@modern-js/plugin-data-loader 2.15.0 → 2.16.0
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.
- package/CHANGELOG.md +13 -0
- package/dist/cjs/cli/createRequest.js +31 -47
- package/dist/cjs/cli/data.js +17 -34
- package/dist/cjs/cli/generateClient.js +15 -41
- package/dist/cjs/cli/loader.js +11 -27
- package/dist/cjs/common/constants.js +13 -27
- package/dist/cjs/common/utils.js +7 -25
- package/dist/cjs/runtime/index.js +45 -60
- package/dist/cjs/runtime/response.js +24 -58
- package/dist/cjs/server/index.js +62 -50
- package/dist/esm/cli/createRequest.js +212 -205
- package/dist/esm/cli/data.js +769 -741
- package/dist/esm/cli/generateClient.js +40 -41
- package/dist/esm/cli/loader.js +219 -201
- package/dist/esm/common/constants.js +3 -4
- package/dist/esm/common/utils.js +17 -18
- package/dist/esm/runtime/index.js +400 -381
- package/dist/esm/runtime/response.js +276 -258
- package/dist/esm/server/index.js +177 -170
- package/dist/esm-node/cli/createRequest.js +11 -22
- package/dist/esm-node/cli/data.js +11 -16
- package/dist/esm-node/cli/generateClient.js +1 -7
- package/dist/esm-node/cli/loader.js +3 -6
- package/dist/esm-node/common/constants.js +3 -8
- package/dist/esm-node/common/utils.js +1 -4
- package/dist/esm-node/runtime/index.js +14 -28
- package/dist/esm-node/runtime/response.js +15 -34
- package/dist/esm-node/server/index.js +4 -17
- package/package.json +12 -8
|
@@ -4,7 +4,7 @@ function isTrackedPromise(value) {
|
|
|
4
4
|
return value != null && typeof value.then === "function" && value._tracked === true;
|
|
5
5
|
}
|
|
6
6
|
const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
|
|
7
|
-
function createDeferredReadableStream(deferredData, signal) {
|
|
7
|
+
export function createDeferredReadableStream(deferredData, signal) {
|
|
8
8
|
const encoder = new TextEncoder();
|
|
9
9
|
const stream = new ReadableStream({
|
|
10
10
|
async start(controller) {
|
|
@@ -24,21 +24,11 @@ function createDeferredReadableStream(deferredData, signal) {
|
|
|
24
24
|
|
|
25
25
|
`));
|
|
26
26
|
for (const preresolvedKey of preresolvedKeys) {
|
|
27
|
-
enqueueTrackedPromise(
|
|
28
|
-
controller,
|
|
29
|
-
encoder,
|
|
30
|
-
preresolvedKey,
|
|
31
|
-
deferredData.data[preresolvedKey]
|
|
32
|
-
);
|
|
27
|
+
enqueueTrackedPromise(controller, encoder, preresolvedKey, deferredData.data[preresolvedKey]);
|
|
33
28
|
}
|
|
34
29
|
const unsubscribe = deferredData.subscribe((aborted, settledKey) => {
|
|
35
30
|
if (settledKey) {
|
|
36
|
-
enqueueTrackedPromise(
|
|
37
|
-
controller,
|
|
38
|
-
encoder,
|
|
39
|
-
settledKey,
|
|
40
|
-
deferredData.data[settledKey]
|
|
41
|
-
);
|
|
31
|
+
enqueueTrackedPromise(controller, encoder, settledKey, deferredData.data[settledKey]);
|
|
42
32
|
}
|
|
43
33
|
});
|
|
44
34
|
await deferredData.resolveData(signal);
|
|
@@ -49,31 +39,22 @@ function createDeferredReadableStream(deferredData, signal) {
|
|
|
49
39
|
return stream;
|
|
50
40
|
}
|
|
51
41
|
function enqueueTrackedPromise(controller, encoder, settledKey, promise) {
|
|
52
|
-
var _a;
|
|
53
42
|
if ("_error" in promise) {
|
|
54
43
|
const { _error } = promise;
|
|
55
|
-
controller.enqueue(
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
}
|
|
62
|
-
})}
|
|
44
|
+
controller.enqueue(encoder.encode(`error:${serializeJson({
|
|
45
|
+
[settledKey]: {
|
|
46
|
+
message: _error.message,
|
|
47
|
+
stack: _error.stack
|
|
48
|
+
}
|
|
49
|
+
})}
|
|
63
50
|
|
|
64
|
-
`
|
|
65
|
-
)
|
|
66
|
-
);
|
|
51
|
+
`));
|
|
67
52
|
} else {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
53
|
+
var _promise__data;
|
|
54
|
+
controller.enqueue(encoder.encode(`data:${JSON.stringify({
|
|
55
|
+
[settledKey]: (_promise__data = promise._data) !== null && _promise__data !== void 0 ? _promise__data : null
|
|
56
|
+
})}
|
|
71
57
|
|
|
72
|
-
`
|
|
73
|
-
)
|
|
74
|
-
);
|
|
58
|
+
`));
|
|
75
59
|
}
|
|
76
60
|
}
|
|
77
|
-
export {
|
|
78
|
-
createDeferredReadableStream
|
|
79
|
-
};
|
|
@@ -1,27 +1,17 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import fs from "fs";
|
|
3
|
-
import {
|
|
4
|
-
MAIN_ENTRY_NAME,
|
|
5
|
-
SERVER_BUNDLE_DIRECTORY
|
|
6
|
-
} from "@modern-js/utils/constants";
|
|
3
|
+
import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils/constants";
|
|
7
4
|
import { matchEntry } from "../common/utils";
|
|
8
|
-
|
|
5
|
+
export default () => ({
|
|
9
6
|
name: "@modern-js/plugin-data-loader",
|
|
10
7
|
setup: () => ({
|
|
11
|
-
prepareLoaderHandler({
|
|
12
|
-
serverRoutes,
|
|
13
|
-
distDir
|
|
14
|
-
}) {
|
|
8
|
+
prepareLoaderHandler({ serverRoutes, distDir }) {
|
|
15
9
|
return async (context) => {
|
|
16
10
|
const entry = matchEntry(context.path, serverRoutes);
|
|
17
11
|
if (!entry) {
|
|
18
12
|
return;
|
|
19
13
|
}
|
|
20
|
-
const routesPath = path.join(
|
|
21
|
-
distDir,
|
|
22
|
-
SERVER_BUNDLE_DIRECTORY,
|
|
23
|
-
`${entry.entryName || MAIN_ENTRY_NAME}-server-loaders.js`
|
|
24
|
-
);
|
|
14
|
+
const routesPath = path.join(distDir, SERVER_BUNDLE_DIRECTORY, `${entry.entryName || MAIN_ENTRY_NAME}-server-loaders.js`);
|
|
25
15
|
if (!fs.existsSync(routesPath)) {
|
|
26
16
|
return;
|
|
27
17
|
}
|
|
@@ -38,6 +28,3 @@ var server_default = () => ({
|
|
|
38
28
|
}
|
|
39
29
|
})
|
|
40
30
|
});
|
|
41
|
-
export {
|
|
42
|
-
server_default as default
|
|
43
|
-
};
|
package/package.json
CHANGED
|
@@ -3,7 +3,11 @@
|
|
|
3
3
|
"description": "A Progressive React Framework for modern web development.",
|
|
4
4
|
"homepage": "https://modernjs.dev",
|
|
5
5
|
"bugs": "https://github.com/web-infra-dev/modern.js/issues",
|
|
6
|
-
"repository":
|
|
6
|
+
"repository": {
|
|
7
|
+
"type": "git",
|
|
8
|
+
"url": "https://github.com/web-infra-dev/modern.js",
|
|
9
|
+
"directory": "packages/cli/plugin-data-loader"
|
|
10
|
+
},
|
|
7
11
|
"license": "MIT",
|
|
8
12
|
"keywords": [
|
|
9
13
|
"react",
|
|
@@ -11,7 +15,7 @@
|
|
|
11
15
|
"modern",
|
|
12
16
|
"modern.js"
|
|
13
17
|
],
|
|
14
|
-
"version": "2.
|
|
18
|
+
"version": "2.16.0",
|
|
15
19
|
"engines": {
|
|
16
20
|
"node": ">=14.17.6"
|
|
17
21
|
},
|
|
@@ -55,7 +59,7 @@
|
|
|
55
59
|
"@remix-run/node": "^1.12.0",
|
|
56
60
|
"path-to-regexp": "^6.2.0",
|
|
57
61
|
"react-router-dom": "^6.8.1",
|
|
58
|
-
"@modern-js/utils": "2.
|
|
62
|
+
"@modern-js/utils": "2.16.0"
|
|
59
63
|
},
|
|
60
64
|
"devDependencies": {
|
|
61
65
|
"@types/babel__core": "^7.1.15",
|
|
@@ -72,11 +76,11 @@
|
|
|
72
76
|
"webpack-chain": "^6.5.1",
|
|
73
77
|
"react": ">=17.0.0",
|
|
74
78
|
"react-router-dom": "^6.8.1",
|
|
75
|
-
"@modern-js/core": "2.
|
|
76
|
-
"@modern-js/server-core": "2.
|
|
77
|
-
"@modern-js/types": "2.
|
|
78
|
-
"@scripts/build": "2.
|
|
79
|
-
"@scripts/jest-config": "2.
|
|
79
|
+
"@modern-js/core": "2.16.0",
|
|
80
|
+
"@modern-js/server-core": "2.16.0",
|
|
81
|
+
"@modern-js/types": "2.16.0",
|
|
82
|
+
"@scripts/build": "2.16.0",
|
|
83
|
+
"@scripts/jest-config": "2.16.0"
|
|
80
84
|
},
|
|
81
85
|
"peerDependencies": {
|
|
82
86
|
"react": ">=17.0.0",
|