@modern-js/runtime 2.0.0-beta.3 → 2.0.0-beta.5
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 +126 -0
- package/dist/js/modern/cli/index.js +49 -19
- package/dist/js/modern/cli/types.d.js +0 -0
- package/dist/js/modern/common.js +4 -1
- package/dist/js/modern/core/app-config.js +8 -9
- package/dist/js/modern/core/compatible.js +195 -169
- package/dist/js/modern/core/index.js +14 -6
- package/dist/js/modern/core/loader/index.js +4 -1
- package/dist/js/modern/core/loader/loaderManager.js +75 -77
- package/dist/js/modern/core/loader/useLoader.js +96 -69
- package/dist/js/modern/core/plugin.js +37 -20
- package/dist/js/modern/document/Body.js +20 -14
- package/dist/js/modern/document/DocumentContext.js +6 -3
- package/dist/js/modern/document/DocumentStructrueContext.js +6 -3
- package/dist/js/modern/document/Head.js +18 -17
- package/dist/js/modern/document/Html.js +42 -58
- package/dist/js/modern/document/Root.js +22 -20
- package/dist/js/modern/document/Script.js +20 -0
- package/dist/js/modern/document/Scripts.js +7 -7
- package/dist/js/modern/document/cli/index.js +175 -85
- package/dist/js/modern/document/constants.js +41 -15
- package/dist/js/modern/document/index.js +2 -1
- package/dist/js/modern/document/type.d.js +0 -0
- package/dist/js/modern/exports/head.js +6 -3
- package/dist/js/modern/exports/loadable.js +6 -3
- package/dist/js/modern/exports/server.js +4 -1
- package/dist/js/modern/exports/styled.js +6 -3
- package/dist/js/modern/index.js +22 -2
- package/dist/js/modern/modern-app.env.d.js +0 -0
- package/dist/js/modern/router/cli/index.js +76 -60
- package/dist/js/modern/router/index.js +7 -3
- package/dist/js/modern/router/runtime/DefaultNotFound.js +11 -10
- package/dist/js/modern/router/runtime/index.js +8 -3
- package/dist/js/modern/router/runtime/plugin.js +79 -37
- package/dist/js/modern/router/runtime/plugin.node.js +88 -83
- package/dist/js/modern/router/runtime/root/index.js +10 -10
- package/dist/js/modern/router/runtime/root/load.js +57 -36
- package/dist/js/modern/router/runtime/server.js +1 -1
- package/dist/js/modern/router/runtime/types.js +0 -1
- package/dist/js/modern/router/runtime/utils.js +91 -66
- package/dist/js/modern/router/runtime/withRouter.js +31 -15
- package/dist/js/modern/runtime-context.js +7 -3
- package/dist/js/modern/ssr/cli/babel-plugin-ssr-loader-id.js +130 -0
- package/dist/js/modern/ssr/cli/index.js +102 -79
- package/dist/js/modern/ssr/index.js +89 -71
- package/dist/js/modern/ssr/index.node.js +59 -37
- package/dist/js/modern/ssr/prefetch.js +64 -45
- package/dist/js/modern/ssr/react/index.js +6 -2
- package/dist/js/modern/ssr/react/nossr/index.js +8 -7
- package/dist/js/modern/ssr/react/prerender/index.js +53 -28
- package/dist/js/modern/ssr/react/prerender/util.js +38 -26
- package/dist/js/modern/ssr/react/withCallback/index.js +6 -7
- package/dist/js/modern/ssr/serverRender/helmet.js +18 -12
- package/dist/js/modern/ssr/serverRender/index.js +34 -13
- package/dist/js/modern/ssr/serverRender/renderToStream/buildTemplate.after.js +10 -12
- package/dist/js/modern/ssr/serverRender/renderToStream/buildTemplate.share.js +11 -5
- package/dist/js/modern/ssr/serverRender/renderToStream/bulidTemplate.before.js +37 -38
- package/dist/js/modern/ssr/serverRender/renderToStream/index.js +36 -18
- package/dist/js/modern/ssr/serverRender/renderToStream/loadable.js +7 -7
- package/dist/js/modern/ssr/serverRender/renderToStream/renderToPipe.js +56 -34
- package/dist/js/modern/ssr/serverRender/renderToStream/styledComponent.js +6 -5
- package/dist/js/modern/ssr/serverRender/renderToStream/template.js +13 -9
- package/dist/js/modern/ssr/serverRender/renderToString/entry.js +101 -84
- package/dist/js/modern/ssr/serverRender/renderToString/index.js +32 -9
- package/dist/js/modern/ssr/serverRender/renderToString/loadable.js +21 -18
- package/dist/js/modern/ssr/serverRender/renderToString/reduce.js +6 -3
- package/dist/js/modern/ssr/serverRender/renderToString/styledComponent.js +6 -3
- package/dist/js/modern/ssr/serverRender/renderToString/template.js +22 -22
- package/dist/js/modern/ssr/serverRender/renderToString/type.js +9 -6
- package/dist/js/modern/ssr/serverRender/types.js +3 -1
- package/dist/js/modern/ssr/serverRender/utils.js +11 -9
- package/dist/js/modern/ssr/type.d.js +0 -0
- package/dist/js/modern/ssr/utils.js +41 -21
- package/dist/js/modern/state/cli/index.js +43 -32
- package/dist/js/modern/state/index.js +7 -3
- package/dist/js/modern/state/plugins.js +13 -7
- package/dist/js/modern/state/runtime/index.js +9 -4
- package/dist/js/modern/state/runtime/plugin.js +56 -40
- package/dist/js/modern/state/types.js +0 -1
- package/dist/js/node/cli/index.js +79 -30
- package/dist/js/node/cli/types.d.js +0 -0
- package/dist/js/node/common.js +26 -7
- package/dist/js/node/core/app-config.js +29 -14
- package/dist/js/node/core/compatible.js +227 -186
- package/dist/js/node/core/index.js +44 -99
- package/dist/js/node/core/loader/index.js +31 -11
- package/dist/js/node/core/loader/loaderManager.js +102 -83
- package/dist/js/node/core/loader/useLoader.js +120 -83
- package/dist/js/node/core/plugin.js +65 -35
- package/dist/js/node/document/Body.js +40 -23
- package/dist/js/node/document/DocumentContext.js +33 -9
- package/dist/js/node/document/DocumentStructrueContext.js +33 -9
- package/dist/js/node/document/Head.js +43 -27
- package/dist/js/node/document/Html.js +66 -65
- package/dist/js/node/document/Root.js +47 -31
- package/dist/js/node/document/Script.js +40 -0
- package/dist/js/node/document/Scripts.js +30 -14
- package/dist/js/node/document/cli/index.js +188 -95
- package/dist/js/node/document/constants.js +73 -28
- package/dist/js/node/document/index.js +25 -93
- package/dist/js/node/document/type.d.js +0 -0
- package/dist/js/node/exports/head.js +33 -22
- package/dist/js/node/exports/loadable.js +33 -22
- package/dist/js/node/exports/server.js +26 -7
- package/dist/js/node/exports/styled.js +33 -22
- package/dist/js/node/index.js +43 -60
- package/dist/js/node/modern-app.env.d.js +0 -0
- package/dist/js/node/router/cli/index.js +89 -65
- package/dist/js/node/router/index.js +33 -30
- package/dist/js/node/router/runtime/DefaultNotFound.js +32 -17
- package/dist/js/node/router/runtime/index.js +31 -32
- package/dist/js/node/router/runtime/plugin.js +101 -44
- package/dist/js/node/router/runtime/plugin.node.js +113 -93
- package/dist/js/node/router/runtime/root/index.js +37 -21
- package/dist/js/node/router/runtime/root/load.js +80 -42
- package/dist/js/node/router/runtime/server.js +17 -16
- package/dist/js/node/router/runtime/types.js +15 -5
- package/dist/js/node/router/runtime/utils.js +112 -75
- package/dist/js/node/router/runtime/withRouter.js +53 -22
- package/dist/js/node/runtime-context.js +30 -10
- package/dist/js/node/ssr/cli/babel-plugin-ssr-loader-id.js +139 -0
- package/dist/js/node/ssr/cli/index.js +119 -85
- package/dist/js/node/ssr/index.js +125 -104
- package/dist/js/node/ssr/index.node.js +86 -59
- package/dist/js/node/ssr/prefetch.js +84 -51
- package/dist/js/node/ssr/react/index.js +27 -16
- package/dist/js/node/ssr/react/nossr/index.js +37 -16
- package/dist/js/node/ssr/react/prerender/index.js +82 -45
- package/dist/js/node/ssr/react/prerender/type.js +15 -0
- package/dist/js/node/ssr/react/prerender/util.js +63 -36
- package/dist/js/node/ssr/react/withCallback/index.js +29 -15
- package/dist/js/node/ssr/serverRender/helmet.js +37 -17
- package/dist/js/node/ssr/serverRender/index.js +55 -19
- package/dist/js/node/ssr/serverRender/renderToStream/buildTemplate.after.js +40 -20
- package/dist/js/node/ssr/serverRender/renderToStream/buildTemplate.share.js +32 -10
- package/dist/js/node/ssr/serverRender/renderToStream/bulidTemplate.before.js +65 -47
- package/dist/js/node/ssr/serverRender/renderToStream/index.js +69 -30
- package/dist/js/node/ssr/serverRender/renderToStream/loadable.js +29 -12
- package/dist/js/node/ssr/serverRender/renderToStream/renderToPipe.js +75 -43
- package/dist/js/node/ssr/serverRender/renderToStream/styledComponent.js +29 -11
- package/dist/js/node/ssr/serverRender/renderToStream/template.js +36 -16
- package/dist/js/node/ssr/serverRender/renderToStream/type.js +15 -0
- package/dist/js/node/ssr/serverRender/renderToString/entry.js +135 -103
- package/dist/js/node/ssr/serverRender/renderToString/index.js +64 -20
- package/dist/js/node/ssr/serverRender/renderToString/loadable.js +45 -26
- package/dist/js/node/ssr/serverRender/renderToString/reduce.js +27 -7
- package/dist/js/node/ssr/serverRender/renderToString/styledComponent.js +27 -8
- package/dist/js/node/ssr/serverRender/renderToString/template.js +44 -28
- package/dist/js/node/ssr/serverRender/renderToString/type.js +31 -12
- package/dist/js/node/ssr/serverRender/types.js +25 -10
- package/dist/js/node/ssr/serverRender/utils.js +31 -13
- package/dist/js/node/ssr/type.d.js +0 -0
- package/dist/js/node/ssr/utils.js +63 -29
- package/dist/js/node/state/cli/index.js +58 -37
- package/dist/js/node/state/index.js +33 -30
- package/dist/js/node/state/plugins.js +43 -22
- package/dist/js/node/state/runtime/index.js +36 -50
- package/dist/js/node/state/runtime/plugin.js +89 -68
- package/dist/js/node/state/types.js +15 -5
- package/dist/js/treeshaking/cli/index.js +180 -52
- package/dist/js/treeshaking/cli/types.d.js +1 -0
- package/dist/js/treeshaking/common.js +4 -3
- package/dist/js/treeshaking/core/app-config.js +8 -13
- package/dist/js/treeshaking/core/compatible.js +473 -276
- package/dist/js/treeshaking/core/index.js +5 -6
- package/dist/js/treeshaking/core/loader/index.js +2 -1
- package/dist/js/treeshaking/core/loader/loaderManager.js +395 -224
- package/dist/js/treeshaking/core/loader/useLoader.js +181 -83
- package/dist/js/treeshaking/core/plugin.js +164 -48
- package/dist/js/treeshaking/document/Body.js +15 -11
- package/dist/js/treeshaking/document/DocumentContext.js +7 -6
- package/dist/js/treeshaking/document/DocumentStructrueContext.js +8 -7
- package/dist/js/treeshaking/document/Head.js +18 -17
- package/dist/js/treeshaking/document/Html.js +86 -93
- package/dist/js/treeshaking/document/Root.js +23 -21
- package/dist/js/treeshaking/document/Script.js +15 -0
- package/dist/js/treeshaking/document/Scripts.js +7 -9
- package/dist/js/treeshaking/document/cli/index.js +381 -168
- package/dist/js/treeshaking/document/constants.js +34 -16
- package/dist/js/treeshaking/document/index.js +2 -1
- package/dist/js/treeshaking/document/type.d.js +1 -0
- package/dist/js/treeshaking/exports/head.js +4 -3
- package/dist/js/treeshaking/exports/loadable.js +4 -3
- package/dist/js/treeshaking/exports/server.js +4 -3
- package/dist/js/treeshaking/exports/styled.js +4 -3
- package/dist/js/treeshaking/index.js +3 -2
- package/dist/js/treeshaking/modern-app.env.d.js +1 -0
- package/dist/js/treeshaking/router/cli/index.js +145 -99
- package/dist/js/treeshaking/router/index.js +4 -3
- package/dist/js/treeshaking/router/runtime/DefaultNotFound.js +14 -15
- package/dist/js/treeshaking/router/runtime/index.js +5 -3
- package/dist/js/treeshaking/router/runtime/plugin.js +129 -62
- package/dist/js/treeshaking/router/runtime/plugin.node.js +375 -152
- package/dist/js/treeshaking/router/runtime/root/index.js +17 -15
- package/dist/js/treeshaking/router/runtime/root/load.js +290 -95
- package/dist/js/treeshaking/router/runtime/server.js +1 -1
- package/dist/js/treeshaking/router/runtime/types.js +1 -1
- package/dist/js/treeshaking/router/runtime/utils.js +230 -142
- package/dist/js/treeshaking/router/runtime/withRouter.js +67 -18
- package/dist/js/treeshaking/runtime-context.js +4 -3
- package/dist/js/treeshaking/ssr/cli/babel-plugin-ssr-loader-id.js +122 -0
- package/dist/js/treeshaking/ssr/cli/index.js +210 -138
- package/dist/js/treeshaking/ssr/index.js +305 -144
- package/dist/js/treeshaking/ssr/index.node.js +234 -66
- package/dist/js/treeshaking/ssr/prefetch.js +196 -79
- package/dist/js/treeshaking/ssr/react/index.js +3 -2
- package/dist/js/treeshaking/ssr/react/nossr/index.js +57 -14
- package/dist/js/treeshaking/ssr/react/prerender/index.js +226 -89
- package/dist/js/treeshaking/ssr/react/prerender/type.js +1 -0
- package/dist/js/treeshaking/ssr/react/prerender/util.js +96 -86
- package/dist/js/treeshaking/ssr/react/withCallback/index.js +16 -15
- package/dist/js/treeshaking/ssr/serverRender/helmet.js +38 -34
- package/dist/js/treeshaking/ssr/serverRender/index.js +165 -37
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/buildTemplate.after.js +33 -31
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/buildTemplate.share.js +7 -7
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/bulidTemplate.before.js +109 -58
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/index.js +157 -42
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/loadable.js +20 -20
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/renderToPipe.js +114 -63
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/styledComponent.js +11 -10
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/template.js +61 -20
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/type.js +1 -0
- package/dist/js/treeshaking/ssr/serverRender/renderToString/entry.js +380 -208
- package/dist/js/treeshaking/ssr/serverRender/renderToString/index.js +161 -40
- package/dist/js/treeshaking/ssr/serverRender/renderToString/loadable.js +51 -45
- package/dist/js/treeshaking/ssr/serverRender/renderToString/reduce.js +9 -8
- package/dist/js/treeshaking/ssr/serverRender/renderToString/styledComponent.js +9 -8
- package/dist/js/treeshaking/ssr/serverRender/renderToString/template.js +142 -64
- package/dist/js/treeshaking/ssr/serverRender/renderToString/type.js +7 -6
- package/dist/js/treeshaking/ssr/serverRender/types.js +1 -1
- package/dist/js/treeshaking/ssr/serverRender/utils.js +67 -26
- package/dist/js/treeshaking/ssr/type.d.js +1 -0
- package/dist/js/treeshaking/ssr/utils.js +128 -64
- package/dist/js/treeshaking/state/cli/index.js +70 -68
- package/dist/js/treeshaking/state/index.js +4 -3
- package/dist/js/treeshaking/state/plugins.js +12 -11
- package/dist/js/treeshaking/state/runtime/index.js +5 -4
- package/dist/js/treeshaking/state/runtime/plugin.js +189 -77
- package/dist/js/treeshaking/state/types.js +1 -1
- package/dist/types/cli/index.d.ts +2 -0
- package/dist/types/core/loader/loaderManager.d.ts +1 -0
- package/dist/types/core/loader/useLoader.d.ts +5 -0
- package/dist/types/core/plugin.d.ts +6 -1
- package/dist/types/document/Script.d.ts +4 -0
- package/dist/types/document/cli/index.d.ts +2 -0
- package/dist/types/document/constants.d.ts +2 -0
- package/dist/types/document/index.d.ts +1 -0
- package/dist/types/router/cli/index.d.ts +2 -0
- package/dist/types/router/runtime/index.d.ts +1 -0
- package/dist/types/router/runtime/plugin.d.ts +5 -2
- package/dist/types/router/runtime/types.d.ts +5 -2
- package/dist/types/ssr/cli/babel-plugin-ssr-loader-id.d.ts +1 -0
- package/dist/types/ssr/cli/index.d.ts +2 -0
- package/dist/types/state/cli/index.d.ts +2 -0
- package/dist/types/state/types.d.ts +1 -0
- package/package.json +24 -13
- package/types/index.d.ts +2 -2
- package/types/router.d.ts +2 -2
|
@@ -1,23 +1,55 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __create = Object.create;
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
9
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
10
|
+
var __spreadValues = (a, b) => {
|
|
11
|
+
for (var prop in b || (b = {}))
|
|
12
|
+
if (__hasOwnProp.call(b, prop))
|
|
13
|
+
__defNormalProp(a, prop, b[prop]);
|
|
14
|
+
if (__getOwnPropSymbols)
|
|
15
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
16
|
+
if (__propIsEnum.call(b, prop))
|
|
17
|
+
__defNormalProp(a, prop, b[prop]);
|
|
18
|
+
}
|
|
19
|
+
return a;
|
|
20
|
+
};
|
|
21
|
+
var __export = (target, all) => {
|
|
22
|
+
for (var name in all)
|
|
23
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
24
|
+
};
|
|
25
|
+
var __copyProps = (to, from, except, desc) => {
|
|
26
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
27
|
+
for (let key of __getOwnPropNames(from))
|
|
28
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
29
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
30
|
+
}
|
|
31
|
+
return to;
|
|
32
|
+
};
|
|
33
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
34
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
35
|
+
mod
|
|
36
|
+
));
|
|
37
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
38
|
+
var cli_exports = {};
|
|
39
|
+
__export(cli_exports, {
|
|
40
|
+
default: () => cli_default
|
|
5
41
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
const {
|
|
15
|
-
server
|
|
16
|
-
} = userConfig;
|
|
17
|
-
if (server !== null && server !== void 0 && server.ssr && !isStreaming(server.ssr)) {
|
|
42
|
+
module.exports = __toCommonJS(cli_exports);
|
|
43
|
+
var import_path = __toESM(require("path"));
|
|
44
|
+
var import_utils = require("@modern-js/utils");
|
|
45
|
+
const PLUGIN_IDENTIFIER = "ssr";
|
|
46
|
+
const hasStringSSREntry = (userConfig) => {
|
|
47
|
+
const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
|
|
48
|
+
const { server } = userConfig;
|
|
49
|
+
if ((server == null ? void 0 : server.ssr) && !isStreaming(server.ssr)) {
|
|
18
50
|
return true;
|
|
19
51
|
}
|
|
20
|
-
if (server
|
|
52
|
+
if ((server == null ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
|
|
21
53
|
for (const name of Object.keys(server.ssrByEntries)) {
|
|
22
54
|
if (!isStreaming(server.ssrByEntries[name])) {
|
|
23
55
|
return true;
|
|
@@ -26,92 +58,99 @@ const hasStringSSREntry = userConfig => {
|
|
|
26
58
|
}
|
|
27
59
|
return false;
|
|
28
60
|
};
|
|
29
|
-
var
|
|
30
|
-
name:
|
|
31
|
-
required: [
|
|
32
|
-
setup: api => {
|
|
33
|
-
const ssrConfigMap = new Map();
|
|
61
|
+
var cli_default = () => ({
|
|
62
|
+
name: "@modern-js/plugin-ssr",
|
|
63
|
+
required: ["@modern-js/runtime"],
|
|
64
|
+
setup: (api) => {
|
|
65
|
+
const ssrConfigMap = /* @__PURE__ */ new Map();
|
|
34
66
|
let pluginsExportsUtils;
|
|
35
67
|
return {
|
|
36
68
|
config() {
|
|
37
69
|
const appContext = api.useAppContext();
|
|
38
|
-
pluginsExportsUtils = (0,
|
|
70
|
+
pluginsExportsUtils = (0, import_utils.createRuntimeExportsUtils)(
|
|
71
|
+
appContext.internalDirectory,
|
|
72
|
+
"plugins"
|
|
73
|
+
);
|
|
39
74
|
return {
|
|
40
75
|
source: {
|
|
41
76
|
alias: {
|
|
42
|
-
|
|
77
|
+
"@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
|
|
43
78
|
}
|
|
44
79
|
},
|
|
45
80
|
tools: {
|
|
46
|
-
webpackChain: (chain, {
|
|
47
|
-
name,
|
|
48
|
-
isServer,
|
|
49
|
-
CHAIN_ID
|
|
50
|
-
}) => {
|
|
81
|
+
webpackChain: (chain, { name, isServer, CHAIN_ID }) => {
|
|
51
82
|
const userConfig = api.useResolvedConfigContext();
|
|
52
|
-
if ((0,
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
}]);
|
|
83
|
+
if ((0, import_utils.isUseSSRBundle)(userConfig) && name !== "server" && hasStringSSREntry(userConfig)) {
|
|
84
|
+
const LoadableWebpackPlugin = require("@loadable/webpack-plugin");
|
|
85
|
+
chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [
|
|
86
|
+
{ filename: import_utils.LOADABLE_STATS_FILE }
|
|
87
|
+
]);
|
|
58
88
|
}
|
|
59
|
-
|
|
60
|
-
// add environment variables to determine the node/browser
|
|
61
89
|
const prefix = `${appContext.metaName.split(/[-_]/)[0]}_`.toUpperCase();
|
|
62
90
|
const modernVars = {
|
|
63
|
-
[`process.env.${prefix}TARGET`]: JSON.stringify(
|
|
91
|
+
[`process.env.${prefix}TARGET`]: JSON.stringify(
|
|
92
|
+
isServer ? "node" : "browser"
|
|
93
|
+
)
|
|
64
94
|
};
|
|
65
|
-
chain.plugin(CHAIN_ID.PLUGIN.DEFINE).tap(args => {
|
|
95
|
+
chain.plugin(CHAIN_ID.PLUGIN.DEFINE).tap((args) => {
|
|
66
96
|
const [vars, ...rest] = args;
|
|
67
|
-
return [
|
|
97
|
+
return [
|
|
98
|
+
__spreadValues(__spreadValues({}, vars), modernVars),
|
|
99
|
+
...rest
|
|
100
|
+
];
|
|
68
101
|
});
|
|
69
102
|
},
|
|
70
|
-
babel: config => {
|
|
103
|
+
babel: (config) => {
|
|
104
|
+
config.plugins.push(
|
|
105
|
+
import_path.default.join(__dirname, "./babel-plugin-ssr-loader-id")
|
|
106
|
+
);
|
|
71
107
|
const userConfig = api.useResolvedConfigContext();
|
|
72
|
-
if ((0,
|
|
73
|
-
config.plugins.push(require.resolve(
|
|
108
|
+
if ((0, import_utils.isUseSSRBundle)(userConfig) && hasStringSSREntry(userConfig)) {
|
|
109
|
+
config.plugins.push(require.resolve("@loadable/babel-plugin"));
|
|
74
110
|
}
|
|
75
111
|
}
|
|
76
112
|
}
|
|
77
113
|
};
|
|
78
114
|
},
|
|
79
|
-
modifyEntryImports({
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
}) {
|
|
83
|
-
const {
|
|
84
|
-
entryName,
|
|
85
|
-
fileSystemRoutes
|
|
86
|
-
} = entrypoint;
|
|
115
|
+
modifyEntryImports({ entrypoint, imports }) {
|
|
116
|
+
var _a;
|
|
117
|
+
const { entryName, fileSystemRoutes } = entrypoint;
|
|
87
118
|
const userConfig = api.useResolvedConfigContext();
|
|
88
|
-
const {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
119
|
+
const { packageName, entrypoints } = api.useAppContext();
|
|
120
|
+
pluginsExportsUtils.addExport(
|
|
121
|
+
`export { default as ssr } from '@modern-js/runtime/ssr'`
|
|
122
|
+
);
|
|
123
|
+
const ssrConfig = (0, import_utils.getEntryOptions)(
|
|
124
|
+
entryName,
|
|
125
|
+
userConfig.server.ssr,
|
|
126
|
+
userConfig.server.ssrByEntries,
|
|
127
|
+
packageName
|
|
128
|
+
);
|
|
129
|
+
if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
|
|
130
|
+
const runtimeConfig = (0, import_utils.getEntryOptions)(
|
|
131
|
+
entryName,
|
|
132
|
+
userConfig.runtime,
|
|
133
|
+
userConfig.runtimeByEntries,
|
|
134
|
+
packageName
|
|
135
|
+
);
|
|
136
|
+
if (((_a = runtimeConfig == null ? void 0 : runtimeConfig.router) == null ? void 0 : _a.mode) === "react-router-5") {
|
|
137
|
+
throw new Error(
|
|
138
|
+
`router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'`
|
|
139
|
+
);
|
|
101
140
|
}
|
|
102
141
|
if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
|
|
103
|
-
throw new Error(
|
|
142
|
+
throw new Error(
|
|
143
|
+
`You should switch to file-system based router to support streaming SSR.`
|
|
144
|
+
);
|
|
104
145
|
}
|
|
105
146
|
}
|
|
106
147
|
const ssgConfig = userConfig.output.ssg;
|
|
107
|
-
const useSSG = (0,
|
|
148
|
+
const useSSG = (0, import_utils.isSingleEntry)(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof (ssgConfig == null ? void 0 : ssgConfig[0]) === "function" || Boolean(ssgConfig == null ? void 0 : ssgConfig[entryName]);
|
|
108
149
|
ssrConfigMap.set(entryName, ssrConfig || useSSG);
|
|
109
150
|
if (ssrConfig || useSSG) {
|
|
110
151
|
imports.push({
|
|
111
|
-
value:
|
|
112
|
-
specifiers: [{
|
|
113
|
-
imported: PLUGIN_IDENTIFIER
|
|
114
|
-
}]
|
|
152
|
+
value: "@modern-js/runtime/plugins",
|
|
153
|
+
specifiers: [{ imported: PLUGIN_IDENTIFIER }]
|
|
115
154
|
});
|
|
116
155
|
}
|
|
117
156
|
return {
|
|
@@ -119,10 +158,7 @@ var _default = () => ({
|
|
|
119
158
|
imports
|
|
120
159
|
};
|
|
121
160
|
},
|
|
122
|
-
modifyEntryRuntimePlugins({
|
|
123
|
-
entrypoint,
|
|
124
|
-
plugins
|
|
125
|
-
}) {
|
|
161
|
+
modifyEntryRuntimePlugins({ entrypoint, plugins }) {
|
|
126
162
|
if (ssrConfigMap.get(entrypoint.entryName)) {
|
|
127
163
|
plugins.push({
|
|
128
164
|
name: PLUGIN_IDENTIFIER,
|
|
@@ -134,24 +170,22 @@ var _default = () => ({
|
|
|
134
170
|
plugins
|
|
135
171
|
};
|
|
136
172
|
},
|
|
137
|
-
modifyEntryExport({
|
|
138
|
-
entrypoint,
|
|
139
|
-
exportStatement
|
|
140
|
-
}) {
|
|
173
|
+
modifyEntryExport({ entrypoint, exportStatement }) {
|
|
141
174
|
if (ssrConfigMap.get(entrypoint.entryName)) {
|
|
142
175
|
return {
|
|
143
176
|
entrypoint,
|
|
144
|
-
exportStatement: [
|
|
177
|
+
exportStatement: [
|
|
178
|
+
`export function ${import_utils.SERVER_RENDER_FUNCTION_NAME}(context) {
|
|
145
179
|
return bootstrap(AppWrapper, context)
|
|
146
|
-
}`,
|
|
180
|
+
}`,
|
|
181
|
+
exportStatement
|
|
182
|
+
].join("\n")
|
|
147
183
|
};
|
|
148
184
|
}
|
|
149
|
-
return {
|
|
150
|
-
entrypoint,
|
|
151
|
-
exportStatement
|
|
152
|
-
};
|
|
185
|
+
return { entrypoint, exportStatement };
|
|
153
186
|
}
|
|
154
187
|
};
|
|
155
188
|
}
|
|
156
189
|
});
|
|
157
|
-
|
|
190
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
191
|
+
0 && (module.exports = {});
|
|
@@ -1,155 +1,174 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
var
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
var
|
|
11
|
-
var
|
|
12
|
-
var
|
|
13
|
-
var
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
if (key in exports && exports[key] === _react[key]) return;
|
|
21
|
-
Object.defineProperty(exports, key, {
|
|
22
|
-
enumerable: true,
|
|
23
|
-
get: function () {
|
|
24
|
-
return _react[key];
|
|
1
|
+
var __create = Object.create;
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __defProps = Object.defineProperties;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
6
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
7
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
8
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
9
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
10
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
11
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
12
|
+
var __spreadValues = (a, b) => {
|
|
13
|
+
for (var prop in b || (b = {}))
|
|
14
|
+
if (__hasOwnProp.call(b, prop))
|
|
15
|
+
__defNormalProp(a, prop, b[prop]);
|
|
16
|
+
if (__getOwnPropSymbols)
|
|
17
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
18
|
+
if (__propIsEnum.call(b, prop))
|
|
19
|
+
__defNormalProp(a, prop, b[prop]);
|
|
25
20
|
}
|
|
21
|
+
return a;
|
|
22
|
+
};
|
|
23
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
24
|
+
var __export = (target, all) => {
|
|
25
|
+
for (var name in all)
|
|
26
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
27
|
+
};
|
|
28
|
+
var __copyProps = (to, from, except, desc) => {
|
|
29
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
30
|
+
for (let key of __getOwnPropNames(from))
|
|
31
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
32
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
33
|
+
}
|
|
34
|
+
return to;
|
|
35
|
+
};
|
|
36
|
+
var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
|
|
37
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
38
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
39
|
+
mod
|
|
40
|
+
));
|
|
41
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
42
|
+
var __async = (__this, __arguments, generator) => {
|
|
43
|
+
return new Promise((resolve, reject) => {
|
|
44
|
+
var fulfilled = (value) => {
|
|
45
|
+
try {
|
|
46
|
+
step(generator.next(value));
|
|
47
|
+
} catch (e) {
|
|
48
|
+
reject(e);
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
var rejected = (value) => {
|
|
52
|
+
try {
|
|
53
|
+
step(generator.throw(value));
|
|
54
|
+
} catch (e) {
|
|
55
|
+
reject(e);
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
59
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
26
60
|
});
|
|
61
|
+
};
|
|
62
|
+
var ssr_exports = {};
|
|
63
|
+
__export(ssr_exports, {
|
|
64
|
+
default: () => ssr_default,
|
|
65
|
+
ssr: () => ssr
|
|
27
66
|
});
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
67
|
+
module.exports = __toCommonJS(ssr_exports);
|
|
68
|
+
var import_jsx_runtime = require("react/jsx-runtime");
|
|
69
|
+
var import_component = require("@loadable/component");
|
|
70
|
+
var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
|
|
71
|
+
var import_types = require("./serverRender/types");
|
|
72
|
+
var import_withCallback = require("./react/withCallback");
|
|
73
|
+
var import_utils = require("./utils");
|
|
74
|
+
__reExport(ssr_exports, require("./react"), module.exports);
|
|
75
|
+
const ssr = (config) => ({
|
|
76
|
+
name: "@modern-js/plugin-ssr",
|
|
34
77
|
setup: () => {
|
|
35
|
-
const mockResp = (0,
|
|
78
|
+
const mockResp = (0, import_utils.mockResponse)();
|
|
36
79
|
return {
|
|
37
|
-
client:
|
|
38
|
-
|
|
39
|
-
context,
|
|
40
|
-
ModernRender,
|
|
41
|
-
ModernHydrate
|
|
42
|
-
}) => {
|
|
43
|
-
var _window, _window$_SSR_DATA;
|
|
44
|
-
const hydrateContext = _objectSpread(_objectSpread({}, context), {}, {
|
|
80
|
+
client: (_0) => __async(void 0, [_0], function* ({ App, context, ModernRender, ModernHydrate }) {
|
|
81
|
+
var _a;
|
|
82
|
+
const hydrateContext = __spreadProps(__spreadValues({}, context), {
|
|
45
83
|
_hydration: true
|
|
46
84
|
});
|
|
47
85
|
const callback = () => {
|
|
48
|
-
// won't cause component re-render because context's reference identity doesn't change
|
|
49
86
|
delete hydrateContext._hydration;
|
|
50
87
|
};
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
const renderLevel = ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : _window$_SSR_DATA.renderLevel) || _types.RenderLevel.CLIENT_RENDER;
|
|
54
|
-
|
|
55
|
-
// react streamSSR hydrate
|
|
56
|
-
if ((0, _utils.isReact18)() && config.mode === 'stream') {
|
|
88
|
+
const renderLevel = ((_a = window == null ? void 0 : window._SSR_DATA) == null ? void 0 : _a.renderLevel) || import_types.RenderLevel.CLIENT_RENDER;
|
|
89
|
+
if ((0, import_utils.isReact18)() && config.mode === "stream") {
|
|
57
90
|
return streamSSRHydrate();
|
|
58
91
|
}
|
|
59
|
-
// react stringSSR hydrate
|
|
60
92
|
return stringSSRHydrate();
|
|
61
93
|
function stringSSRHydrate() {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
context: context
|
|
94
|
+
if (renderLevel === import_types.RenderLevel.CLIENT_RENDER || renderLevel === import_types.RenderLevel.SERVER_PREFETCH) {
|
|
95
|
+
ModernRender(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
|
|
96
|
+
context
|
|
66
97
|
}));
|
|
67
|
-
} else if (renderLevel ===
|
|
68
|
-
if ((0,
|
|
69
|
-
(0,
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
|
|
98
|
+
} else if (renderLevel === import_types.RenderLevel.SERVER_RENDER) {
|
|
99
|
+
if ((0, import_utils.isReact18)()) {
|
|
100
|
+
(0, import_component.loadableReady)(() => {
|
|
101
|
+
let SSRApp = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_withCallback.WithCallback, {
|
|
102
|
+
callback,
|
|
103
|
+
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
|
|
74
104
|
context: hydrateContext
|
|
75
105
|
})
|
|
76
106
|
});
|
|
77
|
-
SSRApp = (0,
|
|
78
|
-
ModernHydrate(
|
|
107
|
+
SSRApp = (0, import_hoist_non_react_statics.default)(SSRApp, App);
|
|
108
|
+
ModernHydrate(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(SSRApp, {}));
|
|
79
109
|
});
|
|
80
110
|
} else {
|
|
81
|
-
(0,
|
|
82
|
-
ModernHydrate(
|
|
111
|
+
(0, import_component.loadableReady)(() => {
|
|
112
|
+
ModernHydrate(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
|
|
83
113
|
context: hydrateContext
|
|
84
114
|
}), callback);
|
|
85
115
|
});
|
|
86
116
|
}
|
|
87
117
|
} else {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
118
|
+
console.warn(
|
|
119
|
+
`unknow render level: ${renderLevel}, execute render()`
|
|
120
|
+
);
|
|
121
|
+
ModernRender(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
|
|
122
|
+
context
|
|
92
123
|
}));
|
|
93
124
|
}
|
|
94
125
|
}
|
|
95
126
|
function streamSSRHydrate() {
|
|
96
|
-
if (renderLevel ===
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
|
|
127
|
+
if (renderLevel === import_types.RenderLevel.SERVER_RENDER) {
|
|
128
|
+
let SSRApp = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_withCallback.WithCallback, {
|
|
129
|
+
callback,
|
|
130
|
+
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
|
|
101
131
|
context: hydrateContext
|
|
102
132
|
})
|
|
103
133
|
});
|
|
104
|
-
SSRApp = (0,
|
|
105
|
-
ModernHydrate(
|
|
134
|
+
SSRApp = (0, import_hoist_non_react_statics.default)(SSRApp, App);
|
|
135
|
+
ModernHydrate(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(SSRApp, {}));
|
|
106
136
|
} else {
|
|
107
|
-
ModernRender(
|
|
108
|
-
context
|
|
137
|
+
ModernRender(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
|
|
138
|
+
context
|
|
109
139
|
}));
|
|
110
140
|
}
|
|
111
141
|
}
|
|
112
|
-
},
|
|
113
|
-
init({
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
var _window2, _window2$_SSR_DATA, _window2$_SSR_DATA$co;
|
|
117
|
-
const request = (_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$_SSR_DATA = _window2._SSR_DATA) === null || _window2$_SSR_DATA === void 0 ? void 0 : (_window2$_SSR_DATA$co = _window2$_SSR_DATA.context) === null || _window2$_SSR_DATA$co === void 0 ? void 0 : _window2$_SSR_DATA$co.request;
|
|
142
|
+
}),
|
|
143
|
+
init({ context }, next) {
|
|
144
|
+
var _a, _b;
|
|
145
|
+
const request = (_b = (_a = window == null ? void 0 : window._SSR_DATA) == null ? void 0 : _a.context) == null ? void 0 : _b.request;
|
|
118
146
|
if (!request) {
|
|
119
|
-
context.ssrContext =
|
|
147
|
+
context.ssrContext = __spreadProps(__spreadValues({}, context.ssrContext), {
|
|
120
148
|
response: mockResp,
|
|
121
|
-
request: (0,
|
|
122
|
-
});
|
|
123
|
-
return next({
|
|
124
|
-
context
|
|
149
|
+
request: (0, import_utils.formatClient)({})
|
|
125
150
|
});
|
|
151
|
+
return next({ context });
|
|
126
152
|
}
|
|
127
153
|
context.ssrContext.response = mockResp;
|
|
128
|
-
context.ssrContext.request = (0,
|
|
129
|
-
return next({
|
|
130
|
-
context
|
|
131
|
-
});
|
|
154
|
+
context.ssrContext.request = (0, import_utils.formatClient)(request);
|
|
155
|
+
return next({ context });
|
|
132
156
|
},
|
|
133
|
-
pickContext: ({
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
var _window3, _window3$_SSR_DATA, _window3$_SSR_DATA$co;
|
|
138
|
-
const request = (_window3 = window) === null || _window3 === void 0 ? void 0 : (_window3$_SSR_DATA = _window3._SSR_DATA) === null || _window3$_SSR_DATA === void 0 ? void 0 : (_window3$_SSR_DATA$co = _window3$_SSR_DATA.context) === null || _window3$_SSR_DATA$co === void 0 ? void 0 : _window3$_SSR_DATA$co.request;
|
|
139
|
-
const {
|
|
140
|
-
initialData
|
|
141
|
-
} = context;
|
|
157
|
+
pickContext: ({ context, pickedContext }, next) => {
|
|
158
|
+
var _a, _b;
|
|
159
|
+
const request = (_b = (_a = window == null ? void 0 : window._SSR_DATA) == null ? void 0 : _a.context) == null ? void 0 : _b.request;
|
|
160
|
+
const { initialData } = context;
|
|
142
161
|
if (!request) {
|
|
143
162
|
return next({
|
|
144
163
|
context,
|
|
145
|
-
pickedContext:
|
|
164
|
+
pickedContext: __spreadProps(__spreadValues({}, pickedContext), {
|
|
146
165
|
initialData
|
|
147
166
|
})
|
|
148
167
|
});
|
|
149
168
|
}
|
|
150
169
|
return next({
|
|
151
170
|
context,
|
|
152
|
-
pickedContext:
|
|
171
|
+
pickedContext: __spreadProps(__spreadValues({}, pickedContext), {
|
|
153
172
|
initialData,
|
|
154
173
|
request,
|
|
155
174
|
response: mockResp
|
|
@@ -159,6 +178,8 @@ const ssr = config => ({
|
|
|
159
178
|
};
|
|
160
179
|
}
|
|
161
180
|
});
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
exports
|
|
181
|
+
var ssr_default = ssr;
|
|
182
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
183
|
+
0 && (module.exports = {
|
|
184
|
+
ssr
|
|
185
|
+
});
|