@modern-js/runtime 2.15.1-alpha.2 → 2.16.1-alpha.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 +19 -0
- package/dist/cjs/cli/index.js +32 -48
- package/dist/cjs/common.js +13 -27
- package/dist/cjs/config.js +4 -15
- package/dist/cjs/core/appConfig.js +13 -26
- package/dist/cjs/core/compatible.js +170 -158
- package/dist/cjs/core/index.js +38 -45
- package/dist/cjs/core/loader/index.js +12 -35
- package/dist/cjs/core/loader/loaderManager.js +42 -56
- package/dist/cjs/core/loader/useLoader.js +80 -105
- package/dist/cjs/core/plugin.js +28 -40
- package/dist/cjs/core/types.js +4 -15
- package/dist/cjs/document/Body.js +61 -37
- package/dist/cjs/document/Comment.js +22 -32
- package/dist/cjs/document/DocumentContext.js +14 -37
- package/dist/cjs/document/DocumentStructureContext.js +14 -37
- package/dist/cjs/document/Head.js +71 -40
- package/dist/cjs/document/Html.js +46 -58
- package/dist/cjs/document/Links.js +18 -28
- package/dist/cjs/document/Root.js +73 -44
- package/dist/cjs/document/Script.js +22 -32
- package/dist/cjs/document/Scripts.js +18 -28
- package/dist/cjs/document/cli/index.js +161 -207
- package/dist/cjs/document/constants.js +36 -75
- package/dist/cjs/document/index.js +28 -27
- package/dist/cjs/exports/head.js +27 -37
- package/dist/cjs/exports/loadable.js +27 -37
- package/dist/cjs/exports/server.js +7 -25
- package/dist/cjs/exports/styled.js +27 -37
- package/dist/cjs/index.js +22 -42
- package/dist/cjs/router/cli/index.js +91 -114
- package/dist/cjs/router/index.js +32 -39
- package/dist/cjs/router/runtime/DefaultNotFound.js +23 -38
- package/dist/cjs/router/runtime/DeferredDataScripts.js +8 -24
- package/dist/cjs/router/runtime/DeferredDataScripts.node.js +69 -112
- package/dist/cjs/router/runtime/PrefetchLink.js +117 -96
- package/dist/cjs/router/runtime/fetch.js +7 -25
- package/dist/cjs/router/runtime/fetch.node.js +7 -25
- package/dist/cjs/router/runtime/fetch.worker.js +7 -25
- package/dist/cjs/router/runtime/hooks.js +8 -26
- package/dist/cjs/router/runtime/index.js +97 -149
- package/dist/cjs/router/runtime/plugin.js +56 -76
- package/dist/cjs/router/runtime/plugin.node.js +95 -74
- package/dist/cjs/router/runtime/server.js +18 -17
- package/dist/cjs/router/runtime/types.js +4 -15
- package/dist/cjs/router/runtime/utils.js +57 -83
- package/dist/cjs/router/runtime/withRouter.js +24 -39
- package/dist/cjs/runtimeContext.js +14 -27
- package/dist/cjs/ssr/cli/babel-plugin-ssr-loader-id.js +75 -59
- package/dist/cjs/ssr/cli/index.js +120 -150
- package/dist/cjs/ssr/index.js +149 -132
- package/dist/cjs/ssr/index.node.js +73 -74
- package/dist/cjs/ssr/prefetch.js +51 -59
- package/dist/cjs/ssr/react/index.js +15 -28
- package/dist/cjs/ssr/react/nossr/index.js +51 -43
- package/dist/cjs/ssr/react/prerender/index.js +93 -59
- package/dist/cjs/ssr/react/prerender/type.js +4 -15
- package/dist/cjs/ssr/react/prerender/util.js +32 -51
- package/dist/cjs/ssr/react/withCallback/index.js +53 -29
- package/dist/cjs/ssr/serverRender/helmet.js +15 -26
- package/dist/cjs/ssr/serverRender/index.js +14 -32
- package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.after.js +15 -34
- package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.share.js +12 -28
- package/dist/cjs/ssr/serverRender/renderToStream/bulidTemplate.before.js +28 -55
- package/dist/cjs/ssr/serverRender/renderToStream/index.js +23 -48
- package/dist/cjs/ssr/serverRender/renderToStream/loadable.js +13 -32
- package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.js +33 -64
- package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.worker.js +26 -54
- package/dist/cjs/ssr/serverRender/renderToStream/styledComponent.js +9 -27
- package/dist/cjs/ssr/serverRender/renderToStream/template.js +11 -32
- package/dist/cjs/ssr/serverRender/renderToStream/type.js +4 -15
- package/dist/cjs/ssr/serverRender/renderToString/entry.js +133 -99
- package/dist/cjs/ssr/serverRender/renderToString/index.js +21 -48
- package/dist/cjs/ssr/serverRender/renderToString/loadable.js +20 -45
- package/dist/cjs/ssr/serverRender/renderToString/reduce.js +13 -25
- package/dist/cjs/ssr/serverRender/renderToString/styledComponent.js +9 -27
- package/dist/cjs/ssr/serverRender/renderToString/template.js +42 -37
- package/dist/cjs/ssr/serverRender/renderToString/type.js +10 -28
- package/dist/cjs/ssr/serverRender/time.js +7 -25
- package/dist/cjs/ssr/serverRender/time.worker.js +11 -26
- package/dist/cjs/ssr/serverRender/types.js +7 -25
- package/dist/cjs/ssr/serverRender/utils.js +12 -27
- package/dist/cjs/ssr/utils.js +26 -51
- package/dist/cjs/state/cli/index.js +71 -95
- package/dist/cjs/state/index.js +32 -39
- package/dist/cjs/state/plugins.js +26 -46
- package/dist/cjs/state/runtime/index.js +27 -37
- package/dist/cjs/state/runtime/plugin.js +82 -84
- package/dist/cjs/state/types.js +4 -15
- package/dist/esm/cli/index.js +184 -176
- package/dist/esm/common.js +4 -5
- package/dist/esm/config.js +1 -1
- package/dist/esm/core/appConfig.js +8 -7
- package/dist/esm/core/compatible.js +470 -448
- package/dist/esm/core/index.js +3 -4
- package/dist/esm/core/loader/index.js +1 -2
- package/dist/esm/core/loader/loaderManager.js +391 -366
- package/dist/esm/core/loader/useLoader.js +173 -162
- package/dist/esm/core/plugin.js +162 -155
- package/dist/esm/core/types.js +1 -1
- package/dist/esm/document/Body.js +12 -13
- package/dist/esm/document/Comment.js +11 -12
- package/dist/esm/document/DocumentContext.js +4 -5
- package/dist/esm/document/DocumentStructureContext.js +6 -7
- package/dist/esm/document/Head.js +16 -17
- package/dist/esm/document/Html.js +84 -85
- package/dist/esm/document/Links.js +5 -6
- package/dist/esm/document/Root.js +20 -21
- package/dist/esm/document/Script.js +12 -13
- package/dist/esm/document/Scripts.js +5 -6
- package/dist/esm/document/cli/index.js +390 -371
- package/dist/esm/document/constants.js +33 -34
- package/dist/esm/exports/head.js +1 -2
- package/dist/esm/exports/loadable.js +1 -2
- package/dist/esm/exports/server.js +2 -3
- package/dist/esm/exports/styled.js +1 -2
- package/dist/esm/index.js +2 -3
- package/dist/esm/router/cli/index.js +141 -141
- package/dist/esm/router/index.js +2 -3
- package/dist/esm/router/runtime/DefaultNotFound.js +12 -13
- package/dist/esm/router/runtime/DeferredDataScripts.js +4 -4
- package/dist/esm/router/runtime/DeferredDataScripts.node.js +154 -143
- package/dist/esm/router/runtime/PrefetchLink.js +418 -394
- package/dist/esm/router/runtime/fetch.js +2 -1
- package/dist/esm/router/runtime/fetch.worker.js +2 -1
- package/dist/esm/router/runtime/index.js +62 -9
- package/dist/esm/router/runtime/plugin.js +141 -142
- package/dist/esm/router/runtime/plugin.node.js +372 -353
- package/dist/esm/router/runtime/types.js +1 -1
- package/dist/esm/router/runtime/utils.js +295 -279
- package/dist/esm/router/runtime/withRouter.js +57 -58
- package/dist/esm/runtimeContext.js +2 -3
- package/dist/esm/ssr/cli/babel-plugin-ssr-loader-id.js +105 -118
- package/dist/esm/ssr/cli/index.js +146 -146
- package/dist/esm/ssr/index.js +303 -297
- package/dist/esm/ssr/index.node.js +227 -221
- package/dist/esm/ssr/prefetch.js +192 -186
- package/dist/esm/ssr/react/index.js +2 -3
- package/dist/esm/ssr/react/nossr/index.js +58 -47
- package/dist/esm/ssr/react/prerender/index.js +214 -206
- package/dist/esm/ssr/react/prerender/type.js +1 -1
- package/dist/esm/ssr/react/prerender/util.js +91 -92
- package/dist/esm/ssr/react/withCallback/index.js +13 -14
- package/dist/esm/ssr/serverRender/helmet.js +34 -35
- package/dist/esm/ssr/serverRender/index.js +167 -160
- package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.after.js +58 -59
- package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.share.js +5 -6
- package/dist/esm/ssr/serverRender/renderToStream/bulidTemplate.before.js +106 -93
- package/dist/esm/ssr/serverRender/renderToStream/index.js +157 -151
- package/dist/esm/ssr/serverRender/renderToStream/loadable.js +17 -18
- package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.js +117 -117
- package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.worker.js +286 -279
- package/dist/esm/ssr/serverRender/renderToStream/styledComponent.js +8 -9
- package/dist/esm/ssr/serverRender/renderToStream/template.js +62 -51
- package/dist/esm/ssr/serverRender/renderToStream/type.js +1 -1
- package/dist/esm/ssr/serverRender/renderToString/entry.js +393 -383
- package/dist/esm/ssr/serverRender/renderToString/index.js +158 -152
- package/dist/esm/ssr/serverRender/renderToString/loadable.js +46 -47
- package/dist/esm/ssr/serverRender/renderToString/reduce.js +7 -8
- package/dist/esm/ssr/serverRender/renderToString/styledComponent.js +6 -7
- package/dist/esm/ssr/serverRender/renderToString/template.js +142 -128
- package/dist/esm/ssr/serverRender/renderToString/type.js +6 -7
- package/dist/esm/ssr/serverRender/time.js +57 -46
- package/dist/esm/ssr/serverRender/time.worker.js +72 -61
- package/dist/esm/ssr/serverRender/utils.js +14 -15
- package/dist/esm/ssr/utils.js +128 -117
- package/dist/esm/state/cli/index.js +67 -67
- package/dist/esm/state/index.js +2 -3
- package/dist/esm/state/plugins.js +7 -8
- package/dist/esm/state/runtime/index.js +1 -2
- package/dist/esm/state/runtime/plugin.js +177 -166
- package/dist/esm/state/types.js +1 -1
- package/dist/esm-node/cli/index.js +11 -9
- package/dist/esm-node/common.js +3 -8
- package/dist/esm-node/config.js +1 -0
- package/dist/esm-node/core/appConfig.js +2 -6
- package/dist/esm-node/core/compatible.js +104 -120
- package/dist/esm-node/core/index.js +3 -13
- package/dist/esm-node/core/loader/index.js +1 -4
- package/dist/esm-node/core/loader/loaderManager.js +25 -25
- package/dist/esm-node/core/loader/useLoader.js +60 -74
- package/dist/esm-node/core/plugin.js +9 -15
- package/dist/esm-node/core/types.js +1 -0
- package/dist/esm-node/document/Body.js +11 -15
- package/dist/esm-node/document/Comment.js +10 -14
- package/dist/esm-node/document/DocumentContext.js +1 -4
- package/dist/esm-node/document/DocumentStructureContext.js +1 -4
- package/dist/esm-node/document/Head.js +14 -14
- package/dist/esm-node/document/Html.js +31 -34
- package/dist/esm-node/document/Links.js +5 -6
- package/dist/esm-node/document/Root.js +19 -21
- package/dist/esm-node/document/Script.js +10 -14
- package/dist/esm-node/document/Scripts.js +5 -6
- package/dist/esm-node/document/cli/index.js +136 -184
- package/dist/esm-node/document/constants.js +22 -52
- package/dist/esm-node/exports/head.js +1 -4
- package/dist/esm-node/exports/loadable.js +1 -4
- package/dist/esm-node/exports/server.js +1 -4
- package/dist/esm-node/exports/styled.js +1 -4
- package/dist/esm-node/index.js +2 -22
- package/dist/esm-node/router/cli/index.js +83 -98
- package/dist/esm-node/router/index.js +2 -6
- package/dist/esm-node/router/runtime/DefaultNotFound.js +11 -17
- package/dist/esm-node/router/runtime/DeferredDataScripts.js +1 -4
- package/dist/esm-node/router/runtime/DeferredDataScripts.node.js +51 -85
- package/dist/esm-node/router/runtime/PrefetchLink.js +53 -59
- package/dist/esm-node/router/runtime/fetch.js +1 -3
- package/dist/esm-node/router/runtime/fetch.node.js +1 -3
- package/dist/esm-node/router/runtime/fetch.worker.js +1 -3
- package/dist/esm-node/router/runtime/hooks.js +1 -3
- package/dist/esm-node/router/runtime/index.js +10 -69
- package/dist/esm-node/router/runtime/plugin.js +27 -41
- package/dist/esm-node/router/runtime/plugin.node.js +24 -32
- package/dist/esm-node/router/runtime/types.js +1 -0
- package/dist/esm-node/router/runtime/utils.js +34 -50
- package/dist/esm-node/router/runtime/withRouter.js +8 -14
- package/dist/esm-node/runtimeContext.js +2 -6
- package/dist/esm-node/ssr/cli/babel-plugin-ssr-loader-id.js +99 -119
- package/dist/esm-node/ssr/cli/index.js +106 -125
- package/dist/esm-node/ssr/index.js +112 -96
- package/dist/esm-node/ssr/index.node.js +39 -39
- package/dist/esm-node/ssr/prefetch.js +40 -35
- package/dist/esm-node/ssr/react/index.js +2 -6
- package/dist/esm-node/ssr/react/nossr/index.js +2 -9
- package/dist/esm-node/ssr/react/prerender/index.js +32 -23
- package/dist/esm-node/ssr/react/prerender/type.js +1 -0
- package/dist/esm-node/ssr/react/prerender/util.js +23 -33
- package/dist/esm-node/ssr/react/withCallback/index.js +4 -5
- package/dist/esm-node/ssr/serverRender/helmet.js +2 -5
- package/dist/esm-node/ssr/serverRender/index.js +5 -10
- package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.after.js +5 -9
- package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.share.js +3 -10
- package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js +7 -17
- package/dist/esm-node/ssr/serverRender/renderToStream/index.js +2 -7
- package/dist/esm-node/ssr/serverRender/renderToStream/loadable.js +4 -8
- package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.js +21 -39
- package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.worker.js +16 -31
- package/dist/esm-node/ssr/serverRender/renderToStream/styledComponent.js +1 -4
- package/dist/esm-node/ssr/serverRender/renderToStream/template.js +2 -8
- package/dist/esm-node/ssr/serverRender/renderToStream/type.js +1 -0
- package/dist/esm-node/ssr/serverRender/renderToString/entry.js +50 -39
- package/dist/esm-node/ssr/serverRender/renderToString/index.js +1 -8
- package/dist/esm-node/ssr/serverRender/renderToString/loadable.js +8 -18
- package/dist/esm-node/ssr/serverRender/renderToString/reduce.js +1 -4
- package/dist/esm-node/ssr/serverRender/renderToString/styledComponent.js +1 -4
- package/dist/esm-node/ssr/serverRender/renderToString/template.js +32 -18
- package/dist/esm-node/ssr/serverRender/renderToString/type.js +3 -6
- package/dist/esm-node/ssr/serverRender/time.js +1 -4
- package/dist/esm-node/ssr/serverRender/time.worker.js +5 -5
- package/dist/esm-node/ssr/serverRender/types.js +1 -3
- package/dist/esm-node/ssr/serverRender/utils.js +4 -10
- package/dist/esm-node/ssr/utils.js +8 -19
- package/dist/esm-node/state/cli/index.js +63 -78
- package/dist/esm-node/state/index.js +2 -6
- package/dist/esm-node/state/plugins.js +4 -10
- package/dist/esm-node/state/runtime/index.js +1 -4
- package/dist/esm-node/state/runtime/plugin.js +47 -44
- package/dist/esm-node/state/types.js +1 -0
- package/dist/types/router/runtime/index.d.ts +1 -1
- package/package.json +14 -10
- package/types/model.d.ts +1 -0
|
@@ -1,39 +1,24 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
};
|
|
9
|
-
var __copyProps = (to, from, except, desc) => {
|
|
10
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
-
for (let key of __getOwnPropNames(from))
|
|
12
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
-
}
|
|
15
|
-
return to;
|
|
16
|
-
};
|
|
17
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
-
var loadable_exports = {};
|
|
19
|
-
__export(loadable_exports, {
|
|
20
|
-
getLoadableChunks: () => getLoadableChunks
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "getLoadableChunks", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: () => getLoadableChunks
|
|
21
8
|
});
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
function getLoadableChunks({
|
|
25
|
-
context,
|
|
26
|
-
jsx
|
|
27
|
-
}) {
|
|
9
|
+
const _server = require("@loadable/server");
|
|
10
|
+
function getLoadableChunks({ context, jsx }) {
|
|
28
11
|
const { loadableStats, entryName } = context.ssrContext;
|
|
29
12
|
if (!loadableStats) {
|
|
30
13
|
return {
|
|
31
14
|
jsx
|
|
32
15
|
};
|
|
33
16
|
}
|
|
34
|
-
const extractor = new
|
|
17
|
+
const extractor = new _server.ChunkExtractor({
|
|
35
18
|
stats: loadableStats,
|
|
36
|
-
entrypoints: [
|
|
19
|
+
entrypoints: [
|
|
20
|
+
entryName
|
|
21
|
+
]
|
|
37
22
|
});
|
|
38
23
|
const collectedJsx = extractor.collectChunks(jsx);
|
|
39
24
|
return {
|
|
@@ -41,7 +26,3 @@ function getLoadableChunks({
|
|
|
41
26
|
chunkExtractor: extractor
|
|
42
27
|
};
|
|
43
28
|
}
|
|
44
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
45
|
-
0 && (module.exports = {
|
|
46
|
-
getLoadableChunks
|
|
47
|
-
});
|
|
@@ -1,37 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
-
var __export = (target, all) => {
|
|
6
|
-
for (var name in all)
|
|
7
|
-
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
-
};
|
|
9
|
-
var __copyProps = (to, from, except, desc) => {
|
|
10
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
-
for (let key of __getOwnPropNames(from))
|
|
12
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
-
}
|
|
15
|
-
return to;
|
|
16
|
-
};
|
|
17
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
-
var renderToPipe_exports = {};
|
|
19
|
-
__export(renderToPipe_exports, {
|
|
20
|
-
default: () => renderToPipe_default
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
21
4
|
});
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
5
|
+
Object.defineProperty(exports, "default", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: () => _default
|
|
8
|
+
});
|
|
9
|
+
const _stream = require("stream");
|
|
10
|
+
const _types = require("../types");
|
|
11
|
+
const _common = require("../../../common");
|
|
12
|
+
const _template = require("./template");
|
|
13
|
+
var ShellChunkStatus;
|
|
14
|
+
(function(ShellChunkStatus2) {
|
|
28
15
|
ShellChunkStatus2[ShellChunkStatus2["IDLE"] = 0] = "IDLE";
|
|
29
16
|
ShellChunkStatus2[ShellChunkStatus2["START"] = 1] = "START";
|
|
30
17
|
ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 2] = "FINIESH";
|
|
31
|
-
|
|
32
|
-
})(ShellChunkStatus || {});
|
|
18
|
+
})(ShellChunkStatus || (ShellChunkStatus = {}));
|
|
33
19
|
function renderToPipe(rootElement, context, options) {
|
|
34
|
-
let shellChunkStatus =
|
|
20
|
+
let shellChunkStatus = ShellChunkStatus.IDLE;
|
|
35
21
|
const { ssrContext } = context;
|
|
36
22
|
const forUserPipe = (stream) => {
|
|
37
23
|
return new Promise((resolve) => {
|
|
@@ -43,27 +29,21 @@ function renderToPipe(rootElement, context, options) {
|
|
|
43
29
|
const { pipe } = renderToPipeableStream(rootElement, {
|
|
44
30
|
...options,
|
|
45
31
|
onShellReady() {
|
|
46
|
-
var
|
|
47
|
-
const { shellAfter, shellBefore } = (0,
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
);
|
|
51
|
-
(_a = options == null ? void 0 : options.onShellReady) == null ? void 0 : _a.call(options);
|
|
52
|
-
const injectableTransform = new import_stream.Transform({
|
|
32
|
+
var _options_onShellReady;
|
|
33
|
+
const { shellAfter, shellBefore } = (0, _template.getTemplates)(context, _types.RenderLevel.SERVER_RENDER);
|
|
34
|
+
options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
|
|
35
|
+
const injectableTransform = new _stream.Transform({
|
|
53
36
|
transform(chunk, _encoding, callback) {
|
|
54
37
|
try {
|
|
55
|
-
if (shellChunkStatus !==
|
|
38
|
+
if (shellChunkStatus !== ShellChunkStatus.FINIESH) {
|
|
56
39
|
let concatedChunk = chunk.toString();
|
|
57
|
-
if (shellChunkStatus ===
|
|
40
|
+
if (shellChunkStatus === ShellChunkStatus.IDLE) {
|
|
58
41
|
concatedChunk = `${shellBefore}${concatedChunk}`;
|
|
59
|
-
shellChunkStatus =
|
|
42
|
+
shellChunkStatus = ShellChunkStatus.START;
|
|
60
43
|
}
|
|
61
|
-
if (shellChunkStatus ===
|
|
62
|
-
concatedChunk = concatedChunk.replace(
|
|
63
|
-
|
|
64
|
-
shellAfter
|
|
65
|
-
);
|
|
66
|
-
shellChunkStatus = 2 /* FINIESH */;
|
|
44
|
+
if (shellChunkStatus === ShellChunkStatus.START && concatedChunk.endsWith(_common.ESCAPED_SHELL_STREAM_END_MARK)) {
|
|
45
|
+
concatedChunk = concatedChunk.replace(_common.ESCAPED_SHELL_STREAM_END_MARK, shellAfter);
|
|
46
|
+
shellChunkStatus = ShellChunkStatus.FINIESH;
|
|
67
47
|
}
|
|
68
48
|
this.push(concatedChunk);
|
|
69
49
|
} else {
|
|
@@ -82,33 +62,22 @@ function renderToPipe(rootElement, context, options) {
|
|
|
82
62
|
resolve(pipe(injectableTransform).pipe(stream));
|
|
83
63
|
},
|
|
84
64
|
onShellError(error) {
|
|
85
|
-
var
|
|
86
|
-
ssrContext.metrics.emitCounter(
|
|
87
|
-
|
|
88
|
-
1
|
|
89
|
-
);
|
|
90
|
-
const { shellAfter, shellBefore } = (0, import_template.getTemplates)(
|
|
91
|
-
context,
|
|
92
|
-
import_types.RenderLevel.CLIENT_RENDER
|
|
93
|
-
);
|
|
65
|
+
var _options_onShellError;
|
|
66
|
+
ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
|
|
67
|
+
const { shellAfter, shellBefore } = (0, _template.getTemplates)(context, _types.RenderLevel.CLIENT_RENDER);
|
|
94
68
|
const fallbackHtml = `${shellBefore}${shellAfter}`;
|
|
95
69
|
resolve(fallbackHtml);
|
|
96
|
-
|
|
70
|
+
options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
|
|
97
71
|
},
|
|
98
72
|
onError(error) {
|
|
99
|
-
var
|
|
100
|
-
ssrContext.logger.error(
|
|
101
|
-
"An error occurs during streaming SSR",
|
|
102
|
-
error
|
|
103
|
-
);
|
|
73
|
+
var _options_onError;
|
|
74
|
+
ssrContext.logger.error("An error occurs during streaming SSR", error);
|
|
104
75
|
ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
|
|
105
|
-
|
|
76
|
+
options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
|
|
106
77
|
}
|
|
107
78
|
});
|
|
108
79
|
});
|
|
109
80
|
};
|
|
110
81
|
return forUserPipe;
|
|
111
82
|
}
|
|
112
|
-
|
|
113
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
114
|
-
0 && (module.exports = {});
|
|
83
|
+
const _default = renderToPipe;
|
|
@@ -1,36 +1,22 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
};
|
|
9
|
-
var __copyProps = (to, from, except, desc) => {
|
|
10
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
-
for (let key of __getOwnPropNames(from))
|
|
12
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
-
}
|
|
15
|
-
return to;
|
|
16
|
-
};
|
|
17
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
-
var renderToPipe_worker_exports = {};
|
|
19
|
-
__export(renderToPipe_worker_exports, {
|
|
20
|
-
default: () => renderToPipe_worker_default
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "default", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: () => _default
|
|
21
8
|
});
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
var
|
|
26
|
-
|
|
9
|
+
const _types = require("../types");
|
|
10
|
+
const _common = require("../../../common");
|
|
11
|
+
const _template = require("./template");
|
|
12
|
+
var ShellChunkStatus;
|
|
13
|
+
(function(ShellChunkStatus2) {
|
|
27
14
|
ShellChunkStatus2[ShellChunkStatus2["IDLE"] = 0] = "IDLE";
|
|
28
15
|
ShellChunkStatus2[ShellChunkStatus2["START"] = 1] = "START";
|
|
29
16
|
ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 2] = "FINIESH";
|
|
30
|
-
|
|
31
|
-
})(ShellChunkStatus || {});
|
|
17
|
+
})(ShellChunkStatus || (ShellChunkStatus = {}));
|
|
32
18
|
function renderToPipe(rootElement, context, options) {
|
|
33
|
-
let shellChunkStatus =
|
|
19
|
+
let shellChunkStatus = ShellChunkStatus.IDLE;
|
|
34
20
|
const { ssrContext } = context;
|
|
35
21
|
const forUserPipe = async () => {
|
|
36
22
|
let renderToReadableStream;
|
|
@@ -38,21 +24,15 @@ function renderToPipe(rootElement, context, options) {
|
|
|
38
24
|
({ renderToReadableStream } = require("react-dom/server"));
|
|
39
25
|
} catch (e) {
|
|
40
26
|
}
|
|
41
|
-
const { shellAfter, shellBefore } = (0,
|
|
42
|
-
context,
|
|
43
|
-
import_types.RenderLevel.SERVER_RENDER
|
|
44
|
-
);
|
|
27
|
+
const { shellAfter, shellBefore } = (0, _template.getTemplates)(context, _types.RenderLevel.SERVER_RENDER);
|
|
45
28
|
try {
|
|
46
29
|
const readableOriginal = await renderToReadableStream(rootElement, {
|
|
47
30
|
...options,
|
|
48
31
|
onError(error) {
|
|
49
|
-
var
|
|
50
|
-
ssrContext.logger.error(
|
|
51
|
-
"An error occurs during streaming SSR",
|
|
52
|
-
error
|
|
53
|
-
);
|
|
32
|
+
var _options_onError;
|
|
33
|
+
ssrContext.logger.error("An error occurs during streaming SSR", error);
|
|
54
34
|
ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
|
|
55
|
-
|
|
35
|
+
options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
|
|
56
36
|
}
|
|
57
37
|
});
|
|
58
38
|
const reader = readableOriginal.getReader();
|
|
@@ -64,18 +44,15 @@ function renderToPipe(rootElement, context, options) {
|
|
|
64
44
|
controller.close();
|
|
65
45
|
return;
|
|
66
46
|
}
|
|
67
|
-
if (shellChunkStatus !==
|
|
47
|
+
if (shellChunkStatus !== ShellChunkStatus.FINIESH) {
|
|
68
48
|
let concatedChunk = new TextDecoder().decode(value);
|
|
69
|
-
if (shellChunkStatus ===
|
|
49
|
+
if (shellChunkStatus === ShellChunkStatus.IDLE) {
|
|
70
50
|
concatedChunk = `${shellBefore}${concatedChunk}`;
|
|
71
|
-
shellChunkStatus =
|
|
51
|
+
shellChunkStatus = ShellChunkStatus.START;
|
|
72
52
|
}
|
|
73
|
-
if (shellChunkStatus ===
|
|
74
|
-
concatedChunk = concatedChunk.replace(
|
|
75
|
-
|
|
76
|
-
shellAfter
|
|
77
|
-
);
|
|
78
|
-
shellChunkStatus = 2 /* FINIESH */;
|
|
53
|
+
if (shellChunkStatus === ShellChunkStatus.START && concatedChunk.endsWith(_common.ESCAPED_SHELL_STREAM_END_MARK)) {
|
|
54
|
+
concatedChunk = concatedChunk.replace(_common.ESCAPED_SHELL_STREAM_END_MARK, shellAfter);
|
|
55
|
+
shellChunkStatus = ShellChunkStatus.FINIESH;
|
|
79
56
|
}
|
|
80
57
|
controller.enqueue(encodeForWebStream(concatedChunk));
|
|
81
58
|
} else {
|
|
@@ -89,10 +66,7 @@ function renderToPipe(rootElement, context, options) {
|
|
|
89
66
|
return injectableStream;
|
|
90
67
|
} catch (err) {
|
|
91
68
|
ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
|
|
92
|
-
const { shellAfter: shellAfter2, shellBefore: shellBefore2 } = (0,
|
|
93
|
-
context,
|
|
94
|
-
import_types.RenderLevel.CLIENT_RENDER
|
|
95
|
-
);
|
|
69
|
+
const { shellAfter: shellAfter2, shellBefore: shellBefore2 } = (0, _template.getTemplates)(context, _types.RenderLevel.CLIENT_RENDER);
|
|
96
70
|
const fallbackHtml = `${shellBefore2}${shellAfter2}`;
|
|
97
71
|
return fallbackHtml;
|
|
98
72
|
}
|
|
@@ -109,6 +83,4 @@ function encodeForWebStream(thing) {
|
|
|
109
83
|
}
|
|
110
84
|
return thing;
|
|
111
85
|
}
|
|
112
|
-
|
|
113
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
114
|
-
0 && (module.exports = {});
|
|
86
|
+
const _default = renderToPipe;
|
|
@@ -1,35 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
-
var __export = (target, all) => {
|
|
6
|
-
for (var name in all)
|
|
7
|
-
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
-
};
|
|
9
|
-
var __copyProps = (to, from, except, desc) => {
|
|
10
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
-
for (let key of __getOwnPropNames(from))
|
|
12
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
-
}
|
|
15
|
-
return to;
|
|
16
|
-
};
|
|
17
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
-
var styledComponent_exports = {};
|
|
19
|
-
__export(styledComponent_exports, {
|
|
20
|
-
getStyledComponentCss: () => getStyledComponentCss
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
21
4
|
});
|
|
22
|
-
|
|
23
|
-
|
|
5
|
+
Object.defineProperty(exports, "getStyledComponentCss", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: () => getStyledComponentCss
|
|
8
|
+
});
|
|
9
|
+
const _styledcomponents = require("styled-components");
|
|
24
10
|
function getStyledComponentCss({ jsx }) {
|
|
25
|
-
const sheet = new
|
|
11
|
+
const sheet = new _styledcomponents.ServerStyleSheet();
|
|
26
12
|
const collectedJsx = sheet.collectStyles(jsx);
|
|
27
13
|
return {
|
|
28
14
|
styleSheet: sheet,
|
|
29
15
|
jsx: collectedJsx
|
|
30
16
|
};
|
|
31
17
|
}
|
|
32
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
33
|
-
0 && (module.exports = {
|
|
34
|
-
getStyledComponentCss
|
|
35
|
-
});
|
|
@@ -1,36 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
-
var __export = (target, all) => {
|
|
6
|
-
for (var name in all)
|
|
7
|
-
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
-
};
|
|
9
|
-
var __copyProps = (to, from, except, desc) => {
|
|
10
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
-
for (let key of __getOwnPropNames(from))
|
|
12
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
-
}
|
|
15
|
-
return to;
|
|
16
|
-
};
|
|
17
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
-
var template_exports = {};
|
|
19
|
-
__export(template_exports, {
|
|
20
|
-
getTemplates: () => getTemplates
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
21
4
|
});
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
5
|
+
Object.defineProperty(exports, "getTemplates", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: () => getTemplates
|
|
8
|
+
});
|
|
9
|
+
const _buildTemplateafter = require("./buildTemplate.after");
|
|
10
|
+
const _bulidTemplatebefore = require("./bulidTemplate.before");
|
|
25
11
|
const HTML_SEPARATOR = "<!--<?- html ?>-->";
|
|
26
12
|
const getTemplates = (context, renderLevel) => {
|
|
27
13
|
const { ssrContext } = context;
|
|
28
14
|
const [beforeAppTemplate = "", afterAppHtmlTemplate = ""] = ssrContext.template.split(HTML_SEPARATOR) || [];
|
|
29
|
-
const builtBeforeTemplate = (0,
|
|
30
|
-
|
|
31
|
-
context
|
|
32
|
-
);
|
|
33
|
-
const builtAfterTemplate = (0, import_buildTemplate.buildShellAfterTemplate)(afterAppHtmlTemplate, {
|
|
15
|
+
const builtBeforeTemplate = (0, _bulidTemplatebefore.buildShellBeforeTemplate)(beforeAppTemplate, context);
|
|
16
|
+
const builtAfterTemplate = (0, _buildTemplateafter.buildShellAfterTemplate)(afterAppHtmlTemplate, {
|
|
34
17
|
context,
|
|
35
18
|
renderLevel
|
|
36
19
|
});
|
|
@@ -39,7 +22,3 @@ const getTemplates = (context, renderLevel) => {
|
|
|
39
22
|
shellAfter: builtAfterTemplate
|
|
40
23
|
};
|
|
41
24
|
};
|
|
42
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
43
|
-
0 && (module.exports = {
|
|
44
|
-
getTemplates
|
|
45
|
-
});
|
|
@@ -1,15 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
var __copyProps = (to, from, except, desc) => {
|
|
6
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
7
|
-
for (let key of __getOwnPropNames(from))
|
|
8
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
9
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
10
|
-
}
|
|
11
|
-
return to;
|
|
12
|
-
};
|
|
13
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
14
|
-
var type_exports = {};
|
|
15
|
-
module.exports = __toCommonJS(type_exports);
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|