@modern-js/app-tools 2.4.0 → 3.0.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @modern-js/app-tools
 
+## 3.0.0-beta.0
+
+### Patch Changes
+
+- 840142c: fix: the `@modern-js/app-tools` hooks should set `webpack` as default type.
+  fix: `@modern-js/app-tools` hooks 应该将 'webpack' 设置为默认类型
+- 11c053b: feat: ssr support deploy worker
+
+  feat: ssr 支持边缘部署
+
+- Updated dependencies [c4c10e7]
+- Updated dependencies [84c21f9]
+- Updated dependencies [11c053b]
+- Updated dependencies [28e7dc6]
+  - @modern-js/builder@2.4.1-beta.0
+  - @modern-js/builder-rspack-provider@2.5.0-beta.0
+  - @modern-js/builder-shared@2.5.0-beta.0
+  - @modern-js/builder-webpack-provider@2.5.0-beta.0
+  - @modern-js/builder-plugin-node-polyfill@2.4.1-beta.0
+  - @modern-js/prod-server@2.4.1-beta.0
+  - @modern-js/utils@2.4.1-beta.0
+  - @modern-js/builder-plugin-esbuild@2.4.1-beta.0
+  - @modern-js/core@2.4.1-beta.0
+  - @modern-js/plugin-data-loader@2.4.1-beta.0
+  - @modern-js/server@2.4.1-beta.0
+  - @modern-js/plugin-i18n@2.4.1-beta.0
+  - @modern-js/plugin-lint@2.4.1-beta.0
+  - @modern-js/new-action@2.4.1-beta.0
+  - @modern-js/node-bundle-require@2.4.1-beta.0
+  - @modern-js/upgrade@2.4.1-beta.0
+
 ## 2.4.0
 
 ### Minor Changes

package/dist/js/modern/analyze/getServerRoutes.js

@@ -38,7 +38,8 @@ import {
   getEntryOptions,
   SERVER_BUNDLE_DIRECTORY,
   MAIN_ENTRY_NAME,
-  removeTailSlash
+  removeTailSlash,
+  SERVER_WORKER_BUNDLE_DIRECTORY
 } from "@modern-js/utils";
 import { walkDirectory } from "./utils";
 const applyBaseUrl = (baseUrl, routes) => {
@@ -101,7 +102,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
   const {
     html: { disableHtmlFolder },
     output: { distPath: { html: htmlPath } = {} },
-    server: { baseUrl, routes, ssr, ssrByEntries }
+    server: { baseUrl, routes, ssr, ssrByEntries, worker }
   } = config;
   const { packageName } = appContext;
   let htmlRoutes = entrypoints.reduce(
@@ -113,6 +114,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
         packageName
       );
       const isSSR = Boolean(entryOptions);
+      const isWorker = Boolean(worker);
       const { resHeaders } = (routes == null ? void 0 : routes[entryName]) || {};
       let route = {
         urlPath: `/${entryName === MAIN_ENTRY_NAME ? "" : entryName}`,
@@ -125,6 +127,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
         isSPA: true,
         isSSR,
         responseHeaders: resHeaders,
+        worker: isWorker ? `${SERVER_WORKER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0,
         bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
       };
       if (routes == null ? void 0 : routes.hasOwnProperty(entryName)) {

package/dist/js/modern/analyze/index.js

@@ -169,7 +169,9 @@ var analyze_default = ({
                 return __async(this, arguments, function* ({ bundlerConfigs }) {
                   const hookRunners2 = api.useHookRunners();
                   yield generateRoutes(appContext);
-                  yield hookRunners2.beforeBuild({ bundlerConfigs });
+                  yield hookRunners2.beforeBuild({
+                    bundlerConfigs
+                  });
                 });
               },
               onAfterBuild(_0) {
@@ -204,7 +206,9 @@ var analyze_default = ({
               onAfterCreateCompiler(_0) {
                 return __async(this, arguments, function* ({ compiler }) {
                   const hookRunners2 = api.useHookRunners();
-                  yield hookRunners2.afterCreateCompiler({ compiler });
+                  yield hookRunners2.afterCreateCompiler({
+                    compiler
+                  });
                 });
               }
             });

package/dist/js/modern/builder/builder-webpack/webpackPlugins/RouterPlugin.js

@@ -32,6 +32,9 @@ class RouterPlugin {
     if (target === "node" || Array.isArray(target) && target.includes("node")) {
       return;
     }
+    if (target === "webworker" || Array.isArray(target) && target.includes("webworker")) {
+      return;
+    }
     const { webpack } = compiler;
     const { Compilation, sources } = webpack;
     const { RawSource } = sources;

package/dist/js/modern/builder/generator/getBuilderTargets.js

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

package/dist/js/modern/builder/shared/builderPlugins/adapterModern.js

@@ -58,13 +58,17 @@ const builderPluginAdapterModern = (options) => ({
       const builderConfig = api.getNormalizedConfig();
       if (target === "node") {
         chain.name("server");
+      } else if (target === "service-worker") {
+        chain.name("service-worker");
+      } else if (target === "web-worker") {
+        chain.name("worker");
       } else if (target === "modern-web") {
         chain.name("modern");
       } else {
         chain.name("client");
       }
-      if (target === "node") {
-        applyNodeCompat(chain, normalizedConfig, isProd);
+      if (target === "node" || target === "service-worker") {
+        applyNodeCompat(target, chain, normalizedConfig, isProd);
       }
       if (isHtmlEnabled(builderConfig, target)) {
         applyBottomHtmlPlugin({
@@ -80,7 +84,7 @@ const builderPluginAdapterModern = (options) => ({
           CHAIN_ID
         });
       }
-      if (target !== "node") {
+      if (target !== "node" && target !== "web-worker" && target !== "service-worker") {
         const bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
         chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
         chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
@@ -89,7 +93,7 @@ const builderPluginAdapterModern = (options) => ({
     applyCallbacks(api, options);
     function isHtmlEnabled(config, target) {
       var _a;
-      return ((_a = config.tools) == null ? void 0 : _a.htmlPlugin) !== false && target !== "node" && target !== "web-worker";
+      return ((_a = config.tools) == null ? void 0 : _a.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
     }
   }
 });
@@ -146,8 +150,8 @@ function applyAsyncChunkHtmlPlugin({
     chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(HtmlAsyncChunkPlugin, [HtmlWebpackPlugin]);
   }
 }
-function applyNodeCompat(chain, modernConfig, isProd) {
-  for (const ext of [
+function applyNodeCompat(target, chain, modernConfig, isProd) {
+  const nodeExts = [
     ".node.js",
     ".node.jsx",
     ".node.ts",
@@ -156,9 +160,21 @@ function applyNodeCompat(chain, modernConfig, isProd) {
     ".server.ts",
     ".server.ts",
     ".server.tsx"
-  ]) {
+  ];
+  const webWorkerExts = [
+    ".worker.js",
+    ".worker.jsx",
+    ".worker.ts",
+    ".worker.tsx"
+  ];
+  for (const ext of nodeExts) {
     chain.resolve.extensions.prepend(ext);
   }
+  if (target === "service-worker") {
+    for (const ext of webWorkerExts) {
+      chain.resolve.extensions.prepend(ext);
+    }
+  }
   filterEntriesBySSRConfig(
     isProd,
     chain,

package/dist/js/node/analyze/getServerRoutes.js

@@ -119,7 +119,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
   const {
     html: { disableHtmlFolder },
     output: { distPath: { html: htmlPath } = {} },
-    server: { baseUrl, routes, ssr, ssrByEntries }
+    server: { baseUrl, routes, ssr, ssrByEntries, worker }
   } = config;
   const { packageName } = appContext;
   let htmlRoutes = entrypoints.reduce(
@@ -131,6 +131,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
         packageName
       );
       const isSSR = Boolean(entryOptions);
+      const isWorker = Boolean(worker);
       const { resHeaders } = (routes == null ? void 0 : routes[entryName]) || {};
       let route = {
         urlPath: `/${entryName === import_utils.MAIN_ENTRY_NAME ? "" : entryName}`,
@@ -143,6 +144,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
         isSPA: true,
         isSSR,
         responseHeaders: resHeaders,
+        worker: isWorker ? `${import_utils.SERVER_WORKER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0,
         bundle: isSSR ? `${import_utils.SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
       };
       if (routes == null ? void 0 : routes.hasOwnProperty(entryName)) {

package/dist/js/node/analyze/index.js

@@ -177,7 +177,9 @@ var analyze_default = ({
                 return __async(this, arguments, function* ({ bundlerConfigs }) {
                   const hookRunners2 = api.useHookRunners();
                   yield (0, import_routes.generateRoutes)(appContext);
-                  yield hookRunners2.beforeBuild({ bundlerConfigs });
+                  yield hookRunners2.beforeBuild({
+                    bundlerConfigs
+                  });
                 });
               },
               onAfterBuild(_0) {
@@ -212,7 +214,9 @@ var analyze_default = ({
               onAfterCreateCompiler(_0) {
                 return __async(this, arguments, function* ({ compiler }) {
                   const hookRunners2 = api.useHookRunners();
-                  yield hookRunners2.afterCreateCompiler({ compiler });
+                  yield hookRunners2.afterCreateCompiler({
+                    compiler
+                  });
                 });
               }
             });

package/dist/js/node/builder/builder-webpack/webpackPlugins/RouterPlugin.js

@@ -55,6 +55,9 @@ class RouterPlugin {
     if (target === "node" || Array.isArray(target) && target.includes("node")) {
       return;
     }
+    if (target === "webworker" || Array.isArray(target) && target.includes("webworker")) {
+      return;
+    }
     const { webpack } = compiler;
     const { Compilation, sources } = webpack;
     const { RawSource } = sources;

package/dist/js/node/builder/generator/getBuilderTargets.js

@@ -27,6 +27,10 @@ function getBuilderTargets(normalizedConfig) {
   if (useNodeTarget) {
     targets.push("node");
   }
+  const useWorkerTarget = (0, import_utils.isProd)() ? (0, import_utils.isServiceWorker)(normalizedConfig) : false;
+  if (useWorkerTarget) {
+    targets.push("service-worker");
+  }
   return targets;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/js/node/builder/shared/builderPlugins/adapterModern.js

@@ -83,13 +83,17 @@ const builderPluginAdapterModern = (options) => ({
       const builderConfig = api.getNormalizedConfig();
       if (target === "node") {
         chain.name("server");
+      } else if (target === "service-worker") {
+        chain.name("service-worker");
+      } else if (target === "web-worker") {
+        chain.name("worker");
       } else if (target === "modern-web") {
         chain.name("modern");
       } else {
         chain.name("client");
       }
-      if (target === "node") {
-        applyNodeCompat(chain, normalizedConfig, isProd);
+      if (target === "node" || target === "service-worker") {
+        applyNodeCompat(target, chain, normalizedConfig, isProd);
       }
       if (isHtmlEnabled(builderConfig, target)) {
         applyBottomHtmlPlugin({
@@ -105,7 +109,7 @@ const builderPluginAdapterModern = (options) => ({
           CHAIN_ID
         });
       }
-      if (target !== "node") {
+      if (target !== "node" && target !== "web-worker" && target !== "service-worker") {
         const bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
         chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
         chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
@@ -114,7 +118,7 @@ const builderPluginAdapterModern = (options) => ({
     applyCallbacks(api, options);
     function isHtmlEnabled(config, target) {
       var _a;
-      return ((_a = config.tools) == null ? void 0 : _a.htmlPlugin) !== false && target !== "node" && target !== "web-worker";
+      return ((_a = config.tools) == null ? void 0 : _a.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
     }
   }
 });
@@ -171,8 +175,8 @@ function applyAsyncChunkHtmlPlugin({
     chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(import_HtmlAsyncChunkPlugin.HtmlAsyncChunkPlugin, [import_html_webpack_plugin.default]);
   }
 }
-function applyNodeCompat(chain, modernConfig, isProd) {
-  for (const ext of [
+function applyNodeCompat(target, chain, modernConfig, isProd) {
+  const nodeExts = [
     ".node.js",
     ".node.jsx",
     ".node.ts",
@@ -181,9 +185,21 @@ function applyNodeCompat(chain, modernConfig, isProd) {
     ".server.ts",
     ".server.ts",
     ".server.tsx"
-  ]) {
+  ];
+  const webWorkerExts = [
+    ".worker.js",
+    ".worker.jsx",
+    ".worker.ts",
+    ".worker.tsx"
+  ];
+  for (const ext of nodeExts) {
     chain.resolve.extensions.prepend(ext);
   }
+  if (target === "service-worker") {
+    for (const ext of webWorkerExts) {
+      chain.resolve.extensions.prepend(ext);
+    }
+  }
   filterEntriesBySSRConfig(
     isProd,
     chain,

package/dist/js/treeshaking/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/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) {
@@ -52,7 +52,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/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/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/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/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/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;
                                     });