@bleedingdev/modern-js-plugin-data-loader 3.2.0-ultramodern.99 → 3.4.0-ultramodern.1

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.
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -10,11 +10,15 @@ var __webpack_require__ = {};
10
10
  };
11
11
  })();
12
12
  (()=>{
13
- __webpack_require__.d = (exports1, definition)=>{
14
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
15
- enumerable: true,
16
- get: definition[key]
17
- });
13
+ __webpack_require__.d = (exports1, getters, values)=>{
14
+ var define = (defs, kind)=>{
15
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
16
+ enumerable: true,
17
+ [kind]: defs[key]
18
+ });
19
+ };
20
+ define(getters, "get");
21
+ define(values, "value");
18
22
  };
19
23
  })();
20
24
  (()=>{
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -23,14 +27,14 @@ var __webpack_require__ = {};
23
27
  })();
24
28
  var __webpack_exports__ = {};
25
29
  __webpack_require__.r(__webpack_exports__);
26
- __webpack_require__.d(__webpack_exports__, {
27
- CONTENT_TYPE_DEFERRED: ()=>CONTENT_TYPE_DEFERRED,
28
- DIRECT_PARAM: ()=>DIRECT_PARAM,
29
- LOADER_ID_PARAM: ()=>LOADER_ID_PARAM
30
- });
31
30
  const LOADER_ID_PARAM = '__loader';
32
31
  const DIRECT_PARAM = '__ssrDirect';
33
32
  const CONTENT_TYPE_DEFERRED = 'text/modernjs-deferred';
33
+ __webpack_require__.d(__webpack_exports__, {}, {
34
+ CONTENT_TYPE_DEFERRED: CONTENT_TYPE_DEFERRED,
35
+ DIRECT_PARAM: DIRECT_PARAM,
36
+ LOADER_ID_PARAM: LOADER_ID_PARAM
37
+ });
34
38
  exports.CONTENT_TYPE_DEFERRED = __webpack_exports__.CONTENT_TYPE_DEFERRED;
35
39
  exports.DIRECT_PARAM = __webpack_exports__.DIRECT_PARAM;
36
40
  exports.LOADER_ID_PARAM = __webpack_exports__.LOADER_ID_PARAM;
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -33,12 +37,28 @@ __webpack_require__.d(__webpack_exports__, {
33
37
  const router_namespaceObject = require("@modern-js/runtime-utils/router");
34
38
  function sanitizeError(error) {
35
39
  if (error instanceof Error && 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV) {
36
- const sanitized = new Error(error.message || 'Unexpected Server Error');
40
+ const sanitized = new Error('Unexpected Server Error');
37
41
  sanitized.stack = void 0;
38
42
  return sanitized;
39
43
  }
40
44
  return error;
41
45
  }
46
+ function shouldRedactRouteErrorResponse(error) {
47
+ return error.status >= 500 && 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV;
48
+ }
49
+ function serializeRouteErrorResponse(error) {
50
+ if (!shouldRedactRouteErrorResponse(error)) return {
51
+ ...error,
52
+ __type: 'RouteErrorResponse'
53
+ };
54
+ return {
55
+ status: error.status,
56
+ statusText: 'Internal Server Error',
57
+ internal: error.internal,
58
+ data: 'Unexpected Server Error',
59
+ __type: 'RouteErrorResponse'
60
+ };
61
+ }
42
62
  function sanitizeErrors(errors) {
43
63
  return Object.entries(errors).reduce((acc, [routeId, error])=>Object.assign(acc, {
44
64
  [routeId]: sanitizeError(error)
@@ -55,10 +75,7 @@ function serializeErrors(errors) {
55
75
  if (!errors) return null;
56
76
  const entries = Object.entries(errors);
57
77
  const serialized = {};
58
- for (const [key, val] of entries)if ((0, router_namespaceObject.isRouteErrorResponse)(val)) serialized[key] = {
59
- ...val,
60
- __type: 'RouteErrorResponse'
61
- };
78
+ for (const [key, val] of entries)if ((0, router_namespaceObject.isRouteErrorResponse)(val)) serialized[key] = serializeRouteErrorResponse(val);
62
79
  else if (val instanceof Error) {
63
80
  const sanitized = sanitizeError(val);
64
81
  serialized[key] = {
@@ -73,9 +90,10 @@ function serializeErrors(errors) {
73
90
  return serialized;
74
91
  }
75
92
  function errorResponseToJson(errorResponse) {
93
+ const serializedErrorResponse = serializeRouteErrorResponse(errorResponse);
76
94
  return Response.json(serializeError(errorResponse.error || new Error('Unexpected Server Error')), {
77
95
  status: errorResponse.status,
78
- statusText: errorResponse.statusText,
96
+ statusText: serializedErrorResponse.statusText,
79
97
  headers: {
80
98
  'X-Modernjs-Error': 'yes'
81
99
  }
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -32,6 +36,16 @@ function isTrackedPromise(value) {
32
36
  return null != value && 'function' == typeof value.then && true === value._tracked;
33
37
  }
34
38
  const DEFERRED_VALUE_PLACEHOLDER_PREFIX = '__deferred_promise:';
39
+ function serializeDeferredError(error) {
40
+ if ('development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV) return {
41
+ message: 'Unexpected Server Error',
42
+ stack: void 0
43
+ };
44
+ return {
45
+ message: error.message,
46
+ stack: error.stack
47
+ };
48
+ }
35
49
  function createDeferredReadableStream(deferredData, signal) {
36
50
  const encoder = new external_util_namespaceObject.TextEncoder();
37
51
  const stream = new ReadableStream({
@@ -58,10 +72,7 @@ function enqueueTrackedPromise(controller, encoder, settledKey, promise) {
58
72
  if ('_error' in promise) {
59
73
  const { _error } = promise;
60
74
  controller.enqueue(encoder.encode(`error:${(0, node_namespaceObject.serializeJson)({
61
- [settledKey]: {
62
- message: _error.message,
63
- stack: _error.stack
64
- }
75
+ [settledKey]: serializeDeferredError(_error)
65
76
  })}\n\n`));
66
77
  } else controller.enqueue(encoder.encode(`data:${JSON.stringify({
67
78
  [settledKey]: promise._data ?? null
@@ -1,12 +1,28 @@
1
1
  import { isRouteErrorResponse } from "@modern-js/runtime-utils/router";
2
2
  function sanitizeError(error) {
3
3
  if (error instanceof Error && 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV) {
4
- const sanitized = new Error(error.message || 'Unexpected Server Error');
4
+ const sanitized = new Error('Unexpected Server Error');
5
5
  sanitized.stack = void 0;
6
6
  return sanitized;
7
7
  }
8
8
  return error;
9
9
  }
10
+ function shouldRedactRouteErrorResponse(error) {
11
+ return error.status >= 500 && 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV;
12
+ }
13
+ function serializeRouteErrorResponse(error) {
14
+ if (!shouldRedactRouteErrorResponse(error)) return {
15
+ ...error,
16
+ __type: 'RouteErrorResponse'
17
+ };
18
+ return {
19
+ status: error.status,
20
+ statusText: 'Internal Server Error',
21
+ internal: error.internal,
22
+ data: 'Unexpected Server Error',
23
+ __type: 'RouteErrorResponse'
24
+ };
25
+ }
10
26
  function sanitizeErrors(errors) {
11
27
  return Object.entries(errors).reduce((acc, [routeId, error])=>Object.assign(acc, {
12
28
  [routeId]: sanitizeError(error)
@@ -23,10 +39,7 @@ function serializeErrors(errors) {
23
39
  if (!errors) return null;
24
40
  const entries = Object.entries(errors);
25
41
  const serialized = {};
26
- for (const [key, val] of entries)if (isRouteErrorResponse(val)) serialized[key] = {
27
- ...val,
28
- __type: 'RouteErrorResponse'
29
- };
42
+ for (const [key, val] of entries)if (isRouteErrorResponse(val)) serialized[key] = serializeRouteErrorResponse(val);
30
43
  else if (val instanceof Error) {
31
44
  const sanitized = sanitizeError(val);
32
45
  serialized[key] = {
@@ -41,9 +54,10 @@ function serializeErrors(errors) {
41
54
  return serialized;
42
55
  }
43
56
  function errorResponseToJson(errorResponse) {
57
+ const serializedErrorResponse = serializeRouteErrorResponse(errorResponse);
44
58
  return Response.json(serializeError(errorResponse.error || new Error('Unexpected Server Error')), {
45
59
  status: errorResponse.status,
46
- statusText: errorResponse.statusText,
60
+ statusText: serializedErrorResponse.statusText,
47
61
  headers: {
48
62
  'X-Modernjs-Error': 'yes'
49
63
  }
@@ -4,6 +4,16 @@ function isTrackedPromise(value) {
4
4
  return null != value && 'function' == typeof value.then && true === value._tracked;
5
5
  }
6
6
  const DEFERRED_VALUE_PLACEHOLDER_PREFIX = '__deferred_promise:';
7
+ function serializeDeferredError(error) {
8
+ if ('development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV) return {
9
+ message: 'Unexpected Server Error',
10
+ stack: void 0
11
+ };
12
+ return {
13
+ message: error.message,
14
+ stack: error.stack
15
+ };
16
+ }
7
17
  function createDeferredReadableStream(deferredData, signal) {
8
18
  const encoder = new TextEncoder();
9
19
  const stream = new ReadableStream({
@@ -30,10 +40,7 @@ function enqueueTrackedPromise(controller, encoder, settledKey, promise) {
30
40
  if ('_error' in promise) {
31
41
  const { _error } = promise;
32
42
  controller.enqueue(encoder.encode(`error:${serializeJson({
33
- [settledKey]: {
34
- message: _error.message,
35
- stack: _error.stack
36
- }
43
+ [settledKey]: serializeDeferredError(_error)
37
44
  })}\n\n`));
38
45
  } else controller.enqueue(encoder.encode(`data:${JSON.stringify({
39
46
  [settledKey]: promise._data ?? null
@@ -2,12 +2,28 @@ import "node:module";
2
2
  import { isRouteErrorResponse } from "@modern-js/runtime-utils/router";
3
3
  function sanitizeError(error) {
4
4
  if (error instanceof Error && 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV) {
5
- const sanitized = new Error(error.message || 'Unexpected Server Error');
5
+ const sanitized = new Error('Unexpected Server Error');
6
6
  sanitized.stack = void 0;
7
7
  return sanitized;
8
8
  }
9
9
  return error;
10
10
  }
11
+ function shouldRedactRouteErrorResponse(error) {
12
+ return error.status >= 500 && 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV;
13
+ }
14
+ function serializeRouteErrorResponse(error) {
15
+ if (!shouldRedactRouteErrorResponse(error)) return {
16
+ ...error,
17
+ __type: 'RouteErrorResponse'
18
+ };
19
+ return {
20
+ status: error.status,
21
+ statusText: 'Internal Server Error',
22
+ internal: error.internal,
23
+ data: 'Unexpected Server Error',
24
+ __type: 'RouteErrorResponse'
25
+ };
26
+ }
11
27
  function sanitizeErrors(errors) {
12
28
  return Object.entries(errors).reduce((acc, [routeId, error])=>Object.assign(acc, {
13
29
  [routeId]: sanitizeError(error)
@@ -24,10 +40,7 @@ function serializeErrors(errors) {
24
40
  if (!errors) return null;
25
41
  const entries = Object.entries(errors);
26
42
  const serialized = {};
27
- for (const [key, val] of entries)if (isRouteErrorResponse(val)) serialized[key] = {
28
- ...val,
29
- __type: 'RouteErrorResponse'
30
- };
43
+ for (const [key, val] of entries)if (isRouteErrorResponse(val)) serialized[key] = serializeRouteErrorResponse(val);
31
44
  else if (val instanceof Error) {
32
45
  const sanitized = sanitizeError(val);
33
46
  serialized[key] = {
@@ -42,9 +55,10 @@ function serializeErrors(errors) {
42
55
  return serialized;
43
56
  }
44
57
  function errorResponseToJson(errorResponse) {
58
+ const serializedErrorResponse = serializeRouteErrorResponse(errorResponse);
45
59
  return Response.json(serializeError(errorResponse.error || new Error('Unexpected Server Error')), {
46
60
  status: errorResponse.status,
47
- statusText: errorResponse.statusText,
61
+ statusText: serializedErrorResponse.statusText,
48
62
  headers: {
49
63
  'X-Modernjs-Error': 'yes'
50
64
  }
@@ -5,6 +5,16 @@ function isTrackedPromise(value) {
5
5
  return null != value && 'function' == typeof value.then && true === value._tracked;
6
6
  }
7
7
  const DEFERRED_VALUE_PLACEHOLDER_PREFIX = '__deferred_promise:';
8
+ function serializeDeferredError(error) {
9
+ if ('development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV) return {
10
+ message: 'Unexpected Server Error',
11
+ stack: void 0
12
+ };
13
+ return {
14
+ message: error.message,
15
+ stack: error.stack
16
+ };
17
+ }
8
18
  function createDeferredReadableStream(deferredData, signal) {
9
19
  const encoder = new TextEncoder();
10
20
  const stream = new ReadableStream({
@@ -31,10 +41,7 @@ function enqueueTrackedPromise(controller, encoder, settledKey, promise) {
31
41
  if ('_error' in promise) {
32
42
  const { _error } = promise;
33
43
  controller.enqueue(encoder.encode(`error:${serializeJson({
34
- [settledKey]: {
35
- message: _error.message,
36
- stack: _error.stack
37
- }
44
+ [settledKey]: serializeDeferredError(_error)
38
45
  })}\n\n`));
39
46
  } else controller.enqueue(encoder.encode(`data:${JSON.stringify({
40
47
  [settledKey]: promise._data ?? null
@@ -6,7 +6,7 @@ export declare const getRequestUrl: ({ params, request, routeId, }: {
6
6
  export declare const createRequest: (routeId: string, method?: string) => ({ params, request, }: {
7
7
  params: Record<string, string>;
8
8
  request: Request;
9
- }) => Promise<{}>;
9
+ }) => Promise<Record<string, unknown> | Response>;
10
10
  export declare const createActionRequest: (routeId: string) => ({ params, request, }: {
11
11
  params: Record<string, string>;
12
12
  request: Request;
package/package.json CHANGED
@@ -17,7 +17,7 @@
17
17
  "modern",
18
18
  "modern.js"
19
19
  ],
20
- "version": "3.2.0-ultramodern.99",
20
+ "version": "3.4.0-ultramodern.1",
21
21
  "engines": {
22
22
  "node": ">=20"
23
23
  },
@@ -46,25 +46,26 @@
46
46
  "dependencies": {
47
47
  "@swc/helpers": "^0.5.23",
48
48
  "path-to-regexp": "^8.4.2",
49
- "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.99",
50
- "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.99"
49
+ "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.4.0-ultramodern.1",
50
+ "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.4.0-ultramodern.1"
51
51
  },
52
52
  "devDependencies": {
53
- "@rsbuild/core": "2.0.7",
54
- "@rslib/core": "0.21.5",
55
- "@types/node": "^25.9.1",
53
+ "@rsbuild/core": "2.0.15",
54
+ "@rslib/core": "0.23.0",
55
+ "@types/node": "^26.0.0",
56
56
  "@types/supertest": "^7.2.0",
57
- "@typescript/native-preview": "7.0.0-dev.20260527.2",
58
- "memfs": "^4.57.2",
59
- "react": "^19.2.6",
60
- "react-dom": "^19.2.6",
57
+ "@typescript/native-preview": "7.0.0-dev.20260624.1",
58
+ "memfs": "^4.57.8",
59
+ "react": "^19.2.7",
60
+ "react-dom": "^19.2.7",
61
61
  "supertest": "^7.2.2",
62
+ "typescript": "^6.0.3",
63
+ "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.4.0-ultramodern.1",
62
64
  "@scripts/rstest-config": "2.66.0",
63
- "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.2.0-ultramodern.99",
64
- "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.99"
65
+ "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.4.0-ultramodern.1"
65
66
  },
66
67
  "peerDependencies": {
67
- "react": "^19.2.6"
68
+ "react": "^19.2.7"
68
69
  },
69
70
  "sideEffects": false,
70
71
  "publishConfig": {
@@ -72,7 +73,7 @@
72
73
  "access": "public"
73
74
  },
74
75
  "scripts": {
75
- "build": "rslib build",
76
+ "build": "rslib build && pnpm -w tsgo:dts \"$PWD\"",
76
77
  "dev": "rslib build --watch",
77
78
  "test": "rstest --passWithNoTests"
78
79
  }