@modern-js/runtime 2.0.0-beta.4 → 2.0.0-beta.5

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

@@ -1,9 +1,26 @@
 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 });
@@ -21,37 +38,18 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var plugin_exports = {};
+__export(plugin_exports, {
   beforeCreateRouter: () => beforeCreateRouter,
   finalRouteConfig: () => finalRouteConfig,
   modifyRoutes: () => modifyRoutes,
   routerPlugin: () => routerPlugin
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(plugin_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react_router_dom = require("react-router-dom");
 var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
 var import_utils = require("./utils");
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.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));
 let finalRouteConfig = {
   routes: []
 };
@@ -80,6 +78,13 @@ const routerPlugin = ({
     name: "@modern-js/plugin-router",
     setup: () => {
       return {
+        init({ context }, next) {
+          context.router = {
+            useMatches: import_react_router_dom.useMatches,
+            useLocation: import_react_router_dom.useLocation
+          };
+          return next({ context });
+        },
         hoc: ({ App }, next) => {
           if (!finalRouteConfig && !createRoutes) {
             return next({ App });
@@ -113,3 +118,10 @@ const routerPlugin = ({
     }
   };
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  beforeCreateRouter,
+  finalRouteConfig,
+  modifyRoutes,
+  routerPlugin
+});

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

@@ -1,9 +1,26 @@
 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 });
@@ -21,40 +38,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  createFetchHeaders: () => createFetchHeaders,
-  routerPlugin: () => routerPlugin
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
-var import_router = require("@remix-run/router");
-var import_server = require("react-router-dom/server");
-var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
-var import_node = require("@remix-run/node");
-var import_react_router_dom = require("react-router-dom");
-var import_core = require("../../core");
-var import_utils = require("./utils");
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.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 __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -75,6 +58,21 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var plugin_node_exports = {};
+__export(plugin_node_exports, {
+  createFetchHeaders: () => createFetchHeaders,
+  routerPlugin: () => routerPlugin
+});
+module.exports = __toCommonJS(plugin_node_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_react = require("react");
+var import_router = require("@remix-run/router");
+var import_server = require("react-router-dom/server");
+var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
+var import_node = require("@remix-run/node");
+var import_react_router_dom = require("react-router-dom");
+var import_core = require("../../core");
+var import_utils = require("./utils");
 (0, import_node.installGlobals)();
 function createFetchRequest(req) {
   const origin = `${req.protocol}://${req.host}`;
@@ -166,3 +164,8 @@ const routerPlugin = ({
     }
   };
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createFetchHeaders,
+  routerPlugin
+});

package/dist/js/node/router/runtime/root/index.js

@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var root_exports = {};
+__export(root_exports, {
   RootLayout: () => RootLayout
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(root_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_react_router_dom = require("react-router-dom");
@@ -36,3 +36,7 @@ function RootLayout(props) {
     children: props.children
   });
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RootLayout
+});

package/dist/js/node/router/runtime/root/load.js

@@ -15,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  handleLoad: () => handleLoad,
-  loadRouteModule: () => loadRouteModule,
-  matchClientRoutes: () => matchClientRoutes
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_react_router_dom = require("react-router-dom");
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -43,6 +35,14 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var load_exports = {};
+__export(load_exports, {
+  handleLoad: () => handleLoad,
+  loadRouteModule: () => loadRouteModule,
+  matchClientRoutes: () => matchClientRoutes
+});
+module.exports = __toCommonJS(load_exports);
+var import_react_router_dom = require("react-router-dom");
 class Logger {
   static getLogger(options) {
     if (this.logger) {
@@ -99,3 +99,9 @@ function loadRouteModule(route, routeAssets) {
     }
   });
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handleLoad,
+  loadRouteModule,
+  matchClientRoutes
+});

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

@@ -12,6 +12,6 @@ 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 stdin_exports = {};
-module.exports = __toCommonJS(stdin_exports);
-__reExport(stdin_exports, require("react-router-dom/server"), module.exports);
+var server_exports = {};
+module.exports = __toCommonJS(server_exports);
+__reExport(server_exports, require("react-router-dom/server"), module.exports);

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

@@ -0,0 +1,15 @@
+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);

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

@@ -1,7 +1,36 @@
 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 __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -15,56 +44,22 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var utils_exports = {};
+__export(utils_exports, {
   getLocation: () => getLocation,
   getRouteComponents: () => getRouteComponents,
   renderRoutes: () => renderRoutes,
   standardSlash: () => standardSlash,
   urlJoin: () => urlJoin
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(utils_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_DefaultNotFound = require("./DefaultNotFound");
 var import_root = require("./root");
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.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 __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp2.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 const renderNestedRoute = (nestedRoute, parent) => {
   const { children, index, id, component: Component } = nestedRoute;
-  const childElements = children == null ? void 0 : children.map((childRoute) => {
-    return renderNestedRoute(childRoute, nestedRoute);
-  });
   const routeProps = {
     caseSensitive: nestedRoute.caseSensitive,
     path: nestedRoute.path,
@@ -90,11 +85,15 @@ const renderNestedRoute = (nestedRoute, parent) => {
         fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, {}),
         children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {})
       });
-    } else {
+    } else if (!(parent == null ? void 0 : parent.index)) {
       element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, {
         children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {})
       });
+    } else {
+      element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {});
     }
+  } else {
+    nestedRoute.loading = parent == null ? void 0 : parent.loading;
   }
   if (!parent && element) {
     element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_root.RootLayout, {
@@ -105,6 +104,9 @@ const renderNestedRoute = (nestedRoute, parent) => {
   if (element) {
     routeProps.element = element;
   }
+  const childElements = children == null ? void 0 : children.map((childRoute) => {
+    return renderNestedRoute(childRoute, nestedRoute);
+  });
   const routeElement = index ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, __spreadProps(__spreadValues({}, routeProps), {
     index: true
   }), id) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, __spreadProps(__spreadValues({}, routeProps), {
@@ -187,3 +189,11 @@ function standardSlash(str) {
   }
   return addr;
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getLocation,
+  getRouteComponents,
+  renderRoutes,
+  standardSlash,
+  urlJoin
+});

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

@@ -1,7 +1,24 @@
 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 });
@@ -15,32 +32,13 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var withRouter_exports = {};
+__export(withRouter_exports, {
   withRouter: () => withRouter
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(withRouter_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react_router_dom = require("react-router-dom");
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.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));
 const withRouter = (Component) => {
   return (props) => {
     const location = (0, import_react_router_dom.useLocation)();
@@ -53,3 +51,7 @@ const withRouter = (Component) => {
     }));
   };
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  withRouter
+});

package/dist/js/node/runtime-context.js

@@ -15,12 +15,17 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var runtime_context_exports = {};
+__export(runtime_context_exports, {
   RuntimeReactContext: () => RuntimeReactContext,
   ServerRouterContext: () => ServerRouterContext
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(runtime_context_exports);
 var import_react = require("react");
 const RuntimeReactContext = (0, import_react.createContext)({});
 const ServerRouterContext = (0, import_react.createContext)({});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RuntimeReactContext,
+  ServerRouterContext
+});