@modern-js/plugin-data-loader 2.20.0 → 2.21.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @modern-js/plugin-data-loader
 
+## 2.21.0
+
+### Patch Changes
+
+- e81eeaf: refactor: guard react-router version consistency
+  refactor: 保证 react-router 相关包的版本一致性
+- 26dcf3a: chore: bump typescript to v5 in devDependencies
+
+  chore: 升级 devDependencies 中的 typescript 版本到 v5
+
+- ad78387: chore(deps): bump babel-related dependencies to latest version
+
+  chore(deps): 升级 babel 相关依赖到最新版本
+
+- Updated dependencies [e81eeaf]
+- Updated dependencies [26dcf3a]
+- Updated dependencies [056627f]
+- Updated dependencies [0fc15ca]
+- Updated dependencies [43b4e83]
+- Updated dependencies [ad78387]
+  - @modern-js/utils@2.21.0
+
 ## 2.20.0
 
 ### Patch Changes

package/dist/cjs/cli/data.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "parseDeferredReadableStream", {
   enumerable: true,
   get: () => parseDeferredReadableStream
 });
-const _router = require("@modern-js/utils/runtime/router");
+const _remixrouter = require("@modern-js/utils/runtime/remix-router");
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 async function parseDeferredReadableStream(stream) {
   if (!stream) {
@@ -65,7 +65,7 @@ async function parseDeferredReadableStream(stream) {
           }
         }
         for (const [key, resolver] of Object.entries(deferredResolvers)) {
-          resolver.reject(new _router.AbortedDeferredError(`Deferred ${key} will never resolved`));
+          resolver.reject(new _remixrouter.AbortedDeferredError(`Deferred ${key} will never resolved`));
         }
       } catch (error) {
         for (const resolver of Object.values(deferredResolvers)) {
@@ -73,7 +73,7 @@ async function parseDeferredReadableStream(stream) {
         }
       }
     })();
-    return new _router.UNSAFE_DeferredData({
+    return new _remixrouter.UNSAFE_DeferredData({
       ...criticalData,
       ...deferredData
     });

package/dist/cjs/runtime/index.js

@@ -15,7 +15,8 @@ _export(exports, {
   handleRequest: () => handleRequest
 });
 const _node = require("@remix-run/node");
-const _router = require("@modern-js/utils/runtime/router");
+const _remixrouter = require("@modern-js/utils/runtime/remix-router");
+const _nestedroutes = require("@modern-js/utils/runtime/nested-routes");
 const _lodash = require("@modern-js/utils/lodash");
 const _constants = require("../common/constants");
 const _utils = require("../common/utils");
@@ -96,8 +97,8 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
     throw new Error("CSR data loader request only support http GET method");
   }
   const basename = entry.urlPath;
-  const routes = (0, _router.transformNestedRoutes)(routesConfig);
-  const { queryRoute } = (0, _router.createStaticHandler)(routes, {
+  const routes = (0, _nestedroutes.transformNestedRoutes)(routesConfig);
+  const { queryRoute } = (0, _remixrouter.createStaticHandler)(routes, {
     basename
   });
   const { res, logger } = context;
@@ -109,8 +110,8 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
     });
     if (isResponse(response) && isRedirectResponse(response.status)) {
       response = convertModernRedirectResponse(response.headers, basename);
-    } else if ((0, _lodash.isPlainObject)(response) && _router.UNSAFE_DEFERRED_SYMBOL in response) {
-      const deferredData = response[_router.UNSAFE_DEFERRED_SYMBOL];
+    } else if ((0, _lodash.isPlainObject)(response) && _remixrouter.UNSAFE_DEFERRED_SYMBOL in response) {
+      const deferredData = response[_remixrouter.UNSAFE_DEFERRED_SYMBOL];
       const body = (0, _response.createDeferredReadableStream)(deferredData, request.signal);
       const init = deferredData.init || {};
       if (init.status && isRedirectResponse(init.status)) {
@@ -132,7 +133,7 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
       });
     }
   } catch (error) {
-    const message = error instanceof _router.ErrorResponse ? error.data : String(error);
+    const message = error instanceof _remixrouter.ErrorResponse ? error.data : String(error);
     logger === null || logger === void 0 ? void 0 : logger.error(message);
     response = new _node.Response(message, {
       status: 500,

package/dist/esm/cli/data.js

@@ -7,7 +7,7 @@ import { _ as _to_array } from "@swc/helpers/_/_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _wrap_async_generator } from "@swc/helpers/_/_wrap_async_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { UNSAFE_DeferredData as DeferredData, AbortedDeferredError } from "@modern-js/utils/runtime/router";
+import { UNSAFE_DeferredData as DeferredData, AbortedDeferredError } from "@modern-js/utils/runtime/remix-router";
 var DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 export function parseDeferredReadableStream(stream) {
   return _parseDeferredReadableStream.apply(this, arguments);

package/dist/esm/runtime/index.js

@@ -3,7 +3,8 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
-import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL, transformNestedRoutes } from "@modern-js/utils/runtime/router";
+import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/runtime/remix-router";
+import { transformNestedRoutes } from "@modern-js/utils/runtime/nested-routes";
 import { isPlainObject } from "@modern-js/utils/lodash";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
 import { matchEntry } from "../common/utils";

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

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

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

@@ -1,5 +1,6 @@
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
-import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL, transformNestedRoutes } from "@modern-js/utils/runtime/router";
+import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/runtime/remix-router";
+import { transformNestedRoutes } from "@modern-js/utils/runtime/nested-routes";
 import { isPlainObject } from "@modern-js/utils/lodash";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
 import { matchEntry } from "../common/utils";

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

@@ -1,4 +1,4 @@
-import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/runtime/router';
+import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/runtime/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/runtime/router';
+import { UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/runtime/remix-router';
 export declare function parseDeferredReadableStream(stream: ReadableStream<Uint8Array>): Promise<DeferredData>;

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

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

package/dist/types/server/index.d.ts

@@ -1,5 +1,3 @@
 import type { ServerPlugin } from '@modern-js/server-core';
-
 declare const _default: () => ServerPlugin;
-
 export default _default;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.20.0",
+  "version": "2.21.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -54,15 +54,15 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.18.0",
+    "@babel/core": "^7.21.8",
     "@remix-run/node": "^1.12.0",
     "path-to-regexp": "^6.2.0",
     "react-router-dom": "^6.8.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.20.0"
+    "@modern-js/utils": "2.21.0"
   },
   "devDependencies": {
-    "@types/babel__core": "^7.1.15",
+    "@types/babel__core": "^7.20.0",
     "@types/jest": "^29",
     "@types/node": "^14",
     "@types/supertest": "^2.0.11",
@@ -70,17 +70,17 @@
     "jest": "^29",
     "memfs": "^3.3.0",
     "supertest": "^6.1.6",
-    "ts-jest": "^29.0.5",
-    "typescript": "^4",
+    "ts-jest": "^29.1.0",
+    "typescript": "^5",
     "webpack": "^5.82.1",
     "webpack-chain": "^6.5.1",
     "react": ">=17.0.0",
     "react-router-dom": "^6.8.1",
-    "@modern-js/core": "2.20.0",
-    "@modern-js/server-core": "2.20.0",
-    "@modern-js/types": "2.20.0",
-    "@scripts/build": "2.20.0",
-    "@scripts/jest-config": "2.20.0"
+    "@modern-js/core": "2.21.0",
+    "@modern-js/server-core": "2.21.0",
+    "@modern-js/types": "2.21.0",
+    "@scripts/jest-config": "2.21.0",
+    "@scripts/build": "2.21.0"
   },
   "peerDependencies": {
     "react": ">=17.0.0",