@modern-js/app-tools 2.4.0 → 2.5.0

package/dist/{js/node → cjs}/utils/routes.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var routes_exports = {};
 __export(routes_exports, {
   generateRoutes: () => generateRoutes
@@ -48,11 +28,11 @@ __export(routes_exports, {
 module.exports = __toCommonJS(routes_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-const generateRoutes = (appContext) => __async(void 0, null, function* () {
+const generateRoutes = async (appContext) => {
   const { serverRoutes, distDirectory } = appContext;
   const output = JSON.stringify({ routes: serverRoutes }, null, 2);
-  yield import_utils.fs.outputFile(import_path.default.join(distDirectory, import_utils.ROUTE_SPEC_FILE), output);
-});
+  await import_utils.fs.outputFile(import_path.default.join(distDirectory, import_utils.ROUTE_SPEC_FILE), output);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   generateRoutes

package/dist/{js/treeshaking → esm}/analyze/generateCode.js

@@ -161,7 +161,7 @@ var createImportSpecifier = function(specifiers) {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         for(var _iterator = specifiers[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var _value = _step.value, local = _value.local, imported = _value.imported;
+            var _step_value = _step.value, local = _step_value.local, imported = _step_value.imported;
             if (local && imported) {
                 named.push("".concat(imported, " as ").concat(local));
             } else if (local) {
@@ -198,7 +198,7 @@ var createImportStatements = function(statements) {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         var _loop = function() {
-            var _value = _step.value, value = _value.value, specifiers = _value.specifiers, initialize = _value.initialize;
+            var _step_value = _step.value, value = _step_value.value, specifiers = _step_value.specifiers, initialize = _step_value.initialize;
             if (!seen.has(value)) {
                 deDuplicated.push({
                     value: value,
@@ -207,14 +207,14 @@ var createImportStatements = function(statements) {
                 });
                 seen.set(value, specifiers);
             } else {
-                var _instance;
-                var ref;
-                (_instance = seen.get(value)).push.apply(_instance, _toConsumableArray(specifiers));
+                var _seen_get;
+                var _deDuplicated_modifyIndex;
+                (_seen_get = seen.get(value)).push.apply(_seen_get, _toConsumableArray(specifiers));
                 var modifyIndex = deDuplicated.findIndex(function(v) {
                     return v.value === value;
                 });
-                var ref1;
-                var originInitialize = (ref1 = (ref = deDuplicated[modifyIndex]) === null || ref === void 0 ? void 0 : ref.initialize) !== null && ref1 !== void 0 ? ref1 : "";
+                var _deDuplicated_modifyIndex_initialize;
+                var originInitialize = (_deDuplicated_modifyIndex_initialize = (_deDuplicated_modifyIndex = deDuplicated[modifyIndex]) === null || _deDuplicated_modifyIndex === void 0 ? void 0 : _deDuplicated_modifyIndex.initialize) !== null && _deDuplicated_modifyIndex_initialize !== void 0 ? _deDuplicated_modifyIndex_initialize : "";
                 deDuplicated[modifyIndex].initialize = originInitialize.concat("\n".concat(initialize || ""));
             }
         };
@@ -240,13 +240,13 @@ var createImportStatements = function(statements) {
 };
 var generateCode = function() {
     var _ref = _asyncToGenerator(function(appContext, config, entrypoints, api) {
-        var ref, ref1, ref2, internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, mountId, getRoutes;
+        var _config_runtime, _config_runtime1, _config_runtime_router, internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, mountId, getRoutes;
         function generateEntryCode(entrypoint) {
             return _generateEntryCode.apply(this, arguments);
         }
         function _generateEntryCode() {
             _generateEntryCode = _asyncToGenerator(function(entrypoint) {
-                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, mode, hasPageRoute, ref, code2, _, _tmp, routesServerFile, code3, ref1, importStatements, plugins, ref2, renderFunction, exportStatement, code, entryFile, ref3, asyncEntryCode, bootstrapFile;
+                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, mode, hasPageRoute, _ref, code2, _, _tmp, routesServerFile, code3, _ref1, importStatements, plugins, _ref2, renderFunction, exportStatement, code, entryFile, _ref3, asyncEntryCode, bootstrapFile;
                 return __generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
@@ -346,7 +346,7 @@ var generateCode = function() {
                                 ])
                             ];
                         case 6:
-                            ref = _state.sent(), code2 = ref.code;
+                            _ref = _state.sent(), code2 = _ref.code;
                             if (!(entrypoint.nestedRoutesEntry && mode)) return [
                                 3,
                                 9
@@ -386,7 +386,7 @@ var generateCode = function() {
                                 })
                             ];
                         case 11:
-                            ref1 = _state.sent(), importStatements = ref1.imports;
+                            _ref1 = _state.sent(), importStatements = _ref1.imports;
                             return [
                                 4,
                                 hookRunners.modifyEntryRuntimePlugins({
@@ -408,7 +408,7 @@ var generateCode = function() {
                                 })
                             ];
                         case 13:
-                            ref2 = _state.sent(), renderFunction = ref2.code;
+                            _ref2 = _state.sent(), renderFunction = _ref2.code;
                             return [
                                 4,
                                 hookRunners.modifyEntryExport({
@@ -438,7 +438,7 @@ var generateCode = function() {
                                 })
                             ];
                         case 15:
-                            ref3 = _state.sent(), asyncEntryCode = ref3.code;
+                            _ref3 = _state.sent(), asyncEntryCode = _ref3.code;
                             fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
                             bootstrapFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_BOOTSTRAP_FILE_NAME));
                             fs.outputFileSync(bootstrapFile, code, "utf8");
@@ -463,7 +463,7 @@ var generateCode = function() {
                 case 0:
                     internalDirectory = appContext.internalDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
                     hookRunners = api.useHookRunners();
-                    isV5 = typeof ((ref = config.runtime) === null || ref === void 0 ? void 0 : ref.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (ref1 = config.runtime) === null || ref1 === void 0 ? void 0 : (ref2 = ref1.router) === null || ref2 === void 0 ? void 0 : ref2.mode) === "react-router-5";
+                    isV5 = typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (_config_runtime1 = config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
                     mountId = config.html.mountId;
                     getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
                     return [

package/dist/{js/treeshaking → esm}/analyze/getBundleEntry.js

@@ -24,7 +24,7 @@ var ifAlreadyExists = function(entrypoints, checked) {
 };
 var getBundleEntry = function(appContext, config) {
     var appDirectory = appContext.appDirectory, packageName = appContext.packageName;
-    var _source = config.source, disableDefaultEntries = _source.disableDefaultEntries, entries = _source.entries, entriesDir = _source.entriesDir;
+    var _config_source = config.source, disableDefaultEntries = _config_source.disableDefaultEntries, entries = _config_source.entries, entriesDir = _config_source.entriesDir;
     var defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
     if (entries) {
         Object.keys(entries).forEach(function(name) {
@@ -32,11 +32,13 @@ var getBundleEntry = function(appContext, config) {
             var entrypoint = typeof value === "string" ? {
                 entryName: name,
                 entry: ensureAbsolutePath(appDirectory, value),
+                absoluteEntryDir: path.dirname(ensureAbsolutePath(appDirectory, value)),
                 isAutoMount: true,
                 fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
             } : {
                 entryName: name,
                 entry: ensureAbsolutePath(appDirectory, value.entry),
+                absoluteEntryDir: path.dirname(ensureAbsolutePath(appDirectory, value.entry)),
                 isAutoMount: !value.disableMount,
                 customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
                 fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
@@ -52,7 +54,7 @@ var getBundleEntry = function(appContext, config) {
     if (!disableDefaultEntries) {
         var entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || "");
         var found = defaults.find(function(param) {
-            var entryName = param.entryName, entry = param.entry, _nestedRoutesEntry = param.nestedRoutesEntry, nestedRoutesEntry = _nestedRoutesEntry === void 0 ? "" : _nestedRoutesEntry;
+            var entryName = param.entryName, entry = param.entry, _param_nestedRoutesEntry = param.nestedRoutesEntry, nestedRoutesEntry = _param_nestedRoutesEntry === void 0 ? "" : _param_nestedRoutesEntry;
             return entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(nestedRoutesEntry) === entriesDirAbs;
         });
         found && (found.entryName = MAIN_ENTRY_NAME);

package/dist/{js/treeshaking → esm}/analyze/getClientRoutes/getRoutes.js

@@ -67,7 +67,7 @@ var layoutNameAbbr = function(filePath) {
 };
 var parents = [];
 var recursiveReadDir = function(param) {
-    var dir = param.dir, routes = param.routes, _basePath = param.basePath, basePath = _basePath === void 0 ? "/" : _basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
+    var dir = param.dir, routes = param.routes, _param_basePath = param.basePath, basePath = _param_basePath === void 0 ? "/" : _param_basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
     var hasDynamicRoute = false;
     var resetParent = false;
     var parent = parents[parents.length - 1];

package/dist/{js/treeshaking → esm}/analyze/getClientRoutes/getRoutesLegacy.js

@@ -67,7 +67,7 @@ var layoutNameAbbr = function(filePath) {
 };
 var parents = [];
 var recursiveReadDirLegacy = function(param) {
-    var dir = param.dir, routes = param.routes, _basePath = param.basePath, basePath = _basePath === void 0 ? "/" : _basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
+    var dir = param.dir, routes = param.routes, _param_basePath = param.basePath, basePath = _param_basePath === void 0 ? "/" : _param_basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
     var hasDynamicRoute = false;
     var resetParent = false;
     var parent = parents[parents.length - 1];

package/dist/{js/treeshaking → esm}/analyze/getFileSystemEntry.js

@@ -80,7 +80,7 @@ var scanDir = function(dirs) {
 };
 var getFileSystemEntry = function(appContext, config) {
     var appDirectory = appContext.appDirectory;
-    var _source = config.source, entriesDir = _source.entriesDir, disableEntryDirs = _source.disableEntryDirs;
+    var _config_source = config.source, entriesDir = _config_source.entriesDir, disableEntryDirs = _config_source.disableEntryDirs;
     var disabledDirs = [];
     if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
         disabledDirs = disableEntryDirs === null || disableEntryDirs === void 0 ? void 0 : disableEntryDirs.map(function(dir) {

package/dist/{js/treeshaking → esm}/analyze/getServerRoutes.js

@@ -104,7 +104,7 @@ function _unsupportedIterableToArray(o, minLen) {
 }
 import path from "path";
 import fs from "fs";
-import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash } from "@modern-js/utils";
+import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash, SERVER_WORKER_BUNDLE_DIRECTORY } from "@modern-js/utils";
 import { walkDirectory } from "./utils";
 var applyBaseUrl = function(baseUrl, routes) {
     if (baseUrl) {
@@ -130,8 +130,8 @@ var applyRouteOptions = function(original, routeOptions) {
     var routes;
     if (route) {
         if (Array.isArray(route)) {
-            var _tmp;
-            _tmp = route.map(function(url) {
+            var _route_map;
+            _route_map = route.map(function(url) {
                 if (isPlainObject(url)) {
                     var urlPath = url.path, other = _objectWithoutProperties(url, [
                         "path"
@@ -144,7 +144,7 @@ var applyRouteOptions = function(original, routeOptions) {
                         urlPath: url
                     });
                 }
-            }), routes = _tmp, _tmp;
+            }), routes = _route_map, _route_map;
         } else if (isPlainObject(route)) {
             var urlPath = route.path, other = _objectWithoutProperties(route, [
                 "path"
@@ -169,12 +169,13 @@ var applyRouteOptions = function(original, routeOptions) {
     return routes;
 };
 var collectHtmlRoutes = function(entrypoints, appContext, config) {
-    var disableHtmlFolder = config.html.disableHtmlFolder, _output = config.output, tmp = _output.distPath, ref = tmp === void 0 ? {} : tmp, htmlPath = ref.html, _server = config.server, baseUrl = _server.baseUrl, routes = _server.routes, ssr = _server.ssr, ssrByEntries = _server.ssrByEntries;
+    var disableHtmlFolder = config.html.disableHtmlFolder, _config_output = config.output, tmp = _config_output.distPath, _ref = tmp === void 0 ? {} : tmp, htmlPath = _ref.html, _config_server = config.server, baseUrl = _config_server.baseUrl, routes = _config_server.routes, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries, worker = _config_server.worker;
     var packageName = appContext.packageName;
     var htmlRoutes = entrypoints.reduce(function(previous, param) {
         var entryName = param.entryName;
         var entryOptions = getEntryOptions(entryName, ssr, ssrByEntries, packageName);
         var isSSR = Boolean(entryOptions);
+        var isWorker = Boolean(worker);
         var resHeaders = ((routes === null || routes === void 0 ? void 0 : routes[entryName]) || {}).resHeaders;
         var route = {
             urlPath: "/".concat(entryName === MAIN_ENTRY_NAME ? "" : entryName),
@@ -183,6 +184,7 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
             isSPA: true,
             isSSR: isSSR,
             responseHeaders: resHeaders,
+            worker: isWorker ? "".concat(SERVER_WORKER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0,
             bundle: isSSR ? "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0
         };
         if (routes === null || routes === void 0 ? void 0 : routes.hasOwnProperty(entryName)) {
@@ -200,7 +202,7 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
 };
 var collectStaticRoutes = function(appContext, config) {
     var appDirectory = appContext.appDirectory;
-    var configDir = config.source.configDir, _server = config.server, _publicRoutes = _server.publicRoutes, publicRoutes = _publicRoutes === void 0 ? {} : _publicRoutes;
+    var configDir = config.source.configDir, _config_server = config.server, _config_server_publicRoutes = _config_server.publicRoutes, publicRoutes = _config_server_publicRoutes === void 0 ? {} : _config_server_publicRoutes;
     var publicFolder = path.resolve(appDirectory, configDir || "", "public");
     return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map(function(filePath) {
         var urlPath = "".concat(urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length)));

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

@@ -243,7 +243,7 @@ var analyze_default = function(param) {
             return {
                 prepare: function prepare() {
                     return _asyncToGenerator(function() {
-                        var ref, appContext, resolvedConfig, hookRunners, apiOnly, ref1, routes2, ref2, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, initialRoutes, routes, htmlTemplates, checkedEntries, entry, command, buildCommands, normalizedConfig, createBuilderForModern, builder;
+                        var _resolvedConfig_source, appContext, resolvedConfig, hookRunners, apiOnly, _ref, routes2, _ref1, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, initialRoutes, routes, htmlTemplates, checkedEntries, entry, command, buildCommands, normalizedConfig, createBuilderForModern, builder;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -255,7 +255,7 @@ var analyze_default = function(param) {
                                     } catch (e) {}
                                     return [
                                         4,
-                                        isApiOnly(appContext.appDirectory, (ref = resolvedConfig.source) === null || ref === void 0 ? void 0 : ref.entriesDir)
+                                        isApiOnly(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir)
                                     ];
                                 case 1:
                                     apiOnly = _state.sent();
@@ -276,7 +276,7 @@ var analyze_default = function(param) {
                                         })
                                     ];
                                 case 3:
-                                    ref1 = _state.sent(), routes2 = ref1.routes;
+                                    _ref = _state.sent(), routes2 = _ref.routes;
                                     debug("server routes: %o", routes2);
                                     appContext = _objectSpreadProps(_objectSpread({}, appContext), {
                                         apiOnly: apiOnly,
@@ -297,10 +297,10 @@ var analyze_default = function(param) {
                                         ])
                                     ];
                                 case 5:
-                                    ref2 = _slicedToArray.apply(void 0, [
+                                    _ref1 = _slicedToArray.apply(void 0, [
                                         _state.sent(),
                                         4
-                                    ]), getBundleEntry = ref2[0].getBundleEntry, getServerRoutes = ref2[1].getServerRoutes, generateCode = ref2[2].generateCode, getHtmlTemplate = ref2[3].getHtmlTemplate;
+                                    ]), getBundleEntry = _ref1[0].getBundleEntry, getServerRoutes = _ref1[1].getServerRoutes, generateCode = _ref1[2].generateCode, getHtmlTemplate = _ref1[3].getHtmlTemplate;
                                     entrypoints = getBundleEntry(appContext, resolvedConfig);
                                     debug("entrypoints: %o", entrypoints);
                                     initialRoutes = getServerRoutes(entrypoints, {
@@ -573,7 +573,7 @@ var analyze_default = function(param) {
                 modifyEntryImports: function modifyEntryImports(param) {
                     var entrypoint = param.entrypoint, imports = param.imports;
                     return _asyncToGenerator(function() {
-                        var appContext, srcDirectory, internalSrcAlias, fileSystemRoutes, nestedRoutesEntry, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout, ref, moduleExports, hasAppConfig, generateLayoutPath, hasAppInit;
+                        var appContext, srcDirectory, internalSrcAlias, fileSystemRoutes, nestedRoutesEntry, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout, _ref, moduleExports, hasAppConfig, generateLayoutPath, hasAppInit;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -612,10 +612,10 @@ var analyze_default = function(param) {
                                         })
                                     ];
                                 case 2:
-                                    ref = _slicedToArray.apply(void 0, [
+                                    _ref = _slicedToArray.apply(void 0, [
                                         _state.sent(),
                                         2
-                                    ]), moduleExports = ref[1];
+                                    ]), moduleExports = _ref[1];
                                     hasAppConfig = moduleExports.some(function(e) {
                                         return e.n === APP_CONFIG_NAME;
                                     });

package/dist/{js/treeshaking → esm}/analyze/nestedRoutes.js

@@ -197,7 +197,7 @@ var createRoute = function(routeInfo, rootDir, filename, entryName) {
 };
 var walk = function() {
     var _ref = _asyncToGenerator(function(dirname, rootDir, alias, entryName) {
-        var ref, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, ref1, ref2, ref3, err, finalRoute, childRoute1, path2;
+        var _route_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, _route_children1, _route_children2, _route_children3, err, finalRoute, childRoute1, path2;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -288,7 +288,7 @@ var walk = function() {
                     childRoute = _state.sent();
                     if (childRoute) {
                         ;
-                        (ref1 = route.children) === null || ref1 === void 0 ? void 0 : ref1.push(childRoute);
+                        (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(childRoute);
                     }
                     _state.label = 8;
                 case 8:
@@ -317,7 +317,7 @@ var walk = function() {
                         if (pageLoaderFile) {
                             pageRoute.loader = pageLoaderFile;
                         }
-                        (ref2 = route.children) === null || ref2 === void 0 ? void 0 : ref2.push(pageRoute);
+                        (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(pageRoute);
                     }
                     if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
                         splatLoaderFile = itemPath;
@@ -331,7 +331,7 @@ var walk = function() {
                         if (splatLoaderFile) {
                             splatRoute.loader = splatLoaderFile;
                         }
-                        (ref3 = route.children) === null || ref3 === void 0 ? void 0 : ref3.push(splatRoute);
+                        (_route_children3 = route.children) === null || _route_children3 === void 0 ? void 0 : _route_children3.push(splatRoute);
                     }
                     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
                         route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
@@ -377,7 +377,7 @@ var walk = function() {
                     if (isPathlessLayout) {
                         delete finalRoute.path;
                     }
-                    route.children = (ref = route.children) === null || ref === void 0 ? void 0 : ref.filter(function(childRoute) {
+                    route.children = (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.filter(function(childRoute) {
                         return childRoute;
                     });
                     if (route.children && route.children.length === 0 && !route.index) {

package/dist/{js/treeshaking → esm}/analyze/templates.js

@@ -229,10 +229,11 @@ var index = function(param) {
 };
 var renderFunction = function(param) {
     var plugins = param.plugins, customBootstrap = param.customBootstrap, fileSystemRoutes2 = param.fileSystemRoutes;
+    var bootstrap = "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM)";
     return "\n  const finalAppConfig = {\n    ...App.config,\n    ...typeof ".concat(APP_CONFIG_NAME, " === 'function' ? ").concat(APP_CONFIG_NAME, "() : {},\n  }\n\n  AppWrapper = createApp({\n    plugins: [\n     ").concat(plugins.map(function(param) {
         var name = param.name, options = param.options, args = param.args;
         return "".concat(name, "({...").concat(options, ", ...finalAppConfig?.").concat(args || name, "}),");
-    }).join("\n"), "\n    ]\n  })(").concat(fileSystemRoutes2 ? "" : "App", ")\n\n\n  if(!AppWrapper.init && typeof appInit !== 'undefined') {\n    AppWrapper.init = appInit;\n  }\n\n\n  if (IS_BROWSER) {\n    ").concat(customBootstrap ? "customBootstrap(AppWrapper);" : "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM);", "\n  }\n\n  return AppWrapper\n");
+    }).join("\n"), "\n    ]\n  })(").concat(fileSystemRoutes2 ? "" : "App", ")\n\n\n  if(!AppWrapper.init && typeof appInit !== 'undefined') {\n    AppWrapper.init = appInit;\n  }\n\n\n  if (IS_BROWSER) {\n    ").concat(customBootstrap ? "customBootstrap(AppWrapper, () => ".concat(bootstrap, ");") : "".concat(bootstrap, ";"), "\n  }\n\n  return AppWrapper\n");
 };
 var html = function(partials) {
     return "\n<!DOCTYPE html>\n<html>\n<head>\n  <%= meta %>\n  <title><%= title %></title>\n\n  ".concat(partials.top.join("\n"), "\n\n  <script>\n    window.__assetPrefix__ = '<%= assetPrefix %>';\n  </script>\n  ").concat(partials.head.join("\n"), "\n\n  <!--<?- chunksMap.css ?>-->\n</head>\n\n<body>\n  <noscript>\n    We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.\n  </noscript>\n  <div id=\"<%= mountId %>\"><!--<?- html ?>--></div>\n  ").concat(partials.body.join("\n"), "\n  <!--<?- chunksMap.js ?>-->\n  <!--<?- SSRDataScript ?>-->\n  <!--<?- bottomTemplate ?>-->\n</body>\n\n</html>\n");
@@ -243,8 +244,8 @@ var routesForServer = function(param) {
     var traverseRouteTree = function(route) {
         var children;
         if ("children" in route && route.children) {
-            var ref;
-            children = route === null || route === void 0 ? void 0 : (ref = route.children) === null || ref === void 0 ? void 0 : ref.map(traverseRouteTree);
+            var _route_children;
+            children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
         }
         var loader;
         if (route.type === "nested") {
@@ -296,7 +297,7 @@ var routesForServer = function(param) {
 };
 var fileSystemRoutes = function() {
     var _ref = _asyncToGenerator(function(param) {
-        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _value, key, loaderInfo;
+        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -321,8 +322,8 @@ var fileSystemRoutes = function() {
                     traverseRouteTree = function(route) {
                         var children;
                         if ("children" in route && route.children) {
-                            var ref;
-                            children = route === null || route === void 0 ? void 0 : (ref = route.children) === null || ref === void 0 ? void 0 : ref.map(traverseRouteTree);
+                            var _route_children;
+                            children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
                         }
                         var loading;
                         var error;
@@ -417,7 +418,7 @@ var fileSystemRoutes = function() {
                     _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
                     try {
                         for(_iterator1 = Object.entries(loadersMap)[Symbol.iterator](); !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
-                            _value = _slicedToArray(_step1.value, 2), key = _value[0], loaderInfo = _value[1];
+                            _step_value = _slicedToArray(_step1.value, 2), key = _step_value[0], loaderInfo = _step_value[1];
                             if (loaderInfo.inline) {
                                 importLoadersCode += "import { loader as ".concat(key, ' } from "').concat(getDataLoaderPath(key)).concat(slash(loaderInfo.filePath), '";\n');
                             } else {

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

@@ -333,7 +333,7 @@ var parseModule = function() {
 }();
 var hasLoader = function() {
     var _ref = _asyncToGenerator(function(filename) {
-        var source, ref, moduleExports;
+        var source, _ref, moduleExports;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -351,10 +351,10 @@ var hasLoader = function() {
                         })
                     ];
                 case 2:
-                    ref = _slicedToArray.apply(void 0, [
+                    _ref = _slicedToArray.apply(void 0, [
                         _state.sent(),
                         2
-                    ]), moduleExports = ref[1];
+                    ]), moduleExports = _ref[1];
                     return [
                         2,
                         moduleExports.some(function(e) {

package/dist/{js/treeshaking → esm}/builder/builder-webpack/builderPlugins/compatModern.js

@@ -33,15 +33,15 @@ var PluginCompatModern = function(options) {
             var modernConfig = options.normalizedConfig, appContext = options.appContext;
             api.modifyWebpackChain(function(chain, param) {
                 var CHAIN_ID = param.CHAIN_ID;
-                var ref;
+                var _modernConfig_runtime;
                 chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
                 if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
                     var defaultCopyPattern = createCopyPattern(appContext, modernConfig, "public", chain);
                     chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(function(args) {
-                        var ref;
+                        var _args_;
                         return [
                             {
-                                patterns: _toConsumableArray(((ref = args[0]) === null || ref === void 0 ? void 0 : ref.patterns) || []).concat([
+                                patterns: _toConsumableArray(((_args_ = args[0]) === null || _args_ === void 0 ? void 0 : _args_.patterns) || []).concat([
                                     defaultCopyPattern
                                 ])
                             }
@@ -52,7 +52,7 @@ var PluginCompatModern = function(options) {
                 var existNestedRoutes = entrypoints.some(function(entrypoint) {
                     return entrypoint.nestedRoutesEntry;
                 });
-                var routerConfig = modernConfig === null || modernConfig === void 0 ? void 0 : (ref = modernConfig.runtime) === null || ref === void 0 ? void 0 : ref.router;
+                var routerConfig = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_runtime = modernConfig.runtime) === null || _modernConfig_runtime === void 0 ? void 0 : _modernConfig_runtime.router;
                 var routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
                 if (existNestedRoutes || routerManifest) {
                     chain.plugin("route-plugin").use(RouterPlugin);

package/dist/{js/treeshaking → esm}/builder/builder-webpack/index.js

@@ -248,7 +248,7 @@ function applyBuilderPlugins(builder, options) {
 }
 function _applyBuilderPlugins() {
     _applyBuilderPlugins = _asyncToGenerator(function(builder, options) {
-        var normalizedConfig, PluginNodePolyfill, _tools, esbuildOptions, PluginEsbuild;
+        var normalizedConfig, PluginNodePolyfill, _normalizedConfig_tools, esbuildOptions, PluginEsbuild;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -272,7 +272,7 @@ function _applyBuilderPlugins() {
                         3,
                         4
                     ];
-                    _tools = normalizedConfig.tools, esbuildOptions = _tools.esbuild;
+                    _normalizedConfig_tools = normalizedConfig.tools, esbuildOptions = _normalizedConfig_tools.esbuild;
                     return [
                         4,
                         import("@modern-js/builder-plugin-esbuild")

package/dist/{js/treeshaking → esm}/builder/builder-webpack/webpackPlugins/RouterPlugin.js

@@ -215,6 +215,9 @@ var RouterPlugin = /*#__PURE__*/ function() {
                 if (target === "node" || Array.isArray(target) && target.includes("node")) {
                     return;
                 }
+                if (target === "webworker" || Array.isArray(target) && target.includes("webworker")) {
+                    return;
+                }
                 var webpack = compiler.webpack;
                 var Compilation = webpack.Compilation, sources = webpack.sources;
                 var RawSource = sources.RawSource;
@@ -232,7 +235,7 @@ var RouterPlugin = /*#__PURE__*/ function() {
                         name: PLUGIN_NAME,
                         stage: PROCESS_ASSETS_STAGE_REPORT
                     }, /*#__PURE__*/ _asyncToGenerator(function() {
-                        var stats, publicPath, routeAssets, namedChunkGroups, assetsByChunkName, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, name, chunkGroup, manifest, injectedContent, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, file, asset, newContent, filename;
+                        var stats, publicPath, routeAssets, namedChunkGroups, assetsByChunkName, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, manifest, injectedContent, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, file, asset, newContent, filename;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -252,7 +255,7 @@ var RouterPlugin = /*#__PURE__*/ function() {
                                     _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                                     try {
                                         for(_iterator = Object.entries(namedChunkGroups)[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                            _value = _slicedToArray(_step.value, 2), name = _value[0], chunkGroup = _value[1];
+                                            _step_value = _slicedToArray(_step.value, 2), name = _step_value[0], chunkGroup = _step_value[1];
                                             if (assetsByChunkName[name]) {
                                                 routeAssets[name] = {
                                                     chunkIds: chunkGroup.chunks,

package/dist/{js/treeshaking → esm}/builder/generator/createBuilderOptions.js

@@ -1,10 +1,10 @@
 function createBuilderOptions(target, appContext) {
     var entries = {};
-    var _entrypoints = appContext.entrypoints, entrypoints = _entrypoints === void 0 ? [] : _entrypoints, checkedEntries = appContext.checkedEntries;
+    var _appContext_entrypoints = appContext.entrypoints, entrypoints = _appContext_entrypoints === void 0 ? [] : _appContext_entrypoints, checkedEntries = appContext.checkedEntries;
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         for(var _iterator = entrypoints[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var _value = _step.value, entryName = _value.entryName, entry = _value.entry;
+            var _step_value = _step.value, entryName = _step_value.entryName, entry = _step_value.entry;
             if (checkedEntries && !checkedEntries.includes(entryName)) {
                 continue;
             }

package/dist/{js/treeshaking → esm}/builder/generator/getBuilderTargets.js

@@ -1,4 +1,4 @@
-import { isProd, isSSR, isUseSSRBundle } from "@modern-js/utils";
+import { isProd, isServiceWorker, isSSR, isUseSSRBundle } from "@modern-js/utils";
 function getBuilderTargets(normalizedConfig) {
     var targets = [
         "web"
@@ -7,6 +7,10 @@ function getBuilderTargets(normalizedConfig) {
     if (useNodeTarget) {
         targets.push("node");
     }
+    var useWorkerTarget = isProd() ? isServiceWorker(normalizedConfig) : false;
+    if (useWorkerTarget) {
+        targets.push("service-worker");
+    }
     return targets;
 }
 export { getBuilderTargets };

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

@@ -131,12 +131,12 @@ function generateBuilder(options, generateProvider, utils) {
 }
 function _generateBuilder() {
     _generateBuilder = _asyncToGenerator(function(options, generateProvider, utils) {
-        var normalizedConfig, appContext, ref, modifyBuilderConfig, modifyBuilderInstance, builderConfig, provider, target, builderOptions, builder;
+        var normalizedConfig, appContext, _ref, modifyBuilderConfig, modifyBuilderInstance, builderConfig, provider, target, builderOptions, builder;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     normalizedConfig = options.normalizedConfig, appContext = options.appContext;
-                    ref = utils || {}, modifyBuilderConfig = ref.modifyBuilderConfig, modifyBuilderInstance = ref.modifyBuilderInstance;
+                    _ref = utils || {}, modifyBuilderConfig = _ref.modifyBuilderConfig, modifyBuilderInstance = _ref.modifyBuilderInstance;
                     builderConfig = createBuilderProviderConfig(normalizedConfig, appContext, modifyBuilderConfig);
                     provider = generateProvider({
                         builderConfig: builderConfig