arui-scripts 18.0.0 → 18.1.0

package/build/configs/webpack.client.js

@@ -36,6 +36,7 @@ const client_env_config_1 = require("./client-env-config");
 const modules_1 = require("./modules");
 const postcss_1 = __importDefault(require("./postcss"));
 const process_assets_plugin_output_1 = require("./process-assets-plugin-output");
+const swc_1 = require("./swc");
 const PnpWebpackPlugin = require('pnp-webpack-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const noopPath = require.resolve('./util/noop');
@@ -156,7 +157,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
                     commons: {
                         chunks: 'initial',
                         minChunks: 2,
-                        maxInitialRequests: 5,
+                        maxInitialRequests: 5, // The default limit is too small to showcase the effect
                         minSize: 0, // This is example is too small to create commons chunks
                     },
                     vendor: {
@@ -223,64 +224,12 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
                 // match the requirements. When no loader matches it will fall
                 // back to the "file" loader at the end of the loader list.
                 oneOf: [
-                    // Process JS with Babel.
-                    {
-                        test: app_configs_1.configs.useTscLoader
-                            ? /\.(js|jsx|mjs|cjs)$/
-                            : /\.(js|jsx|mjs|ts|tsx|cjs)$/,
-                        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,
-                                mode === 'dev'
-                                    ? [
-                                        require.resolve('react-refresh/babel'),
-                                        { skipEnvCheck: true },
-                                    ]
-                                    : undefined,
-                            ].filter(Boolean) }),
-                    },
-                    app_configs_1.configs.tsconfig &&
-                        app_configs_1.configs.useTscLoader && {
-                        test: /\.tsx?$/,
-                        use: [
-                            {
-                                loader: require.resolve('babel-loader'),
-                                options: Object.assign({ cacheDirectory: mode === 'dev', cacheCompression: false, 
-                                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                                    // @ts-ignore
-                                    plugins: mode === 'dev'
-                                        ? [
-                                            require.resolve('react-refresh/babel'),
-                                            { skipEnvCheck: true },
-                                        ]
-                                        : undefined }, babel_client_1.default),
-                            },
-                            {
-                                loader: require.resolve('ts-loader'),
-                                options: {
-                                    getCustomTransformers: () => ({
-                                        before: mode === 'dev' ? [(0, react_refresh_typescript_1.default)()] : [],
-                                    }),
-                                    onlyCompileBundledFiles: true,
-                                    transpileOnly: true,
-                                    happyPackMode: true,
-                                    configFile: app_configs_1.configs.tsconfig,
-                                },
-                            },
-                        ],
-                    },
-                    // Process any JS outside of the app with Babel.
-                    // Unlike the application JS, we only compile the standard ES features.
-                    {
-                        test: /\.(js|mjs)$/,
-                        exclude: /@babel(?:\/|\\{1,2})runtime/,
-                        loader: require.resolve('babel-loader'),
-                        resolve: {
-                            fullySpecified: false,
-                        },
-                        options: Object.assign(Object.assign({}, babel_dependencies_1.babelDependencies), { babelrc: false, configFile: false, compact: false, cacheDirectory: mode === 'dev', cacheCompression: false }),
-                    },
+                    // Обработка основного кода приложения
+                    getCodeLoader(mode),
+                    // обработка ts кода если codeLoader = tsc
+                    getTsLoaderIfEnabled(mode),
+                    // Обработка внешнего для приложения кода (node_modules)
+                    getExternalCodeLoader(mode),
                     // process simple css files with postcss loader and css loader
                     {
                         test: /\.css$/,
@@ -384,7 +333,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
         })()),
         (mode === 'prod' || !app_configs_1.configs.disableDevWebpackTypecheck) &&
             app_configs_1.configs.tsconfig !== null &&
-            !app_configs_1.configs.useTscLoader &&
+            app_configs_1.configs.codeLoader !== 'tsc' &&
             new fork_ts_checker_webpack_plugin_1.default(),
         // moment.js очень большая библиотека, которая включает в себя массу локализаций, которые мы не используем.
         // Поэтому мы их просто игнорируем, чтобы не включать в сборку.
@@ -417,7 +366,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
             new html_webpack_plugin_1.default({
                 templateContent: mode === 'dev'
                     ? (0, client_env_config_1.addEnvToHtmlTemplate)(html_template_1.htmlTemplate)
-                    : html_template_1.htmlTemplate,
+                    : html_template_1.htmlTemplate, // оставляем env шаблоны как есть для прод сборки - их будет менять start.sh
                 filename: '../index.html',
             }),
         mode === 'dev' && app_configs_1.configs.clientOnly && new client_env_config_1.ClientConfigPlugin(),
@@ -482,3 +431,77 @@ const createClientWebpackConfig = (mode) => {
     return [appWebpackConfig, ...modulesWebpackConfigs];
 };
 exports.createClientWebpackConfig = createClientWebpackConfig;
+function getCodeLoader(mode) {
+    var _a, _b, _c;
+    if (app_configs_1.configs.codeLoader === 'swc') {
+        return {
+            test: /\.(js|jsx|mjs|ts|tsx|cjs)$/,
+            include: app_configs_1.configs.appSrc,
+            loader: require.resolve('swc-loader'),
+            options: Object.assign(Object.assign({ cacheDirectory: mode === 'dev', cacheCompression: false }, swc_1.swcClientConfig), { jsc: Object.assign(Object.assign({}, swc_1.swcClientConfig.jsc), { transform: Object.assign(Object.assign({}, (_a = swc_1.swcClientConfig.jsc) === null || _a === void 0 ? void 0 : _a.transform), { react: Object.assign(Object.assign({}, (_c = (_b = swc_1.swcClientConfig.jsc) === null || _b === void 0 ? void 0 : _b.transform) === null || _c === void 0 ? void 0 : _c.react), { refresh: mode === 'dev' }) }) }) }),
+        };
+    }
+    return {
+        test: app_configs_1.configs.codeLoader === 'tsc'
+            ? /\.(js|jsx|mjs|cjs)$/
+            : /\.(js|jsx|mjs|ts|tsx|cjs)$/,
+        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,
+                mode === 'dev'
+                    ? [
+                        require.resolve('react-refresh/babel'),
+                        { skipEnvCheck: true },
+                    ]
+                    : undefined,
+            ].filter(Boolean) }),
+    };
+}
+function getTsLoaderIfEnabled(mode) {
+    if (app_configs_1.configs.codeLoader !== 'tsc' || !app_configs_1.configs.tsconfig) {
+        return false;
+    }
+    return {
+        test: /\.tsx?$/,
+        use: [
+            {
+                loader: require.resolve('babel-loader'),
+                options: Object.assign(Object.assign({}, babel_client_1.default), { cacheDirectory: mode === 'dev', cacheCompression: false, plugins: mode === 'dev'
+                        ? [
+                            require.resolve('react-refresh/babel'),
+                            { skipEnvCheck: true },
+                        ]
+                        : undefined }),
+            },
+            {
+                loader: require.resolve('ts-loader'),
+                options: {
+                    getCustomTransformers: () => ({
+                        before: mode === 'dev' ? [(0, react_refresh_typescript_1.default)()] : [],
+                    }),
+                    onlyCompileBundledFiles: true,
+                    transpileOnly: true,
+                    happyPackMode: true,
+                    configFile: app_configs_1.configs.tsconfig,
+                },
+            },
+        ],
+    };
+}
+function getExternalCodeLoader(mode) {
+    const baseLoaderConfig = {
+        test: /\.(js|mjs)$/,
+        exclude: /@babel(?:\/|\\{1,2})runtime/,
+        resolve: {
+            fullySpecified: false,
+        },
+    };
+    if (app_configs_1.configs.codeLoader === 'swc') {
+        return Object.assign(Object.assign({}, baseLoaderConfig), { loader: require.resolve('swc-loader'), options: {
+                cacheDirectory: mode === 'dev',
+                cacheCompression: false,
+            } });
+    }
+    return Object.assign(Object.assign({}, baseLoaderConfig), { loader: require.resolve('babel-loader'), options: Object.assign(Object.assign({}, babel_dependencies_1.babelDependencies), { babelrc: false, configFile: false, compact: false, cacheDirectory: mode === 'dev', cacheCompression: false }) });
+}

package/build/configs/webpack.server.d.ts

@@ -1,2 +1,2 @@
 import { Configuration } from 'webpack';
-export declare const createServerConfig: (mode: 'dev' | 'prod') => Configuration;
+export declare const createServerConfig: (mode: "dev" | "prod") => Configuration;

package/build/configs/webpack.server.js

@@ -15,12 +15,13 @@ const tsconfig_paths_webpack_plugin_1 = __importDefault(require("tsconfig-paths-
 const webpack_1 = __importDefault(require("webpack"));
 const webpack_node_externals_1 = __importDefault(require("webpack-node-externals"));
 const get_entry_1 = __importDefault(require("./util/get-entry"));
+const get_webpack_cache_dependencies_1 = require("./util/get-webpack-cache-dependencies");
 const app_configs_1 = __importDefault(require("./app-configs"));
 const babel_dependencies_1 = require("./babel-dependencies");
 const babel_server_1 = __importDefault(require("./babel-server"));
 const postcss_1 = __importDefault(require("./postcss"));
 const server_externals_exemptions_1 = require("./server-externals-exemptions");
-const get_webpack_cache_dependencies_1 = require("./util/get-webpack-cache-dependencies");
+const swc_1 = require("./swc");
 const ReloadServerPlugin = require('../plugins/reload-server-webpack-plugin');
 const WatchMissingNodeModulesPlugin = require('../plugins/watch-missing-node-modules-plugin');
 const assetsIgnoreBanner = fs_1.default.readFileSync(require.resolve('./util/node-assets-ignore'), 'utf8');
@@ -115,51 +116,12 @@ const createServerConfig = (mode) => ({
         rules: [
             {
                 oneOf: [
-                    // Process JS with Babel.
-                    {
-                        test: app_configs_1.default.useTscLoader ? /\.(js|jsx|mjs)$/ : /\.(js|jsx|mjs|ts|tsx)$/,
-                        include: app_configs_1.default.appSrc,
-                        loader: require.resolve('babel-loader'),
-                        options: Object.assign(Object.assign({}, babel_server_1.default), { 
-                            // This is a feature of `babel-loader` for webpack (not Babel itself).
-                            // It enables caching results in ./node_modules/.cache/babel-loader/
-                            // directory for faster rebuilds.
-                            cacheDirectory: mode === 'dev' }),
-                    },
-                    app_configs_1.default.tsconfig &&
-                        app_configs_1.default.useTscLoader && {
-                        test: /\.tsx?$/,
-                        use: [
-                            {
-                                loader: require.resolve('babel-loader'),
-                                options: Object.assign({ 
-                                    // This is a feature of `babel-loader` for webpack (not Babel itself).
-                                    // It enables caching results in ./node_modules/.cache/babel-loader/
-                                    // directory for faster rebuilds.
-                                    cacheDirectory: mode === 'dev' }, babel_server_1.default),
-                            },
-                            {
-                                loader: require.resolve('ts-loader'),
-                                options: {
-                                    onlyCompileBundledFiles: true,
-                                    transpileOnly: true,
-                                    happyPackMode: true,
-                                    configFile: app_configs_1.default.tsconfig,
-                                },
-                            },
-                        ],
-                    },
-                    // Process any JS outside of the app with Babel.
-                    // Unlike the application JS, we only compile the standard ES features.
-                    {
-                        test: /\.(js|mjs)$/,
-                        exclude: /@babel(?:\/|\\{1,2})runtime/,
-                        loader: require.resolve('babel-loader'),
-                        resolve: {
-                            fullySpecified: false,
-                        },
-                        options: Object.assign(Object.assign({}, babel_dependencies_1.babelDependencies), { babelrc: false, configFile: false, compact: false, cacheDirectory: mode === 'dev', cacheCompression: false }),
-                    },
+                    // Обработка основного кода приложения
+                    getCodeLoader(mode),
+                    // обработка ts кода если codeLoader = tsc
+                    getTsLoaderIfEnabled(mode),
+                    // Обработка внешнего для приложения кода (node_modules)
+                    getExternalCodeLoader(mode),
                     // replace css imports with empty files
                     {
                         test: cssRegex,
@@ -247,3 +209,65 @@ const createServerConfig = (mode) => ({
     },
 });
 exports.createServerConfig = createServerConfig;
+function getCodeLoader(mode) {
+    if (app_configs_1.default.codeLoader === 'swc') {
+        return {
+            test: /\.(js|jsx|mjs|ts|tsx|cjs)$/,
+            include: app_configs_1.default.appSrc,
+            loader: require.resolve('swc-loader'),
+            options: swc_1.swcServerConfig,
+        };
+    }
+    return {
+        test: app_configs_1.default.codeLoader === 'tsc'
+            ? /\.(js|jsx|mjs|cjs)$/
+            : /\.(js|jsx|mjs|ts|tsx|cjs)$/,
+        include: app_configs_1.default.appSrc,
+        loader: require.resolve('babel-loader'),
+        options: Object.assign(Object.assign({}, babel_server_1.default), { 
+            // This is a feature of `babel-loader` for webpack (not Babel itself).
+            // It enables caching results in ./node_modules/.cache/babel-loader/
+            // directory for faster rebuilds.
+            cacheDirectory: mode === 'dev' }),
+    };
+}
+function getTsLoaderIfEnabled(mode) {
+    if (app_configs_1.default.codeLoader !== 'tsc' || !app_configs_1.default.tsconfig) {
+        return false;
+    }
+    return {
+        test: /\.tsx?$/,
+        use: [
+            {
+                loader: require.resolve('babel-loader'),
+                options: Object.assign({ 
+                    // This is a feature of `babel-loader` for webpack (not Babel itself).
+                    // It enables caching results in ./node_modules/.cache/babel-loader/
+                    // directory for faster rebuilds.
+                    cacheDirectory: mode === 'dev' }, babel_server_1.default),
+            },
+            {
+                loader: require.resolve('ts-loader'),
+                options: {
+                    onlyCompileBundledFiles: true,
+                    transpileOnly: true,
+                    happyPackMode: true,
+                    configFile: app_configs_1.default.tsconfig,
+                },
+            },
+        ],
+    };
+}
+function getExternalCodeLoader(mode) {
+    const baseLoaderConfig = {
+        test: /\.(js|mjs)$/,
+        exclude: /@babel(?:\/|\\{1,2})runtime/,
+        resolve: {
+            fullySpecified: false,
+        },
+    };
+    if (app_configs_1.default.codeLoader === 'swc') {
+        return Object.assign(Object.assign({}, baseLoaderConfig), { loader: require.resolve('swc-loader') });
+    }
+    return Object.assign(Object.assign({}, baseLoaderConfig), { loader: require.resolve('babel-loader'), options: Object.assign(Object.assign({}, babel_dependencies_1.babelDependencies), { babelrc: false, configFile: false, compact: false, cacheDirectory: mode === 'dev', cacheCompression: false }) });
+}

package/build/plugins/arui-runtime/arui-runtime-module.js

@@ -14,7 +14,7 @@ class RuntimeModule extends webpack_1.default.RuntimeModule {
     // eslint-disable-next-line class-methods-use-this
     generate() {
         return webpack_1.default.Template.asString([
-            "if (typeof __webpack_modules__ !== 'undefined' && typeof document !== 'undefined') {",
+            "if (typeof __webpack_modules__ !== 'undefined' && typeof document !== 'undefined') {", // По какой-то причине вебпак пытается выполнить этот код не только в браузере, но и при сборке.
             `${exports.FULL_ARUI_RUNTIME_PATH} = { scriptSource: document.currentScript };`,
             '}',
         ]);

package/build/plugins/arui-runtime/index.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInsertCssRuntimeMethod = exports.AruiRuntimePlugin = void 0;
+exports.AruiRuntimePlugin = void 0;
+exports.getInsertCssRuntimeMethod = getInsertCssRuntimeMethod;
 const webpack_1 = __importDefault(require("webpack"));
 const arui_runtime_module_1 = require("./arui-runtime-module");
 class AruiRuntimePlugin {
@@ -47,4 +48,3 @@ function getInsertCssRuntimeMethod() {
     };
     /* eslint-enable */
 }
-exports.getInsertCssRuntimeMethod = getInsertCssRuntimeMethod;

package/build/templates/dockerfile.template.js

@@ -32,7 +32,7 @@ ADD $NGINX_CONF_LOCATION ${nginxConfTargetLocation}
 ${nginxNonRootPart}
 
 ${app_configs_1.configs.runFromNonRootUser ? `ADD --chown=nginx:nginx ${appPathToAdd} ${appTargetPath}` : `ADD ${appPathToAdd} ${appTargetPath}`}
-${app_configs_1.configs.clientOnly ? 'COPY env-config.jso[n] /src/ # конструкция с [n] нужная чтобы копирование было опциональным. Если файла не будет - сборка не упадёт' : ''}
+${app_configs_1.configs.clientOnly ? 'COPY env-config.jso[n] /src/' : ''}
 ${app_configs_1.configs.clientOnly ? 'CMD ["nginx"]' : ''}
 `;
 exports.default = (0, apply_overrides_1.default)('Dockerfile', dockerfileTemplate);