arui-scripts 23.4.0 → 23.5.1

package/.turbo/turbo-test.log

@@ -1,25 +1,25 @@
 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/bin/__tests__/create-cli.tests.ts (35.077 s)
-PASS src/templates/__tests__/dockerfile-templates.tests.ts
-PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (35.512 s)
-PASS src/configs/util/__tests__/create-watch-ignore-regex.tests.ts
+PASS src/templates/__tests__/dockerfile-templates.tests.ts (33.921 s)
+PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (34.001 s)
 PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts
-PASS src/configs/util/__tests__/apply-overrides.tests.ts
+PASS src/bin/__tests__/create-cli.tests.ts
+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-package.tests.ts
 PASS src/configs/util/__tests__/compress-with-dcb.test.ts
 PASS src/configs/util/__tests__/get-polyfills.tests.ts
 PASS src/plugins/postcss-global-variables/utils/__tests__/parse-variables.tests.ts
 PASS src/plugins/postcss-global-variables/utils/__tests__/get-media-query-name.tests.ts
 PASS src/configs/app-configs/__tests__/validate-settings-keys.tests.ts
-PASS src/configs/__tests__/webpack-client-modules.tests.ts (11.464 s)
-PASS src/configs/util/__tests__/find-plugin.tests.ts (47.931 s)
+PASS src/configs/__tests__/webpack-client-modules.tests.ts (12.54 s)
+PASS src/configs/util/__tests__/find-plugin.tests.ts (48.247 s)
 A worker process has failed to exit gracefully and has been force exited. This is likely caused by tests leaking due to improper teardown. Try running with --detectOpenHandles to find leaks. Active timers can also cause this, ensure that .unref() was called on them.
 
 Test Suites: 15 passed, 15 total
-Tests:       42 passed, 42 total
+Tests:       45 passed, 45 total
 Snapshots:   0 total
-Time:        49.677 s
+Time:        50.316 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # arui-scripts
 
+## 23.5.1
+
+### Patch Changes
+
+-   [#574](https://github.com/core-ds/arui-scripts/pull/574) [`2e48012`](https://github.com/core-ds/arui-scripts/commit/2e4801232e988fc8da639faac6e6e5fd716118e8) Thanks [@artemgafarov66](https://github.com/artemgafarov66)! - Исправлено создание ссылки на Yarn при сборке Docker-образа, если бинарник уже существует.
+
+## 23.5.0
+
+### Minor Changes
+
+-   [#571](https://github.com/core-ds/arui-scripts/pull/571) [`9c548f5`](https://github.com/core-ds/arui-scripts/commit/9c548f51c44d6198c8a98dd4b03f6a3a372324b7) Thanks [@syn7xx](https://github.com/syn7xx)! - Добавлен автоматический symlink на yarn бинарник в Dockerfile при использовании yarn 2+ с yarnPath в .yarnrc.yml. Это исправляет ошибку `yarn: not found` в Docker-образах (ни полный, ни slim-образ не содержат yarn).
+
 ## 23.4.0
 
 ### Minor Changes

package/build/commands/util/yarn.d.ts

@@ -2,4 +2,16 @@ type YarnVersion = '1' | '2+' | 'unavailable';
 export declare function getYarnVersion(): YarnVersion;
 export declare function getPruningCommand(): string;
 export declare function getInstallProductionCommand(): string;
+/**
+ * Читает значение yarnPath из .yarnrc.yml.
+ * Возвращает путь к бинарнику yarn (например .yarn/releases/yarn-4.18.0.cjs) или null.
+ */
+export declare function getYarnPathFromRc(): string | null;
+/**
+ * Возвращает команду для создания symlink на yarn бинарник в Docker-образе.
+ * Используется при yarn 2+ с yarnPath в .yarnrc.yml, чтобы yarn был доступен
+ * в PATH внутри Docker-образов (где yarn не установлен глобально).
+ * Возвращает пустую строку, если symlink не нужен.
+ */
+export declare function getYarnBinSymlinkCommand(): string;
 export {};

package/build/commands/util/yarn.js

@@ -6,6 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getYarnVersion = getYarnVersion;
 exports.getPruningCommand = getPruningCommand;
 exports.getInstallProductionCommand = getInstallProductionCommand;
+exports.getYarnPathFromRc = getYarnPathFromRc;
+exports.getYarnBinSymlinkCommand = getYarnBinSymlinkCommand;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const shelljs_1 = __importDefault(require("shelljs"));
 const app_configs_1 = require("../../configs/app-configs");
 function getYarnVersion() {
@@ -53,3 +57,41 @@ function getInstallProductionCommand() {
         }
     }
 }
+/**
+ * Читает значение yarnPath из .yarnrc.yml.
+ * Возвращает путь к бинарнику yarn (например .yarn/releases/yarn-4.18.0.cjs) или null.
+ */
+function getYarnPathFromRc() {
+    const rcPath = path_1.default.join(app_configs_1.configs.cwd, '.yarnrc.yml');
+    if (!shelljs_1.default.test('-f', rcPath)) {
+        return null;
+    }
+    let content;
+    try {
+        content = fs_1.default.readFileSync(rcPath, 'utf8');
+    }
+    catch (_a) {
+        return null;
+    }
+    // Ищем строку вида: yarnPath: .yarn/releases/yarn-4.18.0.cjs
+    // Значение может быть в кавычках или без
+    const match = content.match(/^\s*yarnPath:\s*['"]?([^'"\s]+)['"]?\s*$/m);
+    return match ? match[1] : null;
+}
+/**
+ * Возвращает команду для создания symlink на yarn бинарник в Docker-образе.
+ * Используется при yarn 2+ с yarnPath в .yarnrc.yml, чтобы yarn был доступен
+ * в PATH внутри Docker-образов (где yarn не установлен глобально).
+ * Возвращает пустую строку, если symlink не нужен.
+ */
+function getYarnBinSymlinkCommand() {
+    if (getYarnVersion() !== '2+') {
+        return '';
+    }
+    const yarnPath = getYarnPathFromRc();
+    if (!yarnPath) {
+        return '';
+    }
+    // WORKDIR в Dockerfile = /src
+    return `ln -sf /src/${yarnPath} /usr/local/bin/yarn && \\\n    `;
+}

package/build/templates/dockerfile-compiled.template.js

@@ -6,6 +6,7 @@ const app_configs_1 = require("../configs/app-configs");
 const apply_overrides_1 = require("../configs/util/apply-overrides");
 const installProductionCommand = (0, yarn_1.getInstallProductionCommand)();
 const yarnVersion = (0, yarn_1.getYarnVersion)();
+const yarnBinSymlinkCommand = (0, yarn_1.getYarnBinSymlinkCommand)();
 const { nginx } = app_configs_1.configs;
 // В зависимости от используемого мендежера зависимостей для их установки нужно копировать разный набор файлов
 const filesRequiredToInstallDependencies = [
@@ -33,7 +34,7 @@ ${filesRequiredToInstallDependencies
     .map((file) => `ADD --chown=nginx:nginx ${file} /src/${file}`)
     .join('\n')}
 
-RUN ${installProductionCommand}  && \\
+RUN ${yarnBinSymlinkCommand}${installProductionCommand}  && \\
     ${yarnVersion === 'unavailable' ? 'npm cache clean --force' : 'yarn cache clean --all'}
 
 ADD --chown=nginx:nginx . /src

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arui-scripts",
-  "version": "23.4.0",
+  "version": "23.5.1",
   "main": "./build/index.js",
   "typings": "./build/index.d.ts",
   "exports": {