arui-scripts 20.5.1 → 20.6.0

package/.turbo/turbo-test.log

@@ -5,20 +5,20 @@ ts-jest[versions] (WARN) Version 29.7.0 of jest installed has not been tested wi
 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/app-configs/__tests__/update-with-presets.tests.ts (28.168 s)
+PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (29.372 s)
 PASS src/configs/util/__tests__/apply-overrides.tests.ts
-PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (28.742 s)
 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__/compress-with-dcb.test.ts
+PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (30.134 s)
 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/util/__tests__/find-plugin.tests.ts (30.665 s)
+PASS src/plugins/postcss-global-variables/utils/__tests__/parse-variables.tests.ts
+PASS src/configs/util/__tests__/find-plugin.tests.ts (32.384 s)
 
 Test Suites: 11 passed, 11 total
 Tests:       25 passed, 25 total
 Snapshots:   0 total
-Time:        31.544 s
+Time:        33.462 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)
 
+## 20.6.0
+
+### Minor Changes
+
+-   [#374](https://github.com/core-ds/arui-scripts/pull/374) [`e1de841`](https://github.com/core-ds/arui-scripts/commit/e1de841b5c19242801416ba8fb3acf9c7721f481) Thanks [@heymdall-legal](https://github.com/heymdall-legal)! - Добавлена экспериментальная поддержка [react-compiler](https://react.dev/learn/react-compiler/introduction).
+
+    На данный момент **не рекомендуется** использовать её в production проектах.
+
+-   [#384](https://github.com/core-ds/arui-scripts/pull/384) [`64d8412`](https://github.com/core-ds/arui-scripts/commit/64d8412c262a15299cb901501a39100ca78902a9) Thanks [@heymdall-legal](https://github.com/heymdall-legal)! - Добавлена возможность создавать отдельную сборку для wmf модулей для применения css префиксов только к коду модулей
+
+-   [#382](https://github.com/core-ds/arui-scripts/pull/382) [`fb0a02e`](https://github.com/core-ds/arui-scripts/commit/fb0a02ea68d60b1c67ecda72dc4a200c5c91ad23) Thanks [@qrik116](https://github.com/qrik116)! - Добавлена команда `exec` для запуска `node` приложения, чтобы приложение могло получать `signals` от операционной системы
+
+    В частности сигнал завершении работы `SIGTERM`, чтобы была возможность корректно завершить работу приложения и выполнить отключение от баз данных и других ресурсов
+
 ## 20.5.1
 
 ### Patch Changes

package/build/configs/app-configs/get-defaults.js

@@ -54,6 +54,7 @@ function getDefaultAppConfig() {
         // build tuning
         keepPropTypes: false,
         codeLoader: 'swc',
+        experimentalReactCompiler: 'disabled',
         installServerSourceMaps: false,
         disableDevWebpackTypecheck: true,
         jestCodeTransformer: 'swc',

package/build/configs/app-configs/index.js

@@ -7,6 +7,7 @@ const update_with_config_file_1 = require("./update-with-config-file");
 const update_with_env_1 = require("./update-with-env");
 const update_with_package_1 = require("./update-with-package");
 const update_with_presets_1 = require("./update-with-presets");
+const validate_config_1 = require("./validate-config");
 const warn_about_deprecations_1 = require("./warn-about-deprecations");
 require("../util/register-ts-node");
 let tmpConfig = (0, get_defaults_1.getDefaultAppConfig)();
@@ -20,4 +21,5 @@ tmpContext = (0, calculate_dependent_config_1.calculateDependentContext)(tmpConf
 exports.appContext = tmpContext;
 exports.appConfigs = tmpConfig;
 exports.configs = Object.assign(Object.assign({}, exports.appConfigs), exports.appContext);
+(0, validate_config_1.validateConfig)(exports.configs);
 (0, warn_about_deprecations_1.warnAboutDeprecations)(exports.configs);

package/build/configs/app-configs/types.d.ts

@@ -1,5 +1,6 @@
 import { type DevTool, type Shared } from '@rspack/core';
 import { type RspackDevServer } from '@rspack/dev-server';
+import { type PluginOptions as ReactCompilerOptions } from 'babel-plugin-react-compiler';
 /**
  * Конфигурация arui-scripts, которая может быть переопределена приложением
  */
@@ -40,6 +41,7 @@ export type AppConfigs = {
     };
     keepPropTypes: boolean;
     codeLoader: 'babel' | 'tsc' | 'swc';
+    experimentalReactCompiler: 'disabled' | ReactCompilerOptions;
     installServerSourceMaps: boolean;
     disableDevWebpackTypecheck: boolean;
     jestCodeTransformer: 'babel' | 'tsc' | 'swc';
@@ -87,8 +89,10 @@ export type AppConfigs = {
 };
 export type ModuleConfigBase = {
     cssPrefix?: false | string;
+    useSeparateBuild?: boolean;
 };
-type CompatModuleConfigBase = ModuleConfigBase & {
+type CompatModuleConfigBase = {
+    cssPrefix?: false | string;
     entry: string;
     externals?: Record<string, string>;
 };

package/build/configs/app-configs/validate-config.d.ts

@@ -0,0 +1,2 @@
+import { type AppContextWithConfigs } from './types';
+export declare function validateConfig(config: AppContextWithConfigs): void;

package/build/configs/app-configs/validate-config.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateConfig = validateConfig;
+function validateConfig(config) {
+    if (config.experimentalReactCompiler !== 'disabled' && config.codeLoader !== 'swc') {
+        throw new Error('Использование `experimentalReactCompiler` на данный момент поддерживается только с `codeLoader: "swc"`. \nЛибо выключите `experimentalReactCompiler`, либо измените настройку для `codeLoader`.');
+    }
+}

package/build/configs/modules.d.ts

@@ -2,7 +2,7 @@ import * as rspack from '@rspack/core';
 import { type CompatModuleConfig } from './app-configs/types';
 export declare function haveExposedDefaultModules(): Record<string, string> | undefined;
 export declare const MODULES_ENTRY_NAME = "remoteEntry.js";
-export declare function patchMainWebpackConfigForModules(webpackConf: rspack.Configuration): rspack.RspackOptions;
+export declare function patchMainWebpackConfigForModules(webpackConf: rspack.Configuration, mode: 'consumer' | 'provider' | 'both'): rspack.RspackOptions;
 export declare function getCssPrefixForModule(module: CompatModuleConfig): string | undefined;
 export declare function getExposeLoadersFormCompatModules(): {
     test: string;

package/build/configs/modules.js

@@ -39,9 +39,11 @@ function haveExposedDefaultModules() {
     return (_a = app_configs_1.configs.modules) === null || _a === void 0 ? void 0 : _a.exposes;
 }
 exports.MODULES_ENTRY_NAME = 'remoteEntry.js';
-function patchMainWebpackConfigForModules(webpackConf) {
+function patchMainWebpackConfigForModules(webpackConf, mode) {
     var _a;
     /* eslint-disable no-param-reassign */
+    const isConsumer = mode === 'consumer' || mode === 'both';
+    const isProvider = mode === 'provider' || mode === 'both';
     if (app_configs_1.configs.disableModulesSupport) {
         // проект хочет сам разбираться с WMF и прочими вещами, полностью отключаем обработку модулей на своей стороне
         return webpackConf;
@@ -50,16 +52,20 @@ function patchMainWebpackConfigForModules(webpackConf) {
         // делаем TS счастливым, на самом деле module и plugins у нас будут всегда
         return webpackConf;
     }
-    // Добавляем expose loader для библиотек, которые мы хотим вынести в глобальную область видимости
-    webpackConf.module.rules.unshift(...getExposeLoadersFormCompatModules());
+    if (isConsumer) {
+        // Добавляем expose loader для библиотек, которые мы хотим вынести в глобальную область видимости
+        webpackConf.module.rules.unshift(...getExposeLoadersFormCompatModules());
+    }
     if (!app_configs_1.configs.modules || !webpackConf.output || !webpackConf.plugins) {
-        // webpack по умолчанию всегда добавлял runtime для шаринга, даже когда модули не включены.
-        // Rspack этого больше не делает, поэтому добавляем плагин для рантайма самостоятельно
-        webpackConf.plugins.push(new rspack.sharing.ProvideSharedPlugin({ provides: {} }));
+        if (isConsumer) {
+            // webpack по умолчанию всегда добавлял runtime для шаринга, даже когда модули не включены.
+            // Rspack этого больше не делает, поэтому добавляем плагин для рантайма самостоятельно
+            webpackConf.plugins.push(new rspack.sharing.ProvideSharedPlugin({ provides: {} }));
+        }
         return webpackConf;
     }
     const { cssPrefix } = app_configs_1.configs.modules.options || {};
-    if (cssPrefix) {
+    if (cssPrefix && isProvider) {
         addCssPrefix(webpackConf, cssPrefix);
     }
     webpackConf.output.publicPath = haveExposedDefaultModules()
@@ -67,9 +73,9 @@ function patchMainWebpackConfigForModules(webpackConf) {
         : app_configs_1.configs.publicPath;
     webpackConf.plugins.push(new rspack.container.ModuleFederationPlugin({
         name: app_configs_1.configs.modules.name || app_configs_1.configs.normalizedName,
-        filename: app_configs_1.configs.modules.exposes ? exports.MODULES_ENTRY_NAME : undefined,
+        filename: isProvider && app_configs_1.configs.modules.exposes ? exports.MODULES_ENTRY_NAME : undefined,
         shared: app_configs_1.configs.modules.shared,
-        exposes: app_configs_1.configs.modules.exposes,
+        exposes: isProvider ? app_configs_1.configs.modules.exposes : {},
         shareScope: app_configs_1.configs.modules.shareScope,
     }), new turn_off_split_remote_entry_1.TurnOffSplitRemoteEntry(app_configs_1.configs.modules.name || app_configs_1.configs.normalizedName));
     return webpackConf;

package/build/configs/webpack.client.js

@@ -179,7 +179,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
                 // back to the "file" loader at the end of the loader list.
                 oneOf: [
                     // Обработка основного кода приложения
-                    getCodeLoader(mode),
+                    ...getCodeLoader(mode),
                     // обработка ts кода если codeLoader = tsc
                     getTsLoaderIfEnabled(mode),
                     // Обработка внешнего для приложения кода (node_modules)
@@ -367,11 +367,18 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
     } }));
 exports.createSingleClientWebpackConfig = createSingleClientWebpackConfig;
 const createClientWebpackConfig = (mode) => {
-    var _a;
-    const appWebpackConfig = (0, modules_1.patchMainWebpackConfigForModules)((0, exports.createSingleClientWebpackConfig)(mode, app_configs_1.configs.clientEntry));
-    const exposedCompatModules = (_a = app_configs_1.configs.compatModules) === null || _a === void 0 ? void 0 : _a.exposes;
+    var _a, _b, _c;
+    const baseWebpackConfig = [(0, exports.createSingleClientWebpackConfig)(mode, app_configs_1.configs.clientEntry)];
+    if ((_b = (_a = app_configs_1.configs.modules) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.useSeparateBuild) {
+        baseWebpackConfig[0] = (0, modules_1.patchMainWebpackConfigForModules)(baseWebpackConfig[0], 'consumer');
+        baseWebpackConfig.push((0, modules_1.patchMainWebpackConfigForModules)((0, exports.createSingleClientWebpackConfig)(mode, {}, 'wmf'), 'provider'));
+    }
+    else {
+        baseWebpackConfig[0] = (0, modules_1.patchMainWebpackConfigForModules)(baseWebpackConfig[0], 'both');
+    }
+    const exposedCompatModules = (_c = app_configs_1.configs.compatModules) === null || _c === void 0 ? void 0 : _c.exposes;
     if (!exposedCompatModules || Object.keys(exposedCompatModules).length === 0) {
-        return appWebpackConfig;
+        return baseWebpackConfig.length === 1 ? baseWebpackConfig[0] : baseWebpackConfig;
     }
     // Добавляем отдельные конфигурации для compat модулей
     const modulesWebpackConfigs = Object.keys(exposedCompatModules).map((moduleName) => {
@@ -381,30 +388,68 @@ const createClientWebpackConfig = (mode) => {
         }, module.name);
         return (0, modules_1.patchWebpackConfigForCompat)(module, config);
     });
-    return [appWebpackConfig, ...modulesWebpackConfigs];
+    return [...baseWebpackConfig, ...modulesWebpackConfigs];
 };
 exports.createClientWebpackConfig = createClientWebpackConfig;
 function getCodeLoader(mode) {
     var _a, _b, _c;
     if (app_configs_1.configs.codeLoader === 'swc') {
-        return {
-            test: /\.(js|jsx|mjs|ts|tsx|cjs)$/,
-            include: app_configs_1.configs.appSrc,
-            loader: 'builtin:swc-loader',
-            options: Object.assign(Object.assign({}, swc_1.swcClientConfig), { jsc: Object.assign(Object.assign({}, swc_1.swcClientConfig.jsc), { transform: Object.assign(Object.assign({}, (_a = swc_1.swcClientConfig.jsc) === null || _a === void 0 ? void 0 : _a.transform), { react: Object.assign(Object.assign({}, (_c = (_b = swc_1.swcClientConfig.jsc) === null || _b === void 0 ? void 0 : _b.transform) === null || _c === void 0 ? void 0 : _c.react), { refresh: mode === 'dev' }) }) }) }),
-        };
+        const swcOptions = Object.assign(Object.assign({}, swc_1.swcClientConfig), { jsc: Object.assign(Object.assign({}, swc_1.swcClientConfig.jsc), { transform: Object.assign(Object.assign({}, (_a = swc_1.swcClientConfig.jsc) === null || _a === void 0 ? void 0 : _a.transform), { react: Object.assign(Object.assign({}, (_c = (_b = swc_1.swcClientConfig.jsc) === null || _b === void 0 ? void 0 : _b.transform) === null || _c === void 0 ? void 0 : _c.react), { refresh: mode === 'dev' }) }) }) });
+        if (app_configs_1.configs.experimentalReactCompiler !== 'disabled') {
+            return [
+                {
+                    test: /\.(js|mjs|ts|cjs)$/,
+                    include: app_configs_1.configs.appSrc,
+                    loader: 'builtin:swc-loader',
+                    options: swcOptions,
+                },
+                {
+                    test: /\.(jsx|tsx)$/,
+                    include: app_configs_1.configs.appSrc,
+                    use: [
+                        {
+                            loader: 'builtin:swc-loader',
+                            options: swcOptions,
+                        },
+                        {
+                            loader: 'babel-loader',
+                            options: {
+                                plugins: [
+                                    [
+                                        'babel-plugin-react-compiler',
+                                        { target: app_configs_1.configs.experimentalReactCompiler.target },
+                                    ],
+                                    '@babel/plugin-syntax-jsx',
+                                    ['@babel/plugin-syntax-typescript', { isTSX: true }],
+                                ],
+                            },
+                        },
+                    ],
+                },
+            ];
+        }
+        return [
+            {
+                test: /\.(js|jsx|mjs|ts|tsx|cjs)$/,
+                include: app_configs_1.configs.appSrc,
+                loader: 'builtin:swc-loader',
+                options: swcOptions,
+            },
+        ];
     }
-    return {
-        test: app_configs_1.configs.codeLoader === 'tsc' ? /\.(js|jsx|mjs|cjs)$/ : /\.(js|jsx|mjs|ts|tsx|cjs)$/,
-        include: app_configs_1.configs.appSrc,
-        loader: require.resolve('babel-loader'),
-        options: Object.assign(Object.assign({}, babel_client_1.babelClientConfig), { cacheDirectory: mode === 'dev', cacheCompression: false, plugins: [
-                ...babel_client_1.babelClientConfig.plugins,
-                mode === 'dev'
-                    ? [require.resolve('react-refresh/babel'), { skipEnvCheck: true }]
-                    : undefined,
-            ].filter(Boolean) }),
-    };
+    return [
+        {
+            test: app_configs_1.configs.codeLoader === 'tsc' ? /\.(js|jsx|mjs|cjs)$/ : /\.(js|jsx|mjs|ts|tsx|cjs)$/,
+            include: app_configs_1.configs.appSrc,
+            loader: require.resolve('babel-loader'),
+            options: Object.assign(Object.assign({}, babel_client_1.babelClientConfig), { cacheDirectory: mode === 'dev', cacheCompression: false, plugins: [
+                    ...babel_client_1.babelClientConfig.plugins,
+                    mode === 'dev'
+                        ? [require.resolve('react-refresh/babel'), { skipEnvCheck: true }]
+                        : undefined,
+                ].filter(Boolean) }),
+        },
+    ];
 }
 function getTsLoaderIfEnabled(mode) {
     if (app_configs_1.configs.codeLoader !== 'tsc' || !app_configs_1.configs.tsconfig) {

package/build/configs/webpack.server.js

@@ -89,7 +89,7 @@ const createServerConfig = (mode) => ({
             {
                 oneOf: [
                     // Обработка основного кода приложения
-                    getCodeLoader(mode),
+                    ...getCodeLoader(mode),
                     // обработка ts кода если codeLoader = tsc
                     getTsLoaderIfEnabled(mode),
                     // Обработка внешнего для приложения кода (node_modules)
@@ -187,23 +187,60 @@ const createServerConfig = (mode) => ({
 exports.createServerConfig = createServerConfig;
 function getCodeLoader(mode) {
     if (app_configs_1.configs.codeLoader === 'swc') {
-        return {
-            test: /\.(js|jsx|mjs|ts|tsx|cjs)$/,
-            include: app_configs_1.configs.appSrc,
-            loader: 'builtin:swc-loader',
-            options: swc_1.swcServerConfig,
-        };
+        if (app_configs_1.configs.experimentalReactCompiler !== 'disabled') {
+            return [
+                {
+                    test: /\.(js|mjs|ts|cjs)$/,
+                    include: app_configs_1.configs.appSrc,
+                    loader: 'builtin:swc-loader',
+                    options: swc_1.swcServerConfig,
+                },
+                {
+                    test: /\.(jsx|tsx)$/,
+                    include: app_configs_1.configs.appSrc,
+                    use: [
+                        {
+                            loader: 'builtin:swc-loader',
+                            options: swc_1.swcServerConfig,
+                        },
+                        {
+                            loader: 'babel-loader',
+                            options: {
+                                plugins: [
+                                    [
+                                        'babel-plugin-react-compiler',
+                                        { target: app_configs_1.configs.experimentalReactCompiler.target },
+                                    ],
+                                    '@babel/plugin-syntax-jsx',
+                                    ['@babel/plugin-syntax-typescript', { isTSX: true }],
+                                ],
+                            },
+                        },
+                    ],
+                },
+            ];
+        }
+        return [
+            {
+                test: /\.(js|jsx|mjs|ts|tsx|cjs)$/,
+                include: app_configs_1.configs.appSrc,
+                loader: 'builtin:swc-loader',
+                options: swc_1.swcServerConfig,
+            },
+        ];
     }
-    return {
-        test: app_configs_1.configs.codeLoader === 'tsc' ? /\.(js|jsx|mjs|cjs)$/ : /\.(js|jsx|mjs|ts|tsx|cjs)$/,
-        include: app_configs_1.configs.appSrc,
-        loader: require.resolve('babel-loader'),
-        options: Object.assign(Object.assign({}, babel_server_1.config), { 
-            // This is a feature of `babel-loader` for webpack (not Babel itself).
-            // It enables caching results in ./node_modules/.cache/babel-loader/
-            // directory for faster rebuilds.
-            cacheDirectory: mode === 'dev' }),
-    };
+    return [
+        {
+            test: app_configs_1.configs.codeLoader === 'tsc' ? /\.(js|jsx|mjs|cjs)$/ : /\.(js|jsx|mjs|ts|tsx|cjs)$/,
+            include: app_configs_1.configs.appSrc,
+            loader: require.resolve('babel-loader'),
+            options: Object.assign(Object.assign({}, babel_server_1.config), { 
+                // This is a feature of `babel-loader` for webpack (not Babel itself).
+                // It enables caching results in ./node_modules/.cache/babel-loader/
+                // directory for faster rebuilds.
+                cacheDirectory: mode === 'dev' }),
+        },
+    ];
 }
 function getTsLoaderIfEnabled(mode) {
     if (app_configs_1.configs.codeLoader !== 'tsc' || !app_configs_1.configs.tsconfig) {

package/build/templates/start.template.js

@@ -31,7 +31,7 @@ node_memory_limit="$(($max_total_memory / 1024 / 1024 - 100))"
 nginx &
 
 # Start nodejs process
-node --max-old-space-size="$node_memory_limit" ./${app_configs_1.configs.buildPath}/${app_configs_1.configs.serverOutput}
+exec node --max-old-space-size="$node_memory_limit" ./${app_configs_1.configs.buildPath}/${app_configs_1.configs.serverOutput}
 `;
 const envConfigTargetPath = `/src/${app_configs_1.configs.buildPath}/${client_env_config_1.ENV_CONFIG_FILENAME}`;
 const envConfigPath = `/src/${client_env_config_1.ENV_CONFIG_FILENAME}`;