arui-scripts 13.4.0-feat-vite-dev-build.4 → 13.4.0

package/CHANGELOG.md

@@ -1,31 +1,14 @@
-# [13.4.0-feat-vite-dev-build.4](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.4.0-feat-vite-dev-build.3...v13.4.0-feat-vite-dev-build.4) (2023-01-20)
+# [13.4.0](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.3.1...v13.4.0) (2023-02-06)
 
 
 ### Bug Fixes
 
-* **vite:** hide warnings about css imports ([e21cd2c](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/e21cd2cce47f4c8e9a212183f4ff9bab90a267fe))
-
-# [13.4.0-feat-vite-dev-build.3](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.4.0-feat-vite-dev-build.2...v13.4.0-feat-vite-dev-build.3) (2023-01-20)
-
-
-### Bug Fixes
-
-* **vite:** correct module resolution ([e8332ed](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/e8332ed13d964ba4c190554aa69ff5f4d109ca99))
-* **vite:** increase reload timeout ([93568f0](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/93568f0eaf62be5029edf6d568078c3911b46960))
-
-# [13.4.0-feat-vite-dev-build.2](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.4.0-feat-vite-dev-build.1...v13.4.0-feat-vite-dev-build.2) (2023-01-20)
-
-
-### Bug Fixes
-
-* **vite:** small fixes in start up process ([aa1588e](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/aa1588e186dafb93a9169f64f71a93fb0741448a))
-
-# [13.4.0-feat-vite-dev-build.1](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.3.1...v13.4.0-feat-vite-dev-build.1) (2023-01-20)
+* **dockerfile:** reduce image size ([13fc2f8](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/13fc2f894569db24d362e3aaf13bc9a15f34378f))
 
 
 ### Features
 
-* add vite as dev build server ([7a2059e](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/7a2059e00c86c3cb21fb5e23bb29574c2360007f))
+* **get-defaults.ts:** run from non root by default ([b9130b7](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/b9130b7c518ad6023fa0d3f8bf6818af7d7e9081))
 
 ## [13.3.1](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.3.0...v13.3.1) (2022-12-13)
 

package/build/bin/index.js

@@ -3,7 +3,6 @@
 /* eslint import/no-dynamic-require: 0 */
 const commands = {
     start: () => require('../commands/start'),
-    'start-vite': () => require('../commands/start-vite'),
     build: () => require('../commands/build'),
     'docker-build': () => require('../commands/docker-build'),
     'docker-build:compiled': () => require('../commands/docker-build-compiled'),

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 (0, exec_1.default)('npm run build');
+        yield exec_1.default('npm run build');
         console.timeEnd('Build application time');
         console.time('Remove build dependencies time');
-        const pruneCommand = (0, yarn_1.getPruningCommand)();
-        yield (0, exec_1.default)(pruneCommand);
+        const pruneCommand = yarn_1.getPruningCommand();
+        yield 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';
-type BuildResult = {
+declare 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 = (0, webpack_1.default)(config);
+    let compiler = webpack_1.default(config);
     return new Promise((resolve, reject) => {
         compiler.run((err, stats) => {
             if (err) {
                 return reject(err);
             }
-            const messages = (0, format_webpack_messages_1.default)(stats === null || stats === void 0 ? void 0 : stats.toJson({}));
+            const messages = 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...'));
-(0, build_wrapper_1.default)(webpack_client_prod_1.default)
+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 @@ console.log(chalk_1.default.magenta('Building client...'));
     }
     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);
+        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);
     }
     if (Array.isArray(webpack_client_prod_1.default)) {
         webpack_client_prod_1.default.forEach(printOutputSizes);
@@ -36,6 +36,6 @@ console.log(chalk_1.default.magenta('Building client...'));
 })
     .catch((err) => {
     console.log(chalk_1.default.red('Failed to compile client.\n'));
-    (0, printBuildError_1.default)(err);
+    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 (!(0, check_required_files_1.default)()) {
+if (!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 = (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 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 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...'));
-(0, build_wrapper_1.default)(webpack_server_prod_1.default)
+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 @@ console.log(chalk_1.default.magenta('Building server...'));
 })
     .catch((err) => {
     console.log(chalk_1.default.red('Failed to compile server.\n'));
-    (0, printBuildError_1.default)(err);
+    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 (0, make_tmp_dir_1.default)();
+    const tmpDir = yield 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;
-    (0, webpack_1.default)(clientWebpackConfig).run(() => { });
+    webpack_1.default(clientWebpackConfig).run(() => { });
 }))();

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

@@ -21,12 +21,12 @@ 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 } = (0, docker_build_1.getBuildParamsFromArgs)();
+    const { imageFullName, pathToTempDir, tempDirName } = docker_build_1.getBuildParamsFromArgs();
     try {
         console.log(`Build docker image ${imageFullName}`);
         console.time('Total time');
         console.time('Setting up time');
-        yield (0, docker_build_1.prepareFilesForDocker)({
+        yield docker_build_1.prepareFilesForDocker({
             pathToTempDir,
             dockerfileTemplate: dockerfile_template_1.default,
             nginxConfTemplate: nginx_conf_template_1.default,
@@ -37,16 +37,16 @@ const yarn_1 = require("../util/yarn");
         console.timeEnd('Setting up time');
         console.time('Build application time');
         // run build script
-        yield (0, exec_1.default)('npm run build');
+        yield 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 = (0, yarn_1.getPruningCommand)();
-            yield (0, exec_1.default)(pruneCommand);
+            const pruneCommand = yarn_1.getPruningCommand();
+            yield exec_1.default(pruneCommand);
             console.timeEnd('Remove dev dependencies time');
         }
         console.time('Build docker image time');
-        yield (0, exec_1.default)(`docker build -f "./${tempDirName}/Dockerfile" \\
+        yield 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 +55,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 (0, exec_1.default)(`docker push ${imageFullName}`);
+            yield 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,25 @@ 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 } = (0, docker_build_1.getBuildParamsFromArgs)();
+    const { imageFullName, pathToTempDir, tempDirName } = docker_build_1.getBuildParamsFromArgs();
     try {
         console.log(`Build docker image ${imageFullName}`);
         console.time('Total time');
-        yield (0, docker_build_1.prepareFilesForDocker)({
+        yield docker_build_1.prepareFilesForDocker({
             pathToTempDir,
             dockerfileTemplate: dockerfile_compiled_template_1.default,
             nginxConfTemplate: nginx_conf_template_1.default,
             startScript: start_template_1.default,
             allowLocalDockerfile: false,
         });
-        yield (0, exec_1.default)('echo "node_modules" >> .dockerignore');
-        yield (0, exec_1.default)(`docker build -f "./${tempDirName}/Dockerfile" \\
+        yield exec_1.default('echo "node_modules" >> .dockerignore');
+        yield 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 (0, exec_1.default)(`docker push ${imageFullName}`);
+            yield 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 = (0, webpack_1.default)(webpack_client_dev_1.default);
+const clientCompiler = 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) => (0, print_compiler_output_1.default)('Client', stats));
+clientCompiler.hooks.done.tap('client', (stats) => print_compiler_output_1.default('Client', stats));
 const DEFAULT_PORT = dev_server_1.default.port;
 const HOST = '0.0.0.0';
-(0, WebpackDevServerUtils_1.choosePort)(HOST, +(DEFAULT_PORT || 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 (!(0, check_required_files_1.default)()) {
+if (!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 = (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 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 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 = (0, webpack_1.default)(webpack_server_dev_1.default);
+const serverCompiler = 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) => (0, print_compiler_output_1.default)('Server', stats));
+serverCompiler.hooks.done.tap('server', (stats) => 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';
-type AssetSize = {
+declare type AssetSize = {
     name: string;
     fullName: string;
     gzipSize: number;
@@ -9,7 +9,7 @@ type AssetSize = {
     gzipLabel: string;
     brotliLabel: string;
 };
-type TotalSizes = {
+declare type TotalSizes = {
     size: number;
     sizeLabel: string;
     gzipSize: number;
@@ -17,7 +17,7 @@ type TotalSizes = {
     brotliSize: number;
     brotliLabel: string;
 };
-type ClientAssetsSizes = {
+declare 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 = (0, gzip_size_1.sync)(fileContents);
+        const size = 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: (0, filesize_1.default)(asset.size),
-            gzipLabel: (0, filesize_1.default)(size),
-            brotliLabel: brSize ? (0, filesize_1.default)(brSize) : '-'
+            sizeLabel: filesize_1.default(asset.size),
+            gzipLabel: filesize_1.default(size),
+            brotliLabel: brSize ? 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 = (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) : '-';
+    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) : '-';
     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 = (0, strip_ansi_1.default)(a.gzipLabel).length;
+        const sizeLength = 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 = (0, strip_ansi_1.default)(sizeLabel).length;
+        const sizeLength = 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,7 +3,7 @@ export declare function getBuildParamsFromArgs(): {
     imageFullName: string;
     tempDirName: string;
 };
-type PrepareFilesForDockerParams = {
+declare type PrepareFilesForDockerParams = {
     dockerfileTemplate: string;
     nginxConfTemplate: string;
     startScript: string;

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

@@ -1,4 +1,4 @@
-type YarnVersion = '1' | '2+' | 'unavailable';
+declare 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"];
-type ArrayElementType<ArrayType extends ReadonlyArray<unknown>> = ArrayType[number];
-export type PackageSettings = Partial<Pick<AppConfigs, ArrayElementType<typeof availablePackageSettings>>>;
+declare type ArrayElementType<ArrayType extends ReadonlyArray<unknown>> = ArrayType[number];
+export declare 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 = (0, resolve_1.resolveNodeModuleRelativeTo)(config.cwd, '@babel/runtime/package.json');
+        const pathToProjectBabelRuntime = 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 (0, lodash_merge_1.default)(config, {
+    return 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),
+        clientPolyfillsEntry: 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

@@ -17,7 +17,7 @@ function getDefaults() {
     const absoluteNodeModulesPath = path_1.default.resolve(CWD, 'node_modules');
     const projectTsConfigPath = path_1.default.join(CWD, 'tsconfig.json');
     const yarnLockFilePath = path_1.default.join(CWD, 'yarn.lock');
-    const overridesPath = (0, resolve_1.tryResolve)(path_1.default.join(CWD, 'arui-scripts.overrides'));
+    const overridesPath = 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');
     return {
@@ -34,7 +34,7 @@ function getDefaults() {
         assetsPath: 'assets',
         additionalBuildPath: ['config'],
         nginxRootPath: '/src',
-        runFromNonRootUser: false,
+        runFromNonRootUser: true,
         archiveName: 'build.tar',
         babelRuntimeVersion: '7.0.0-beta.0',
         // server compilation configs
@@ -56,7 +56,6 @@ function getDefaults() {
         clientServerPort: 8080,
         serverPort: 3000,
         installServerSourceMaps: false,
-        viteDevPort: 23891,
         debug: false,
         overridesPath: overridesPath ? [overridesPath] : [],
         statsOutputFilename: 'stats.json',

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 = (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);
+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);
 exports.default = config;

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

@@ -1,4 +1,4 @@
-export type AppConfigs = {
+export declare type AppConfigs = {
     appPackage: any;
     name: string;
     version: string;
@@ -30,7 +30,6 @@ export type AppConfigs = {
     clientServerPort: number;
     serverPort: number;
     installServerSourceMaps: boolean;
-    viteDevPort: number;
     debug: boolean;
     overridesPath: string[];
     statsOutputFilename: string;

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

@@ -10,15 +10,15 @@ 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 appConfigPath = 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.default)(available_package_settings_1.availablePackageSettings, appSettings);
-        config = (0, lodash_merge_1.default)(config, appSettings);
+        validate_settings_keys_1.default(available_package_settings_1.availablePackageSettings, appSettings);
+        config = lodash_merge_1.default(config, appSettings);
     }
     return config;
 }

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

@@ -14,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.default)(available_package_settings_1.availablePackageSettings, envSettings);
-        return (0, lodash_merge_1.default)(config, envSettings);
+        validate_settings_keys_1.default(available_package_settings_1.availablePackageSettings, envSettings);
+        return lodash_merge_1.default(config, envSettings);
     }
     catch (e) {
         console.error(e);

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

@@ -9,7 +9,7 @@ const validate_settings_keys_1 = __importDefault(require("./validate-settings-ke
 const available_package_settings_1 = require("./available-package-settings");
 function updateWithPackage(config) {
     const packageSettings = config.appPackage.aruiScripts || {};
-    (0, validate_settings_keys_1.default)(available_package_settings_1.availablePackageSettings, packageSettings);
-    return (0, lodash_merge_1.default)(config, packageSettings);
+    validate_settings_keys_1.default(available_package_settings_1.availablePackageSettings, packageSettings);
+    return lodash_merge_1.default(config, packageSettings);
 }
 exports.updateWithPackage = updateWithPackage;

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

@@ -13,16 +13,16 @@ function updateWithPresets(config) {
     if (!packageSettings.presets) {
         return config;
     }
-    const presetsConfigPath = (0, resolve_1.tryResolve)(`${packageSettings.presets}/arui-scripts.config`, { paths: [config.cwd] });
-    const presetsOverridesPath = (0, resolve_1.tryResolve)(`${packageSettings.presets}/arui-scripts.overrides`, { paths: [config.cwd] });
+    const presetsConfigPath = resolve_1.tryResolve(`${packageSettings.presets}/arui-scripts.config`, { paths: [config.cwd] });
+    const presetsOverridesPath = resolve_1.tryResolve(`${packageSettings.presets}/arui-scripts.overrides`, { paths: [config.cwd] });
     if (presetsConfigPath) {
         let presetsSettings = require(presetsConfigPath);
         if (presetsSettings.__esModule) {
             // ts-node импортирует esModules, из них надо вытягивать default именно так
             presetsSettings = presetsSettings.default;
         }
-        (0, validate_settings_keys_1.default)(available_package_settings_1.availablePackageSettings, presetsSettings);
-        config = (0, lodash_merge_1.default)(config, presetsSettings);
+        validate_settings_keys_1.default(available_package_settings_1.availablePackageSettings, presetsSettings);
+        config = lodash_merge_1.default(config, presetsSettings);
     }
     if (presetsOverridesPath) {
         config.overridesPath.unshift(presetsOverridesPath);

package/build/configs/babel-client.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const supporting_browsers_1 = __importDefault(require("./supporting-browsers"));
 const app_configs_1 = __importDefault(require("./app-configs"));
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
-const babelClientConfig = (0, apply_overrides_1.default)(['babel', 'babelClient'], {
+const babelClientConfig = apply_overrides_1.default(['babel', 'babelClient'], {
     presets: [
         [
             require.resolve('@babel/preset-env'),

package/build/configs/babel-dependencies.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.babelDependencies = void 0;
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
 const app_configs_1 = __importDefault(require("./app-configs"));
-exports.babelDependencies = (0, apply_overrides_1.default)('babelDependencies', {
+exports.babelDependencies = apply_overrides_1.default('babelDependencies', {
     sourceType: 'unambiguous',
     presets: [
         [

package/build/configs/babel-server.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
 const app_configs_1 = __importDefault(require("./app-configs"));
-const config = (0, apply_overrides_1.default)(['babel', 'babelServer'], {
+const config = apply_overrides_1.default(['babel', 'babelServer'], {
     presets: [
         [
             require.resolve('@babel/preset-env'),

package/build/configs/dev-server.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const app_configs_1 = __importDefault(require("./app-configs"));
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
-const devServerConfig = (0, apply_overrides_1.default)('devServer', {
+const devServerConfig = apply_overrides_1.default('devServer', {
     port: app_configs_1.default.clientServerPort,
     liveReload: false,
     client: {

package/build/configs/jest/file-transform.d.ts

@@ -1 +1,2 @@
-export function process(src: any, filename: any): string;
+export declare function process(src: any, filename: any): string;
+export declare function process(src: any, filename: any): string;