@modern-js/runtime 2.69.7 → 3.0.0-alpha.1

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
-};

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

@@ -1,192 +0,0 @@
-"use client";
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { Link as RouterLink, NavLink as RouterNavLink, matchRoutes, useHref, useMatches, useResolvedPath } from "@modern-js/runtime-utils/router";
-import React, { useContext, useMemo } from "react";
-import { RuntimeReactContext } from "../../core";
-function composeEventHandlers(theirHandler, ourHandler) {
-  return (event) => {
-    theirHandler === null || theirHandler === void 0 ? void 0 : theirHandler(event);
-    if (!event.defaultPrevented) {
-      ourHandler(event);
-    }
-  };
-}
-const ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
-function usePrefetchBehavior(prefetch, theirElementProps) {
-  const [maybePrefetch, setMaybePrefetch] = React.useState(false);
-  const [shouldPrefetch, setShouldPrefetch] = React.useState(false);
-  const { onFocus, onBlur, onMouseEnter, onMouseLeave, onTouchStart } = theirElementProps;
-  React.useEffect(() => {
-    if (prefetch === "render") {
-      setShouldPrefetch(true);
-    }
-  }, [
-    prefetch
-  ]);
-  const setIntent = () => {
-    if (prefetch === "intent") {
-      setMaybePrefetch(true);
-    }
-  };
-  const cancelIntent = () => {
-    if (prefetch === "intent") {
-      setMaybePrefetch(false);
-      setShouldPrefetch(false);
-    }
-  };
-  React.useEffect(() => {
-    if (maybePrefetch) {
-      const id = setTimeout(() => {
-        setShouldPrefetch(true);
-      }, 100);
-      return () => {
-        clearTimeout(id);
-      };
-    }
-  }, [
-    maybePrefetch
-  ]);
-  return [
-    shouldPrefetch,
-    {
-      onFocus: composeEventHandlers(onFocus, setIntent),
-      onBlur: composeEventHandlers(onBlur, cancelIntent),
-      onMouseEnter: composeEventHandlers(onMouseEnter, setIntent),
-      onMouseLeave: composeEventHandlers(onMouseLeave, cancelIntent),
-      onTouchStart: composeEventHandlers(onTouchStart, setIntent)
-    }
-  ];
-}
-async function loadRouteModule(route, routeAssets) {
-  const routeId = route.id;
-  if (!routeId) {
-    return;
-  }
-  if (!routeAssets[routeId]) {
-    return;
-  }
-  const { chunkIds } = routeAssets[routeId];
-  if (!chunkIds) {
-    return;
-  }
-  try {
-    await Promise.all(chunkIds.map((chunkId) => {
-      return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(chunkId);
-    }));
-  } catch (error) {
-    console.error(error);
-  }
-}
-const getRequestUrl = (pathname, routeId) => {
-  const LOADER_ID_PARAM = "__loader";
-  const DIRECT_PARAM = "__ssrDirect";
-  const { protocol, host } = window.location;
-  const url = new URL(pathname, `${protocol}//${host}`);
-  url.searchParams.append(LOADER_ID_PARAM, routeId);
-  url.searchParams.append(DIRECT_PARAM, "true");
-  return url;
-};
-const createDataHref = (href) => {
-  return /* @__PURE__ */ _jsx("link", {
-    rel: "prefetch",
-    as: "fetch",
-    href
-  }, href);
-};
-const getDataHref = (route, pathname, basename) => {
-  const { id } = route;
-  const path = basename === "/" ? pathname : `${basename}${pathname}`;
-  const url = getRequestUrl(path, id);
-  return createDataHref(url.toString());
-};
-const PrefetchPageLinks = ({ path }) => {
-  const { pathname } = path;
-  const context = useContext(RuntimeReactContext);
-  const { routeManifest, routes } = context;
-  const { routeAssets } = routeManifest || {};
-  const matches = Array.isArray(routes) ? matchRoutes(routes, pathname) : [];
-  if (Array.isArray(matches) && routeAssets) {
-    matches === null || matches === void 0 ? void 0 : matches.forEach((match) => loadRouteModule(match.route, routeAssets));
-  }
-  if (!window._SSR_DATA) {
-    return null;
-  }
-  return /* @__PURE__ */ _jsx(PrefetchDataLinks, {
-    matches,
-    path,
-    routeManifest
-  });
-};
-const PrefetchDataLinks = ({ matches, path, routeManifest }) => {
-  const { pathname, search, hash } = path;
-  const currentMatches = useMatches();
-  const basename = useHref("/");
-  const dataHrefs = useMemo(() => {
-    return matches === null || matches === void 0 ? void 0 : matches.filter((match, index) => {
-      if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
-        return false;
-      }
-      if (match.route.shouldRevalidate) {
-        var _currentMatches_;
-        const currentUrl = new URL(location.pathname + location.search + location.hash, window.origin);
-        const nextUrl = new URL(pathname + search + hash, window.origin);
-        const shouldLoad = match.route.shouldRevalidate({
-          currentUrl,
-          currentParams: ((_currentMatches_ = currentMatches[0]) === null || _currentMatches_ === void 0 ? void 0 : _currentMatches_.params) || {},
-          nextUrl,
-          nextParams: match.params,
-          defaultShouldRevalidate: true
-        });
-        if (typeof shouldLoad === "boolean") {
-          return shouldLoad;
-        }
-      }
-      const currentMatch = currentMatches[index];
-      if (!currentMatch || currentMatch.id !== match.route.id) {
-        return true;
-      }
-      if (currentMatch.pathname !== match.pathname) {
-        return true;
-      }
-      if (currentMatch.pathname.endsWith("*") && currentMatch.params["*"] !== match.params["*"]) {
-        return true;
-      }
-      return false;
-    }).map((match) => getDataHref(match.route, pathname, basename));
-  }, [
-    matches,
-    pathname,
-    routeManifest
-  ]);
-  return /* @__PURE__ */ _jsx(_Fragment, {
-    children: dataHrefs
-  });
-};
-const createPrefetchLink = (Link2) => {
-  return /* @__PURE__ */ React.forwardRef(({ to, prefetch = "none", ...props }, forwardedRef) => {
-    const isAbsolute = typeof to === "string" && ABSOLUTE_URL_REGEX.test(to);
-    const [shouldPrefetch, prefetchHandlers] = usePrefetchBehavior(prefetch, props);
-    const resolvedPath = useResolvedPath(to);
-    return /* @__PURE__ */ _jsxs(_Fragment, {
-      children: [
-        /* @__PURE__ */ _jsx(Link2, {
-          ref: forwardedRef,
-          to,
-          ...props,
-          ...prefetchHandlers
-        }),
-        shouldPrefetch && __webpack_chunk_load__ && !isAbsolute ? /* @__PURE__ */ _jsx(PrefetchPageLinks, {
-          path: resolvedPath
-        }) : null
-      ]
-    });
-  });
-};
-const Link = createPrefetchLink(RouterLink);
-Link.displayName = "Link";
-const NavLink = createPrefetchLink(RouterNavLink);
-NavLink.displayName = "NavLink";
-export {
-  Link,
-  NavLink
-};

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

@@ -1,7 +0,0 @@
-import { createSyncHook } from "@modern-js/plugin-v2";
-const modifyRoutes = createSyncHook();
-const onBeforeCreateRoutes = createSyncHook();
-export {
-  modifyRoutes,
-  onBeforeCreateRoutes
-};

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

@@ -1,17 +0,0 @@
-import { useRouteLoaderData as useRouteData } from "@modern-js/runtime-utils/router";
-export * from "@modern-js/runtime-utils/router";
-import { Link, NavLink } from "./PrefetchLink";
-const useRouteLoaderData = (routeId) => {
-  const realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
-  return useRouteData(realRouteId);
-};
-import { createShouldRevalidate, handleRouteModule, handleRouteModuleError } from "./routeModule";
-export * from "./withRouter";
-export {
-  Link,
-  NavLink,
-  createShouldRevalidate,
-  handleRouteModule,
-  handleRouteModuleError,
-  useRouteLoaderData
-};

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

@@ -1,10 +0,0 @@
-import { routerPlugin } from "./plugin";
-var internal_default = routerPlugin;
-import { renderRoutes } from "./utils";
-import { modifyRoutes } from "./plugin";
-export {
-  internal_default as default,
-  modifyRoutes,
-  renderRoutes,
-  routerPlugin
-};