@modern-js/runtime 2.0.1 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @modern-js/runtime
 
+## 2.1.0
+
+### Patch Changes
+
+- f3237db: fix: loadable component should not be wrapped in suspense
+  fix: loadable component 不应该被 suspense 包裹
+- 776cc27: chore: hard code MODER_TARGET
+  chore: 硬编码 MODER_TARGET
+- 35d3e84: fix: add missing esbuild
+  fix: 添加缺失的 esbuild
+- Updated dependencies [837620c]
+- Updated dependencies [8a9482c]
+  - @modern-js/utils@2.1.0
+  - @modern-js/plugin@2.1.0
+  - @modern-js/types@2.1.0
+
+## 2.0.2
+
+### Patch Changes
+
+- 39988b2: feat: advance the timing of static resource loading
+  feat: 将嵌套路由下静态资源加载时机提前
+- Updated dependencies [39988b2]
+  - @modern-js/types@2.0.2
+  - @modern-js/utils@2.0.2
+  - @modern-js/plugin@2.0.2
+
 ## 2.0.1
 
 ### Patch Changes

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

@@ -33,14 +33,14 @@ import { jsx } from "react/jsx-runtime";
 import { Suspense } from "react";
 import { Route } from "react-router-dom";
 import { DefaultNotFound } from "./DefaultNotFound";
-import { RootLayout } from "./root";
 const renderNestedRoute = (nestedRoute, parent) => {
-  const { children, index, id, component: Component } = nestedRoute;
+  const { children, index, id, component, isRoot } = nestedRoute;
+  const Component = component;
   const routeProps = {
     caseSensitive: nestedRoute.caseSensitive,
     path: nestedRoute.path,
     id: nestedRoute.id,
-    loader: nestedRoute.loader,
+    loader: createLoader(nestedRoute),
     action: nestedRoute.action,
     hasErrorBoundary: nestedRoute.hasErrorBoundary,
     shouldRevalidate: nestedRoute.shouldRevalidate,
@@ -57,26 +57,26 @@ const renderNestedRoute = (nestedRoute, parent) => {
   if (Component) {
     if (parent == null ? void 0 : parent.loading) {
       const Loading = parent.loading;
-      element = /* @__PURE__ */ jsx(Suspense, {
-        fallback: /* @__PURE__ */ jsx(Loading, {}),
-        children: /* @__PURE__ */ jsx(Component, {})
-      });
-    } else if (!(parent == null ? void 0 : parent.index)) {
+      if (isLoadableComponent(Component)) {
+        element = /* @__PURE__ */ jsx(Component, {
+          fallback: /* @__PURE__ */ jsx(Loading, {})
+        });
+      } else {
+        element = /* @__PURE__ */ jsx(Suspense, {
+          fallback: /* @__PURE__ */ jsx(Loading, {}),
+          children: /* @__PURE__ */ jsx(Component, {})
+        });
+      }
+    } else if (isLoadableComponent(Component) || isRoot) {
+      element = /* @__PURE__ */ jsx(Component, {});
+    } else {
       element = /* @__PURE__ */ jsx(Suspense, {
         children: /* @__PURE__ */ jsx(Component, {})
       });
-    } else {
-      element = /* @__PURE__ */ jsx(Component, {});
     }
   } else {
     nestedRoute.loading = parent == null ? void 0 : parent.loading;
   }
-  if (!parent && element) {
-    element = /* @__PURE__ */ jsx(RootLayout, {
-      routes: [nestedRoute],
-      children: element
-    });
-  }
   if (element) {
     routeProps.element = element;
   }
@@ -165,6 +165,27 @@ function standardSlash(str) {
   }
   return addr;
 }
+function createLoader(route) {
+  const { loader } = route;
+  if (loader) {
+    return (args) => {
+      if (typeof route.lazyImport === "function") {
+        route.lazyImport();
+      }
+      return loader(args);
+    };
+  } else {
+    return () => {
+      if (typeof route.lazyImport === "function") {
+        route.lazyImport();
+      }
+      return null;
+    };
+  }
+}
+function isLoadableComponent(component) {
+  return component && component.displayName === "Loadable" && component.preload && typeof component.preload === "function";
+}
 export {
   getLocation,
   getRouteComponents,

package/dist/js/modern/ssr/cli/index.js

@@ -67,9 +67,8 @@ var cli_default = () => ({
                   { filename: LOADABLE_STATS_FILE }
                 ]);
               }
-              const prefix = `${appContext.metaName.split(/[-_]/)[0]}_`.toUpperCase();
               const modernVars = {
-                [`process.env.${prefix}TARGET`]: JSON.stringify(
+                [`process.env.MODERN_TARGET`]: JSON.stringify(
                   isServer ? "node" : "browser"
                 )
               };

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

@@ -57,14 +57,14 @@ 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");
 const renderNestedRoute = (nestedRoute, parent) => {
-  const { children, index, id, component: Component } = nestedRoute;
+  const { children, index, id, component, isRoot } = nestedRoute;
+  const Component = component;
   const routeProps = {
     caseSensitive: nestedRoute.caseSensitive,
     path: nestedRoute.path,
     id: nestedRoute.id,
-    loader: nestedRoute.loader,
+    loader: createLoader(nestedRoute),
     action: nestedRoute.action,
     hasErrorBoundary: nestedRoute.hasErrorBoundary,
     shouldRevalidate: nestedRoute.shouldRevalidate,
@@ -81,26 +81,26 @@ const renderNestedRoute = (nestedRoute, parent) => {
   if (Component) {
     if (parent == null ? void 0 : parent.loading) {
       const Loading = parent.loading;
-      element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, {
-        fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, {}),
-        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {})
-      });
-    } else if (!(parent == null ? void 0 : parent.index)) {
+      if (isLoadableComponent(Component)) {
+        element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
+          fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, {})
+        });
+      } else {
+        element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, {
+          fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, {}),
+          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {})
+        });
+      }
+    } else if (isLoadableComponent(Component) || isRoot) {
+      element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {});
+    } else {
       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, {
-      routes: [nestedRoute],
-      children: element
-    });
-  }
   if (element) {
     routeProps.element = element;
   }
@@ -189,6 +189,27 @@ function standardSlash(str) {
   }
   return addr;
 }
+function createLoader(route) {
+  const { loader } = route;
+  if (loader) {
+    return (args) => {
+      if (typeof route.lazyImport === "function") {
+        route.lazyImport();
+      }
+      return loader(args);
+    };
+  } else {
+    return () => {
+      if (typeof route.lazyImport === "function") {
+        route.lazyImport();
+      }
+      return null;
+    };
+  }
+}
+function isLoadableComponent(component) {
+  return component && component.displayName === "Loadable" && component.preload && typeof component.preload === "function";
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getLocation,

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

@@ -86,9 +86,8 @@ var cli_default = () => ({
                   { filename: import_utils.LOADABLE_STATS_FILE }
                 ]);
               }
-              const prefix = `${appContext.metaName.split(/[-_]/)[0]}_`.toUpperCase();
               const modernVars = {
-                [`process.env.${prefix}TARGET`]: JSON.stringify(
+                [`process.env.MODERN_TARGET`]: JSON.stringify(
                   isServer ? "node" : "browser"
                 )
               };

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

@@ -81,14 +81,14 @@ import { jsx } from "react/jsx-runtime";
 import { Suspense } from "react";
 import { Route } from "react-router-dom";
 import { DefaultNotFound } from "./DefaultNotFound";
-import { RootLayout } from "./root";
 var renderNestedRoute = function(nestedRoute, parent) {
-    var children = nestedRoute.children, index = nestedRoute.index, id = nestedRoute.id, Component = nestedRoute.component;
+    var children = nestedRoute.children, index = nestedRoute.index, id = nestedRoute.id, component = nestedRoute.component, isRoot = nestedRoute.isRoot;
+    var Component = component;
     var routeProps = {
         caseSensitive: nestedRoute.caseSensitive,
         path: nestedRoute.path,
         id: nestedRoute.id,
-        loader: nestedRoute.loader,
+        loader: createLoader(nestedRoute),
         action: nestedRoute.action,
         hasErrorBoundary: nestedRoute.hasErrorBoundary,
         shouldRevalidate: nestedRoute.shouldRevalidate,
@@ -105,28 +105,26 @@ var renderNestedRoute = function(nestedRoute, parent) {
     if (Component) {
         if (parent === null || parent === void 0 ? void 0 : parent.loading) {
             var Loading = parent.loading;
-            element = /* @__PURE__ */ jsx(Suspense, {
-                fallback: /* @__PURE__ */ jsx(Loading, {}),
-                children: /* @__PURE__ */ jsx(Component, {})
-            });
-        } else if (!(parent === null || parent === void 0 ? void 0 : parent.index)) {
+            if (isLoadableComponent(Component)) {
+                element = /* @__PURE__ */ jsx(Component, {
+                    fallback: /* @__PURE__ */ jsx(Loading, {})
+                });
+            } else {
+                element = /* @__PURE__ */ jsx(Suspense, {
+                    fallback: /* @__PURE__ */ jsx(Loading, {}),
+                    children: /* @__PURE__ */ jsx(Component, {})
+                });
+            }
+        } else if (isLoadableComponent(Component) || isRoot) {
+            element = /* @__PURE__ */ jsx(Component, {});
+        } else {
             element = /* @__PURE__ */ jsx(Suspense, {
                 children: /* @__PURE__ */ jsx(Component, {})
             });
-        } else {
-            element = /* @__PURE__ */ jsx(Component, {});
         }
     } else {
         nestedRoute.loading = parent === null || parent === void 0 ? void 0 : parent.loading;
     }
-    if (!parent && element) {
-        element = /* @__PURE__ */ jsx(RootLayout, {
-            routes: [
-                nestedRoute
-            ],
-            children: element
-        });
-    }
     if (element) {
         routeProps.element = element;
     }
@@ -237,4 +235,25 @@ function standardSlash(str) {
     }
     return addr;
 }
+function createLoader(route) {
+    var loader = route.loader;
+    if (loader) {
+        return function(args) {
+            if (typeof route.lazyImport === "function") {
+                route.lazyImport();
+            }
+            return loader(args);
+        };
+    } else {
+        return function() {
+            if (typeof route.lazyImport === "function") {
+                route.lazyImport();
+            }
+            return null;
+        };
+    }
+}
+function isLoadableComponent(component) {
+    return component && component.displayName === "Loadable" && component.preload && typeof component.preload === "function";
+}
 export { getLocation, getRouteComponents, renderRoutes, standardSlash, urlJoin };

package/dist/js/treeshaking/ssr/cli/index.js

@@ -128,8 +128,7 @@ var cli_default = function() {
                                         }
                                     ]);
                                 }
-                                var prefix = "".concat(appContext.metaName.split(/[-_]/)[0], "_").toUpperCase();
-                                var modernVars = _defineProperty({}, "process.env.".concat(prefix, "TARGET"), JSON.stringify(isServer ? "node" : "browser"));
+                                var modernVars = _defineProperty({}, "process.env.MODERN_TARGET", JSON.stringify(isServer ? "node" : "browser"));
                                 chain.plugin(CHAIN_ID.PLUGIN.DEFINE).tap(function(args) {
                                     var _args = _toArray(args), vars = _args[0], rest = _args.slice(1);
                                     return [

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.1",
+  "version": "2.1.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -155,9 +155,10 @@
     "redux-logger": "^3.0.6",
     "serialize-javascript": "^6.0.0",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.0.1",
-    "@modern-js/types": "2.0.1",
-    "@modern-js/utils": "2.0.1"
+    "esbuild": "0.15.7",
+    "@modern-js/plugin": "2.1.0",
+    "@modern-js/types": "2.1.0",
+    "@modern-js/utils": "2.1.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -178,11 +179,11 @@
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.0.1",
-    "@modern-js/core": "2.0.1",
-    "@modern-js/server-core": "2.0.1",
-    "@scripts/jest-config": "2.0.1",
-    "@scripts/build": "2.0.1"
+    "@modern-js/app-tools": "2.1.0",
+    "@modern-js/core": "2.1.0",
+    "@modern-js/server-core": "2.1.0",
+    "@scripts/build": "2.1.0",
+    "@scripts/jest-config": "2.1.0"
   },
   "sideEffects": false,
   "modernConfig": {},

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

@@ -1,19 +0,0 @@
-import { Fragment, jsx } from "react/jsx-runtime";
-import { useContext, useEffect } from "react";
-import { useLocation } from "react-router-dom";
-import { RuntimeReactContext } from "../../../core";
-import { handleLoad } from "./load";
-function RootLayout(props) {
-  const location = useLocation();
-  const context = useContext(RuntimeReactContext);
-  useEffect(() => {
-    const { routes } = props;
-    handleLoad(routes, location, context.routeManifest);
-  }, [location]);
-  return /* @__PURE__ */ jsx(Fragment, {
-    children: props.children
-  });
-}
-export {
-  RootLayout
-};

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

@@ -1,82 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import { matchRoutes } from "react-router-dom";
-class Logger {
-  static getLogger(options) {
-    if (this.logger) {
-      return this.logger;
-    }
-    this.logger = new Logger(options);
-    return this.logger;
-  }
-  constructor(options) {
-    this.enableLogging = options.enableLogging;
-  }
-  log(...args) {
-    if (this.enableLogging) {
-      console.log(...args);
-    }
-  }
-}
-function handleLoad(routes, location, routeManifest) {
-  if (!routeManifest || !routeManifest.enableFetchParallel === false) {
-    return;
-  }
-  const { routeAssets } = routeManifest;
-  Logger.getLogger({ enableLogging: routeManifest.enableLogging }).log(
-    "handle page load"
-  );
-  const matches = matchClientRoutes(routes, location);
-  matches == null ? void 0 : matches.forEach((match) => loadRouteModule(match.route, routeAssets));
-}
-function matchClientRoutes(routes, location) {
-  const matches = matchRoutes(routes, location);
-  return matches;
-}
-function loadRouteModule(route, routeAssets) {
-  return __async(this, null, function* () {
-    const routeId = route.id;
-    if (!routeId) {
-      return;
-    }
-    if (!routeAssets[routeId]) {
-      return;
-    }
-    const { chunkIds } = routeAssets[routeId];
-    if (!chunkIds) {
-      return;
-    }
-    try {
-      yield Promise.all(
-        chunkIds.map((chunkId) => {
-          return __webpack_chunk_load__(String(chunkId));
-        })
-      );
-    } catch (error) {
-      console.error(error);
-    }
-  });
-}
-export {
-  handleLoad,
-  loadRouteModule,
-  matchClientRoutes
-};

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

@@ -1,42 +0,0 @@
-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 root_exports = {};
-__export(root_exports, {
-  RootLayout: () => RootLayout
-});
-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");
-var import_core = require("../../../core");
-var import_load = require("./load");
-function RootLayout(props) {
-  const location = (0, import_react_router_dom.useLocation)();
-  const context = (0, import_react.useContext)(import_core.RuntimeReactContext);
-  (0, import_react.useEffect)(() => {
-    const { routes } = props;
-    (0, import_load.handleLoad)(routes, location, context.routeManifest);
-  }, [location]);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
-    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

@@ -1,107 +0,0 @@
-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 __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    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) {
-      return this.logger;
-    }
-    this.logger = new Logger(options);
-    return this.logger;
-  }
-  constructor(options) {
-    this.enableLogging = options.enableLogging;
-  }
-  log(...args) {
-    if (this.enableLogging) {
-      console.log(...args);
-    }
-  }
-}
-function handleLoad(routes, location, routeManifest) {
-  if (!routeManifest || !routeManifest.enableFetchParallel === false) {
-    return;
-  }
-  const { routeAssets } = routeManifest;
-  Logger.getLogger({ enableLogging: routeManifest.enableLogging }).log(
-    "handle page load"
-  );
-  const matches = matchClientRoutes(routes, location);
-  matches == null ? void 0 : matches.forEach((match) => loadRouteModule(match.route, routeAssets));
-}
-function matchClientRoutes(routes, location) {
-  const matches = (0, import_react_router_dom.matchRoutes)(routes, location);
-  return matches;
-}
-function loadRouteModule(route, routeAssets) {
-  return __async(this, null, function* () {
-    const routeId = route.id;
-    if (!routeId) {
-      return;
-    }
-    if (!routeAssets[routeId]) {
-      return;
-    }
-    const { chunkIds } = routeAssets[routeId];
-    if (!chunkIds) {
-      return;
-    }
-    try {
-      yield Promise.all(
-        chunkIds.map((chunkId) => {
-          return __webpack_chunk_load__(String(chunkId));
-        })
-      );
-    } catch (error) {
-      console.error(error);
-    }
-  });
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  handleLoad,
-  loadRouteModule,
-  matchClientRoutes
-});

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

@@ -1,19 +0,0 @@
-import { Fragment, jsx } from "react/jsx-runtime";
-import { useContext, useEffect } from "react";
-import { useLocation } from "react-router-dom";
-import { RuntimeReactContext } from "../../../core";
-import { handleLoad } from "./load";
-function RootLayout(props) {
-    var location = useLocation();
-    var context = useContext(RuntimeReactContext);
-    useEffect(function() {
-        var routes = props.routes;
-        handleLoad(routes, location, context.routeManifest);
-    }, [
-        location
-    ]);
-    return /* @__PURE__ */ jsx(Fragment, {
-        children: props.children
-    });
-}
-export { RootLayout };

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

@@ -1,297 +0,0 @@
-function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
-    return arr2;
-}
-function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
-}
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-    try {
-        var info = gen[key](arg);
-        var value = info.value;
-    } catch (error) {
-        reject(error);
-        return;
-    }
-    if (info.done) {
-        resolve(value);
-    } else {
-        Promise.resolve(value).then(_next, _throw);
-    }
-}
-function _asyncToGenerator(fn) {
-    return function() {
-        var self = this, args = arguments;
-        return new Promise(function(resolve, reject) {
-            var gen = fn.apply(self, args);
-            function _next(value) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-            }
-            function _throw(err) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-            }
-            _next(undefined);
-        });
-    };
-}
-function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
-function _defineProperty(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-function _iterableToArray(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
-function _nonIterableSpread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
-}
-function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-}
-var __generator = this && this.__generator || function(thisArg, body) {
-    var f, y, t, g, _ = {
-        label: 0,
-        sent: function() {
-            if (t[0] & 1) throw t[1];
-            return t[1];
-        },
-        trys: [],
-        ops: []
-    };
-    return g = {
-        next: verb(0),
-        "throw": verb(1),
-        "return": verb(2)
-    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
-    }), g;
-    function verb(n) {
-        return function(v) {
-            return step([
-                n,
-                v
-            ]);
-        };
-    }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while(_)try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [
-                op[0] & 2,
-                t.value
-            ];
-            switch(op[0]){
-                case 0:
-                case 1:
-                    t = op;
-                    break;
-                case 4:
-                    _.label++;
-                    return {
-                        value: op[1],
-                        done: false
-                    };
-                case 5:
-                    _.label++;
-                    y = op[1];
-                    op = [
-                        0
-                    ];
-                    continue;
-                case 7:
-                    op = _.ops.pop();
-                    _.trys.pop();
-                    continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                        _ = 0;
-                        continue;
-                    }
-                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                        _.label = op[1];
-                        break;
-                    }
-                    if (op[0] === 6 && _.label < t[1]) {
-                        _.label = t[1];
-                        t = op;
-                        break;
-                    }
-                    if (t && _.label < t[2]) {
-                        _.label = t[2];
-                        _.ops.push(op);
-                        break;
-                    }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop();
-                    continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) {
-            op = [
-                6,
-                e
-            ];
-            y = 0;
-        } finally{
-            f = t = 0;
-        }
-        if (op[0] & 5) throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
-};
-import { matchRoutes } from "react-router-dom";
-var Logger = /*#__PURE__*/ function() {
-    "use strict";
-    function Logger(options) {
-        _classCallCheck(this, Logger);
-        _defineProperty(this, "enableLogging", void 0);
-        this.enableLogging = options.enableLogging;
-    }
-    _createClass(Logger, [
-        {
-            key: "log",
-            value: function log() {
-                for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
-                    args[_key] = arguments[_key];
-                }
-                if (this.enableLogging) {
-                    var _console;
-                    (_console = console).log.apply(_console, _toConsumableArray(args));
-                }
-            }
-        }
-    ], [
-        {
-            key: "getLogger",
-            value: function getLogger(options) {
-                if (this.logger) {
-                    return this.logger;
-                }
-                this.logger = new Logger(options);
-                return this.logger;
-            }
-        }
-    ]);
-    return Logger;
-}();
-_defineProperty(Logger, "logger", void 0);
-function handleLoad(routes, location, routeManifest) {
-    if (!routeManifest || !routeManifest.enableFetchParallel === false) {
-        return;
-    }
-    var routeAssets = routeManifest.routeAssets;
-    Logger.getLogger({
-        enableLogging: routeManifest.enableLogging
-    }).log("handle page load");
-    var matches = matchClientRoutes(routes, location);
-    matches === null || matches === void 0 ? void 0 : matches.forEach(function(match) {
-        return loadRouteModule(match.route, routeAssets);
-    });
-}
-function matchClientRoutes(routes, location) {
-    var matches = matchRoutes(routes, location);
-    return matches;
-}
-function loadRouteModule(route, routeAssets) {
-    return _loadRouteModule.apply(this, arguments);
-}
-function _loadRouteModule() {
-    _loadRouteModule = _asyncToGenerator(function(route, routeAssets) {
-        var routeId, chunkIds, error;
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    routeId = route.id;
-                    if (!routeId) {
-                        return [
-                            2
-                        ];
-                    }
-                    if (!routeAssets[routeId]) {
-                        return [
-                            2
-                        ];
-                    }
-                    chunkIds = routeAssets[routeId].chunkIds;
-                    if (!chunkIds) {
-                        return [
-                            2
-                        ];
-                    }
-                    _state.label = 1;
-                case 1:
-                    _state.trys.push([
-                        1,
-                        3,
-                        ,
-                        4
-                    ]);
-                    return [
-                        4,
-                        Promise.all(chunkIds.map(function(chunkId) {
-                            return __webpack_chunk_load__(String(chunkId));
-                        }))
-                    ];
-                case 2:
-                    _state.sent();
-                    return [
-                        3,
-                        4
-                    ];
-                case 3:
-                    error = _state.sent();
-                    console.error(error);
-                    return [
-                        3,
-                        4
-                    ];
-                case 4:
-                    return [
-                        2
-                    ];
-            }
-        });
-    });
-    return _loadRouteModule.apply(this, arguments);
-}
-export { handleLoad, loadRouteModule, matchClientRoutes };

package/dist/types/router/runtime/root/index.d.ts

@@ -1,8 +0,0 @@
-import React from 'react';
-import type { NestedRoute } from '@modern-js/types';
-interface IProps {
-  children: React.ReactNode;
-  routes: NestedRoute[];
-}
-export declare function RootLayout(props: IProps): JSX.Element;
-export {};

package/dist/types/router/runtime/root/load.d.ts

@@ -1,22 +0,0 @@
-import { Location, Params } from 'react-router-dom';
-import type { NestedRoute } from '@modern-js/types';
-interface RouteAssets {
-  [routeId: string]: {
-    chunkIds?: (string | number)[];
-    assets?: string[];
-  };
-}
-interface RouteManifest {
-  routeAssets: RouteAssets;
-  enableFetchParallel?: boolean;
-  enableLogging?: boolean;
-}
-export interface RouteMatch<Route> {
-  params: Params;
-  pathname: string;
-  route: Route;
-}
-export declare function handleLoad(routes: NestedRoute[], location: Location, routeManifest: RouteManifest): void;
-export declare function matchClientRoutes(routes: NestedRoute[], location: Location): RouteMatch<NestedRoute>[];
-export declare function loadRouteModule(route: NestedRoute, routeAssets: RouteAssets): Promise<string[] | void>;
-export {};