@modern-js/plugin-data-loader 2.68.0 → 2.68.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -81,7 +81,7 @@ function serializeErrors(errors) {
|
|
|
81
81
|
return serialized;
|
|
82
82
|
}
|
|
83
83
|
function errorResponseToJson(errorResponse) {
|
|
84
|
-
return
|
|
84
|
+
return Response.json(
|
|
85
85
|
// @ts-expect-error This is "private" from users but intended for internal use
|
|
86
86
|
serializeError(errorResponse.error || new Error("Unexpected Server Error")),
|
|
87
87
|
{
|
|
@@ -93,10 +93,10 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
|
|
|
93
93
|
});
|
|
94
94
|
if (isResponse(response) && isRedirectResponse(response.status)) {
|
|
95
95
|
response = convertModernRedirectResponse(response.headers, basename);
|
|
96
|
-
} else if ((0, import_lodash.isPlainObject)(response) && (import_remix_router.
|
|
96
|
+
} else if ((0, import_lodash.isPlainObject)(response) && (import_remix_router.DEFERRED_SYMBOL in response || activeDeferreds.get(routeId))) {
|
|
97
97
|
let deferredData;
|
|
98
|
-
if (import_remix_router.
|
|
99
|
-
deferredData = response[import_remix_router.
|
|
98
|
+
if (import_remix_router.DEFERRED_SYMBOL in response) {
|
|
99
|
+
deferredData = response[import_remix_router.DEFERRED_SYMBOL];
|
|
100
100
|
} else {
|
|
101
101
|
deferredData = activeDeferreds.get(routeId);
|
|
102
102
|
}
|
|
@@ -3,7 +3,7 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
|
|
|
3
3
|
import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
4
4
|
import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
|
|
5
5
|
import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
|
|
6
|
-
import { isRouteErrorResponse
|
|
6
|
+
import { isRouteErrorResponse } from "@modern-js/runtime-utils/remix-router";
|
|
7
7
|
function sanitizeError(error) {
|
|
8
8
|
if (_instanceof(error, Error) && process.env.NODE_ENV !== "development" && process.env.NODE_ENV !== "test") {
|
|
9
9
|
var sanitized = new Error(error.message || "Unexpected Server Error");
|
|
@@ -69,7 +69,7 @@ function serializeErrors(errors) {
|
|
|
69
69
|
return serialized;
|
|
70
70
|
}
|
|
71
71
|
function errorResponseToJson(errorResponse) {
|
|
72
|
-
return json(
|
|
72
|
+
return Response.json(
|
|
73
73
|
// @ts-expect-error This is "private" from users but intended for internal use
|
|
74
74
|
serializeError(errorResponse.error || new Error("Unexpected Server Error")),
|
|
75
75
|
{
|
|
@@ -5,7 +5,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
|
5
5
|
import { transformNestedRoutes } from "@modern-js/runtime-utils/browser";
|
|
6
6
|
import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
|
|
7
7
|
import { storage } from "@modern-js/runtime-utils/node";
|
|
8
|
-
import {
|
|
8
|
+
import { DEFERRED_SYMBOL, createStaticHandler, isRouteErrorResponse } from "@modern-js/runtime-utils/remix-router";
|
|
9
9
|
import { matchEntry } from "@modern-js/runtime-utils/server";
|
|
10
10
|
import { time } from "@modern-js/runtime-utils/time";
|
|
11
11
|
import { parseHeaders } from "@modern-js/runtime-utils/universal/request";
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isRouteErrorResponse
|
|
1
|
+
import { isRouteErrorResponse } from "@modern-js/runtime-utils/remix-router";
|
|
2
2
|
function sanitizeError(error) {
|
|
3
3
|
if (error instanceof Error && process.env.NODE_ENV !== "development" && process.env.NODE_ENV !== "test") {
|
|
4
4
|
const sanitized = new Error(error.message || "Unexpected Server Error");
|
|
@@ -54,7 +54,7 @@ function serializeErrors(errors) {
|
|
|
54
54
|
return serialized;
|
|
55
55
|
}
|
|
56
56
|
function errorResponseToJson(errorResponse) {
|
|
57
|
-
return json(
|
|
57
|
+
return Response.json(
|
|
58
58
|
// @ts-expect-error This is "private" from users but intended for internal use
|
|
59
59
|
serializeError(errorResponse.error || new Error("Unexpected Server Error")),
|
|
60
60
|
{
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { transformNestedRoutes } from "@modern-js/runtime-utils/browser";
|
|
2
2
|
import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
|
|
3
3
|
import { storage } from "@modern-js/runtime-utils/node";
|
|
4
|
-
import {
|
|
4
|
+
import { DEFERRED_SYMBOL, createStaticHandler, isRouteErrorResponse } from "@modern-js/runtime-utils/remix-router";
|
|
5
5
|
import { matchEntry } from "@modern-js/runtime-utils/server";
|
|
6
6
|
import { time } from "@modern-js/runtime-utils/time";
|
|
7
7
|
import { parseHeaders } from "@modern-js/runtime-utils/universal/request";
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "2.68.
|
|
18
|
+
"version": "2.68.2",
|
|
19
19
|
"engines": {
|
|
20
20
|
"node": ">=16.2.0"
|
|
21
21
|
},
|
|
@@ -48,9 +48,9 @@
|
|
|
48
48
|
"dependencies": {
|
|
49
49
|
"@babel/core": "^7.26.0",
|
|
50
50
|
"@swc/helpers": "^0.5.17",
|
|
51
|
-
"path-to-regexp": "^6.
|
|
52
|
-
"@modern-js/runtime-utils": "2.68.
|
|
53
|
-
"@modern-js/utils": "2.68.
|
|
51
|
+
"path-to-regexp": "^6.3.0",
|
|
52
|
+
"@modern-js/runtime-utils": "2.68.2",
|
|
53
|
+
"@modern-js/utils": "2.68.2"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
56
|
"@types/babel__core": "^7.20.5",
|
|
@@ -66,10 +66,10 @@
|
|
|
66
66
|
"ts-jest": "^29.1.0",
|
|
67
67
|
"typescript": "^5",
|
|
68
68
|
"webpack": "^5.99.8",
|
|
69
|
-
"@modern-js/core": "2.68.
|
|
70
|
-
"@modern-js/server-core": "2.68.
|
|
69
|
+
"@modern-js/core": "2.68.2",
|
|
70
|
+
"@modern-js/server-core": "2.68.2",
|
|
71
|
+
"@modern-js/types": "2.68.2",
|
|
71
72
|
"@scripts/build": "2.66.0",
|
|
72
|
-
"@modern-js/types": "2.68.0",
|
|
73
73
|
"@scripts/jest-config": "2.66.0"
|
|
74
74
|
},
|
|
75
75
|
"peerDependencies": {
|