arui-scripts 14.5.0-feat-modules.1 → 14.5.0

package/CHANGELOG.md

@@ -1,18 +1,9 @@
-# [14.5.0-feat-modules.1](https://github.com/core-ds/arui-scripts/compare/v14.4.1...v14.5.0-feat-modules.1) (2023-05-15)
-
-
-### Bug Fixes
-
-* **build:** correctly report build sized for multiple entrypoints ([cc41419](https://github.com/core-ds/arui-scripts/commit/cc414195915bdbd24867c45e291991568ac6e741))
-* **webpack:** turn off performance hints from webpack ([d43f2c8](https://github.com/core-ds/arui-scripts/commit/d43f2c88b73176a173de570da8321b1f8cccc611))
+# [14.5.0](https://github.com/core-ds/arui-scripts/compare/v14.4.1...v14.5.0) (2023-05-16)
 
 
 ### Features
 
-* add initial modules implementation ([0e2093e](https://github.com/core-ds/arui-scripts/commit/0e2093e350af3a3abb557d15b075b43ce96efe67))
-* add modules build support ([2a0f5c1](https://github.com/core-ds/arui-scripts/commit/2a0f5c10ee8fb496228e7b2e42d1a94727c895e5))
 * add new `start:prod` command ([2944887](https://github.com/core-ds/arui-scripts/commit/2944887758527e65fdd0e11ea5bb7e59afa213c1))
-* **modules:** automaticaly generate expose for embedded modules ([5ecadfc](https://github.com/core-ds/arui-scripts/commit/5ecadfca7ebfbb15a0b65331c1db27f091f4173c))
 
 ## [14.4.1](https://github.com/core-ds/arui-scripts/compare/v14.4.0...v14.4.1) (2023-05-07)
 

package/build/commands/build/build-wrapper.d.ts

@@ -1,8 +1,8 @@
 import webpack from 'webpack';
 type BuildResult = {
-    stats: webpack.Stats | webpack.MultiStats;
+    stats: webpack.Stats;
     warnings: string[];
     previousFileSizes: unknown;
 };
-declare function build(config: webpack.Configuration | webpack.Configuration[], previousFileSizes?: unknown): Promise<BuildResult>;
+declare function build(config: webpack.Configuration, previousFileSizes?: unknown): Promise<BuildResult>;
 export default build;

package/build/commands/build/client.js

@@ -22,16 +22,16 @@ console.log(chalk_1.default.magenta('Building client...'));
     else {
         console.log(chalk_1.default.green('Client compiled successfully.\n'));
     }
-    function printOutputSizes(webpackConfig, stats) {
+    function printOutputSizes(webpackConfig) {
         var _a;
         const sizes = (0, client_assets_sizes_1.calculateAssetsSizes)(stats, (_a = webpackConfig === null || webpackConfig === void 0 ? void 0 : webpackConfig.output) === null || _a === void 0 ? void 0 : _a.path);
         (0, client_assets_sizes_1.printAssetsSizes)(sizes);
     }
     if (Array.isArray(webpack_client_prod_1.default)) {
-        webpack_client_prod_1.default.forEach((conf, index) => printOutputSizes(conf, stats.stats[index]));
+        webpack_client_prod_1.default.forEach(printOutputSizes);
     }
     else {
-        printOutputSizes(webpack_client_prod_1.default, stats);
+        printOutputSizes(webpack_client_prod_1.default);
     }
 })
     .catch((err) => {

package/build/commands/bundle-analyze/index.js

@@ -25,9 +25,11 @@ const app_configs_1 = __importDefault(require("../../configs/app-configs"));
         statsFilename: app_configs_1.default.statsOutputPath,
     });
     let clientWebpackConfig = webpack_client_prod_1.default;
-    // В случае, если у пользователя несколько конфигов для клиента - запускаем bundle analyzer только для первого
-    let singleClientConfig = Array.isArray(webpack_client_prod_1.default) ? webpack_client_prod_1.default[0] : webpack_client_prod_1.default;
-    (_a = singleClientConfig.plugins) === null || _a === void 0 ? void 0 : _a.push(plugin);
-    singleClientConfig.output.path = tmpDir;
-    (0, webpack_1.default)(singleClientConfig).run(() => { });
+    if (Array.isArray(webpack_client_prod_1.default)) {
+        // В случае, если у пользователя несколько конфигов для клиента - запускаем bundle analyzer только для первого
+        clientWebpackConfig = webpack_client_prod_1.default[0];
+    }
+    (_a = clientWebpackConfig.plugins) === null || _a === void 0 ? void 0 : _a.push(plugin);
+    clientWebpackConfig.output.path = tmpDir;
+    (0, webpack_1.default)(clientWebpackConfig).run(() => { });
 }))();

package/build/commands/changelog/index.js

@@ -26,14 +26,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const readline_1 = __importDefault(require("readline"));
-const app_configs_1 = __importDefault(require("../../configs/app-configs"));
+const get_defaults_1 = require("../../configs/app-configs/get-defaults");
 const { readFile, rename, unlink } = fs_1.promises;
 /**
  * Сюда пайплайн Jenkins складывает соответствующие части описания версии. Не получается использовать
  * переменные окружения, т.к. `standard-version` запускает хуки через `child_process.exec`, не передавая туда
  * ни аргументы ни переменные окружения.
  */
-const { appNodeModulesBin, changelogPath, changelogTmpPath, changelogFeaturesPath, changelogBugfixesPath, changelogBreakingChangesPath } = app_configs_1.default;
+const { appNodeModulesBin, changelogPath, changelogTmpPath, changelogFeaturesPath, changelogBugfixesPath, changelogBreakingChangesPath } = (0, get_defaults_1.getDefaults)();
 // Пример заголовка – `## [50.1.0](http://git.moscow.alfaintra.net/...) (2022-07-27)`.
 const changelogHeaderRegExp = /^###? \[\d+\.\d+\.\d+]\([^)]+\) \(\d{4}-\d{2}-\d{2}\)/;
 (() => __awaiter(void 0, void 0, void 0, function* () {

package/build/commands/start/client.js

@@ -4,5 +4,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const webpack_client_dev_1 = __importDefault(require("../../configs/webpack.client.dev"));
-const run_client_dev_derver_1 = require("../util/run-client-dev-derver");
-(0, run_client_dev_derver_1.runClientDevServer)(webpack_client_dev_1.default);
+const run_client_dev_server_1 = require("../util/run-client-dev-server");
+(0, run_client_dev_server_1.runClientDevServer)(webpack_client_dev_1.default);

package/build/commands/start-prod/client.js

@@ -4,5 +4,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const webpack_client_prod_1 = __importDefault(require("../../configs/webpack.client.prod"));
-const run_client_dev_derver_1 = require("../util/run-client-dev-derver");
-(0, run_client_dev_derver_1.runClientDevServer)(webpack_client_prod_1.default);
+const run_client_dev_server_1 = require("../util/run-client-dev-server");
+(0, run_client_dev_server_1.runClientDevServer)(webpack_client_prod_1.default);

package/build/commands/util/{run-client-dev-derver.d.ts → run-client-dev-server.d.ts}

@@ -1,2 +1,2 @@
 import { Configuration } from 'webpack';
-export declare function runClientDevServer(configuration: Configuration | Configuration[]): Promise<void>;
+export declare function runClientDevServer(configuration: Configuration): Promise<void>;

package/build/commands/util/{run-client-dev-derver.js → run-client-dev-server.js}

@@ -20,7 +20,10 @@ const print_compiler_output_1 = __importDefault(require("../start/print-compiler
 const WebpackDevServerUtils_1 = require("react-dev-utils/WebpackDevServerUtils");
 function runClientDevServer(configuration) {
     return __awaiter(this, void 0, void 0, function* () {
-        const clientCompiler = (0, webpack_1.default)(configuration); // типы вебпака не умеют выбирать между конфигурациями и массивом конфигураций
+        const clientCompiler = (0, webpack_1.default)(configuration);
+        // не резолвиться constructor(config: WebpackDevServer.Configuration, webpack?: webpack.Compiler | webpack.MultiCompiler);
+        // clientCompiler: webpack.Compiler
+        // @ts-ignore
         const clientDevServer = new webpack_dev_server_1.default(dev_server_1.default, clientCompiler);
         clientCompiler.hooks.invalid.tap('client', () => console.log('Compiling client...'));
         clientCompiler.hooks.done.tap('client', (stats) => (0, print_compiler_output_1.default)('Client', stats));

package/build/configs/app-configs/available-package-settings.d.ts

@@ -0,0 +1,8 @@
+import { AppConfigs } from './types';
+/**
+ * Эти ключи из конфига будут обновляться из package.json при их наличии
+ */
+export declare const availablePackageSettings: readonly ["dockerRegistry", "baseDockerImage", "serverEntry", "buildPath", "assetsPath", "additionalBuildPath", "nginxRootPath", "runFromNonRootUser", "archiveName", "serverOutput", "clientPolyfillsEntry", "clientEntry", "keepPropTypes", "devSourceMaps", "useTscLoader", "useServerHMR", "webpack4Compatibility", "clientServerPort", "serverPort", "debug", "statsOutputFilename", "componentsTheme", "keepCssVars", "removeDevDependenciesDuringDockerBuild"];
+type ArrayElementType<ArrayType extends ReadonlyArray<unknown>> = ArrayType[number];
+export type PackageSettings = Partial<Pick<AppConfigs, ArrayElementType<typeof availablePackageSettings>>>;
+export {};

package/build/configs/app-configs/available-package-settings.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.availablePackageSettings = void 0;
+/**
+ * Эти ключи из конфига будут обновляться из package.json при их наличии
+ */
+exports.availablePackageSettings = [
+    'dockerRegistry',
+    'baseDockerImage',
+    'serverEntry',
+    'buildPath',
+    'assetsPath',
+    'additionalBuildPath',
+    'nginxRootPath',
+    'runFromNonRootUser',
+    'archiveName',
+    'serverOutput',
+    'clientPolyfillsEntry',
+    'clientEntry',
+    'keepPropTypes',
+    'devSourceMaps',
+    'useTscLoader',
+    'useServerHMR',
+    'webpack4Compatibility',
+    'clientServerPort',
+    'serverPort',
+    'debug',
+    'statsOutputFilename',
+    'componentsTheme',
+    'keepCssVars',
+    'removeDevDependenciesDuringDockerBuild'
+];

package/build/configs/app-configs/calculate-dependent-config.d.ts

@@ -1,53 +1,13 @@
-import { AppConfigs, AppContext } from './types';
+import { AppConfigs } from './types';
 /**
  * Обновление ключей конфига, зависящих от других. Это нужно делать в самый последний момент
  */
-export declare function calculateDependentConfig(config: AppConfigs): {
+export declare function calculateDependentConfig(config: AppConfigs): AppConfigs & {
+    publicPath: string;
+    serverOutputPath: string;
+    clientOutputPath: string;
     clientPolyfillsEntry: string[];
-    clientServerPort: number;
-    serverPort: number;
-    debug: boolean;
-    devSourceMaps: string;
-    useServerHMR: boolean;
-    presets: string | null;
-    buildPath: string;
-    assetsPath: string;
-    additionalBuildPath: string[];
-    statsOutputFilename: string;
-    serverEntry: string | string[] | Record<string, string | string[]>;
-    serverOutput: string;
-    clientEntry: string;
-    dockerRegistry: string;
-    baseDockerImage: string;
-    nginxRootPath: string;
-    runFromNonRootUser: boolean;
-    removeDevDependenciesDuringDockerBuild: boolean;
-    archiveName: string;
-    keepPropTypes: boolean;
-    useTscLoader: boolean;
-    webpack4Compatibility: boolean;
-    installServerSourceMaps: boolean;
-    componentsTheme: string | undefined;
-    keepCssVars: boolean;
-    embeddedModules: {
-        shared?: {
-            [libraryName: string]: string;
-        } | undefined;
-        exposes?: {
-            [moduleId: string]: {
-                entry: string;
-                embeddedConfig?: Record<string, string> | undefined;
-                cssPrefix?: string | false | undefined;
-            };
-        } | undefined;
-    } | null;
-    mfModules: {
-        name?: string | undefined;
-        shared: any;
-        exposes?: Record<string, string> | undefined;
-    } | null;
+    statsOutputPath: string;
+    watchIgnorePath: string[];
+    babelRuntimeVersion: string;
 };
-/**
- * Обновление контекста в зависимости от ключей конфига
- */
-export declare function calculateDependentContext(config: AppConfigs, context: AppContext): AppContext;

package/build/configs/app-configs/calculate-dependent-config.js

@@ -3,22 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateDependentContext = exports.calculateDependentConfig = void 0;
+exports.calculateDependentConfig = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const lodash_merge_1 = __importDefault(require("lodash.merge"));
 const get_polyfills_1 = require("../util/get-polyfills");
 const resolve_1 = require("../util/resolve");
 /**
  * Обновление ключей конфига, зависящих от других. Это нужно делать в самый последний момент
  */
 function calculateDependentConfig(config) {
-    return Object.assign(Object.assign({}, config), { clientPolyfillsEntry: (0, get_polyfills_1.getPolyfills)(config) });
-}
-exports.calculateDependentConfig = calculateDependentConfig;
-/**
- * Обновление контекста в зависимости от ключей конфига
- */
-function calculateDependentContext(config, context) {
     let babelRuntimeVersion;
     try {
         // В проекте может стоять babel/runtime отличный от того, что установлен как зависимость arui-scripts.
@@ -26,12 +20,20 @@ function calculateDependentContext(config, context) {
         // Поэтому мы читаем версию того babel/runtime, который установлен в проекте.
         // Так же мы не можем использовать require для получения контента из babel/runtime/package.json,
         // потому что webpack.cache будет ругаться на то, что мы пытаемся импортировать файлы НЕ из своего node_modules.
-        const pathToProjectBabelRuntime = (0, resolve_1.resolveNodeModuleRelativeTo)(context.cwd, '@babel/runtime/package.json');
+        const pathToProjectBabelRuntime = (0, resolve_1.resolveNodeModuleRelativeTo)(config.cwd, '@babel/runtime/package.json');
         babelRuntimeVersion = JSON.parse(fs_1.default.readFileSync(pathToProjectBabelRuntime, 'utf8')).version;
     }
     catch (e) {
         babelRuntimeVersion = require('@babel/runtime/package.json').version;
     }
-    return Object.assign(Object.assign({}, context), { publicPath: `${config.assetsPath}/`, serverOutputPath: path_1.default.resolve(context.cwd, config.buildPath), clientOutputPath: path_1.default.resolve(context.cwd, config.buildPath, config.assetsPath), statsOutputPath: path_1.default.resolve(context.cwd, config.buildPath, config.statsOutputFilename), watchIgnorePath: ['node_modules', config.buildPath], babelRuntimeVersion });
+    return (0, lodash_merge_1.default)(config, {
+        publicPath: `${config.assetsPath}/`,
+        serverOutputPath: path_1.default.resolve(config.cwd, config.buildPath),
+        clientOutputPath: path_1.default.resolve(config.cwd, config.buildPath, config.assetsPath),
+        clientPolyfillsEntry: (0, get_polyfills_1.getPolyfills)(config),
+        statsOutputPath: path_1.default.resolve(config.cwd, config.buildPath, config.statsOutputFilename),
+        watchIgnorePath: ['node_modules', config.buildPath],
+        babelRuntimeVersion,
+    });
 }
-exports.calculateDependentContext = calculateDependentContext;
+exports.calculateDependentConfig = calculateDependentConfig;

package/build/configs/app-configs/get-defaults.d.ts

@@ -1,3 +1,2 @@
-import { AppConfigs, AppContext } from './types';
-export declare function getDefaultAppConfig(): AppConfigs;
-export declare function getDefaultAppContext(): AppContext;
+import { AppConfigs } from './types';
+export declare function getDefaults(): AppConfigs;

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

@@ -3,57 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultAppContext = exports.getDefaultAppConfig = void 0;
+exports.getDefaults = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const resolve_1 = require("../util/resolve");
-const CWD = process.cwd();
-const absoluteSrcPath = path_1.default.resolve(CWD, 'src');
-function getDefaultAppConfig() {
-    return {
-        /// general settings
-        clientServerPort: 8080,
-        serverPort: 3000,
-        debug: false,
-        devSourceMaps: 'eval',
-        useServerHMR: false,
-        presets: null,
-        // paths
-        buildPath: '.build',
-        assetsPath: 'assets',
-        additionalBuildPath: ['config'],
-        statsOutputFilename: 'stats.json',
-        serverEntry: path_1.default.resolve(absoluteSrcPath, 'server/index'),
-        serverOutput: 'server.js',
-        clientPolyfillsEntry: null,
-        clientEntry: path_1.default.resolve(absoluteSrcPath, 'index'),
-        // docker compilation configs
-        dockerRegistry: '',
-        baseDockerImage: 'alfabankui/arui-scripts:latest',
-        nginxRootPath: '/src',
-        runFromNonRootUser: true,
-        removeDevDependenciesDuringDockerBuild: true,
-        // archive compilation configs
-        archiveName: 'build.tar',
-        // build tuning
-        keepPropTypes: false,
-        useTscLoader: false,
-        webpack4Compatibility: false,
-        installServerSourceMaps: false,
-        // CSS
-        componentsTheme: undefined,
-        keepCssVars: false,
-        // Modules
-        embeddedModules: null,
-        mfModules: null,
-    };
-}
-exports.getDefaultAppConfig = getDefaultAppConfig;
-function getDefaultAppContext() {
+function getDefaults() {
+    const CWD = process.cwd();
     const appPackage = JSON.parse(fs_1.default.readFileSync(path_1.default.join(CWD, 'package.json'), 'utf8'));
     if (appPackage['arui-scripts']) {
         throw Error('arui-scripts in package.json is not supported. Use aruiScripts instead.');
     }
+    const absoluteSrcPath = path_1.default.resolve(CWD, 'src');
     const absoluteNodeModulesPath = path_1.default.resolve(CWD, 'node_modules');
     const absoluteNodeModulesBinPath = path_1.default.resolve(absoluteNodeModulesPath, '.bin');
     const projectTsConfigPath = path_1.default.join(CWD, 'tsconfig.json');
@@ -65,22 +25,47 @@ function getDefaultAppContext() {
     return {
         appPackage,
         name: appPackage.name,
-        normalizedName: appPackage.name.replace(/-/g, '_'),
         version: appPackage.version,
+        dockerRegistry: '',
+        baseDockerImage: 'alfabankui/arui-scripts:latest',
         // general paths
         cwd: CWD,
         appSrc: absoluteSrcPath,
         appNodeModules: absoluteNodeModulesPath,
         appNodeModulesBin: absoluteNodeModulesBinPath,
-        overridesPath: overridesPath ? [overridesPath] : [],
-        // tools availability
+        buildPath: '.build',
+        assetsPath: 'assets',
+        additionalBuildPath: ['config'],
+        nginxRootPath: '/src',
+        runFromNonRootUser: true,
+        archiveName: 'build.tar',
         babelRuntimeVersion: '7.0.0-beta.0',
-        useYarn: fs_1.default.existsSync(yarnLockFilePath),
+        // server compilation configs
+        serverEntry: path_1.default.resolve(absoluteSrcPath, 'server/index'),
+        serverOutput: 'server.js',
+        // client compilation configs
+        clientPolyfillsEntry: null,
+        clientEntry: path_1.default.resolve(absoluteSrcPath, 'index'),
+        keepPropTypes: false,
         // compilation configs locations
         tsconfig: fs_1.default.existsSync(projectTsConfigPath) ? projectTsConfigPath : null,
         localNginxConf: fs_1.default.existsSync(nginxConfFilePath) ? nginxConfFilePath : null,
         localDockerfile: fs_1.default.existsSync(dockerfileFilePath) ? dockerfileFilePath : null,
         localStartScript: fs_1.default.existsSync(startScriptFilePath) ? startScriptFilePath : null,
+        devSourceMaps: 'eval',
+        useTscLoader: false,
+        useServerHMR: false,
+        webpack4Compatibility: false,
+        useYarn: fs_1.default.existsSync(yarnLockFilePath),
+        clientServerPort: 8080,
+        serverPort: 3000,
+        installServerSourceMaps: false,
+        debug: false,
+        overridesPath: overridesPath ? [overridesPath] : [],
+        statsOutputFilename: 'stats.json',
+        removeDevDependenciesDuringDockerBuild: true,
+        componentsTheme: undefined,
+        keepCssVars: false,
         // Эти пути зависят от других настроек, которые могут быть переопределены пользователем
         publicPath: '',
         serverOutputPath: '',
@@ -95,4 +80,4 @@ function getDefaultAppContext() {
         changelogBreakingChangesPath: path_1.default.resolve(CWD, './changelog_breaking_changes.tmp'),
     };
 }
-exports.getDefaultAppContext = getDefaultAppContext;
+exports.getDefaults = getDefaults;

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

@@ -1,6 +1,4 @@
 import '../util/register-ts-node';
-import { AppConfigs, AppContext, AppContextWithConfigs } from './types';
-export declare const appContext: AppContext;
-export declare const appConfigs: AppConfigs;
-export declare const configs: AppContextWithConfigs;
-export default configs;
+import { AppConfigs } from './types';
+declare let config: AppConfigs;
+export default config;

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configs = exports.appConfigs = exports.appContext = void 0;
 require("../util/register-ts-node");
 const get_defaults_1 = require("./get-defaults");
 const update_with_env_1 = require("./update-with-env");
@@ -8,15 +7,10 @@ const update_with_package_1 = require("./update-with-package");
 const update_with_presets_1 = require("./update-with-presets");
 const calculate_dependent_config_1 = require("./calculate-dependent-config");
 const update_with_config_file_1 = require("./update-with-config-file");
-let tmpConfig = (0, get_defaults_1.getDefaultAppConfig)();
-let tmpContext = (0, get_defaults_1.getDefaultAppContext)();
-tmpConfig = (0, update_with_presets_1.updateWithPresets)(tmpConfig, tmpContext);
-tmpConfig = (0, update_with_package_1.updateWithPackage)(tmpConfig, tmpContext);
-tmpConfig = (0, update_with_config_file_1.updateWithConfigFile)(tmpConfig, tmpContext);
-tmpConfig = (0, update_with_env_1.updateWithEnv)(tmpConfig);
-tmpConfig = (0, calculate_dependent_config_1.calculateDependentConfig)(tmpConfig);
-tmpContext = (0, calculate_dependent_config_1.calculateDependentContext)(tmpConfig, tmpContext);
-exports.appContext = tmpContext;
-exports.appConfigs = tmpConfig;
-exports.configs = Object.assign(Object.assign({}, exports.appConfigs), exports.appContext);
-exports.default = exports.configs;
+let config = (0, get_defaults_1.getDefaults)();
+config = (0, update_with_presets_1.updateWithPresets)(config);
+config = (0, update_with_package_1.updateWithPackage)(config);
+config = (0, update_with_config_file_1.updateWithConfigFile)(config);
+config = (0, update_with_env_1.updateWithEnv)(config);
+config = (0, calculate_dependent_config_1.calculateDependentConfig)(config);
+exports.default = config;

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

@@ -1,74 +1,43 @@
-/**
- * Конфигурация arui-scripts, которая может быть переопределена приложением
- */
 export type AppConfigs = {
-    clientServerPort: number;
-    serverPort: number;
-    debug: boolean;
-    devSourceMaps: string;
-    useServerHMR: boolean;
-    presets: string | null;
-    buildPath: string;
-    assetsPath: string;
-    additionalBuildPath: string[];
-    statsOutputFilename: string;
-    serverEntry: string | string[] | Record<string, string | string[]>;
-    serverOutput: string;
-    clientPolyfillsEntry: null | string | string[];
-    clientEntry: string;
-    dockerRegistry: string;
-    baseDockerImage: string;
-    nginxRootPath: string;
-    runFromNonRootUser: boolean;
-    removeDevDependenciesDuringDockerBuild: boolean;
-    archiveName: string;
-    keepPropTypes: boolean;
-    useTscLoader: boolean;
-    webpack4Compatibility: boolean;
-    installServerSourceMaps: boolean;
-    componentsTheme: string | undefined;
-    keepCssVars: boolean;
-    embeddedModules: {
-        shared?: {
-            [libraryName: string]: string;
-        };
-        exposes?: {
-            [moduleId: string]: EmbeddedModuleConfigBase;
-        };
-    } | null;
-    mfModules: {
-        name?: string;
-        shared: any;
-        exposes?: Record<string, string>;
-    } | null;
-};
-type EmbeddedModuleConfigBase = {
-    entry: string;
-    embeddedConfig?: Record<string, string>;
-    cssPrefix?: false | string;
-};
-export type EmbeddedModuleConfig = EmbeddedModuleConfigBase & {
-    name: string;
-};
-/**
- * Внутренний контекст arui-scripts
- */
-export type AppContext = {
     appPackage: any;
     name: string;
-    normalizedName: string;
     version: string;
+    dockerRegistry: string;
+    baseDockerImage: string;
     cwd: string;
     appSrc: string;
     appNodeModules: string;
     appNodeModulesBin: string;
+    buildPath: string;
+    assetsPath: string;
+    additionalBuildPath: string[];
+    nginxRootPath: string;
+    runFromNonRootUser: boolean;
+    archiveName: string;
     babelRuntimeVersion: string;
-    useYarn: boolean;
+    serverEntry: string | string[] | Record<string, string | string[]>;
+    serverOutput: string;
+    clientPolyfillsEntry: null | string | string[];
+    clientEntry: string;
+    keepPropTypes: boolean;
     tsconfig: string | null;
     localNginxConf: string | null;
     localDockerfile: string | null;
     localStartScript: string | null;
+    devSourceMaps: string;
+    useTscLoader: boolean;
+    useServerHMR: boolean;
+    webpack4Compatibility: boolean;
+    useYarn: boolean;
+    clientServerPort: number;
+    serverPort: number;
+    installServerSourceMaps: boolean;
+    debug: boolean;
     overridesPath: string[];
+    statsOutputFilename: string;
+    removeDevDependenciesDuringDockerBuild: boolean;
+    componentsTheme: string | undefined;
+    keepCssVars: boolean;
     publicPath: string;
     serverOutputPath: string;
     clientOutputPath: string;
@@ -80,6 +49,3 @@ export type AppContext = {
     changelogBugfixesPath: string;
     changelogBreakingChangesPath: string;
 };
-export type AppContextWithConfigs = AppContext & AppConfigs;
-export type PackageSettings = Partial<AppConfigs>;
-export {};

package/build/configs/app-configs/update-with-config-file.d.ts

@@ -1,2 +1,2 @@
-import { AppConfigs, AppContext } from './types';
-export declare function updateWithConfigFile(config: AppConfigs, context: AppContext): any;
+import { AppConfigs } from './types';
+export declare function updateWithConfigFile(config: AppConfigs): AppConfigs;

package/build/configs/app-configs/update-with-config-file.js

@@ -5,18 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWithConfigFile = void 0;
 const path_1 = __importDefault(require("path"));
+const lodash_merge_1 = __importDefault(require("lodash.merge"));
 const resolve_1 = require("../util/resolve");
-const validate_settings_keys_1 = require("./validate-settings-keys");
-function updateWithConfigFile(config, context) {
-    const appConfigPath = (0, resolve_1.tryResolve)(path_1.default.join(context.cwd, '/arui-scripts.config'));
+const validate_settings_keys_1 = __importDefault(require("./validate-settings-keys"));
+const available_package_settings_1 = require("./available-package-settings");
+function updateWithConfigFile(config) {
+    const appConfigPath = (0, resolve_1.tryResolve)(path_1.default.join(config.cwd, '/arui-scripts.config'));
     if (appConfigPath) {
         let appSettings = require(appConfigPath);
         if (appSettings.__esModule) {
             // ts-node импортирует esModules, из них надо вытягивать default именно так
             appSettings = appSettings.default;
         }
-        (0, validate_settings_keys_1.validateSettingsKeys)(config, appSettings, appConfigPath);
-        return Object.assign(Object.assign({}, config), appSettings);
+        (0, validate_settings_keys_1.default)(available_package_settings_1.availablePackageSettings, appSettings);
+        config = (0, lodash_merge_1.default)(config, appSettings);
     }
     return config;
 }

package/build/configs/app-configs/update-with-env.js

@@ -1,7 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWithEnv = void 0;
-const validate_settings_keys_1 = require("./validate-settings-keys");
+const lodash_merge_1 = __importDefault(require("lodash.merge"));
+const validate_settings_keys_1 = __importDefault(require("./validate-settings-keys"));
+const available_package_settings_1 = require("./available-package-settings");
 function updateWithEnv(config) {
     if (!process.env.ARUI_SCRIPTS_CONFIG) {
         return config;
@@ -9,8 +14,8 @@ function updateWithEnv(config) {
     try {
         console.warn('Используйте ARUI_SCRIPTS_CONFIG только для отладки');
         const envSettings = JSON.parse(process.env.ARUI_SCRIPTS_CONFIG);
-        (0, validate_settings_keys_1.validateSettingsKeys)(config, envSettings, 'ENV');
-        return Object.assign(Object.assign({}, config), envSettings);
+        (0, validate_settings_keys_1.default)(available_package_settings_1.availablePackageSettings, envSettings);
+        return (0, lodash_merge_1.default)(config, envSettings);
     }
     catch (e) {
         console.error(e);

package/build/configs/app-configs/update-with-package.d.ts

@@ -1,2 +1,2 @@
-import { AppConfigs, AppContext } from './types';
-export declare function updateWithPackage(config: AppConfigs, context: AppContext): any;
+import { AppConfigs } from './types';
+export declare function updateWithPackage(config: AppConfigs): any;