arui-scripts 13.5.0 → 14.1.0

package/README.md

@@ -1,10 +1,7 @@
 ARUI-scripts
 ===
 
-Приложение на нашем стеке без какой либо конфигурации билдеров.
-
-Во многом пакет аналогичен `react-scripts` из `create-react-app`, разница заключается
-в немного отличающихся настройках для `babel`, поддержки `ts` и возможности работы с серверным кодом.
+Простой и гибкий инструмент для одновременной сборки клиентской и серверной части react-приложений.
 
 Использование
 ===
@@ -78,7 +75,7 @@ npm install arui-scripts --save-dev
 - `devSourceMaps` - какой вид source-map использовать в режиме разработки. По умолчанию `eval`. Эта настройка может сильно влиять на время сборки. Подробнее можно почитать [здесь](https://webpack.js.org/configuration/devtool/).
 **Внимание**. При использовании любых source-map на основании `eval` webpack-dev-server будет модифицировать заголовок `Content-Security-Policy` (при наличии) и добавлять в него `unsafe-eval`. [Подробнее тут](#dev-csp).
 - `useTscLoader` -  использовать ts-loader вместо babel-loader для обработки ts файлов. У babel-loader есть [ряд ограничений](https://blogs.msdn.microsoft.com/typescript/2018/08/27/typescript-and-babel-7/). По умолчанию `false`.
-- `componentsTheme` - путь к css файлу с темой для [core-components](https://alfa-laboratory.github.io/core-components). Используется для настройки [postcss-custom-properties](https://github.com/postcss/postcss-custom-properties#importfrom).
+- `componentsTheme` - путь к css файлу с темой для [core-components](https://github.com/core-ds/core-components). Используется для настройки [postcss-custom-properties](https://github.com/postcss/postcss-custom-properties#importfrom).
 - `keepCssVars` - отключает `postcss-custom-properties`, css переменные будут оставаться в бандле.
 - `removeDevDependenciesDuringDockerBuild` - отключает удаление devDependencies из node_modules при сборке докер образа. Используется когда вам не нужно удалять devDependencies, т.к. в своём Dockerfile вы не переносите node_modules в докер-контейнер
 
@@ -294,7 +291,7 @@ docker
 
 Команда `arui-scripts docker-build` запускает компиляцию продакшн версии и сборку докер образа.
 
-Образ основан на [alpine-node-nginx](https://github.com/alfa-laboratory/arui-scripts/blob/master/packages/alpine-node-nginx/).
+Образ основан на [alpine-node-nginx](../alpine-node-nginx).
 
 Имя контейнера определяется как `{configs.dockerRegistry}/{name}:{version}`. Переменные `name` и `version` по умолчанию берутся из package.json,
 но вы так же можете переопределить их из командной строки, например
@@ -320,6 +317,12 @@ docker run -p 8080:8080 container-name:version ./start.sh
 
 `Dockerfile` в корне проекта имеет приоритет над overrides.
 
+Чтобы переопределить скрипт запуска, воспользуйтесь механизмом [overrides](#тонкая-настройка)
+или создайте в корневой директории проекта `start.sh` файл содержащий необходимый набор инструкций.
+Пример [start.sh](src/templates/start.template.ts).
+
+`start.sh` в корне проекта имеет приоритет над overrides.
+
 docker compiled
 ---
 Команда `arui-scripts docker-build:compiled` во многом аналогична `docker-build`, но вместо сборки проекта использует уже скомпилированный в папку `.build` код.

package/build/commands/archive-build/index.js

@@ -46,11 +46,11 @@ const packageJsonPath = path_1.default.join(app_configs_1.default.cwd, packageJs
         console.timeEnd('Setting up time');
         console.time('Build application time');
         // run build script
-        yield exec_1.default('npm run build');
+        yield (0, exec_1.default)('npm run build');
         console.timeEnd('Build application time');
         console.time('Remove build dependencies time');
-        const pruneCommand = yarn_1.getPruningCommand();
-        yield exec_1.default(pruneCommand);
+        const pruneCommand = (0, yarn_1.getPruningCommand)();
+        yield (0, exec_1.default)(pruneCommand);
         console.timeEnd('Remove build dependencies time');
         console.time('Archive build time');
         yield Promise.all([

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

@@ -1,5 +1,5 @@
 import webpack from 'webpack';
-declare type BuildResult = {
+type BuildResult = {
     stats: webpack.Stats;
     warnings: string[];
     previousFileSizes: unknown;

package/build/commands/build/build-wrapper.js

@@ -9,13 +9,13 @@ const chalk_1 = __importDefault(require("chalk"));
 const webpack_1 = __importDefault(require("webpack"));
 const format_webpack_messages_1 = __importDefault(require("../util/format-webpack-messages"));
 function build(config, previousFileSizes) {
-    let compiler = webpack_1.default(config);
+    let compiler = (0, webpack_1.default)(config);
     return new Promise((resolve, reject) => {
         compiler.run((err, stats) => {
             if (err) {
                 return reject(err);
             }
-            const messages = format_webpack_messages_1.default(stats === null || stats === void 0 ? void 0 : stats.toJson({}));
+            const messages = (0, format_webpack_messages_1.default)(stats === null || stats === void 0 ? void 0 : stats.toJson({}));
             if (messages.errors.length) {
                 // Only keep the first error. Others are often indicative
                 // of the same problem, but confuse the reader with noise.

package/build/commands/build/client.js

@@ -11,7 +11,7 @@ const build_wrapper_1 = __importDefault(require("./build-wrapper"));
 const client_assets_sizes_1 = require("../util/client-assets-sizes");
 const webpack_client_prod_1 = __importDefault(require("../../configs/webpack.client.prod"));
 console.log(chalk_1.default.magenta('Building client...'));
-build_wrapper_1.default(webpack_client_prod_1.default)
+(0, build_wrapper_1.default)(webpack_client_prod_1.default)
     .then(({ stats, warnings }) => {
     if (warnings.length) {
         console.log(chalk_1.default.yellow('Client compiled with warnings.\n'));
@@ -24,8 +24,8 @@ build_wrapper_1.default(webpack_client_prod_1.default)
     }
     function printOutputSizes(webpackConfig) {
         var _a;
-        const sizes = client_assets_sizes_1.calculateAssetsSizes(stats, (_a = webpackConfig === null || webpackConfig === void 0 ? void 0 : webpackConfig.output) === null || _a === void 0 ? void 0 : _a.path);
-        client_assets_sizes_1.printAssetsSizes(sizes);
+        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);
@@ -36,6 +36,6 @@ build_wrapper_1.default(webpack_client_prod_1.default)
 })
     .catch((err) => {
     console.log(chalk_1.default.red('Failed to compile client.\n'));
-    printBuildError_1.default(err);
+    (0, printBuildError_1.default)(err);
     process.exit(1);
 });

package/build/commands/build/index.js

@@ -14,14 +14,14 @@ const app_configs_1 = __importDefault(require("../../configs/app-configs"));
 process.env.BABEL_ENV = 'production';
 process.env.NODE_ENV = 'production';
 process.env.BROWSERSLIST_CONFIG = process.env.BROWSERSLIST_CONFIG || require.resolve('../../../.browserslistrc');
-if (!check_required_files_1.default()) {
+if (!(0, check_required_files_1.default)()) {
     process.exit(1);
 }
 if (fs_extra_1.default.pathExistsSync(app_configs_1.default.serverOutputPath)) {
     fs_extra_1.default.removeSync(app_configs_1.default.serverOutputPath);
 }
-const compileServer = child_process_1.spawn('node', [path_1.default.join(__dirname, './server')], { stdio: 'inherit' });
-const compileClient = child_process_1.spawn('node', [path_1.default.join(__dirname, './client')], { stdio: 'inherit' });
+const compileServer = (0, child_process_1.spawn)('node', [path_1.default.join(__dirname, './server')], { stdio: 'inherit' });
+const compileClient = (0, child_process_1.spawn)('node', [path_1.default.join(__dirname, './client')], { stdio: 'inherit' });
 const onProcessExit = (code) => {
     if (code !== 0) {
         compileServer.kill();

package/build/commands/build/server.js

@@ -10,7 +10,7 @@ const printBuildError_1 = __importDefault(require("react-dev-utils/printBuildErr
 const build_wrapper_1 = __importDefault(require("./build-wrapper"));
 const webpack_server_prod_1 = __importDefault(require("../../configs/webpack.server.prod"));
 console.log(chalk_1.default.magenta('Building server...'));
-build_wrapper_1.default(webpack_server_prod_1.default)
+(0, build_wrapper_1.default)(webpack_server_prod_1.default)
     .then(({ warnings }) => {
     if (warnings.length) {
         console.log(chalk_1.default.yellow('Server compiled with warnings.\n'));
@@ -24,6 +24,6 @@ build_wrapper_1.default(webpack_server_prod_1.default)
 })
     .catch((err) => {
     console.log(chalk_1.default.red('Failed to compile server.\n'));
-    printBuildError_1.default(err);
+    (0, printBuildError_1.default)(err);
     process.exit(1);
 });

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

@@ -19,7 +19,7 @@ const webpack_client_prod_1 = __importDefault(require("../../configs/webpack.cli
 const app_configs_1 = __importDefault(require("../../configs/app-configs"));
 (() => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const tmpDir = yield make_tmp_dir_1.default();
+    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,
@@ -31,5 +31,5 @@ const app_configs_1 = __importDefault(require("../../configs/app-configs"));
     }
     (_a = clientWebpackConfig.plugins) === null || _a === void 0 ? void 0 : _a.push(plugin);
     clientWebpackConfig.output.path = tmpDir;
-    webpack_1.default(clientWebpackConfig).run(() => { });
+    (0, webpack_1.default)(clientWebpackConfig).run(() => { });
 }))();

package/build/commands/changelog/index.js

@@ -33,15 +33,15 @@ const { readFile, rename, unlink } = fs_1.promises;
  * переменные окружения, т.к. `standard-version` запускает хуки через `child_process.exec`, не передавая туда
  * ни аргументы ни переменные окружения.
  */
-const { appNodeModulesBin, changelogPath, changelogTmpPath, changelogFeaturesPath, changelogBugfixesPath, changelogBreakingChangesPath } = get_defaults_1.getDefaults();
+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* () {
-    var e_1, _a;
+    var _a, e_1, _b, _c;
     const rl = readline_1.default.createInterface({
-        input: fs_1.createReadStream(changelogPath),
+        input: (0, fs_1.createReadStream)(changelogPath),
     });
-    const ws = fs_1.createWriteStream(changelogTmpPath);
+    const ws = (0, fs_1.createWriteStream)(changelogTmpPath);
     let modifyingStatus = 'PENDING';
     const addVersionDescription = () => __awaiter(void 0, void 0, void 0, function* () {
         const [features, bugFixes, breakingChanges] = yield Promise.all([
@@ -52,36 +52,43 @@ const changelogHeaderRegExp = /^###? \[\d+\.\d+\.\d+]\([^)]+\) \(\d{4}-\d{2}-\d{
         ws.write(getVersionDescription({ features, bugFixes, breakingChanges }));
     });
     try {
-        for (var rl_1 = __asyncValues(rl), rl_1_1; rl_1_1 = yield rl_1.next(), !rl_1_1.done;) {
-            const line = rl_1_1.value;
-            switch (modifyingStatus) {
-                // Копируем всё как есть до первого заголовка.
-                case 'PENDING':
-                    if (changelogHeaderRegExp.test(line)) {
-                        modifyingStatus = 'MODIFYING';
-                    }
-                    ws.write(`${line}\n`);
-                    break;
-                // Игнорируем описание версии, сгенерированное пакетом `standard-version`, пишем своё
-                // до второго заголовка. См. описание задачи http://jira.moscow.alfaintra.net/browse/NEWCLICKUI-1048
-                case 'MODIFYING':
-                    if (changelogHeaderRegExp.test(line)) {
-                        modifyingStatus = 'MODIFIED';
-                        yield addVersionDescription();
+        for (var _d = true, rl_1 = __asyncValues(rl), rl_1_1; rl_1_1 = yield rl_1.next(), _a = rl_1_1.done, !_a;) {
+            _c = rl_1_1.value;
+            _d = false;
+            try {
+                const line = _c;
+                switch (modifyingStatus) {
+                    // Копируем всё как есть до первого заголовка.
+                    case 'PENDING':
+                        if (changelogHeaderRegExp.test(line)) {
+                            modifyingStatus = 'MODIFYING';
+                        }
                         ws.write(`${line}\n`);
-                    }
-                    break;
-                // Дальше просто копируем всё как есть.
-                case 'MODIFIED':
-                    ws.write(`${line}\n`);
-                    break;
+                        break;
+                    // Игнорируем описание версии, сгенерированное пакетом `standard-version`, пишем своё
+                    // до второго заголовка. См. описание задачи http://jira.moscow.alfaintra.net/browse/NEWCLICKUI-1048
+                    case 'MODIFYING':
+                        if (changelogHeaderRegExp.test(line)) {
+                            modifyingStatus = 'MODIFIED';
+                            yield addVersionDescription();
+                            ws.write(`${line}\n`);
+                        }
+                        break;
+                    // Дальше просто копируем всё как есть.
+                    case 'MODIFIED':
+                        ws.write(`${line}\n`);
+                        break;
+                }
+            }
+            finally {
+                _d = true;
             }
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (rl_1_1 && !rl_1_1.done && (_a = rl_1.return)) yield _a.call(rl_1);
+            if (!_d && !_a && (_b = rl_1.return)) yield _b.call(rl_1);
         }
         finally { if (e_1) throw e_1.error; }
     }
@@ -91,7 +98,7 @@ const changelogHeaderRegExp = /^###? \[\d+\.\d+\.\d+]\([^)]+\) \(\d{4}-\d{2}-\d{
     ws.close();
     yield unlink(changelogPath);
     yield rename(changelogTmpPath, changelogPath);
-    child_process_1.execSync(`${appNodeModulesBin}/prettier -w "${changelogPath}"`);
+    (0, child_process_1.execSync)(`${appNodeModulesBin}/prettier -w "${changelogPath}"`);
     process.exit(0);
 }))();
 function getVersionDescription({ features, bugFixes, breakingChanges }) {

package/build/commands/docker-build/index.js

@@ -21,32 +21,33 @@ const exec_1 = __importDefault(require("../util/exec"));
 const docker_build_1 = require("../util/docker-build");
 const yarn_1 = require("../util/yarn");
 (() => __awaiter(void 0, void 0, void 0, function* () {
-    const { imageFullName, pathToTempDir, tempDirName } = docker_build_1.getBuildParamsFromArgs();
+    const { imageFullName, pathToTempDir, tempDirName } = (0, docker_build_1.getBuildParamsFromArgs)();
     try {
         console.log(`Build docker image ${imageFullName}`);
         console.time('Total time');
         console.time('Setting up time');
-        yield docker_build_1.prepareFilesForDocker({
+        yield (0, docker_build_1.prepareFilesForDocker)({
             pathToTempDir,
             dockerfileTemplate: dockerfile_template_1.default,
             nginxConfTemplate: nginx_conf_template_1.default,
-            startScript: start_template_1.default,
+            startScriptTemplate: start_template_1.default,
             allowLocalDockerfile: true,
+            allowLocalStartScript: true,
         });
         yield fs_extra_1.default.remove(app_configs_1.default.buildPath);
         console.timeEnd('Setting up time');
         console.time('Build application time');
         // run build script
-        yield exec_1.default('npm run build');
+        yield (0, exec_1.default)('npm run build');
         console.timeEnd('Build application time');
         if (app_configs_1.default.removeDevDependenciesDuringDockerBuild) {
             console.time('Remove dev dependencies time');
-            const pruneCommand = yarn_1.getPruningCommand();
-            yield exec_1.default(pruneCommand);
+            const pruneCommand = (0, yarn_1.getPruningCommand)();
+            yield (0, exec_1.default)(pruneCommand);
             console.timeEnd('Remove dev dependencies time');
         }
         console.time('Build docker image time');
-        yield exec_1.default(`docker build -f "./${tempDirName}/Dockerfile" \\
+        yield (0, exec_1.default)(`docker build -f "./${tempDirName}/Dockerfile" \\
  --build-arg START_SH_LOCATION="./${tempDirName}/start.sh" \\
  --build-arg NGINX_CONF_LOCATION="./${tempDirName}/nginx.conf" -t ${imageFullName} .`);
         console.timeEnd('Build docker image time');
@@ -55,7 +56,7 @@ const yarn_1 = require("../util/yarn");
         yield fs_extra_1.default.remove(pathToTempDir);
         // guard against pushing the image during tests
         if (!app_configs_1.default.debug) {
-            yield exec_1.default(`docker push ${imageFullName}`);
+            yield (0, exec_1.default)(`docker push ${imageFullName}`);
         }
         console.timeEnd('Cleanup time');
         console.timeEnd('Total time');

package/build/commands/docker-build-compiled/index.js

@@ -20,25 +20,26 @@ const start_template_1 = __importDefault(require("../../templates/start.template
 const exec_1 = __importDefault(require("../util/exec"));
 const docker_build_1 = require("../util/docker-build");
 (() => __awaiter(void 0, void 0, void 0, function* () {
-    const { imageFullName, pathToTempDir, tempDirName } = docker_build_1.getBuildParamsFromArgs();
+    const { imageFullName, pathToTempDir, tempDirName } = (0, docker_build_1.getBuildParamsFromArgs)();
     try {
         console.log(`Build docker image ${imageFullName}`);
         console.time('Total time');
-        yield docker_build_1.prepareFilesForDocker({
+        yield (0, docker_build_1.prepareFilesForDocker)({
             pathToTempDir,
             dockerfileTemplate: dockerfile_compiled_template_1.default,
             nginxConfTemplate: nginx_conf_template_1.default,
-            startScript: start_template_1.default,
+            startScriptTemplate: start_template_1.default,
             allowLocalDockerfile: false,
+            allowLocalStartScript: false,
         });
-        yield exec_1.default('echo "node_modules" >> .dockerignore');
-        yield exec_1.default(`docker build -f "./${tempDirName}/Dockerfile" \\
+        yield (0, exec_1.default)('echo "node_modules" >> .dockerignore');
+        yield (0, exec_1.default)(`docker build -f "./${tempDirName}/Dockerfile" \\
  --build-arg START_SH_LOCATION="./${tempDirName}/start.sh" \\
  --build-arg NGINX_CONF_LOCATION="./${tempDirName}/nginx.conf" -t ${imageFullName} .`);
         yield fs_extra_1.default.remove(pathToTempDir);
         // guard against pushing the image during tests
         if (!app_configs_1.default.debug) {
-            yield exec_1.default(`docker push ${imageFullName}`);
+            yield (0, exec_1.default)(`docker push ${imageFullName}`);
         }
         console.timeEnd('Total time');
     }

package/build/commands/start/client.js

@@ -9,16 +9,16 @@ const WebpackDevServerUtils_1 = require("react-dev-utils/WebpackDevServerUtils")
 const print_compiler_output_1 = __importDefault(require("./print-compiler-output"));
 const webpack_client_dev_1 = __importDefault(require("../../configs/webpack.client.dev"));
 const dev_server_1 = __importDefault(require("../../configs/dev-server"));
-const clientCompiler = webpack_1.default(webpack_client_dev_1.default);
+const clientCompiler = (0, webpack_1.default)(webpack_client_dev_1.default);
 // не резолвиться 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) => print_compiler_output_1.default('Client', stats));
+clientCompiler.hooks.done.tap('client', (stats) => (0, print_compiler_output_1.default)('Client', stats));
 const DEFAULT_PORT = dev_server_1.default.port;
 const HOST = '0.0.0.0';
-WebpackDevServerUtils_1.choosePort(HOST, +(DEFAULT_PORT || 0))
+(0, WebpackDevServerUtils_1.choosePort)(HOST, +(DEFAULT_PORT || 0))
     .then((port) => {
     if (!port) {
         // We have not found a port.

package/build/commands/start/index.js

@@ -9,14 +9,14 @@ const path_1 = __importDefault(require("path"));
 const check_required_files_1 = __importDefault(require("../util/check-required-files"));
 const app_configs_1 = __importDefault(require("../../configs/app-configs"));
 process.env.BROWSERSLIST_CONFIG = process.env.BROWSERSLIST_CONFIG || require.resolve('../../../.browserslistrc');
-if (!check_required_files_1.default()) {
+if (!(0, check_required_files_1.default)()) {
     process.exit(1);
 }
 if (fs_extra_1.default.pathExistsSync(app_configs_1.default.serverOutputPath)) {
     fs_extra_1.default.removeSync(app_configs_1.default.serverOutputPath);
 }
-const compileServer = child_process_1.spawn('node', [path_1.default.join(__dirname, './server')], { stdio: 'inherit' });
-const compileClient = child_process_1.spawn('node', [path_1.default.join(__dirname, './client')], { stdio: 'inherit' });
+const compileServer = (0, child_process_1.spawn)('node', [path_1.default.join(__dirname, './server')], { stdio: 'inherit' });
+const compileClient = (0, child_process_1.spawn)('node', [path_1.default.join(__dirname, './client')], { stdio: 'inherit' });
 const onProcessExit = (code) => {
     if (code !== 0) {
         compileServer.kill();

package/build/commands/start/server.js

@@ -7,10 +7,10 @@ const webpack_1 = __importDefault(require("webpack"));
 const print_compiler_output_1 = __importDefault(require("./print-compiler-output"));
 const webpack_server_dev_1 = __importDefault(require("../../configs/webpack.server.dev"));
 const app_configs_1 = __importDefault(require("../../configs/app-configs"));
-const serverCompiler = webpack_1.default(webpack_server_dev_1.default);
+const serverCompiler = (0, webpack_1.default)(webpack_server_dev_1.default);
 serverCompiler.hooks.compile.tap('server', () => console.log('Compiling server...'));
 serverCompiler.hooks.invalid.tap('server', () => console.log('Compiling server...'));
-serverCompiler.hooks.done.tap('server', (stats) => print_compiler_output_1.default('Server', stats));
+serverCompiler.hooks.done.tap('server', (stats) => (0, print_compiler_output_1.default)('Server', stats));
 serverCompiler.watch({
     aggregateTimeout: 50,
     ignored: new RegExp(app_configs_1.default.watchIgnorePath.join('|')),

package/build/commands/util/client-assets-sizes.d.ts

@@ -1,5 +1,5 @@
 import { Stats } from 'webpack';
-declare type AssetSize = {
+type AssetSize = {
     name: string;
     fullName: string;
     gzipSize: number;
@@ -9,7 +9,7 @@ declare type AssetSize = {
     gzipLabel: string;
     brotliLabel: string;
 };
-declare type TotalSizes = {
+type TotalSizes = {
     size: number;
     sizeLabel: string;
     gzipSize: number;
@@ -17,7 +17,7 @@ declare type TotalSizes = {
     brotliSize: number;
     brotliLabel: string;
 };
-declare type ClientAssetsSizes = {
+type ClientAssetsSizes = {
     totalSizes: TotalSizes;
     assets: AssetSize[];
 };

package/build/commands/util/client-assets-sizes.js

@@ -34,7 +34,7 @@ function calculateAssetsSizes(webpackStats, rootDir = '') {
         .filter((asset) => canReadAsset(asset.name))
         .map((asset) => {
         const fileContents = fs_1.default.readFileSync(path_1.default.join(rootDir, asset.name));
-        const size = gzip_size_1.sync(fileContents);
+        const size = (0, gzip_size_1.sync)(fileContents);
         const brSize = brotliSize(fileContents);
         const filename = path_1.default.basename(asset.name);
         return {
@@ -43,9 +43,9 @@ function calculateAssetsSizes(webpackStats, rootDir = '') {
             gzipSize: size,
             brotliSize: brSize,
             size: asset.size,
-            sizeLabel: filesize_1.default(asset.size),
-            gzipLabel: filesize_1.default(size),
-            brotliLabel: brSize ? filesize_1.default(brSize) : '-'
+            sizeLabel: (0, filesize_1.default)(asset.size),
+            gzipLabel: (0, filesize_1.default)(size),
+            brotliLabel: brSize ? (0, filesize_1.default)(brSize) : '-'
         };
     });
     const totalSizes = (assets || []).reduce((file, total) => {
@@ -55,9 +55,9 @@ function calculateAssetsSizes(webpackStats, rootDir = '') {
             brotliSize: total.brotliSize + file.brotliSize
         };
     }, { size: 0, gzipSize: 0, brotliSize: 0 });
-    totalSizes.sizeLabel = filesize_1.default(totalSizes.size || 0);
-    totalSizes.gzipLabel = filesize_1.default(totalSizes.gzipSize || 0);
-    totalSizes.brotliLabel = totalSizes.brotliSize ? filesize_1.default(totalSizes.brotliSize) : '-';
+    totalSizes.sizeLabel = (0, filesize_1.default)(totalSizes.size || 0);
+    totalSizes.gzipLabel = (0, filesize_1.default)(totalSizes.gzipSize || 0);
+    totalSizes.brotliLabel = totalSizes.brotliSize ? (0, filesize_1.default)(totalSizes.brotliSize) : '-';
     return {
         totalSizes: totalSizes,
         assets
@@ -66,13 +66,13 @@ function calculateAssetsSizes(webpackStats, rootDir = '') {
 exports.calculateAssetsSizes = calculateAssetsSizes;
 function printAssetsSizes(sizes) {
     const longestSizeLabelLength = Math.max.apply(null, sizes.assets.map(a => {
-        const sizeLength = strip_ansi_1.default(a.gzipLabel).length;
+        const sizeLength = (0, strip_ansi_1.default)(a.gzipLabel).length;
         return sizeLength + sizeLength + 8;
     }));
     console.log(chalk_1.default.blueBright('Assets sizes:'));
     sizes.assets.forEach(asset => {
         let sizeLabel = `${asset.sizeLabel} (${asset.gzipLabel} gzip, ${asset.brotliLabel} br)`;
-        const sizeLength = strip_ansi_1.default(sizeLabel).length;
+        const sizeLength = (0, strip_ansi_1.default)(sizeLabel).length;
         if (sizeLength < longestSizeLabelLength) {
             const rightPadding = ' '.repeat(longestSizeLabelLength - sizeLength);
             sizeLabel += rightPadding;

package/build/commands/util/docker-build.d.ts

@@ -3,12 +3,13 @@ export declare function getBuildParamsFromArgs(): {
     imageFullName: string;
     tempDirName: string;
 };
-declare type PrepareFilesForDockerParams = {
+type PrepareFilesForDockerParams = {
     dockerfileTemplate: string;
     nginxConfTemplate: string;
-    startScript: string;
+    startScriptTemplate: string;
     pathToTempDir: string;
     allowLocalDockerfile: boolean;
+    allowLocalStartScript: boolean;
 };
-export declare function prepareFilesForDocker({ dockerfileTemplate, nginxConfTemplate, startScript, pathToTempDir, allowLocalDockerfile, }: PrepareFilesForDockerParams): Promise<void>;
+export declare function prepareFilesForDocker({ dockerfileTemplate, nginxConfTemplate, startScriptTemplate, pathToTempDir, allowLocalDockerfile, allowLocalStartScript }: PrepareFilesForDockerParams): Promise<void>;
 export {};

package/build/commands/util/docker-build.js

@@ -49,7 +49,7 @@ function getBuildParamsFromArgs() {
     };
 }
 exports.getBuildParamsFromArgs = getBuildParamsFromArgs;
-function prepareFilesForDocker({ dockerfileTemplate, nginxConfTemplate, startScript, pathToTempDir, allowLocalDockerfile, }) {
+function prepareFilesForDocker({ dockerfileTemplate, nginxConfTemplate, startScriptTemplate, pathToTempDir, allowLocalDockerfile, allowLocalStartScript }) {
     return __awaiter(this, void 0, void 0, function* () {
         yield fs_extra_1.default.emptyDir(pathToTempDir);
         const nginxConf = app_configs_1.default.localNginxConf
@@ -58,6 +58,9 @@ function prepareFilesForDocker({ dockerfileTemplate, nginxConfTemplate, startScr
         const dockerfile = app_configs_1.default.localDockerfile && allowLocalDockerfile
             ? yield fs_extra_1.default.readFile(app_configs_1.default.localDockerfile, 'utf8')
             : dockerfileTemplate;
+        const startScript = app_configs_1.default.localStartScript && allowLocalStartScript
+            ? yield fs_extra_1.default.readFile(app_configs_1.default.localStartScript, 'utf8')
+            : startScriptTemplate;
         yield Promise.all([
             fs_extra_1.default.writeFile(path_1.default.join(pathToTempDir, 'Dockerfile'), dockerfile, 'utf8'),
             fs_extra_1.default.writeFile(path_1.default.join(pathToTempDir, 'nginx.conf'), nginxConf, 'utf8'),

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

@@ -1,4 +1,4 @@
-declare type YarnVersion = '1' | '2+' | 'unavailable';
+type YarnVersion = '1' | '2+' | 'unavailable';
 export declare function getYarnVersion(): YarnVersion;
 export declare function getPruningCommand(): string;
 export declare function getInstallProductionCommand(): string;

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

@@ -3,6 +3,6 @@ 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"];
-declare type ArrayElementType<ArrayType extends ReadonlyArray<unknown>> = ArrayType[number];
-export declare type PackageSettings = Partial<Pick<AppConfigs, ArrayElementType<typeof availablePackageSettings>>>;
+type ArrayElementType<ArrayType extends ReadonlyArray<unknown>> = ArrayType[number];
+export type PackageSettings = Partial<Pick<AppConfigs, ArrayElementType<typeof availablePackageSettings>>>;
 export {};

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

@@ -20,17 +20,17 @@ function calculateDependentConfig(config) {
         // Поэтому мы читаем версию того babel/runtime, который установлен в проекте.
         // Так же мы не можем использовать require для получения контента из babel/runtime/package.json,
         // потому что webpack.cache будет ругаться на то, что мы пытаемся импортировать файлы НЕ из своего node_modules.
-        const pathToProjectBabelRuntime = resolve_1.resolveNodeModuleRelativeTo(config.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 lodash_merge_1.default(config, {
+    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: get_polyfills_1.getPolyfills(config),
+        clientPolyfillsEntry: (0, get_polyfills_1.getPolyfills)(config),
         statsOutputPath: path_1.default.resolve(config.cwd, config.buildPath, config.statsOutputFilename),
         watchIgnorePath: ['node_modules', config.buildPath],
         babelRuntimeVersion,

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

@@ -18,9 +18,10 @@ function getDefaults() {
     const absoluteNodeModulesBinPath = path_1.default.resolve(absoluteNodeModulesPath, '.bin');
     const projectTsConfigPath = path_1.default.join(CWD, 'tsconfig.json');
     const yarnLockFilePath = path_1.default.join(CWD, 'yarn.lock');
-    const overridesPath = resolve_1.tryResolve(path_1.default.join(CWD, 'arui-scripts.overrides'));
+    const overridesPath = (0, resolve_1.tryResolve)(path_1.default.join(CWD, 'arui-scripts.overrides'));
     const nginxConfFilePath = path_1.default.join(CWD, 'nginx.conf');
     const dockerfileFilePath = path_1.default.join(CWD, 'Dockerfile');
+    const startScriptFilePath = path_1.default.join(CWD, 'start.sh');
     return {
         appPackage,
         name: appPackage.name,
@@ -50,6 +51,7 @@ function getDefaults() {
         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,

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

@@ -7,10 +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 config = get_defaults_1.getDefaults();
-config = update_with_presets_1.updateWithPresets(config);
-config = update_with_package_1.updateWithPackage(config);
-config = update_with_config_file_1.updateWithConfigFile(config);
-config = update_with_env_1.updateWithEnv(config);
-config = calculate_dependent_config_1.calculateDependentConfig(config);
+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,4 +1,4 @@
-export declare type AppConfigs = {
+export type AppConfigs = {
     appPackage: any;
     name: string;
     version: string;
@@ -23,6 +23,7 @@ export declare type AppConfigs = {
     tsconfig: string | null;
     localNginxConf: string | null;
     localDockerfile: string | null;
+    localStartScript: string | null;
     devSourceMaps: string;
     useTscLoader: boolean;
     useServerHMR: boolean;