arui-scripts 15.3.0 → 15.4.0

package/README.md

@@ -590,7 +590,7 @@ export default overrides;
             const { files } = postcssPluginsOptions['@csstools/postcss-global-data'];
             const newOption = {
                 ...postcssPluginsOptions,
-                '@csstools/postcss-global-data': { 
+                '@csstools/postcss-global-data': {
                     files:files.concat(['./vars.css'])
                 }
             };
@@ -621,6 +621,32 @@ export default overrides;
 
 Для некоторых конфигураций определены несколько ключей, они будут применяться в том порядке, в котором они приведены в этом файле.
 
+### Создание дополнительных конфигураций для webpack
+На некоторых проектах может потребоваться создать дополнительные конфигурации для webpack. Например, для создания
+service worker'а (или любых других кейсов). Для этого можно использовать функцию-хелпер `createSingleWebpackConfig`:
+
+```ts
+import type { OverrideFile } from 'arui-scripts';
+
+const overrides: OverrideFile = {
+    webpackClient: (config, appConfig, { createSingleClientWebpackConfig }) => {
+        return [
+            config,
+            createSingleClientWebpackConfig(
+                './src/sw.js', // entrypoint, может быть массивом/объектом
+                'sw', // наименование сборки, влияет на имена чанков
+            ),
+        ];
+    }
+};
+
+export default overrides;
+```
+Эта функция вернет независимую конфигурацию для webpack, которую можно использовать в качестве оверрайда. Вы так же можете ее модифицировать,
+не боясь что это повлияет на другие конфигурации.
+
+Созданная таким образом конфигурация будет шарить с оригинальной конфигурацией только плагин для формирования assets-manifest'а.
+
 Пресеты
 ===
 

package/bin/build.sh

@@ -1 +1,2 @@
-tsc --project tsconfig-local.json;cp ./src/configs/mq.css build/configs/mq.css;
+set -e;
+tsc --project tsconfig-local.json;cp ./src/configs/mq.css build/configs/mq.css;

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

@@ -1,8 +1,8 @@
 import webpack from 'webpack';
 type BuildResult = {
-    stats: webpack.Stats;
+    stats: webpack.Stats | webpack.MultiStats;
     warnings: string[];
     previousFileSizes: unknown;
 };
-declare function build(config: webpack.Configuration, previousFileSizes?: unknown): Promise<BuildResult>;
+declare function build(config: webpack.Configuration | 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) {
+    function printOutputSizes(webpackConfig, stats) {
         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(printOutputSizes);
+        webpack_client_prod_1.default.forEach((conf, index) => printOutputSizes(conf, stats.stats[index]));
     }
     else {
-        printOutputSizes(webpack_client_prod_1.default);
+        printOutputSizes(webpack_client_prod_1.default, stats);
     }
 })
     .catch((err) => {

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

@@ -16,20 +16,20 @@ const webpack_1 = __importDefault(require("webpack"));
 const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 const make_tmp_dir_1 = __importDefault(require("../util/make-tmp-dir"));
 const webpack_client_prod_1 = __importDefault(require("../../configs/webpack.client.prod"));
-const app_configs_1 = __importDefault(require("../../configs/app-configs"));
 (() => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    const tmpDir = yield (0, make_tmp_dir_1.default)();
-    const plugin = new webpack_bundle_analyzer_1.BundleAnalyzerPlugin({
-        generateStatsFile: true,
-        statsFilename: app_configs_1.default.statsOutputPath,
-    });
-    let clientWebpackConfig = webpack_client_prod_1.default;
-    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(() => { });
+    let clientWebpackConfigs = Array.isArray(webpack_client_prod_1.default) ? webpack_client_prod_1.default : [webpack_client_prod_1.default];
+    const promises = clientWebpackConfigs.map((config, i) => __awaiter(void 0, void 0, void 0, function* () {
+        const tmpDir = yield (0, make_tmp_dir_1.default)(i.toString());
+        config.plugins = [
+            ...config.plugins,
+            new webpack_bundle_analyzer_1.BundleAnalyzerPlugin({
+                generateStatsFile: true,
+                statsFilename: config.statsOutputPath,
+                analyzerPort: 'auto',
+            }),
+        ];
+        config.output = Object.assign(Object.assign({}, config.output), { path: tmpDir });
+    }));
+    yield Promise.all(promises);
+    (0, webpack_1.default)(clientWebpackConfigs).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 get_defaults_1 = require("../../configs/app-configs/get-defaults");
+const app_configs_1 = __importDefault(require("../../configs/app-configs"));
 const { readFile, rename, unlink } = fs_1.promises;
 /**
  * Сюда пайплайн Jenkins складывает соответствующие части описания версии. Не получается использовать
  * переменные окружения, т.к. `standard-version` запускает хуки через `child_process.exec`, не передавая туда
  * ни аргументы ни переменные окружения.
  */
-const { appNodeModulesBin, changelogPath, changelogTmpPath, changelogFeaturesPath, changelogBugfixesPath, changelogBreakingChangesPath } = (0, get_defaults_1.getDefaults)();
+const { appNodeModulesBin, changelogPath, changelogTmpPath, changelogFeaturesPath, changelogBugfixesPath, changelogBreakingChangesPath } = app_configs_1.default;
 // Пример заголовка – `## [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/util/make-tmp-dir.d.ts

@@ -2,5 +2,5 @@
  * Создает и возвращает временную папку
  * @returns {Promise<string>}
  */
-declare function makeTmpDir(): Promise<string>;
+declare function makeTmpDir(prefix?: string): Promise<string>;
 export default makeTmpDir;

package/build/commands/util/make-tmp-dir.js

@@ -21,9 +21,9 @@ const nodeMakeTmpDir = util_1.default.promisify(fs_1.default.mkdtemp);
  * Создает и возвращает временную папку
  * @returns {Promise<string>}
  */
-function makeTmpDir() {
+function makeTmpDir(prefix) {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield nodeMakeTmpDir(`${os_1.default.tmpdir()}${path_1.default.sep}`);
+        return yield nodeMakeTmpDir(path_1.default.join(os_1.default.tmpdir(), prefix || ''));
     });
 }
 exports.default = makeTmpDir;

package/build/commands/util/run-client-dev-server.d.ts

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

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

@@ -20,10 +20,7 @@ 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);
-        // не резолвиться constructor(config: WebpackDevServer.Configuration, webpack?: webpack.Compiler | webpack.MultiCompiler);
-        // clientCompiler: webpack.Compiler
-        // @ts-ignore
+        const clientCompiler = (0, webpack_1.default)(configuration); // типы вебпака не умеют выбирать между конфигурациями и массивом конфигураций
         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/calculate-dependent-config.d.ts

@@ -1,13 +1,59 @@
-import { AppConfigs } from './types';
+import { AppConfigs, AppContext } from './types';
 /**
  * Обновление ключей конфига, зависящих от других. Это нужно делать в самый последний момент
  */
-export declare function calculateDependentConfig(config: AppConfigs): AppConfigs & {
-    publicPath: string;
-    serverOutputPath: string;
-    clientOutputPath: string;
+export declare function calculateDependentConfig(config: AppConfigs): {
     clientPolyfillsEntry: string[];
-    statsOutputPath: string;
-    watchIgnorePath: string[];
-    babelRuntimeVersion: string;
+    clientServerPort: number;
+    serverPort: number;
+    debug: boolean;
+    devSourceMaps: string;
+    devServerCors: boolean;
+    useServerHMR: boolean;
+    presets: string | null;
+    buildPath: string;
+    assetsPath: string;
+    additionalBuildPath: string[];
+    statsOutputFilename: string;
+    serverEntry: string | string[] | Record<string, string | string[]>;
+    serverOutput: string;
+    clientEntry: string | string[] | Record<string, string | string[]>;
+    dockerRegistry: string;
+    baseDockerImage: string;
+    nginxRootPath: string;
+    runFromNonRootUser: boolean;
+    removeDevDependenciesDuringDockerBuild: boolean;
+    archiveName: string;
+    keepPropTypes: boolean;
+    useTscLoader: boolean;
+    webpack4Compatibility: boolean;
+    installServerSourceMaps: boolean;
+    dataUrlMaxSize?: number | undefined;
+    imageMinimizer?: {
+        svg?: {
+            enabled?: boolean | undefined;
+        } | undefined;
+        gif?: {
+            enabled?: boolean | undefined;
+            optimizationLevel?: number | undefined;
+        } | undefined;
+        jpg?: {
+            enabled?: boolean | undefined;
+            quality: number;
+        } | undefined;
+        png?: {
+            enabled?: boolean | undefined;
+            optimizationLevel?: number | undefined;
+            bitDepthReduction?: boolean | undefined;
+            colorTypeReduction?: boolean | undefined;
+            paletteReduction?: boolean | undefined;
+            interlaced?: boolean | undefined;
+        } | undefined;
+    } | undefined;
+    componentsTheme: string | null;
+    keepCssVars: boolean;
 };
+/**
+ * Обновление контекста в зависимости от ключей конфига
+ */
+export declare function calculateDependentContext(config: AppConfigs, context: AppContext): AppContext;

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

@@ -3,16 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateDependentConfig = void 0;
+exports.calculateDependentContext = 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.
@@ -20,20 +26,12 @@ function calculateDependentConfig(config) {
         // Поэтому мы читаем версию того babel/runtime, который установлен в проекте.
         // Так же мы не можем использовать require для получения контента из babel/runtime/package.json,
         // потому что webpack.cache будет ругаться на то, что мы пытаемся импортировать файлы НЕ из своего node_modules.
-        const pathToProjectBabelRuntime = (0, resolve_1.resolveNodeModuleRelativeTo)(config.cwd, '@babel/runtime/package.json');
+        const pathToProjectBabelRuntime = (0, resolve_1.resolveNodeModuleRelativeTo)(context.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 (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,
-    });
+    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 });
 }
-exports.calculateDependentConfig = calculateDependentConfig;
+exports.calculateDependentContext = calculateDependentContext;

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

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

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

@@ -3,17 +3,77 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaults = void 0;
+exports.getDefaultAppContext = exports.getDefaultAppConfig = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const resolve_1 = require("../util/resolve");
-function getDefaults() {
-    const CWD = process.cwd();
+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',
+        devServerCors: false,
+        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,
+        // image processing
+        dataUrlMaxSize: 1536,
+        imageMinimizer: {
+            svg: {
+                enabled: true,
+            },
+            gif: {
+                enabled: false,
+                optimizationLevel: 1,
+            },
+            jpg: {
+                enabled: false,
+                quality: 75,
+            },
+            png: {
+                enabled: false,
+                optimizationLevel: 3,
+                bitDepthReduction: false,
+                colorTypeReduction: false,
+                paletteReduction: false,
+            },
+        },
+        // CSS
+        componentsTheme: null,
+        keepCssVars: false,
+    };
+}
+exports.getDefaultAppConfig = getDefaultAppConfig;
+function getDefaultAppContext() {
     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');
@@ -25,47 +85,22 @@ function getDefaults() {
     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,
-        buildPath: '.build',
-        assetsPath: 'assets',
-        additionalBuildPath: ['config'],
-        nginxRootPath: '/src',
-        runFromNonRootUser: true,
-        archiveName: 'build.tar',
+        overridesPath: overridesPath ? [overridesPath] : [],
+        // tools availability
         babelRuntimeVersion: '7.0.0-beta.0',
-        // 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,
+        useYarn: fs_1.default.existsSync(yarnLockFilePath),
         // 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: '',
@@ -78,27 +113,6 @@ function getDefaults() {
         changelogFeaturesPath: path_1.default.resolve(CWD, './changelog_features.tmp'),
         changelogBugfixesPath: path_1.default.resolve(CWD, './changelog_bugfixes.tmp'),
         changelogBreakingChangesPath: path_1.default.resolve(CWD, './changelog_breaking_changes.tmp'),
-        dataUrlMaxSize: 1536,
-        imageMinimizer: {
-            svg: {
-                enabled: true,
-            },
-            gif: {
-                enabled: false,
-                optimizationLevel: 1,
-            },
-            jpg: {
-                enabled: false,
-                quality: 75
-            },
-            png: {
-                enabled: false,
-                optimizationLevel: 3,
-                bitDepthReduction: false,
-                colorTypeReduction: false,
-                paletteReduction: false
-            }
-        }
     };
 }
-exports.getDefaults = getDefaults;
+exports.getDefaultAppContext = getDefaultAppContext;

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

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

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

@@ -1,5 +1,6 @@
 "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");
@@ -7,10 +8,15 @@ 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 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;
+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;

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

@@ -1,53 +1,32 @@
+/**
+ * Конфигурация arui-scripts, которая может быть переопределена приложением
+ */
 export type AppConfigs = {
-    appPackage: any;
-    name: string;
-    version: string;
-    dockerRegistry: string;
-    baseDockerImage: string;
-    cwd: string;
-    appSrc: string;
-    appNodeModules: string;
-    appNodeModulesBin: string;
+    clientServerPort: number;
+    serverPort: number;
+    debug: boolean;
+    devSourceMaps: string;
+    devServerCors: boolean;
+    useServerHMR: boolean;
+    presets: string | null;
     buildPath: string;
     assetsPath: string;
     additionalBuildPath: string[];
-    nginxRootPath: string;
-    runFromNonRootUser: boolean;
-    archiveName: string;
-    babelRuntimeVersion: string;
+    statsOutputFilename: string;
     serverEntry: string | string[] | Record<string, string | string[]>;
     serverOutput: string;
     clientPolyfillsEntry: null | string | string[];
     clientEntry: string | string[] | Record<string, string | string[]>;
+    dockerRegistry: string;
+    baseDockerImage: string;
+    nginxRootPath: string;
+    runFromNonRootUser: boolean;
+    removeDevDependenciesDuringDockerBuild: boolean;
+    archiveName: 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;
-    statsOutputPath: string;
-    watchIgnorePath: string[];
-    changelogPath: string;
-    changelogTmpPath: string;
-    changelogFeaturesPath: string;
-    changelogBugfixesPath: string;
-    changelogBreakingChangesPath: string;
     dataUrlMaxSize?: number;
     imageMinimizer?: {
         svg?: {
@@ -70,4 +49,38 @@ export type AppConfigs = {
             interlaced?: boolean;
         };
     };
+    componentsTheme: string | null;
+    keepCssVars: boolean;
+};
+/**
+ * Внутренний контекст arui-scripts
+ */
+export type AppContext = {
+    appPackage: any;
+    name: string;
+    normalizedName: string;
+    version: string;
+    cwd: string;
+    appSrc: string;
+    appNodeModules: string;
+    appNodeModulesBin: string;
+    babelRuntimeVersion: string;
+    useYarn: boolean;
+    tsconfig: string | null;
+    localNginxConf: string | null;
+    localDockerfile: string | null;
+    localStartScript: string | null;
+    overridesPath: string[];
+    publicPath: string;
+    serverOutputPath: string;
+    clientOutputPath: string;
+    statsOutputPath: string;
+    watchIgnorePath: string[];
+    changelogPath: string;
+    changelogTmpPath: string;
+    changelogFeaturesPath: string;
+    changelogBugfixesPath: string;
+    changelogBreakingChangesPath: string;
 };
+export type AppContextWithConfigs = AppContext & AppConfigs;
+export type PackageSettings = Partial<AppConfigs>;

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

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

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

@@ -5,20 +5,18 @@ 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 = __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'));
+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'));
     if (appConfigPath) {
         let appSettings = require(appConfigPath);
         if (appSettings.__esModule) {
             // ts-node импортирует esModules, из них надо вытягивать default именно так
             appSettings = appSettings.default;
         }
-        (0, validate_settings_keys_1.default)(available_package_settings_1.availablePackageSettings, appSettings);
-        config = (0, lodash_merge_1.default)(config, appSettings);
+        (0, validate_settings_keys_1.validateSettingsKeys)(config, appSettings, appConfigPath);
+        return Object.assign(Object.assign({}, config), appSettings);
     }
     return config;
 }