@modern-js/runtime 2.69.4 → 3.0.0-alpha.0

package/dist/esm-node/router/cli/code/getClientRoutes/getRoutes.js

@@ -1,163 +0,0 @@
-import path from "path";
-import { fs } from "@modern-js/utils";
-import { FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_INDEX, FILE_SYSTEM_ROUTES_LAYOUT } from "../../constants";
-import { makeLegalIdentifier } from "../makeLegalIdentifier";
-import { replaceWithAlias } from "../utils";
-import { debug, findLayout, getRouteWeight, shouldSkip } from "./utils";
-const compName = (srcDirectory, filePath) => {
-  const legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
-  return `Comp_${legalCompName}`;
-};
-const layoutNameAbbr = (filePath) => {
-  const prefix = "L_";
-  const dirName = path.dirname(filePath).split("/").pop() || "";
-  return `${prefix}${makeLegalIdentifier(dirName)}`;
-};
-const parents = [];
-const recursiveReadDir = ({ dir, routes, basePath = "/", srcDirectory, srcAlias }) => {
-  let hasDynamicRoute = false;
-  let resetParent = false;
-  let parent = parents[parents.length - 1];
-  const layout = findLayout(dir);
-  if (layout) {
-    if (basePath === "/") {
-      throw new Error(`should use _app instead of _layout in ${dir}`);
-    } else {
-      const alias = replaceWithAlias(srcDirectory, layout, srcAlias);
-      const componentName = compName(srcDirectory, layout);
-      const route = {
-        path: `${basePath.substring(0, basePath.length - 1)}`,
-        children: [],
-        _component: alias,
-        component: componentName,
-        parent,
-        type: "page"
-      };
-      parent = route;
-      resetParent = true;
-      routes.push(route);
-      parents.push(route);
-      routes = route.children;
-    }
-  }
-  for (const relative of fs.readdirSync(dir)) {
-    const filePath = path.join(dir, relative);
-    if (!shouldSkip(filePath)) {
-      const filename = path.basename(filePath, path.extname(filePath));
-      const alias = replaceWithAlias(srcDirectory, filePath, srcAlias);
-      const componentName = compName(srcDirectory, filePath);
-      const dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
-      if (dynamicRouteMatched) {
-        if (hasDynamicRoute) {
-          throw new Error(`Can't set two dynamic route in one directory: ${dir}`);
-        } else {
-          hasDynamicRoute = true;
-        }
-      }
-      const route = {
-        path: `${basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1].replace(/\$$/, "?")}${dynamicRouteMatched[2]}` : filename}`,
-        _component: alias,
-        component: componentName,
-        parent,
-        type: "page"
-      };
-      if (fs.statSync(filePath).isDirectory()) {
-        recursiveReadDir({
-          dir: filePath,
-          routes,
-          basePath: `${route.path}/`,
-          srcDirectory,
-          srcAlias
-        });
-        continue;
-      }
-      if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
-        continue;
-      }
-      if (filename === FILE_SYSTEM_ROUTES_INDEX) {
-        route.path = basePath === "/" ? basePath : `${basePath.substring(0, basePath.length - 1)}`;
-      }
-      if (filename === "404" && basePath === "/") {
-        route.path = "*";
-      }
-      routes.push(route);
-    }
-  }
-  if (resetParent) {
-    parents.pop();
-  }
-};
-const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory, internalDirAlias) => {
-  const flat = (routes) => routes.reduce((memo, route) => memo.concat(Array.isArray(route.children) ? flat(route.children) : [
-    route
-  ]), []);
-  const generate = (route) => {
-    const codes = [];
-    let lastComponent = route.component;
-    const imports = [
-      `import React from 'react';`,
-      `import ${lastComponent} from '${route._component}'`
-    ];
-    while (route = route.parent) {
-      const layoutComponent = route.component;
-      const layoutComponentAbbr = layoutNameAbbr(route._component);
-      imports.push(`import ${layoutComponent} from '${route._component}';`);
-      const currentComponent = `${layoutComponentAbbr}_${lastComponent}`;
-      codes.push(`const ${currentComponent} = props => <${layoutComponent} Component={${lastComponent}} {...props} />;`);
-      lastComponent = currentComponent;
-    }
-    const file = path.resolve(internalComponentsDir, `${lastComponent}.jsx`);
-    fs.outputFileSync(file, `${imports.join("\n")}
-${codes.join("\n")}
-export default ${lastComponent}`);
-    return {
-      component: lastComponent,
-      _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
-    };
-  };
-  const normalized = flat(nested).map((route) => route.parent ? {
-    ...route,
-    ...generate(route),
-    parent: void 0
-  } : {
-    ...route,
-    parent: void 0
-  });
-  return normalized;
-};
-const getClientRoutes = ({ entrypoint, srcDirectory, srcAlias, internalDirectory, internalDirAlias }) => {
-  const { entryName, pageRoutesEntry } = entrypoint;
-  if (!pageRoutesEntry) {
-    return [];
-  }
-  if (!fs.existsSync(pageRoutesEntry)) {
-    throw new Error(`generate file system routes error, ${pageRoutesEntry} directory not found.`);
-  }
-  if (!(fs.existsSync(pageRoutesEntry) && fs.statSync(pageRoutesEntry).isDirectory())) {
-    throw new Error(`generate file system routes error, ${pageRoutesEntry} should be directory.`);
-  }
-  let routes = [];
-  recursiveReadDir({
-    dir: pageRoutesEntry,
-    routes,
-    basePath: "/",
-    srcDirectory,
-    srcAlias
-  });
-  const internalComponentsDir = path.resolve(internalDirectory, `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`);
-  fs.emptyDirSync(internalComponentsDir);
-  routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
-  parents.length = 0;
-  routes.sort((a, b) => {
-    const delta = getRouteWeight(a.path) - getRouteWeight(b.path);
-    if (delta === 0) {
-      return a.path.length - b.path.length;
-    }
-    return delta;
-  });
-  debug(`fileSystem routes: %o`, routes);
-  return routes;
-};
-export {
-  getClientRoutes
-};

package/dist/esm-node/router/cli/code/getClientRoutes/getRoutesLegacy.js

@@ -1,161 +0,0 @@
-import path from "path";
-import { fs } from "@modern-js/utils";
-import { FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_INDEX, FILE_SYSTEM_ROUTES_LAYOUT } from "../../constants";
-import { makeLegalIdentifier } from "../makeLegalIdentifier";
-import { replaceWithAlias } from "../utils";
-import { debug, findLayout, getRouteWeight, shouldSkip } from "./utils";
-const compName = (srcDirectory, filePath) => {
-  const legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
-  return `Comp_${legalCompName}`;
-};
-const layoutNameAbbr = (filePath) => {
-  const prefix = "L_";
-  const dirName = path.dirname(filePath).split("/").pop() || "";
-  return `${prefix}${makeLegalIdentifier(dirName)}`;
-};
-const parents = [];
-const recursiveReadDirLegacy = ({ dir, routes, basePath = "/", srcDirectory, srcAlias }) => {
-  let hasDynamicRoute = false;
-  let resetParent = false;
-  let parent = parents[parents.length - 1];
-  const layout = findLayout(dir);
-  if (layout) {
-    if (basePath === "/") {
-      throw new Error(`should use _app instead of _layout in ${dir}`);
-    } else {
-      const alias = replaceWithAlias(srcDirectory, layout, srcAlias);
-      const componentName = compName(srcDirectory, layout);
-      const route = {
-        path: `${basePath.substring(0, basePath.length - 1)}`,
-        exact: false,
-        routes: [],
-        _component: alias,
-        component: componentName,
-        parent
-      };
-      parent = route;
-      resetParent = true;
-      routes.push(route);
-      parents.push(route);
-      routes = route.routes;
-    }
-  }
-  for (const relative of fs.readdirSync(dir)) {
-    const filePath = path.join(dir, relative);
-    if (!shouldSkip(filePath)) {
-      const filename = path.basename(filePath, path.extname(filePath));
-      const alias = replaceWithAlias(srcDirectory, filePath, srcAlias);
-      const componentName = compName(srcDirectory, filePath);
-      const dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
-      if (dynamicRouteMatched) {
-        if (hasDynamicRoute) {
-          throw new Error(`Can't set two dynamic route in one directory: ${dir}`);
-        } else {
-          hasDynamicRoute = true;
-        }
-      }
-      const route = {
-        path: `${basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1].replace(/\$$/, "?")}${dynamicRouteMatched[2]}` : filename}`,
-        _component: alias,
-        component: componentName,
-        exact: true,
-        parent
-      };
-      if (fs.statSync(filePath).isDirectory()) {
-        recursiveReadDirLegacy({
-          dir: filePath,
-          routes,
-          basePath: `${route.path}/`,
-          srcDirectory,
-          srcAlias
-        });
-        continue;
-      }
-      if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
-        continue;
-      }
-      if (filename === FILE_SYSTEM_ROUTES_INDEX) {
-        route.path = basePath === "/" ? basePath : `${basePath.substring(0, basePath.length - 1)}`;
-      }
-      if (filename === "404" && basePath === "/") {
-        route.path = "*";
-        route.exact = false;
-      }
-      routes.push(route);
-    }
-  }
-  if (resetParent) {
-    parents.pop();
-  }
-};
-const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory, internalDirAlias) => {
-  const flat = (routes) => routes.reduce((memo, route) => memo.concat(Array.isArray(route.routes) ? flat(route.routes) : [
-    route
-  ]), []);
-  const generate = (route) => {
-    const codes = [];
-    let lastComponent = route.component;
-    const imports = [
-      `import React from 'react';`,
-      `import ${lastComponent} from '${route._component}'`
-    ];
-    while (route = route.parent) {
-      const layoutComponent = route.component;
-      const layoutComponentAbbr = layoutNameAbbr(route._component);
-      imports.push(`import ${layoutComponent} from '${route._component}';`);
-      const currentComponent = `${layoutComponentAbbr}_${lastComponent}`;
-      codes.push(`const ${currentComponent} = props => <${layoutComponent} Component={${lastComponent}} {...props} />;`);
-      lastComponent = currentComponent;
-    }
-    const file = path.resolve(internalComponentsDir, `${lastComponent}.jsx`);
-    fs.outputFileSync(file, `${imports.join("\n")}
-${codes.join("\n")}
-export default ${lastComponent}`);
-    return {
-      component: lastComponent,
-      _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
-    };
-  };
-  const normalized = flat(nested).map((route) => route.parent ? {
-    ...route,
-    ...generate(route),
-    parent: void 0
-  } : {
-    ...route,
-    parent: void 0
-  });
-  return normalized;
-};
-const getClientRoutes = ({ entrypoint, srcDirectory, srcAlias, internalDirectory, internalDirAlias }) => {
-  const { entry, entryName } = entrypoint;
-  if (!fs.existsSync(entry)) {
-    throw new Error(`generate file system routes error, ${entry} directory not found.`);
-  }
-  if (!(fs.existsSync(entry) && fs.statSync(entry).isDirectory())) {
-    throw new Error(`generate file system routes error, ${entry} should be directory.`);
-  }
-  let routes = [];
-  recursiveReadDirLegacy({
-    dir: entry,
-    routes,
-    basePath: "/",
-    srcDirectory,
-    srcAlias
-  });
-  const internalComponentsDir = path.resolve(internalDirectory, `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`);
-  fs.emptyDirSync(internalComponentsDir);
-  routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
-  parents.length = 0;
-  routes.sort((a, b) => {
-    const delta = getRouteWeight(a.path) - getRouteWeight(b.path);
-    if (delta === 0) {
-      return a.path.length - b.path.length;
-    }
-    return delta;
-  });
-  debug(`fileSystem routes: %o`, routes);
-  return routes;
-};
-export {
-  getClientRoutes
-};

package/dist/esm-node/router/cli/code/getClientRoutes/index.js

@@ -1,6 +0,0 @@
-import { getClientRoutes } from "./getRoutes";
-import { getClientRoutes as getClientRoutes2 } from "./getRoutesLegacy";
-export {
-  getClientRoutes,
-  getClientRoutes2 as getClientRoutesLegacy
-};

package/dist/esm-node/router/cli/code/getClientRoutes/utils.js

@@ -1,22 +0,0 @@
-import path from "path";
-import { fs, JS_EXTENSIONS, createDebugger, findExists } from "@modern-js/utils";
-import { FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, FILE_SYSTEM_ROUTES_IGNORED_REGEX, FILE_SYSTEM_ROUTES_LAYOUT } from "../../constants";
-const debug = createDebugger("get-client-routes");
-const findLayout = (dir) => findExists(JS_EXTENSIONS.map((ext) => path.resolve(dir, `${FILE_SYSTEM_ROUTES_LAYOUT}${ext}`)));
-const getRouteWeight = (route) => route === "*" ? 999 : route.split(":").length - 1;
-const shouldSkip = (file) => {
-  if (fs.statSync(file).isDirectory()) {
-    return false;
-  }
-  const ext = path.extname(file);
-  if (FILE_SYSTEM_ROUTES_IGNORED_REGEX.test(file) || !JS_EXTENSIONS.includes(ext) || FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT === path.basename(file, ext)) {
-    return true;
-  }
-  return false;
-};
-export {
-  debug,
-  findLayout,
-  getRouteWeight,
-  shouldSkip
-};

package/dist/esm-node/router/cli/code/index.js

@@ -1,126 +0,0 @@
-import path from "path";
-import { fs, getEntryOptions, isSSGEntry, isUseRsc, isUseSSRBundle, logger } from "@modern-js/utils";
-import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils";
-import { cloneDeep } from "@modern-js/utils/lodash";
-import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
-import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
-import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
-import { walk } from "./nestedRoutes";
-import * as templates from "./templates";
-import { getServerCombinedModueFile, getServerLoadersFile } from "./utils";
-const generateCode = async (appContext, config, entrypoints, api, isRouterV5) => {
-  const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
-  const hooks = api.getHooks();
-  const getRoutes = isRouterV5 ? getClientRoutesLegacy : getClientRoutes;
-  const oldVersion = typeof (config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
-  await Promise.all(entrypoints.map(generateEntryCode));
-  async function generateEntryCode(entrypoint) {
-    const { entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry } = entrypoint;
-    const { metaName } = api.getAppContext();
-    if (isAutoMount) {
-      if (pageRoutesEntry || nestedRoutesEntry) {
-        var _config_output;
-        let initialRoutes = [];
-        let nestedRoutes = null;
-        if (entrypoint.entry) {
-          initialRoutes = getRoutes({
-            entrypoint,
-            srcDirectory,
-            srcAlias: internalSrcAlias,
-            internalDirectory,
-            internalDirAlias
-          });
-        }
-        if (!isRouterV5 && entrypoint.nestedRoutesEntry) {
-          nestedRoutes = await walk(entrypoint.nestedRoutesEntry, entrypoint.nestedRoutesEntry, {
-            name: internalSrcAlias,
-            basename: srcDirectory
-          }, entrypoint.entryName, entrypoint.isMainEntry, oldVersion);
-          if (nestedRoutes) {
-            if (!Array.isArray(nestedRoutes)) {
-              nestedRoutes = [
-                nestedRoutes
-              ];
-            }
-            for (const route of nestedRoutes) {
-              initialRoutes.unshift(route);
-            }
-          }
-        }
-        const config2 = api.getNormalizedConfig();
-        const ssrByRouteIds = config2.server.ssrByRouteIds || [];
-        const clonedRoutes = cloneDeep(initialRoutes);
-        const markedRoutes = ssrByRouteIds.length > 0 ? markRoutes(clonedRoutes, ssrByRouteIds) : initialRoutes;
-        const { routes } = await hooks.modifyFileSystemRoutes.call({
-          entrypoint,
-          routes: markedRoutes
-        });
-        const ssr = getEntryOptions(entryName, isMainEntry, config2.server.ssr, config2.server.ssrByEntries, packageName);
-        const useSSG = isSSGEntry(config2, entryName, entrypoints);
-        let mode;
-        if (ssr) {
-          mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
-        }
-        if (mode === "stream") {
-          const hasPageRoute = routes.some((route) => "type" in route && route.type === "page");
-          if (hasPageRoute) {
-            logger.error("Streaming ssr is not supported when pages dir exists");
-            process.exit(1);
-          }
-        }
-        const { code } = await hooks.onBeforeGenerateRoutes.call({
-          entrypoint,
-          code: await templates.fileSystemRoutes({
-            metaName,
-            routes,
-            ssrMode: useSSG ? "string" : isUseRsc(config2) ? "stream" : mode,
-            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
-            entryName: entrypoint.entryName,
-            internalDirectory,
-            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output = config2.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks,
-            isRscClient: isUseRsc(config2)
-          })
-        });
-        if (entrypoint.nestedRoutesEntry && (isUseSSRBundle(config2) || isUseRsc(config2))) {
-          var _config_output1;
-          const routesServerFile = getServerLoadersFile(internalDirectory, entryName);
-          const filtedRoutesForServer = filterRoutesForServer(routes);
-          const routesForServerLoaderMatches = filterRoutesLoader(routes);
-          const code2 = templates.routesForServer({
-            routesForServerLoaderMatches
-          });
-          await fs.ensureFile(routesServerFile);
-          await fs.writeFile(routesServerFile, code2);
-          const serverRoutesCode = await templates.fileSystemRoutes({
-            metaName,
-            routes: filtedRoutesForServer,
-            ssrMode: useSSG ? "string" : mode,
-            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
-            entryName: entrypoint.entryName,
-            internalDirectory,
-            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output1 = config2.output) === null || _config_output1 === void 0 ? void 0 : _config_output1.splitRouteChunks,
-            isRscClient: false
-          });
-          await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/routes.server.js`), serverRoutesCode, "utf8");
-        }
-        const serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, config2, appContext);
-        if (serverLoaderCombined) {
-          const serverLoaderFile = getServerCombinedModueFile(internalDirectory, entryName);
-          await fs.outputFile(serverLoaderFile, serverLoaderCombined);
-        }
-        await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");
-      }
-    }
-  }
-};
-function generatorRegisterCode(internalDirectory, entryName, code) {
-  fs.outputFileSync(path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}.js`), code, "utf8");
-}
-function generatorServerRegisterCode(internalDirectory, entryName, code) {
-  fs.outputFileSync(path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}.server.js`), code, "utf8");
-}
-export {
-  generateCode,
-  generatorRegisterCode,
-  generatorServerRegisterCode
-};