Merge pull request #1184 from bryceosterhaus/node20

feat(npm-scripts): update for node v20
liferay · Apr 23, 2024 · 6fa409e · 6fa409e
2 parents 2effb43 + e93594b
commit 6fa409e
Show file tree

Hide file tree

Showing 4 changed files with 623 additions and 119 deletions.
diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/package.json b/projects/js-themes-toolkit/packages/liferay-theme-tasks/package.json
@@ -47,7 +47,7 @@
 	"devDependencies": {
 		"liferay-frontend-theme-styled": "6.0.6",
 		"liferay-frontend-theme-unstyled": "6.0.6",
-		"node-sass": "^6.0.1"
+		"node-sass": "^9.0.0"
 	},
 	"engines": {
 		"node": ">=16.0.0"

diff --git a/projects/npm-tools/packages/npm-scripts/src/utils/SignalHandler.js b/projects/npm-tools/packages/npm-scripts/src/utils/SignalHandler.js
@@ -23,7 +23,25 @@ const SignalHandler = {
 	install() {
 		if (!installed) {
 			Object.keys(SIGNALS).forEach((signal) => {
-				process.on(signal, handleSignal);
+				process.on(signal, (code) => {
+					log(`Received ${code}`);
+
+					for (const callback of callbacks.values()) {
+						try {
+							callback();
+						}
+						catch (error) {
+							log(`Caught error in signal callback: ${error}`);
+						}
+					}
+
+					if (signal !== 'exit') {
+						process.exit(128 + SIGNALS[code]);
+					}
+					else {
+						process.exit(code);
+					}
+				});
 			});
 
 			installed = true;
@@ -49,21 +67,4 @@ function getDisposable(callback, id) {
 	};
 }
 
-function handleSignal(signal) {
-	log(`Received ${signal}`);
-
-	for (const callback of callbacks.values()) {
-		try {
-			callback();
-		}
-		catch (error) {
-			log(`Caught error in signal callback: ${error}`);
-		}
-	}
-
-	if (signal !== -1) {
-		process.exit(128 + SIGNALS[signal]);
-	}
-}
-
 module.exports = SignalHandler;
diff --git a/projects/npm-tools/packages/npm-scripts/src/utils/runBundler.js b/projects/npm-tools/packages/npm-scripts/src/utils/runBundler.js
@@ -18,6 +18,10 @@ function runBundler(...args) {
 		autoDelete: false,
 	});
 
+	// Support for Node 20
+
+	process.env.NODE_OPTIONS = '--no-experimental-fetch';
+
 	withTempFile(
 		'.npmbundlerrc',
 		JSON.stringify(config),