@modern-js/runtime 2.15.1-alpha.2 → 2.16.0

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

@@ -1,106 +1,91 @@
-import {
-  getEntryOptions,
-  createRuntimeExportsUtils,
-  PLUGIN_SCHEMAS,
-  isRouterV5 as isV5
-} from "@modern-js/utils";
+import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS, isRouterV5 as isV5 } from "@modern-js/utils";
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
-var cli_default = () => ({
-  name: "@modern-js/plugin-router",
-  required: ["@modern-js/runtime"],
-  setup: (api) => {
-    const runtimeConfigMap = /* @__PURE__ */ new Map();
-    let pluginsExportsUtils;
-    return {
-      config() {
-        const appContext = api.useAppContext();
-        pluginsExportsUtils = createRuntimeExportsUtils(
-          appContext.internalDirectory,
-          "plugins"
-        );
-        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/
-            ],
-            alias: {
-              "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
+export default () => {
+  return {
+    name: "@modern-js/plugin-router",
+    required: [
+      "@modern-js/runtime"
+    ],
+    setup: (api) => {
+      const runtimeConfigMap = /* @__PURE__ */ new Map();
+      let pluginsExportsUtils;
+      return {
+        config() {
+          const appContext = api.useAppContext();
+          pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
+          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/
+              ],
+              alias: {
+                "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
+              }
             }
+          };
+        },
+        validateSchema() {
+          return PLUGIN_SCHEMAS["@modern-js/plugin-router"];
+        },
+        modifyEntryImports({ entrypoint, imports }) {
+          const { entryName, fileSystemRoutes } = entrypoint;
+          const userConfig = api.useResolvedConfigContext();
+          const { packageName } = api.useAppContext();
+          const runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+          runtimeConfigMap.set(entryName, runtimeConfig);
+          if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) {
+            if (!isV5(userConfig)) {
+              imports.push({
+                value: "@modern-js/runtime/plugins",
+                specifiers: [
+                  {
+                    imported: PLUGIN_IDENTIFIER
+                  }
+                ]
+              });
+            }
+          } else if (fileSystemRoutes) {
+            throw new Error(`should enable runtime.router for entry ${entryName}`);
           }
-        };
-      },
-      validateSchema() {
-        return PLUGIN_SCHEMAS["@modern-js/plugin-router"];
-      },
-      modifyEntryImports({ entrypoint, imports }) {
-        const { entryName, fileSystemRoutes } = entrypoint;
-        const userConfig = api.useResolvedConfigContext();
-        const { packageName } = api.useAppContext();
-        const runtimeConfig = getEntryOptions(
-          entryName,
-          userConfig.runtime,
-          userConfig.runtimeByEntries,
-          packageName
-        );
-        runtimeConfigMap.set(entryName, runtimeConfig);
-        if (runtimeConfig == null ? void 0 : runtimeConfig.router) {
-          if (!isV5(userConfig)) {
-            imports.push({
-              value: "@modern-js/runtime/plugins",
-              specifiers: [{ imported: PLUGIN_IDENTIFIER }]
+          return {
+            entrypoint,
+            imports
+          };
+        },
+        modifyEntryRuntimePlugins({ entrypoint, plugins }) {
+          const { entryName, fileSystemRoutes } = entrypoint;
+          const { serverRoutes } = api.useAppContext();
+          const userConfig = api.useResolvedConfigContext();
+          const runtimeConfig = runtimeConfigMap.get(entryName);
+          if (runtimeConfig.router && !isV5(userConfig)) {
+            const serverBase = serverRoutes.filter((route) => route.entryName === entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
+            plugins.push({
+              name: PLUGIN_IDENTIFIER,
+              options: JSON.stringify({
+                serverBase,
+                ...runtimeConfig.router,
+                routesConfig: fileSystemRoutes ? `{ ${ROUTES_IDENTIFIER}, globalApp: App }` : void 0
+              }).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
             });
           }
-        } else if (fileSystemRoutes) {
-          throw new Error(
-            `should enable runtime.router for entry ${entryName}`
-          );
-        }
-        return {
-          entrypoint,
-          imports
-        };
-      },
-      modifyEntryRuntimePlugins({ entrypoint, plugins }) {
-        const { entryName, fileSystemRoutes } = entrypoint;
-        const { serverRoutes } = api.useAppContext();
-        const userConfig = api.useResolvedConfigContext();
-        const runtimeConfig = runtimeConfigMap.get(entryName);
-        if (runtimeConfig.router && !isV5(userConfig)) {
-          const serverBase = serverRoutes.filter((route) => route.entryName === entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
-          plugins.push({
-            name: PLUGIN_IDENTIFIER,
-            options: JSON.stringify({
-              serverBase,
-              ...runtimeConfig.router,
-              routesConfig: fileSystemRoutes ? `{ ${ROUTES_IDENTIFIER}, globalApp: App }` : void 0
-            }).replace(
-              /"routesConfig"\s*:\s*"((\S|\s)+)"/g,
-              '"routesConfig": $1,'
-            )
-          });
-        }
-        return {
-          entrypoint,
-          plugins
-        };
-      },
-      addRuntimeExports() {
-        const userConfig = api.useResolvedConfigContext();
-        if (!isV5(userConfig)) {
-          pluginsExportsUtils.addExport(
-            `export { default as router } from '@modern-js/runtime/router'`
-          );
+          return {
+            entrypoint,
+            plugins
+          };
+        },
+        addRuntimeExports() {
+          const userConfig = api.useResolvedConfigContext();
+          if (!isV5(userConfig)) {
+            pluginsExportsUtils.addExport(`export { default as router } from '@modern-js/runtime/router'`);
+          }
         }
-      }
-    };
-  }
-});
-export {
-  cli_default as default
+      };
+    }
+  };
 };

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

@@ -1,7 +1,3 @@
-import { default as default2 } from "./runtime";
-import { default as default3 } from "./runtime";
+export { default as router } from "./runtime";
+export { default } from "./runtime";
 export * from "./runtime";
-export {
-  default3 as default,
-  default2 as router
-};

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

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

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

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

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

@@ -1,10 +1,6 @@
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Suspense, useEffect, useRef, useMemo, useContext } from "react";
-import {
-  Await,
-  UNSAFE_DataRouterContext as DataRouterContext,
-  useAsyncError
-} from "react-router-dom";
+import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "react-router-dom";
 import { serializeJson } from "@modern-js/utils/universal/serialize";
 import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { serializeErrors } from "./utils";
@@ -39,20 +35,12 @@ const DeferredDataScripts = () => {
       const { deferredKeys } = deferredData;
       const deferredKeyPromiseStr = deferredKeys.map((key) => {
         if (pendingKeys.has(key)) {
-          deferredDataScripts.push(
-            /* @__PURE__ */ jsx(
-              DeferredDataScript,
-              {
-                data: deferredData.data[key],
-                dataKey: key,
-                routeId
-              },
-              `${routeId} | ${key}`
-            )
-          );
-          return `${JSON.stringify(key)}: _ROUTER_DATA.s(${JSON.stringify(
+          deferredDataScripts.push(/* @__PURE__ */ _jsx(DeferredDataScript, {
+            data: deferredData.data[key],
+            dataKey: key,
             routeId
-          )},${JSON.stringify(key)}) `;
+          }, `${routeId} | ${key}`));
+          return `${JSON.stringify(key)}: _ROUTER_DATA.s(${JSON.stringify(routeId)},${JSON.stringify(key)}) `;
         } else {
           const trackedPromise = deferredData.data[key];
           if (typeof trackedPromise._error !== "undefined") {
@@ -60,89 +48,67 @@ const DeferredDataScripts = () => {
               message: trackedPromise._error.message,
               stack: process.env.NODE_ENV !== "production" ? trackedPromise._error.stack : void 0
             };
-            return `${JSON.stringify(
-              key
-            )}: _ROUTER_DATA.p(${void 0}, ${serializeJson(error)})`;
+            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${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`
-              );
+              throw new Error(`The deferred data for ${key} was not resolved, did you forget to return data from a deferred promise`);
             }
-            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${serializeJson(
-              trackedPromise._data
-            )})`;
+            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${serializeJson(trackedPromise._data)})`;
           }
         }
       }).join(",\n");
-      return `Object.assign(_ROUTER_DATA.loaderData[${JSON.stringify(
-        routeId
-      )}], {${deferredKeyPromiseStr}});`;
+      return `Object.assign(_ROUTER_DATA.loaderData[${JSON.stringify(routeId)}], {${deferredKeyPromiseStr}});`;
     }).join("\n");
-    return [initialScripts, deferredDataScripts];
+    return [
+      initialScripts,
+      deferredDataScripts
+    ];
   }, []);
   if (!deferredScripts) {
     return null;
   }
-  return /* @__PURE__ */ jsxs(Fragment, { children: [
-    !hydratedRef.current && /* @__PURE__ */ jsx(
-      "script",
-      {
+  return /* @__PURE__ */ _jsxs(_Fragment, {
+    children: [
+      !hydratedRef.current && /* @__PURE__ */ _jsx("script", {
         async: true,
         suppressHydrationWarning: true,
-        dangerouslySetInnerHTML: { __html: deferredScripts[0] }
-      }
-    ),
-    !hydratedRef.current && deferredScripts[1],
-    JSX_SHELL_STREAM_END_MARK
-  ] });
+        dangerouslySetInnerHTML: {
+          __html: deferredScripts[0]
+        }
+      }),
+      !hydratedRef.current && deferredScripts[1],
+      JSX_SHELL_STREAM_END_MARK
+    ]
+  });
 };
-const DeferredDataScript = ({
-  data,
-  routeId,
-  dataKey
-}) => {
-  return /* @__PURE__ */ jsx(Suspense, { children: typeof document === "undefined" && data && dataKey && routeId ? /* @__PURE__ */ jsx(
-    Await,
-    {
+const DeferredDataScript = ({ data, routeId, dataKey }) => {
+  return /* @__PURE__ */ _jsx(Suspense, {
+    children: typeof document === "undefined" && data && dataKey && routeId ? /* @__PURE__ */ _jsx(Await, {
       resolve: data,
-      errorElement: /* @__PURE__ */ jsx(ErrorDeferredDataScript, { routeId, dataKey }),
-      children: (data2) => /* @__PURE__ */ jsx(
-        "script",
-        {
-          async: true,
-          suppressHydrationWarning: true,
-          dangerouslySetInnerHTML: {
-            __html: `_ROUTER_DATA.r(${JSON.stringify(
-              routeId
-            )}, ${JSON.stringify(dataKey)}, ${serializeJson(data2)});`
-          }
+      errorElement: /* @__PURE__ */ _jsx(ErrorDeferredDataScript, {
+        routeId,
+        dataKey
+      }),
+      children: (data2) => /* @__PURE__ */ _jsx("script", {
+        async: true,
+        suppressHydrationWarning: true,
+        dangerouslySetInnerHTML: {
+          __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${serializeJson(data2)});`
         }
-      )
-    }
-  ) : null });
+      })
+    }) : null
+  });
 };
-const ErrorDeferredDataScript = ({
-  routeId,
-  dataKey
-}) => {
+const ErrorDeferredDataScript = ({ routeId, dataKey }) => {
   const error = useAsyncError();
-  return /* @__PURE__ */ jsx(
-    "script",
-    {
-      suppressHydrationWarning: true,
-      dangerouslySetInnerHTML: {
-        __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(
-          dataKey
-        )}, ${void 0}, ${serializeJson({
-          message: error.message,
-          stack: error.stack
-        })});`
-      }
+  return /* @__PURE__ */ _jsx("script", {
+    suppressHydrationWarning: true,
+    dangerouslySetInnerHTML: {
+      __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${void 0}, ${serializeJson({
+        message: error.message,
+        stack: error.stack
+      })});`
     }
-  );
-};
-var DeferredDataScripts_node_default = DeferredDataScripts;
-export {
-  DeferredDataScripts_node_default as default
+  });
 };
+export default DeferredDataScripts;

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

@@ -1,17 +1,10 @@
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useContext, useMemo } from "react";
-import {
-  Link as RouterLink,
-  matchRoutes,
-  useResolvedPath,
-  useHref,
-  useMatches,
-  NavLink as RouterNavLink
-} from "react-router-dom";
+import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "react-router-dom";
 import { RuntimeReactContext } from "../../core";
-function composeEventHandlers(theirHandler, ourHandler) {
+export function composeEventHandlers(theirHandler, ourHandler) {
   return (event) => {
-    theirHandler == null ? void 0 : theirHandler(event);
+    theirHandler === null || theirHandler === void 0 ? void 0 : theirHandler(event);
     if (!event.defaultPrevented) {
       ourHandler(event);
     }
@@ -26,7 +19,9 @@ function usePrefetchBehavior(prefetch, theirElementProps) {
     if (prefetch === "render") {
       setShouldPrefetch(true);
     }
-  }, [prefetch]);
+  }, [
+    prefetch
+  ]);
   const setIntent = () => {
     if (prefetch === "intent") {
       setMaybePrefetch(true);
@@ -47,7 +42,9 @@ function usePrefetchBehavior(prefetch, theirElementProps) {
         clearTimeout(id);
       };
     }
-  }, [maybePrefetch]);
+  }, [
+    maybePrefetch
+  ]);
   return [
     shouldPrefetch,
     {
@@ -72,11 +69,9 @@ async function loadRouteModule(route, routeAssets) {
     return;
   }
   try {
-    await Promise.all(
-      chunkIds.map((chunkId) => {
-        return __webpack_chunk_load__ == null ? void 0 : __webpack_chunk_load__(String(chunkId));
-      })
-    );
+    await Promise.all(chunkIds.map((chunkId) => {
+      return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(String(chunkId));
+    }));
   } catch (error) {
     console.error(error);
   }
@@ -91,7 +86,11 @@ const getRequestUrl = (pathname, routeId) => {
   return url;
 };
 const createDataHref = (href) => {
-  return /* @__PURE__ */ jsx("link", { rel: "prefetch", as: "fetch", href }, href);
+  return /* @__PURE__ */ _jsx("link", {
+    rel: "prefetch",
+    as: "fetch",
+    href
+  }, href);
 };
 const getDataHref = (route, pathname, basename) => {
   const { id } = route;
@@ -105,25 +104,22 @@ const PrefetchPageLinks = ({ pathname }) => {
   const { routeAssets } = routeManifest;
   const matches = Array.isArray(routes) ? matchRoutes(routes, pathname) : [];
   if (Array.isArray(matches)) {
-    matches == null ? void 0 : matches.forEach((match) => loadRouteModule(match.route, 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,
-      pathname,
-      routeManifest
-    }
-  );
+  return /* @__PURE__ */ _jsx(PrefetchDataLinks, {
+    matches,
+    pathname,
+    routeManifest
+  });
 };
 const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
   const currentMatches = useMatches();
   const basename = useHref("/");
   const dataHrefs = useMemo(() => {
-    return matches == null ? void 0 : matches.filter((match, index) => {
+    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;
       }
@@ -139,40 +135,38 @@ const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
       }
       return false;
     }).map((match) => getDataHref(match.route, pathname, basename));
-  }, [matches, pathname, routeManifest]);
-  return /* @__PURE__ */ jsx(Fragment, { children: dataHrefs });
+  }, [
+    matches,
+    pathname,
+    routeManifest
+  ]);
+  return /* @__PURE__ */ _jsx(_Fragment, {
+    children: dataHrefs
+  });
 };
 const createPrefetchLink = (Link2) => {
-  return 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);
-      const { pathname } = resolvedPath;
-      return /* @__PURE__ */ jsxs(Fragment, { children: [
-        /* @__PURE__ */ jsx(
-          Link2,
-          {
-            ref: forwardedRef,
-            to,
-            ...props,
-            ...prefetchHandlers
-          }
-        ),
-        shouldPrefetch && __webpack_chunk_load__ && !isAbsolute ? /* @__PURE__ */ jsx(PrefetchPageLinks, { pathname }) : null
-      ] });
-    }
-  );
+  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);
+    const { pathname } = resolvedPath;
+    return /* @__PURE__ */ _jsxs(_Fragment, {
+      children: [
+        /* @__PURE__ */ _jsx(Link2, {
+          ref: forwardedRef,
+          to,
+          ...props,
+          ...prefetchHandlers
+        }),
+        shouldPrefetch && __webpack_chunk_load__ && !isAbsolute ? /* @__PURE__ */ _jsx(PrefetchPageLinks, {
+          pathname
+        }) : null
+      ]
+    });
+  });
 };
 const Link = createPrefetchLink(RouterLink);
 Link.displayName = "Link";
 const NavLink = createPrefetchLink(RouterNavLink);
 NavLink.displayName = "NavLink";
-export {
-  Link,
-  NavLink,
-  composeEventHandlers
-};
+export { Link, NavLink };

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

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

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

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

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

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

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

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