arui-scripts 21.0.2 → 21.0.4

package/.turbo/turbo-test.log

@@ -1,21 +1,21 @@
 ts-jest[versions] (WARN) Version 6.0.2 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <6.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 6.0.2 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <6.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 6.0.2 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <6.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
-PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (23.693 s)
-PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (23.933 s)
+PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (24.143 s)
+PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (24.05 s)
 PASS src/configs/util/__tests__/create-watch-ignore-regex.tests.ts
-PASS src/configs/app-configs/__tests__/update-with-env.tests.ts
 PASS src/configs/util/__tests__/apply-overrides.tests.ts
+PASS src/configs/app-configs/__tests__/update-with-env.tests.ts
 PASS src/configs/app-configs/__tests__/update-with-package.tests.ts
 PASS src/configs/util/__tests__/get-polyfills.tests.ts
+PASS src/plugins/postcss-global-variables/utils/__tests__/parse-variables.tests.ts
 PASS src/configs/util/__tests__/compress-with-dcb.test.ts
 PASS src/plugins/postcss-global-variables/utils/__tests__/get-media-query-name.tests.ts
-PASS src/plugins/postcss-global-variables/utils/__tests__/parse-variables.tests.ts
 PASS src/configs/app-configs/__tests__/validate-settings-keys.tests.ts
-PASS src/configs/util/__tests__/find-plugin.tests.ts (26.988 s)
+PASS src/configs/util/__tests__/find-plugin.tests.ts (26.924 s)
 
 Test Suites: 12 passed, 12 total
 Tests:       30 passed, 30 total
 Snapshots:   0 total
-Time:        27.817 s
+Time:        27.769 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # [15.3.0](https://github.com/core-ds/arui-scripts/compare/v15.2.0...v15.3.0) (2023-06-30)
 
+## 21.0.4
+
+### Patch Changes
+
+-   [#467](https://github.com/core-ds/arui-scripts/pull/467) [`e6d6a40`](https://github.com/core-ds/arui-scripts/commit/e6d6a40c5200fcb128850f44ddf0e676b144624b) Thanks [@Los-Santos1](https://github.com/Los-Santos1)! - Исправлен запуск Jest на Windows из-за абсолютных путей в import
+
+## 21.0.3
+
+### Patch Changes
+
+-   [#463](https://github.com/core-ds/arui-scripts/pull/463) [`b27ac8c`](https://github.com/core-ds/arui-scripts/commit/b27ac8c40420df53704a12d83163c31fa6943495) Thanks [@ngg-dev](https://github.com/ngg-dev)! - - удаление устаревшего пакета react-dev-utils для решение проблем с уязвимостями в пакете ajv
+    -   добавление пакета get-port
+    -   создание утилит getLocalIdent и printBuildError
+
 ## 21.0.2
 
 ### Patch Changes

package/build/commands/build/client.js

@@ -13,11 +13,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
-const printBuildError_1 = __importDefault(require("react-dev-utils/printBuildError"));
 const build_wrapper_1 = __importDefault(require("./build-wrapper"));
 const client_assets_sizes_1 = require("../util/client-assets-sizes");
 const webpack_client_prod_1 = require("../../configs/webpack.client.prod");
 const load_browserslist_1 = require("../util/load-browserslist");
+const print_build_error_1 = require("../util/print-build-error");
 (0, load_browserslist_1.loadBrowserslist)();
 console.log(chalk_1.default.magenta('Building client...'));
 function main() {
@@ -46,7 +46,7 @@ function main() {
         }
         catch (err) {
             console.log(chalk_1.default.red('Failed to compile client.\n'));
-            (0, printBuildError_1.default)(err);
+            (0, print_build_error_1.printBuildError)(err);
             process.exit(1);
         }
     });

package/build/commands/build/server.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
-const printBuildError_1 = __importDefault(require("react-dev-utils/printBuildError"));
 const build_wrapper_1 = __importDefault(require("./build-wrapper"));
 const webpack_server_prod_1 = require("../../configs/webpack.server.prod");
 const supporting_node_1 = require("../../configs/supporting-node");
+const print_build_error_1 = require("../util/print-build-error");
 process.env.BROWSERSLIST = supporting_node_1.supportingNode.join(',');
 console.log(chalk_1.default.magenta('Building server...'));
 (0, build_wrapper_1.default)(webpack_server_prod_1.webpackServerConfig)
@@ -24,6 +24,6 @@ console.log(chalk_1.default.magenta('Building server...'));
 })
     .catch((err) => {
     console.log(chalk_1.default.red('Failed to compile server.\n'));
-    (0, printBuildError_1.default)(err);
+    (0, print_build_error_1.printBuildError)(err);
     process.exit(1);
 });

package/build/commands/test/get-config.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJestConfig = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const url_1 = require("url");
 const jest_config_1 = require("jest-config");
 const jest_resolve_1 = __importDefault(require("jest-resolve"));
 const lodash_merge_1 = __importDefault(require("lodash.merge"));
@@ -48,7 +49,7 @@ function getAppJestConfig() {
     return __awaiter(this, void 0, void 0, function* () {
         const jestConfigPath = path_1.default.resolve(process.cwd(), 'jest.config.js');
         if (fs_1.default.existsSync(jestConfigPath)) {
-            return (yield import(jestConfigPath)).default;
+            return (yield import((0, url_1.pathToFileURL)(jestConfigPath).href)).default;
         }
         if (app_configs_1.configs.appPackage.jest) {
             return app_configs_1.configs.appPackage.jest;
@@ -72,7 +73,8 @@ function getPresetConfig(presetPath) {
         if (!presetModule) {
             throw new Error(`Cannot find module '${normalizedPresetPath}'`);
         }
-        const _a = (yield import(presetModule)).default, { preset: subPreset } = _a, preset = __rest(_a, ["preset"]);
+        const _a = (yield import((0, url_1.pathToFileURL)(presetModule).href))
+            .default, { preset: subPreset } = _a, preset = __rest(_a, ["preset"]);
         if (subPreset) {
             console.warn(`Jest can't handle preset chaining. Preset "${subPreset}" will be ignored.`);
         }

package/build/commands/util/get-local-ident.d.ts

@@ -0,0 +1,6 @@
+type CssLoaderContext = {
+    resourcePath: string;
+    rootContext: string;
+};
+export declare function getLocalIdent(context: CssLoaderContext, _localIdentName: string, localName: string): string;
+export {};

package/build/commands/util/get-local-ident.js

@@ -0,0 +1,29 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLocalIdent = getLocalIdent;
+const crypto_1 = __importDefault(require("crypto"));
+const path_1 = __importDefault(require("path"));
+function getLocalIdent(context, _localIdentName, localName) {
+    const isIndexModule = /index\.module\.(css|scss|sass)$/.test(context.resourcePath);
+    const relativePath = path_1.default.posix.relative(context.rootContext, context.resourcePath);
+    const hash = crypto_1.default
+        .createHash('md5')
+        .update(relativePath + localName)
+        .digest('base64')
+        .slice(0, 5)
+        .replace(/\+/g, '_')
+        .replace(/\//g, '_')
+        .replace(/=/g, '');
+    let baseName;
+    if (isIndexModule) {
+        baseName = path_1.default.basename(path_1.default.dirname(context.resourcePath));
+    }
+    else {
+        baseName = path_1.default.basename(context.resourcePath, '.module.css');
+    }
+    const className = `${baseName}_${localName}__${hash}`;
+    return className.replace('.module_', '_').replace(/\./g, '_');
+}

package/build/commands/util/print-build-error.d.ts

@@ -0,0 +1 @@
+export declare function printBuildError(err: Error | null | undefined): void;

package/build/commands/util/print-build-error.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.printBuildError = printBuildError;
+const chalk_1 = __importDefault(require("chalk"));
+function printBuildError(err) {
+    const message = err === null || err === void 0 ? void 0 : err.message;
+    const stack = err === null || err === void 0 ? void 0 : err.stack;
+    if (stack && typeof message === 'string' && message.includes('from Terser')) {
+        try {
+            const matched = /(.+)\[(.+):(.+),(.+)\]\[.+\]/.exec(stack);
+            if (!matched) {
+                throw new Error('Using errors for control flow is bad.');
+            }
+            const problemPath = matched[2];
+            const line = matched[3];
+            const column = matched[4];
+            const columnFormatted = column === '0' ? '' : `:${column}`;
+            console.log(`Failed to minify the code from this file: \n\n${chalk_1.default.yellow(`\t${problemPath}:${line}${columnFormatted}`)}\n`);
+        }
+        catch (ignored) {
+            console.log('Failed to minify the bundle.', err);
+        }
+        console.log('Read more here: https://cra.link/failed-to-minify');
+    }
+    else {
+        console.log(`${message || err}\n`);
+    }
+    console.log();
+}

package/build/commands/util/run-client-dev-server.js

@@ -8,10 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runClientDevServer = runClientDevServer;
 const util_1 = require("util");
-const WebpackDevServerUtils_1 = require("react-dev-utils/WebpackDevServerUtils");
+const get_port_1 = __importDefault(require("get-port"));
 const core_1 = require("@rspack/core");
 const dev_server_1 = require("@rspack/dev-server");
 const dev_server_2 = require("../../configs/dev-server");
@@ -25,7 +28,10 @@ function runClientDevServer(configuration) {
         const DEFAULT_PORT = dev_server_2.devServerConfig.port;
         const HOST = '0.0.0.0';
         try {
-            const port = yield (0, WebpackDevServerUtils_1.choosePort)(HOST, +(DEFAULT_PORT || 0));
+            const port = yield (0, get_port_1.default)({
+                port: +(DEFAULT_PORT || 0),
+                host: HOST,
+            });
             if (!port) {
                 // We have not found a port.
                 return;

package/build/configs/webpack.client.js

@@ -39,7 +39,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createClientWebpackConfig = exports.createSingleClientWebpackConfig = void 0;
 const path_1 = __importDefault(require("path"));
 const zlib = __importStar(require("zlib"));
-const getCSSModuleLocalIdent_1 = __importDefault(require("react-dev-utils/getCSSModuleLocalIdent"));
 const react_refresh_typescript_1 = __importDefault(require("react-refresh-typescript"));
 const core_1 = require("@rspack/core");
 const plugin_react_refresh_1 = __importDefault(require("@rspack/plugin-react-refresh"));
@@ -47,10 +46,11 @@ const assets_webpack_plugin_1 = __importDefault(require("assets-webpack-plugin")
 const case_sensitive_paths_webpack_plugin_1 = __importDefault(require("case-sensitive-paths-webpack-plugin"));
 const compression_webpack_plugin_1 = __importDefault(require("compression-webpack-plugin"));
 const css_minimizer_webpack_plugin_1 = __importDefault(require("css-minimizer-webpack-plugin"));
-const ts_checker_rspack_plugin_1 = require("ts-checker-rspack-plugin");
 const html_webpack_plugin_1 = __importDefault(require("html-webpack-plugin"));
 const rspack_manifest_plugin_1 = require("rspack-manifest-plugin");
+const ts_checker_rspack_plugin_1 = require("ts-checker-rspack-plugin");
 const webpack_deduplication_plugin_1 = require("webpack-deduplication-plugin");
+const get_local_ident_1 = require("../commands/util/get-local-ident");
 const arui_runtime_1 = require("../plugins/arui-runtime");
 const html_template_1 = require("../templates/html.template");
 const minimizers_1 = require("./config-extras/minimizers");
@@ -235,7 +235,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
                                     importLoaders: 1,
                                     sourceMap: mode === 'dev',
                                     modules: {
-                                        getLocalIdent: getCSSModuleLocalIdent_1.default,
+                                        getLocalIdent: get_local_ident_1.getLocalIdent,
                                     },
                                 },
                             },

package/build/configs/webpack.server.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createServerConfig = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const getCSSModuleLocalIdent_1 = __importDefault(require("react-dev-utils/getCSSModuleLocalIdent"));
 const core_1 = require("@rspack/core");
 const case_sensitive_paths_webpack_plugin_1 = __importDefault(require("case-sensitive-paths-webpack-plugin"));
 const run_script_webpack_plugin_1 = require("run-script-webpack-plugin");
@@ -21,6 +20,7 @@ const babel_server_1 = require("./babel-server");
 const postcss_1 = require("./postcss");
 const server_externals_exemptions_1 = require("./server-externals-exemptions");
 const swc_1 = require("./swc");
+const get_local_ident_1 = require("../commands/util/get-local-ident");
 const assetsIgnoreBanner = fs_1.default.readFileSync(require.resolve('./util/node-assets-ignore'), 'utf8');
 const sourceMapSupportBanner = fs_1.default.readFileSync(require.resolve('./util/install-sourcemap-support'), 'utf8');
 // style files regexes
@@ -109,7 +109,7 @@ const createServerConfig = (mode) => ({
                                 options: {
                                     modules: {
                                         exportOnlyLocals: true,
-                                        getLocalIdent: getCSSModuleLocalIdent_1.default,
+                                        getLocalIdent: get_local_ident_1.getLocalIdent,
                                     },
                                 },
                             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arui-scripts",
-  "version": "21.0.2",
+  "version": "21.0.4",
   "main": "./build/index.js",
   "typings": "./build/index.d.ts",
   "license": "MPL-2.0",
@@ -62,6 +62,7 @@
     "expose-loader": "3.1.0",
     "filesize": "^6.4.0",
     "fs-extra": "6.0.1",
+    "get-port": "7.2.0",
     "html-webpack-plugin": "^5.6.0",
     "image-minimizer-webpack-plugin": "^3.8.3",
     "imagemin": "^8.0.1",
@@ -95,7 +96,6 @@
     "postcss-remove-root": "^0.0.2",
     "postcss-strip-units": "^2.0.0",
     "postcss-url": "^10.0.0",
-    "react-dev-utils": "12.0.1",
     "react-refresh": "0.10.0",
     "react-refresh-typescript": "2.0.2",
     "rimraf": "^2.7.1",
@@ -128,7 +128,6 @@
     "@types/lodash.merge": "^4.6.7",
     "@types/node": "18.19.121",
     "@types/postcss-media-query-parser": "0.2.4",
-    "@types/react-dev-utils": "9.0.11",
     "@types/semver": "^7.5.0",
     "@types/serialize-javascript": "^5.0.4",
     "@types/shelljs": "^0.8.12",