@modern-js/app-tools 2.3.1-alpha.2 → 2.5.0

package/dist/{js/node → cjs}/utils/generateWatchFiles.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 generateWatchFiles_exports = {};
 __export(generateWatchFiles_exports, {
   addServerConfigToDeps: () => addServerConfigToDeps,
@@ -56,27 +36,25 @@ const getPackageConfig = (appDirectory, packageJsonConfig) => {
   );
   return json[packageJsonConfig != null ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
 };
-const addServerConfigToDeps = (dependencies, appDirectory, serverConfigFile) => __async(void 0, null, function* () {
-  const serverConfig = yield (0, import_utils.getServerConfig)(appDirectory, serverConfigFile);
+const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
+  const serverConfig = await (0, import_utils.getServerConfig)(appDirectory, serverConfigFile);
   if (serverConfig) {
     dependencies.push(serverConfig);
   }
-});
-function generateWatchFiles(appContext, configDir) {
-  return __async(this, null, function* () {
-    const { appDirectory, configFile } = appContext;
-    const configPath = import_path.default.join(appDirectory, configDir || "");
-    const dependencies = getPackageConfig(
-      appContext.appDirectory,
-      appContext.packageName
-    ) ? [import_path.default.resolve(appDirectory, "./package.json")] : [];
-    yield addServerConfigToDeps(
-      dependencies,
-      appContext.appDirectory,
-      appContext.serverConfigFile
-    );
-    return [`${configPath}/html`, configFile || "./config", ...dependencies];
-  });
+};
+async function generateWatchFiles(appContext, configDir) {
+  const { appDirectory, configFile } = appContext;
+  const configPath = import_path.default.join(appDirectory, configDir || "");
+  const dependencies = getPackageConfig(
+    appContext.appDirectory,
+    appContext.packageName
+  ) ? [import_path.default.resolve(appDirectory, "./package.json")] : [];
+  await addServerConfigToDeps(
+    dependencies,
+    appContext.appDirectory,
+    appContext.serverConfigFile
+  );
+  return [`${configPath}/html`, configFile || "./config", ...dependencies];
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -15,26 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 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 getSelectedEntries_exports = {};
 __export(getSelectedEntries_exports, {
   getSelectedEntries: () => getSelectedEntries
@@ -42,13 +22,13 @@ __export(getSelectedEntries_exports, {
 module.exports = __toCommonJS(getSelectedEntries_exports);
 var import_utils = require("@modern-js/utils");
 var import_locale = require("../locale");
-const getSelectedEntries = (entry, entrypoints) => __async(void 0, null, function* () {
+const getSelectedEntries = async (entry, entrypoints) => {
   const entryNames = entrypoints.map((e) => e.entryName);
   if (!entry) {
     return entryNames;
   }
   if (typeof entry === "boolean") {
-    const { selected } = yield import_utils.inquirer.prompt([
+    const { selected } = await import_utils.inquirer.prompt([
       {
         type: "checkbox",
         name: "selected",
@@ -74,7 +54,7 @@ const getSelectedEntries = (entry, entrypoints) => __async(void 0, null, functio
     }
   });
   return entry;
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getSelectedEntries

package/dist/{js/node/config/index.js → cjs/utils/getServerInternalPlugins.js}

@@ -15,20 +15,27 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var config_exports = {};
-__export(config_exports, {
-  checkIsLegacyConfig: () => import_initial.checkIsLegacyConfig,
-  createDefaultConfig: () => import_default.createDefaultConfig,
-  createLegacyDefaultConfig: () => import_default.createLegacyDefaultConfig,
-  initialNormalizedConfig: () => import_initial.initialNormalizedConfig
+var getServerInternalPlugins_exports = {};
+__export(getServerInternalPlugins_exports, {
+  getServerInternalPlugins: () => getServerInternalPlugins
 });
-module.exports = __toCommonJS(config_exports);
-var import_default = require("./default");
-var import_initial = require("./initial");
+module.exports = __toCommonJS(getServerInternalPlugins_exports);
+async function getServerInternalPlugins(api) {
+  const hookRunners = api.useHookRunners();
+  const { plugins: serverPlugins } = await hookRunners.collectServerPlugins({
+    plugins: []
+  });
+  const serverInternalPlugins = serverPlugins.reduce(
+    (result, plugin) => Object.assign(result, plugin),
+    {}
+  );
+  api.setAppContext({
+    ...api.useAppContext(),
+    serverInternalPlugins
+  });
+  return serverInternalPlugins;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  checkIsLegacyConfig,
-  createDefaultConfig,
-  createLegacyDefaultConfig,
-  initialNormalizedConfig
+  getServerInternalPlugins
 });

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

@@ -15,39 +15,19 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 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 printInstructions_exports = {};
 __export(printInstructions_exports, {
   printInstructions: () => printInstructions
 });
 module.exports = __toCommonJS(printInstructions_exports);
 var import_utils = require("@modern-js/utils");
-const printInstructions = (hookRunners, appContext, config) => __async(void 0, null, function* () {
+const printInstructions = async (hookRunners, appContext, config) => {
   const message = (0, import_utils.prettyInstructions)(appContext, config);
-  const { instructions } = yield hookRunners.beforePrintInstructions({
+  const { instructions } = await hookRunners.beforePrintInstructions({
     instructions: message
   });
   import_utils.logger.info(instructions);
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   printInstructions

package/dist/cjs/utils/restart.js

@@ -0,0 +1,45 @@
+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 restart_exports = {};
+__export(restart_exports, {
+  restart: () => restart
+});
+module.exports = __toCommonJS(restart_exports);
+var import_core = require("@modern-js/core");
+var import_utils = require("@modern-js/utils");
+async function restart(hooksRunner, filename) {
+  (0, import_utils.clearConsole)();
+  import_utils.logger.info(`Restart because ${import_utils.chalk.yellow(filename)} is changed...
+`);
+  let hasGetError = false;
+  await hooksRunner.beforeRestart();
+  try {
+    await import_core.cli.init(import_core.cli.getPrevInitOptions());
+  } catch (err) {
+    console.error(err);
+    hasGetError = true;
+  } finally {
+    if (!hasGetError) {
+      import_utils.program.parse(process.argv);
+    }
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  restart
+});

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/cjs/utils/types.js

@@ -0,0 +1,15 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 types_exports = {};
+module.exports = __toCommonJS(types_exports);

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)));