@modern-js/app-tools 2.4.0 → 2.5.0-alpha.1

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/constants.js

@@ -0,0 +1,100 @@
+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 constants_exports = {};
+__export(constants_exports, {
+  APP_CONFIG_NAME: () => APP_CONFIG_NAME,
+  APP_FILE_NAME: () => APP_FILE_NAME,
+  APP_INIT_EXPORTED: () => APP_INIT_EXPORTED,
+  APP_INIT_IMPORTED: () => APP_INIT_IMPORTED,
+  ENTRY_BOOTSTRAP_FILE_NAME: () => ENTRY_BOOTSTRAP_FILE_NAME,
+  ENTRY_POINT_FILE_NAME: () => ENTRY_POINT_FILE_NAME,
+  FILE_SYSTEM_ROUTES_COMPONENTS_DIR: () => FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
+  FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP: () => FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
+  FILE_SYSTEM_ROUTES_FILE_NAME: () => FILE_SYSTEM_ROUTES_FILE_NAME,
+  FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT: () => FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
+  FILE_SYSTEM_ROUTES_IGNORED_REGEX: () => FILE_SYSTEM_ROUTES_IGNORED_REGEX,
+  FILE_SYSTEM_ROUTES_INDEX: () => FILE_SYSTEM_ROUTES_INDEX,
+  FILE_SYSTEM_ROUTES_LAYOUT: () => FILE_SYSTEM_ROUTES_LAYOUT,
+  HTML_PARTIALS_EXTENSIONS: () => HTML_PARTIALS_EXTENSIONS,
+  HTML_PARTIALS_FOLDER: () => HTML_PARTIALS_FOLDER,
+  INDEX_FILE_NAME: () => INDEX_FILE_NAME,
+  JS_EXTENSIONS: () => JS_EXTENSIONS,
+  LOADER_EXPORT_NAME: () => LOADER_EXPORT_NAME,
+  NESTED_ROUTE: () => NESTED_ROUTE,
+  NESTED_ROUTES_DIR: () => NESTED_ROUTES_DIR,
+  PAGES_DIR_NAME: () => PAGES_DIR_NAME,
+  TEMP_LOADERS_DIR: () => TEMP_LOADERS_DIR
+});
+module.exports = __toCommonJS(constants_exports);
+const JS_EXTENSIONS = [".js", ".ts", ".jsx", ".tsx"];
+const INDEX_FILE_NAME = "index";
+const APP_FILE_NAME = "App";
+const PAGES_DIR_NAME = "pages";
+const NESTED_ROUTES_DIR = "routes";
+const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
+const LOADER_EXPORT_NAME = "loader";
+const TEMP_LOADERS_DIR = "__loaders__";
+const ENTRY_POINT_FILE_NAME = "index.js";
+const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.js";
+const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
+const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
+const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";
+const FILE_SYSTEM_ROUTES_INDEX = "index";
+const FILE_SYSTEM_ROUTES_IGNORED_REGEX = /\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/;
+const HTML_PARTIALS_FOLDER = "html";
+const HTML_PARTIALS_EXTENSIONS = [".htm", ".html", ".ejs"];
+const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
+const NESTED_ROUTE = {
+  LAYOUT_FILE: "layout",
+  LAYOUT_LOADER_FILE: "layout.loader",
+  PAGE_FILE: "page",
+  PAGE_LOADER_FILE: "page.loader",
+  LOADING_FILE: "loading",
+  ERROR_FILE: "error",
+  LOADER_FILE: "loader",
+  SPLATE_FILE: "$",
+  SPLATE_LOADER_FILE: "$.loader"
+};
+const APP_CONFIG_NAME = "config";
+const APP_INIT_EXPORTED = "init";
+const APP_INIT_IMPORTED = "appInit";
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  APP_CONFIG_NAME,
+  APP_FILE_NAME,
+  APP_INIT_EXPORTED,
+  APP_INIT_IMPORTED,
+  ENTRY_BOOTSTRAP_FILE_NAME,
+  ENTRY_POINT_FILE_NAME,
+  FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
+  FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
+  FILE_SYSTEM_ROUTES_FILE_NAME,
+  FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
+  FILE_SYSTEM_ROUTES_IGNORED_REGEX,
+  FILE_SYSTEM_ROUTES_INDEX,
+  FILE_SYSTEM_ROUTES_LAYOUT,
+  HTML_PARTIALS_EXTENSIONS,
+  HTML_PARTIALS_FOLDER,
+  INDEX_FILE_NAME,
+  JS_EXTENSIONS,
+  LOADER_EXPORT_NAME,
+  NESTED_ROUTE,
+  NESTED_ROUTES_DIR,
+  PAGES_DIR_NAME,
+  TEMP_LOADERS_DIR
+});

package/dist/cjs/analyze/generateCode.js

@@ -0,0 +1,251 @@
+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,
+    metaName
+  } = 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,
+            metaName
+          });
+          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/cjs/analyze/getBundleEntry.js

@@ -0,0 +1,101 @@
+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 getBundleEntry_exports = {};
+__export(getBundleEntry_exports, {
+  getBundleEntry: () => getBundleEntry
+});
+module.exports = __toCommonJS(getBundleEntry_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_getFileSystemEntry = require("./getFileSystemEntry");
+var import_constants = require("./constants");
+const ensureExtensions = (file) => {
+  if (!import_path.default.extname(file)) {
+    return (0, import_utils.findExists)(import_constants.JS_EXTENSIONS.map((ext) => `${file}${ext}`)) || file;
+  }
+  return file;
+};
+const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint) => {
+  if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
+    checked.entryName = entrypoint.entryName;
+    return true;
+  }
+  if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
+    throw new Error(
+      `Entry configuration conflicts
+ Your configuration: ${checked.entry}.
+ Default entrypoint: ${entrypoint.entry}
+ Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`
+    );
+  }
+  return false;
+});
+const getBundleEntry = (appContext, config) => {
+  const { appDirectory, packageName } = appContext;
+  const {
+    source: { disableDefaultEntries, entries, entriesDir }
+  } = config;
+  const defaults = disableDefaultEntries ? [] : (0, import_getFileSystemEntry.getFileSystemEntry)(appContext, config);
+  if (entries) {
+    Object.keys(entries).forEach((name) => {
+      const value = entries[name];
+      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
+      };
+      if (entrypoint.fileSystemRoutes) {
+        entrypoint.nestedRoutesEntry = entrypoint.entry;
+      }
+      if (!ifAlreadyExists(defaults, entrypoint)) {
+        defaults.push(entrypoint);
+      }
+    });
+  }
+  if (!disableDefaultEntries) {
+    const entriesDirAbs = (0, import_utils.ensureAbsolutePath)(appDirectory, entriesDir || "");
+    const found = defaults.find(
+      ({ entryName, entry, nestedRoutesEntry = "" }) => entryName === packageName || import_path.default.dirname(entry) === entriesDirAbs || import_path.default.dirname(nestedRoutesEntry) === entriesDirAbs
+    );
+    found && (found.entryName = import_utils.MAIN_ENTRY_NAME);
+  }
+  return defaults;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getBundleEntry
+});