@modern-js/app-tools 2.47.1 → 2.48.1

package/bin/modern.js

@@ -5,11 +5,17 @@ const {
   INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
 } = require('@modern-js/utils');
 
+const { version } = require('../package.json');
+
+if (!process.env.MODERN_JS_VERSION) {
+  process.env.MODERN_JS_VERSION = version;
+}
+
 require('@modern-js/core/runBin').run({
   internalPlugins: {
     cli: INTERNAL_APP_TOOLS_PLUGINS,
     server: INTERNAL_SERVER_PLUGINS,
     autoLoad: INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
   },
-  initialLog: `Modern.js Framework v${require('../package.json').version}`,
+  initialLog: `Modern.js Framework v${version}`,
 });

package/dist/cjs/builder/generator/index.js

@@ -49,11 +49,12 @@ async function generateBuilder(options, bundlerType) {
   return builder;
 }
 async function applyBuilderPlugins(builder, options) {
-  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR } = await Promise.resolve().then(() => __toESM(require("../shared/builderPlugins")));
+  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterWorker } = await Promise.resolve().then(() => __toESM(require("../shared/builderPlugins")));
   builder.addPlugins([
     builderPluginAdapterBasic(),
     builderPluginAdapterSSR(options),
-    builderPluginAdapterHtml(options)
+    builderPluginAdapterHtml(options),
+    builderPluginAdapterWorker()
   ]);
   const { normalizedConfig } = options;
   if (!normalizedConfig.output.disableNodePolyfill) {

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js

@@ -33,6 +33,7 @@ __export(adapterSSR_exports, {
 module.exports = __toCommonJS(adapterSSR_exports);
 var path = __toESM(require("path"));
 var import_shared = require("@rsbuild/shared");
+var import_core = require("@rsbuild/core");
 var import_utils = require("@modern-js/utils");
 var import_bundlerPlugins = require("../bundlerPlugins");
 var import_utils2 = require("../../../analyze/utils");
@@ -42,7 +43,7 @@ const builderPluginAdapterSSR = (options) => ({
     const { normalizedConfig } = options;
     api.modifyRsbuildConfig((config) => {
       if (isStreamingSSR(normalizedConfig)) {
-        return (0, import_shared.mergeRsbuildConfig)(config, {
+        return (0, import_core.mergeRsbuildConfig)(config, {
           html: {
             inject: "body"
           }

package/dist/cjs/builder/shared/builderPlugins/adapterWorker.js

@@ -0,0 +1,49 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var adapterWorker_exports = {};
+__export(adapterWorker_exports, {
+  builderPluginAdapterWorker: () => builderPluginAdapterWorker
+});
+module.exports = __toCommonJS(adapterWorker_exports);
+var import_path = require("path");
+const getDistPath = (outputConfig, type) => {
+  const { distPath } = outputConfig;
+  const ret = distPath[type];
+  if (typeof ret !== "string") {
+    throw new Error(`unknown key ${type} in "output.distPath"`);
+  }
+  return ret;
+};
+const builderPluginAdapterWorker = () => ({
+  name: "builder-plugin-adapter-worker",
+  setup(api) {
+    api.modifyBundlerChain(async (chain, { isServiceWorker }) => {
+      const config = api.getNormalizedConfig();
+      if (isServiceWorker) {
+        const workerPath = getDistPath(config.output, "worker");
+        const filename = import_path.posix.join(workerPath, `[name].js`);
+        chain.output.filename(filename).chunkFilename(filename).libraryTarget("commonjs2");
+      }
+    });
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  builderPluginAdapterWorker
+});

package/dist/cjs/builder/shared/builderPlugins/index.js

@@ -18,9 +18,11 @@ module.exports = __toCommonJS(builderPlugins_exports);
 __reExport(builderPlugins_exports, require("./adapterBasic"), module.exports);
 __reExport(builderPlugins_exports, require("./adapterHtml"), module.exports);
 __reExport(builderPlugins_exports, require("./adapterSSR"), module.exports);
+__reExport(builderPlugins_exports, require("./adapterWorker"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./adapterBasic"),
   ...require("./adapterHtml"),
-  ...require("./adapterSSR")
+  ...require("./adapterSSR"),
+  ...require("./adapterWorker")
 });

package/dist/cjs/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js

@@ -21,7 +21,6 @@ __export(HtmlAsyncChunkPlugin_exports, {
   HtmlAsyncChunkPlugin: () => HtmlAsyncChunkPlugin
 });
 module.exports = __toCommonJS(HtmlAsyncChunkPlugin_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 class HtmlAsyncChunkPlugin {
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, (compilation) => {
@@ -45,8 +44,6 @@ class HtmlAsyncChunkPlugin {
     });
   }
   constructor(htmlWebpackPlugin) {
-    (0, import_define_property._)(this, "name", void 0);
-    (0, import_define_property._)(this, "htmlWebpackPlugin", void 0);
     this.name = "HtmlAsyncChunkPlugin";
     this.htmlWebpackPlugin = htmlWebpackPlugin;
   }

package/dist/cjs/builder/shared/bundlerPlugins/HtmlBottomTemplate.js

@@ -21,7 +21,6 @@ __export(HtmlBottomTemplate_exports, {
   BottomTemplatePlugin: () => BottomTemplatePlugin
 });
 module.exports = __toCommonJS(HtmlBottomTemplate_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 class BottomTemplatePlugin {
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, (compilation) => {
@@ -44,10 +43,8 @@ ${match}`);
     });
   }
   constructor(htmlWebpackPlugin) {
-    (0, import_define_property._)(this, "htmlWebpackPlugin", void 0);
-    (0, import_define_property._)(this, "bottomTemplateReg", /<!--<\?-\s*bottomTemplate\s*\?>-->/);
-    (0, import_define_property._)(this, "bodyRegExp", /(<\/\s*body\s*>)/i);
-    (0, import_define_property._)(this, "name", void 0);
+    this.bottomTemplateReg = /<!--<\?-\s*bottomTemplate\s*\?>-->/;
+    this.bodyRegExp = /(<\/\s*body\s*>)/i;
     this.htmlWebpackPlugin = htmlWebpackPlugin;
     this.name = "bottom-template";
   }

package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -21,7 +21,6 @@ __export(RouterPlugin_exports, {
   RouterPlugin: () => RouterPlugin
 });
 module.exports = __toCommonJS(RouterPlugin_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_crypto = require("crypto");
 var import_lodash = require("@modern-js/utils/lodash");
 var import_utils = require("@modern-js/utils");
@@ -229,13 +228,7 @@ class RouterPlugin {
     });
   }
   constructor({ staticJsDir = "static/js", HtmlBundlerPlugin, enableInlineRouteManifests, disableFilenameHash = false, scriptLoading = "defer", nonce }) {
-    (0, import_define_property._)(this, "name", "RouterPlugin");
-    (0, import_define_property._)(this, "HtmlBundlerPlugin", void 0);
-    (0, import_define_property._)(this, "enableInlineRouteManifests", void 0);
-    (0, import_define_property._)(this, "staticJsDir", void 0);
-    (0, import_define_property._)(this, "disableFilenameHash", void 0);
-    (0, import_define_property._)(this, "scriptLoading", void 0);
-    (0, import_define_property._)(this, "nonce", void 0);
+    this.name = "RouterPlugin";
     this.HtmlBundlerPlugin = HtmlBundlerPlugin;
     this.enableInlineRouteManifests = enableInlineRouteManifests;
     this.staticJsDir = staticJsDir;

package/dist/cjs/index.js

@@ -162,18 +162,18 @@ const appTools = (options = {
           process.exit(0);
         });
         program.command("new").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.new.describe)).option("--config-file <configFile>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("--lang <lang>", import_locale.i18n.t(import_locale.localeKeys.command.new.lang)).option("-c, --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.new.config)).option("-d, --debug", import_locale.i18n.t(import_locale.localeKeys.command.new.debug), false).option("--dist-tag <tag>", import_locale.i18n.t(import_locale.localeKeys.command.new.distTag)).option("--registry", import_locale.i18n.t(import_locale.localeKeys.command.new.registry)).option("--no-need-install", import_locale.i18n.t(import_locale.localeKeys.command.shared.noNeedInstall)).action(async (options2) => {
-          const { MWANewAction } = await Promise.resolve().then(() => __toESM(require("@modern-js/new-action")));
-          await MWANewAction({
+          await (0, import_utils.newAction)({
             ...options2,
             locale: options2.lang || locale
-          });
+          }, "mwa");
         });
         program.command("inspect").description("inspect the internal configs").option(`--env <env>`, import_locale.i18n.t(import_locale.localeKeys.command.inspect.env), "development").option("--output <output>", import_locale.i18n.t(import_locale.localeKeys.command.inspect.output), "/").option("--verbose", import_locale.i18n.t(import_locale.localeKeys.command.inspect.verbose)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).action(async (options2) => {
           const { inspect } = await Promise.resolve().then(() => __toESM(require("./commands/inspect")));
           inspect(api, options2);
         });
-        const { defineCommand } = await Promise.resolve().then(() => __toESM(require("@modern-js/upgrade")));
-        defineCommand(program.command("upgrade").option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("--no-need-install", import_locale.i18n.t(import_locale.localeKeys.command.shared.noNeedInstall)));
+        program.command("upgrade").allowUnknownOption().option("-h --help", "Show help").action(async () => {
+          await (0, import_utils.upgradeAction)();
+        });
       },
       async prepare() {
         const command = (0, import_utils.getCommand)();

package/dist/esm/builder/generator/index.js

@@ -48,7 +48,7 @@ function applyBuilderPlugins(builder, options) {
 }
 function _applyBuilderPlugins() {
   _applyBuilderPlugins = _async_to_generator(function(builder, options) {
-    var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, normalizedConfig, pluginNodePolyfill;
+    var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterWorker, normalizedConfig, pluginNodePolyfill;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -57,11 +57,12 @@ function _applyBuilderPlugins() {
             import("../shared/builderPlugins")
           ];
         case 1:
-          _ref = _state.sent(), builderPluginAdapterBasic = _ref.builderPluginAdapterBasic, builderPluginAdapterHtml = _ref.builderPluginAdapterHtml, builderPluginAdapterSSR = _ref.builderPluginAdapterSSR;
+          _ref = _state.sent(), builderPluginAdapterBasic = _ref.builderPluginAdapterBasic, builderPluginAdapterHtml = _ref.builderPluginAdapterHtml, builderPluginAdapterSSR = _ref.builderPluginAdapterSSR, builderPluginAdapterWorker = _ref.builderPluginAdapterWorker;
           builder.addPlugins([
             builderPluginAdapterBasic(),
             builderPluginAdapterSSR(options),
-            builderPluginAdapterHtml(options)
+            builderPluginAdapterHtml(options),
+            builderPluginAdapterWorker()
           ]);
           normalizedConfig = options.normalizedConfig;
           if (!!normalizedConfig.output.disableNodePolyfill)

package/dist/esm/builder/shared/builderPlugins/adapterSSR.js

@@ -1,7 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
-import { isHtmlDisabled, mergeRsbuildConfig } from "@rsbuild/shared";
+import { isHtmlDisabled } from "@rsbuild/shared";
+import { mergeRsbuildConfig } from "@rsbuild/core";
 import { isSSR, fs } from "@modern-js/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
 import { getServerCombinedModueFile } from "../../../analyze/utils";

package/dist/esm/builder/shared/builderPlugins/adapterWorker.js

@@ -0,0 +1,41 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { posix } from "path";
+var getDistPath = function(outputConfig, type) {
+  var distPath = outputConfig.distPath;
+  var ret = distPath[type];
+  if (typeof ret !== "string") {
+    throw new Error("unknown key ".concat(type, ' in "output.distPath"'));
+  }
+  return ret;
+};
+var builderPluginAdapterWorker = function() {
+  return {
+    name: "builder-plugin-adapter-worker",
+    setup: function setup(api) {
+      api.modifyBundlerChain(function() {
+        var _ref = _async_to_generator(function(chain, param) {
+          var isServiceWorker, config, workerPath, filename;
+          return _ts_generator(this, function(_state) {
+            isServiceWorker = param.isServiceWorker;
+            config = api.getNormalizedConfig();
+            if (isServiceWorker) {
+              workerPath = getDistPath(config.output, "worker");
+              filename = posix.join(workerPath, "[name].js");
+              chain.output.filename(filename).chunkFilename(filename).libraryTarget("commonjs2");
+            }
+            return [
+              2
+            ];
+          });
+        });
+        return function(chain, _) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    }
+  };
+};
+export {
+  builderPluginAdapterWorker
+};

package/dist/esm/builder/shared/builderPlugins/index.js

@@ -1,3 +1,4 @@
 export * from "./adapterBasic";
 export * from "./adapterHtml";
 export * from "./adapterSSR";
+export * from "./adapterWorker";

package/dist/esm/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js

@@ -1,57 +1,49 @@
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
-import { _ as _create_class } from "@swc/helpers/_/_create_class";
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 var HtmlAsyncChunkPlugin = /* @__PURE__ */ function() {
   "use strict";
   function HtmlAsyncChunkPlugin2(htmlWebpackPlugin) {
     _class_call_check(this, HtmlAsyncChunkPlugin2);
-    _define_property(this, "name", void 0);
-    _define_property(this, "htmlWebpackPlugin", void 0);
     this.name = "HtmlAsyncChunkPlugin";
     this.htmlWebpackPlugin = htmlWebpackPlugin;
   }
-  _create_class(HtmlAsyncChunkPlugin2, [
-    {
-      key: "apply",
-      value: function apply(compiler) {
-        var _this = this;
-        compiler.hooks.compilation.tap(this.name, function(compilation) {
-          var hooks = _this.htmlWebpackPlugin.getHooks(compilation);
-          hooks.alterAssetTagGroups.tap(_this.name, function(assets) {
-            var tags = _to_consumable_array(assets.headTags).concat(_to_consumable_array(assets.bodyTags));
-            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-            try {
-              for (var _iterator = tags[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-                var tag = _step.value;
-                if (tag.tagName === "script") {
-                  var attributes = tag.attributes;
-                  if (attributes && attributes.defer === true) {
-                    attributes.async = true;
-                    delete attributes.defer;
-                  }
-                }
-              }
-            } catch (err) {
-              _didIteratorError = true;
-              _iteratorError = err;
-            } finally {
-              try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                  _iterator.return();
-                }
-              } finally {
-                if (_didIteratorError) {
-                  throw _iteratorError;
-                }
+  var _proto = HtmlAsyncChunkPlugin2.prototype;
+  _proto.apply = function apply(compiler) {
+    var _this = this;
+    compiler.hooks.compilation.tap(this.name, function(compilation) {
+      var hooks = _this.htmlWebpackPlugin.getHooks(compilation);
+      hooks.alterAssetTagGroups.tap(_this.name, function(assets) {
+        var tags = _to_consumable_array(assets.headTags).concat(_to_consumable_array(assets.bodyTags));
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+        try {
+          for (var _iterator = tags[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+            var tag = _step.value;
+            if (tag.tagName === "script") {
+              var attributes = tag.attributes;
+              if (attributes && attributes.defer === true) {
+                attributes.async = true;
+                delete attributes.defer;
               }
             }
-            return assets;
-          });
-        });
-      }
-    }
-  ]);
+          }
+        } catch (err) {
+          _didIteratorError = true;
+          _iteratorError = err;
+        } finally {
+          try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+              _iterator.return();
+            }
+          } finally {
+            if (_didIteratorError) {
+              throw _iteratorError;
+            }
+          }
+        }
+        return assets;
+      });
+    });
+  };
   return HtmlAsyncChunkPlugin2;
 }();
 export {

package/dist/esm/builder/shared/bundlerPlugins/HtmlBottomTemplate.js

@@ -1,43 +1,35 @@
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
-import { _ as _create_class } from "@swc/helpers/_/_create_class";
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 var BottomTemplatePlugin = /* @__PURE__ */ function() {
   "use strict";
   function BottomTemplatePlugin2(htmlWebpackPlugin) {
     _class_call_check(this, BottomTemplatePlugin2);
-    _define_property(this, "htmlWebpackPlugin", void 0);
-    _define_property(this, "bottomTemplateReg", /<!--<\?-\s*bottomTemplate\s*\?>-->/);
-    _define_property(this, "bodyRegExp", /(<\/\s*body\s*>)/i);
-    _define_property(this, "name", void 0);
+    this.bottomTemplateReg = /<!--<\?-\s*bottomTemplate\s*\?>-->/;
+    this.bodyRegExp = /(<\/\s*body\s*>)/i;
     this.htmlWebpackPlugin = htmlWebpackPlugin;
     this.name = "bottom-template";
   }
-  _create_class(BottomTemplatePlugin2, [
-    {
-      key: "apply",
-      value: function apply(compiler) {
-        var _this = this;
-        compiler.hooks.compilation.tap(this.name, function(compilation) {
-          _this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(_this.name, function(data) {
-            var _data_plugin_options;
-            if (!((_data_plugin_options = data.plugin.options) === null || _data_plugin_options === void 0 ? void 0 : _data_plugin_options.__internal__)) {
-              return data;
-            }
-            if (_this.bottomTemplateReg.test(data.html)) {
-              data.html = data.html.replace(_this.bottomTemplateReg, "");
-              var bottomTemplate = data.plugin.options.bottomTemplate;
-              if (bottomTemplate) {
-                data.html = data.html.replace(_this.bodyRegExp, function(match) {
-                  return "\n".concat(bottomTemplate, "\n").concat(match);
-                });
-              }
-            }
-            return data;
-          });
-        });
-      }
-    }
-  ]);
+  var _proto = BottomTemplatePlugin2.prototype;
+  _proto.apply = function apply(compiler) {
+    var _this = this;
+    compiler.hooks.compilation.tap(this.name, function(compilation) {
+      _this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(_this.name, function(data) {
+        var _data_plugin_options;
+        if (!((_data_plugin_options = data.plugin.options) === null || _data_plugin_options === void 0 ? void 0 : _data_plugin_options.__internal__)) {
+          return data;
+        }
+        if (_this.bottomTemplateReg.test(data.html)) {
+          data.html = data.html.replace(_this.bottomTemplateReg, "");
+          var bottomTemplate = data.plugin.options.bottomTemplate;
+          if (bottomTemplate) {
+            data.html = data.html.replace(_this.bodyRegExp, function(match) {
+              return "\n".concat(bottomTemplate, "\n").concat(match);
+            });
+          }
+        }
+        return data;
+      });
+    });
+  };
   return BottomTemplatePlugin2;
 }();
 export {