@modern-js/runtime 2.35.1 → 2.37.0

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

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import React, { useContext, useMemo } from "react";
 import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "@modern-js/runtime-utils/router";
 import { RuntimeReactContext } from "../../core";
-export function composeEventHandlers(theirHandler, ourHandler) {
+function composeEventHandlers(theirHandler, ourHandler) {
   return (event) => {
     theirHandler === null || theirHandler === void 0 ? void 0 : theirHandler(event);
     if (!event.defaultPrevented) {
@@ -98,7 +98,8 @@ const getDataHref = (route, pathname, basename) => {
   const url = getRequestUrl(path, id);
   return createDataHref(url.toString());
 };
-const PrefetchPageLinks = ({ pathname }) => {
+const PrefetchPageLinks = ({ path }) => {
+  const { pathname } = path;
   const context = useContext(RuntimeReactContext);
   const { routeManifest, routes } = context;
   const { routeAssets } = routeManifest || {};
@@ -111,11 +112,12 @@ const PrefetchPageLinks = ({ pathname }) => {
   }
   return /* @__PURE__ */ _jsx(PrefetchDataLinks, {
     matches,
-    pathname,
+    path,
     routeManifest
   });
 };
-const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
+const PrefetchDataLinks = ({ matches, path, routeManifest }) => {
+  const { pathname, search, hash } = path;
   const currentMatches = useMatches();
   const basename = useHref("/");
   const dataHrefs = useMemo(() => {
@@ -123,6 +125,21 @@ const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
       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;
@@ -149,7 +166,6 @@ const createPrefetchLink = (Link2) => {
     const isAbsolute = typeof to === "string" && ABSOLUTE_URL_REGEX.test(to);
     const [shouldPrefetch, prefetchHandlers] = usePrefetchBehavior(prefetch, props);
     const resolvedPath = useResolvedPath(to);
-    const { pathname } = resolvedPath;
     return /* @__PURE__ */ _jsxs(_Fragment, {
       children: [
         /* @__PURE__ */ _jsx(Link2, {
@@ -159,7 +175,7 @@ const createPrefetchLink = (Link2) => {
           ...prefetchHandlers
         }),
         shouldPrefetch && __webpack_chunk_load__ && !isAbsolute ? /* @__PURE__ */ _jsx(PrefetchPageLinks, {
-          pathname
+          path: resolvedPath
         }) : null
       ]
     });
@@ -169,4 +185,8 @@ const Link = createPrefetchLink(RouterLink);
 Link.displayName = "Link";
 const NavLink = createPrefetchLink(RouterNavLink);
 NavLink.displayName = "NavLink";
-export { Link, NavLink };
+export {
+  Link,
+  NavLink,
+  composeEventHandlers
+};

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

@@ -1,3 +1,5 @@
 function installGlobals() {
 }
-export { installGlobals };
+export {
+  installGlobals
+};

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

@@ -1,2 +1,4 @@
 import { installGlobals } from "@remix-run/node";
-export { installGlobals };
+export {
+  installGlobals
+};

package/dist/esm-node/router/runtime/fetch.worker.js

@@ -1,3 +1,5 @@
 function installGlobals() {
 }
-export { installGlobals };
+export {
+  installGlobals
+};

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

@@ -1,3 +1,5 @@
 import { createWaterfall } from "@modern-js/plugin";
 const modifyRoutes = createWaterfall();
-export { modifyRoutes };
+export {
+  modifyRoutes
+};

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

@@ -1,15 +1,16 @@
 import { useRouteLoaderData as useRouteData } from "@modern-js/runtime-utils/router";
 import { routerPlugin } from "./plugin";
-export { renderRoutes } from "./utils";
-export default routerPlugin;
-export { modifyRoutes } from "./plugin";
+import { renderRoutes } from "./utils";
+var runtime_default = routerPlugin;
+import { modifyRoutes } from "./plugin";
 export * from "./withRouter";
-export { Link, NavLink } from "./PrefetchLink";
-export const useRouteLoaderData = (routeId) => {
+import { Link, NavLink } from "./PrefetchLink";
+const useRouteLoaderData = (routeId) => {
   const realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
   return useRouteData(realRouteId);
 };
-export {
+import { createShouldRevalidate } from "./shouldRevalidate";
+import {
   createBrowserRouter,
   createHashRouter,
   createMemoryRouter,
@@ -67,3 +68,68 @@ export {
   json,
   redirect
 } from "@modern-js/runtime-utils/router";
+export {
+  Await,
+  BrowserRouter,
+  Form,
+  HashRouter,
+  Link,
+  MemoryRouter,
+  NavLink,
+  Navigate,
+  Outlet,
+  Route,
+  Router,
+  RouterProvider,
+  Routes,
+  ScrollRestoration,
+  createBrowserRouter,
+  createHashRouter,
+  createMemoryRouter,
+  createPath,
+  createRoutesFromChildren,
+  createRoutesFromElements,
+  createSearchParams,
+  createShouldRevalidate,
+  runtime_default as default,
+  defer,
+  generatePath,
+  isRouteErrorResponse,
+  json,
+  matchPath,
+  matchRoutes,
+  modifyRoutes,
+  redirect,
+  renderMatches,
+  renderRoutes,
+  resolvePath,
+  unstable_useBlocker,
+  unstable_usePrompt,
+  useActionData,
+  useAsyncError,
+  useAsyncValue,
+  useBeforeUnload,
+  useFetcher,
+  useFetchers,
+  useFormAction,
+  useHref,
+  useInRouterContext,
+  useLinkClickHandler,
+  useLoaderData,
+  useLocation,
+  useMatch,
+  useMatches,
+  useNavigate,
+  useNavigation,
+  useNavigationType,
+  useOutlet,
+  useOutletContext,
+  useParams,
+  useResolvedPath,
+  useRevalidator,
+  useRouteError,
+  useRouteLoaderData,
+  useRoutes,
+  useSearchParams,
+  useSubmit
+};

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

@@ -6,11 +6,11 @@ import { parsedJSONFromElement } from "@modern-js/runtime-utils/browser";
 import { RuntimeReactContext } from "../../core";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
-export let finalRouteConfig = {
+let finalRouteConfig = {
   routes: []
 };
-export let beforeCreateRouter = true;
-export function modifyRoutes(modifyFunction) {
+let beforeCreateRouter = true;
+function modifyRoutes(modifyFunction) {
   if (beforeCreateRouter) {
     const { routes: originRoutes } = finalRouteConfig;
     const newRoutes = modifyFunction(originRoutes);
@@ -19,7 +19,7 @@ export function modifyRoutes(modifyFunction) {
     console.error("It is not allowed to modify routes config after create router.");
   }
 }
-export const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename = "", routesConfig, createRoutes }) => {
+const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename = "", routesConfig, createRoutes }) => {
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   let routes = [];
   finalRouteConfig = routesConfig;
@@ -155,3 +155,9 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
     }
   };
 };
+export {
+  beforeCreateRouter,
+  finalRouteConfig,
+  modifyRoutes,
+  routerPlugin
+};

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

@@ -23,7 +23,7 @@ function createFetchRequest(req) {
   };
   return new Request(url.href, init);
 }
-export function createFetchHeaders(requestHeaders) {
+function createFetchHeaders(requestHeaders) {
   const headers = new Headers();
   for (const [key, values] of Object.entries(requestHeaders || {})) {
     if (values) {
@@ -38,7 +38,7 @@ export function createFetchHeaders(requestHeaders) {
   }
   return headers;
 }
-export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
+const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
@@ -146,5 +146,10 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
     }
   };
 };
-export const modifyRoutes = () => {
+const modifyRoutes = () => {
+};
+export {
+  createFetchHeaders,
+  modifyRoutes,
+  routerPlugin
 };

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

@@ -0,0 +1,14 @@
+import { ROUTE_MODULES } from "@modern-js/utils/universal/constants";
+const createShouldRevalidate = (routeId) => {
+  return (arg) => {
+    var _window_ROUTE_MODULES, _window;
+    const routeModule = (_window = window) === null || _window === void 0 ? void 0 : (_window_ROUTE_MODULES = _window[ROUTE_MODULES]) === null || _window_ROUTE_MODULES === void 0 ? void 0 : _window_ROUTE_MODULES[routeId];
+    if (routeModule && typeof routeModule.shouldRevalidate === "function") {
+      return routeModule.shouldRevalidate(arg);
+    }
+    return arg.defaultShouldRevalidate;
+  };
+};
+export {
+  createShouldRevalidate
+};

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

@@ -1 +0,0 @@
-export {};

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

@@ -4,7 +4,7 @@ import { ErrorResponse } from "@modern-js/runtime-utils/remix-router";
 import { renderNestedRoute } from "@modern-js/runtime-utils/browser";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
-export function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
+function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
   const Layout = ({ Component, ...props2 }) => {
     const GlobalLayout = globalApp;
     if (!GlobalLayout) {
@@ -42,7 +42,7 @@ export function getRouteComponents(routes, { globalApp, ssrMode, props, reporter
   }, "*"));
   return routeElements;
 }
-export function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
+function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
   if (!routesConfig) {
     return null;
   }
@@ -58,7 +58,7 @@ export function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
   });
   return routeElements;
 }
-export function getLocation(serverContext) {
+function getLocation(serverContext) {
   var _url_replace;
   const { pathname, url } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
   const cleanUrl = url === null || url === void 0 ? void 0 : (_url_replace = url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
@@ -68,12 +68,12 @@ export function getLocation(serverContext) {
   }
   return cleanUrl.substring(index);
 }
-export const urlJoin = (...parts) => {
+const urlJoin = (...parts) => {
   const separator = "/";
   const replace = new RegExp(`${separator}{1,}`, "g");
   return standardSlash(parts.join(separator).replace(replace, separator));
 };
-export function standardSlash(str) {
+function standardSlash(str) {
   let addr = str;
   if (!addr || typeof addr !== "string") {
     return addr;
@@ -89,7 +89,7 @@ export function standardSlash(str) {
   }
   return addr;
 }
-export function serializeErrors(errors) {
+function serializeErrors(errors) {
   if (!errors) {
     return null;
   }
@@ -113,7 +113,7 @@ export function serializeErrors(errors) {
   }
   return serialized;
 }
-export function deserializeErrors(errors) {
+function deserializeErrors(errors) {
   if (!errors) {
     return null;
   }
@@ -132,3 +132,12 @@ export function deserializeErrors(errors) {
   }
   return serialized;
 }
+export {
+  deserializeErrors,
+  getLocation,
+  getRouteComponents,
+  renderRoutes,
+  serializeErrors,
+  standardSlash,
+  urlJoin
+};

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useLocation, useNavigate, useParams } from "@modern-js/runtime-utils/router";
-export const withRouter = (Component) => {
+const withRouter = (Component) => {
   return (props) => {
     const location = useLocation();
     const params = useParams();
@@ -13,3 +13,6 @@ export const withRouter = (Component) => {
     });
   };
 };
+export {
+  withRouter
+};

package/dist/esm-node/runtimeContext.js

@@ -1,3 +1,7 @@
 import { createContext } from "react";
-export const RuntimeReactContext = createContext({});
-export const ServerRouterContext = createContext({});
+const RuntimeReactContext = createContext({});
+const ServerRouterContext = createContext({});
+export {
+  RuntimeReactContext,
+  ServerRouterContext
+};

package/dist/esm-node/ssr/cli/babel-plugin-ssr-loader-id.js

@@ -1,110 +1,119 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 import crypto from "crypto";
-import { Buffer } from "buffer";
+import { Buffer as Buffer2 } from "buffer";
 import * as t from "@babel/types";
 import { get } from "@modern-js/utils/lodash";
-const RUNTIME_PACKAGE_NAMES = [
-  "@modern-js/runtime"
-];
-const FUNCTION_USE_LOADER_NAME = "useLoader";
-function getHash(filepath) {
-  const cwd = process.cwd();
-  const point = filepath.indexOf(cwd);
-  let relativePath = filepath;
-  if (point !== -1) {
-    relativePath = filepath.substring(point + cwd.length);
-  }
-  const fileBuf = Buffer.from(relativePath);
-  const fsHash = crypto.createHash("md5");
-  const md5 = fsHash.update(fileBuf).digest("hex");
-  return md5;
-}
-function getUseLoaderPath(path, calleeName) {
-  const { node } = path;
-  if (!calleeName || node.callee.name !== calleeName) {
-    return false;
-  }
-  const arg1 = get(node, "arguments.0");
-  if (t.isFunction(arg1) || t.isFunctionExpression(arg1) || t.isArrowFunctionExpression(arg1) || t.isIdentifier(arg1) || t.isCallExpression(arg1) || t.isMemberExpression(arg1)) {
-    const loaderPath = path.get("arguments.0");
-    if (isDuplicateInnerLoader(loaderPath)) {
-      return false;
-    } else {
-      return loaderPath;
-    }
-  }
-  console.warn("useLoader 中 loaderId 生成失败，请检查 useLoader");
-  throw path.buildCodeFrameError(`
-    please check the usage of ${path.node.name}
-  `);
-}
-function isDuplicateInnerLoader(path) {
-  const { node } = path;
-  if (t.isFunctionExpression(node.callee)) {
-    if (t.isBlockStatement(node.callee.body)) {
-      if (get(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && get(node.callee.body, "body.2.argument.name") === "innerLoader") {
-        return true;
+var require_babel_plugin_ssr_loader_id = __commonJS({
+  "src/ssr/cli/babel-plugin-ssr-loader-id.ts"(exports, module) {
+    const RUNTIME_PACKAGE_NAMES = [
+      "@modern-js/runtime"
+    ];
+    const FUNCTION_USE_LOADER_NAME = "useLoader";
+    function getHash(filepath) {
+      const cwd = process.cwd();
+      const point = filepath.indexOf(cwd);
+      let relativePath = filepath;
+      if (point !== -1) {
+        relativePath = filepath.substring(point + cwd.length);
       }
+      const fileBuf = Buffer2.from(relativePath);
+      const fsHash = crypto.createHash("md5");
+      const md5 = fsHash.update(fileBuf).digest("hex");
+      return md5;
     }
-  }
-  return false;
-}
-function getSelfRunLoaderExpression(loaderExpression, id) {
-  return t.callExpression(t.functionExpression(null, [], t.blockStatement([
-    t.variableDeclaration("var", [
-      t.variableDeclarator(t.identifier("innerLoader"), loaderExpression)
-    ]),
-    t.expressionStatement(t.assignmentExpression("=", t.memberExpression(t.identifier("innerLoader"), t.identifier("id")), t.stringLiteral(id))),
-    t.returnStatement(t.identifier("innerLoader"))
-  ])), []);
-}
-module.exports = function() {
-  let useLoader = null;
-  let hash = "";
-  let index = 0;
-  function genId() {
-    return `${hash}_${index++}`;
-  }
-  return {
-    name: "babel-plugin-ssr-loader-id",
-    pre() {
-      index = 0;
-      useLoader = null;
-      hash = "";
-    },
-    visitor: {
-      ImportDeclaration(path, state) {
-        if (useLoader) {
-          return false;
-        }
-        if (!RUNTIME_PACKAGE_NAMES.includes(get(path, "node.source.value"))) {
+    function getUseLoaderPath(path, calleeName) {
+      const { node } = path;
+      if (!calleeName || node.callee.name !== calleeName) {
+        return false;
+      }
+      const arg1 = get(node, "arguments.0");
+      if (t.isFunction(arg1) || t.isFunctionExpression(arg1) || t.isArrowFunctionExpression(arg1) || t.isIdentifier(arg1) || t.isCallExpression(arg1) || t.isMemberExpression(arg1)) {
+        const loaderPath = path.get("arguments.0");
+        if (isDuplicateInnerLoader(loaderPath)) {
           return false;
+        } else {
+          return loaderPath;
         }
-        hash = getHash(state.file.opts.filename);
-        get(path, "node.specifiers", []).forEach(({ imported, local }) => {
-          if (!imported) {
-            throw path.buildCodeFrameError(`please \`import { useLoader } from ${RUNTIME_PACKAGE_NAMES[0]}\``);
-          }
-          if (!useLoader && imported.name === FUNCTION_USE_LOADER_NAME) {
-            useLoader = local.name;
-          }
-        });
-        return false;
-      },
-      CallExpression(path) {
-        let loaderPath = getUseLoaderPath(path, useLoader);
-        if (loaderPath) {
-          if (!Array.isArray(loaderPath)) {
-            loaderPath = [
-              loaderPath
-            ];
+      }
+      console.warn("useLoader 中 loaderId 生成失败，请检查 useLoader");
+      throw path.buildCodeFrameError(`
+    please check the usage of ${path.node.name}
+  `);
+    }
+    function isDuplicateInnerLoader(path) {
+      const { node } = path;
+      if (t.isFunctionExpression(node.callee)) {
+        if (t.isBlockStatement(node.callee.body)) {
+          if (get(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && get(node.callee.body, "body.2.argument.name") === "innerLoader") {
+            return true;
           }
-          loaderPath.forEach((p) => {
-            p.replaceWith(getSelfRunLoaderExpression(p.node, genId()));
-          });
-          return false;
         }
-        return false;
       }
+      return false;
     }
-  };
-};
+    function getSelfRunLoaderExpression(loaderExpression, id) {
+      return t.callExpression(t.functionExpression(null, [], t.blockStatement([
+        t.variableDeclaration("var", [
+          t.variableDeclarator(t.identifier("innerLoader"), loaderExpression)
+        ]),
+        t.expressionStatement(t.assignmentExpression("=", t.memberExpression(t.identifier("innerLoader"), t.identifier("id")), t.stringLiteral(id))),
+        t.returnStatement(t.identifier("innerLoader"))
+      ])), []);
+    }
+    module.exports = function() {
+      let useLoader = null;
+      let hash = "";
+      let index = 0;
+      function genId() {
+        return `${hash}_${index++}`;
+      }
+      return {
+        name: "babel-plugin-ssr-loader-id",
+        pre() {
+          index = 0;
+          useLoader = null;
+          hash = "";
+        },
+        visitor: {
+          ImportDeclaration(path, state) {
+            if (useLoader) {
+              return false;
+            }
+            if (!RUNTIME_PACKAGE_NAMES.includes(get(path, "node.source.value"))) {
+              return false;
+            }
+            hash = getHash(state.file.opts.filename);
+            get(path, "node.specifiers", []).forEach(({ imported, local }) => {
+              if (!imported) {
+                throw path.buildCodeFrameError(`please \`import { useLoader } from ${RUNTIME_PACKAGE_NAMES[0]}\``);
+              }
+              if (!useLoader && imported.name === FUNCTION_USE_LOADER_NAME) {
+                useLoader = local.name;
+              }
+            });
+            return false;
+          },
+          CallExpression(path) {
+            let loaderPath = getUseLoaderPath(path, useLoader);
+            if (loaderPath) {
+              if (!Array.isArray(loaderPath)) {
+                loaderPath = [
+                  loaderPath
+                ];
+              }
+              loaderPath.forEach((p) => {
+                p.replaceWith(getSelfRunLoaderExpression(p.node, genId()));
+              });
+              return false;
+            }
+            return false;
+          }
+        }
+      };
+    };
+  }
+});
+export default require_babel_plugin_ssr_loader_id();

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

@@ -20,7 +20,7 @@ const checkUseStringSSR = (config) => {
   const { output } = config;
   return Boolean(output === null || output === void 0 ? void 0 : output.ssg) || hasStringSSREntry(config);
 };
-export const ssrPlugin = () => ({
+const ssrPlugin = () => ({
   name: "@modern-js/plugin-ssr",
   required: [
     "@modern-js/runtime"
@@ -161,4 +161,8 @@ export const ssrPlugin = () => ({
     };
   }
 });
-export default ssrPlugin;
+var cli_default = ssrPlugin;
+export {
+  cli_default as default,
+  ssrPlugin
+};