@modern-js/plugin-data-loader 0.0.0-next-1680077090761 → 0.0.0-next-1680093705168

package/CHANGELOG.md

@@ -1,21 +1,27 @@
 # @modern-js/plugin-data-loader
 
-## 0.0.0-next-1680077090761
+## 0.0.0-next-1680093705168
 
 ### Patch Changes
 
-- e2466a107: fix: remove nestedRoutes file from @modern-js/utils
+- 5d624fdc1d: feat: assets and data prefetching is supported
+  feat: 支持资源和数据预加载
+- e2466a1071: fix: remove nestedRoutes file from @modern-js/utils
   fix: 将 nestedRoutes 从 @modern-js/utils 中移除
-- 381a3b9f3: feat(utils): move universal utils to the universal folder
+- 381a3b9f32: feat(utils): move universal utils to the universal folder
 
   feat(utils): 将运行时使用的 utils 移动到 universal 目录
 
-- Updated dependencies [e2466a107]
-- Updated dependencies [02bb383cb]
-- Updated dependencies [381a3b9f3]
-- Updated dependencies [7a60f1071]
-- Updated dependencies [274b2e535]
-  - @modern-js/utils@0.0.0-next-1680077090761
+- Updated dependencies [cfb058fbf6]
+- Updated dependencies [1d045b84ef]
+- Updated dependencies [5d624fdc1d]
+- Updated dependencies [e2466a1071]
+- Updated dependencies [02bb383cb0]
+- Updated dependencies [381a3b9f32]
+- Updated dependencies [7a60f1071d]
+- Updated dependencies [274b2e535a]
+- Updated dependencies [b9e1c546bd]
+  - @modern-js/utils@0.0.0-next-1680093705168
 
 ## 2.10.0
 

package/dist/cjs/runtime/index.js

@@ -25,9 +25,9 @@ module.exports = __toCommonJS(runtime_exports);
 var import_node = require("@remix-run/node");
 var import_remix_router = require("@modern-js/utils/universal/remix-router");
 var import_lodash = require("@modern-js/utils/lodash");
+var import_nestedRoutes = require("@modern-js/utils/universal/nestedRoutes");
 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/esm/runtime/index.js

@@ -178,9 +178,9 @@ var __generator = this && this.__generator || function(thisArg, body) {
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
 import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/universal/remix-router";
 import { isPlainObject } from "@modern-js/utils/lodash";
+import { transformNestedRoutes } from "@modern-js/utils/universal/nestedRoutes";
 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-node/runtime/index.js

@@ -9,9 +9,9 @@ import {
   UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL
 } from "@modern-js/utils/universal/remix-router";
 import { isPlainObject } from "@modern-js/utils/lodash";
+import { transformNestedRoutes } from "@modern-js/utils/universal/nestedRoutes";
 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/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-next-1680077090761",
+  "version": "0.0.0-next-1680093705168",
   "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-1680077090761"
+    "@modern-js/utils": "0.0.0-next-1680093705168"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -72,11 +72,11 @@
     "webpack-chain": "^6.5.1",
     "react": ">=17.0.0",
     "react-router-dom": "^6.8.1",
-    "@modern-js/core": "0.0.0-next-1680077090761",
-    "@modern-js/server-core": "0.0.0-next-1680077090761",
-    "@modern-js/types": "0.0.0-next-1680077090761",
-    "@scripts/build": "0.0.0-next-1680077090761",
-    "@scripts/jest-config": "0.0.0-next-1680077090761"
+    "@modern-js/core": "0.0.0-next-1680093705168",
+    "@modern-js/server-core": "0.0.0-next-1680093705168",
+    "@modern-js/types": "0.0.0-next-1680093705168",
+    "@scripts/build": "0.0.0-next-1680093705168",
+    "@scripts/jest-config": "0.0.0-next-1680093705168"
   },
   "peerDependencies": {
     "react": ">=17.0.0",

package/dist/cjs/runtime/nestedRoutes.js

@@ -1,114 +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 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/esm/runtime/nestedRoutes.js

@@ -1,174 +0,0 @@
-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-node/runtime/nestedRoutes.js

@@ -1,93 +0,0 @@
-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/types/runtime/nestedRoutes.d.ts

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