@modern-js/app-tools 2.4.0 → 2.5.0

package/CHANGELOG.md

@@ -1,5 +1,64 @@
 # @modern-js/app-tools
 
+## 2.5.0
+
+### Patch Changes
+
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 7cb8bb4: fix: use a more correctly params to cal document file
+
+  fix: 使用更准确的参数去获取 docuemnt 文件
+
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
+- 97cc2d0: feat: pass origin bootstrap function to custom render
+  feat: 自定义渲染中传入原始 bootstrap 函数
+- 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 [58a9918]
+- Updated dependencies [89ca6cc]
+- Updated dependencies [7cb8bb4]
+- Updated dependencies [442204a]
+- Updated dependencies [bb4e712]
+- Updated dependencies [6fca567]
+- Updated dependencies [30614fa]
+- Updated dependencies [038a23b]
+- Updated dependencies [c4c10e7]
+- Updated dependencies [84c21f9]
+- Updated dependencies [1b0ce87]
+- Updated dependencies [11c053b]
+- Updated dependencies [577084d]
+- Updated dependencies [f0b3d8c]
+- Updated dependencies [c5ea222]
+- Updated dependencies [28e7dc6]
+- Updated dependencies [40230b3]
+- Updated dependencies [169c58b]
+  - @modern-js/builder-shared@2.5.0
+  - @modern-js/plugin-data-loader@2.5.0
+  - @modern-js/plugin-i18n@2.5.0
+  - @modern-js/plugin-lint@2.5.0
+  - @modern-js/new-action@2.5.0
+  - @modern-js/prod-server@2.5.0
+  - @modern-js/server@2.5.0
+  - @modern-js/node-bundle-require@2.5.0
+  - @modern-js/plugin@2.5.0
+  - @modern-js/types@2.5.0
+  - @modern-js/builder@2.5.0
+  - @modern-js/builder-rspack-provider@2.5.0
+  - @modern-js/builder-webpack-provider@2.5.0
+  - @modern-js/builder-plugin-esbuild@2.5.0
+  - @modern-js/builder-plugin-node-polyfill@2.5.0
+  - @modern-js/core@2.5.0
+  - @modern-js/utils@2.5.0
+  - @modern-js/upgrade@2.5.0
+
 ## 2.4.0
 
 ### Minor Changes

package/dist/cjs/analyze/generateCode.js

@@ -0,0 +1,249 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var generateCode_exports = {};
+__export(generateCode_exports, {
+  createImportStatements: () => createImportStatements,
+  generateCode: () => generateCode
+});
+module.exports = __toCommonJS(generateCode_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_core = require("@modern-js/core");
+var templates = __toESM(require("./templates"));
+var import_getClientRoutes = require("./getClientRoutes");
+var import_constants = require("./constants");
+var import_utils2 = require("./utils");
+var import_nestedRoutes = require("./nestedRoutes");
+const createImportSpecifier = (specifiers) => {
+  let defaults = "";
+  const named = [];
+  for (const { local, imported } of specifiers) {
+    if (local && imported) {
+      named.push(`${imported} as ${local}`);
+    } else if (local) {
+      defaults = local;
+    } else {
+      named.push(imported);
+    }
+  }
+  if (defaults && named.length) {
+    return `${defaults}, { ${named.join(", ")} }`;
+  } else if (defaults) {
+    return defaults;
+  } else {
+    return `{ ${named.join(", ")} }`;
+  }
+};
+const createImportStatements = (statements) => {
+  var _a, _b;
+  const deDuplicated = [];
+  const seen = /* @__PURE__ */ new Map();
+  for (const { value, specifiers, initialize } of statements) {
+    if (!seen.has(value)) {
+      deDuplicated.push({
+        value,
+        specifiers,
+        initialize
+      });
+      seen.set(value, specifiers);
+    } else {
+      seen.get(value).push(...specifiers);
+      const modifyIndex = deDuplicated.findIndex((v) => v.value === value);
+      const originInitialize = (_b = (_a = deDuplicated[modifyIndex]) == null ? void 0 : _a.initialize) != null ? _b : "";
+      deDuplicated[modifyIndex].initialize = originInitialize.concat(
+        `
+${initialize || ""}`
+      );
+    }
+  }
+  return deDuplicated.map(
+    ({ value, specifiers, initialize }) => `import ${createImportSpecifier(specifiers)} from '${value}';
+${initialize || ""}`
+  ).join("\n");
+};
+const generateCode = async (appContext, config, entrypoints, api) => {
+  var _a, _b, _c;
+  const {
+    internalDirectory,
+    srcDirectory,
+    internalDirAlias,
+    internalSrcAlias,
+    packageName
+  } = appContext;
+  const hookRunners = api.useHookRunners();
+  const isV5 = typeof ((_a = config.runtime) == null ? void 0 : _a.router) !== "boolean" && ((_c = (_b = config == null ? void 0 : config.runtime) == null ? void 0 : _b.router) == null ? void 0 : _c.mode) === "react-router-5";
+  const { mountId } = config.html;
+  const getRoutes = isV5 ? import_getClientRoutes.getClientRoutesLegacy : import_getClientRoutes.getClientRoutes;
+  await Promise.all(entrypoints.map(generateEntryCode));
+  async function generateEntryCode(entrypoint) {
+    const { entryName, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
+    if (isAutoMount) {
+      if (fileSystemRoutes) {
+        let initialRoutes = [];
+        let nestedRoute = null;
+        if (entrypoint.entry) {
+          initialRoutes = getRoutes({
+            entrypoint,
+            srcDirectory,
+            srcAlias: internalSrcAlias,
+            internalDirectory,
+            internalDirAlias
+          });
+        }
+        if (entrypoint.nestedRoutesEntry) {
+          if (!isV5) {
+            nestedRoute = await (0, import_nestedRoutes.walk)(
+              entrypoint.nestedRoutesEntry,
+              entrypoint.nestedRoutesEntry,
+              {
+                name: internalSrcAlias,
+                basename: srcDirectory
+              },
+              entrypoint.entryName
+            );
+            if (nestedRoute) {
+              initialRoutes.unshift(nestedRoute);
+            }
+          } else {
+            import_utils.logger.error("Nested routes is not supported in legacy mode.");
+            process.exit(1);
+          }
+        }
+        const { routes } = await hookRunners.modifyFileSystemRoutes({
+          entrypoint,
+          routes: initialRoutes
+        });
+        const config2 = (0, import_core.useResolvedConfigContext)();
+        const ssr = (0, import_utils.getEntryOptions)(
+          entryName,
+          config2.server.ssr,
+          config2.server.ssrByEntries,
+          packageName
+        );
+        let mode;
+        if (ssr) {
+          mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
+        } else {
+          mode = false;
+        }
+        if (mode === "stream") {
+          const hasPageRoute = routes.some(
+            (route) => "type" in route && route.type === "page"
+          );
+          if (hasPageRoute) {
+            import_utils.logger.error(
+              "Streaming ssr is not supported when pages dir exists"
+            );
+            process.exit(1);
+          }
+        }
+        const { code: code2 } = await hookRunners.beforeGenerateRoutes({
+          entrypoint,
+          code: await templates.fileSystemRoutes({
+            routes,
+            ssrMode: mode,
+            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+            entryName: entrypoint.entryName,
+            internalDirectory
+          })
+        });
+        if (entrypoint.nestedRoutesEntry && mode) {
+          const routesServerFile = (0, import_utils2.getServerLoadersFile)(
+            internalDirectory,
+            entryName
+          );
+          const code3 = templates.routesForServer({
+            routes
+          });
+          await import_utils.fs.ensureFile(routesServerFile);
+          await import_utils.fs.writeFile(routesServerFile, code3);
+        }
+        import_utils.fs.outputFileSync(
+          import_path.default.resolve(
+            internalDirectory,
+            `./${entryName}/${import_constants.FILE_SYSTEM_ROUTES_FILE_NAME}`
+          ),
+          code2,
+          "utf8"
+        );
+      }
+      const { imports: importStatements } = await hookRunners.modifyEntryImports({
+        entrypoint,
+        imports: (0, import_utils2.getDefaultImports)({
+          entrypoint,
+          srcDirectory,
+          internalSrcAlias,
+          internalDirAlias,
+          internalDirectory
+        })
+      });
+      const { plugins } = await hookRunners.modifyEntryRuntimePlugins({
+        entrypoint,
+        plugins: []
+      });
+      const { code: renderFunction } = await hookRunners.modifyEntryRenderFunction({
+        entrypoint,
+        code: templates.renderFunction({
+          plugins,
+          customBootstrap,
+          fileSystemRoutes
+        })
+      });
+      const { exportStatement } = await hookRunners.modifyEntryExport({
+        entrypoint,
+        exportStatement: "export default AppWrapper;"
+      });
+      const code = templates.index({
+        mountId,
+        imports: createImportStatements(importStatements),
+        renderFunction,
+        exportStatement
+      });
+      const entryFile = import_path.default.resolve(
+        internalDirectory,
+        `./${entryName}/${import_constants.ENTRY_POINT_FILE_NAME}`
+      );
+      entrypoint.entry = entryFile;
+      if (config.source.enableAsyncEntry) {
+        const { code: asyncEntryCode } = await hookRunners.modifyAsyncEntry({
+          entrypoint,
+          code: `import('./${import_constants.ENTRY_BOOTSTRAP_FILE_NAME}');`
+        });
+        import_utils.fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
+        const bootstrapFile = import_path.default.resolve(
+          internalDirectory,
+          `./${entryName}/${import_constants.ENTRY_BOOTSTRAP_FILE_NAME}`
+        );
+        import_utils.fs.outputFileSync(bootstrapFile, code, "utf8");
+      } else {
+        import_utils.fs.outputFileSync(entryFile, code, "utf8");
+      }
+    }
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createImportStatements,
+  generateCode
+});

package/dist/{js/node → cjs}/analyze/getBundleEntry.js

@@ -63,11 +63,17 @@ const getBundleEntry = (appContext, config) => {
       const entrypoint = typeof value === "string" ? {
         entryName: name,
         entry: (0, import_utils.ensureAbsolutePath)(appDirectory, value),
+        absoluteEntryDir: import_path.default.dirname(
+          (0, import_utils.ensureAbsolutePath)(appDirectory, value)
+        ),
         isAutoMount: true,
         fileSystemRoutes: import_utils.fs.statSync((0, import_utils.ensureAbsolutePath)(appDirectory, value)).isDirectory() ? {} : void 0
       } : {
         entryName: name,
         entry: (0, import_utils.ensureAbsolutePath)(appDirectory, value.entry),
+        absoluteEntryDir: import_path.default.dirname(
+          (0, import_utils.ensureAbsolutePath)(appDirectory, value.entry)
+        ),
         isAutoMount: !value.disableMount,
         customBootstrap: value.customBootstrap && (0, import_utils.ensureAbsolutePath)(appDirectory, value.customBootstrap),
         fileSystemRoutes: import_utils.fs.statSync((0, import_utils.ensureAbsolutePath)(appDirectory, value.entry)).isDirectory() ? {} : void 0

package/dist/{js/node → cjs}/analyze/getClientRoutes/getRoutes.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -181,7 +164,7 @@ export default ${lastComponent}`
     };
   };
   const normalized = flat(nested).map(
-    (route) => route.parent ? __spreadProps(__spreadValues(__spreadValues({}, route), generate(route)), { parent: void 0 }) : __spreadProps(__spreadValues({}, route), { parent: void 0 })
+    (route) => route.parent ? { ...route, ...generate(route), parent: void 0 } : { ...route, parent: void 0 }
   );
   return normalized;
 };

package/dist/{js/node → cjs}/analyze/getClientRoutes/getRoutesLegacy.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -180,7 +163,7 @@ export default ${lastComponent}`
     };
   };
   const normalized = flat(nested).map(
-    (route) => route.parent ? __spreadProps(__spreadValues(__spreadValues({}, route), generate(route)), { parent: void 0 }) : __spreadProps(__spreadValues({}, route), { parent: void 0 })
+    (route) => route.parent ? { ...route, ...generate(route), parent: void 0 } : { ...route, parent: void 0 }
   );
   return normalized;
 };

package/dist/{js/node → cjs}/analyze/getHtmlTemplate.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 getHtmlTemplate_exports = {};
 __export(getHtmlTemplate_exports, {
   getHtmlTemplate: () => getHtmlTemplate
@@ -74,10 +54,10 @@ const findPartials = (dir, entryName, position) => {
   }
   return null;
 };
-const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function* (entrypoints, api, {
+const getHtmlTemplate = async (entrypoints, api, {
   appContext,
   config
-}) {
+}) => {
   const { appDirectory, internalDirectory } = appContext;
   const {
     source: { configDir }
@@ -100,7 +80,7 @@ const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function*
       htmlTemplates[entryName] = customIndexTemplate.file;
     } else {
       const hookRunners = api.useHookRunners();
-      const { partials } = yield hookRunners.htmlPartials({
+      const { partials } = await hookRunners.htmlPartials({
         entrypoint,
         partials: [
           "top" /* TOP */,
@@ -137,7 +117,7 @@ const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function*
     }
   }
   return htmlTemplates;
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getHtmlTemplate

package/dist/{js/node → cjs}/analyze/getServerRoutes.js

@@ -1,38 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -69,9 +40,10 @@ const applyBaseUrl = (baseUrl, routes) => {
     } else {
       return routes.map((route) => {
         const urlPath = (0, import_utils.urlJoin)(baseUrl, route.urlPath);
-        return __spreadProps(__spreadValues({}, route), {
+        return {
+          ...route,
           urlPath: urlPath === "/" ? urlPath : (0, import_utils.removeTailSlash)(urlPath)
-        });
+        };
       });
     }
   }
@@ -86,28 +58,34 @@ const applyRouteOptions = (original, routeOptions) => {
     if (Array.isArray(route)) {
       routes = route.map((url) => {
         if ((0, import_utils.isPlainObject)(url)) {
-          const _a2 = url, { path: urlPath } = _a2, other = __objRest(_a2, ["path"]);
-          return __spreadProps(__spreadValues(__spreadValues({}, original), other), {
+          const { path: urlPath, ...other } = url;
+          return {
+            ...original,
+            ...other,
             urlPath
-          });
+          };
         } else {
-          return __spreadProps(__spreadValues({}, original), {
+          return {
+            ...original,
             urlPath: url
-          });
+          };
         }
       });
     } else if ((0, import_utils.isPlainObject)(route)) {
-      const _a = route, { path: urlPath } = _a, other = __objRest(_a, ["path"]);
+      const { path: urlPath, ...other } = route;
       routes = [
-        __spreadProps(__spreadValues(__spreadValues({}, original), other), {
+        {
+          ...original,
+          ...other,
           urlPath
-        })
+        }
       ];
     } else {
       routes = [
-        __spreadProps(__spreadValues({}, original), {
+        {
+          ...original,
           urlPath: route
-        })
+        }
       ];
     }
   } else {
@@ -119,7 +97,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 +109,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 +122,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)) {