arui-scripts 15.3.0 → 15.4.1

package/build/configs/webpack.client.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createClientWebpackConfig = void 0;
+exports.createClientWebpackConfig = exports.createSingleClientWebpackConfig = void 0;
 const path_1 = __importDefault(require("path"));
 const webpack_1 = __importDefault(require("webpack"));
 const webpack_manifest_plugin_1 = require("webpack-manifest-plugin");
@@ -14,7 +14,6 @@ const compression_webpack_plugin_1 = __importDefault(require("compression-webpac
 const assets_webpack_plugin_1 = __importDefault(require("assets-webpack-plugin"));
 const tsconfig_paths_webpack_plugin_1 = __importDefault(require("tsconfig-paths-webpack-plugin"));
 const getCSSModuleLocalIdent_1 = __importDefault(require("react-dev-utils/getCSSModuleLocalIdent"));
-const PnpWebpackPlugin = require('pnp-webpack-plugin');
 const get_entry_1 = __importDefault(require("./util/get-entry"));
 const app_configs_1 = __importDefault(require("./app-configs"));
 const babel_client_1 = __importDefault(require("./babel-client"));
@@ -27,38 +26,50 @@ const case_sensitive_paths_webpack_plugin_1 = __importDefault(require("case-sens
 const webpack_deduplication_plugin_1 = require("webpack-deduplication-plugin");
 const minimizers_1 = require("./config-extras/minimizers");
 const mini_svg_data_uri_1 = __importDefault(require("mini-svg-data-uri"));
+const process_assets_plugin_output_1 = require("./process-assets-plugin-output");
+const PnpWebpackPlugin = require('pnp-webpack-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const noopPath = require.resolve('./util/noop');
 function getSingleEntry(entryPoint, mode) {
     return [
         ...(Array.isArray(app_configs_1.default.clientPolyfillsEntry) ? app_configs_1.default.clientPolyfillsEntry : [app_configs_1.default.clientPolyfillsEntry]),
-        mode === 'dev' ? require.resolve('webpack/hot/dev-server') : false,
         ...entryPoint
     ].filter(Boolean);
 }
-// This is the production configuration.
-const createClientWebpackConfig = (mode) => ({
-    target: 'web',
-    mode: mode === 'dev' ? 'development' : 'production',
-    devtool: mode === 'dev' ? app_configs_1.default.devSourceMaps : 'source-map',
-    entry: (0, get_entry_1.default)(app_configs_1.default.clientEntry, getSingleEntry, mode),
+// Нам важно шарить assets plugin между разными сборками, чтобы файл не перезаписывался
+const assetsPlugin = new assets_webpack_plugin_1.default({
+    path: app_configs_1.default.serverOutputPath,
+    processOutput: process_assets_plugin_output_1.processAssetsPluginOutput,
+});
+// Этот плагин нужен для того, чтобы клиентский код так же могу получить информацию о сборке.
+// Это позволяет нам использовать данные о сборки на клиенте.
+const clientAssetsPlugin = new assets_webpack_plugin_1.default({
+    path: app_configs_1.default.clientOutputPath,
+    processOutput: process_assets_plugin_output_1.processAssetsPluginOutput,
+});
+/**
+ * Создает конфигурацию для сборки клиентского кода. Может быть использована для создания дополнительных конфигураций.
+ * @param mode Режим сборки (dev или prod)
+ * @param entry Точка входа, любой валидный вход для webpack
+ * @param configName Имя конфигурации, если не указано, то используется имя по умолчанию
+ */
+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), 
     // 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.default.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,
         filename: mode === 'dev' ? '[name].js' : '[name].[chunkhash:8].js',
-        chunkFilename: mode === 'dev' ? '[name].js' : '[name].[chunkhash:8].chunk.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, '/'),
-    },
-    optimization: {
+    }, optimization: {
         splitChunks: mode === 'prod'
             ? {
                 chunks: "all",
@@ -72,7 +83,14 @@ const createClientWebpackConfig = (mode) => ({
                     vendor: {
                         test: /node_modules/,
                         chunks: "initial",
-                        name: "vendor",
+                        name: (_, chunks, cacheGroupKey) => {
+                            if (!configName) {
+                                return 'vendor';
+                            }
+                            // Нам нужно сделать так, чтобы у разных конфигураций были разные имена чанков
+                            const allChunksNames = chunks.map((item) => item.name).join('~');
+                            return `${cacheGroupKey}-${allChunksNames}`;
+                        },
                         priority: 10,
                         enforce: true
                     }
@@ -127,8 +145,7 @@ const createClientWebpackConfig = (mode) => ({
         // Оптимизации времени билда, см https://webpack.js.org/guides/build-performance/
         removeAvailableModules: mode !== 'dev',
         removeEmptyChunks: mode !== 'dev',
-    },
-    resolve: {
+    }, resolve: {
         // This allows you to set a fallback for where Webpack should look for modules.
         // We placed these paths second because we want `node_modules` to "win"
         // if there are any conflicts. This matches Node resolution mechanism.
@@ -147,21 +164,18 @@ const createClientWebpackConfig = (mode) => ({
                 extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx', '.ts', '.tsx']
             })),
         ].filter(Boolean)),
-    },
-    resolveLoader: {
+    }, resolveLoader: {
         plugins: [
             PnpWebpackPlugin.moduleLoader(module),
         ],
-    },
-    cache: mode === 'dev'
+    }, cache: mode === 'dev'
         ? {
             type: 'filesystem',
             buildDependencies: {
                 config: [__filename],
             },
         }
-        : false,
-    module: {
+        : 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,
@@ -294,9 +308,9 @@ const createClientWebpackConfig = (mode) => ({
             // ** STOP ** Are you adding a new loader?
             // Make sure to add the new loader(s) before asset modules
         ],
-    },
-    plugins: ([
-        new assets_webpack_plugin_1.default({ path: app_configs_1.default.serverOutputPath }),
+    }, plugins: ([
+        assetsPlugin,
+        clientAssetsPlugin,
         new webpack_1.default.DefinePlugin(Object.assign({ 
             // Tell Webpack to provide empty mocks for process.env.
             'process.env': '{}' }, (mode === 'dev'
@@ -354,20 +368,20 @@ const createClientWebpackConfig = (mode) => ({
         // This should works fine, since proptypes usage should be eliminated in production mode
         mode === 'prod' && !app_configs_1.default.keepPropTypes && new webpack_1.default.NormalModuleReplacementPlugin(/^react-style-proptype$/, noopPath),
         mode === 'prod' && !app_configs_1.default.keepPropTypes && new webpack_1.default.NormalModuleReplacementPlugin(/^thrift-services\/proptypes/, noopPath)
-    ].filter(Boolean)),
-    experiments: {
+    ].filter(Boolean)), experiments: {
         backCompat: app_configs_1.default.webpack4Compatibility,
-    },
+    }, 
     // Без этого комиляция трирегилась на изменение в node_modules и приводила к утечке памяти
     watchOptions: {
         ignored: new RegExp(app_configs_1.default.watchIgnorePath.join('|')),
         aggregateTimeout: 100,
-    },
-    // Turn off performance hints during development because we don't do any
-    // splitting or minification in interest of speed. These warnings become
-    // cumbersome.
+    }, 
+    // Выключаем performance hints, т.к. размеры бандлов контролируются не в рамках arui-scripts
     performance: {
-        hints: mode === 'dev' ? false : 'warning',
-    },
-});
+        hints: false,
+    } }));
+exports.createSingleClientWebpackConfig = createSingleClientWebpackConfig;
+const createClientWebpackConfig = (mode) => {
+    return (0, exports.createSingleClientWebpackConfig)(mode, app_configs_1.default.clientEntry);
+};
 exports.createClientWebpackConfig = createClientWebpackConfig;

package/build/configs/webpack.client.prod.js

@@ -5,5 +5,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
 const webpack_client_1 = require("./webpack.client");
-const config = (0, apply_overrides_1.default)(['webpack', 'webpackClient', 'webpackProd', 'webpackClientProd'], (0, webpack_client_1.createClientWebpackConfig)('prod'));
+const config = (0, apply_overrides_1.default)(['webpack', 'webpackClient', 'webpackProd', 'webpackClientProd'], (0, webpack_client_1.createClientWebpackConfig)('prod'), { createSingleClientWebpackConfig: webpack_client_1.createSingleClientWebpackConfig.bind(null, 'prod') });
 exports.default = config;

package/build/index.d.ts

@@ -1,5 +1,5 @@
 export type { OverrideFile } from './configs/util/apply-overrides';
-export type { PackageSettings } from './configs/app-configs/available-package-settings';
+export type { AppConfigs, PackageSettings } from './configs/app-configs/types';
 export { prepareFilesForDocker } from './commands/util/docker-build';
 export { getBuildParamsFromArgs } from './commands/util/docker-build';
 export { getDockerBuildCommand } from './commands/util/docker-build';