@modern-js/app-tools 2.15.0 → 2.17.0

package/dist/esm-node/analyze/nestedRoutes.js

@@ -7,16 +7,11 @@ const replaceDynamicPath = (routePath) => {
   return routePath.replace(/\[(.*?)\]/g, ":$1");
 };
 const createIndexRoute = (routeInfo, rootDir, filename, entryName) => {
-  return createRoute(
-    {
-      ...routeInfo,
-      index: true,
-      children: void 0
-    },
-    rootDir,
-    filename,
-    entryName
-  );
+  return createRoute({
+    ...routeInfo,
+    index: true,
+    children: void 0
+  }, rootDir, filename, entryName);
 };
 const createRoute = (routeInfo, rootDir, filename, entryName) => {
   const id = getRouteId(filename, rootDir, entryName);
@@ -26,8 +21,8 @@ const createRoute = (routeInfo, rootDir, filename, entryName) => {
     type: "nested"
   };
 };
-const walk = async (dirname, rootDir, alias, entryName) => {
-  var _a, _b, _c, _d;
+export const walk = async (dirname, rootDir, alias, entryName) => {
+  var _route_children;
   if (!await fs.pathExists(dirname)) {
     return null;
   }
@@ -47,7 +42,7 @@ const walk = async (dirname, rootDir, alias, entryName) => {
   }
   routePath = replaceDynamicPath(routePath);
   const route = {
-    path: routePath == null ? void 0 : routePath.replace(/\$$/, "?"),
+    path: routePath === null || routePath === void 0 ? void 0 : routePath.replace(/\$$/, "?"),
     children: [],
     isRoot
   };
@@ -65,7 +60,8 @@ const walk = async (dirname, rootDir, alias, entryName) => {
     if (isDirectory2) {
       const childRoute = await walk(itemPath, rootDir, alias, entryName);
       if (childRoute) {
-        (_a = route.children) == null ? void 0 : _a.push(childRoute);
+        var _route_children1;
+        (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(childRoute);
       }
     }
     if (extname && (!JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
@@ -91,39 +87,31 @@ const walk = async (dirname, rootDir, alias, entryName) => {
       pageConfigFile = itemPath;
     }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_FILE) {
-      pageRoute = createIndexRoute(
-        {
-          _component: replaceWithAlias(alias.basename, itemPath, alias.name)
-        },
-        rootDir,
-        itemPath,
-        entryName
-      );
+      var _route_children2;
+      pageRoute = createIndexRoute({
+        _component: replaceWithAlias(alias.basename, itemPath, alias.name)
+      }, rootDir, itemPath, entryName);
       if (pageLoaderFile) {
         pageRoute.loader = pageLoaderFile;
       }
       if (pageConfigFile) {
         pageRoute.config = pageConfigFile;
       }
-      (_b = route.children) == null ? void 0 : _b.push(pageRoute);
+      (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(pageRoute);
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
       splatLoaderFile = itemPath;
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
-      splatRoute = createRoute(
-        {
-          _component: replaceWithAlias(alias.basename, itemPath, alias.name),
-          path: "*"
-        },
-        rootDir,
-        itemPath,
-        entryName
-      );
+      var _route_children3;
+      splatRoute = createRoute({
+        _component: replaceWithAlias(alias.basename, itemPath, alias.name),
+        path: "*"
+      }, rootDir, itemPath, entryName);
       if (splatLoaderFile) {
         splatRoute.loader = splatLoaderFile;
       }
-      (_c = route.children) == null ? void 0 : _c.push(splatRoute);
+      (_route_children3 = route.children) === null || _route_children3 === void 0 ? void 0 : _route_children3.push(splatRoute);
     }
     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
       route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
@@ -132,16 +120,11 @@ const walk = async (dirname, rootDir, alias, entryName) => {
       route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
     }
   }
-  let finalRoute = createRoute(
-    route,
-    rootDir,
-    path.join(dirname, `${NESTED_ROUTE.LAYOUT_FILE}.ts`),
-    entryName
-  );
+  let finalRoute = createRoute(route, rootDir, path.join(dirname, `${NESTED_ROUTE.LAYOUT_FILE}.ts`), entryName);
   if (isPathlessLayout) {
     delete finalRoute.path;
   }
-  route.children = (_d = route.children) == null ? void 0 : _d.filter((childRoute) => childRoute);
+  route.children = (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.filter((childRoute) => childRoute);
   if (route.children && route.children.length === 0 && !route.index) {
     return null;
   }
@@ -157,6 +140,3 @@ const walk = async (dirname, rootDir, alias, entryName) => {
   }
   return finalRoute;
 };
-export {
-  walk
-};

package/dist/esm-node/analyze/templates.js

@@ -2,12 +2,7 @@ import path from "path";
 import { fs, getEntryOptions, isSSGEntry, slash } from "@modern-js/utils";
 import { APP_CONFIG_NAME, TEMP_LOADERS_DIR } from "./constants";
 import { getServerLoadersFile } from "./utils";
-const index = ({
-  mountId,
-  imports,
-  renderFunction: renderFunction2,
-  exportStatement
-}) => `
+export 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}';
@@ -26,11 +21,7 @@ AppWrapper = render();
 
 ${exportStatement};
 `;
-const renderFunction = ({
-  plugins,
-  customBootstrap,
-  fileSystemRoutes: fileSystemRoutes2
-}) => {
+export const renderFunction = ({ plugins, customBootstrap, fileSystemRoutes: fileSystemRoutes2 }) => {
   const bootstrap = "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM)";
   return `
   const finalAppConfig = {
@@ -40,9 +31,7 @@ const renderFunction = ({
 
   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`})
 
@@ -59,7 +48,7 @@ const renderFunction = ({
   return AppWrapper
 `;
 };
-const html = (partials) => `
+export const html = (partials) => `
 <!DOCTYPE html>
 <html>
 <head>
@@ -85,15 +74,13 @@ const html = (partials) => `
 
 </html>
 `;
-const routesForServer = ({
-  routes
-}) => {
+export 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") {
@@ -115,10 +102,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)}`;
     }
@@ -137,14 +121,7 @@ const routesForServer = ({
   `;
 };
 const createMatchReg = (keyword) => new RegExp(`("${keyword}":\\s)"([^,]+)"`, "g");
-const fileSystemRoutes = async ({
-  routes,
-  ssrMode,
-  nestedRoutesEntry,
-  entryName,
-  internalDirectory,
-  splitRouteChunks = true
-}) => {
+export const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, splitRouteChunks = true }) => {
   const components = [];
   const loadings = [];
   const errors = [];
@@ -152,12 +129,7 @@ const fileSystemRoutes = async ({
   const loadersMap = {};
   const configs = [];
   const configsMap = {};
-  const loadersMapFile = path.join(
-    internalDirectory,
-    entryName,
-    TEMP_LOADERS_DIR,
-    "map.json"
-  );
+  const loadersMapFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "map.json");
   const importLazyCode = `
     import { lazy } from "react";
     import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
@@ -173,10 +145,10 @@ const fileSystemRoutes = async ({
     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;
@@ -273,7 +245,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, '"');
@@ -297,14 +272,10 @@ const fileSystemRoutes = async ({
   let importLoadersCode = "";
   for (const [key, loaderInfo] of Object.entries(loadersMap)) {
     if (loaderInfo.inline) {
-      importLoadersCode += `import { loader as ${key} } from "${slash(
-        loaderInfo.filePath
-      )}${getDataLoaderPath(key)}";
+      importLoadersCode += `import { loader as ${key} } from "${slash(loaderInfo.filePath)}${getDataLoaderPath(key)}";
 `;
     } else {
-      importLoadersCode += `import ${key} from "${slash(
-        loaderInfo.filePath
-      )}${getDataLoaderPath(key)}";
+      importLoadersCode += `import ${key} from "${slash(loaderInfo.filePath)}${getDataLoaderPath(key)}";
 `;
     }
   }
@@ -326,34 +297,16 @@ const fileSystemRoutes = async ({
     ${routeComponentsCode}
   `;
 };
-function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
+export function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
   const { entryName } = entrypoint;
   const { packageName, internalDirectory } = appContext;
-  const ssr = getEntryOptions(
-    entryName,
-    config.server.ssr,
-    config.server.ssrByEntries,
-    packageName
-  );
+  const ssr = getEntryOptions(entryName, config.server.ssr, config.server.ssrByEntries, packageName);
   const ssg = isSSGEntry(config, entryName, entrypoints);
   if (entrypoint.nestedRoutesEntry && (ssr || ssg)) {
     const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
-    const serverLoadersFile = getServerLoadersFile(
-      internalDirectory,
-      entryName
-    );
-    const combinedModule = `export * from "${slash(
-      serverLoaderRuntime
-    )}"; export * from "${slash(serverLoadersFile)}"`;
+    const serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
+    const combinedModule = `export * from "${slash(serverLoaderRuntime)}"; export * from "${slash(serverLoadersFile)}"`;
     return combinedModule;
   }
   return null;
 }
-export {
-  fileSystemRoutes,
-  html,
-  index,
-  renderFunction,
-  routesForServer,
-  ssrLoaderCombinedModule
-};

package/dist/esm-node/analyze/utils.js

@@ -3,63 +3,77 @@ import path from "path";
 import { isReact18, normalizeToPosixPath, fs as fse } from "@modern-js/utils";
 import { transform } from "esbuild";
 import { parse } from "es-module-lexer";
-import {
-  FILE_SYSTEM_ROUTES_FILE_NAME,
-  JS_EXTENSIONS,
-  LOADER_EXPORT_NAME
-} from "./constants";
-const walkDirectory = (dir) => fs.readdirSync(dir).reduce((previous, filename) => {
+import { FILE_SYSTEM_ROUTES_FILE_NAME, JS_EXTENSIONS, LOADER_EXPORT_NAME } from "./constants";
+export const walkDirectory = (dir) => fs.readdirSync(dir).reduce((previous, filename) => {
   const filePath = path.join(dir, filename);
   if (fs.statSync(filePath).isDirectory()) {
-    return [...previous, ...walkDirectory(filePath)];
+    return [
+      ...previous,
+      ...walkDirectory(filePath)
+    ];
   } else {
-    return [...previous, filePath];
+    return [
+      ...previous,
+      filePath
+    ];
   }
 }, []);
-const getDefaultImports = ({
-  entrypoint,
-  srcDirectory,
-  internalSrcAlias,
-  internalDirAlias,
-  internalDirectory
-}) => {
+export 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" }],
+      specifiers: [
+        {
+          local: "ReactDOM"
+        }
+      ],
       value: isReact18(path.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: normalizeToPosixPath(
-        customBootstrap.replace(srcDirectory, internalSrcAlias)
-      )
+      specifiers: [
+        {
+          local: "customBootstrap"
+        }
+      ],
+      value: normalizeToPosixPath(customBootstrap.replace(srcDirectory, internalSrcAlias))
     }
   ].filter(Boolean);
   if (fileSystemRoutes) {
     const route = {
-      specifiers: [{ imported: "routes" }],
-      value: normalizeToPosixPath(
-        `${internalDirAlias}/${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME.replace(
-          ".js",
-          ""
-        )}`
-      )
+      specifiers: [
+        {
+          imported: "routes"
+        }
+      ],
+      value: normalizeToPosixPath(`${internalDirAlias}/${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME.replace(".js", "")}`)
     };
     if (fileSystemRoutes.globalApp) {
       imports.push({
-        specifiers: [{ local: "App" }],
-        value: normalizeToPosixPath(
-          fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias)
-        )
+        specifiers: [
+          {
+            local: "App"
+          }
+        ],
+        value: normalizeToPosixPath(fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias))
       });
     } else {
       route.initialize = "const App = false;";
@@ -67,36 +81,38 @@ const getDefaultImports = ({
     imports.push(route);
   } else {
     imports.push({
-      specifiers: [{ local: "App" }],
-      value: normalizeToPosixPath(
-        entry.replace(srcDirectory, internalSrcAlias)
-      )
+      specifiers: [
+        {
+          local: "App"
+        }
+      ],
+      value: normalizeToPosixPath(entry.replace(srcDirectory, internalSrcAlias))
     });
   }
   return imports;
 };
-const isPageComponentFile = (filePath) => {
+export const isPageComponentFile = (filePath) => {
   if (/\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/.test(filePath)) {
     return false;
   }
-  if ([".js", ".jsx", ".ts", ".tsx"].includes(path.extname(filePath))) {
+  if ([
+    ".js",
+    ".jsx",
+    ".ts",
+    ".tsx"
+  ].includes(path.extname(filePath))) {
     return true;
   }
   return false;
 };
-const replaceWithAlias = (base, filePath, alias) => {
+export const replaceWithAlias = (base, filePath, alias) => {
   if (filePath.includes(base)) {
-    return normalizeToPosixPath(
-      path.join(alias, path.relative(base, filePath))
-    );
+    return normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
   } else {
     return filePath;
   }
 };
-const parseModule = async ({
-  source,
-  filename
-}) => {
+export const parseModule = async ({ source, filename }) => {
   let content = source;
   if (JS_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
     const result = await transform(content, {
@@ -107,7 +123,7 @@ const parseModule = async ({
   }
   return await parse(content);
 };
-const hasLoader = async (filename) => {
+export const hasLoader = async (filename) => {
   const source = await fse.readFile(filename);
   const [, moduleExports] = await parseModule({
     source: source.toString(),
@@ -115,19 +131,9 @@ const hasLoader = async (filename) => {
   });
   return moduleExports.some((e) => e.n === LOADER_EXPORT_NAME);
 };
-const getServerLoadersFile = (internalDirectory, entryName) => {
+export const getServerLoadersFile = (internalDirectory, entryName) => {
   return path.join(internalDirectory, entryName, "route-server-loaders.js");
 };
-const getServerCombinedModueFile = (internalDirectory, entryName) => {
+export const getServerCombinedModueFile = (internalDirectory, entryName) => {
   return path.join(internalDirectory, entryName, "server-loader-combined.js");
 };
-export {
-  getDefaultImports,
-  getServerCombinedModueFile,
-  getServerLoadersFile,
-  hasLoader,
-  isPageComponentFile,
-  parseModule,
-  replaceWithAlias,
-  walkDirectory
-};

package/dist/esm-node/builder/builder-rspack/adapterCopy.js

@@ -2,71 +2,52 @@ import path from "path";
 import fs from "@modern-js/utils/fs-extra";
 import { logger, removeTailSlash } from "@modern-js/utils";
 import { createCopyInfo } from "../shared";
-const builderPluginAdpaterCopy = (options) => ({
-  name: "builder-plugin-adapter-rspack-copy",
-  setup(api) {
-    let publicPath;
-    api.modifyRspackConfig((config) => {
-      var _a, _b, _c;
-      config.builtins = {
-        ...config.builtins || {},
-        copy: {
-          patterns: [
-            ...transformCopy((_b = (_a = config.builtins) == null ? void 0 : _a.copy) == null ? void 0 : _b.patterns),
-            ...createConfigBuiltinCopy(options)
-          ]
+export const builderPluginAdpaterCopy = (options) => {
+  return {
+    name: "builder-plugin-adapter-rspack-copy",
+    setup(api) {
+      let publicPath;
+      api.modifyRspackConfig((config) => {
+        var _config_builtins, _config_builtins_copy, _config_output;
+        config.builtins = {
+          ...config.builtins || {},
+          copy: {
+            patterns: [
+              ...transformCopy((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns),
+              ...createConfigBuiltinCopy(options)
+            ]
+          }
+        };
+        publicPath = (_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.publicPath;
+      });
+      api.onDevCompileDone(async () => {
+        await transformHtmlFiles();
+      });
+      api.onAfterBuild(async () => {
+        await transformHtmlFiles();
+      });
+      async function transformHtmlFiles() {
+        var _normalizedConfig_output_distPath;
+        const { normalizedConfig } = options;
+        const publicDir = path.resolve(((_normalizedConfig_output_distPath = normalizedConfig.output.distPath) === null || _normalizedConfig_output_distPath === void 0 ? void 0 : _normalizedConfig_output_distPath.root) || "./dist", "./public");
+        if (!fs.existsSync(publicDir) || !fs.statSync(publicDir).isDirectory()) {
+          return;
         }
-      };
-      publicPath = (_c = config.output) == null ? void 0 : _c.publicPath;
-    });
-    api.onDevCompileDone(async () => {
-      await transformHtmlFiles();
-    });
-    api.onAfterBuild(async () => {
-      await transformHtmlFiles();
-    });
-    async function transformHtmlFiles() {
-      var _a;
-      const { normalizedConfig } = options;
-      const publicDir = path.resolve(
-        ((_a = normalizedConfig.output.distPath) == null ? void 0 : _a.root) || "./dist",
-        "./public"
-      );
-      if (!fs.existsSync(publicDir) || !fs.statSync(publicDir).isDirectory()) {
-        return;
-      }
-      const HTML_REGEXP = /\.html?$/;
-      const filepaths = (await fs.readdir(publicDir)).map(
-        (file) => path.resolve(publicDir, file)
-      );
-      await Promise.all(
-        filepaths.filter((file) => HTML_REGEXP.test(file)).map(async (file) => {
+        const HTML_REGEXP = /\.html?$/;
+        const filepaths = (await fs.readdir(publicDir)).map((file) => path.resolve(publicDir, file));
+        await Promise.all(filepaths.filter((file) => HTML_REGEXP.test(file)).map(async (file) => {
           const content = await fs.readFile(file, "utf-8");
           if (publicPath) {
-            await fs.writeFile(
-              file,
-              content.replace(
-                /<%=\s*assetPrefix\s*%>/g,
-                removeTailSlash(publicPath)
-              )
-            );
+            await fs.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash(publicPath)));
           } else {
-            logger.warn(
-              "Expect get a string from `publicPath`, but receive `undefined`."
-            );
-            await fs.writeFile(
-              file,
-              content.replace(
-                /<%=\s*assetPrefix\s*%>/g,
-                removeTailSlash("/")
-              )
-            );
+            logger.warn("Expect get a string from `publicPath`, but receive `undefined`.");
+            await fs.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash("/")));
           }
-        })
-      );
+        }));
+      }
     }
-  }
-});
+  };
+};
 function transformCopy(patterns) {
   if (patterns) {
     patterns.map((value) => {
@@ -98,6 +79,3 @@ function createConfigBuiltinCopy(options) {
     }
   ];
 }
-export {
-  builderPluginAdpaterCopy
-};

package/dist/esm-node/builder/builder-rspack/index.js

@@ -1,13 +1,12 @@
 import { builderRspackProvider } from "@modern-js/builder-rspack-provider";
 import { generateBuilder } from "../generator";
 import { builderPluginAdpaterCopy } from "./adapterCopy";
-function createRspackBuilderForModern(options) {
+export function createRspackBuilderForModern(options) {
   return generateBuilder(options, builderRspackProvider, {
     modifyBuilderInstance(builder) {
-      builder.addPlugins([builderPluginAdpaterCopy(options)]);
+      builder.addPlugins([
+        builderPluginAdpaterCopy(options)
+      ]);
     }
   });
 }
-export {
-  createRspackBuilderForModern
-};