@modern-js/runtime 2.4.1-alpha.1 → 2.5.0-alpha.0

package/dist/{js/node/router/runtime/index.js → cjs/router/index.node.js}

@@ -16,18 +16,16 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var runtime_exports = {};
-__export(runtime_exports, {
-  default: () => runtime_default,
-  modifyRoutes: () => import_plugin2.modifyRoutes
+var index_node_exports = {};
+__export(index_node_exports, {
+  default: () => import_plugin2.routerPlugin,
+  router: () => import_plugin.routerPlugin
 });
-module.exports = __toCommonJS(runtime_exports);
-var import_plugin = require("./plugin");
-var import_plugin2 = require("./plugin");
-__reExport(runtime_exports, require("react-router-dom"), module.exports);
-__reExport(runtime_exports, require("./withRouter"), module.exports);
-var runtime_default = import_plugin.routerPlugin;
+module.exports = __toCommonJS(index_node_exports);
+var import_plugin = require("./runtime/plugin.node");
+var import_plugin2 = require("./runtime/plugin.node");
+__reExport(index_node_exports, require("./runtime"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  modifyRoutes
+  router
 });

package/dist/cjs/router/runtime/DeferredDataScripts.js

@@ -0,0 +1,148 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var DeferredDataScripts_exports = {};
+__export(DeferredDataScripts_exports, {
+  default: () => DeferredDataScripts_default
+});
+module.exports = __toCommonJS(DeferredDataScripts_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_react = require("react");
+var import_react_router_dom = require("react-router-dom");
+var import_serialize = require("@modern-js/utils/serialize");
+var import_common = require("../../common");
+const setupFnStr = `function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};`;
+const resolveFnStr = `function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};`;
+const preResolvedFnStr = `function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resovle(e)};`;
+const DeferredDataScripts = () => {
+  const context = (0, import_react.useContext)(import_react_router_dom.UNSAFE_DataRouterContext);
+  const { staticContext } = context || {};
+  const hydratedRef = (0, import_react.useRef)(false);
+  (0, import_react.useEffect)(() => {
+    hydratedRef.current = true;
+  }, []);
+  const deferredScripts = (0, import_react.useMemo)(() => {
+    const activeDeferreds = (staticContext == null ? void 0 : staticContext.activeDeferreds) || [];
+    const _ROUTER_DATA = {
+      loaderData: staticContext == null ? void 0 : staticContext.loaderData
+    };
+    let initialScripts = [
+      `_ROUTER_DATA = ${(0, import_serialize.serializeJson)(_ROUTER_DATA)};`,
+      `_ROUTER_DATA.s = ${setupFnStr}`,
+      `_ROUTER_DATA.r = ${resolveFnStr}`,
+      `_ROUTER_DATA.p = ${preResolvedFnStr}`
+    ].join("\n");
+    const deferredDataScripts = [];
+    initialScripts += Object.entries(activeDeferreds).map(([routeId, deferredData]) => {
+      const pendingKeys = new Set(deferredData.pendingKeys);
+      const { deferredKeys } = deferredData;
+      const deferredKeyPromiseStr = deferredKeys.map((key) => {
+        if (pendingKeys.has(key)) {
+          deferredDataScripts.push(
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DeferredDataScript, {
+              data: deferredData.data[key],
+              dataKey: key,
+              routeId
+            }, `${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") {
+            const error = {
+              message: trackedPromise._error.message,
+              stack: process.env.NODE_ENV !== "production" ? trackedPromise._error.stack : void 0
+            };
+            return `${JSON.stringify(
+              key
+            )}: _ROUTER_DATA.p(${void 0}, ${(0, import_serialize.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 `${JSON.stringify(key)}: _ROUTER_DATA.p(${(0, import_serialize.serializeJson)(
+              trackedPromise._data
+            )})`;
+          }
+        }
+      }).join(",\n");
+      return `Object.assign(_ROUTER_DATA.loaderData[${JSON.stringify(
+        routeId
+      )}], {${deferredKeyPromiseStr}});`;
+    }).join("\n");
+    return [initialScripts, deferredDataScripts];
+  }, []);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
+    children: [
+      !hydratedRef.current && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
+        async: true,
+        suppressHydrationWarning: true,
+        dangerouslySetInnerHTML: { __html: deferredScripts[0] }
+      }),
+      !hydratedRef.current && deferredScripts[1],
+      import_common.JSX_SHELL_STREAM_END_MARK
+    ]
+  });
+};
+const DeferredDataScript = ({
+  data,
+  routeId,
+  dataKey
+}) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, {
+    children: typeof document === "undefined" && data && dataKey && routeId ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Await, {
+      resolve: data,
+      errorElement: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorDeferredDataScript, {
+        routeId,
+        dataKey
+      }),
+      children: (data2) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
+        async: true,
+        suppressHydrationWarning: true,
+        dangerouslySetInnerHTML: {
+          __html: `_ROUTER_DATA.r(${JSON.stringify(
+            routeId
+          )}, ${JSON.stringify(dataKey)}, ${(0, import_serialize.serializeJson)(data2)});`
+        }
+      })
+    }) : null
+  });
+};
+const ErrorDeferredDataScript = ({
+  routeId,
+  dataKey
+}) => {
+  const error = (0, import_react_router_dom.useAsyncError)();
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
+    suppressHydrationWarning: true,
+    dangerouslySetInnerHTML: {
+      __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(
+        dataKey
+      )}, ${void 0}, ${(0, import_serialize.serializeJson)({
+        message: error.message,
+        stack: error.stack
+      })});`
+    }
+  });
+};
+var DeferredDataScripts_default = DeferredDataScripts;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/cjs/router/runtime/index.js

@@ -0,0 +1,82 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var runtime_exports = {};
+__export(runtime_exports, {
+  Form: () => import_react_router_dom.Form,
+  Outlet: () => import_react_router_dom.Outlet,
+  default: () => runtime_default,
+  defer: () => import_remix_router.defer,
+  isRouteErrorResponse: () => import_react_router_dom.isRouteErrorResponse,
+  modifyRoutes: () => import_plugin2.modifyRoutes,
+  unstable_useBlocker: () => import_react_router_dom.unstable_useBlocker,
+  unstable_usePrompt: () => import_react_router_dom.unstable_usePrompt,
+  useAsyncError: () => import_react_router_dom.useAsyncError,
+  useAsyncValue: () => import_react_router_dom.useAsyncValue,
+  useBeforeUnload: () => import_react_router_dom.useBeforeUnload,
+  useFormAction: () => import_react_router_dom.useFormAction,
+  useHref: () => import_react_router_dom.useHref,
+  useLocation: () => import_react_router_dom.useLocation,
+  useNavigate: () => import_react_router_dom.useNavigate,
+  useNavigation: () => import_react_router_dom.useNavigation,
+  useNavigationType: () => import_react_router_dom.useNavigationType,
+  useOutlet: () => import_react_router_dom.useOutlet,
+  useOutletContext: () => import_react_router_dom.useOutletContext,
+  useParams: () => import_react_router_dom.useParams,
+  useResolvedPath: () => import_react_router_dom.useResolvedPath,
+  useRevalidator: () => import_react_router_dom.useRevalidator,
+  useRouteError: () => import_react_router_dom.useRouteError,
+  useRouteLoaderData: () => import_react_router_dom.useRouteLoaderData,
+  useSearchParams: () => import_react_router_dom.useSearchParams,
+  useSubmit: () => import_react_router_dom.useSubmit
+});
+module.exports = __toCommonJS(runtime_exports);
+var import_plugin = require("./plugin");
+var import_plugin2 = require("./plugin");
+__reExport(runtime_exports, require("./withRouter"), module.exports);
+var import_react_router_dom = require("react-router-dom");
+var import_remix_router = require("@modern-js/utils/remix-router");
+var runtime_default = import_plugin.routerPlugin;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Form,
+  Outlet,
+  defer,
+  isRouteErrorResponse,
+  modifyRoutes,
+  unstable_useBlocker,
+  unstable_usePrompt,
+  useAsyncError,
+  useAsyncValue,
+  useBeforeUnload,
+  useFormAction,
+  useHref,
+  useLocation,
+  useNavigate,
+  useNavigation,
+  useNavigationType,
+  useOutlet,
+  useOutletContext,
+  useParams,
+  useResolvedPath,
+  useRevalidator,
+  useRouteError,
+  useRouteLoaderData,
+  useSearchParams,
+  useSubmit
+});

package/dist/{js/node → cjs}/router/runtime/plugin.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -96,12 +79,20 @@ const routerPlugin = ({
               const routes = createRoutes ? createRoutes() : (0, import_react_router_dom.createRoutesFromElements)((0, import_utils.renderRoutes)(finalRouteConfig));
               const baseUrl = ((_a = window._SERVER_DATA) == null ? void 0 : _a.router.baseUrl) || select(location.pathname);
               const _basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, basename) : baseUrl;
-              const router = supportHtml5History ? (0, import_react_router_dom.createBrowserRouter)(routes, { basename: _basename }) : (0, import_react_router_dom.createHashRouter)(routes, { basename: _basename });
-              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadProps(__spreadValues({}, props), {
+              const hydrationData = window._ROUTER_DATA;
+              const router = supportHtml5History ? (0, import_react_router_dom.createBrowserRouter)(routes, {
+                basename: _basename,
+                hydrationData
+              }) : (0, import_react_router_dom.createHashRouter)(routes, {
+                basename: _basename,
+                hydrationData
+              });
+              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+                ...props,
                 children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.RouterProvider, {
                   router
                 })
-              }));
+              });
             };
           };
           const RouteApp = getRouteApp();

package/dist/cjs/router/runtime/plugin.node.js

@@ -0,0 +1,137 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var plugin_node_exports = {};
+__export(plugin_node_exports, {
+  createFetchHeaders: () => createFetchHeaders,
+  modifyRoutes: () => modifyRoutes,
+  routerPlugin: () => routerPlugin
+});
+module.exports = __toCommonJS(plugin_node_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_react = require("react");
+var import_remix_router = require("@modern-js/utils/remix-router");
+var import_server = require("react-router-dom/server");
+var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
+var import_react_router_dom = require("react-router-dom");
+var import_core = require("../../core");
+var import_utils = require("./utils");
+var import_fetch = require("./fetch");
+(0, import_fetch.installGlobals)();
+function createFetchRequest(req) {
+  const origin = `${req.protocol}://${req.host}`;
+  const url = new URL(req.originalUrl || req.url, origin);
+  const controller = new AbortController();
+  const init = {
+    method: req.method,
+    headers: createFetchHeaders(req.headers),
+    signal: controller.signal
+  };
+  return new Request(url.href, init);
+}
+function createFetchHeaders(requestHeaders) {
+  const headers = new Headers();
+  for (const [key, values] of Object.entries(requestHeaders || {})) {
+    if (values) {
+      if (Array.isArray(values)) {
+        for (const value of values) {
+          headers.append(key, value);
+        }
+      } else {
+        headers.set(key, values);
+      }
+    }
+  }
+  return headers;
+}
+const routerPlugin = ({
+  basename = "",
+  routesConfig,
+  createRoutes
+}) => {
+  return {
+    name: "@modern-js/plugin-router",
+    setup: () => {
+      return {
+        async init({ context }, next) {
+          if (!routesConfig && !createRoutes) {
+            return next({ context });
+          }
+          const { request } = context.ssrContext;
+          const baseUrl = request.baseUrl;
+          const _basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, basename) : baseUrl;
+          const routes = createRoutes ? createRoutes() : (0, import_react_router_dom.createRoutesFromElements)((0, import_utils.renderRoutes)(routesConfig));
+          const { query } = (0, import_remix_router.createStaticHandler)(routes, {
+            basename: _basename
+          });
+          const remixRequest = createFetchRequest(request);
+          const routerContext = await query(remixRequest);
+          if (routerContext instanceof Response) {
+            return routerContext;
+          }
+          const router = (0, import_server.createStaticRouter)(routes, routerContext);
+          context.router = router;
+          context.routerContext = routerContext;
+          context.routes = routes;
+          context.routeManifest = context.ssrContext.routeManifest;
+          return next({ context });
+        },
+        hoc: ({ App }, next) => {
+          if (!routesConfig) {
+            return next({ App });
+          }
+          const getRouteApp = () => {
+            return (props) => {
+              const { router, routerContext } = (0, import_react.useContext)(import_core.RuntimeReactContext);
+              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+                ...props,
+                children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_server.StaticRouterProvider, {
+                  router,
+                  context: routerContext,
+                  hydrate: false
+                })
+              });
+            };
+          };
+          const RouteApp = getRouteApp();
+          if (routesConfig == null ? void 0 : routesConfig.globalApp) {
+            return next({
+              App: (0, import_hoist_non_react_statics.default)(RouteApp, routesConfig.globalApp)
+            });
+          }
+          return next({
+            App: RouteApp
+          });
+        }
+      };
+    }
+  };
+};
+const modifyRoutes = () => {
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createFetchHeaders,
+  modifyRoutes,
+  routerPlugin
+});

package/dist/cjs/router/runtime/utils.js

@@ -0,0 +1,123 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  getLocation: () => getLocation,
+  getRouteComponents: () => getRouteComponents,
+  renderRoutes: () => renderRoutes,
+  standardSlash: () => standardSlash,
+  urlJoin: () => urlJoin
+});
+module.exports = __toCommonJS(utils_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_react_router_dom = require("react-router-dom");
+var import_nestedRoutes = require("@modern-js/utils/nestedRoutes");
+var import_DefaultNotFound = require("./DefaultNotFound");
+var import_DeferredDataScripts = __toESM(require("./DeferredDataScripts"));
+function getRouteComponents(routes, globalApp) {
+  const Layout = ({ Component, ...props }) => {
+    const GlobalLayout = globalApp;
+    if (!GlobalLayout) {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
+        ...props
+      });
+    }
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, {
+      Component,
+      ...props
+    });
+  };
+  const routeElements = [];
+  for (const route of routes) {
+    if (route.type === "nested") {
+      const routeElement = (0, import_nestedRoutes.renderNestedRoute)(route, {
+        DeferredDataComponent: import_DeferredDataScripts.default
+      });
+      routeElements.push(routeElement);
+    } else {
+      const routeElement = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, {
+        path: route.path,
+        element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Layout, {
+          Component: route.component
+        })
+      }, route.path);
+      routeElements.push(routeElement);
+    }
+  }
+  routeElements.push(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, {
+    path: "*",
+    element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DefaultNotFound.DefaultNotFound, {})
+  }, "*"));
+  return routeElements;
+}
+function renderRoutes(routesConfig) {
+  if (!routesConfig) {
+    return null;
+  }
+  const { routes, globalApp } = routesConfig;
+  if (!routes) {
+    return null;
+  }
+  const routeElements = getRouteComponents(routes, globalApp);
+  return routeElements;
+}
+function getLocation(serverContext) {
+  var _a;
+  const { pathname, url } = (serverContext == null ? void 0 : serverContext.request) || {};
+  const cleanUrl = (_a = url == null ? void 0 : url.replace("http://", "")) == null ? void 0 : _a.replace("https://", "");
+  const index = (cleanUrl || "").indexOf(pathname);
+  if (index === -1) {
+    return pathname;
+  }
+  return cleanUrl.substring(index);
+}
+const urlJoin = (...parts) => {
+  const separator = "/";
+  const replace = new RegExp(`${separator}{1,}`, "g");
+  return standardSlash(parts.join(separator).replace(replace, separator));
+};
+function standardSlash(str) {
+  let addr = str;
+  if (!addr || typeof addr !== "string") {
+    return addr;
+  }
+  if (addr.startsWith(".")) {
+    addr = addr.slice(1);
+  }
+  if (!addr.startsWith("/")) {
+    addr = `/${addr}`;
+  }
+  if (addr.endsWith("/") && addr !== "/") {
+    addr = addr.slice(0, addr.length - 1);
+  }
+  return addr;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getLocation,
+  getRouteComponents,
+  renderRoutes,
+  standardSlash,
+  urlJoin
+});

package/dist/{js/node → cjs}/router/runtime/withRouter.js

@@ -1,24 +1,7 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -44,11 +27,12 @@ const withRouter = (Component) => {
     const location = (0, import_react_router_dom.useLocation)();
     const params = (0, import_react_router_dom.useParams)();
     const navigate = (0, import_react_router_dom.useNavigate)();
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, __spreadProps(__spreadValues({}, props), {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
+      ...props,
       location,
       params,
       navigate
-    }));
+    });
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/{js/node → cjs}/ssr/cli/index.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -78,9 +64,9 @@ var cli_default = () => ({
             }
           },
           tools: {
-            webpackChain: (chain, { name, isServer, isServiceWorker, CHAIN_ID }) => {
+            webpackChain: (chain, { isServer, isServiceWorker, CHAIN_ID }) => {
               const userConfig = api.useResolvedConfigContext();
-              if ((0, import_utils.isUseSSRBundle)(userConfig) && name !== "server" && hasStringSSREntry(userConfig)) {
+              if ((0, import_utils.isUseSSRBundle)(userConfig) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig)) {
                 const LoadableWebpackPlugin = require("@loadable/webpack-plugin");
                 chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [
                   { filename: import_utils.LOADABLE_STATS_FILE }
@@ -94,7 +80,10 @@ var cli_default = () => ({
               chain.plugin(CHAIN_ID.PLUGIN.DEFINE).tap((args) => {
                 const [vars, ...rest] = args;
                 return [
-                  __spreadValues(__spreadValues({}, vars), modernVars),
+                  {
+                    ...vars,
+                    ...modernVars
+                  },
                   ...rest
                 ];
               });