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

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

@@ -1,22 +1,58 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-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 __webpack_modules__ = {
+    "@modern-js/runtime-utils/router" (module) {
+        module.exports = require("@modern-js/runtime-utils/router");
+    }
 };
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var server_exports = {};
-module.exports = __toCommonJS(server_exports);
-__reExport(server_exports, require("@modern-js/runtime-utils/node/router"), module.exports);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ...require("@modern-js/runtime-utils/node/router")
+var __webpack_module_cache__ = {};
+function __webpack_require__(moduleId) {
+    var cachedModule = __webpack_module_cache__[moduleId];
+    if (void 0 !== cachedModule) return cachedModule.exports;
+    var module = __webpack_module_cache__[moduleId] = {
+        exports: {}
+    };
+    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+    return module.exports;
+}
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+(()=>{
+    __webpack_require__.r(__webpack_exports__);
+    var _modern_js_runtime_utils_router__rspack_import_0 = __webpack_require__("@modern-js/runtime-utils/router");
+    var __rspack_reexport = {};
+    for(const __rspack_import_key in _modern_js_runtime_utils_router__rspack_import_0)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_modern_js_runtime_utils_router__rspack_import_0[__rspack_import_key];
+    __webpack_require__.d(__webpack_exports__, __rspack_reexport);
+})();
+for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

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

@@ -1,16 +1,18 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-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 types_exports = {};
-module.exports = __toCommonJS(types_exports);
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

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

@@ -1,260 +1,234 @@
 "use strict";
-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(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  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, {
-  createRouteObjectsFromConfig: () => createRouteObjectsFromConfig,
-  deserializeErrors: () => deserializeErrors,
-  getLocation: () => getLocation,
-  getRouteComponents: () => getRouteComponents,
-  getRouteObjects: () => getRouteObjects,
-  renderRoutes: () => renderRoutes,
-  serializeErrors: () => serializeErrors,
-  standardSlash: () => standardSlash,
-  urlJoin: () => urlJoin
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createRouteObjectsFromConfig: ()=>createRouteObjectsFromConfig,
+    renderRoutes: ()=>renderRoutes,
+    getRouteComponents: ()=>getRouteComponents,
+    deserializeErrors: ()=>deserializeErrors,
+    getRouteObjects: ()=>getRouteObjects,
+    standardSlash: ()=>standardSlash,
+    urlJoin: ()=>urlJoin,
+    serializeErrors: ()=>serializeErrors,
+    getLocation: ()=>getLocation
 });
-module.exports = __toCommonJS(utils_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_browser = require("@modern-js/runtime-utils/browser");
-var import_remix_router = require("@modern-js/runtime-utils/remix-router");
-var import_router = require("@modern-js/runtime-utils/router");
-var import_react = __toESM(require("react"));
-var import_DefaultNotFound = require("./DefaultNotFound");
-var import_DeferredDataScripts = __toESM(require("./DeferredDataScripts"));
+const jsx_runtime_namespaceObject = require("react/jsx-runtime");
+const browser_namespaceObject = require("@modern-js/runtime-utils/browser");
+const router_namespaceObject = require("@modern-js/runtime-utils/router");
+const external_react_namespaceObject = require("react");
+var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_namespaceObject);
+const external_DefaultNotFound_js_namespaceObject = require("./DefaultNotFound.js");
+const external_DeferredDataScripts_js_namespaceObject = require("./DeferredDataScripts.js");
+var external_DeferredDataScripts_js_default = /*#__PURE__*/ __webpack_require__.n(external_DeferredDataScripts_js_namespaceObject);
 function getRouteComponents(routes, { globalApp, ssrMode, props }) {
-  const Layout = ({ Component, ...props2 }) => {
-    const GlobalLayout = globalApp;
-    if (!GlobalLayout) {
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
-        ...props2
-      });
-    }
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, {
-      Component,
-      ...props2
-    });
-  };
-  const routeElements = [];
-  for (const route of routes) {
-    if (route.type === "nested") {
-      const routeElement = (0, import_browser.renderNestedRoute)(route, {
-        DeferredDataComponent: ssrMode === "stream" ? import_DeferredDataScripts.default : void 0,
-        props
-      });
-      routeElements.push(routeElement);
+    const Layout = ({ Component, ...props })=>{
+        const GlobalLayout = globalApp;
+        if (!GlobalLayout) return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(Component, {
+            ...props
+        });
+        return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(GlobalLayout, {
+            Component: Component,
+            ...props
+        });
+    };
+    const routeElements = [];
+    for (const route of routes)if ('nested' === route.type) {
+        const routeElement = (0, browser_namespaceObject.renderNestedRoute)(route, {
+            DeferredDataComponent: 'stream' === ssrMode ? external_DeferredDataScripts_js_default() : void 0,
+            props
+        });
+        routeElements.push(routeElement);
     } else {
-      const routeElement = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_router.Route, {
-        path: route.path,
-        element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Layout, {
-          Component: route.component
-        })
-      }, route.path);
-      routeElements.push(routeElement);
+        const routeElement = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(router_namespaceObject.Route, {
+            path: route.path,
+            element: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(Layout, {
+                Component: route.component
+            })
+        }, route.path);
+        routeElements.push(routeElement);
     }
-  }
-  routeElements.push(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_router.Route, {
-    path: "*",
-    element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DefaultNotFound.DefaultNotFound, {})
-  }, "*"));
-  return routeElements;
+    routeElements.push(/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(router_namespaceObject.Route, {
+        path: "*",
+        element: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_DefaultNotFound_js_namespaceObject.DefaultNotFound, {}),
+        loader: ()=>new Response('404', {
+                status: 404
+            })
+    }, "*"));
+    return routeElements;
 }
 function getRouteObjects(routes, { globalApp, ssrMode, props }) {
-  const createLayoutElement = (Component) => {
-    const GlobalLayout = globalApp;
-    if (!GlobalLayout) {
-      return Component;
-    }
-    const LayoutWrapper = (props2) => {
-      const LayoutComponent = GlobalLayout;
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LayoutComponent, {
-        Component,
-        ...props2
-      });
+    const createLayoutElement = (Component)=>{
+        const GlobalLayout = globalApp;
+        if (!GlobalLayout) return Component;
+        const LayoutWrapper = (props)=>{
+            const LayoutComponent = GlobalLayout;
+            return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(LayoutComponent, {
+                Component: Component,
+                ...props
+            });
+        };
+        return LayoutWrapper;
     };
-    return LayoutWrapper;
-  };
-  const routeObjects = [];
-  for (const route of routes) {
-    if (route.type === "nested") {
-      var _route_config;
-      const nestedRouteObject = {
-        path: route.path,
-        id: route.id,
-        loader: route.loader,
-        action: route.action,
-        hasErrorBoundary: route.hasErrorBoundary,
-        shouldRevalidate: route.shouldRevalidate,
-        handle: {
-          ...route.handle,
-          ...typeof route.config === "object" ? (_route_config = route.config) === null || _route_config === void 0 ? void 0 : _route_config.handle : {}
-        },
-        index: route.index,
-        hasClientLoader: !!route.clientData,
-        Component: route.component ? route.component : void 0,
-        errorElement: route.error ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(route.error, {}) : void 0,
-        children: route.children ? route.children.map((child) => getRouteObjects([
-          child
-        ], {
-          globalApp,
-          ssrMode,
-          props
-        })[0]) : void 0
-      };
-      routeObjects.push(nestedRouteObject);
-    } else {
-      if (typeof route.component === "function" || typeof route.component === "object") {
+    const routeObjects = [];
+    for (const route of routes)if ('nested' === route.type) {
+        const nestedRouteObject = {
+            path: route.path,
+            id: route.id,
+            loader: route.loader,
+            action: route.action,
+            hasErrorBoundary: route.hasErrorBoundary,
+            shouldRevalidate: route.shouldRevalidate,
+            handle: {
+                ...route.handle,
+                ...'object' == typeof route.config ? route.config?.handle : {}
+            },
+            index: route.index,
+            hasClientLoader: !!route.clientData,
+            Component: route.component ? route.component : void 0,
+            errorElement: route.error ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(route.error, {}) : void 0,
+            children: route.children ? route.children.map((child)=>getRouteObjects([
+                    child
+                ], {
+                    globalApp,
+                    ssrMode,
+                    props
+                })[0]) : void 0
+        };
+        routeObjects.push(nestedRouteObject);
+    } else if ('function' == typeof route.component || 'object' == typeof route.component) {
         const LayoutComponent = createLayoutElement(route.component);
         const routeObject = {
-          path: route.path,
-          element: /* @__PURE__ */ import_react.default.createElement(LayoutComponent)
+            path: route.path,
+            element: /*#__PURE__*/ external_react_default().createElement(LayoutComponent)
         };
         routeObjects.push(routeObject);
-      }
     }
-  }
-  routeObjects.push({
-    path: "*",
-    element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DefaultNotFound.DefaultNotFound, {})
-  });
-  return routeObjects;
+    routeObjects.push({
+        path: '*',
+        element: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_DefaultNotFound_js_namespaceObject.DefaultNotFound, {})
+    });
+    return routeObjects;
 }
 function createRouteObjectsFromConfig({ routesConfig, props, ssrMode }) {
-  if (!routesConfig) {
-    return null;
-  }
-  const { routes, globalApp } = routesConfig;
-  if (!routes) {
-    return null;
-  }
-  return getRouteObjects(routes, {
-    globalApp,
-    ssrMode,
-    props
-  });
+    if (!routesConfig) return null;
+    const { routes, globalApp } = routesConfig;
+    if (!routes) return null;
+    return getRouteObjects(routes, {
+        globalApp,
+        ssrMode,
+        props
+    });
 }
 function renderRoutes({ routesConfig, props, ssrMode }) {
-  if (!routesConfig) {
-    return null;
-  }
-  const { routes, globalApp } = routesConfig;
-  if (!routes) {
-    return null;
-  }
-  const routeElements = getRouteComponents(routes, {
-    globalApp,
-    ssrMode,
-    props
-  });
-  return routeElements;
+    if (!routesConfig) return null;
+    const { routes, globalApp } = routesConfig;
+    if (!routes) return null;
+    const routeElements = getRouteComponents(routes, {
+        globalApp,
+        ssrMode,
+        props
+    });
+    return routeElements;
 }
 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://", "");
-  const index = (cleanUrl || "").indexOf(pathname);
-  if (index === -1) {
-    return pathname;
-  }
-  return cleanUrl.substring(index);
+    const { pathname = '', url = '' } = serverContext?.request || {};
+    const cleanUrl = url?.replace('http://', '')?.replace('https://', '');
+    const index = (cleanUrl || '').indexOf(pathname);
+    if (-1 === index) 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));
+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") {
+    let addr = str;
+    if (!addr || 'string' != typeof addr) 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;
-  }
-  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;
 }
 function serializeErrors(errors) {
-  if (!errors) {
-    return null;
-  }
-  const entries = Object.entries(errors);
-  const serialized = {};
-  for (const [key, val] of entries) {
-    if ((0, import_router.isRouteErrorResponse)(val)) {
-      serialized[key] = {
+    if (!errors) return null;
+    const entries = Object.entries(errors);
+    const serialized = {};
+    for (const [key, val] of entries)if ((0, router_namespaceObject.isRouteErrorResponse)(val)) serialized[key] = {
         ...val,
-        __type: "RouteErrorResponse"
-      };
-    } else if (val instanceof Error) {
-      serialized[key] = {
+        __type: 'RouteErrorResponse'
+    };
+    else if (val instanceof Error) serialized[key] = {
         message: val.message,
         stack: val.stack,
-        __type: "Error"
-      };
-    } else {
-      serialized[key] = val;
-    }
-  }
-  return serialized;
+        __type: 'Error'
+    };
+    else serialized[key] = val;
+    return serialized;
 }
 function deserializeErrors(errors) {
-  if (!errors) {
-    return null;
-  }
-  const entries = Object.entries(errors);
-  const serialized = {};
-  for (const [key, val] of entries) {
-    if (val && val.__type === "RouteErrorResponse") {
-      serialized[key] = new import_remix_router.UNSAFE_ErrorResponseImpl(val.status, val.statusText, val.data, val.internal === true);
-    } else if (val && val.__type === "Error") {
-      const error = new Error(val.message);
-      error.stack = val.stack;
-      serialized[key] = error;
-    } else {
-      serialized[key] = val;
-    }
-  }
-  return serialized;
+    if (!errors) return null;
+    const entries = Object.entries(errors);
+    const serialized = {};
+    for (const [key, val] of entries)if (val && 'RouteErrorResponse' === val.__type) serialized[key] = new router_namespaceObject.UNSAFE_ErrorResponseImpl(val.status, val.statusText, val.data, true === val.internal);
+    else if (val && 'Error' === val.__type) {
+        const error = new Error(val.message);
+        error.stack = val.stack;
+        serialized[key] = error;
+    } else serialized[key] = val;
+    return serialized;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createRouteObjectsFromConfig,
-  deserializeErrors,
-  getLocation,
-  getRouteComponents,
-  getRouteObjects,
-  renderRoutes,
-  serializeErrors,
-  standardSlash,
-  urlJoin
+exports.createRouteObjectsFromConfig = __webpack_exports__.createRouteObjectsFromConfig;
+exports.deserializeErrors = __webpack_exports__.deserializeErrors;
+exports.getLocation = __webpack_exports__.getLocation;
+exports.getRouteComponents = __webpack_exports__.getRouteComponents;
+exports.getRouteObjects = __webpack_exports__.getRouteObjects;
+exports.renderRoutes = __webpack_exports__.renderRoutes;
+exports.serializeErrors = __webpack_exports__.serializeErrors;
+exports.standardSlash = __webpack_exports__.standardSlash;
+exports.urlJoin = __webpack_exports__.urlJoin;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createRouteObjectsFromConfig",
+    "deserializeErrors",
+    "getLocation",
+    "getRouteComponents",
+    "getRouteObjects",
+    "renderRoutes",
+    "serializeErrors",
+    "standardSlash",
+    "urlJoin"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });