@modern-js/app-tools 2.10.1-alpha.0 → 2.11.1-alpha.0

package/dist/js/treeshaking/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/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/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/js/treeshaking/types/utils.js

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

package/dist/js/treeshaking/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/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/types/types/config/source.d.ts

@@ -24,5 +24,5 @@ export interface SharedSourceConfig extends BuilderSharedSourceConfig {
 
   designSystem?: Record<string, any>;
 }
-export interface SourceUserConfig extends BuilderSourceConfig, SharedSourceConfig {}
-export interface RsSourceUserConfig extends RsBuilderSourceConfig, SharedSourceConfig {}
+export type SourceUserConfig = BuilderSourceConfig & SharedSourceConfig;
+export type RsSourceUserConfig = RsBuilderSourceConfig & SharedSourceConfig;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.10.1-alpha.0",
+  "version": "2.11.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -68,23 +68,23 @@
     "@babel/types": "^7.18.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
-    "@modern-js/builder": "2.10.0",
-    "@modern-js/builder-shared": "2.10.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.10.0",
-    "@modern-js/builder-webpack-provider": "2.10.0",
-    "@modern-js/core": "2.10.0",
-    "@modern-js/new-action": "2.10.0",
-    "@modern-js/node-bundle-require": "2.10.0",
-    "@modern-js/plugin-data-loader": "2.10.0",
-    "@modern-js/plugin-i18n": "2.10.0",
-    "@modern-js/plugin-lint": "2.10.0",
-    "@modern-js/plugin": "2.10.0",
-    "@modern-js/types": "2.10.0",
-    "@modern-js/server": "2.10.0",
-    "@modern-js/prod-server": "2.10.0",
-    "@modern-js/upgrade": "2.10.0",
-    "@modern-js/utils": "2.10.0",
-    "@modern-js/builder-plugin-esbuild": "2.10.0"
+    "@modern-js/builder": "2.11.0",
+    "@modern-js/builder-plugin-esbuild": "2.11.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.11.0",
+    "@modern-js/builder-shared": "2.11.0",
+    "@modern-js/builder-webpack-provider": "2.11.0",
+    "@modern-js/core": "2.11.0",
+    "@modern-js/new-action": "2.11.0",
+    "@modern-js/node-bundle-require": "2.11.0",
+    "@modern-js/plugin": "2.11.0",
+    "@modern-js/plugin-lint": "2.11.0",
+    "@modern-js/plugin-i18n": "2.11.0",
+    "@modern-js/prod-server": "2.11.0",
+    "@modern-js/server": "2.11.0",
+    "@modern-js/types": "2.11.0",
+    "@modern-js/upgrade": "2.11.0",
+    "@modern-js/utils": "2.11.0",
+    "@modern-js/plugin-data-loader": "2.11.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -93,14 +93,14 @@
     "jest": "^29",
     "typescript": "^4",
     "webpack": "^5.76.2",
-    "@modern-js/server-core": "2.10.0",
-    "@modern-js/builder-rspack-provider": "2.10.0",
-    "@scripts/build": "2.10.0",
-    "@modern-js/builder-plugin-swc": "2.10.0",
-    "@scripts/jest-config": "2.10.0"
+    "@scripts/build": "2.11.0",
+    "@modern-js/builder-plugin-swc": "2.11.0",
+    "@scripts/jest-config": "2.11.0",
+    "@modern-js/server-core": "2.11.0",
+    "@modern-js/builder-rspack-provider": "2.11.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.10.0"
+    "@modern-js/builder-rspack-provider": "^2.11.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {

package/dist/js/modern/builder/loaders/routerLoader.js

@@ -1,17 +0,0 @@
-import { slash } from "@modern-js/utils";
-function loader(source) {
-  this.cacheable();
-  const { target } = this._compiler.options;
-  if (target === "node" || Array.isArray(target) && target.includes("node")) {
-    return source;
-  }
-  const { resourcePath } = this;
-  const code = `
-    export { default } from "${slash(resourcePath)}";
-  `;
-  return code;
-}
-var routerLoader_default = loader;
-export {
-  routerLoader_default as default
-};

package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js

@@ -1,30 +0,0 @@
-class HtmlAsyncChunkPlugin {
-  constructor(htmlWebpackPlugin) {
-    this.name = "HtmlAsyncChunkPlugin";
-    this.htmlWebpackPlugin = htmlWebpackPlugin;
-  }
-  apply(compiler) {
-    compiler.hooks.compilation.tap(
-      this.name,
-      (compilation) => {
-        const hooks = this.htmlWebpackPlugin.getHooks(compilation);
-        hooks.alterAssetTagGroups.tap(this.name, (assets) => {
-          const tags = [...assets.headTags, ...assets.bodyTags];
-          for (const tag of tags) {
-            if (tag.tagName === "script") {
-              const { attributes } = tag;
-              if (attributes && attributes.defer === true) {
-                attributes.async = true;
-                delete attributes.defer;
-              }
-            }
-          }
-          return assets;
-        });
-      }
-    );
-  }
-}
-export {
-  HtmlAsyncChunkPlugin
-};

package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js

@@ -1,37 +0,0 @@
-class BottomTemplatePlugin {
-  constructor(htmlWebpackPlugin) {
-    this.bottomTemplateReg = /<!--<\?-\s*bottomTemplate\s*\?>-->/;
-    this.bodyRegExp = /(<\/\s*body\s*>)/i;
-    this.htmlWebpackPlugin = htmlWebpackPlugin;
-    this.name = "bottom-template";
-  }
-  apply(compiler) {
-    compiler.hooks.compilation.tap(
-      this.name,
-      (compilation) => {
-        this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(this.name, (data) => {
-          var _a;
-          if (!((_a = data.plugin.options) == null ? void 0 : _a.__internal__)) {
-            return data;
-          }
-          if (this.bottomTemplateReg.test(data.html)) {
-            data.html = data.html.replace(this.bottomTemplateReg, "");
-            const { bottomTemplate } = data.plugin.options;
-            if (bottomTemplate) {
-              data.html = data.html.replace(
-                this.bodyRegExp,
-                (match) => `
-${bottomTemplate}
-${match}`
-              );
-            }
-          }
-          return data;
-        });
-      }
-    );
-  }
-}
-export {
-  BottomTemplatePlugin
-};

package/dist/js/modern/config/initial/index.js

@@ -1,16 +0,0 @@
-import { initHtmlConfig, initSourceConfig, initToolsConfig } from "./inits";
-import { transformNormalizedConfig } from "./transformNormalizedConfig";
-function checkIsLegacyConfig(config) {
-  return Boolean(config.legacy);
-}
-function initialNormalizedConfig(config, appContext) {
-  initHtmlConfig(config, appContext);
-  initSourceConfig(config, appContext);
-  initToolsConfig(config);
-  return config;
-}
-export {
-  checkIsLegacyConfig,
-  initialNormalizedConfig,
-  transformNormalizedConfig
-};

package/dist/js/treeshaking/builder/loaders/routerLoader.js

@@ -1,13 +0,0 @@
-import { slash } from "@modern-js/utils";
-function loader(source) {
-    this.cacheable();
-    var target = this._compiler.options.target;
-    if (target === "node" || Array.isArray(target) && target.includes("node")) {
-        return source;
-    }
-    var resourcePath = this.resourcePath;
-    var code = '\n    export { default } from "'.concat(slash(resourcePath), '";\n  ');
-    return code;
-}
-var routerLoader_default = loader;
-export { routerLoader_default as default };

package/dist/js/treeshaking/config/initial/createHtmlConfig.js

@@ -1,19 +0,0 @@
-function createHtmlConfig(config) {
-    var _output = config.output, disableHtmlFolder = _output.disableHtmlFolder, favicon = _output.favicon, faviconByEntries = _output.faviconByEntries, inject = _output.inject, injectByEntries = _output.injectByEntries, meta = _output.meta, metaByEntries = _output.metaByEntries, mountId = _output.mountId, title = _output.title, titleByEntries = _output.titleByEntries, templateParameters = _output.templateParameters, templateParametersByEntries = _output.templateParametersByEntries, crossorigin = _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/index.js

@@ -1,12 +0,0 @@
-import { initHtmlConfig, initSourceConfig, initToolsConfig } from "./inits";
-import { transformNormalizedConfig } from "./transformNormalizedConfig";
-function checkIsLegacyConfig(config) {
-    return Boolean(config.legacy);
-}
-function initialNormalizedConfig(config, appContext) {
-    initHtmlConfig(config, appContext);
-    initSourceConfig(config, appContext);
-    initToolsConfig(config);
-    return config;
-}
-export { checkIsLegacyConfig, initialNormalizedConfig, transformNormalizedConfig };