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

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

@@ -1,101 +0,0 @@
-import fs from "fs";
-import path from "path";
-import { JS_EXTENSIONS, fs as fse, normalizeToPosixPath } from "@modern-js/utils";
-import { parse } from "es-module-lexer";
-import { transform } from "esbuild";
-import { ACTION_EXPORT_NAME, LOADER_EXPORT_NAME } from "../constants";
-const walkDirectory = (dir) => fs.readdirSync(dir).reduce((previous, filename) => {
-  const filePath = path.join(dir, filename);
-  if (fs.statSync(filePath).isDirectory()) {
-    return [
-      ...previous,
-      ...walkDirectory(filePath)
-    ];
-  } else {
-    return [
-      ...previous,
-      filePath
-    ];
-  }
-}, []);
-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))) {
-    return true;
-  }
-  return false;
-};
-const replaceWithAlias = (base, filePath, alias) => {
-  if (filePath.includes(base)) {
-    return normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
-  } else {
-    return filePath;
-  }
-};
-const parseModule = async ({ source, filename }) => {
-  let content = source;
-  if (JS_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
-    const result = await transform(content, {
-      loader: path.extname(filename).slice(1),
-      format: "esm"
-    });
-    content = result.code;
-  }
-  return parse(content);
-};
-const hasLoader = async (filename, source) => {
-  let content = source;
-  if (!source) {
-    content = (await fse.readFile(filename, "utf-8")).toString();
-  }
-  if (content) {
-    const [, moduleExports] = await parseModule({
-      source: content.toString(),
-      filename
-    });
-    return moduleExports.some((e) => e.n === LOADER_EXPORT_NAME);
-  }
-  return false;
-};
-const hasAction = async (filename, source) => {
-  let content = source;
-  if (!source) {
-    content = (await fse.readFile(filename, "utf-8")).toString();
-  }
-  if (content) {
-    const [, moduleExports] = await parseModule({
-      source: content.toString(),
-      filename
-    });
-    return moduleExports.some((e) => e.n === ACTION_EXPORT_NAME);
-  }
-  return false;
-};
-const getServerLoadersFile = (internalDirectory, entryName) => {
-  return path.join(internalDirectory, entryName, "route-server-loaders.js");
-};
-const getServerCombinedModueFile = (internalDirectory, entryName) => {
-  return path.join(internalDirectory, entryName, "server-loader-combined.js");
-};
-const getPathWithoutExt = (filename) => {
-  const extname = path.extname(filename);
-  return filename.slice(0, -extname.length);
-};
-export {
-  getPathWithoutExt,
-  getServerCombinedModueFile,
-  getServerLoadersFile,
-  hasAction,
-  hasLoader,
-  isPageComponentFile,
-  parseModule,
-  replaceWithAlias,
-  walkDirectory
-};

package/dist/esm-node/router/cli/constants.js

@@ -1,51 +0,0 @@
-const PAGES_DIR_NAME = "pages";
-const NESTED_ROUTES_DIR = "routes";
-const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
-const LOADER_EXPORT_NAME = "loader";
-const ACTION_EXPORT_NAME = "action";
-const TEMP_LOADERS_DIR = "__loaders__";
-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 FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
-const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
-const APP_CONFIG_NAME = "config";
-const APP_INIT_EXPORTED = "init";
-const NESTED_ROUTE = {
-  LAYOUT_FILE: "layout",
-  LAYOUT_CONFIG_FILE: "layout.config",
-  LAYOUT_LOADER_FILE: "layout.loader",
-  LAYOUT_DATA_FILE: "layout.data",
-  LAYOUT_CLIENT_LOADER: "layout.data.client",
-  PAGE_FILE: "page",
-  PAGE_CONFIG_FILE: "page.config",
-  PAGE_LOADER_FILE: "page.loader",
-  PAGE_DATA_FILE: "page.data",
-  PAGE_CLIENT_LOADER: "page.data.client",
-  SPLATE_FILE: "$",
-  SPLATE_CONFIG_FILE: "$.config",
-  SPLATE_LOADER_FILE: "$.loader",
-  SPLATE_DATA_FILE: "$.data",
-  SPLATE_CLIENT_DATA: "$.data.client",
-  LOADING_FILE: "loading",
-  ERROR_FILE: "error",
-  LOADER_FILE: "loader"
-};
-export {
-  ACTION_EXPORT_NAME,
-  APP_CONFIG_NAME,
-  APP_INIT_EXPORTED,
-  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,
-  LOADER_EXPORT_NAME,
-  NESTED_ROUTE,
-  NESTED_ROUTES_DIR,
-  PAGES_DIR_NAME,
-  TEMP_LOADERS_DIR
-};

package/dist/esm-node/router/cli/entry.js

@@ -1,54 +0,0 @@
-import path from "path";
-import { fs, JS_EXTENSIONS, findExists } from "@modern-js/utils";
-import { hasApp } from "../../cli/entry";
-import { FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, NESTED_ROUTES_DIR, PAGES_DIR_NAME } from "./constants";
-const hasPages = (dir) => fs.existsSync(path.join(dir, PAGES_DIR_NAME));
-const hasNestedRoutes = (dir) => fs.existsSync(path.join(dir, NESTED_ROUTES_DIR));
-const isRouteEntry = (dir) => {
-  if (hasNestedRoutes(dir)) {
-    return path.join(dir, NESTED_ROUTES_DIR);
-  }
-  if (hasPages(dir)) {
-    return path.join(dir, PAGES_DIR_NAME);
-  }
-  return false;
-};
-const modifyEntrypoints = (entrypoints, isRouterV5) => {
-  return entrypoints.map((entrypoint) => {
-    if (!entrypoint.isAutoMount) {
-      return entrypoint;
-    }
-    if (entrypoint === null || entrypoint === void 0 ? void 0 : entrypoint.isCustomSourceEntry) {
-      if (entrypoint.fileSystemRoutes) {
-        if (isRouterV5) {
-          throw Error("Custom entries with conventional routing not support use react router v5!");
-        }
-        entrypoint.nestedRoutesEntry = entrypoint.absoluteEntryDir || entrypoint.entry;
-      }
-      return entrypoint;
-    }
-    const isHasApp = hasApp(entrypoint.absoluteEntryDir);
-    if (isHasApp) {
-      return entrypoint;
-    }
-    const isHasPages = hasPages(entrypoint.absoluteEntryDir);
-    if (isHasPages) {
-      entrypoint.pageRoutesEntry = path.join(entrypoint.absoluteEntryDir, PAGES_DIR_NAME);
-      entrypoint.fileSystemRoutes = {
-        ...entrypoint.fileSystemRoutes,
-        globalApp: findExists(JS_EXTENSIONS.map((ext) => path.resolve(entrypoint.absoluteEntryDir, `./${PAGES_DIR_NAME}/${FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT}${ext}`)))
-      };
-    }
-    const isHasNestedRoutes = hasNestedRoutes(entrypoint.absoluteEntryDir);
-    if (isHasNestedRoutes) {
-      entrypoint.nestedRoutesEntry = path.join(entrypoint.absoluteEntryDir, NESTED_ROUTES_DIR);
-    }
-    return entrypoint;
-  });
-};
-export {
-  hasNestedRoutes,
-  hasPages,
-  isRouteEntry,
-  modifyEntrypoints
-};

package/dist/esm-node/router/cli/handler.js

@@ -1,67 +0,0 @@
-import path from "path";
-import { cloneDeep } from "@modern-js/utils/lodash";
-import * as templates from "./code/templates";
-import { isPageComponentFile } from "./code/utils";
-import { modifyEntrypoints } from "./entry";
-let originEntrypoints = [];
-async function handleModifyEntrypoints(isRouterV5, entrypoints) {
-  return modifyEntrypoints(entrypoints, isRouterV5);
-}
-async function handleGeneratorEntryCode(api, entrypoints, isRouterV5) {
-  var _resolvedConfig_server;
-  const appContext = api.getAppContext();
-  const { internalDirectory } = appContext;
-  const resolvedConfig = api.getNormalizedConfig();
-  const { generatorRegisterCode, generateCode, generatorServerRegisterCode } = await import("./code");
-  originEntrypoints = cloneDeep(entrypoints);
-  const enableRsc = resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_server = resolvedConfig.server) === null || _resolvedConfig_server === void 0 ? void 0 : _resolvedConfig_server.rsc;
-  await generateCode(appContext, resolvedConfig, entrypoints, api, isRouterV5);
-  await Promise.all(entrypoints.map(async (entrypoint) => {
-    if (entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry) {
-      var _entrypoint_fileSystemRoutes;
-      generatorRegisterCode(internalDirectory, entrypoint.entryName, await templates.runtimeGlobalContext({
-        entryName: entrypoint.entryName,
-        metaName: appContext.metaName,
-        srcDirectory: appContext.srcDirectory,
-        nestedRoutesEntry: entrypoint.nestedRoutesEntry,
-        internalSrcAlias: appContext.internalSrcAlias,
-        globalApp: (_entrypoint_fileSystemRoutes = entrypoint.fileSystemRoutes) === null || _entrypoint_fileSystemRoutes === void 0 ? void 0 : _entrypoint_fileSystemRoutes.globalApp,
-        rscType: enableRsc ? "client" : void 0
-      }));
-      if (enableRsc) {
-        var _entrypoint_fileSystemRoutes1;
-        generatorServerRegisterCode(internalDirectory, entrypoint.entryName, await templates.runtimeGlobalContext({
-          entryName: entrypoint.entryName,
-          metaName: appContext.metaName,
-          srcDirectory: appContext.srcDirectory,
-          nestedRoutesEntry: entrypoint.nestedRoutesEntry,
-          internalSrcAlias: appContext.internalSrcAlias,
-          globalApp: (_entrypoint_fileSystemRoutes1 = entrypoint.fileSystemRoutes) === null || _entrypoint_fileSystemRoutes1 === void 0 ? void 0 : _entrypoint_fileSystemRoutes1.globalApp,
-          rscType: "server"
-        }));
-      }
-    }
-  }));
-  return entrypoints;
-}
-async function handleFileChange(api, isRouterV5, e) {
-  const appContext = api.getAppContext();
-  const { appDirectory, entrypoints } = appContext;
-  const { filename, eventType } = e;
-  const nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
-  const pagesDir = entrypoints.map((point) => point.entry).filter((entry) => entry && !path.extname(entry)).concat(nestedRouteEntries);
-  const isPageFile = (name) => pagesDir.some((pageDir) => name.includes(pageDir));
-  const absoluteFilePath = path.resolve(appDirectory, filename);
-  const isRouteComponent = isPageFile(absoluteFilePath) && isPageComponentFile(absoluteFilePath);
-  if (isRouteComponent && (eventType === "add" || eventType === "unlink")) {
-    const resolvedConfig = api.getNormalizedConfig();
-    const { generateCode } = await import("./code");
-    const entrypoints2 = cloneDeep(originEntrypoints);
-    await generateCode(appContext, resolvedConfig, entrypoints2, api, isRouterV5);
-  }
-}
-export {
-  handleFileChange,
-  handleGeneratorEntryCode,
-  handleModifyEntrypoints
-};

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

@@ -1,110 +0,0 @@
-import path from "node:path";
-import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, getEntryOptions } from "@modern-js/utils";
-import { filterRoutesForServer } from "@modern-js/utils";
-import { isRouteEntry } from "./entry";
-import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
-import { isRouteEntry as isRouteEntry2 } from "./entry";
-import { handleFileChange as handleFileChange2, handleModifyEntrypoints as handleModifyEntrypoints2 } from "./handler";
-const routerPlugin = (options) => ({
-  name: "@modern-js/plugin-router",
-  required: [
-    "@modern-js/runtime"
-  ],
-  setup: (api) => {
-    const nestedRoutes = {};
-    const nestedRoutesForServer = {};
-    const { metaName } = api.getAppContext();
-    const isRouterV5 = api.isPluginExists(`@${metaName}/plugin-router-v5`);
-    api._internalRuntimePlugins(({ entrypoint, plugins }) => {
-      var _getEntryOptions;
-      const { nestedRoutesEntry, pageRoutesEntry } = entrypoint;
-      const { packageName, serverRoutes, metaName: metaName2 } = api.getAppContext();
-      const serverBase = serverRoutes.filter((route) => route.entryName === entrypoint.entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
-      const userConfig = api.getNormalizedConfig();
-      const routerConfig = (_getEntryOptions = getEntryOptions(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
-      if ((nestedRoutesEntry || pageRoutesEntry) && !isRouterV5 && !(options === null || options === void 0 ? void 0 : options.disableRegisterRuntimePlugin)) {
-        plugins.push({
-          name: "router",
-          path: `@${metaName2}/runtime/router/internal`,
-          config: typeof routerConfig === "boolean" ? {
-            serverBase
-          } : {
-            ...routerConfig,
-            serverBase
-          }
-        });
-      }
-      return {
-        entrypoint,
-        plugins
-      };
-    });
-    api.checkEntryPoint(({ path: path2, entry }) => {
-      return {
-        path: path2,
-        entry: entry || isRouteEntry(path2)
-      };
-    });
-    api.config(() => {
-      return {
-        source: {
-          include: [
-            // react-router v6 is no longer support ie 11
-            // so we need to compile these packages to ensure the compatibility
-            // https://github.com/remix-run/react-router/commit/f6df0697e1b2064a2b3a12e8b39577326fdd945b
-            /[\\/]node_modules[\\/]react-router[\\/]/,
-            /[\\/]node_modules[\\/]react-router-dom[\\/]/,
-            /[\\/]node_modules[\\/]@remix-run[\\/]router[\\/]/,
-            path.resolve(__dirname, "../runtime").replace("cjs", "esm")
-          ],
-          globalVars: {
-            "process.env._MODERN_ROUTER_VERSION": "v6"
-          }
-        }
-      };
-    });
-    api.modifyEntrypoints(async ({ entrypoints }) => {
-      const newEntryPoints = await handleModifyEntrypoints(isRouterV5, entrypoints);
-      return {
-        entrypoints: newEntryPoints
-      };
-    });
-    api.generateEntryCode(async ({ entrypoints }) => {
-      await handleGeneratorEntryCode(api, entrypoints, isRouterV5);
-    });
-    api.addRuntimeExports(() => {
-      const { internalDirectory, metaName: metaName2 } = api.useAppContext();
-      const pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
-      if (!isRouterV5) {
-        pluginsExportsUtils.addExport(`export { default as router } from '@${metaName2}/runtime/router/internal'`);
-      }
-    });
-    api.onFileChanged(async (e) => {
-      await handleFileChange(api, isRouterV5, e);
-    });
-    api.modifyFileSystemRoutes(({ entrypoint, routes }) => {
-      nestedRoutes[entrypoint.entryName] = routes;
-      nestedRoutesForServer[entrypoint.entryName] = filterRoutesForServer(routes);
-      return {
-        entrypoint,
-        routes
-      };
-    });
-    api.onBeforeGenerateRoutes(async ({ entrypoint, code }) => {
-      const { distDirectory } = api.getAppContext();
-      await fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutesForServer);
-      return {
-        entrypoint,
-        code
-      };
-    });
-  }
-});
-var cli_default = routerPlugin;
-export {
-  cli_default as default,
-  handleFileChange2 as handleFileChange,
-  handleModifyEntrypoints2 as handleModifyEntrypoints,
-  isRouteEntry2 as isRouteEntry,
-  routerPlugin
-};

package/dist/esm-node/router/runtime/DefaultNotFound.js

@@ -1,14 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-const DefaultNotFound = () => /* @__PURE__ */ _jsx("div", {
-  style: {
-    margin: "150px auto",
-    textAlign: "center",
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center"
-  },
-  children: "404"
-});
-export {
-  DefaultNotFound
-};

package/dist/esm-node/router/runtime/DeferredDataScripts.js

@@ -1,6 +0,0 @@
-var DeferredDataScripts_default = () => {
-  return null;
-};
-export {
-  DeferredDataScripts_default as default
-};

package/dist/esm-node/router/runtime/DeferredDataScripts.node.js

@@ -1,132 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { serializeJson, storage } from "@modern-js/runtime-utils/node";
-import { useEffect, useMemo, useRef } from "react";
-import { ROUTER_DATA_JSON_ID } from "../../core/constants";
-import { modernInline, runWindowFnStr } from "./constants";
-import { serializeErrors } from "./utils";
-const DeferredDataScripts = (props) => {
-  const staticContext = props === null || props === void 0 ? void 0 : props.context;
-  const useJsonScript = props === null || props === void 0 ? void 0 : props.useJsonScript;
-  const hydratedRef = useRef(false);
-  const isRouterV7 = process.env._MODERN_ROUTER_VERSION === "v7";
-  useEffect(() => {
-    hydratedRef.current = true;
-  }, []);
-  const deferredScripts = useMemo(() => {
-    if (!staticContext) {
-      return null;
-    }
-    const originalActiveDeferreds = storage.useContext().activeDeferreds;
-    const activeDeferreds = !isRouterV7 ? staticContext.activeDeferreds || [] : originalActiveDeferreds;
-    const _ROUTER_DATA = {
-      loaderData: staticContext.loaderData,
-      errors: serializeErrors(staticContext.errors)
-    };
-    const initialScript0 = useJsonScript ? `${serializeJson(_ROUTER_DATA)}` : "";
-    const initialScript1 = useJsonScript ? modernInline : [
-      `_ROUTER_DATA = ${serializeJson(_ROUTER_DATA)};`,
-      modernInline
-    ].join("\n");
-    const deferredDataScripts = [];
-    const initialScripts = (activeDeferreds instanceof Map ? Array.from(activeDeferreds.entries()) : Object.entries(activeDeferreds)).map(([routeId, deferredData]) => {
-      const pendingKeys = new Set(deferredData.pendingKeys);
-      const { deferredKeys } = deferredData;
-      const deferredKeyPromiseManifests = deferredKeys.map((key) => {
-        if (pendingKeys.has(key)) {
-          return {
-            key,
-            routerDataFnName: "s",
-            routerDataFnArgs: [
-              serializeJson(routeId),
-              serializeJson(key)
-            ]
-          };
-        } else {
-          const trackedPromise = deferredData.data[key];
-          if (typeof trackedPromise._error !== "undefined") {
-            const error = {
-              message: trackedPromise._error.message,
-              stack: process.env.NODE_ENV !== "production" ? trackedPromise._error.stack : void 0
-            };
-            return {
-              key,
-              routerDataFnName: "p",
-              routerDataFnArgs: [
-                serializeJson(void 0),
-                serializeJson(error)
-              ]
-            };
-          } else {
-            if (typeof trackedPromise._data === "undefined") {
-              throw new Error(`The deferred data for ${key} was not resolved, did you forget to return data from a deferred promise`);
-            }
-            return {
-              key,
-              routerDataFnName: "p",
-              routerDataFnArgs: [
-                serializeJson(trackedPromise._data)
-              ]
-            };
-          }
-        }
-      });
-      return {
-        fnName: `mergeLoaderData`,
-        fnRun: runWindowFnStr,
-        fnArgs: [
-          routeId,
-          deferredKeyPromiseManifests
-        ],
-        fnScriptSrc: "modern-run-window-fn"
-      };
-    });
-    return [
-      initialScript0,
-      initialScript1,
-      initialScripts,
-      deferredDataScripts
-    ];
-  }, []);
-  if (!deferredScripts) {
-    return null;
-  }
-  return /* @__PURE__ */ _jsx(_Fragment, {
-    children: !hydratedRef.current && /* @__PURE__ */ _jsxs(_Fragment, {
-      children: [
-        deferredScripts[0].length !== 0 && /* @__PURE__ */ _jsx("script", {
-          type: "application/json",
-          id: ROUTER_DATA_JSON_ID,
-          nonce: props === null || props === void 0 ? void 0 : props.nonce,
-          suppressHydrationWarning: true,
-          dangerouslySetInnerHTML: {
-            __html: deferredScripts[0]
-          }
-        }),
-        /* @__PURE__ */ _jsx("script", {
-          async: true,
-          nonce: props === null || props === void 0 ? void 0 : props.nonce,
-          "data-script-src": "modern-inline",
-          suppressHydrationWarning: true,
-          dangerouslySetInnerHTML: {
-            __html: deferredScripts[1]
-          }
-        }),
-        deferredScripts[2].map(({ fnName, fnArgs, fnRun, fnScriptSrc }) => /* @__PURE__ */ _jsx("script", {
-          async: true,
-          "data-script-src": fnScriptSrc,
-          "data-fn-name": fnName,
-          "data-fn-args": JSON.stringify(fnArgs),
-          nonce: props === null || props === void 0 ? void 0 : props.nonce,
-          suppressHydrationWarning: true,
-          dangerouslySetInnerHTML: {
-            __html: fnRun
-          }
-        }, fnName))
-      ]
-    })
-  });
-};
-var DeferredDataScripts_node_default = DeferredDataScripts;
-export {
-  DeferredDataScripts_node_default as default
-};