From 14f5ab9dd32ca61cc501b8f023184658a1f9b172 Mon Sep 17 00:00:00 2001 From: Nayden Naydenov Date: Tue, 19 Aug 2025 17:16:44 +0300 Subject: [PATCH 1/2] chore: clean nps scripts --- packages/base/package-scripts.cjs | 4 ++-- packages/tools/components-package/nps.js | 19 ++++++++----------- packages/tools/icons-collection/nps.js | 12 ++++++------ .../tools/lib/generate-json-imports/i18n.js | 2 +- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/packages/base/package-scripts.cjs b/packages/base/package-scripts.cjs index a2976f7ca564..822b8fbbff06 100644 --- a/packages/base/package-scripts.cjs +++ b/packages/base/package-scripts.cjs @@ -39,8 +39,8 @@ const scripts = { json: `node "${LIB}/i18n/toJSON.js" src/i18n dist/generated/assets/i18n`, }, jsonImports: { - default: "mkdirp src/generated/json-imports && nps build.jsonImports.i18n", - i18n: `node "${LIB}/generate-json-imports/i18n.js" dist/generated/assets/i18n src/generated/json-imports`, + default: "nps build.jsonImports.i18n", + i18n: `node "${LIB}/generate-json-imports/i18n.js" src/i18n src/generated/json-imports`, }, }, copy: { diff --git a/packages/tools/components-package/nps.js b/packages/tools/components-package/nps.js index 4b34a6e1ab7c..c9bc728bd269 100644 --- a/packages/tools/components-package/nps.js +++ b/packages/tools/components-package/nps.js @@ -13,7 +13,7 @@ const cypressEnvVariables = (options, predefinedVars) => { let variables = []; const { cypress_code_coverage, cypress_acc_tests } = options.internal ?? {}; - // Handle environment variables like TEST_SUITE + // Handle environment variables like TEST_SUITE if (predefinedVars) { variables = [...predefinedVars]; } @@ -83,11 +83,11 @@ const getScripts = (options) => { lintfix: `eslint . ${eslintConfig} --fix`, generate: { default: `${tsCrossEnv} nps prepare.all`, - all: 'concurrently "nps build.templates" "nps build.i18n" "nps prepare.styleRelated" "nps copyProps" "nps build.illustrations"', + all: 'concurrently "nps build.templates" "nps build.i18n" "nps prepare.styleRelated" "nps build.illustrations"', styleRelated: "nps build.styles build.jsonImports build.jsImports", }, prepare: { - default: `${tsCrossEnv} nps clean prepare.all ${options.legacy ? "copy" : ""} copyProps prepare.typescript generateAPI`, + default: `${tsCrossEnv} nps clean prepare.all ${options.legacy ? "copy" : ""} prepare.typescript generateAPI`, all: 'concurrently "nps build.templates" "nps build.i18n" "nps prepare.styleRelated" "nps build.illustrations"', styleRelated: "nps build.styles build.jsonImports build.jsImports", typescript: tsCommandOld, @@ -108,7 +108,7 @@ const getScripts = (options) => { jsonImports: { default: "mkdirp src/generated/json-imports && nps build.jsonImports.themes build.jsonImports.i18n", themes: `node "${LIB}/generate-json-imports/themes.js" dist/generated/assets/themes src/generated/json-imports`, - i18n: `node "${LIB}/generate-json-imports/i18n.js" dist/generated/assets/i18n src/generated/json-imports`, + i18n: `node "${LIB}/generate-json-imports/i18n.js" src/i18n src/generated/json-imports`, }, jsImports: { default: "mkdirp src/generated/js-imports && nps build.jsImports.illustrationsLoaders", @@ -118,18 +118,15 @@ const getScripts = (options) => { bundle2: ``, illustrations: createIllustrationsJSImportsScript, }, - copyProps: `node "${LIB}/copy-and-watch/index.js" --silent "src/i18n/*.properties" dist/`, copy: { - default: "nps copy.src copy.props", - src: `node "${LIB}/copy-and-watch/index.js" --silent "src/**/*.{js,json}" dist/`, - props: `node "${LIB}/copy-and-watch/index.js" --silent "src/i18n/*.properties" dist/`, + default: "nps copy.src", + src: `node "${LIB}/copy-and-watch/index.js" "src/**/*.{js,json}" dist/`, }, watch: { - default: `${tsCrossEnv} concurrently "nps watch.templates" "nps watch.typescript" ${options.legacy ? '"nps watch.src"' : ""} "nps watch.styles" "nps watch.i18n" "nps watch.props"`, + default: `${tsCrossEnv} concurrently "nps watch.templates" "nps watch.typescript" ${options.legacy ? '"nps watch.src"' : ""} "nps watch.styles" "nps watch.i18n"`, devServer: 'concurrently "nps watch.default" "nps watch.bundle"', src: 'nps "copy.src --watch --safe --skip-initial-copy"', typescript: tsWatchCommandStandalone, - props: 'nps "copyProps --watch --safe --skip-initial-copy"', bundle: `node ${LIB}/dev-server/dev-server.mjs ${viteConfig}`, styles: { default: 'concurrently "nps watch.styles.themes" "nps watch.styles.components"', @@ -158,7 +155,7 @@ const getScripts = (options) => { replace: `node "${LIB}/scoping/scope-test-pages.js" test/pages/scoped demo`, }, watchWithBundle: 'concurrently "nps scope.watch" "nps scope.bundle" ', - watch: 'concurrently "nps watch.templates" "nps watch.props" "nps watch.styles"', + watch: 'concurrently "nps watch.templates" "nps watch.styles"', bundle: `node ${LIB}/dev-server/dev-server.mjs ${viteConfig}`, }, generateAPI: { diff --git a/packages/tools/icons-collection/nps.js b/packages/tools/icons-collection/nps.js index be76782e8393..721fcc6ac97d 100644 --- a/packages/tools/icons-collection/nps.js +++ b/packages/tools/icons-collection/nps.js @@ -21,7 +21,7 @@ const copyIconAssetsCommand = (options) => { return { default: "nps copy.json-imports copy.icon-collection", "json-imports": `node "${LIB}/copy-and-watch/index.js" --silent "src/**/*.js" dist/`, - "icon-collection": `node "${LIB}/copy-and-watch/index.js" --silent "src/*.json" src/generated/assets/`, + "icon-collection": `node "${LIB}/copy-and-watch/index.js" --silent "src/*.json" "!src/${v}/messagebundle_*.json" src/generated/assets/`, } } @@ -32,7 +32,7 @@ const copyIconAssetsCommand = (options) => { options.versions.forEach((v) => { command.default += ` copy.icon-collection${v}`; - command[`icon-collection${v}`] = `node "${LIB}/copy-and-watch/index.js" --silent "src/${v}/*.json" src/generated/assets/${v}/`; + command[`icon-collection${v}`] = `node "${LIB}/copy-and-watch/index.js" --silent "src/${v}/*.json" "!src/${v}/messagebundle_*.json" src/generated/assets/${v}/`; }); return command; @@ -53,12 +53,12 @@ const getScripts = (options) => { default: `${tsCrossEnv} nps clean copy build.i18n typescript build.icons build.jsonImports`, i18n: { default: "nps build.i18n.defaultsjs build.i18n.json", - defaultsjs: `mkdirp dist/generated/i18n && node "${LIB}/i18n/defaults.js" src/i18n src/generated/i18n`, - json: `mkdirp src/generated/assets/i18n && node "${LIB}/i18n/toJSON.js" src/i18n src/generated/assets/i18n`, + defaultsjs: `node "${LIB}/i18n/defaults.js" src/i18n src/generated/i18n`, + json: `node "${LIB}/i18n/toJSON.js" src/i18n src/generated/assets/i18n`, }, jsonImports: { - default: "mkdirp src/generated/json-imports && nps build.jsonImports.i18n", - i18n: `node "${LIB}/generate-json-imports/i18n.js" src/generated/assets/i18n src/generated/json-imports`, + default: "nps build.jsonImports.i18n", + i18n: `node "${LIB}/generate-json-imports/i18n.js" src/i18n src/generated/json-imports`, }, icons: createJSImportsCmd, }, diff --git a/packages/tools/lib/generate-json-imports/i18n.js b/packages/tools/lib/generate-json-imports/i18n.js index 32cd945f4180..1f9b12f93806 100644 --- a/packages/tools/lib/generate-json-imports/i18n.js +++ b/packages/tools/lib/generate-json-imports/i18n.js @@ -44,7 +44,7 @@ const generate = async () => { // All languages present in the file system const files = await fs.readdir(inputFolder); const languages = files.map(file => { - const matches = file.match(/messagebundle_(.+?).json$/); + const matches = file.match(/messagebundle_(.+?).properties$/); return matches ? matches[1] : undefined; }).filter(key => !!key); From 5b0da7ea84459f23185108c9b05f8900472240f8 Mon Sep 17 00:00:00 2001 From: Nayden Naydenov Date: Wed, 20 Aug 2025 11:42:19 +0300 Subject: [PATCH 2/2] chore: simply --- packages/tools/icons-collection/nps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/icons-collection/nps.js b/packages/tools/icons-collection/nps.js index 721fcc6ac97d..742076d91371 100644 --- a/packages/tools/icons-collection/nps.js +++ b/packages/tools/icons-collection/nps.js @@ -21,7 +21,7 @@ const copyIconAssetsCommand = (options) => { return { default: "nps copy.json-imports copy.icon-collection", "json-imports": `node "${LIB}/copy-and-watch/index.js" --silent "src/**/*.js" dist/`, - "icon-collection": `node "${LIB}/copy-and-watch/index.js" --silent "src/*.json" "!src/${v}/messagebundle_*.json" src/generated/assets/`, + "icon-collection": `node "${LIB}/copy-and-watch/index.js" --silent "src/*.json" src/generated/assets/`, } } @@ -32,7 +32,7 @@ const copyIconAssetsCommand = (options) => { options.versions.forEach((v) => { command.default += ` copy.icon-collection${v}`; - command[`icon-collection${v}`] = `node "${LIB}/copy-and-watch/index.js" --silent "src/${v}/*.json" "!src/${v}/messagebundle_*.json" src/generated/assets/${v}/`; + command[`icon-collection${v}`] = `node "${LIB}/copy-and-watch/index.js" --silent "src/${v}/*.json" src/generated/assets/${v}/`; }); return command;