@modern-js/plugin-data-loader 2.10.0 → 2.11.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 +23 -0
- package/dist/cjs/cli/data.js +1 -1
- package/dist/cjs/runtime/index.js +2 -2
- package/dist/cjs/runtime/response.js +1 -1
- package/dist/cjs/server/index.js +5 -5
- package/dist/esm/cli/data.js +1 -1
- package/dist/esm/runtime/index.js +2 -2
- package/dist/esm/runtime/response.js +1 -1
- package/dist/esm/server/index.js +1 -1
- package/dist/esm-node/cli/data.js +1 -1
- package/dist/esm-node/runtime/index.js +2 -2
- package/dist/esm-node/runtime/response.js +1 -1
- package/dist/esm-node/server/index.js +4 -1
- package/dist/types/cli/createRequest.d.ts +1 -1
- package/dist/types/cli/data.d.ts +1 -1
- package/dist/types/runtime/response.d.ts +1 -1
- package/package.json +13 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
# @modern-js/plugin-data-loader
|
|
2
2
|
|
|
3
|
+
## 2.11.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 5d624fd: feat: assets and data prefetching is supported
|
|
8
|
+
feat: 支持资源和数据预加载
|
|
9
|
+
- e2466a1: fix: remove nestedRoutes file from @modern-js/utils
|
|
10
|
+
fix: 将 nestedRoutes 从 @modern-js/utils 中移除
|
|
11
|
+
- 381a3b9: feat(utils): move universal utils to the universal folder
|
|
12
|
+
|
|
13
|
+
feat(utils): 将运行时使用的 utils 移动到 universal 目录
|
|
14
|
+
|
|
15
|
+
- Updated dependencies [cfb058f]
|
|
16
|
+
- Updated dependencies [0bd018b]
|
|
17
|
+
- Updated dependencies [5d624fd]
|
|
18
|
+
- Updated dependencies [e2466a1]
|
|
19
|
+
- Updated dependencies [02bb383]
|
|
20
|
+
- Updated dependencies [381a3b9]
|
|
21
|
+
- Updated dependencies [7a60f10]
|
|
22
|
+
- Updated dependencies [274b2e5]
|
|
23
|
+
- Updated dependencies [b9e1c54]
|
|
24
|
+
- @modern-js/utils@2.11.0
|
|
25
|
+
|
|
3
26
|
## 2.10.0
|
|
4
27
|
|
|
5
28
|
### Patch Changes
|
package/dist/cjs/cli/data.js
CHANGED
|
@@ -20,7 +20,7 @@ __export(data_exports, {
|
|
|
20
20
|
parseDeferredReadableStream: () => parseDeferredReadableStream
|
|
21
21
|
});
|
|
22
22
|
module.exports = __toCommonJS(data_exports);
|
|
23
|
-
var import_remix_router = require("@modern-js/utils/remix-router");
|
|
23
|
+
var import_remix_router = require("@modern-js/utils/universal/remix-router");
|
|
24
24
|
const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
|
|
25
25
|
async function parseDeferredReadableStream(stream) {
|
|
26
26
|
if (!stream) {
|
|
@@ -23,9 +23,9 @@ __export(runtime_exports, {
|
|
|
23
23
|
});
|
|
24
24
|
module.exports = __toCommonJS(runtime_exports);
|
|
25
25
|
var import_node = require("@remix-run/node");
|
|
26
|
-
var
|
|
27
|
-
var import_remix_router = require("@modern-js/utils/remix-router");
|
|
26
|
+
var import_remix_router = require("@modern-js/utils/universal/remix-router");
|
|
28
27
|
var import_lodash = require("@modern-js/utils/lodash");
|
|
28
|
+
var import_nestedRoutes = require("@modern-js/utils/universal/nestedRoutes");
|
|
29
29
|
var import_constants = require("../common/constants");
|
|
30
30
|
var import_utils = require("../common/utils");
|
|
31
31
|
var import_response = require("./response");
|
|
@@ -21,7 +21,7 @@ __export(response_exports, {
|
|
|
21
21
|
});
|
|
22
22
|
module.exports = __toCommonJS(response_exports);
|
|
23
23
|
var import_util = require("util");
|
|
24
|
-
var import_serialize = require("@modern-js/utils/serialize");
|
|
24
|
+
var import_serialize = require("@modern-js/utils/universal/serialize");
|
|
25
25
|
function isTrackedPromise(value) {
|
|
26
26
|
return value != null && typeof value.then === "function" && value._tracked === true;
|
|
27
27
|
}
|
package/dist/cjs/server/index.js
CHANGED
|
@@ -32,8 +32,8 @@ __export(server_exports, {
|
|
|
32
32
|
module.exports = __toCommonJS(server_exports);
|
|
33
33
|
var import_path = __toESM(require("path"));
|
|
34
34
|
var import_fs = __toESM(require("fs"));
|
|
35
|
-
var
|
|
36
|
-
var
|
|
35
|
+
var import_constants = require("@modern-js/utils/constants");
|
|
36
|
+
var import_utils = require("../common/utils");
|
|
37
37
|
var server_default = () => ({
|
|
38
38
|
name: "@modern-js/plugin-data-loader",
|
|
39
39
|
setup: () => ({
|
|
@@ -42,14 +42,14 @@ var server_default = () => ({
|
|
|
42
42
|
distDir
|
|
43
43
|
}) {
|
|
44
44
|
return async (context) => {
|
|
45
|
-
const entry = (0,
|
|
45
|
+
const entry = (0, import_utils.matchEntry)(context.path, serverRoutes);
|
|
46
46
|
if (!entry) {
|
|
47
47
|
return;
|
|
48
48
|
}
|
|
49
49
|
const routesPath = import_path.default.join(
|
|
50
50
|
distDir,
|
|
51
|
-
|
|
52
|
-
`${entry.entryName ||
|
|
51
|
+
import_constants.SERVER_BUNDLE_DIRECTORY,
|
|
52
|
+
`${entry.entryName || import_constants.MAIN_ENTRY_NAME}-server-loaders.js`
|
|
53
53
|
);
|
|
54
54
|
if (!import_fs.default.existsSync(routesPath)) {
|
|
55
55
|
return;
|
package/dist/esm/cli/data.js
CHANGED
|
@@ -344,7 +344,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
|
|
|
344
344
|
};
|
|
345
345
|
}
|
|
346
346
|
};
|
|
347
|
-
import { UNSAFE_DeferredData as DeferredData, AbortedDeferredError } from "@modern-js/utils/remix-router";
|
|
347
|
+
import { UNSAFE_DeferredData as DeferredData, AbortedDeferredError } from "@modern-js/utils/universal/remix-router";
|
|
348
348
|
var DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
|
|
349
349
|
function parseDeferredReadableStream(stream) {
|
|
350
350
|
return _parseDeferredReadableStream.apply(this, arguments);
|
|
@@ -176,9 +176,9 @@ var __generator = this && this.__generator || function(thisArg, body) {
|
|
|
176
176
|
}
|
|
177
177
|
};
|
|
178
178
|
import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
|
|
179
|
-
import {
|
|
180
|
-
import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/remix-router";
|
|
179
|
+
import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/universal/remix-router";
|
|
181
180
|
import { isPlainObject } from "@modern-js/utils/lodash";
|
|
181
|
+
import { transformNestedRoutes } from "@modern-js/utils/universal/nestedRoutes";
|
|
182
182
|
import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
|
|
183
183
|
import { matchEntry } from "../common/utils";
|
|
184
184
|
import { createDeferredReadableStream } from "./response";
|
|
@@ -182,7 +182,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
|
|
|
182
182
|
}
|
|
183
183
|
};
|
|
184
184
|
import { TextEncoder } from "util";
|
|
185
|
-
import { serializeJson } from "@modern-js/utils/serialize";
|
|
185
|
+
import { serializeJson } from "@modern-js/utils/universal/serialize";
|
|
186
186
|
function isTrackedPromise(value) {
|
|
187
187
|
return value != null && typeof value.then === "function" && value._tracked === true;
|
|
188
188
|
}
|
package/dist/esm/server/index.js
CHANGED
|
@@ -124,7 +124,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
|
|
|
124
124
|
};
|
|
125
125
|
import path from "path";
|
|
126
126
|
import fs from "fs";
|
|
127
|
-
import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
|
|
127
|
+
import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils/constants";
|
|
128
128
|
import { matchEntry } from "../common/utils";
|
|
129
129
|
var server_default = function() {
|
|
130
130
|
return {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
UNSAFE_DeferredData as DeferredData,
|
|
3
3
|
AbortedDeferredError
|
|
4
|
-
} from "@modern-js/utils/remix-router";
|
|
4
|
+
} from "@modern-js/utils/universal/remix-router";
|
|
5
5
|
const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
|
|
6
6
|
async function parseDeferredReadableStream(stream) {
|
|
7
7
|
if (!stream) {
|
|
@@ -3,13 +3,13 @@ import {
|
|
|
3
3
|
writeReadableStreamToWritable,
|
|
4
4
|
Response as NodeResponse
|
|
5
5
|
} from "@remix-run/node";
|
|
6
|
-
import { transformNestedRoutes } from "@modern-js/utils/nestedRoutes";
|
|
7
6
|
import {
|
|
8
7
|
createStaticHandler,
|
|
9
8
|
ErrorResponse,
|
|
10
9
|
UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL
|
|
11
|
-
} from "@modern-js/utils/remix-router";
|
|
10
|
+
} from "@modern-js/utils/universal/remix-router";
|
|
12
11
|
import { isPlainObject } from "@modern-js/utils/lodash";
|
|
12
|
+
import { transformNestedRoutes } from "@modern-js/utils/universal/nestedRoutes";
|
|
13
13
|
import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
|
|
14
14
|
import { matchEntry } from "../common/utils";
|
|
15
15
|
import { createDeferredReadableStream } from "./response";
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TextEncoder } from "util";
|
|
2
|
-
import { serializeJson } from "@modern-js/utils/serialize";
|
|
2
|
+
import { serializeJson } from "@modern-js/utils/universal/serialize";
|
|
3
3
|
function isTrackedPromise(value) {
|
|
4
4
|
return value != null && typeof value.then === "function" && value._tracked === true;
|
|
5
5
|
}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import fs from "fs";
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
MAIN_ENTRY_NAME,
|
|
5
|
+
SERVER_BUNDLE_DIRECTORY
|
|
6
|
+
} from "@modern-js/utils/constants";
|
|
4
7
|
import { matchEntry } from "../common/utils";
|
|
5
8
|
var server_default = () => ({
|
|
6
9
|
name: "@modern-js/plugin-data-loader",
|
package/dist/types/cli/data.d.ts
CHANGED
|
@@ -7,5 +7,5 @@
|
|
|
7
7
|
* Copyright 2021 Remix Software Inc.
|
|
8
8
|
* https://github.com/remix-run/remix/blob/2b5e1a72fc628d0408e27cf4d72e537762f1dc5b/LICENSE.md
|
|
9
9
|
*/
|
|
10
|
-
import { UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/remix-router';
|
|
10
|
+
import { UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/universal/remix-router';
|
|
11
11
|
export declare function parseDeferredReadableStream(stream: ReadableStream<Uint8Array>): Promise<DeferredData>;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/remix-router';
|
|
1
|
+
import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/universal/remix-router';
|
|
2
2
|
export declare function createDeferredReadableStream(deferredData: DeferredData, signal: AbortSignal): any;
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"modern",
|
|
12
12
|
"modern.js"
|
|
13
13
|
],
|
|
14
|
-
"version": "2.
|
|
14
|
+
"version": "2.11.0",
|
|
15
15
|
"engines": {
|
|
16
16
|
"node": ">=14.17.6"
|
|
17
17
|
},
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"@remix-run/node": "^1.12.0",
|
|
56
56
|
"path-to-regexp": "^6.2.0",
|
|
57
57
|
"react-router-dom": "^6.8.1",
|
|
58
|
-
"@modern-js/utils": "2.
|
|
58
|
+
"@modern-js/utils": "2.11.0"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
61
|
"@types/babel__core": "^7.1.15",
|
|
@@ -70,11 +70,17 @@
|
|
|
70
70
|
"typescript": "^4",
|
|
71
71
|
"webpack": "^5.76.2",
|
|
72
72
|
"webpack-chain": "^6.5.1",
|
|
73
|
-
"
|
|
74
|
-
"
|
|
75
|
-
"@modern-js/
|
|
76
|
-
"@
|
|
77
|
-
"@
|
|
73
|
+
"react": ">=17.0.0",
|
|
74
|
+
"react-router-dom": "^6.8.1",
|
|
75
|
+
"@modern-js/core": "2.11.0",
|
|
76
|
+
"@modern-js/server-core": "2.11.0",
|
|
77
|
+
"@modern-js/types": "2.11.0",
|
|
78
|
+
"@scripts/build": "2.11.0",
|
|
79
|
+
"@scripts/jest-config": "2.11.0"
|
|
80
|
+
},
|
|
81
|
+
"peerDependencies": {
|
|
82
|
+
"react": ">=17.0.0",
|
|
83
|
+
"react-router-dom": "^6.8.1"
|
|
78
84
|
},
|
|
79
85
|
"sideEffects": false,
|
|
80
86
|
"publishConfig": {
|