@modern-js/app-tools 2.3.1-alpha.2 → 2.5.0

package/dist/esm/config/initialize/index.js

@@ -0,0 +1,10 @@
+import { initHtmlConfig, initSourceConfig, initToolsConfig } from "./inits";
+function initialNormalizedConfig(config, appContext, bundler) {
+    initHtmlConfig(config, appContext);
+    initSourceConfig(config, appContext, bundler);
+    if (bundler === "webpack") {
+        initToolsConfig(config);
+    }
+    return config;
+}
+export { initialNormalizedConfig };

package/dist/{js/treeshaking/config/initial → esm/config/initialize}/inits.js

@@ -105,9 +105,9 @@ function initHtmlConfig(config, appContext) {
     config.html.favicon = createBuilderFavicon(config, appContext);
     return config.html;
 }
-function initSourceConfig(config, appContext) {
+function initSourceConfig(config, appContext, bundler) {
     var createBuilderGlobalVars = function createBuilderGlobalVars(config2, appContext2) {
-        var _source = config2.source, _globalVars = _source.globalVars, globalVars = _globalVars === void 0 ? {} : _globalVars;
+        var _config2_source = config2.source, _config2_source_globalVars = _config2_source.globalVars, globalVars = _config2_source_globalVars === void 0 ? {} : _config2_source_globalVars;
         var publicEnv = getAutoInjectEnv(appContext2);
         return _objectSpread({}, globalVars, publicEnv);
     };
@@ -176,8 +176,10 @@ function initSourceConfig(config, appContext) {
         }
     };
     config.source.include = createBuilderInclude(config, appContext);
-    config.source.moduleScopes = createBuilderModuleScope(config);
     config.source.globalVars = createBuilderGlobalVars(config, appContext);
+    if (bundler === "webpack") {
+        config.source.moduleScopes = createBuilderModuleScope(config);
+    }
 }
 function initToolsConfig(config) {
     var defaultTsChecker = {
@@ -197,7 +199,7 @@ function initToolsConfig(config) {
             ]
         }
     };
-    var _tools = config.tools, tsChecker = _tools.tsChecker, tsLoader = _tools.tsLoader;
+    var _config_tools = config.tools, tsChecker = _config_tools.tsChecker, tsLoader = _config_tools.tsLoader;
     config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
     tsLoader && (config.tools.tsLoader = function(tsLoaderConfig, utils) {
         applyOptionsChain(_objectSpreadProps(_objectSpread({}, tsLoaderConfig), {

package/dist/esm/config/legacy/createHtmlConfig.js

@@ -0,0 +1,19 @@
+function createHtmlConfig(config) {
+    var _config_output = config.output, disableHtmlFolder = _config_output.disableHtmlFolder, favicon = _config_output.favicon, faviconByEntries = _config_output.faviconByEntries, inject = _config_output.inject, injectByEntries = _config_output.injectByEntries, meta = _config_output.meta, metaByEntries = _config_output.metaByEntries, mountId = _config_output.mountId, title = _config_output.title, titleByEntries = _config_output.titleByEntries, templateParameters = _config_output.templateParameters, templateParametersByEntries = _config_output.templateParametersByEntries, crossorigin = _config_output.crossorigin;
+    return {
+        disableHtmlFolder: disableHtmlFolder,
+        favicon: favicon,
+        faviconByEntries: faviconByEntries,
+        inject: inject,
+        injectByEntries: injectByEntries,
+        meta: meta,
+        metaByEntries: metaByEntries,
+        mountId: mountId,
+        title: title,
+        titleByEntries: titleByEntries,
+        crossorigin: crossorigin,
+        templateParameters: templateParameters,
+        templateParametersByEntries: templateParametersByEntries
+    };
+}
+export { createHtmlConfig };

package/dist/{js/treeshaking/config/initial → esm/config/legacy}/createOutputConfig.js

@@ -1,5 +1,5 @@
 function createOutputConfig(config) {
-    var _output = config.output, assetPrefix = _output.assetPrefix, copy = _output.copy, cssModuleLocalIdentName = _output.cssModuleLocalIdentName, cssPath = _output.cssPath, jsPath = _output.jsPath, htmlPath = _output.htmlPath, mediaPath = _output.mediaPath, enableTsLoader = _output.enableTsLoader, path = _output.path, disableInlineRuntimeChunk = _output.disableInlineRuntimeChunk, disableCssExtract = _output.disableCssExtract, disableMinimize = _output.disableMinimize, disableSourceMap = _output.disableSourceMap, disableTsChecker = _output.disableTsChecker, enableCssModuleTSDeclaration = _output.enableCssModuleTSDeclaration, enableInlineScripts = _output.enableInlineScripts, enableInlineStyles = _output.enableInlineStyles, polyfill = _output.polyfill, dataUriLimit = _output.dataUriLimit, disableAssetsCache = _output.disableAssetsCache, enableLatestDecorators = _output.enableLatestDecorators, disableCssModuleExtension = _output.disableCssModuleExtension, ssg = _output.ssg, disableNodePolyfill = _output.disableNodePolyfill;
+    var _config_output = config.output, assetPrefix = _config_output.assetPrefix, copy = _config_output.copy, cssModuleLocalIdentName = _config_output.cssModuleLocalIdentName, cssPath = _config_output.cssPath, jsPath = _config_output.jsPath, htmlPath = _config_output.htmlPath, mediaPath = _config_output.mediaPath, enableTsLoader = _config_output.enableTsLoader, path = _config_output.path, disableInlineRuntimeChunk = _config_output.disableInlineRuntimeChunk, disableCssExtract = _config_output.disableCssExtract, disableMinimize = _config_output.disableMinimize, disableSourceMap = _config_output.disableSourceMap, disableTsChecker = _config_output.disableTsChecker, enableCssModuleTSDeclaration = _config_output.enableCssModuleTSDeclaration, enableInlineScripts = _config_output.enableInlineScripts, enableInlineStyles = _config_output.enableInlineStyles, polyfill = _config_output.polyfill, dataUriLimit = _config_output.dataUriLimit, disableAssetsCache = _config_output.disableAssetsCache, enableLatestDecorators = _config_output.enableLatestDecorators, disableCssModuleExtension = _config_output.disableCssModuleExtension, ssg = _config_output.ssg, disableNodePolyfill = _config_output.disableNodePolyfill;
     return {
         assetPrefix: assetPrefix,
         copy: copy,

package/dist/{js/treeshaking/config/initial → esm/config/legacy}/createSourceConfig.js

@@ -1,5 +1,5 @@
 function createSourceConfig(config) {
-    var _source = config.source, alias = _source.alias, envVars = _source.envVars, globalVars = _source.globalVars, include = _source.include, moduleScopes = _source.moduleScopes, preEntry = _source.preEntry, entries = _source.entries, enableAsyncEntry = _source.enableAsyncEntry, disableDefaultEntries = _source.disableDefaultEntries, entriesDir = _source.entriesDir, configDir = _source.configDir;
+    var _config_source = config.source, alias = _config_source.alias, envVars = _config_source.envVars, globalVars = _config_source.globalVars, include = _config_source.include, moduleScopes = _config_source.moduleScopes, preEntry = _config_source.preEntry, entries = _config_source.entries, enableAsyncEntry = _config_source.enableAsyncEntry, disableDefaultEntries = _config_source.disableDefaultEntries, entriesDir = _config_source.entriesDir, configDir = _config_source.configDir;
     var builderGlobalVars = globalVars || {};
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {

package/dist/{js/treeshaking/config/initial → esm/config/legacy}/createToolsConfig.js

@@ -1,5 +1,5 @@
 function createToolsConfig(config) {
-    var _tools = config.tools, autoprefixer = _tools.autoprefixer, babel = _tools.babel, minifyCss = _tools.minifyCss, terser = _tools.terser, webpack = _tools.webpack, webpackChain = _tools.webpackChain, tsLoader = _tools.tsLoader, styledComponents = _tools.styledComponents, sass = _tools.sass, postcss = _tools.postcss, less = _tools.less, htmlPlugin = _tools.htmlPlugin, devServer = _tools.devServer, tailwindcss = _tools.tailwindcss, jest = _tools.jest, esbuild = _tools.esbuild;
+    var _config_tools = config.tools, autoprefixer = _config_tools.autoprefixer, babel = _config_tools.babel, minifyCss = _config_tools.minifyCss, terser = _config_tools.terser, webpack = _config_tools.webpack, webpackChain = _config_tools.webpackChain, tsLoader = _config_tools.tsLoader, styledComponents = _config_tools.styledComponents, sass = _config_tools.sass, postcss = _config_tools.postcss, less = _config_tools.less, htmlPlugin = _config_tools.htmlPlugin, devServer = _config_tools.devServer, tailwindcss = _config_tools.tailwindcss, jest = _config_tools.jest, esbuild = _config_tools.esbuild;
     var enableTsLoader = config.output.enableTsLoader;
     return {
         tsLoader: enableTsLoader ? tsLoader : void 0,

package/dist/{js/treeshaking/config/initial/transformNormalizedConfig.js → esm/config/legacy/index.js}

@@ -32,4 +32,7 @@ function transformNormalizedConfig(config) {
         }
     };
 }
-export { transformNormalizedConfig };
+function checkIsLegacyConfig(config) {
+    return Boolean(config.legacy);
+}
+export { checkIsLegacyConfig, transformNormalizedConfig };

package/dist/{js/treeshaking → esm}/index.js

@@ -439,6 +439,9 @@ var buildCommand = function() {
     };
 }();
 var src_default = function() {
+    var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {
+        bundler: "webpack"
+    };
     return {
         name: "@modern-js/app-tools",
         post: [
@@ -453,8 +456,12 @@ var src_default = function() {
         ],
         registerHook: hooks,
         usePlugins: [
-            initializePlugin(),
-            analyzePlugin(),
+            initializePlugin({
+                bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+            }),
+            analyzePlugin({
+                bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+            }),
             lintPlugin()
         ],
         setup: function(api) {
@@ -505,7 +512,7 @@ var src_default = function() {
                                         });
                                     }));
                                     program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).description(i18n.t(localeKeys.command.deploy.describe)).action(function() {
-                                        var _ref = _asyncToGenerator(function(options) {
+                                        var _ref = _asyncToGenerator(function(options2) {
                                             var build, deploy;
                                             return __generator(this, function(_state) {
                                                 switch(_state.label){
@@ -530,7 +537,7 @@ var src_default = function() {
                                                         deploy = _state.sent().deploy;
                                                         return [
                                                             4,
-                                                            deploy(api, options)
+                                                            deploy(api, options2)
                                                         ];
                                                     case 4:
                                                         _state.sent();
@@ -541,12 +548,12 @@ var src_default = function() {
                                                 }
                                             });
                                         });
-                                        return function(options) {
+                                        return function(options2) {
                                             return _ref.apply(this, arguments);
                                         };
                                     }());
                                     program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("--lang <lang>", i18n.t(localeKeys.command.new.lang)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).action(function() {
-                                        var _ref = _asyncToGenerator(function(options) {
+                                        var _ref = _asyncToGenerator(function(options2) {
                                             var MWANewAction;
                                             return __generator(this, function(_state) {
                                                 switch(_state.label){
@@ -559,8 +566,8 @@ var src_default = function() {
                                                         MWANewAction = _state.sent().MWANewAction;
                                                         return [
                                                             4,
-                                                            MWANewAction(_objectSpreadProps(_objectSpread({}, options), {
-                                                                locale: options.lang || locale
+                                                            MWANewAction(_objectSpreadProps(_objectSpread({}, options2), {
+                                                                locale: options2.lang || locale
                                                             }))
                                                         ];
                                                     case 2:
@@ -571,12 +578,12 @@ var src_default = function() {
                                                 }
                                             });
                                         });
-                                        return function(options) {
+                                        return function(options2) {
                                             return _ref.apply(this, arguments);
                                         };
                                     }());
                                     program.command("inspect").description("inspect internal webpack config").option("--env <env>", i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(function() {
-                                        var _ref = _asyncToGenerator(function(options) {
+                                        var _ref = _asyncToGenerator(function(options2) {
                                             var inspect;
                                             return __generator(this, function(_state) {
                                                 switch(_state.label){
@@ -587,14 +594,14 @@ var src_default = function() {
                                                         ];
                                                     case 1:
                                                         inspect = _state.sent().inspect;
-                                                        inspect(api, options);
+                                                        inspect(api, options2);
                                                         return [
                                                             2
                                                         ];
                                                 }
                                             });
                                         });
-                                        return function(options) {
+                                        return function(options2) {
                                             return _ref.apply(this, arguments);
                                         };
                                     }());

package/dist/{js/treeshaking → esm}/initialize/index.js

@@ -176,16 +176,16 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import { ensureAbsolutePath, getPort, isDev, isDevCommand } from "@modern-js/utils";
 import { legacySchema, schema } from "../schema";
-import { transformNormalizedConfig } from "../config/initial/transformNormalizedConfig";
-import { checkIsLegacyConfig, createDefaultConfig, createLegacyDefaultConfig } from "../config";
-var initialize_default = function() {
+import { checkIsLegacyConfig, createDefaultConfig, createLegacyDefaultConfig, transformNormalizedConfig } from "../config";
+var initialize_default = function(param) {
+    var bundler = param.bundler;
     return {
         name: "@modern-js/plugin-initialize",
         setup: function setup(api) {
             var config = function() {
                 var appContext = api.useAppContext();
                 var userConfig = api.useConfigContext();
-                return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext);
+                return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext, bundler);
             };
             var validateSchema = function() {
                 var userConfig = api.useConfigContext();
@@ -198,7 +198,7 @@ var initialize_default = function() {
                 resolvedConfig: function resolvedConfig(param) {
                     var resolved = param.resolved;
                     return _asyncToGenerator(function() {
-                        var ref, appContext, userConfig, port, normalizedConfig;
+                        var _resolved_output_distPath, appContext, userConfig, port, normalizedConfig;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -212,35 +212,38 @@ var initialize_default = function() {
                                     port = _state.sent();
                                     appContext = _objectSpreadProps(_objectSpread({}, appContext), {
                                         port: port,
-                                        distDirectory: ensureAbsolutePath(appContext.distDirectory, ((ref = resolved.output.distPath) === null || ref === void 0 ? void 0 : ref.root) || "dist")
+                                        distDirectory: ensureAbsolutePath(appContext.distDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
                                     });
                                     api.setAppContext(appContext);
                                     normalizedConfig = checkIsLegacyConfig(resolved) ? transformNormalizedConfig(resolved) : resolved;
+                                    resolved._raw = userConfig;
+                                    resolved.server = _objectSpreadProps(_objectSpread({}, normalizedConfig.server || {}), {
+                                        port: port
+                                    });
+                                    resolved.autoLoadPlugins = normalizedConfig.autoLoadPlugins || false;
+                                    stabilizeConfig(resolved, normalizedConfig, [
+                                        "source",
+                                        "bff",
+                                        "dev",
+                                        "html",
+                                        "output",
+                                        "tools",
+                                        "testing",
+                                        "plugins",
+                                        "builderPlugins",
+                                        "runtime",
+                                        "runtimeByEntries",
+                                        "deploy",
+                                        "performance"
+                                    ]);
+                                    if (bundler === "webpack") {
+                                        resolved.security = normalizedConfig.security || {};
+                                        resolved.experiments = normalizedConfig.experiments;
+                                    }
                                     return [
                                         2,
                                         {
-                                            resolved: {
-                                                _raw: userConfig,
-                                                source: normalizedConfig.source || {},
-                                                server: _objectSpreadProps(_objectSpread({}, normalizedConfig.server || {}), {
-                                                    port: port
-                                                }),
-                                                bff: normalizedConfig.bff || {},
-                                                dev: normalizedConfig.dev || {},
-                                                html: normalizedConfig.html || {},
-                                                output: normalizedConfig.output || {},
-                                                security: normalizedConfig.security || {},
-                                                tools: normalizedConfig.tools || {},
-                                                testing: normalizedConfig.testing || {},
-                                                plugins: normalizedConfig.plugins || [],
-                                                builderPlugins: normalizedConfig.builderPlugins || [],
-                                                runtime: normalizedConfig.runtime || {},
-                                                runtimeByEntries: normalizedConfig.runtimeByEntries || {},
-                                                deploy: normalizedConfig.deploy || {},
-                                                performance: normalizedConfig.performance || {},
-                                                experiments: normalizedConfig.experiments || {},
-                                                autoLoadPlugins: normalizedConfig.autoLoadPlugins || false
-                                            }
+                                            resolved: resolved
                                         }
                                     ];
                             }
@@ -251,6 +254,11 @@ var initialize_default = function() {
         }
     };
 };
+function stabilizeConfig(resolve, config, keys) {
+    keys.forEach(function(key) {
+        resolve[key] = config[key] || {};
+    });
+}
 function getServerPort(config) {
     return _getServerPort.apply(this, arguments);
 }

package/dist/{js/treeshaking → esm}/locale/zh.js

@@ -21,7 +21,7 @@ var ZH_LOCALE = {
             describe: "部署应用命令"
         },
         new: {
-            describe: "MWA 项目中执行生成器",
+            describe: "Web App 项目中执行生成器",
             debug: "开启 Debug 模式，打印调试日志信息",
             config: "生成器运行默认配置(JSON 字符串)",
             distTag: "生成器使用特殊的 npm Tag 版本",

package/dist/esm/types/utils.js

@@ -0,0 +1 @@
+"use strict";

package/dist/{js/treeshaking → esm}/utils/config.js

@@ -275,11 +275,11 @@ var safeReplacer = function() {
 };
 var emitResolvedConfig = function() {
     var _ref = _asyncToGenerator(function(appDirectory, resolvedConfig) {
-        var ref, outputPath;
+        var _resolvedConfig_output_distPath, outputPath;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    outputPath = path.join(appDirectory, ((ref = resolvedConfig.output.distPath) === null || ref === void 0 ? void 0 : ref.root) || "./dist", OUTPUT_CONFIG_FILE);
+                    outputPath = path.join(appDirectory, ((_resolvedConfig_output_distPath = resolvedConfig.output.distPath) === null || _resolvedConfig_output_distPath === void 0 ? void 0 : _resolvedConfig_output_distPath.root) || "./dist", OUTPUT_CONFIG_FILE);
                     return [
                         4,
                         fs.writeJSON(outputPath, resolvedConfig, {

package/dist/{js/treeshaking → esm}/utils/getServerInternalPlugins.js

@@ -179,7 +179,7 @@ function getServerInternalPlugins(api) {
 }
 function _getServerInternalPlugins() {
     _getServerInternalPlugins = _asyncToGenerator(function(api) {
-        var hookRunners, ref, serverPlugins, serverInternalPlugins;
+        var hookRunners, _ref, serverPlugins, serverInternalPlugins;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -191,7 +191,7 @@ function _getServerInternalPlugins() {
                         })
                     ];
                 case 1:
-                    ref = _state.sent(), serverPlugins = ref.plugins;
+                    _ref = _state.sent(), serverPlugins = _ref.plugins;
                     serverInternalPlugins = serverPlugins.reduce(function(result, plugin) {
                         return Object.assign(result, plugin);
                     }, {});

package/dist/esm/utils/types.js

@@ -0,0 +1 @@
+"use strict";