arui-scripts 17.0.2 → 17.1.1

package/build/configs/webpack.client.js

@@ -15,6 +15,7 @@ const assets_webpack_plugin_1 = __importDefault(require("assets-webpack-plugin")
 const case_sensitive_paths_webpack_plugin_1 = __importDefault(require("case-sensitive-paths-webpack-plugin"));
 const compression_webpack_plugin_1 = __importDefault(require("compression-webpack-plugin"));
 const fork_ts_checker_webpack_plugin_1 = __importDefault(require("fork-ts-checker-webpack-plugin"));
+const html_webpack_plugin_1 = __importDefault(require("html-webpack-plugin"));
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 const mini_svg_data_uri_1 = __importDefault(require("mini-svg-data-uri"));
 const terser_webpack_plugin_1 = __importDefault(require("terser-webpack-plugin"));
@@ -22,38 +23,39 @@ const tsconfig_paths_webpack_plugin_1 = __importDefault(require("tsconfig-paths-
 const webpack_1 = __importDefault(require("webpack"));
 const webpack_deduplication_plugin_1 = require("webpack-deduplication-plugin");
 const webpack_manifest_plugin_1 = require("webpack-manifest-plugin");
+const arui_runtime_1 = require("../plugins/arui-runtime");
+const html_template_1 = require("../templates/html.template");
 const minimizers_1 = require("./config-extras/minimizers");
 const check_node_version_1 = __importDefault(require("./util/check-node-version"));
 const get_entry_1 = __importDefault(require("./util/get-entry"));
-const app_configs_1 = __importDefault(require("./app-configs"));
+const get_webpack_cache_dependencies_1 = require("./util/get-webpack-cache-dependencies");
+const app_configs_1 = require("./app-configs");
 const babel_client_1 = __importDefault(require("./babel-client"));
 const babel_dependencies_1 = require("./babel-dependencies");
 const modules_1 = require("./modules");
 const postcss_1 = __importDefault(require("./postcss"));
 const process_assets_plugin_output_1 = require("./process-assets-plugin-output");
-const arui_runtime_1 = require("../plugins/arui-runtime");
-const get_webpack_cache_dependencies_1 = require("./util/get-webpack-cache-dependencies");
 const PnpWebpackPlugin = require('pnp-webpack-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const noopPath = require.resolve('./util/noop');
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function getSingleEntry(entryPoint, mode) {
     return [
-        ...(Array.isArray(app_configs_1.default.clientPolyfillsEntry)
-            ? app_configs_1.default.clientPolyfillsEntry
-            : [app_configs_1.default.clientPolyfillsEntry]),
+        ...(Array.isArray(app_configs_1.configs.clientPolyfillsEntry)
+            ? app_configs_1.configs.clientPolyfillsEntry
+            : [app_configs_1.configs.clientPolyfillsEntry]),
         ...entryPoint,
     ].filter(Boolean);
 }
 // Нам важно шарить assets plugin между разными сборками, чтобы файл не перезаписывался
 const assetsPlugin = new assets_webpack_plugin_1.default({
-    path: app_configs_1.default.serverOutputPath,
+    path: app_configs_1.configs.serverOutputPath,
     processOutput: process_assets_plugin_output_1.processAssetsPluginOutput,
 });
 // Этот плагин нужен для того, чтобы клиентский код так же могу получить информацию о сборке.
 // Это позволяет нам использовать данные о сборки на клиенте.
 const clientAssetsPlugin = new assets_webpack_plugin_1.default({
-    path: app_configs_1.default.clientOutputPath,
+    path: app_configs_1.configs.clientOutputPath,
     processOutput: process_assets_plugin_output_1.processAssetsPluginOutput,
 });
 function getMinimizeConfig(mode) {
@@ -104,7 +106,7 @@ function getMinimizeConfig(mode) {
             ].filter(Boolean),
         };
     }
-    if (app_configs_1.default.keepCssVars) {
+    if (app_configs_1.configs.keepCssVars) {
         // Каждый импорт css файла с переменными приводит к дублированию всего набора.
         // Чтобы этого избежать — проходимся плагином, который удалит дубли из выходного файла.
         return {
@@ -132,20 +134,20 @@ function getMinimizeConfig(mode) {
  * @param configName Имя конфигурации, если не указано, то используется имя по умолчанию
  */
 // eslint-disable-next-line complexity
-const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.assign(Object.assign({}, (configName ? { name: configName } : {})), { target: 'web', mode: mode === 'dev' ? 'development' : 'production', devtool: mode === 'dev' ? app_configs_1.default.devSourceMaps : 'source-map', entry: (0, get_entry_1.default)(entry, getSingleEntry, mode), 
+const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.assign(Object.assign({}, (configName ? { name: configName } : {})), { target: 'web', mode: mode === 'dev' ? 'development' : 'production', devtool: mode === 'dev' ? app_configs_1.configs.devSourceMaps : 'source-map', entry: (0, get_entry_1.default)(entry, getSingleEntry, mode), 
     // in production mode we need to fail on first error
-    bail: mode === 'prod', context: app_configs_1.default.cwd, output: {
+    bail: mode === 'prod', context: app_configs_1.configs.cwd, output: {
         assetModuleFilename: 'static/media/[name].[hash:8][ext]',
         // Add /* filename */ comments to generated require()s in the output.
         pathinfo: mode === 'dev',
-        path: app_configs_1.default.clientOutputPath,
-        publicPath: app_configs_1.default.publicPath,
+        path: app_configs_1.configs.clientOutputPath,
+        publicPath: app_configs_1.configs.publicPath,
         filename: mode === 'dev' ? '[name].js' : '[name].[chunkhash:8].js',
         chunkFilename: mode === 'dev'
             ? `${configName ? `${configName}-` : ''}[name].js`
             : `${configName ? `${configName}-` : ''}[name].[chunkhash:8].chunk.js`,
         // Point sourcemap entries to original disk location (format as URL on Windows)
-        devtoolModuleFilenameTemplate: (info) => path_1.default.relative(app_configs_1.default.appSrc, info.absoluteResourcePath).replace(/\\/g, '/'),
+        devtoolModuleFilenameTemplate: (info) => path_1.default.relative(app_configs_1.configs.appSrc, info.absoluteResourcePath).replace(/\\/g, '/'),
     }, optimization: Object.assign(Object.assign({}, getMinimizeConfig(mode)), { splitChunks: mode === 'prod'
             ? {
                 chunks: 'all',
@@ -179,7 +181,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
         // We placed these paths second because we want `node_modules` to "win"
         // if there are any conflicts. This matches Node resolution mechanism.
         // https://github.com/facebookincubator/create-react-app/issues/253
-        modules: ['node_modules', app_configs_1.default.appNodeModules],
+        modules: ['node_modules', app_configs_1.configs.appNodeModules],
         // These are the reasonable defaults supported by the Node ecosystem.
         // We also include JSX as a common component filename extension to support
         // some tools, although we do not recommend using it, see:
@@ -188,9 +190,9 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
         // for React Native Web.
         extensions: ['.web.js', '.mjs', '.cjs', '.js', '.json', '.web.jsx', '.jsx', '.ts', '.tsx'],
         plugins: [
-            app_configs_1.default.tsconfig &&
+            app_configs_1.configs.tsconfig &&
                 new tsconfig_paths_webpack_plugin_1.default({
-                    configFile: app_configs_1.default.tsconfig,
+                    configFile: app_configs_1.configs.tsconfig,
                     extensions: [
                         '.web.js',
                         '.mjs',
@@ -213,7 +215,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
         : false, module: {
         // typescript interface will be removed from modules, and we will get an error on correct code
         // see https://github.com/webpack/webpack/issues/7378
-        strictExportPresence: !app_configs_1.default.tsconfig,
+        strictExportPresence: !app_configs_1.configs.tsconfig,
         rules: [
             {
                 // "oneOf" will traverse all following loaders until one will
@@ -222,10 +224,10 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
                 oneOf: [
                     // Process JS with Babel.
                     {
-                        test: app_configs_1.default.useTscLoader
+                        test: app_configs_1.configs.useTscLoader
                             ? /\.(js|jsx|mjs|cjs)$/
                             : /\.(js|jsx|mjs|ts|tsx|cjs)$/,
-                        include: app_configs_1.default.appSrc,
+                        include: app_configs_1.configs.appSrc,
                         loader: require.resolve('babel-loader'),
                         options: Object.assign(Object.assign({}, babel_client_1.default), { cacheDirectory: mode === 'dev', cacheCompression: false, plugins: [
                                 ...babel_client_1.default.plugins,
@@ -237,8 +239,8 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
                                     : undefined,
                             ].filter(Boolean) }),
                     },
-                    app_configs_1.default.tsconfig &&
-                        app_configs_1.default.useTscLoader && {
+                    app_configs_1.configs.tsconfig &&
+                        app_configs_1.configs.useTscLoader && {
                         test: /\.tsx?$/,
                         use: [
                             {
@@ -262,7 +264,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
                                     onlyCompileBundledFiles: true,
                                     transpileOnly: true,
                                     happyPackMode: true,
-                                    configFile: app_configs_1.default.tsconfig,
+                                    configFile: app_configs_1.configs.tsconfig,
                                 },
                             },
                         ],
@@ -337,7 +339,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
                         },
                         parser: {
                             dataUrlCondition: {
-                                maxSize: app_configs_1.default.dataUrlMaxSize,
+                                maxSize: app_configs_1.configs.dataUrlMaxSize,
                             },
                         },
                     },
@@ -346,7 +348,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
                         type: 'asset',
                         parser: {
                             dataUrlCondition: {
-                                maxSize: app_configs_1.default.dataUrlMaxSize,
+                                maxSize: app_configs_1.configs.dataUrlMaxSize,
                             },
                         },
                     },
@@ -363,16 +365,23 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
             'process.env': '{}' }, (mode === 'dev'
             ? { 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV) }
             : {}))),
-        new mini_css_extract_plugin_1.default({
-            ignoreOrder: true,
-            filename: mode === 'dev' ? '[name].css' : '[name].[contenthash:8].css',
-            chunkFilename: mode === 'dev' ? '[id].css' : '[name].[contenthash:8].chunk.css',
-            insert: (0, arui_runtime_1.getInsertCssRuntimeMethod)(),
-        }),
-        (mode === 'prod' || !app_configs_1.default.disableDevWebpackTypecheck)
-            && app_configs_1.default.tsconfig !== null
-            && !app_configs_1.default.useTscLoader
-            && new fork_ts_checker_webpack_plugin_1.default(),
+        new mini_css_extract_plugin_1.default((() => {
+            const prefix = `${configName ? `${configName}-` : ''}`;
+            return {
+                ignoreOrder: true,
+                filename: mode === 'dev'
+                    ? `${prefix}[name].css`
+                    : `${prefix}[name].[contenthash:8].css`,
+                chunkFilename: mode === 'dev'
+                    ? `${prefix}[name].css`
+                    : `${prefix}[name].[contenthash:8].chunk.css`,
+                insert: (0, arui_runtime_1.getInsertCssRuntimeMethod)(),
+            };
+        })()),
+        (mode === 'prod' || !app_configs_1.configs.disableDevWebpackTypecheck) &&
+            app_configs_1.configs.tsconfig !== null &&
+            !app_configs_1.configs.useTscLoader &&
+            new fork_ts_checker_webpack_plugin_1.default(),
         // moment.js очень большая библиотека, которая включает в себя массу локализаций, которые мы не используем.
         // Поэтому мы их просто игнорируем, чтобы не включать в сборку.
         // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
@@ -385,10 +394,10 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
         // например проект зависит от lodash@1, библиотеки A и B зависят от lodash@2. Тогда lodash@2 будет включен в сборку
         // дважды, что приведет к увеличению размера бандла (и это не лечится дедубликацией в yarn/npm).
         // Сама реализация плагина зависит от yarn.lock, поэтому если мы используем npm, то плагин не будет работать.
-        app_configs_1.default.useYarn &&
+        app_configs_1.configs.useYarn &&
             new webpack_deduplication_plugin_1.WebpackDeduplicationPlugin({
-                cacheDir: path_1.default.join(app_configs_1.default.cwd, 'node_modules/.cache/deduplication-webpack-plugin/'),
-                rootPath: app_configs_1.default.cwd,
+                cacheDir: path_1.default.join(app_configs_1.configs.cwd, 'node_modules/.cache/deduplication-webpack-plugin/'),
+                rootPath: app_configs_1.configs.cwd,
             }),
         // dev plugins:
         mode === 'dev' &&
@@ -400,6 +409,11 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
         // See https://github.com/facebookincubator/create-react-app/issues/240
         mode === 'dev' && new case_sensitive_paths_webpack_plugin_1.default(),
         new arui_runtime_1.AruiRuntimePlugin(),
+        app_configs_1.configs.clientOnly &&
+            new html_webpack_plugin_1.default({
+                templateContent: html_template_1.htmlTemplate,
+                filename: '../index.html',
+            }),
         // production plugins:
         mode === 'prod' && new webpack_manifest_plugin_1.WebpackManifestPlugin(),
         mode === 'prod' &&
@@ -425,17 +439,17 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
         // Ignore prop-types packages in production mode
         // This should works fine, since proptypes usage should be eliminated in production mode
         mode === 'prod' &&
-            !app_configs_1.default.keepPropTypes &&
+            !app_configs_1.configs.keepPropTypes &&
             new webpack_1.default.NormalModuleReplacementPlugin(/^react-style-proptype$/, noopPath),
         mode === 'prod' &&
-            !app_configs_1.default.keepPropTypes &&
+            !app_configs_1.configs.keepPropTypes &&
             new webpack_1.default.NormalModuleReplacementPlugin(/^thrift-services\/proptypes/, noopPath),
     ].filter(Boolean), experiments: {
-        backCompat: app_configs_1.default.webpack4Compatibility,
+        backCompat: app_configs_1.configs.webpack4Compatibility,
     }, 
     // Без этого комиляция трирегилась на изменение в node_modules и приводила к утечке памяти
     watchOptions: {
-        ignored: new RegExp(app_configs_1.default.watchIgnorePath.join('|')),
+        ignored: new RegExp(app_configs_1.configs.watchIgnorePath.join('|')),
         aggregateTimeout: 100,
     }, 
     // Выключаем performance hints, т.к. размеры бандлов контролируются не в рамках arui-scripts
@@ -445,8 +459,8 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
 exports.createSingleClientWebpackConfig = createSingleClientWebpackConfig;
 const createClientWebpackConfig = (mode) => {
     var _a;
-    const appWebpackConfig = (0, modules_1.patchMainWebpackConfigForModules)((0, exports.createSingleClientWebpackConfig)(mode, app_configs_1.default.clientEntry));
-    const exposedCompatModules = (_a = app_configs_1.default.compatModules) === null || _a === void 0 ? void 0 : _a.exposes;
+    const appWebpackConfig = (0, modules_1.patchMainWebpackConfigForModules)((0, exports.createSingleClientWebpackConfig)(mode, app_configs_1.configs.clientEntry));
+    const exposedCompatModules = (_a = app_configs_1.configs.compatModules) === null || _a === void 0 ? void 0 : _a.exposes;
     if (!exposedCompatModules || Object.keys(exposedCompatModules).length === 0) {
         return appWebpackConfig;
     }

package/build/templates/dockerfile.template.js

@@ -3,9 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const app_configs_1 = __importDefault(require("../configs/app-configs"));
+const app_configs_1 = require("../configs/app-configs");
 const apply_overrides_1 = __importDefault(require("../configs/util/apply-overrides"));
-const nginxNonRootPart = app_configs_1.default.runFromNonRootUser
+const appPathToAdd = app_configs_1.configs.clientOnly ? app_configs_1.configs.buildPath : '.';
+const appTargetPath = app_configs_1.configs.clientOnly ? `/src/${app_configs_1.configs.buildPath}` : '/src';
+const nginxConfTargetLocation = app_configs_1.configs.clientOnly ? '/etc/nginx/conf.d/default.conf' : '/src/nginx.conf';
+const nginxNonRootPart = app_configs_1.configs.runFromNonRootUser
     ? `RUN chown -R nginx:nginx /src && \\
        mkdir -p /var/lib/nginx && \\
        chown -R nginx:nginx /var/lib/nginx && \\
@@ -18,15 +21,17 @@ const nginxNonRootPart = app_configs_1.default.runFromNonRootUser
    USER nginx`
     : '';
 const dockerfileTemplate = `
-FROM ${app_configs_1.default.baseDockerImage}
+FROM ${app_configs_1.configs.baseDockerImage}
 ARG START_SH_LOCATION
 ARG NGINX_CONF_LOCATION
 
 WORKDIR /src
-ADD $START_SH_LOCATION /src/start.sh
-ADD $NGINX_CONF_LOCATION /src/nginx.conf
+ADD $NGINX_CONF_LOCATION ${nginxConfTargetLocation}
+
 ${nginxNonRootPart}
-${app_configs_1.default.runFromNonRootUser ? 'ADD --chown=nginx:nginx . /src' : 'ADD . /src'}
 
+${app_configs_1.configs.runFromNonRootUser ? `ADD --chown=nginx:nginx ${appPathToAdd} ${appTargetPath}` : `ADD ${appPathToAdd} ${appTargetPath}`}
+
+${app_configs_1.configs.clientOnly ? 'CMD ["nginx"]' : 'CMD ["/bin/sh", "-c" "./start.sh"'}
 `;
 exports.default = (0, apply_overrides_1.default)('Dockerfile', dockerfileTemplate);

package/build/templates/html.template.d.ts

@@ -0,0 +1 @@
+export declare const htmlTemplate = "<!doctype html>\n<html lang=\"ru\">\n  <head>\n    <meta charset=\"utf-8\" />\n    <title>React-app</title>\n    <link\n     rel=\"shortcut icon\"\n     href=\"data:image/svg+xml,%3Csvg viewBox='0 0 100 100' xmlns='http://www.w3.org/2000/svg'%3E%3Ccircle cx='50' cy='50' r='50' fill='%23EF3124' /%3E%3C/svg%3E\"\n    >\n  </head>\n  <body>\n  <div id=\"react-app\"></div>\n  </body>\n</html>";

package/build/templates/html.template.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.htmlTemplate = void 0;
+const apply_overrides_1 = __importDefault(require("../configs/util/apply-overrides"));
+const template = `<!doctype html>
+<html lang="ru">
+  <head>
+    <meta charset="utf-8" />
+    <title>React-app</title>
+    <link
+     rel="shortcut icon"
+     href="data:image/svg+xml,%3Csvg viewBox='0 0 100 100' xmlns='http://www.w3.org/2000/svg'%3E%3Ccircle cx='50' cy='50' r='50' fill='%23EF3124' /%3E%3C/svg%3E"
+    >
+  </head>
+  <body>
+  <div id="react-app"></div>
+  </body>
+</html>`;
+exports.htmlTemplate = (0, apply_overrides_1.default)('html', template);

package/build/templates/nginx.conf.template.js

@@ -3,29 +3,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const app_configs_1 = __importDefault(require("../configs/app-configs"));
+const app_configs_1 = require("../configs/app-configs");
 const apply_overrides_1 = __importDefault(require("../configs/util/apply-overrides"));
 const nginxTemplate = `client_max_body_size 20m;
 
 server {
-    listen ${app_configs_1.default.clientServerPort};
+    listen ${app_configs_1.configs.clientServerPort};
     server_tokens off;
 
-    location / {
+    ${app_configs_1.configs.clientOnly
+    ? `location / {
+        root ${app_configs_1.configs.nginxRootPath}/${app_configs_1.configs.buildPath};
+        index index.html;
+        }`
+    : ` location / {
         proxy_set_header Host $host;
-        proxy_pass http://127.0.0.1:${app_configs_1.default.serverPort};
-    }
+        proxy_pass http://127.0.0.1:${app_configs_1.configs.serverPort};
+    }`}
 
-    location /${app_configs_1.default.publicPath} {
+    location /${app_configs_1.configs.publicPath} {
         expires max;
         add_header Cache-Control public;
-        root ${app_configs_1.default.nginxRootPath}/${app_configs_1.default.buildPath};
+        root ${app_configs_1.configs.nginxRootPath}/${app_configs_1.configs.buildPath};
     }
 
-    location ~ /${app_configs_1.default.publicPath}.*\\.js$ {
+    location ~ /${app_configs_1.configs.publicPath}.*\\.js$ {
         expires max;
         add_header Cache-Control public;
-        root ${app_configs_1.default.nginxRootPath}/${app_configs_1.default.buildPath};
+        root ${app_configs_1.configs.nginxRootPath}/${app_configs_1.configs.buildPath};
         types {
             text/javascript  js;
         }