@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,84 +1,61 @@
|
|
|
1
|
-
|
|
2
|
-
import React from 'react';
|
|
1
|
+
import { jsx, jsxs } from "react/jsx-runtime";
|
|
3
2
|
import { Body } from "./Body";
|
|
4
3
|
import { DocumentStructrueContext } from "./DocumentStructrueContext";
|
|
5
4
|
import { Head } from "./Head";
|
|
6
|
-
|
|
7
|
-
/**
|
|
8
|
-
* get the directly son element
|
|
9
|
-
*/
|
|
10
|
-
import { jsxs as _jsxs } from "react/jsx-runtime";
|
|
11
|
-
import { jsx as _jsx } from "react/jsx-runtime";
|
|
12
5
|
function findTargetChild(tag, children) {
|
|
13
|
-
return children.find(item => getEleType(item) === tag);
|
|
6
|
+
return children.find((item) => getEleType(item) === tag);
|
|
14
7
|
}
|
|
15
|
-
|
|
16
|
-
/**
|
|
17
|
-
* get the type of react element
|
|
18
|
-
*/
|
|
19
8
|
function getEleType(ele) {
|
|
20
|
-
|
|
21
|
-
return typeof (ele === null || ele === void 0 ? void 0 : ele.type) === 'function' ? ele.type.name : ele === null || ele === void 0 ? void 0 : ele.type;
|
|
9
|
+
return typeof (ele == null ? void 0 : ele.type) === "function" ? ele.type.name : ele == null ? void 0 : ele.type;
|
|
22
10
|
}
|
|
23
|
-
|
|
24
|
-
/**
|
|
25
|
-
* get the children(grandChild included) with target type
|
|
26
|
-
* @param tag the element type
|
|
27
|
-
* @param children son element
|
|
28
|
-
* @returns target element
|
|
29
|
-
*/
|
|
30
11
|
function findTargetElement(tag, children) {
|
|
12
|
+
var _a;
|
|
31
13
|
if (children.length === 0) {
|
|
32
14
|
return null;
|
|
33
15
|
}
|
|
34
16
|
let nextChildren = [];
|
|
35
17
|
for (const item of children) {
|
|
36
|
-
var _item$props;
|
|
37
18
|
if (tag === getEleType(item)) {
|
|
38
19
|
return item;
|
|
39
20
|
}
|
|
40
|
-
if (item
|
|
21
|
+
if ((_a = item == null ? void 0 : item.props) == null ? void 0 : _a.children) {
|
|
41
22
|
nextChildren = nextChildren.concat(item.props.children);
|
|
42
23
|
}
|
|
43
24
|
}
|
|
44
25
|
return findTargetElement(tag, nextChildren);
|
|
45
26
|
}
|
|
46
|
-
|
|
47
|
-
const {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
const notMissMustChild = [hasSetHead, hasSetBody
|
|
57
|
-
// hasSetScripts,
|
|
58
|
-
// hasSetRoot,
|
|
59
|
-
].every(item => item);
|
|
60
|
-
|
|
61
|
-
// todo: or throw an error
|
|
27
|
+
function Html(props) {
|
|
28
|
+
const { children } = props;
|
|
29
|
+
const hasSetHead = Boolean(findTargetChild("Head", children));
|
|
30
|
+
const hasSetScripts = Boolean(findTargetElement("Scripts", children));
|
|
31
|
+
const hasSetBody = Boolean(findTargetChild("Body", children));
|
|
32
|
+
const hasSetRoot = Boolean(findTargetElement("Root", children));
|
|
33
|
+
const notMissMustChild = [
|
|
34
|
+
hasSetHead,
|
|
35
|
+
hasSetBody
|
|
36
|
+
].every((item) => item);
|
|
62
37
|
if (!notMissMustChild) {
|
|
63
|
-
return
|
|
64
|
-
children:
|
|
65
|
-
style: {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
38
|
+
return /* @__PURE__ */ jsx("html", {
|
|
39
|
+
children: /* @__PURE__ */ jsxs("body", {
|
|
40
|
+
style: { color: "red" },
|
|
41
|
+
children: [
|
|
42
|
+
`Miss the `,
|
|
43
|
+
[
|
|
44
|
+
hasSetHead,
|
|
45
|
+
hasSetBody
|
|
46
|
+
].map((item, index) => {
|
|
47
|
+
return item ? null : [
|
|
48
|
+
"Head",
|
|
49
|
+
"Body"
|
|
50
|
+
][index];
|
|
51
|
+
}),
|
|
52
|
+
` Element`
|
|
53
|
+
]
|
|
77
54
|
})
|
|
78
55
|
});
|
|
79
56
|
}
|
|
80
|
-
return
|
|
81
|
-
children:
|
|
57
|
+
return /* @__PURE__ */ jsx("html", {
|
|
58
|
+
children: /* @__PURE__ */ jsxs(DocumentStructrueContext.Provider, {
|
|
82
59
|
value: {
|
|
83
60
|
hasSetHead,
|
|
84
61
|
hasSetScripts,
|
|
@@ -86,7 +63,14 @@ export function Html(props) {
|
|
|
86
63
|
hasSetBody,
|
|
87
64
|
docChild: children
|
|
88
65
|
},
|
|
89
|
-
children: [
|
|
66
|
+
children: [
|
|
67
|
+
!hasSetHead && /* @__PURE__ */ jsx(Head, {}),
|
|
68
|
+
!hasSetBody && /* @__PURE__ */ jsx(Body, {}),
|
|
69
|
+
children
|
|
70
|
+
]
|
|
90
71
|
})
|
|
91
72
|
});
|
|
92
|
-
}
|
|
73
|
+
}
|
|
74
|
+
export {
|
|
75
|
+
Html
|
|
76
|
+
};
|
|
@@ -1,31 +1,33 @@
|
|
|
1
|
-
|
|
2
|
-
import
|
|
1
|
+
import { jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { useContext } from "react";
|
|
3
3
|
import { DocumentContext } from "./DocumentContext";
|
|
4
4
|
import { DOCUMENT_SSR_PLACEHOLDER } from "./constants";
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
function Root(props) {
|
|
6
|
+
const { rootId, children } = props;
|
|
7
7
|
const {
|
|
8
|
-
|
|
9
|
-
children
|
|
10
|
-
} = props;
|
|
11
|
-
const {
|
|
12
|
-
templateParams: {
|
|
13
|
-
mountId = 'root'
|
|
14
|
-
}
|
|
8
|
+
templateParams: { mountId = "root" }
|
|
15
9
|
} = useContext(DocumentContext);
|
|
16
|
-
return
|
|
10
|
+
return /* @__PURE__ */ jsxs("div", {
|
|
17
11
|
id: `${rootId || mountId}`,
|
|
18
|
-
children: [
|
|
12
|
+
children: [
|
|
13
|
+
`${DOCUMENT_SSR_PLACEHOLDER}`,
|
|
14
|
+
children
|
|
15
|
+
]
|
|
19
16
|
});
|
|
20
17
|
}
|
|
21
|
-
|
|
18
|
+
function DefaultRoot(props) {
|
|
22
19
|
const {
|
|
23
|
-
templateParams: {
|
|
24
|
-
mountId
|
|
25
|
-
}
|
|
20
|
+
templateParams: { mountId = "root" }
|
|
26
21
|
} = useContext(DocumentContext);
|
|
27
|
-
return
|
|
22
|
+
return /* @__PURE__ */ jsxs("div", {
|
|
28
23
|
id: `${mountId}`,
|
|
29
|
-
children: [
|
|
24
|
+
children: [
|
|
25
|
+
`${DOCUMENT_SSR_PLACEHOLDER}`,
|
|
26
|
+
props.children
|
|
27
|
+
]
|
|
30
28
|
});
|
|
31
|
-
}
|
|
29
|
+
}
|
|
30
|
+
export {
|
|
31
|
+
DefaultRoot,
|
|
32
|
+
Root
|
|
33
|
+
};
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { Fragment, jsxs } from "react/jsx-runtime";
|
|
2
|
+
import {
|
|
3
|
+
DOCUMENT_SCRIPT_PLACEHOLDER_START,
|
|
4
|
+
DOCUMENT_SCRIPT_PLACEHOLDER_END
|
|
5
|
+
} from "./constants";
|
|
6
|
+
function Script(props) {
|
|
7
|
+
const { content } = props;
|
|
8
|
+
const contentStr = content.toString();
|
|
9
|
+
const contentIIFE = encodeURIComponent(`(${contentStr})()`);
|
|
10
|
+
return /* @__PURE__ */ jsxs(Fragment, {
|
|
11
|
+
children: [
|
|
12
|
+
`${DOCUMENT_SCRIPT_PLACEHOLDER_START}`,
|
|
13
|
+
`${contentIIFE}`,
|
|
14
|
+
`${DOCUMENT_SCRIPT_PLACEHOLDER_END}`
|
|
15
|
+
]
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
export {
|
|
19
|
+
Script
|
|
20
|
+
};
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
import React from 'react';
|
|
1
|
+
import { Fragment, jsx } from "react/jsx-runtime";
|
|
3
2
|
import { DOCUMENT_SCRIPTS_PLACEHOLDER } from "./constants";
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
export function Scripts() {
|
|
7
|
-
return /*#__PURE__*/_jsx(_Fragment, {
|
|
3
|
+
function Scripts() {
|
|
4
|
+
return /* @__PURE__ */ jsx(Fragment, {
|
|
8
5
|
children: `${DOCUMENT_SCRIPTS_PLACEHOLDER}`
|
|
9
6
|
});
|
|
10
|
-
}
|
|
7
|
+
}
|
|
8
|
+
export {
|
|
9
|
+
Scripts
|
|
10
|
+
};
|
|
@@ -1,37 +1,79 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
3
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
4
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
5
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
6
|
+
var __spreadValues = (a, b) => {
|
|
7
|
+
for (var prop in b || (b = {}))
|
|
8
|
+
if (__hasOwnProp.call(b, prop))
|
|
9
|
+
__defNormalProp(a, prop, b[prop]);
|
|
10
|
+
if (__getOwnPropSymbols)
|
|
11
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
12
|
+
if (__propIsEnum.call(b, prop))
|
|
13
|
+
__defNormalProp(a, prop, b[prop]);
|
|
14
|
+
}
|
|
15
|
+
return a;
|
|
16
|
+
};
|
|
17
|
+
var __async = (__this, __arguments, generator) => {
|
|
18
|
+
return new Promise((resolve, reject) => {
|
|
19
|
+
var fulfilled = (value) => {
|
|
20
|
+
try {
|
|
21
|
+
step(generator.next(value));
|
|
22
|
+
} catch (e) {
|
|
23
|
+
reject(e);
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
var rejected = (value) => {
|
|
27
|
+
try {
|
|
28
|
+
step(generator.throw(value));
|
|
29
|
+
} catch (e) {
|
|
30
|
+
reject(e);
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
34
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
35
|
+
});
|
|
36
|
+
};
|
|
37
|
+
import path from "path";
|
|
38
|
+
import React from "react";
|
|
39
|
+
import ReactDomServer from "react-dom/server";
|
|
40
|
+
import { build } from "esbuild";
|
|
41
|
+
import { createDebugger, findExists, fs } from "@modern-js/utils";
|
|
9
42
|
import { DocumentContext } from "../DocumentContext";
|
|
10
|
-
import {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
43
|
+
import {
|
|
44
|
+
DOCUMENT_SCRIPTS_PLACEHOLDER,
|
|
45
|
+
DOCUMENT_FILE_NAME,
|
|
46
|
+
DOCUMENT_META_PLACEHOLDER,
|
|
47
|
+
PLACEHOLDER_REPLACER_MAP,
|
|
48
|
+
DOC_EXT,
|
|
49
|
+
DOCUMENT_SSR_PLACEHOLDER,
|
|
50
|
+
DOCUMENT_CHUNKSMAP_PLACEHOLDER,
|
|
51
|
+
DOCUMENT_SSRDATASCRIPT_PLACEHOLDER,
|
|
52
|
+
DOCUMENT_SCRIPT_PLACEHOLDER_START,
|
|
53
|
+
DOCUMENT_SCRIPT_PLACEHOLDER_END,
|
|
54
|
+
HTML_SEPARATOR
|
|
55
|
+
} from "../constants";
|
|
56
|
+
const debug = createDebugger("html_genarate");
|
|
57
|
+
const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
|
|
58
|
+
var _a;
|
|
59
|
+
const entryDir = (_a = entrypoints.find(
|
|
60
|
+
(item) => item.entryName === entryName
|
|
61
|
+
)) == null ? void 0 : _a.absoluteEntryDir;
|
|
62
|
+
const entryDirs = DOC_EXT.map(
|
|
63
|
+
(item) => `${entryDir}${path.sep}${DOCUMENT_FILE_NAME}.${item}`
|
|
64
|
+
);
|
|
65
|
+
const fallbackDirs = fallbackDir ? DOC_EXT.map(
|
|
66
|
+
(item) => [fallbackDir, "src", `${DOCUMENT_FILE_NAME}.${item}`].join(path.sep)
|
|
67
|
+
) : [];
|
|
20
68
|
const docFile = findExists([...entryDirs, ...fallbackDirs]);
|
|
21
|
-
return docFile ||
|
|
69
|
+
return docFile || void 0;
|
|
22
70
|
};
|
|
23
|
-
|
|
24
|
-
name:
|
|
25
|
-
pre: [
|
|
26
|
-
setup:
|
|
27
|
-
// get params for document.tsx
|
|
71
|
+
var cli_default = () => ({
|
|
72
|
+
name: "@modern-js/plugin-document",
|
|
73
|
+
pre: ["@modern-js/plugin-analyze"],
|
|
74
|
+
setup: (api) => __async(void 0, null, function* () {
|
|
28
75
|
function getDocParams(params) {
|
|
29
|
-
const {
|
|
30
|
-
config,
|
|
31
|
-
templateParameters,
|
|
32
|
-
entryName
|
|
33
|
-
} = params;
|
|
34
|
-
// for enough params, devide as:process, config, templateParams
|
|
76
|
+
const { config, templateParameters, entryName } = params;
|
|
35
77
|
return {
|
|
36
78
|
processEnv: process.env,
|
|
37
79
|
config: {
|
|
@@ -42,91 +84,139 @@ export default (() => ({
|
|
|
42
84
|
};
|
|
43
85
|
}
|
|
44
86
|
const documentEntry = (entryName, templateParameters) => {
|
|
45
|
-
const {
|
|
87
|
+
const { entrypoints, internalDirectory, appDirectory } = api.useAppContext();
|
|
88
|
+
const documentFilePath = getDocumenByEntryName(
|
|
46
89
|
entrypoints,
|
|
47
|
-
|
|
90
|
+
entryName,
|
|
48
91
|
appDirectory
|
|
49
|
-
|
|
50
|
-
// search the document.[tsx|jsx|js|ts] under entry
|
|
51
|
-
const documentFilePath = getDocumenByEntryName(entrypoints, entryName, appDirectory);
|
|
52
|
-
// if no document file, do nothing as default
|
|
92
|
+
);
|
|
53
93
|
if (!documentFilePath) {
|
|
54
94
|
return null;
|
|
55
95
|
}
|
|
56
|
-
return
|
|
57
|
-
htmlWebpackPlugin
|
|
58
|
-
}) => {
|
|
96
|
+
return (_0) => __async(void 0, [_0], function* ({ htmlWebpackPlugin }) {
|
|
59
97
|
const documentParams = getDocParams({
|
|
60
98
|
config: api.useConfigContext(),
|
|
61
99
|
entryName,
|
|
62
100
|
templateParameters
|
|
63
101
|
});
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
|
|
102
|
+
const tempTsConfigFile = path.join(
|
|
103
|
+
internalDirectory,
|
|
104
|
+
`./document/_tempTsconfig.json`
|
|
105
|
+
);
|
|
106
|
+
const userTsConfigFilePath = path.join(appDirectory, "tsconfig.json");
|
|
107
|
+
let tsConfig;
|
|
108
|
+
try {
|
|
109
|
+
tsConfig = yield require(userTsConfigFilePath);
|
|
110
|
+
} catch (err) {
|
|
111
|
+
tsConfig = {};
|
|
112
|
+
}
|
|
113
|
+
if (tsConfig == null ? void 0 : tsConfig.compilerOptions) {
|
|
114
|
+
tsConfig.compilerOptions.jsx = "react-jsx";
|
|
115
|
+
} else {
|
|
116
|
+
tsConfig.compilerOptions = {
|
|
117
|
+
jsx: "react-jsx"
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
fs.outputFileSync(tempTsConfigFile, JSON.stringify(tsConfig));
|
|
121
|
+
const htmlOutputFile = path.join(
|
|
122
|
+
internalDirectory,
|
|
123
|
+
`./document/_${entryName}.html.js`
|
|
124
|
+
);
|
|
125
|
+
yield build({
|
|
67
126
|
entryPoints: [documentFilePath],
|
|
68
|
-
// write: false,
|
|
69
127
|
outfile: htmlOutputFile,
|
|
70
|
-
platform:
|
|
71
|
-
|
|
128
|
+
platform: "node",
|
|
129
|
+
tsconfig: tempTsConfigFile,
|
|
130
|
+
target: "es6",
|
|
72
131
|
loader: {
|
|
73
|
-
|
|
74
|
-
|
|
132
|
+
".ts": "ts",
|
|
133
|
+
".tsx": "tsx"
|
|
75
134
|
},
|
|
76
135
|
bundle: true,
|
|
77
|
-
plugins: [
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
136
|
+
plugins: [
|
|
137
|
+
{
|
|
138
|
+
name: "make-all-packages-external",
|
|
139
|
+
setup(build2) {
|
|
140
|
+
build2.onResolve(
|
|
141
|
+
{ filter: /^[^./]|^\.[^./]|^\.\.[^/]/ },
|
|
142
|
+
(args) => {
|
|
143
|
+
let external = true;
|
|
144
|
+
if (args.kind === "entry-point") {
|
|
145
|
+
external = false;
|
|
146
|
+
}
|
|
147
|
+
return {
|
|
148
|
+
path: args.path,
|
|
149
|
+
external
|
|
150
|
+
};
|
|
151
|
+
}
|
|
152
|
+
);
|
|
153
|
+
}
|
|
94
154
|
}
|
|
95
|
-
|
|
155
|
+
]
|
|
96
156
|
});
|
|
97
|
-
|
|
98
|
-
const
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
157
|
+
delete require.cache[require.resolve(htmlOutputFile)];
|
|
158
|
+
const Document = (yield require(htmlOutputFile)).default;
|
|
159
|
+
const HTMLElement = React.createElement(
|
|
160
|
+
DocumentContext.Provider,
|
|
161
|
+
{ value: documentParams },
|
|
162
|
+
React.createElement(Document, null)
|
|
163
|
+
);
|
|
164
|
+
let html = ReactDomServer.renderToStaticMarkup(HTMLElement);
|
|
102
165
|
debug("entry %s's document jsx rendered html: %o", entryName, html);
|
|
103
|
-
const scripts = [
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
166
|
+
const scripts = [
|
|
167
|
+
htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "script").join(""),
|
|
168
|
+
htmlWebpackPlugin.tags.bodyTags.toString()
|
|
169
|
+
].join("");
|
|
170
|
+
const metas = [
|
|
171
|
+
templateParameters.meta,
|
|
172
|
+
htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName !== "script").join("")
|
|
173
|
+
].join("");
|
|
174
|
+
if (html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
|
|
175
|
+
html = html.replaceAll(
|
|
176
|
+
new RegExp(
|
|
177
|
+
`${DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${DOCUMENT_SCRIPT_PLACEHOLDER_END}`,
|
|
178
|
+
"g"
|
|
179
|
+
),
|
|
180
|
+
(_scriptStr, $1) => `<script>${decodeURIComponent($1)}<\/script>`
|
|
181
|
+
);
|
|
182
|
+
}
|
|
183
|
+
const finalHtml = `<!DOCTYPE html>${html}`.replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(
|
|
184
|
+
DOCUMENT_CHUNKSMAP_PLACEHOLDER,
|
|
185
|
+
PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]
|
|
186
|
+
).replace(
|
|
187
|
+
DOCUMENT_SSRDATASCRIPT_PLACEHOLDER,
|
|
188
|
+
PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]
|
|
189
|
+
);
|
|
190
|
+
return finalHtml;
|
|
191
|
+
});
|
|
109
192
|
};
|
|
110
193
|
return {
|
|
111
194
|
config: () => {
|
|
112
195
|
return {
|
|
113
196
|
tools: {
|
|
114
197
|
htmlPlugin: (options, entry) => {
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
198
|
+
const hackParameters = typeof (options == null ? void 0 : options.templateParameters) === "function" ? options == null ? void 0 : options.templateParameters(
|
|
199
|
+
{},
|
|
200
|
+
{},
|
|
201
|
+
{},
|
|
202
|
+
{}
|
|
203
|
+
) : __spreadValues({}, options == null ? void 0 : options.templateParameters);
|
|
204
|
+
const templateContent = documentEntry(
|
|
205
|
+
entry.entryName,
|
|
206
|
+
hackParameters
|
|
207
|
+
);
|
|
121
208
|
const documentHtmlOptions = templateContent ? {
|
|
122
209
|
templateContent,
|
|
123
210
|
inject: false
|
|
124
211
|
} : {};
|
|
125
|
-
return
|
|
212
|
+
return __spreadValues(__spreadValues({}, options), documentHtmlOptions);
|
|
126
213
|
}
|
|
127
214
|
}
|
|
128
215
|
};
|
|
129
216
|
}
|
|
130
217
|
};
|
|
131
|
-
}
|
|
132
|
-
})
|
|
218
|
+
})
|
|
219
|
+
});
|
|
220
|
+
export {
|
|
221
|
+
cli_default as default
|
|
222
|
+
};
|
|
@@ -1,19 +1,45 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
1
|
+
const DOC_EXT = ["jsx", "tsx", "ts", "js"];
|
|
2
|
+
const DOCUMENT_META_PLACEHOLDER = encodeURIComponent("<%= meta %>");
|
|
3
|
+
const HTML_SEPARATOR = "<!--<?- html ?>-->";
|
|
4
|
+
const HTML_CHUNKSMAP_SEPARATOR = "<!--<?- chunksMap.js ?>-->";
|
|
5
|
+
const HTML_SSRDATASCRIPT_SEPARATOR = "<!--<?- SSRDataScript ?>-->";
|
|
6
|
+
const DOCUMENT_SSR_PLACEHOLDER = encodeURIComponent(HTML_SEPARATOR);
|
|
7
|
+
const DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(
|
|
8
|
+
HTML_CHUNKSMAP_SEPARATOR
|
|
9
|
+
);
|
|
10
|
+
const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = encodeURIComponent(
|
|
11
|
+
HTML_SSRDATASCRIPT_SEPARATOR
|
|
12
|
+
);
|
|
13
|
+
const DOCUMENT_FILE_NAME = "Document";
|
|
14
|
+
const DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent(
|
|
15
|
+
"<!-- chunk scripts placeholder -->"
|
|
16
|
+
);
|
|
17
|
+
const DOCUMENT_NO_SCRIPTE_PLACEHOLDER = encodeURIComponent("<!-- no-script -->");
|
|
18
|
+
const DOCUMENT_SCRIPT_PLACEHOLDER_START = encodeURIComponent(
|
|
19
|
+
"<!-- script-start -->"
|
|
20
|
+
);
|
|
21
|
+
const DOCUMENT_SCRIPT_PLACEHOLDER_END = encodeURIComponent(
|
|
22
|
+
"<!-- script-end -->"
|
|
23
|
+
);
|
|
24
|
+
const PLACEHOLDER_REPLACER_MAP = {
|
|
15
25
|
[DOCUMENT_NO_SCRIPTE_PLACEHOLDER]: `We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.`,
|
|
16
26
|
[DOCUMENT_SSR_PLACEHOLDER]: HTML_SEPARATOR,
|
|
17
27
|
[DOCUMENT_CHUNKSMAP_PLACEHOLDER]: HTML_CHUNKSMAP_SEPARATOR,
|
|
18
28
|
[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]: HTML_SSRDATASCRIPT_SEPARATOR
|
|
19
|
-
};
|
|
29
|
+
};
|
|
30
|
+
export {
|
|
31
|
+
DOCUMENT_CHUNKSMAP_PLACEHOLDER,
|
|
32
|
+
DOCUMENT_FILE_NAME,
|
|
33
|
+
DOCUMENT_META_PLACEHOLDER,
|
|
34
|
+
DOCUMENT_NO_SCRIPTE_PLACEHOLDER,
|
|
35
|
+
DOCUMENT_SCRIPTS_PLACEHOLDER,
|
|
36
|
+
DOCUMENT_SCRIPT_PLACEHOLDER_END,
|
|
37
|
+
DOCUMENT_SCRIPT_PLACEHOLDER_START,
|
|
38
|
+
DOCUMENT_SSRDATASCRIPT_PLACEHOLDER,
|
|
39
|
+
DOCUMENT_SSR_PLACEHOLDER,
|
|
40
|
+
DOC_EXT,
|
|
41
|
+
HTML_CHUNKSMAP_SEPARATOR,
|
|
42
|
+
HTML_SEPARATOR,
|
|
43
|
+
HTML_SSRDATASCRIPT_SEPARATOR,
|
|
44
|
+
PLACEHOLDER_REPLACER_MAP
|
|
45
|
+
};
|
|
File without changes
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
-
import loadable from
|
|
2
|
-
|
|
3
|
-
export * from
|
|
1
|
+
import loadable from "@loadable/component";
|
|
2
|
+
var loadable_default = loadable;
|
|
3
|
+
export * from "@loadable/component";
|
|
4
|
+
export {
|
|
5
|
+
loadable_default as default
|
|
6
|
+
};
|