arui-scripts 18.2.0 → 18.4.0

package/.turbo/turbo-lint.log

@@ -149,7 +149,7 @@
   66:47  warning  Unexpected any. Specify a different type                        @typescript-eslint/no-explicit-any
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/plugins/postcss-prefix-selector.ts
-  38:79  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+  40:79  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/templates/dockerfile-compiled.template.ts
    2:8  warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default

package/.turbo/turbo-test.log

@@ -1,20 +1,24 @@
+ts-jest[versions] (WARN) Version 29.7.0 of jest installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=28.0.0 <29.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
+ts-jest[versions] (WARN) Version 29.7.0 of jest installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=28.0.0 <29.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
+ts-jest[versions] (WARN) Version 29.7.0 of jest installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=28.0.0 <29.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
+ts-jest[versions] (WARN) Version 29.7.0 of jest installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=28.0.0 <29.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 5.6.3 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <5.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 5.6.3 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <5.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 5.6.3 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <5.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
-PASS src/configs/util/__tests__/get-polyfills.tests.ts (31.522 s)
-PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (32.969 s)
+PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (33.169 s)
 PASS src/configs/util/__tests__/apply-overrides.tests.ts
-PASS src/configs/app-configs/__tests__/update-with-package.tests.ts
 PASS src/configs/app-configs/__tests__/update-with-env.tests.ts
+PASS src/configs/util/__tests__/get-polyfills.tests.ts (34.718 s)
+PASS src/configs/app-configs/__tests__/update-with-package.tests.ts
 PASS src/configs/app-configs/__tests__/validate-settings-keys.tests.ts
 Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
 Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
 Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
 Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
-PASS src/configs/util/__tests__/find-plugin.tests.ts (42.181 s)
+PASS src/configs/util/__tests__/find-plugin.tests.ts (43.016 s)
 
 Test Suites: 7 passed, 7 total
 Tests:       21 passed, 21 total
 Snapshots:   0 total
-Time:        44.125 s
+Time:        44.555 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # [15.3.0](https://github.com/core-ds/arui-scripts/compare/v15.2.0...v15.3.0) (2023-06-30)
 
+## 18.4.0
+
+### Minor Changes
+
+-   [#282](https://github.com/core-ds/arui-scripts/pull/282) [`5c94eea`](https://github.com/core-ds/arui-scripts/commit/5c94eea4895e3c4094fbb0824d22f6c547f86ec5) Thanks [@e-ogri](https://github.com/e-ogri)! - Добавление возможности использовать preset в jest конфигурации приложений, для переопределения настроек тестирования
+
+## 18.3.0
+
+### Minor Changes
+
+-   [#283](https://github.com/core-ds/arui-scripts/pull/283) [`c84f2f6`](https://github.com/core-ds/arui-scripts/commit/c84f2f6260101a886b86029841f6fce4b3145ead) Thanks [@dryabinin94](https://github.com/dryabinin94)! - Исправление реализации префикса для :root селектора для правильной работы css переменных
+
 ## 18.2.0
 
 ### Minor Changes

package/build/commands/test/get-config.d.ts

@@ -0,0 +1 @@
+export declare const getJestConfig: () => Promise<any>;

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

@@ -0,0 +1,104 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getJestConfig = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const jest_config_1 = require("jest-config");
+const jest_resolve_1 = __importDefault(require("jest-resolve"));
+const lodash_merge_1 = __importDefault(require("lodash.merge"));
+const app_configs_1 = require("../../configs/app-configs");
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+const settings_1 = __importDefault(require("../../configs/jest/settings"));
+const PRESET_EXTENSIONS = ['.json', '.js', '.cjs', '.mjs'];
+const PRESET_NAME = 'jest-preset';
+const getJestConfig = () => __awaiter(void 0, void 0, void 0, function* () {
+    const _a = yield getAppJestConfig(), { preset } = _a, appJestConfig = __rest(_a, ["preset"]);
+    let presetConfig = {};
+    if (preset) {
+        presetConfig = yield getPresetConfig(preset);
+    }
+    return (0, lodash_merge_1.default)(settings_1.default, presetConfig, appJestConfig);
+});
+exports.getJestConfig = getJestConfig;
+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 Promise.resolve(`${jestConfigPath}`).then(s => __importStar(require(s)))).default;
+        }
+        if (app_configs_1.configs.appPackage.jest) {
+            return app_configs_1.configs.appPackage.jest;
+        }
+        return {};
+    });
+}
+function getPresetConfig(presetPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!presetPath) {
+            return {};
+        }
+        const rootDir = process.cwd();
+        const normalizedPresetPath = (0, jest_config_1.replaceRootDirInPath)(rootDir, presetPath);
+        const presetModule = jest_resolve_1.default.findNodeModule(normalizedPresetPath.startsWith('.')
+            ? normalizedPresetPath
+            : path_1.default.join(normalizedPresetPath, PRESET_NAME), {
+            basedir: rootDir,
+            extensions: PRESET_EXTENSIONS,
+        });
+        if (!presetModule) {
+            throw new Error(`Cannot find module '${normalizedPresetPath}'`);
+        }
+        const _a = (yield Promise.resolve(`${presetModule}`).then(s => __importStar(require(s)))).default, { preset: subPreset } = _a, preset = __rest(_a, ["preset"]);
+        if (subPreset) {
+            console.warn(`Jest can't handle preset chaining. Preset "${subPreset}" will be ignored.`);
+        }
+        return preset;
+    });
+}

package/build/commands/test/index.d.ts

@@ -1,3 +1 @@
-declare const jestRunner: any;
-declare const jestConfig: any;
-declare const argv: string[];
+export {};

package/build/commands/test/index.js

@@ -1,16 +1,43 @@
 "use strict";
-// TODO: remove eslint-disable and eslint-disable-next-line
-/* eslint-disable @typescript-eslint/no-var-requires */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const jestRunner = __importStar(require("jest"));
+const get_config_1 = require("./get-config");
 // Do this as the first thing so that any code reading it knows the right env.
 process.env.BABEL_ENV = 'test';
 process.env.NODE_ENV = 'test';
 process.env.PUBLIC_URL = '';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-const jestRunner = require('jest');
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-const jestConfig = require('../../configs/jest');
 // Makes the script crash on unhandled rejections instead of silently
 // ignoring them. In the future, promise rejections that are not handled will
 // terminate the Node.js process with a non-zero exit code.
@@ -22,5 +49,12 @@ process.on('unhandledRejection', (err) => {
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 const argv = process.argv.slice(3);
-argv.push('--config', JSON.stringify(jestConfig));
-jestRunner.run(argv);
+const runJest = () => __awaiter(void 0, void 0, void 0, function* () {
+    const jestConfig = yield (0, get_config_1.getJestConfig)();
+    argv.push('--config', JSON.stringify(jestConfig));
+    jestRunner.run(argv);
+});
+runJest().catch((error) => {
+    console.error('Error running Jest:', error);
+    process.exit(1);
+});

package/build/plugins/postcss-prefix-selector.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.postCssPrefix = void 0;
 const VisitedRule = Symbol('VisitedRule');
+const ROOT_SELECTOR = ':root';
 const KEYFRAME_RULES = ['keyframes', '-webkit-keyframes', '-moz-keyframes', '-o-keyframes'];
 const postCssPrefix = (options) => {
     const prefix = (options === null || options === void 0 ? void 0 : options.prefix) || '.prefix ';
@@ -25,7 +26,17 @@ const postCssPrefix = (options) => {
                     // если хотя бы один из родителей (кроме root) был посещен, то не добавляем префикс
                     return;
                 }
-                rule.selectors = rule.selectors.map((selector) => `${prefix}${selector}`);
+                rule.selectors = rule.selectors.map((selector) => {
+                    /**
+                     * Оборачивам только самим префиксом без :root.
+                     * Позволяет инкапсулировать css переменные под классом.
+                     * В таком случае они будут доступны в модулях приложений после использования флага keepCssVars.
+                    */
+                    if (selector === ROOT_SELECTOR) {
+                        return prefix;
+                    }
+                    return `${prefix}${selector}`;
+                });
             });
         },
     };