@modern-js/app-tools 2.15.0 → 2.16.0

package/dist/cjs/analyze/templates.js

@@ -1,50 +1,32 @@
-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) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _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(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var templates_exports = {};
-__export(templates_exports, {
-  fileSystemRoutes: () => fileSystemRoutes,
-  html: () => html,
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
   index: () => index,
   renderFunction: () => renderFunction,
+  html: () => html,
   routesForServer: () => routesForServer,
+  fileSystemRoutes: () => fileSystemRoutes,
   ssrLoaderCombinedModule: () => ssrLoaderCombinedModule
 });
-module.exports = __toCommonJS(templates_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_constants = require("./constants");
-var import_utils2 = require("./utils");
-const index = ({
-  mountId,
-  imports,
-  renderFunction: renderFunction2,
-  exportStatement
-}) => `
+const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _utils = require("@modern-js/utils");
+const _constants = require("./constants");
+const _utils1 = require("./utils");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+const index = ({ mountId, imports, renderFunction: renderFunction2, exportStatement }) => `
 const IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';
 const IS_REACT18 = process.env.IS_REACT18 === 'true';
 const MOUNT_ID = '${mountId}';
@@ -63,23 +45,17 @@ AppWrapper = render();
 
 ${exportStatement};
 `;
-const renderFunction = ({
-  plugins,
-  customBootstrap,
-  fileSystemRoutes: fileSystemRoutes2
-}) => {
+const renderFunction = ({ plugins, customBootstrap, fileSystemRoutes: fileSystemRoutes2 }) => {
   const bootstrap = "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM)";
   return `
   const finalAppConfig = {
     ...App.config,
-    ...typeof ${import_constants.APP_CONFIG_NAME} === 'function' ? ${import_constants.APP_CONFIG_NAME}() : {},
+    ...typeof ${_constants.APP_CONFIG_NAME} === 'function' ? ${_constants.APP_CONFIG_NAME}() : {},
   }
 
   AppWrapper = createApp({
     plugins: [
-     ${plugins.map(
-    ({ name, options, args }) => `${name}({...${options}, ...finalAppConfig?.${args || name}}),`
-  ).join("\n")}
+     ${plugins.map(({ name, options, args }) => `${name}({...${options}, ...finalAppConfig?.${args || name}}),`).join("\n")}
     ]
   })(${fileSystemRoutes2 ? "" : `App`})
 
@@ -122,15 +98,13 @@ const html = (partials) => `
 
 </html>
 `;
-const routesForServer = ({
-  routes
-}) => {
+const routesForServer = ({ routes }) => {
   const loaders = [];
   const traverseRouteTree = (route) => {
-    var _a;
     let children;
     if ("children" in route && route.children) {
-      children = (_a = route == null ? void 0 : route.children) == null ? void 0 : _a.map(traverseRouteTree);
+      var _route_children;
+      children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
     }
     let loader;
     if (route.type === "nested") {
@@ -152,10 +126,7 @@ const routesForServer = ({
   for (const route of routes) {
     if ("type" in route) {
       const newRoute = traverseRouteTree(route);
-      routesCode += `${JSON.stringify(newRoute, null, 2).replace(
-        /"(loader_[^"]+)"/g,
-        "$1"
-      )},`;
+      routesCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loader_[^"]+)"/g, "$1")},`;
     } else {
       routesCode += `${JSON.stringify(route, null, 2)}`;
     }
@@ -165,7 +136,7 @@ const routesForServer = ({
   let importLoadersCode = "";
   if (loaders.length > 0) {
     importLoadersCode = loaders.map((loader, index2) => {
-      return `import loader_${index2} from "${(0, import_utils.slash)(loader)}"`;
+      return `import loader_${index2} from "${(0, _utils.slash)(loader)}"`;
     }).join("\n");
   }
   return `
@@ -174,14 +145,7 @@ const routesForServer = ({
   `;
 };
 const createMatchReg = (keyword) => new RegExp(`("${keyword}":\\s)"([^,]+)"`, "g");
-const fileSystemRoutes = async ({
-  routes,
-  ssrMode,
-  nestedRoutesEntry,
-  entryName,
-  internalDirectory,
-  splitRouteChunks = true
-}) => {
+const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, splitRouteChunks = true }) => {
   const components = [];
   const loadings = [];
   const errors = [];
@@ -189,12 +153,7 @@ const fileSystemRoutes = async ({
   const loadersMap = {};
   const configs = [];
   const configsMap = {};
-  const loadersMapFile = import_path.default.join(
-    internalDirectory,
-    entryName,
-    import_constants.TEMP_LOADERS_DIR,
-    "map.json"
-  );
+  const loadersMapFile = _path.default.join(internalDirectory, entryName, _constants.TEMP_LOADERS_DIR, "map.json");
   const importLazyCode = `
     import { lazy } from "react";
     import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
@@ -205,15 +164,15 @@ const fileSystemRoutes = async ({
       return "";
     }
     if (nestedRoutesEntry) {
-      return `?mapFile=${(0, import_utils.slash)(loadersMapFile)}&loaderId=${loaderId}`;
+      return `?mapFile=${(0, _utils.slash)(loadersMapFile)}&loaderId=${loaderId}`;
     }
     return "";
   };
   const traverseRouteTree = (route) => {
-    var _a;
     let children;
     if ("children" in route && route.children) {
-      children = (_a = route == null ? void 0 : route.children) == null ? void 0 : _a.map(traverseRouteTree);
+      var _route_children;
+      children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
     }
     let loading;
     let error;
@@ -310,7 +269,10 @@ const fileSystemRoutes = async ({
         ...route,
         component
       };
-      const keywords = ["component", "lazyImport"];
+      const keywords = [
+        "component",
+        "lazyImport"
+      ];
       const routeStr = JSON.stringify(finalRoute, null, 2);
       const regs = keywords.map(createMatchReg);
       const newRouteStr = regs.reduce((acc, reg) => acc.replace(reg, "$1$2"), routeStr).replace(/\\"/g, '"');
@@ -334,24 +296,20 @@ const fileSystemRoutes = async ({
   let importLoadersCode = "";
   for (const [key, loaderInfo] of Object.entries(loadersMap)) {
     if (loaderInfo.inline) {
-      importLoadersCode += `import { loader as ${key} } from "${(0, import_utils.slash)(
-        loaderInfo.filePath
-      )}${getDataLoaderPath(key)}";
+      importLoadersCode += `import { loader as ${key} } from "${(0, _utils.slash)(loaderInfo.filePath)}${getDataLoaderPath(key)}";
 `;
     } else {
-      importLoadersCode += `import ${key} from "${(0, import_utils.slash)(
-        loaderInfo.filePath
-      )}${getDataLoaderPath(key)}";
+      importLoadersCode += `import ${key} from "${(0, _utils.slash)(loaderInfo.filePath)}${getDataLoaderPath(key)}";
 `;
     }
   }
   let importConfigsCode = "";
   for (const [key, configPath] of Object.entries(configsMap)) {
-    importConfigsCode += `import * as ${key} from "${(0, import_utils.slash)(configPath)}";
+    importConfigsCode += `import * as ${key} from "${(0, _utils.slash)(configPath)}";
 `;
   }
-  await import_utils.fs.ensureFile(loadersMapFile);
-  await import_utils.fs.writeJSON(loadersMapFile, loadersMap);
+  await _utils.fs.ensureFile(loadersMapFile);
+  await _utils.fs.writeJSON(loadersMapFile, loadersMap);
   return `
     ${importLazyCode}
     ${importComponentsCode}
@@ -366,32 +324,13 @@ const fileSystemRoutes = async ({
 function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
   const { entryName } = entrypoint;
   const { packageName, internalDirectory } = appContext;
-  const ssr = (0, import_utils.getEntryOptions)(
-    entryName,
-    config.server.ssr,
-    config.server.ssrByEntries,
-    packageName
-  );
-  const ssg = (0, import_utils.isSSGEntry)(config, entryName, entrypoints);
+  const ssr = (0, _utils.getEntryOptions)(entryName, config.server.ssr, config.server.ssrByEntries, packageName);
+  const ssg = (0, _utils.isSSGEntry)(config, entryName, entrypoints);
   if (entrypoint.nestedRoutesEntry && (ssr || ssg)) {
     const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
-    const serverLoadersFile = (0, import_utils2.getServerLoadersFile)(
-      internalDirectory,
-      entryName
-    );
-    const combinedModule = `export * from "${(0, import_utils.slash)(
-      serverLoaderRuntime
-    )}"; export * from "${(0, import_utils.slash)(serverLoadersFile)}"`;
+    const serverLoadersFile = (0, _utils1.getServerLoadersFile)(internalDirectory, entryName);
+    const combinedModule = `export * from "${(0, _utils.slash)(serverLoaderRuntime)}"; export * from "${(0, _utils.slash)(serverLoadersFile)}"`;
     return combinedModule;
   }
   return null;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  fileSystemRoutes,
-  html,
-  index,
-  renderFunction,
-  routesForServer,
-  ssrLoaderCombinedModule
-});

package/dist/cjs/analyze/utils.js

@@ -1,100 +1,105 @@
-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) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _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(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var utils_exports = {};
-__export(utils_exports, {
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  walkDirectory: () => walkDirectory,
   getDefaultImports: () => getDefaultImports,
-  getServerCombinedModueFile: () => getServerCombinedModueFile,
-  getServerLoadersFile: () => getServerLoadersFile,
-  hasLoader: () => hasLoader,
   isPageComponentFile: () => isPageComponentFile,
-  parseModule: () => parseModule,
   replaceWithAlias: () => replaceWithAlias,
-  walkDirectory: () => walkDirectory
+  parseModule: () => parseModule,
+  hasLoader: () => hasLoader,
+  getServerLoadersFile: () => getServerLoadersFile,
+  getServerCombinedModueFile: () => getServerCombinedModueFile
 });
-module.exports = __toCommonJS(utils_exports);
-var import_fs = __toESM(require("fs"));
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_esbuild = require("esbuild");
-var import_es_module_lexer = require("es-module-lexer");
-var import_constants = require("./constants");
-const walkDirectory = (dir) => import_fs.default.readdirSync(dir).reduce((previous, filename) => {
-  const filePath = import_path.default.join(dir, filename);
-  if (import_fs.default.statSync(filePath).isDirectory()) {
-    return [...previous, ...walkDirectory(filePath)];
+const _fs = /* @__PURE__ */ _interop_require_default(require("fs"));
+const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _utils = require("@modern-js/utils");
+const _esbuild = require("esbuild");
+const _esmodulelexer = require("es-module-lexer");
+const _constants = require("./constants");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+const walkDirectory = (dir) => _fs.default.readdirSync(dir).reduce((previous, filename) => {
+  const filePath = _path.default.join(dir, filename);
+  if (_fs.default.statSync(filePath).isDirectory()) {
+    return [
+      ...previous,
+      ...walkDirectory(filePath)
+    ];
   } else {
-    return [...previous, filePath];
+    return [
+      ...previous,
+      filePath
+    ];
   }
 }, []);
-const getDefaultImports = ({
-  entrypoint,
-  srcDirectory,
-  internalSrcAlias,
-  internalDirAlias,
-  internalDirectory
-}) => {
+const getDefaultImports = ({ entrypoint, srcDirectory, internalSrcAlias, internalDirAlias, internalDirectory }) => {
   const { entryName, fileSystemRoutes, customBootstrap, entry } = entrypoint;
   const imports = [
     {
-      specifiers: [{ local: "React" }],
+      specifiers: [
+        {
+          local: "React"
+        }
+      ],
       value: "react"
     },
     {
-      specifiers: [{ local: "ReactDOM" }],
-      value: (0, import_utils.isReact18)(import_path.default.join(internalDirectory, "../../")) ? "react-dom/client" : "react-dom"
+      specifiers: [
+        {
+          local: "ReactDOM"
+        }
+      ],
+      value: (0, _utils.isReact18)(_path.default.join(internalDirectory, "../../")) ? "react-dom/client" : "react-dom"
     },
     {
-      specifiers: [{ imported: "createApp" }, { imported: "bootstrap" }],
+      specifiers: [
+        {
+          imported: "createApp"
+        },
+        {
+          imported: "bootstrap"
+        }
+      ],
       value: "@modern-js/runtime"
     },
     customBootstrap && {
-      specifiers: [{ local: "customBootstrap" }],
-      value: (0, import_utils.normalizeToPosixPath)(
-        customBootstrap.replace(srcDirectory, internalSrcAlias)
-      )
+      specifiers: [
+        {
+          local: "customBootstrap"
+        }
+      ],
+      value: (0, _utils.normalizeToPosixPath)(customBootstrap.replace(srcDirectory, internalSrcAlias))
     }
   ].filter(Boolean);
   if (fileSystemRoutes) {
     const route = {
-      specifiers: [{ imported: "routes" }],
-      value: (0, import_utils.normalizeToPosixPath)(
-        `${internalDirAlias}/${entryName}/${import_constants.FILE_SYSTEM_ROUTES_FILE_NAME.replace(
-          ".js",
-          ""
-        )}`
-      )
+      specifiers: [
+        {
+          imported: "routes"
+        }
+      ],
+      value: (0, _utils.normalizeToPosixPath)(`${internalDirAlias}/${entryName}/${_constants.FILE_SYSTEM_ROUTES_FILE_NAME.replace(".js", "")}`)
     };
     if (fileSystemRoutes.globalApp) {
       imports.push({
-        specifiers: [{ local: "App" }],
-        value: (0, import_utils.normalizeToPosixPath)(
-          fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias)
-        )
+        specifiers: [
+          {
+            local: "App"
+          }
+        ],
+        value: (0, _utils.normalizeToPosixPath)(fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias))
       });
     } else {
       route.initialize = "const App = false;";
@@ -102,10 +107,12 @@ const getDefaultImports = ({
     imports.push(route);
   } else {
     imports.push({
-      specifiers: [{ local: "App" }],
-      value: (0, import_utils.normalizeToPosixPath)(
-        entry.replace(srcDirectory, internalSrcAlias)
-      )
+      specifiers: [
+        {
+          local: "App"
+        }
+      ],
+      value: (0, _utils.normalizeToPosixPath)(entry.replace(srcDirectory, internalSrcAlias))
     });
   }
   return imports;
@@ -114,56 +121,45 @@ const isPageComponentFile = (filePath) => {
   if (/\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/.test(filePath)) {
     return false;
   }
-  if ([".js", ".jsx", ".ts", ".tsx"].includes(import_path.default.extname(filePath))) {
+  if ([
+    ".js",
+    ".jsx",
+    ".ts",
+    ".tsx"
+  ].includes(_path.default.extname(filePath))) {
     return true;
   }
   return false;
 };
 const replaceWithAlias = (base, filePath, alias) => {
   if (filePath.includes(base)) {
-    return (0, import_utils.normalizeToPosixPath)(
-      import_path.default.join(alias, import_path.default.relative(base, filePath))
-    );
+    return (0, _utils.normalizeToPosixPath)(_path.default.join(alias, _path.default.relative(base, filePath)));
   } else {
     return filePath;
   }
 };
-const parseModule = async ({
-  source,
-  filename
-}) => {
+const parseModule = async ({ source, filename }) => {
   let content = source;
-  if (import_constants.JS_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
-    const result = await (0, import_esbuild.transform)(content, {
-      loader: import_path.default.extname(filename).slice(1),
+  if (_constants.JS_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
+    const result = await (0, _esbuild.transform)(content, {
+      loader: _path.default.extname(filename).slice(1),
       format: "esm"
     });
     content = result.code;
   }
-  return await (0, import_es_module_lexer.parse)(content);
+  return await (0, _esmodulelexer.parse)(content);
 };
 const hasLoader = async (filename) => {
-  const source = await import_utils.fs.readFile(filename);
+  const source = await _utils.fs.readFile(filename);
   const [, moduleExports] = await parseModule({
     source: source.toString(),
     filename
   });
-  return moduleExports.some((e) => e.n === import_constants.LOADER_EXPORT_NAME);
+  return moduleExports.some((e) => e.n === _constants.LOADER_EXPORT_NAME);
 };
 const getServerLoadersFile = (internalDirectory, entryName) => {
-  return import_path.default.join(internalDirectory, entryName, "route-server-loaders.js");
+  return _path.default.join(internalDirectory, entryName, "route-server-loaders.js");
 };
 const getServerCombinedModueFile = (internalDirectory, entryName) => {
-  return import_path.default.join(internalDirectory, entryName, "server-loader-combined.js");
+  return _path.default.join(internalDirectory, entryName, "server-loader-combined.js");
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getDefaultImports,
-  getServerCombinedModueFile,
-  getServerLoadersFile,
-  hasLoader,
-  isPageComponentFile,
-  parseModule,
-  replaceWithAlias,
-  walkDirectory
-});