@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,12 +1,11 @@
|
|
|
1
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
2
1
|
const VARIABLE_REG_EXP = /<!--<\?([-=+])\s*(.*?)\s*\?>-->/;
|
|
3
2
|
const VARIABLE_SPLITTER = /(<!--<\?.*?\?>-->)/;
|
|
4
3
|
const ENCODE_HTML_RULES = {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
'"':
|
|
9
|
-
"'":
|
|
4
|
+
"&": "&",
|
|
5
|
+
"<": "<",
|
|
6
|
+
">": ">",
|
|
7
|
+
'"': """,
|
|
8
|
+
"'": "'"
|
|
10
9
|
};
|
|
11
10
|
const MATCH_HTML = /[&<>'"]/g;
|
|
12
11
|
function encodeChar(c) {
|
|
@@ -15,19 +14,15 @@ function encodeChar(c) {
|
|
|
15
14
|
function escape(str) {
|
|
16
15
|
return str.replace(MATCH_HTML, encodeChar);
|
|
17
16
|
}
|
|
18
|
-
|
|
17
|
+
const _Fragment = class {
|
|
19
18
|
constructor(template) {
|
|
20
|
-
_defineProperty(this, "isVariable", void 0);
|
|
21
|
-
_defineProperty(this, "content", void 0);
|
|
22
|
-
_defineProperty(this, "filters", void 0);
|
|
23
|
-
_defineProperty(this, "path", void 0);
|
|
24
19
|
const match = VARIABLE_REG_EXP.exec(template);
|
|
25
20
|
if (match) {
|
|
26
21
|
const [, filterFlag, content] = match;
|
|
27
22
|
this.isVariable = true;
|
|
28
23
|
this.content = content;
|
|
29
|
-
this.filters = [
|
|
30
|
-
this.path = content.replace(/\[['"](.*?)['"]\]/g,
|
|
24
|
+
this.filters = [_Fragment.filterMap[filterFlag]];
|
|
25
|
+
this.path = content.replace(/\[['"](.*?)['"]\]/g, ".$1").split(".");
|
|
31
26
|
} else {
|
|
32
27
|
this.isVariable = false;
|
|
33
28
|
this.content = template;
|
|
@@ -38,21 +33,26 @@ export class Fragment {
|
|
|
38
33
|
getValue(data) {
|
|
39
34
|
if (this.isVariable) {
|
|
40
35
|
const value = this.path.reduce((p, n) => p != null ? p[n] : p, data);
|
|
41
|
-
return this.filters.reduce((p, n) => n(p), value != null ? value :
|
|
36
|
+
return this.filters.reduce((p, n) => n(p), value != null ? value : "");
|
|
42
37
|
}
|
|
43
38
|
return this.content;
|
|
44
39
|
}
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
40
|
+
};
|
|
41
|
+
let Fragment = _Fragment;
|
|
42
|
+
Fragment.filterMap = {
|
|
43
|
+
"=": escape,
|
|
44
|
+
"-": (v) => v
|
|
45
|
+
};
|
|
50
46
|
const fragmentListMap = {};
|
|
51
|
-
|
|
47
|
+
function toFragments(template, entryName) {
|
|
52
48
|
if (fragmentListMap[entryName]) {
|
|
53
49
|
return fragmentListMap[entryName];
|
|
54
50
|
}
|
|
55
|
-
const fragmentList = template.split(VARIABLE_SPLITTER).filter(v => Boolean(v)).map(v => new Fragment(v));
|
|
51
|
+
const fragmentList = template.split(VARIABLE_SPLITTER).filter((v) => Boolean(v)).map((v) => new Fragment(v));
|
|
56
52
|
fragmentListMap[entryName] = fragmentList;
|
|
57
53
|
return fragmentList;
|
|
58
|
-
}
|
|
54
|
+
}
|
|
55
|
+
export {
|
|
56
|
+
Fragment,
|
|
57
|
+
toFragments
|
|
58
|
+
};
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
})(RenderLevel ||
|
|
1
|
+
var RenderLevel = /* @__PURE__ */ ((RenderLevel2) => {
|
|
2
|
+
RenderLevel2[RenderLevel2["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
|
|
3
|
+
RenderLevel2[RenderLevel2["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";
|
|
4
|
+
RenderLevel2[RenderLevel2["SERVER_RENDER"] = 2] = "SERVER_RENDER";
|
|
5
|
+
return RenderLevel2;
|
|
6
|
+
})(RenderLevel || {});
|
|
7
|
+
export {
|
|
8
|
+
RenderLevel
|
|
9
|
+
};
|
|
@@ -1,20 +1,22 @@
|
|
|
1
|
-
|
|
2
|
-
const check =
|
|
1
|
+
function getLoadableScripts(extractor) {
|
|
2
|
+
const check = (scripts2) => (scripts2 || "").includes("__LOADABLE_REQUIRED_CHUNKS___ext");
|
|
3
3
|
const scripts = extractor.getScriptTags();
|
|
4
4
|
if (!check(scripts)) {
|
|
5
|
-
return
|
|
5
|
+
return "";
|
|
6
6
|
}
|
|
7
|
-
return scripts.split(
|
|
8
|
-
// 前两个 script为 loadable 必须的 script
|
|
9
|
-
.slice(0, 2).map(i => `${i}</script>`).join('');
|
|
7
|
+
return scripts.split("<\/script>").slice(0, 2).map((i) => `${i}<\/script>`).join("");
|
|
10
8
|
}
|
|
11
|
-
const getLatency = hrtime => {
|
|
9
|
+
const getLatency = (hrtime) => {
|
|
12
10
|
const [s, ns] = process.hrtime(hrtime);
|
|
13
11
|
return s * 1e3 + ns / 1e6;
|
|
14
12
|
};
|
|
15
|
-
|
|
13
|
+
const time = () => {
|
|
16
14
|
const hrtime = process.hrtime();
|
|
17
15
|
return () => {
|
|
18
16
|
return getLatency(hrtime);
|
|
19
17
|
};
|
|
20
|
-
};
|
|
18
|
+
};
|
|
19
|
+
export {
|
|
20
|
+
getLoadableScripts,
|
|
21
|
+
time
|
|
22
|
+
};
|
|
File without changes
|
|
@@ -1,61 +1,81 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
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
|
+
const isReact18 = () => process.env.IS_REACT18 === "true";
|
|
18
|
+
const formatServer = (request) => {
|
|
6
19
|
const {
|
|
7
|
-
cookie =
|
|
8
|
-
|
|
20
|
+
cookie = "",
|
|
21
|
+
"user-agent": userAgent = "",
|
|
9
22
|
referer
|
|
10
23
|
} = request.headers || {};
|
|
11
|
-
return
|
|
24
|
+
return __spreadValues({
|
|
12
25
|
cookie,
|
|
13
26
|
userAgent,
|
|
14
27
|
referer
|
|
15
28
|
}, request);
|
|
16
29
|
};
|
|
17
|
-
const getQuery = () => window.location.search.substring(1).split(
|
|
18
|
-
const [key, value] = item.split(
|
|
30
|
+
const getQuery = () => window.location.search.substring(1).split("&").reduce((res, item) => {
|
|
31
|
+
const [key, value] = item.split("=");
|
|
19
32
|
if (key) {
|
|
20
33
|
res[key] = value;
|
|
21
34
|
}
|
|
22
35
|
return res;
|
|
23
36
|
}, {});
|
|
24
|
-
|
|
25
|
-
var
|
|
37
|
+
const formatClient = (request) => {
|
|
38
|
+
var _a, _b;
|
|
26
39
|
return {
|
|
27
40
|
params: request.params || {},
|
|
28
41
|
host: request.host || location.host,
|
|
29
42
|
pathname: request.pathname || location.pathname,
|
|
30
43
|
headers: request.headers || {},
|
|
31
44
|
cookieMap: request.cookieMap || {},
|
|
32
|
-
cookie: ((
|
|
33
|
-
userAgent: ((
|
|
45
|
+
cookie: ((_a = request.headers) == null ? void 0 : _a.cookie) || document.cookie,
|
|
46
|
+
userAgent: ((_b = request.headers) == null ? void 0 : _b["user-agent"]) || navigator.userAgent,
|
|
34
47
|
referer: request.referer || document.referrer,
|
|
35
48
|
query: request.query || getQuery(),
|
|
36
49
|
url: location.href
|
|
37
50
|
};
|
|
38
51
|
};
|
|
39
|
-
|
|
52
|
+
const mockResponse = () => {
|
|
40
53
|
return {
|
|
41
54
|
setHeader() {
|
|
42
|
-
console.warn(
|
|
55
|
+
console.warn("response.setHeader() can only be used in the server side");
|
|
43
56
|
},
|
|
44
57
|
status() {
|
|
45
|
-
console.warn(
|
|
58
|
+
console.warn("response.status() can only be used in the server side");
|
|
46
59
|
},
|
|
47
60
|
get locals() {
|
|
48
|
-
console.warn(
|
|
61
|
+
console.warn("response.locals can only be used in the server side");
|
|
49
62
|
return {};
|
|
50
63
|
}
|
|
51
64
|
};
|
|
52
65
|
};
|
|
53
|
-
|
|
54
|
-
if (url.startsWith(
|
|
66
|
+
const isCrossOrigin = (url = "", base) => {
|
|
67
|
+
if (url.startsWith("/") || url.startsWith("./")) {
|
|
55
68
|
return false;
|
|
56
69
|
} else if (!url.includes(base)) {
|
|
57
70
|
return true;
|
|
58
71
|
} else {
|
|
59
72
|
return false;
|
|
60
73
|
}
|
|
61
|
-
};
|
|
74
|
+
};
|
|
75
|
+
export {
|
|
76
|
+
formatClient,
|
|
77
|
+
formatServer,
|
|
78
|
+
isCrossOrigin,
|
|
79
|
+
isReact18,
|
|
80
|
+
mockResponse
|
|
81
|
+
};
|
|
@@ -1,43 +1,50 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
import {
|
|
2
|
+
getEntryOptions,
|
|
3
|
+
createRuntimeExportsUtils,
|
|
4
|
+
PLUGIN_SCHEMAS
|
|
5
|
+
} from "@modern-js/utils";
|
|
6
|
+
const PLUGIN_IDENTIFIER = "state";
|
|
7
|
+
var cli_default = () => ({
|
|
8
|
+
name: "@modern-js/plugin-state",
|
|
9
|
+
required: ["@modern-js/runtime"],
|
|
10
|
+
setup: (api) => {
|
|
11
|
+
const stateConfigMap = /* @__PURE__ */ new Map();
|
|
8
12
|
let pluginsExportsUtils;
|
|
9
13
|
return {
|
|
10
14
|
config() {
|
|
11
15
|
const appContext = api.useAppContext();
|
|
12
|
-
pluginsExportsUtils = createRuntimeExportsUtils(
|
|
16
|
+
pluginsExportsUtils = createRuntimeExportsUtils(
|
|
17
|
+
appContext.internalDirectory,
|
|
18
|
+
"plugins"
|
|
19
|
+
);
|
|
13
20
|
return {
|
|
14
21
|
source: {
|
|
15
22
|
alias: {
|
|
16
|
-
|
|
23
|
+
"@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
|
|
17
24
|
}
|
|
18
25
|
}
|
|
19
26
|
};
|
|
20
27
|
},
|
|
21
|
-
modifyEntryImports({
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}) {
|
|
25
|
-
var _getEntryOptions;
|
|
26
|
-
const {
|
|
27
|
-
entryName
|
|
28
|
-
} = entrypoint;
|
|
28
|
+
modifyEntryImports({ entrypoint, imports }) {
|
|
29
|
+
var _a;
|
|
30
|
+
const { entryName } = entrypoint;
|
|
29
31
|
const userConfig = api.useResolvedConfigContext();
|
|
30
|
-
const {
|
|
32
|
+
const { packageName } = api.useAppContext();
|
|
33
|
+
const stateConfig = (_a = getEntryOptions(
|
|
34
|
+
entryName,
|
|
35
|
+
userConfig.runtime,
|
|
36
|
+
userConfig.runtimeByEntries,
|
|
31
37
|
packageName
|
|
32
|
-
|
|
33
|
-
const stateConfig = (_getEntryOptions = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
|
|
38
|
+
)) == null ? void 0 : _a.state;
|
|
34
39
|
stateConfigMap.set(entryName, stateConfig);
|
|
35
40
|
if (stateConfig) {
|
|
36
41
|
imports.push({
|
|
37
|
-
value:
|
|
38
|
-
specifiers: [
|
|
39
|
-
|
|
40
|
-
|
|
42
|
+
value: "@modern-js/runtime/plugins",
|
|
43
|
+
specifiers: [
|
|
44
|
+
{
|
|
45
|
+
imported: PLUGIN_IDENTIFIER
|
|
46
|
+
}
|
|
47
|
+
]
|
|
41
48
|
});
|
|
42
49
|
}
|
|
43
50
|
return {
|
|
@@ -45,15 +52,14 @@ export default (() => ({
|
|
|
45
52
|
imports
|
|
46
53
|
};
|
|
47
54
|
},
|
|
48
|
-
modifyEntryRuntimePlugins({
|
|
49
|
-
entrypoint,
|
|
50
|
-
plugins
|
|
51
|
-
}) {
|
|
55
|
+
modifyEntryRuntimePlugins({ entrypoint, plugins }) {
|
|
52
56
|
const stateOptions = stateConfigMap.get(entrypoint.entryName);
|
|
53
57
|
if (stateOptions) {
|
|
54
58
|
plugins.push({
|
|
55
59
|
name: PLUGIN_IDENTIFIER,
|
|
56
|
-
options: `${JSON.stringify(
|
|
60
|
+
options: `${JSON.stringify(
|
|
61
|
+
stateConfigMap.get(entrypoint.entryName)
|
|
62
|
+
)}`
|
|
57
63
|
});
|
|
58
64
|
}
|
|
59
65
|
return {
|
|
@@ -62,11 +68,16 @@ export default (() => ({
|
|
|
62
68
|
};
|
|
63
69
|
},
|
|
64
70
|
validateSchema() {
|
|
65
|
-
return PLUGIN_SCHEMAS[
|
|
71
|
+
return PLUGIN_SCHEMAS["@modern-js/plugin-state"];
|
|
66
72
|
},
|
|
67
73
|
addRuntimeExports() {
|
|
68
|
-
pluginsExportsUtils.addExport(
|
|
74
|
+
pluginsExportsUtils.addExport(
|
|
75
|
+
`export { default as state } from '@modern-js/runtime/model'`
|
|
76
|
+
);
|
|
69
77
|
}
|
|
70
78
|
};
|
|
71
79
|
}
|
|
72
|
-
})
|
|
80
|
+
});
|
|
81
|
+
export {
|
|
82
|
+
cli_default as default
|
|
83
|
+
};
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
export * from "./runtime";
|
|
1
|
+
import { default as default2 } from "./runtime";
|
|
2
|
+
import { default as default3 } from "./runtime";
|
|
3
|
+
export * from "./runtime";
|
|
4
|
+
export {
|
|
5
|
+
default3 as default,
|
|
6
|
+
default2 as state
|
|
7
|
+
};
|
|
@@ -1,7 +1,13 @@
|
|
|
1
|
-
import { plugin as effectsPlugin } from
|
|
2
|
-
import autoActionsPlugin from
|
|
3
|
-
import immerPlugin from
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
import { plugin as effectsPlugin } from "@modern-js-reduck/plugin-effects";
|
|
2
|
+
import autoActionsPlugin from "@modern-js-reduck/plugin-auto-actions";
|
|
3
|
+
import immerPlugin from "@modern-js-reduck/plugin-immutable";
|
|
4
|
+
import { default as default2 } from "@modern-js-reduck/plugin-devtools";
|
|
5
|
+
const effects = () => effectsPlugin;
|
|
6
|
+
const immer = () => immerPlugin;
|
|
7
|
+
const autoActions = () => autoActionsPlugin;
|
|
8
|
+
export {
|
|
9
|
+
autoActions,
|
|
10
|
+
default2 as devtools,
|
|
11
|
+
effects,
|
|
12
|
+
immer
|
|
13
|
+
};
|
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
export * from "./plugin";
|
|
1
|
+
export * from "@modern-js-reduck/react";
|
|
2
|
+
import { model, createStore } from "@modern-js-reduck/store";
|
|
3
|
+
import { default as default2 } from "./plugin";
|
|
4
|
+
export * from "./plugin";
|
|
5
|
+
export {
|
|
6
|
+
createStore,
|
|
7
|
+
default2 as default,
|
|
8
|
+
model
|
|
9
|
+
};
|
|
@@ -1,75 +1,88 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __defProps = Object.defineProperties;
|
|
3
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
4
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
7
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
8
|
+
var __spreadValues = (a, b) => {
|
|
9
|
+
for (var prop in b || (b = {}))
|
|
10
|
+
if (__hasOwnProp.call(b, prop))
|
|
11
|
+
__defNormalProp(a, prop, b[prop]);
|
|
12
|
+
if (__getOwnPropSymbols)
|
|
13
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
14
|
+
if (__propIsEnum.call(b, prop))
|
|
15
|
+
__defNormalProp(a, prop, b[prop]);
|
|
16
|
+
}
|
|
17
|
+
return a;
|
|
18
|
+
};
|
|
19
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
|
+
import { jsx } from "react/jsx-runtime";
|
|
21
|
+
import { useContext } from "react";
|
|
22
|
+
import {
|
|
23
|
+
createStore
|
|
24
|
+
} from "@modern-js-reduck/store";
|
|
25
|
+
import { Provider } from "@modern-js-reduck/react";
|
|
26
|
+
import hoistNonReactStatics from "hoist-non-react-statics";
|
|
8
27
|
import { immer, effects, autoActions, devtools } from "../plugins";
|
|
9
28
|
import { RuntimeReactContext } from "../../core";
|
|
10
29
|
import { isBrowser } from "../../common";
|
|
11
|
-
import { jsx as _jsx } from "react/jsx-runtime";
|
|
12
30
|
const StatePluginHandleMap = {
|
|
13
31
|
immer,
|
|
14
32
|
effects,
|
|
15
33
|
autoActions,
|
|
16
34
|
devtools
|
|
17
35
|
};
|
|
18
|
-
const getStoreConfig = config => {
|
|
19
|
-
const internalPlugins = [
|
|
36
|
+
const getStoreConfig = (config) => {
|
|
37
|
+
const internalPlugins = [
|
|
38
|
+
"immer",
|
|
39
|
+
"effects",
|
|
40
|
+
"autoActions",
|
|
41
|
+
"devtools"
|
|
42
|
+
];
|
|
20
43
|
const plugins = [];
|
|
21
|
-
internalPlugins.filter(plugin => config[plugin] !== false).forEach(
|
|
44
|
+
internalPlugins.filter((plugin) => config[plugin] !== false).forEach(
|
|
45
|
+
(plugin) => plugins.push(StatePluginHandleMap[plugin](config[plugin]))
|
|
46
|
+
);
|
|
22
47
|
const storeConfig = {};
|
|
23
48
|
for (const [key, value] of Object.entries(config)) {
|
|
24
|
-
if (internalPlugins.includes(key)) {
|
|
25
|
-
plugins.push(StatePluginHandleMap[key](value));
|
|
26
|
-
} else {
|
|
49
|
+
if (!internalPlugins.includes(key)) {
|
|
27
50
|
storeConfig[key] = value;
|
|
28
51
|
}
|
|
29
52
|
}
|
|
30
53
|
storeConfig.plugins = plugins;
|
|
31
54
|
return storeConfig;
|
|
32
55
|
};
|
|
33
|
-
const state = config => ({
|
|
34
|
-
name:
|
|
56
|
+
const state = (config) => ({
|
|
57
|
+
name: "@modern-js/plugin-state",
|
|
35
58
|
setup: () => {
|
|
59
|
+
const storeConfig = getStoreConfig(config);
|
|
36
60
|
return {
|
|
37
|
-
hoc({
|
|
38
|
-
|
|
39
|
-
}, next) {
|
|
40
|
-
const getStateApp = props => {
|
|
41
|
-
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
61
|
+
hoc({ App }, next) {
|
|
62
|
+
const getStateApp = (props) => {
|
|
42
63
|
const context = useContext(RuntimeReactContext);
|
|
43
|
-
return
|
|
64
|
+
return /* @__PURE__ */ jsx(Provider, {
|
|
44
65
|
store: context.store,
|
|
45
|
-
config:
|
|
46
|
-
children:
|
|
66
|
+
config: storeConfig,
|
|
67
|
+
children: /* @__PURE__ */ jsx(App, __spreadValues({}, props))
|
|
47
68
|
});
|
|
48
69
|
};
|
|
49
70
|
return next({
|
|
50
71
|
App: hoistNonReactStatics(getStateApp, App)
|
|
51
72
|
});
|
|
52
73
|
},
|
|
53
|
-
init({
|
|
54
|
-
|
|
55
|
-
}, next) {
|
|
56
|
-
const storeConfig = getStoreConfig(config || {});
|
|
74
|
+
init({ context }, next) {
|
|
75
|
+
var _a, _b;
|
|
57
76
|
if (isBrowser()) {
|
|
58
|
-
|
|
59
|
-
storeConfig.initialState = storeConfig.initialState || ((_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$dat = _window$_SSR_DATA.data) === null || _window$_SSR_DATA$dat === void 0 ? void 0 : _window$_SSR_DATA$dat.storeState) || {};
|
|
77
|
+
storeConfig.initialState = storeConfig.initialState || ((_b = (_a = window == null ? void 0 : window._SSR_DATA) == null ? void 0 : _a.data) == null ? void 0 : _b.storeState) || {};
|
|
60
78
|
}
|
|
61
79
|
context.store = createStore(storeConfig);
|
|
62
|
-
return next({
|
|
63
|
-
context
|
|
64
|
-
});
|
|
80
|
+
return next({ context });
|
|
65
81
|
},
|
|
66
|
-
pickContext({
|
|
67
|
-
context,
|
|
68
|
-
pickedContext
|
|
69
|
-
}, next) {
|
|
82
|
+
pickContext({ context, pickedContext }, next) {
|
|
70
83
|
return next({
|
|
71
84
|
context,
|
|
72
|
-
pickedContext:
|
|
85
|
+
pickedContext: __spreadProps(__spreadValues({}, pickedContext), {
|
|
73
86
|
store: context.store
|
|
74
87
|
})
|
|
75
88
|
});
|
|
@@ -77,5 +90,8 @@ const state = config => ({
|
|
|
77
90
|
};
|
|
78
91
|
}
|
|
79
92
|
});
|
|
80
|
-
|
|
81
|
-
export * from "../plugins";
|
|
93
|
+
var plugin_default = state;
|
|
94
|
+
export * from "../plugins";
|
|
95
|
+
export {
|
|
96
|
+
plugin_default as default
|
|
97
|
+
};
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|