@modern-js/app-tools 2.48.0 → 2.48.1

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/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 {

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

@@ -1,7 +1,5 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 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 _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
@@ -18,13 +16,7 @@ var RouterPlugin = /* @__PURE__ */ function() {
   function RouterPlugin2(param) {
     var _param_staticJsDir = param.staticJsDir, staticJsDir = _param_staticJsDir === void 0 ? "static/js" : _param_staticJsDir, HtmlBundlerPlugin = param.HtmlBundlerPlugin, enableInlineRouteManifests = param.enableInlineRouteManifests, _param_disableFilenameHash = param.disableFilenameHash, disableFilenameHash = _param_disableFilenameHash === void 0 ? false : _param_disableFilenameHash, _param_scriptLoading = param.scriptLoading, scriptLoading = _param_scriptLoading === void 0 ? "defer" : _param_scriptLoading, nonce = param.nonce;
     _class_call_check(this, RouterPlugin2);
-    _define_property(this, "name", "RouterPlugin");
-    _define_property(this, "HtmlBundlerPlugin", void 0);
-    _define_property(this, "enableInlineRouteManifests", void 0);
-    _define_property(this, "staticJsDir", void 0);
-    _define_property(this, "disableFilenameHash", void 0);
-    _define_property(this, "scriptLoading", void 0);
-    _define_property(this, "nonce", void 0);
+    this.name = "RouterPlugin";
     this.HtmlBundlerPlugin = HtmlBundlerPlugin;
     this.enableInlineRouteManifests = enableInlineRouteManifests;
     this.staticJsDir = staticJsDir;
@@ -32,276 +24,263 @@ var RouterPlugin = /* @__PURE__ */ function() {
     this.scriptLoading = scriptLoading;
     this.nonce = nonce;
   }
-  _create_class(RouterPlugin2, [
-    {
-      key: "isTargetNodeOrWebWorker",
-      value: function isTargetNodeOrWebWorker(target) {
-        if (target === "node" || Array.isArray(target) && target.includes("node")) {
-          return true;
-        }
-        if (target === "webworker" || Array.isArray(target) && target.includes("webworker")) {
-          return true;
-        }
-        return false;
-      }
-    },
-    {
-      key: "getEntryChunks",
-      value: function getEntryChunks(compilation, chunks) {
-        var entrypointsArray = Array.from(compilation.entrypoints.entries());
-        var entryChunkIds = entrypointsArray.map(function(entrypoint) {
-          return entrypoint[0];
-        });
-        var entryChunks = _to_consumable_array(chunks).filter(function(chunk) {
-          var _chunk_names;
-          return (_chunk_names = chunk.names) === null || _chunk_names === void 0 ? void 0 : _chunk_names.some(function(name) {
-            return entryChunkIds.includes(name);
-          });
-        });
-        return entryChunks;
-      }
-    },
-    {
-      key: "getEntryChunkFiles",
-      value: function getEntryChunkFiles(entryChunks) {
-        return entryChunks.map(function(chunk) {
-          return _to_consumable_array(chunk.files || []).find(function(fname) {
-            return fname.includes(".js");
-          });
-        });
+  var _proto = RouterPlugin2.prototype;
+  _proto.isTargetNodeOrWebWorker = function isTargetNodeOrWebWorker(target) {
+    if (target === "node" || Array.isArray(target) && target.includes("node")) {
+      return true;
+    }
+    if (target === "webworker" || Array.isArray(target) && target.includes("webworker")) {
+      return true;
+    }
+    return false;
+  };
+  _proto.getEntryChunks = function getEntryChunks(compilation, chunks) {
+    var entrypointsArray = Array.from(compilation.entrypoints.entries());
+    var entryChunkIds = entrypointsArray.map(function(entrypoint) {
+      return entrypoint[0];
+    });
+    var entryChunks = _to_consumable_array(chunks).filter(function(chunk) {
+      var _chunk_names;
+      return (_chunk_names = chunk.names) === null || _chunk_names === void 0 ? void 0 : _chunk_names.some(function(name) {
+        return entryChunkIds.includes(name);
+      });
+    });
+    return entryChunks;
+  };
+  _proto.getEntryChunkFiles = function getEntryChunkFiles(entryChunks) {
+    return entryChunks.map(function(chunk) {
+      return _to_consumable_array(chunk.files || []).find(function(fname) {
+        return fname.includes(".js");
+      });
+    });
+  };
+  _proto.apply = function apply(compiler) {
+    var _this = this;
+    var target = compiler.options.target;
+    if (this.isTargetNodeOrWebWorker(target)) {
+      return;
+    }
+    var webpack = compiler.webpack;
+    var isRspack = "rspackVersion" in webpack;
+    var Compilation = webpack.Compilation, sources = webpack.sources;
+    var RawSource = sources.RawSource;
+    var normalizePath = function(path) {
+      if (!path.endsWith("/")) {
+        return "".concat(path, "/");
       }
-    },
-    {
-      key: "apply",
-      value: function apply(compiler) {
-        var _this = this;
-        var target = compiler.options.target;
-        if (this.isTargetNodeOrWebWorker(target)) {
-          return;
-        }
-        var webpack = compiler.webpack;
-        var isRspack = "rspackVersion" in webpack;
-        var Compilation = webpack.Compilation, sources = webpack.sources;
-        var RawSource = sources.RawSource;
-        var normalizePath = function(path) {
-          if (!path.endsWith("/")) {
-            return "".concat(path, "/");
-          }
-          return path;
-        };
-        var chunksToHtmlName = /* @__PURE__ */ new Map();
-        var ROUTE_MANIFEST_HOLDER = "route-manifest";
-        var placeholder = "<!--<?- ".concat(ROUTE_MANIFEST_HOLDER, " ?>-->");
-        compiler.hooks.thisCompilation.tap(PLUGIN_NAME, function(compilation) {
-          _this.HtmlBundlerPlugin.getHooks(compilation).beforeEmit.tapAsync("RouterManifestPlugin", function(data, callback) {
-            var outputName = data.outputName;
-            var chunks = data.plugin.options.chunks;
-            chunksToHtmlName.set(chunks, outputName);
-            data.html = data.html.replace("</script>", "</script>".concat(placeholder));
-            callback(null, data);
-          });
-          var _this1 = _this;
-          compilation.hooks.processAssets.tapPromise({
-            name: PLUGIN_NAME,
-            stage: Compilation.PROCESS_ASSETS_STAGE_REPORT
-          }, /* @__PURE__ */ _async_to_generator(function() {
-            var _loop, stats, publicPath, _stats_chunks, chunks, namedChunkGroups, routeAssets, prevManifestAsset, prevManifestStr, prevManifest, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, assets, referenceCssAssets, manifest, entryNames, entryChunks, orignalEntryIds, entryChunkFiles, entryChunkFileIds, i;
-            return _ts_generator(this, function(_state) {
-              _loop = function(i2) {
-                var entryName = entryNames[i2];
-                var file = entryChunkFiles[i2];
-                var chunkNames = entryChunks[i2].names;
-                var chunkId = entryChunkFileIds[i2];
-                var asset = compilation.assets[file];
-                if (!asset || !chunkId) {
-                  return "continue";
-                }
-                var relatedAssets = {};
-                if (entryChunkFiles.length > 1) {
-                  Object.keys(routeAssets).forEach(function(routeId) {
-                    var segments = routeId.split("_");
-                    var chunkName = segments[0];
-                    if (chunkNames === null || chunkNames === void 0 ? void 0 : chunkNames.includes(chunkName)) {
-                      relatedAssets[routeId] = routeAssets[routeId];
-                    }
-                  });
-                } else {
-                  relatedAssets = routeAssets;
-                }
-                var manifest2 = {
-                  routeAssets: relatedAssets
-                };
-                var injectedContent = "\n            ;(function(){\n              window.".concat(ROUTE_MANIFEST, " = ").concat(JSON.stringify(manifest2, function(k, v) {
-                  if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
-                    return v.map(function(item) {
-                      return item.replace(publicPath, "");
-                    });
-                  }
-                  return v;
-                }), ";\n            })();\n          ");
-                var htmlName = void 0;
-                var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
-                try {
-                  var _loop2 = function() {
-                    var _step_value2 = _sliced_to_array(_step2.value, 2), chunks2 = _step_value2[0], name2 = _step_value2[1];
-                    if (Array.isArray(chunkNames) && Array.isArray(chunks2) && chunkNames.every(function(value, index) {
-                      return value === chunks2[index];
-                    })) {
-                      htmlName = name2;
-                      return "break";
-                    }
-                  };
-                  for (var _iterator2 = chunksToHtmlName.entries()[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-                    var _ret = _loop2();
-                    if (_ret === "break")
-                      break;
-                  }
-                } catch (err) {
-                  _didIteratorError2 = true;
-                  _iteratorError2 = err;
-                } finally {
-                  try {
-                    if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-                      _iterator2.return();
-                    }
-                  } finally {
-                    if (_didIteratorError2) {
-                      throw _iteratorError2;
-                    }
-                  }
+      return path;
+    };
+    var chunksToHtmlName = /* @__PURE__ */ new Map();
+    var ROUTE_MANIFEST_HOLDER = "route-manifest";
+    var placeholder = "<!--<?- ".concat(ROUTE_MANIFEST_HOLDER, " ?>-->");
+    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, function(compilation) {
+      _this.HtmlBundlerPlugin.getHooks(compilation).beforeEmit.tapAsync("RouterManifestPlugin", function(data, callback) {
+        var outputName = data.outputName;
+        var chunks = data.plugin.options.chunks;
+        chunksToHtmlName.set(chunks, outputName);
+        data.html = data.html.replace("</script>", "</script>".concat(placeholder));
+        callback(null, data);
+      });
+      var _this1 = _this;
+      compilation.hooks.processAssets.tapPromise({
+        name: PLUGIN_NAME,
+        stage: Compilation.PROCESS_ASSETS_STAGE_REPORT
+      }, /* @__PURE__ */ _async_to_generator(function() {
+        var _loop, stats, publicPath, _stats_chunks, chunks, namedChunkGroups, routeAssets, prevManifestAsset, prevManifestStr, prevManifest, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, assets, referenceCssAssets, manifest, entryNames, entryChunks, orignalEntryIds, entryChunkFiles, entryChunkFileIds, i;
+        return _ts_generator(this, function(_state) {
+          _loop = function(i2) {
+            var entryName = entryNames[i2];
+            var file = entryChunkFiles[i2];
+            var chunkNames = entryChunks[i2].names;
+            var chunkId = entryChunkFileIds[i2];
+            var asset = compilation.assets[file];
+            if (!asset || !chunkId) {
+              return "continue";
+            }
+            var relatedAssets = {};
+            if (entryChunkFiles.length > 1) {
+              Object.keys(routeAssets).forEach(function(routeId) {
+                var segments = routeId.split("_");
+                var chunkName = segments[0];
+                if (chunkNames === null || chunkNames === void 0 ? void 0 : chunkNames.includes(chunkName)) {
+                  relatedAssets[routeId] = routeAssets[routeId];
                 }
-                var oldHtml = compilation.assets[htmlName];
-                var enableInlineRouteManifests = _this1.enableInlineRouteManifests, disableFilenameHash = _this1.disableFilenameHash, staticJsDir = _this1.staticJsDir, scriptLoading = _this1.scriptLoading, nonce = _this1.nonce;
-                var nonceAttr = nonce ? 'nonce="'.concat(nonce, '"') : "";
-                if (oldHtml) {
-                  if (enableInlineRouteManifests) {
-                    compilation.updateAsset(
-                      htmlName,
-                      new RawSource(oldHtml.source().toString().replace(placeholder, "<script ".concat(nonceAttr, ">").concat(injectedContent, "</script>"))),
-                      // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
-                      void 0
-                    );
-                  } else {
-                    var scriptPath = "".concat(staticJsDir, "/").concat(ROUTE_MANIFEST_HOLDER, "-").concat(entryName).concat(disableFilenameHash ? ".js" : ".".concat(generateContentHash(injectedContent), ".js"));
-                    var scriptUrl = "".concat(publicPath).concat(scriptPath);
-                    var scriptLoadingAttr = (
-                      // eslint-disable-next-line no-nested-ternary
-                      scriptLoading === "defer" ? scriptLoading : scriptLoading === "module" ? 'type="module"' : ""
-                    );
-                    var script = "<script ".concat(scriptLoadingAttr, " ").concat(nonceAttr, ' src="').concat(scriptUrl, '"></script>');
-                    compilation.updateAsset(
-                      htmlName,
-                      new RawSource(oldHtml.source().toString().replace(placeholder, script)),
-                      // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
-                      void 0
-                    );
-                    compilation.emitAsset(scriptPath, new RawSource(injectedContent));
-                  }
+              });
+            } else {
+              relatedAssets = routeAssets;
+            }
+            var manifest2 = {
+              routeAssets: relatedAssets
+            };
+            var injectedContent = "\n            ;(function(){\n              window.".concat(ROUTE_MANIFEST, " = ").concat(JSON.stringify(manifest2, function(k, v) {
+              if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
+                return v.map(function(item) {
+                  return item.replace(publicPath, "");
+                });
+              }
+              return v;
+            }), ";\n            })();\n          ");
+            var htmlName = void 0;
+            var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
+            try {
+              var _loop2 = function() {
+                var _step_value2 = _sliced_to_array(_step2.value, 2), chunks2 = _step_value2[0], name2 = _step_value2[1];
+                if (Array.isArray(chunkNames) && Array.isArray(chunks2) && chunkNames.every(function(value, index) {
+                  return value === chunks2[index];
+                })) {
+                  htmlName = name2;
+                  return "break";
                 }
               };
-              stats = compilation.getStats().toJson({
-                all: false,
-                publicPath: true,
-                assets: true,
-                chunkGroups: true,
-                chunks: true,
-                ids: true
-              });
-              publicPath = stats.publicPath, _stats_chunks = stats.chunks, chunks = _stats_chunks === void 0 ? [] : _stats_chunks, namedChunkGroups = stats.namedChunkGroups;
-              routeAssets = {};
-              if (!namedChunkGroups) {
-                return [
-                  2
-                ];
+              for (var _iterator2 = chunksToHtmlName.entries()[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+                var _ret = _loop2();
+                if (_ret === "break")
+                  break;
               }
-              prevManifestAsset = compilation.getAsset(ROUTE_MANIFEST_FILE);
-              prevManifestStr = prevManifestAsset ? prevManifestAsset.source.source().toString() : JSON.stringify({
-                routeAssets: {}
-              });
-              prevManifest = JSON.parse(prevManifestStr);
-              _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+            } catch (err) {
+              _didIteratorError2 = true;
+              _iteratorError2 = err;
+            } finally {
               try {
-                for (_iterator = Object.entries(namedChunkGroups)[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-                  _step_value = _sliced_to_array(_step.value, 2), name = _step_value[0], chunkGroup = _step_value[1];
-                  assets = chunkGroup.assets.map(function(asset) {
-                    var filename = asset.name;
-                    return publicPath ? normalizePath(publicPath) + filename : filename;
-                  });
-                  referenceCssAssets = assets.filter(function(asset) {
-                    return /\.css$/.test(asset);
-                  });
-                  routeAssets[name] = {
-                    chunkIds: chunkGroup.chunks,
-                    assets,
-                    referenceCssAssets
-                  };
-                  if (prevManifest.routeAssets[name]) {
-                    mergeWith(routeAssets[name], prevManifest.routeAssets[name], function(obj, source) {
-                      if (Array.isArray(obj)) {
-                        return obj.concat(source);
-                      }
-                      return Object.assign(source, obj);
-                    });
-                  }
+                if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+                  _iterator2.return();
                 }
-              } catch (err) {
-                _didIteratorError = true;
-                _iteratorError = err;
               } finally {
-                try {
-                  if (!_iteratorNormalCompletion && _iterator.return != null) {
-                    _iterator.return();
-                  }
-                } finally {
-                  if (_didIteratorError) {
-                    throw _iteratorError;
-                  }
+                if (_didIteratorError2) {
+                  throw _iteratorError2;
                 }
               }
-              manifest = {
-                routeAssets
-              };
-              entryNames = Array.from(compilation.entrypoints.keys());
-              entryChunks = [];
-              if (isRspack) {
-                entryChunks = _this1.getEntryChunks(compilation, chunks);
-              } else {
-                orignalEntryIds = Object.keys(compilation.options.entry).map(function(entryName) {
-                  var chunk = compilation.namedChunks.get(entryName);
-                  if (chunk) {
-                    return chunk.id;
-                  }
-                  return entryName;
-                });
-                entryChunks = _this1.getEntryChunks(compilation, chunks).filter(function(chunk) {
-                  return orignalEntryIds.includes(chunk.id);
-                });
-              }
-              entryChunkFiles = _this1.getEntryChunkFiles(entryChunks);
-              entryChunkFileIds = entryChunks.map(function(chunk) {
-                return chunk.id;
-              });
-              for (i = 0; i < entryChunkFiles.length; i++)
-                _loop(i);
-              if (prevManifestAsset) {
+            }
+            var oldHtml = compilation.assets[htmlName];
+            var enableInlineRouteManifests = _this1.enableInlineRouteManifests, disableFilenameHash = _this1.disableFilenameHash, staticJsDir = _this1.staticJsDir, scriptLoading = _this1.scriptLoading, nonce = _this1.nonce;
+            var nonceAttr = nonce ? 'nonce="'.concat(nonce, '"') : "";
+            if (oldHtml) {
+              if (enableInlineRouteManifests) {
                 compilation.updateAsset(
-                  ROUTE_MANIFEST_FILE,
-                  new RawSource(JSON.stringify(manifest, null, 2)),
+                  htmlName,
+                  new RawSource(oldHtml.source().toString().replace(placeholder, "<script ".concat(nonceAttr, ">").concat(injectedContent, "</script>"))),
                   // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
                   void 0
                 );
               } else {
-                compilation.emitAsset(ROUTE_MANIFEST_FILE, new RawSource(JSON.stringify(manifest, null, 2)));
+                var scriptPath = "".concat(staticJsDir, "/").concat(ROUTE_MANIFEST_HOLDER, "-").concat(entryName).concat(disableFilenameHash ? ".js" : ".".concat(generateContentHash(injectedContent), ".js"));
+                var scriptUrl = "".concat(publicPath).concat(scriptPath);
+                var scriptLoadingAttr = (
+                  // eslint-disable-next-line no-nested-ternary
+                  scriptLoading === "defer" ? scriptLoading : scriptLoading === "module" ? 'type="module"' : ""
+                );
+                var script = "<script ".concat(scriptLoadingAttr, " ").concat(nonceAttr, ' src="').concat(scriptUrl, '"></script>');
+                compilation.updateAsset(
+                  htmlName,
+                  new RawSource(oldHtml.source().toString().replace(placeholder, script)),
+                  // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
+                  void 0
+                );
+                compilation.emitAsset(scriptPath, new RawSource(injectedContent));
               }
-              return [
-                2
-              ];
+            }
+          };
+          stats = compilation.getStats().toJson({
+            all: false,
+            publicPath: true,
+            assets: true,
+            chunkGroups: true,
+            chunks: true,
+            ids: true
+          });
+          publicPath = stats.publicPath, _stats_chunks = stats.chunks, chunks = _stats_chunks === void 0 ? [] : _stats_chunks, namedChunkGroups = stats.namedChunkGroups;
+          routeAssets = {};
+          if (!namedChunkGroups) {
+            return [
+              2
+            ];
+          }
+          prevManifestAsset = compilation.getAsset(ROUTE_MANIFEST_FILE);
+          prevManifestStr = prevManifestAsset ? prevManifestAsset.source.source().toString() : JSON.stringify({
+            routeAssets: {}
+          });
+          prevManifest = JSON.parse(prevManifestStr);
+          _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+          try {
+            for (_iterator = Object.entries(namedChunkGroups)[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+              _step_value = _sliced_to_array(_step.value, 2), name = _step_value[0], chunkGroup = _step_value[1];
+              assets = chunkGroup.assets.map(function(asset) {
+                var filename = asset.name;
+                return publicPath ? normalizePath(publicPath) + filename : filename;
+              });
+              referenceCssAssets = assets.filter(function(asset) {
+                return /\.css$/.test(asset);
+              });
+              routeAssets[name] = {
+                chunkIds: chunkGroup.chunks,
+                assets,
+                referenceCssAssets
+              };
+              if (prevManifest.routeAssets[name]) {
+                mergeWith(routeAssets[name], prevManifest.routeAssets[name], function(obj, source) {
+                  if (Array.isArray(obj)) {
+                    return obj.concat(source);
+                  }
+                  return Object.assign(source, obj);
+                });
+              }
+            }
+          } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+          } finally {
+            try {
+              if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+              }
+            } finally {
+              if (_didIteratorError) {
+                throw _iteratorError;
+              }
+            }
+          }
+          manifest = {
+            routeAssets
+          };
+          entryNames = Array.from(compilation.entrypoints.keys());
+          entryChunks = [];
+          if (isRspack) {
+            entryChunks = _this1.getEntryChunks(compilation, chunks);
+          } else {
+            orignalEntryIds = Object.keys(compilation.options.entry).map(function(entryName) {
+              var chunk = compilation.namedChunks.get(entryName);
+              if (chunk) {
+                return chunk.id;
+              }
+              return entryName;
+            });
+            entryChunks = _this1.getEntryChunks(compilation, chunks).filter(function(chunk) {
+              return orignalEntryIds.includes(chunk.id);
             });
-          }));
+          }
+          entryChunkFiles = _this1.getEntryChunkFiles(entryChunks);
+          entryChunkFileIds = entryChunks.map(function(chunk) {
+            return chunk.id;
+          });
+          for (i = 0; i < entryChunkFiles.length; i++)
+            _loop(i);
+          if (prevManifestAsset) {
+            compilation.updateAsset(
+              ROUTE_MANIFEST_FILE,
+              new RawSource(JSON.stringify(manifest, null, 2)),
+              // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
+              void 0
+            );
+          } else {
+            compilation.emitAsset(ROUTE_MANIFEST_FILE, new RawSource(JSON.stringify(manifest, null, 2)));
+          }
+          return [
+            2
+          ];
         });
-      }
-    }
-  ]);
+      }));
+    });
+  };
   return RouterPlugin2;
 }();
 export {

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

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

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

@@ -1,5 +1,6 @@
 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-node/builder/shared/builderPlugins/adapterWorker.js

@@ -0,0 +1,25 @@
+import { posix } from "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 = posix.join(workerPath, `[name].js`);
+        chain.output.filename(filename).chunkFilename(filename).libraryTarget("commonjs2");
+      }
+    });
+  }
+});
+export {
+  builderPluginAdapterWorker
+};

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

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

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 class HtmlAsyncChunkPlugin {
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, (compilation) => {
@@ -22,8 +21,6 @@ class HtmlAsyncChunkPlugin {
     });
   }
   constructor(htmlWebpackPlugin) {
-    _define_property(this, "name", void 0);
-    _define_property(this, "htmlWebpackPlugin", void 0);
     this.name = "HtmlAsyncChunkPlugin";
     this.htmlWebpackPlugin = htmlWebpackPlugin;
   }

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 class BottomTemplatePlugin {
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, (compilation) => {
@@ -21,10 +20,8 @@ ${match}`);
     });
   }
   constructor(htmlWebpackPlugin) {
-    _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";
   }

package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { createHash } from "crypto";
 import { mergeWith } from "@modern-js/utils/lodash";
 import { ROUTE_MANIFEST_FILE } from "@modern-js/utils";
@@ -206,13 +205,7 @@ class RouterPlugin {
     });
   }
   constructor({ staticJsDir = "static/js", HtmlBundlerPlugin, enableInlineRouteManifests, disableFilenameHash = false, scriptLoading = "defer", nonce }) {
-    _define_property(this, "name", "RouterPlugin");
-    _define_property(this, "HtmlBundlerPlugin", void 0);
-    _define_property(this, "enableInlineRouteManifests", void 0);
-    _define_property(this, "staticJsDir", void 0);
-    _define_property(this, "disableFilenameHash", void 0);
-    _define_property(this, "scriptLoading", void 0);
-    _define_property(this, "nonce", void 0);
+    this.name = "RouterPlugin";
     this.HtmlBundlerPlugin = HtmlBundlerPlugin;
     this.enableInlineRouteManifests = enableInlineRouteManifests;
     this.staticJsDir = staticJsDir;

package/dist/types/builder/shared/builderPlugins/adapterWorker.d.ts

@@ -0,0 +1,2 @@
+import { RsbuildPlugin } from '@rsbuild/shared';
+export declare const builderPluginAdapterWorker: () => RsbuildPlugin;

package/dist/types/builder/shared/builderPlugins/index.d.ts

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

package/dist/types/config/legacy/index.d.ts

@@ -1,3 +1,3 @@
 import type { AppLegacyNormalizedConfig, AppLegacyUserConfig, AppNormalizedConfig, AppUserConfig } from '../../types';
 export declare function transformNormalizedConfig(config: AppLegacyNormalizedConfig): AppNormalizedConfig<'webpack'>;
-export declare function checkIsLegacyConfig(config: AppLegacyUserConfig | AppUserConfig): config is AppLegacyUserConfig;
+export declare function checkIsLegacyConfig(config: AppLegacyUserConfig | AppUserConfig<'shared'>): config is AppLegacyUserConfig;

package/dist/types/defineConfig.d.ts

@@ -4,7 +4,7 @@ import type { AppLegacyUserConfig, AppUserConfig } from './types';
  * This function helps you to autocomplete configuration types.
  * It accepts a direct config object, or a function that returns a config.
  */
-export declare const defineConfig: <B extends "rspack" | "webpack" = "webpack">(config: UserConfigExport<AppUserConfig<B_1>>) => UserConfigExport<AppUserConfig<B_1>>;
+export declare const defineConfig: <B extends "rspack" | "webpack" = "webpack">(config: UserConfigExport<AppUserConfig<B>>) => UserConfigExport<AppUserConfig<B>>;
 /**
  * @deprecated Please use `defineConfig` instead.
  * `defineLegacyConfig` will be removed in the future major version.

package/dist/types/types/config/index.d.ts

@@ -1,5 +1,6 @@
 import type { ServerUserConfig, BffUserConfig } from '@modern-js/server-core';
 import type { UniBuilderPlugin } from '@modern-js/uni-builder';
+import type { Bundler } from '../utils';
 import type { OutputUserConfig } from './output';
 import type { SourceUserConfig } from './source';
 import type { TestingUserConfig } from './testing';
@@ -17,7 +18,7 @@ export interface RuntimeUserConfig {
 export interface RuntimeByEntriesUserConfig {
     [name: string]: RuntimeUserConfig;
 }
-export interface AppToolsUserConfig {
+export interface AppToolsUserConfig<B extends Bundler> {
     server?: ServerUserConfig;
     source?: SourceUserConfig;
     output?: OutputUserConfig;
@@ -33,7 +34,7 @@ export interface AppToolsUserConfig {
     runtime?: RuntimeUserConfig;
     runtimeByEntries?: RuntimeByEntriesUserConfig;
     html?: HtmlUserConfig;
-    tools?: ToolsUserConfig;
+    tools?: ToolsUserConfig<B>;
     security?: SecurityUserConfig;
     testing?: TestingUserConfig;
     builderPlugins?: UniBuilderPlugin[];
@@ -44,4 +45,4 @@ interface SharedNormalizedConfig<RawConfig> {
     cliOptions?: Record<string, any>;
     _raw: RawConfig;
 }
-export type AppToolsNormalizedConfig<Config = AppToolsUserConfig> = Required<Config> & SharedNormalizedConfig<Config>;
+export type AppToolsNormalizedConfig<Config = AppToolsUserConfig<'shared'>> = Required<Config> & SharedNormalizedConfig<Config>;

package/dist/types/types/config/tools.d.ts

@@ -2,9 +2,10 @@ import type { JestConfig } from '@modern-js/types';
 import type { PluginSwcOptions } from '@rsbuild/plugin-swc';
 import type { PluginEsbuildOptions } from '@rsbuild/plugin-esbuild';
 import type { UniBuilderConfig } from '@modern-js/uni-builder';
-import type { UnwrapBuilderConfig } from '../utils';
+import type { UnwrapBuilderConfig, Bundler } from '../utils';
 export type Tailwindcss = Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
-export interface ToolsUserConfig extends UnwrapBuilderConfig<UniBuilderConfig, 'tools'> {
+type BuilderToolsConfig = UnwrapBuilderConfig<UniBuilderConfig, 'tools'>;
+export interface ToolsUserConfig<B extends Bundler = 'webpack'> extends Omit<BuilderToolsConfig, 'swc'> {
     /**
      * Used to custom Tailwind CSS configurations.
      * @requires `tailwindcss` plugin.
@@ -25,7 +26,7 @@ export interface ToolsUserConfig extends UnwrapBuilderConfig<UniBuilderConfig, '
      * The configuration of `swc` is provided by `swc` plugin.
      * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
      */
-    swc?: PluginSwcOptions<'outer'>;
+    swc?: B extends 'shared' ? undefined : B extends 'webpack' ? PluginSwcOptions<'outer'> : BuilderToolsConfig['swc'];
     /**
      * Used to custom Esbuild configurations.
      * @requires `esbuild` plugin.
@@ -34,3 +35,4 @@ export interface ToolsUserConfig extends UnwrapBuilderConfig<UniBuilderConfig, '
      */
     esbuild?: PluginEsbuildOptions;
 }
+export {};

package/dist/types/types/index.d.ts

@@ -12,8 +12,8 @@ export type { ServerUserConfig, ServerNormalizedConfig, BffUserConfig, BffNormal
 export type { IAppContext, PluginAPI, CliPlugin, NormalizedConfig, UserConfig, } from '@modern-js/core';
 export type AppTools<B extends Bundler = 'webpack'> = {
     hooks: AppToolsHooks<B>;
-    userConfig: AppToolsUserConfig;
-    normalizedConfig: AppToolsNormalizedConfig<AppToolsUserConfig>;
+    userConfig: AppToolsUserConfig<B>;
+    normalizedConfig: AppToolsNormalizedConfig<AppToolsUserConfig<'shared'>>;
 };
 export type LegacyAppTools = {
     hooks: AppToolsHooks;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.48.0",
+  "version": "2.48.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -69,37 +69,37 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.23.0",
-    "@rsbuild/plugin-esbuild": "0.4.8",
-    "@rsbuild/plugin-node-polyfill": "0.4.8",
-    "@rsbuild/shared": "0.4.8",
-    "@rsbuild/core": "0.4.8",
+    "@rsbuild/plugin-esbuild": "0.4.15",
+    "@rsbuild/plugin-node-polyfill": "0.4.15",
+    "@rsbuild/shared": "0.4.15",
+    "@rsbuild/core": "0.4.15",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "@swc/helpers": "0.5.3",
-    "@modern-js/uni-builder": "2.48.0",
-    "@modern-js/core": "2.48.0",
-    "@modern-js/node-bundle-require": "2.48.0",
-    "@modern-js/plugin": "2.48.0",
-    "@modern-js/plugin-i18n": "2.48.0",
-    "@modern-js/plugin-data-loader": "2.48.0",
-    "@modern-js/plugin-lint": "2.48.0",
-    "@modern-js/server": "2.48.0",
-    "@modern-js/prod-server": "2.48.0",
-    "@modern-js/server-utils": "2.48.0",
-    "@modern-js/types": "2.48.0",
-    "@modern-js/utils": "2.48.0",
-    "@modern-js/server-core": "2.48.0"
+    "@modern-js/uni-builder": "2.48.1",
+    "@modern-js/core": "2.48.1",
+    "@modern-js/plugin": "2.48.1",
+    "@modern-js/node-bundle-require": "2.48.1",
+    "@modern-js/plugin-data-loader": "2.48.1",
+    "@modern-js/plugin-lint": "2.48.1",
+    "@modern-js/plugin-i18n": "2.48.1",
+    "@modern-js/prod-server": "2.48.1",
+    "@modern-js/server": "2.48.1",
+    "@modern-js/server-utils": "2.48.1",
+    "@modern-js/types": "2.48.1",
+    "@modern-js/utils": "2.48.1",
+    "@modern-js/server-core": "2.48.1"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.4.8",
+    "@rsbuild/plugin-swc": "0.4.15",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.89.0",
-    "@scripts/jest-config": "2.48.0",
-    "@scripts/build": "2.48.0"
+    "@scripts/build": "2.48.1",
+    "@scripts/jest-config": "2.48.1"
   },
   "sideEffects": false,
   "publishConfig": {