chore: execute node scripts as modules

package.json

@@ -69,7 +69,6 @@
     "@commitlint/config-conventional": "^16.2.1",
     "@semantic-release/github": "^11.0.0",
     "command-line-args": "^5.1.1",
-    "copy-and-watch": "^0.1.5",
     "globby": "^13.1.1",
     "husky": "^7.0.4",
     "lerna": "^7.4.1",

packages/ai/package.json

@@ -58,7 +58,6 @@
     "chokidar-cli": "^3.0.0",
     "cypress": "^15.3.0",
     "eslint": "^7.22.0",
-    "rimraf": "^6.0.1",
     "vite": "5.4.8"
   }
 }

packages/base/lib/css-processors/css-processor-font-face.mjs

@@ -3,62 +3,72 @@ import * as path from "path";
 import { readFile, writeFile } from "fs/promises";
 import { fileURLToPath } from "url";
 
-const themeBasePackage = JSON.parse(await readFile(fileURLToPath(import.meta.resolve("@sap-theming/theming-base-content/package.json", "utf-8"))));
+const generate = async () => {
+    const themeBasePackage = JSON.parse(await readFile(fileURLToPath(import.meta.resolve("@sap-theming/theming-base-content/package.json", "utf-8"))));
 
-const processFontFace = (text) => {
-    const declarationExpr = /@font-face\s*{[^}]*}/g;
+    const processFontFace = (text) => {
+        const declarationExpr = /@font-face\s*{[^}]*}/g;
 
-    // change font-face src
-    text = text.replaceAll("../baseTheme/fonts", `https://cdn.jsdelivr.net/npm/@sap-theming/theming-base-content@${themeBasePackage.version}/content/Base/baseLib/baseTheme/fonts`);
+        // change font-face src
+        text = text.replaceAll("../baseTheme/fonts", `https://cdn.jsdelivr.net/npm/@sap-theming/theming-base-content@${themeBasePackage.version}/content/Base/baseLib/baseTheme/fonts`);
 
-    // extract declarations for separate usage
-    let fontFaceDeclarations = [...text.matchAll(declarationExpr)].map(x => x[0]);
+        // extract declarations for separate usage
+        let fontFaceDeclarations = [...text.matchAll(declarationExpr)].map(x => x[0]);
 
-    // remove SAP-icons
-    fontFaceDeclarations = fontFaceDeclarations.filter(decl => !decl.includes("SAP-icons"));
+        // remove SAP-icons
+        fontFaceDeclarations = fontFaceDeclarations.filter(decl => !decl.includes("SAP-icons"));
 
-    // remove woff urls
-    fontFaceDeclarations = fontFaceDeclarations.map(decl => {
-        // @font-face {
-        //     src: url(../baseTheme/fonts/72-Semibold.woff2) format("woff2"), url(../baseTheme/fonts/72-Semibold.woff) format("woff"), local("72-Semibold");
-        return decl.replace(/,url\(([^)]+)\.woff\)\ format\("woff"\)/, '');
-    });
+        // remove woff urls
+        fontFaceDeclarations = fontFaceDeclarations.map(decl => {
+            // @font-face {
+            //     src: url(../baseTheme/fonts/72-Semibold.woff2) format("woff2"), url(../baseTheme/fonts/72-Semibold.woff) format("woff"), local("72-Semibold");
+            return decl.replace(/,url\(([^)]+)\.woff\)\ format\("woff"\)/, '');
+        });
 
-    return fontFaceDeclarations.join("\n");
-}
+        return fontFaceDeclarations.join("\n");
+    }
 
-let fontfacePlugin = {
-    name: 'fontface',
-    setup(build) {
-        build.initialOptions.write = false;
+    let fontfacePlugin = {
+        name: 'fontface',
+        setup(build) {
+            build.initialOptions.write = false;
 
-        build.onEnd(result => {
-            result.outputFiles.forEach(async f => {
-                let newText = processFontFace(f.text);
-                const tsPath = path.join(process.cwd(), "src/generated/css/FontFace.css.ts");
-                const tsContent = `export default \`${newText}\``;
-                await writeFile(tsPath, tsContent);
-            });
-        })
-    },
-}
+            build.onEnd(result => {
+                result.outputFiles.forEach(async f => {
+                    let newText = processFontFace(f.text);
+                    const tsPath = path.join(process.cwd(), "src/generated/css/FontFace.css.ts");
+                    const tsContent = `export default \`${newText}\``;
+                    await writeFile(tsPath, tsContent);
+                });
+            })
+        },
+    }
+
+    // esbuild cannot resolve the node module format when passed as stdin, so resolve the actual file via node resolve
+    const themeBaseFile = fileURLToPath(import.meta.resolve("@sap-theming/theming-base-content/content/Base/baseLib/sap_horizon/css_variables.css"));
 
-// esbuild cannot resolve the node module format when passed as stdin, so resolve the actual file via node resolve
-const themeBaseFile = fileURLToPath(import.meta.resolve("@sap-theming/theming-base-content/content/Base/baseLib/sap_horizon/css_variables.css"));
+    const config = {
+        stdin: {
+            contents: `@import ${JSON.stringify(themeBaseFile)};`, // windows paths contain a backslash which has to be escaped because this will be treated as a string
+            resolveDir: './',
+            sourcefile: 'virtual-font-face.css',
+            loader: 'css',
+        },
+        bundle: true,
+        minify: true,
+        plugins: [
+            fontfacePlugin,
+        ],
+        external: ["*.ttf", "*.woff", "*.woff2"],
+    };
 
-const config = {
-    stdin: {
-        contents: `@import ${JSON.stringify(themeBaseFile)};`, // windows paths contain a backslash which has to be escaped because this will be treated as a string
-        resolveDir: './',
-        sourcefile: 'virtual-font-face.css',
-        loader: 'css',
-    },
-    bundle: true,
-    minify: true,
-    plugins: [
-        fontfacePlugin,
-    ],
-    external: ["*.ttf", "*.woff", "*.woff2"],
+    const result = await esbuild.build(config);
 };
 
-const result = await esbuild.build(config);
+if (import.meta.url === `file://${process.argv[1]}`) {
+    generate()
+}
+
+export default {
+    _ui5mainFn: generate
+}

packages/base/lib/generate-asset-parameters/index.js

@@ -19,9 +19,15 @@ export {
 
 const generate = async () => {
 	await fs.mkdir("src/generated/", { recursive: true });
-	return fs.writeFile("src/generated/AssetParameters.ts", fileContent);
-}
+	await fs.writeFile("src/generated/AssetParameters.ts", fileContent);
 
-generate().then(() => {
 	console.log("Assets parameters generated.");
-});
+}
+
+if (import.meta.url === `file://${process.argv[1]}`) {
+	generate()
+}
+
+export default {
+	_ui5mainFn: generate
+}

packages/base/lib/generate-styles/index.js

@@ -3,7 +3,7 @@ import path from "path";
 import CleanCSS from "clean-css";
 
 const generate = async () => {
-	await fs.mkdir("src/generated/css/", {recursive: true});
+	await fs.mkdir("src/generated/css/", { recursive: true });
 
 	const files = (await fs.readdir("src/css/")).filter(file => file.endsWith(".css"));
 	const filesPromises = files.map(async file => {
@@ -13,9 +13,16 @@ const generate = async () => {
 		return fs.writeFile(path.join("src/generated/css/", `${file}.ts`), content);
 	});
 
-	return Promise.all(filesPromises);
+	return Promise.all(filesPromises)
+		.then(() => {
+			console.log("Styles files generated.");
+		});
 };
 
-generate().then(() => {
-	console.log("Styles files generated.");
-});
+if (import.meta.url === `file://${process.argv[1]}`) {
+	generate()
+}
+
+export default {
+	_ui5mainFn: generate
+}

packages/base/lib/generate-version-info/index.js

@@ -25,8 +25,14 @@ export default VersionInfo;`;
 
 	await fs.mkdir("src/generated/", { recursive: true });
 	await fs.writeFile("src/generated/VersionInfo.ts", fileContent);
-}
 
-generate().then(() => {
 	console.log("Version info file generated.");
-});
+}
+
+if (import.meta.url === `file://${process.argv[1]}`) {
+	generate()
+}
+
+export default {
+	_ui5mainFn: generate
+}

packages/base/package-scripts.cjs

@@ -15,23 +15,27 @@ const viteConfig = `-c "${require.resolve("@ui5/webcomponents-tools/components-p
 
 const scripts = {
 	__ui5envs: {
-		UI5_TS: true,
+		UI5_TS: "true",
 		UI5_BASE: true,
 		UI5_CEM_MODE: "dev",
 	},
-	clean: "rimraf src/generated && rimraf dist",
+	clean: {
+		default: "ui5nps clean.generated clean.dist",
+		"generated": `ui5nps-script "${LIB}/rimraf/rimraf.js src/generated`,
+		"dist": `ui5nps-script "${LIB}/rimraf/rimraf.js dist`,
+	},
 	lint: `eslint .`,
 	generate: "ui5nps clean build.i18n integrate copy generateAssetParameters generateVersionInfo generateStyles generateFontFace build.jsonImports",
 	prepare: "ui5nps clean build.i18n integrate copy generateAssetParameters generateVersionInfo generateStyles generateFontFace typescript integrate.no-remaining-require build.jsonImports",
 	typescript: "tsc -b",
 	integrate: {
 		default: "ui5nps integrate.copy-used-modules integrate.amd-to-es6 integrate.third-party",
-		"copy-used-modules": `node "${copyUsedModules}" ./used-modules.txt dist/`,
-		"amd-to-es6": `node "${amdToES6}" dist/`,
-		"no-remaining-require": `node "${noRequire}" dist/`,
+		"copy-used-modules": `ui5nps-script "${copyUsedModules}" ./used-modules.txt dist/`,
+		"amd-to-es6": `ui5nps-script "${amdToES6}" dist/`,
+		"no-remaining-require": `ui5nps-script "${noRequire}" dist/`,
 		"third-party": {
 			default: "ui5nps integrate.third-party.copy integrate.third-party.fix",
-			copy: "copy-and-watch ../../node_modules/@openui5/sap.ui.core/src/sap/ui/thirdparty/caja-html-sanitizer.js dist/sap/ui/thirdparty/",
+			copy: `ui5nps-script "${LIB}copy-and-watch/index.js" ../../node_modules/@openui5/sap.ui.core/src/sap/ui/thirdparty/caja-html-sanitizer.js dist/sap/ui/thirdparty/`,
 			fix: "replace-in-file 240 xA0 dist/sap/ui/thirdparty/caja-html-sanitizer.js"
 		},
 	},
@@ -40,39 +44,44 @@ const scripts = {
 		bundle: `vite build ${viteConfig}`,
 		i18n: {
 			default: "ui5nps build.i18n.defaultsjs build.i18n.json",
-			defaultsjs: `node "${LIB}/i18n/defaults.js" src/i18n src/generated/i18n`,
-			json: `node "${LIB}/i18n/toJSON.js" src/i18n dist/generated/assets/i18n`,
+			defaultsjs: `ui5nps-script "${LIB}/i18n/defaults.js" src/i18n src/generated/i18n`,
+			json: `ui5nps-script "${LIB}/i18n/toJSON.js" src/i18n dist/generated/assets/i18n`,
 		},
 		jsonImports: {
 			default: "ui5nps build.jsonImports.i18n",
-			i18n: `node "${LIB}/generate-json-imports/i18n.js" dist/generated/assets/i18n src/generated/json-imports`,
+			i18n: `ui5nps-script "${LIB}/generate-json-imports/i18n.js" dist/generated/assets/i18n src/generated/json-imports`,
 		},
 	},
 	copy: {
 		default: "ui5nps copy.src",
-		src: `copy-and-watch "src/**/*.{js,css,d.ts}" dist/`,
-		srcWithWatch: `copy-and-watch "src/**/*.{js,css,d.ts}" dist/ --watch --skip-initial-copy`,
+		src: `ui5nps-script "${LIB}copy-and-watch/index.js" "src/**/*.{js,css,d.ts}" dist/`,
+		srcWithWatch: `ui5nps-script "${LIB}copy-and-watch/index.js" "src/**/*.{js,css,d.ts}" dist/ --watch --skip-initial-copy`,
 	},
-	generateAssetParameters: `node "${assetParametersScript}"`,
-	generateVersionInfo: `node "${versionScript}"`,
-	generateStyles: `node "${stylesScript}"`,
-	generateFontFace: `node "${fontFaceScript}"`,
+	generateAssetParameters: `ui5nps-script "${assetParametersScript}"`,
+	generateVersionInfo: `ui5nps-script "${versionScript}"`,
+	generateStyles: `ui5nps-script "${stylesScript}"`,
+	generateFontFace: `ui5nps-script "${fontFaceScript}"`,
 	generateTestTemplates: `node "${LIB}/hbs2ui5/index.js" -d test/test-elements -o test/test-elements/generated/templates`,
 	generateProd: {
 		"default": "ui5nps generateProd.remove-dev-mode generateProd.copy-prod",
-		"remove-dev-mode": `node "${LIB}/remove-dev-mode/remove-dev-mode.mjs"`,
-		"copy-prod": `copy-and-watch "dist/sap/**/*" dist/prod/sap/ && copy-and-watch "dist/thirdparty/preact/**/*.js" dist/prod/thirdparty/preact/ && copy-and-watch "dist/generated/assets/**/*.json" dist/prod/generated/assets/`,
-	},
+		"remove-dev-mode": `ui5nps-script "${LIB}/remove-dev-mode/remove-dev-mode.mjs"`,
+		"copy-prod": {
+			default: "ui5nps-p generateProd.copy-prod.ui5 generateProd.copy-prod.preact generateProd.copy-prod.assets",
+			"ui5": `ui5nps-script "${LIB}copy-and-watch/index.js" "dist/sap/**/*" dist/prod/sap/`,
+			"preact": `ui5nps-script "${LIB}copy-and-watch/index.js" "dist/thirdparty/preact/**/*.js" dist/prod/thirdparty/preact/`,
+			"assets": `ui5nps-script "${LIB}copy-and-watch/index.js" "dist/generated/assets/**/*.json" dist/prod/generated/assets/`,
+	}
+},
 	generateAPI: {
 		default: "ui5nps generateAPI.generateCEM generateAPI.validateCEM",
-		generateCEM: `cem analyze --config "${LIB}/cem/custom-elements-manifest.config.mjs"`,
-		validateCEM: `node "${LIB}/cem/validate.js"`,
+		generateCEM: `ui5nps-script "${LIB}/cem/cem.js" analyze --config "${LIB}cem/custom-elements-manifest.config.mjs"`,
+		validateCEM: `ui5nps-script "${LIB}/cem/validate.js"`,
 	},
 	watch: {
 		default: 'ui5nps-p watch.src watch.styles', // concurently
 		withBundle: 'ui5nps-p watch.src watch.bundle watch.styles', // concurently
 		src: 'ui5nps copy.srcWithWatch',
-		bundle: `node ${LIB}/dev-server/dev-server.mjs ${viteConfig}`,
+		bundle: `ui5nps-script ${LIB}/dev-server/dev-server.mjs ${viteConfig}`,
 		styles: 'chokidar "src/css/*.css" -c "ui5nps generateStyles"'
 	},
 	test: {

packages/base/package.json

@@ -67,17 +67,12 @@
     "@ui5/cypress-internal": "0.1.0",
     "@ui5/webcomponents-tools": "2.15.0-rc.2",
     "clean-css": "^5.2.2",
-    "concurrently": "^9.2.1",
-    "copy-and-watch": "^0.1.5",
-    "cross-env": "^7.0.3",
     "cypress": "^15.3.0",
     "eslint": "^7.22.0",
     "mkdirp": "^1.0.4",
     "mocha": "^11.7.2",
-    "nps": "^5.10.0",
     "replace-in-file": "^6.3.5",
     "resolve": "^1.20.0",
-    "rimraf": "^6.0.1",
     "touch": "^3.1.0",
     "typescript": "^5.6.2",
     "vite": "5.4.8"

packages/compat/package.json

@@ -58,7 +58,6 @@
     "chokidar-cli": "^3.0.0",
     "cypress": "^15.3.0",
     "eslint": "^7.22.0",
-    "rimraf": "^6.0.1",
     "vite": "5.4.8"
   }
 }

packages/fiori/package.json

@@ -60,15 +60,12 @@
   },
   "devDependencies": {
     "@custom-elements-manifest/analyzer": "patch:@custom-elements-manifest/analyzer@npm%3A0.10.6#~/.yarn/patches/@custom-elements-manifest-analyzer-npm-0.10.6-9b5ff0c50b.patch",
-    "@types/add": "^2",
     "@ui5/cypress-internal": "0.1.0",
     "@ui5/webcomponents-tools": "2.15.0-rc.2",
-    "add": "^2.0.6",
     "chokidar-cli": "^3.0.0",
     "cypress": "^15.3.0",
     "eslint": "^7.22.0",
     "lit": "^2.0.0",
-    "rimraf": "^6.0.1",
     "vite": "5.4.8",
     "yarn": "^1.22.22"
   }

packages/icons-business-suite/package.json

@@ -30,7 +30,6 @@
     "@ui5/webcomponents-base": "2.15.0-rc.2"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "2.15.0-rc.2",
-    "rimraf": "^6.0.1"
+    "@ui5/webcomponents-tools": "2.15.0-rc.2"
   }
 }

packages/icons-tnt/package.json

@@ -30,7 +30,6 @@
     "@ui5/webcomponents-base": "2.15.0-rc.2"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "2.15.0-rc.2",
-    "rimraf": "^6.0.1"
+    "@ui5/webcomponents-tools": "2.15.0-rc.2"
   }
 }

packages/icons/package.json

@@ -30,7 +30,6 @@
     "@ui5/webcomponents-base": "2.15.0-rc.2"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "2.15.0-rc.2",
-    "rimraf": "^6.0.1"
+    "@ui5/webcomponents-tools": "2.15.0-rc.2"
   }
 }

packages/localization/lib/generate-json-imports/cldr.js

@@ -39,9 +39,16 @@ const generate = async () => {
 		fs.writeFile("src/generated/json-imports/LocaleData.ts", contentDynamic(caseDynamicImports)),
 		fs.writeFile("src/generated/json-imports/LocaleData-fetch.ts", contentDynamic(caseFetchMetaResolve)),
 		fs.writeFile("src/generated/json-imports/LocaleData-node.ts", contentDynamic(caseDynamicImportJSONAttr)),
-	]);
+	])
+		.then(() => {
+			console.log("CLDR files generated.");
+		});
 }
 
-generate().then(() => {
-	console.log("CLDR files generated.");
-});
+if (import.meta.url === `file://${process.argv[1]}`) {
+	generate()
+}
+
+export default {
+	_ui5mainFn: generate
+}