@modern-js/plugin-data-loader 0.0.0-next-1679563983140 → 0.0.0-next-1679753199581

package/CHANGELOG.md

@@ -1,26 +1,41 @@
 # @modern-js/plugin-data-loader
 
-## 0.0.0-next-1679563983140
+## 0.0.0-next-1679753199581
 
 ### Patch Changes
 
-- 3e0bd5084: feat: when enable bff handle render, support use `useContext` to get framework plugin context in data loader.
+- e2466a107: fix: remove nestedRoutes file from @modern-js/utils
+  fix: 将 nestedRoutes 从 @modern-js/utils 中移除
+- 381a3b9f3: feat(utils): move universal utils to the universal folder
+
+  feat(utils): 将运行时使用的 utils 移动到 universal 目录
+
+- Updated dependencies [e2466a107]
+- Updated dependencies [02bb383cb]
+- Updated dependencies [381a3b9f3]
+  - @modern-js/utils@0.0.0-next-1679753199581
+
+## 2.10.0
+
+### Patch Changes
+
+- 3e0bd50: feat: when enable bff handle render, support use `useContext` to get framework plugin context in data loader.
   feat: 当开启 BFF 托管渲染时，支持在 data loader 中使用 `useContext` 获取框架插件提供的上下文。
-- 0da32d0ae: chore: upgrade jest and puppeteer
+- 0da32d0: chore: upgrade jest and puppeteer
   chore: 升级 jest 和 puppeteer 到 latest
-- 0d9962bf4: fix: add types field in package.json
+- 0d9962b: fix: add types field in package.json
   fix: 添加 package.json 中的 types 字段
-- fbefa7ecf: chore(deps): bump webpack from 5.75.0 to 5.76.2
+- fbefa7e: chore(deps): bump webpack from 5.75.0 to 5.76.2
 
   chore(deps): 将 webpack 从 5.75.0 升级至 5.76.2
 
-- d6b6e29bb: fix: split server and runtime code in plugin-data-loader
+- d6b6e29: fix: split server and runtime code in plugin-data-loader
   fix: 分离 plugin-data-loader 中服务端和客户端运行时的代码
-- Updated dependencies [0da32d0ae]
-- Updated dependencies [fbefa7ecf]
-- Updated dependencies [4d542339b]
-- Updated dependencies [6db486404]
-  - @modern-js/utils@0.0.0-next-1679563983140
+- Updated dependencies [0da32d0]
+- Updated dependencies [fbefa7e]
+- Updated dependencies [4d54233]
+- Updated dependencies [6db4864]
+  - @modern-js/utils@2.10.0
 
 ## 2.9.0
 

package/dist/cjs/cli/data.js

@@ -20,7 +20,7 @@ __export(data_exports, {
   parseDeferredReadableStream: () => parseDeferredReadableStream
 });
 module.exports = __toCommonJS(data_exports);
-var import_remix_router = require("@modern-js/utils/remix-router");
+var import_remix_router = require("@modern-js/utils/universal/remix-router");
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 async function parseDeferredReadableStream(stream) {
   if (!stream) {

package/dist/cjs/runtime/index.js

@@ -23,11 +23,11 @@ __export(runtime_exports, {
 });
 module.exports = __toCommonJS(runtime_exports);
 var import_node = require("@remix-run/node");
-var import_nestedRoutes = require("@modern-js/utils/nestedRoutes");
-var import_remix_router = require("@modern-js/utils/remix-router");
+var import_remix_router = require("@modern-js/utils/universal/remix-router");
 var import_lodash = require("@modern-js/utils/lodash");
 var import_constants = require("../common/constants");
 var import_utils = require("../common/utils");
+var import_nestedRoutes = require("./nestedRoutes");
 var import_response = require("./response");
 (0, import_node.installGlobals)();
 const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);

package/dist/cjs/runtime/nestedRoutes.js

@@ -0,0 +1,114 @@
+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 nestedRoutes_exports = {};
+__export(nestedRoutes_exports, {
+  renderNestedRoute: () => renderNestedRoute,
+  transformNestedRoutes: () => transformNestedRoutes
+});
+module.exports = __toCommonJS(nestedRoutes_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_react = require("react");
+var import_react_router_dom = require("react-router-dom");
+const transformNestedRoutes = (routes) => {
+  const routeElements = [];
+  for (const route of routes) {
+    const routeElement = renderNestedRoute(route);
+    routeElements.push(routeElement);
+  }
+  return (0, import_react_router_dom.createRoutesFromElements)(routeElements);
+};
+const renderNestedRoute = (nestedRoute, options = {}) => {
+  const { children, index, id, component, isRoot, lazyImport } = nestedRoute;
+  const Component = component;
+  const { parent, DeferredDataComponent } = options;
+  const routeProps = {
+    caseSensitive: nestedRoute.caseSensitive,
+    path: nestedRoute.path,
+    id: nestedRoute.id,
+    loader: createLoader(nestedRoute),
+    action: nestedRoute.action,
+    hasErrorBoundary: nestedRoute.hasErrorBoundary,
+    shouldRevalidate: nestedRoute.shouldRevalidate,
+    handle: nestedRoute.handle,
+    index: nestedRoute.index,
+    element: nestedRoute.element,
+    errorElement: nestedRoute.errorElement
+  };
+  if (nestedRoute.error) {
+    const errorElement = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(nestedRoute.error, {});
+    routeProps.errorElement = errorElement;
+  }
+  let element;
+  if (Component) {
+    if ((parent == null ? void 0 : parent.loading) && lazyImport) {
+      const Loading = parent.loading;
+      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) && lazyImport) {
+      element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {});
+    } else if (isRoot) {
+      element = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {}),
+        typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DeferredDataComponent, {})
+      ] });
+    } else if (lazyImport) {
+      element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, { fallback: null, 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 (element) {
+    routeProps.element = element;
+  }
+  const childElements = children == null ? void 0 : children.map((childRoute) => {
+    return renderNestedRoute(childRoute, { parent: nestedRoute });
+  });
+  const routeElement = index ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, { ...routeProps, index: true }, id) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, { ...routeProps, index: false, children: childElements }, id);
+  return routeElement;
+};
+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 = {
+  renderNestedRoute,
+  transformNestedRoutes
+});

package/dist/cjs/runtime/response.js

@@ -21,7 +21,7 @@ __export(response_exports, {
 });
 module.exports = __toCommonJS(response_exports);
 var import_util = require("util");
-var import_serialize = require("@modern-js/utils/serialize");
+var import_serialize = require("@modern-js/utils/universal/serialize");
 function isTrackedPromise(value) {
   return value != null && typeof value.then === "function" && value._tracked === true;
 }

package/dist/cjs/server/index.js

@@ -32,8 +32,8 @@ __export(server_exports, {
 module.exports = __toCommonJS(server_exports);
 var import_path = __toESM(require("path"));
 var import_fs = __toESM(require("fs"));
-var import_utils = require("@modern-js/utils");
-var import_utils2 = require("../common/utils");
+var import_constants = require("@modern-js/utils/constants");
+var import_utils = require("../common/utils");
 var server_default = () => ({
   name: "@modern-js/plugin-data-loader",
   setup: () => ({
@@ -42,14 +42,14 @@ var server_default = () => ({
       distDir
     }) {
       return async (context) => {
-        const entry = (0, import_utils2.matchEntry)(context.path, serverRoutes);
+        const entry = (0, import_utils.matchEntry)(context.path, serverRoutes);
         if (!entry) {
           return;
         }
         const routesPath = import_path.default.join(
           distDir,
-          import_utils.SERVER_BUNDLE_DIRECTORY,
-          `${entry.entryName || import_utils.MAIN_ENTRY_NAME}-server-loaders.js`
+          import_constants.SERVER_BUNDLE_DIRECTORY,
+          `${entry.entryName || import_constants.MAIN_ENTRY_NAME}-server-loaders.js`
         );
         if (!import_fs.default.existsSync(routesPath)) {
           return;

package/dist/esm/cli/data.js

@@ -344,7 +344,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { UNSAFE_DeferredData as DeferredData, AbortedDeferredError } from "@modern-js/utils/remix-router";
+import { UNSAFE_DeferredData as DeferredData, AbortedDeferredError } from "@modern-js/utils/universal/remix-router";
 var DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 function parseDeferredReadableStream(stream) {
     return _parseDeferredReadableStream.apply(this, arguments);

package/dist/esm/runtime/index.js

@@ -176,11 +176,11 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
-import { transformNestedRoutes } from "@modern-js/utils/nestedRoutes";
-import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/remix-router";
+import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/universal/remix-router";
 import { isPlainObject } from "@modern-js/utils/lodash";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
 import { matchEntry } from "../common/utils";
+import { transformNestedRoutes } from "./nestedRoutes";
 import { createDeferredReadableStream } from "./response";
 installGlobals();
 var redirectStatusCodes = /* @__PURE__ */ new Set([

package/dist/esm/runtime/nestedRoutes.js

@@ -0,0 +1,174 @@
+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 _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { Suspense } from "react";
+import { createRoutesFromElements, Route } from "react-router-dom";
+var transformNestedRoutes = function(routes) {
+    var routeElements = [];
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = routes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var route = _step.value;
+            var routeElement = renderNestedRoute(route);
+            routeElements.push(routeElement);
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return createRoutesFromElements(routeElements);
+};
+var renderNestedRoute = function(nestedRoute) {
+    var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+    var children = nestedRoute.children, index = nestedRoute.index, id = nestedRoute.id, component = nestedRoute.component, isRoot = nestedRoute.isRoot, lazyImport = nestedRoute.lazyImport;
+    var Component = component;
+    var parent = options.parent, DeferredDataComponent = options.DeferredDataComponent;
+    var routeProps = {
+        caseSensitive: nestedRoute.caseSensitive,
+        path: nestedRoute.path,
+        id: nestedRoute.id,
+        loader: createLoader(nestedRoute),
+        action: nestedRoute.action,
+        hasErrorBoundary: nestedRoute.hasErrorBoundary,
+        shouldRevalidate: nestedRoute.shouldRevalidate,
+        handle: nestedRoute.handle,
+        index: nestedRoute.index,
+        element: nestedRoute.element,
+        errorElement: nestedRoute.errorElement
+    };
+    if (nestedRoute.error) {
+        var errorElement = /* @__PURE__ */ jsx(nestedRoute.error, {});
+        routeProps.errorElement = errorElement;
+    }
+    var element;
+    if (Component) {
+        if ((parent === null || parent === void 0 ? void 0 : parent.loading) && lazyImport) {
+            var Loading = parent.loading;
+            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) && lazyImport) {
+            element = /* @__PURE__ */ jsx(Component, {});
+        } else if (isRoot) {
+            element = /* @__PURE__ */ jsxs(Fragment, {
+                children: [
+                    /* @__PURE__ */ jsx(Component, {}),
+                    typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ jsx(DeferredDataComponent, {})
+                ]
+            });
+        } else if (lazyImport) {
+            element = /* @__PURE__ */ jsx(Suspense, {
+                fallback: null,
+                children: /* @__PURE__ */ jsx(Component, {})
+            });
+        } else {
+            element = /* @__PURE__ */ jsx(Component, {});
+        }
+    } else {
+        nestedRoute.loading = parent === null || parent === void 0 ? void 0 : parent.loading;
+    }
+    if (element) {
+        routeProps.element = element;
+    }
+    var childElements = children === null || children === void 0 ? void 0 : children.map(function(childRoute) {
+        return renderNestedRoute(childRoute, {
+            parent: nestedRoute
+        });
+    });
+    var routeElement = index ? /* @__PURE__ */ jsx(Route, _objectSpreadProps(_objectSpread({}, routeProps), {
+        index: true
+    }), id) : /* @__PURE__ */ jsx(Route, _objectSpreadProps(_objectSpread({}, routeProps), {
+        index: false,
+        children: childElements
+    }), id);
+    return routeElement;
+};
+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 { renderNestedRoute, transformNestedRoutes };

package/dist/esm/runtime/response.js

@@ -182,7 +182,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { TextEncoder } from "util";
-import { serializeJson } from "@modern-js/utils/serialize";
+import { serializeJson } from "@modern-js/utils/universal/serialize";
 function isTrackedPromise(value) {
     return value != null && typeof value.then === "function" && value._tracked === true;
 }

package/dist/esm/server/index.js

@@ -124,7 +124,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import path from "path";
 import fs from "fs";
-import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
+import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils/constants";
 import { matchEntry } from "../common/utils";
 var server_default = function() {
     return {

package/dist/esm-node/cli/data.js

@@ -1,7 +1,7 @@
 import {
   UNSAFE_DeferredData as DeferredData,
   AbortedDeferredError
-} from "@modern-js/utils/remix-router";
+} from "@modern-js/utils/universal/remix-router";
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 async function parseDeferredReadableStream(stream) {
   if (!stream) {

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

@@ -3,15 +3,15 @@ import {
   writeReadableStreamToWritable,
   Response as NodeResponse
 } from "@remix-run/node";
-import { transformNestedRoutes } from "@modern-js/utils/nestedRoutes";
 import {
   createStaticHandler,
   ErrorResponse,
   UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL
-} from "@modern-js/utils/remix-router";
+} from "@modern-js/utils/universal/remix-router";
 import { isPlainObject } from "@modern-js/utils/lodash";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
 import { matchEntry } from "../common/utils";
+import { transformNestedRoutes } from "./nestedRoutes";
 import { createDeferredReadableStream } from "./response";
 installGlobals();
 const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);

package/dist/esm-node/runtime/nestedRoutes.js

@@ -0,0 +1,93 @@
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { Suspense } from "react";
+import {
+  createRoutesFromElements,
+  Route
+} from "react-router-dom";
+const transformNestedRoutes = (routes) => {
+  const routeElements = [];
+  for (const route of routes) {
+    const routeElement = renderNestedRoute(route);
+    routeElements.push(routeElement);
+  }
+  return createRoutesFromElements(routeElements);
+};
+const renderNestedRoute = (nestedRoute, options = {}) => {
+  const { children, index, id, component, isRoot, lazyImport } = nestedRoute;
+  const Component = component;
+  const { parent, DeferredDataComponent } = options;
+  const routeProps = {
+    caseSensitive: nestedRoute.caseSensitive,
+    path: nestedRoute.path,
+    id: nestedRoute.id,
+    loader: createLoader(nestedRoute),
+    action: nestedRoute.action,
+    hasErrorBoundary: nestedRoute.hasErrorBoundary,
+    shouldRevalidate: nestedRoute.shouldRevalidate,
+    handle: nestedRoute.handle,
+    index: nestedRoute.index,
+    element: nestedRoute.element,
+    errorElement: nestedRoute.errorElement
+  };
+  if (nestedRoute.error) {
+    const errorElement = /* @__PURE__ */ jsx(nestedRoute.error, {});
+    routeProps.errorElement = errorElement;
+  }
+  let element;
+  if (Component) {
+    if ((parent == null ? void 0 : parent.loading) && lazyImport) {
+      const Loading = parent.loading;
+      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) && lazyImport) {
+      element = /* @__PURE__ */ jsx(Component, {});
+    } else if (isRoot) {
+      element = /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(Component, {}),
+        typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ jsx(DeferredDataComponent, {})
+      ] });
+    } else if (lazyImport) {
+      element = /* @__PURE__ */ jsx(Suspense, { fallback: null, children: /* @__PURE__ */ jsx(Component, {}) });
+    } else {
+      element = /* @__PURE__ */ jsx(Component, {});
+    }
+  } else {
+    nestedRoute.loading = parent == null ? void 0 : parent.loading;
+  }
+  if (element) {
+    routeProps.element = element;
+  }
+  const childElements = children == null ? void 0 : children.map((childRoute) => {
+    return renderNestedRoute(childRoute, { parent: nestedRoute });
+  });
+  const routeElement = index ? /* @__PURE__ */ jsx(Route, { ...routeProps, index: true }, id) : /* @__PURE__ */ jsx(Route, { ...routeProps, index: false, children: childElements }, id);
+  return routeElement;
+};
+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 {
+  renderNestedRoute,
+  transformNestedRoutes
+};

package/dist/esm-node/runtime/response.js

@@ -1,5 +1,5 @@
 import { TextEncoder } from "util";
-import { serializeJson } from "@modern-js/utils/serialize";
+import { serializeJson } from "@modern-js/utils/universal/serialize";
 function isTrackedPromise(value) {
   return value != null && typeof value.then === "function" && value._tracked === true;
 }

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

@@ -1,6 +1,9 @@
 import path from "path";
 import fs from "fs";
-import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
+import {
+  MAIN_ENTRY_NAME,
+  SERVER_BUNDLE_DIRECTORY
+} from "@modern-js/utils/constants";
 import { matchEntry } from "../common/utils";
 var server_default = () => ({
   name: "@modern-js/plugin-data-loader",

package/dist/types/cli/createRequest.d.ts

@@ -1,4 +1,4 @@
-import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/remix-router';
+import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/universal/remix-router';
 export declare const getRequestUrl: ({
   params,
   request,

package/dist/types/cli/data.d.ts

@@ -7,5 +7,5 @@
  * Copyright 2021 Remix Software Inc.
  * https://github.com/remix-run/remix/blob/2b5e1a72fc628d0408e27cf4d72e537762f1dc5b/LICENSE.md
  */
-import { UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/remix-router';
+import { UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/universal/remix-router';
 export declare function parseDeferredReadableStream(stream: ReadableStream<Uint8Array>): Promise<DeferredData>;

package/dist/types/runtime/nestedRoutes.d.ts

@@ -0,0 +1,6 @@
+import type { NestedRoute } from '@modern-js/types';
+export declare const transformNestedRoutes: (routes: NestedRoute[]) => import("react-router-dom").RouteObject[];
+export declare const renderNestedRoute: (nestedRoute: NestedRoute, options?: {
+  parent?: NestedRoute;
+  DeferredDataComponent?: () => JSX.Element | null;
+}) => JSX.Element;

package/dist/types/runtime/response.d.ts

@@ -1,2 +1,2 @@
-import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/remix-router';
+import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/universal/remix-router';
 export declare function createDeferredReadableStream(deferredData: DeferredData, signal: AbortSignal): any;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-next-1679563983140",
+  "version": "0.0.0-next-1679753199581",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -55,7 +55,7 @@
     "@remix-run/node": "^1.12.0",
     "path-to-regexp": "^6.2.0",
     "react-router-dom": "^6.8.1",
-    "@modern-js/utils": "0.0.0-next-1679563983140"
+    "@modern-js/utils": "0.0.0-next-1679753199581"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -70,11 +70,17 @@
     "typescript": "^4",
     "webpack": "^5.76.2",
     "webpack-chain": "^6.5.1",
-    "@modern-js/core": "0.0.0-next-1679563983140",
-    "@modern-js/server-core": "0.0.0-next-1679563983140",
-    "@modern-js/types": "0.0.0-next-1679563983140",
-    "@scripts/build": "0.0.0-next-1679563983140",
-    "@scripts/jest-config": "0.0.0-next-1679563983140"
+    "react": ">=17.0.0",
+    "react-router-dom": "^6.8.1",
+    "@modern-js/server-core": "0.0.0-next-1679753199581",
+    "@modern-js/core": "0.0.0-next-1679753199581",
+    "@modern-js/types": "0.0.0-next-1679753199581",
+    "@scripts/jest-config": "0.0.0-next-1679753199581",
+    "@scripts/build": "0.0.0-next-1679753199581"
+  },
+  "peerDependencies": {
+    "react": ">=17.0.0",
+    "react-router-dom": "^6.8.1"
   },
   "sideEffects": false,
   "publishConfig": {