@modern-js/runtime 2.19.1 → 2.21.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +51 -0
- package/dist/cjs/cli/index.js +6 -10
- package/dist/cjs/core/compatible.js +4 -47
- package/dist/cjs/core/index.js +4 -16
- package/dist/cjs/core/loader/index.js +2 -6
- package/dist/cjs/core/loader/loaderManager.js +2 -6
- package/dist/cjs/core/loader/useLoader.js +2 -6
- package/dist/cjs/document/Body.js +2 -41
- package/dist/cjs/document/Comment.js +2 -6
- package/dist/cjs/document/DocumentContext.js +2 -6
- package/dist/cjs/document/DocumentStructureContext.js +2 -6
- package/dist/cjs/document/Head.js +2 -41
- package/dist/cjs/document/Html.js +2 -6
- package/dist/cjs/document/Links.js +2 -6
- package/dist/cjs/document/Root.js +2 -41
- package/dist/cjs/document/Script.js +2 -6
- package/dist/cjs/document/Scripts.js +2 -6
- package/dist/cjs/document/cli/index.js +9 -10
- package/dist/cjs/document/index.js +12 -24
- package/dist/cjs/exports/head.js +3 -19
- package/dist/cjs/exports/loadable.js +3 -19
- package/dist/cjs/exports/styled.js +3 -19
- package/dist/cjs/router/index.js +3 -19
- package/dist/cjs/router/runtime/DefaultNotFound.js +2 -6
- package/dist/cjs/router/runtime/DeferredDataScripts.node.js +4 -4
- package/dist/cjs/router/runtime/PrefetchLink.js +9 -48
- package/dist/cjs/router/runtime/index.js +57 -70
- package/dist/cjs/router/runtime/plugin.js +10 -14
- package/dist/cjs/router/runtime/plugin.node.js +11 -54
- package/dist/cjs/router/runtime/server.js +2 -14
- package/dist/cjs/router/runtime/utils.js +9 -12
- package/dist/cjs/router/runtime/withRouter.js +6 -10
- package/dist/cjs/ssr/cli/babel-plugin-ssr-loader-id.js +4 -47
- package/dist/cjs/ssr/cli/index.js +3 -7
- package/dist/cjs/ssr/cli/loadable-bundler-plugin.js +5 -21
- package/dist/cjs/ssr/index.js +4 -20
- package/dist/cjs/ssr/index.node.js +4 -20
- package/dist/cjs/ssr/react/nossr/index.js +2 -41
- package/dist/cjs/ssr/react/prerender/index.js +8 -63
- package/dist/cjs/ssr/react/withCallback/index.js +2 -41
- package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.after.js +6 -2
- package/dist/cjs/ssr/serverRender/renderToStream/bulidTemplate.before.js +5 -9
- package/dist/cjs/ssr/serverRender/renderToStream/index.js +2 -6
- package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.js +10 -12
- package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.worker.js +11 -11
- package/dist/cjs/ssr/serverRender/renderToString/entry.js +28 -77
- package/dist/cjs/ssr/serverRender/renderToString/index.js +2 -6
- package/dist/cjs/ssr/serverRender/renderToString/loadable.js +7 -4
- package/dist/cjs/ssr/serverRender/renderToString/reduce.js +2 -6
- package/dist/cjs/ssr/serverRender/renderToString/template.js +6 -18
- package/dist/cjs/ssr/serverRender/utils.js +7 -1
- package/dist/cjs/ssr/utils.js +2 -6
- package/dist/cjs/state/index.js +3 -19
- package/dist/cjs/state/plugins.js +4 -8
- package/dist/cjs/state/runtime/index.js +4 -20
- package/dist/cjs/state/runtime/plugin.js +4 -20
- package/dist/esm/cli/index.js +3 -132
- package/dist/esm/core/compatible.js +7 -233
- package/dist/esm/core/loader/loaderManager.js +7 -212
- package/dist/esm/core/loader/useLoader.js +4 -117
- package/dist/esm/core/plugin.js +3 -132
- package/dist/esm/document/cli/index.js +12 -198
- package/dist/esm/document/constants.js +1 -13
- package/dist/esm/router/cli/index.js +2 -52
- package/dist/esm/router/runtime/DeferredDataScripts.node.js +2 -59
- package/dist/esm/router/runtime/PrefetchLink.js +7 -251
- package/dist/esm/router/runtime/index.js +6 -4
- package/dist/esm/router/runtime/plugin.js +3 -53
- package/dist/esm/router/runtime/plugin.node.js +10 -252
- package/dist/esm/router/runtime/server.js +1 -1
- package/dist/esm/router/runtime/utils.js +8 -151
- package/dist/esm/router/runtime/withRouter.js +3 -53
- package/dist/esm/ssr/cli/index.js +1 -1
- package/dist/esm/ssr/cli/loadable-bundler-plugin.js +6 -108
- package/dist/esm/ssr/index.js +5 -184
- package/dist/esm/ssr/index.node.js +5 -184
- package/dist/esm/ssr/prefetch.js +4 -133
- package/dist/esm/ssr/react/nossr/index.js +1 -58
- package/dist/esm/ssr/react/prerender/index.js +7 -145
- package/dist/esm/ssr/serverRender/index.js +3 -132
- package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.after.js +7 -30
- package/dist/esm/ssr/serverRender/renderToStream/bulidTemplate.before.js +3 -73
- package/dist/esm/ssr/serverRender/renderToStream/index.js +3 -132
- package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.js +13 -71
- package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.worker.js +18 -197
- package/dist/esm/ssr/serverRender/renderToStream/template.js +1 -58
- package/dist/esm/ssr/serverRender/renderToString/entry.js +19 -188
- package/dist/esm/ssr/serverRender/renderToString/index.js +3 -132
- package/dist/esm/ssr/serverRender/renderToString/loadable.js +8 -5
- package/dist/esm/ssr/serverRender/renderToString/template.js +4 -93
- package/dist/esm/ssr/serverRender/time.js +1 -58
- package/dist/esm/ssr/serverRender/time.worker.js +1 -58
- package/dist/esm/ssr/serverRender/utils.js +7 -0
- package/dist/esm/ssr/utils.js +2 -86
- package/dist/esm/state/runtime/plugin.js +3 -110
- package/dist/esm-node/document/cli/index.js +5 -2
- package/dist/esm-node/router/runtime/DeferredDataScripts.node.js +1 -1
- package/dist/esm-node/router/runtime/PrefetchLink.js +1 -1
- package/dist/esm-node/router/runtime/index.js +6 -4
- package/dist/esm-node/router/runtime/plugin.js +1 -1
- package/dist/esm-node/router/runtime/plugin.node.js +3 -3
- package/dist/esm-node/router/runtime/server.js +1 -1
- package/dist/esm-node/router/runtime/utils.js +3 -2
- package/dist/esm-node/router/runtime/withRouter.js +1 -1
- package/dist/esm-node/ssr/cli/index.js +1 -1
- package/dist/esm-node/ssr/cli/loadable-bundler-plugin.js +1 -13
- package/dist/esm-node/ssr/react/prerender/index.js +1 -13
- package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.after.js +6 -2
- package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js +1 -1
- package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.js +10 -12
- package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.worker.js +11 -11
- package/dist/esm-node/ssr/serverRender/renderToString/entry.js +12 -18
- package/dist/esm-node/ssr/serverRender/renderToString/loadable.js +8 -5
- package/dist/esm-node/ssr/serverRender/renderToString/template.js +1 -13
- package/dist/esm-node/ssr/serverRender/utils.js +5 -0
- package/dist/types/cli/index.d.ts +0 -2
- package/dist/types/core/loader/loaderManager.d.ts +0 -1
- package/dist/types/core/loader/useLoader.d.ts +0 -5
- package/dist/types/core/plugin.d.ts +1 -6
- package/dist/types/document/cli/index.d.ts +0 -2
- package/dist/types/router/cli/index.d.ts +0 -2
- package/dist/types/router/runtime/DeferredDataScripts.d.ts +0 -1
- package/dist/types/router/runtime/DeferredDataScripts.node.d.ts +0 -1
- package/dist/types/router/runtime/PrefetchLink.d.ts +1 -3
- package/dist/types/router/runtime/hooks.d.ts +1 -1
- package/dist/types/router/runtime/index.d.ts +3 -4
- package/dist/types/router/runtime/server.d.ts +1 -1
- package/dist/types/router/runtime/types.d.ts +1 -3
- package/dist/types/router/runtime/utils.d.ts +1 -3
- package/dist/types/router/runtime/withRouter.d.ts +1 -1
- package/dist/types/runtimeContext.d.ts +1 -1
- package/dist/types/ssr/cli/index.d.ts +0 -2
- package/dist/types/ssr/serverRender/renderToStream/type.d.ts +2 -2
- package/dist/types/ssr/serverRender/renderToString/entry.d.ts +1 -0
- package/dist/types/ssr/serverRender/renderToString/type.d.ts +1 -0
- package/dist/types/ssr/serverRender/utils.d.ts +2 -1
- package/dist/types/state/cli/index.d.ts +0 -2
- package/dist/types/state/types.d.ts +0 -1
- package/package.json +28 -21
|
@@ -2,55 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
const
|
|
5
|
+
const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
6
|
+
const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
|
|
7
|
+
const _crypto = /* @__PURE__ */ _interop_require_default._(require("crypto"));
|
|
6
8
|
const _buffer = require("buffer");
|
|
7
|
-
const _types = /* @__PURE__ */ _interop_require_wildcard(require("@babel/types"));
|
|
9
|
+
const _types = /* @__PURE__ */ _interop_require_wildcard._(require("@babel/types"));
|
|
8
10
|
const _lodash = require("@modern-js/utils/lodash");
|
|
9
|
-
function _interop_require_default(obj) {
|
|
10
|
-
return obj && obj.__esModule ? obj : {
|
|
11
|
-
default: obj
|
|
12
|
-
};
|
|
13
|
-
}
|
|
14
|
-
function _getRequireWildcardCache(nodeInterop) {
|
|
15
|
-
if (typeof WeakMap !== "function")
|
|
16
|
-
return null;
|
|
17
|
-
var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
|
|
18
|
-
var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
|
|
19
|
-
return (_getRequireWildcardCache = function(nodeInterop2) {
|
|
20
|
-
return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
|
|
21
|
-
})(nodeInterop);
|
|
22
|
-
}
|
|
23
|
-
function _interop_require_wildcard(obj, nodeInterop) {
|
|
24
|
-
if (!nodeInterop && obj && obj.__esModule) {
|
|
25
|
-
return obj;
|
|
26
|
-
}
|
|
27
|
-
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
28
|
-
return {
|
|
29
|
-
default: obj
|
|
30
|
-
};
|
|
31
|
-
}
|
|
32
|
-
var cache = _getRequireWildcardCache(nodeInterop);
|
|
33
|
-
if (cache && cache.has(obj)) {
|
|
34
|
-
return cache.get(obj);
|
|
35
|
-
}
|
|
36
|
-
var newObj = {};
|
|
37
|
-
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
38
|
-
for (var key in obj) {
|
|
39
|
-
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
40
|
-
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
41
|
-
if (desc && (desc.get || desc.set)) {
|
|
42
|
-
Object.defineProperty(newObj, key, desc);
|
|
43
|
-
} else {
|
|
44
|
-
newObj[key] = obj[key];
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
newObj.default = obj;
|
|
49
|
-
if (cache) {
|
|
50
|
-
cache.set(obj, newObj);
|
|
51
|
-
}
|
|
52
|
-
return newObj;
|
|
53
|
-
}
|
|
54
11
|
const RUNTIME_PACKAGE_NAMES = [
|
|
55
12
|
"@modern-js/runtime"
|
|
56
13
|
];
|
|
@@ -6,13 +6,9 @@ Object.defineProperty(exports, "default", {
|
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: () => _default
|
|
8
8
|
});
|
|
9
|
-
const
|
|
9
|
+
const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
10
|
+
const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
|
|
10
11
|
const _utils = require("@modern-js/utils");
|
|
11
|
-
function _interop_require_default(obj) {
|
|
12
|
-
return obj && obj.__esModule ? obj : {
|
|
13
|
-
default: obj
|
|
14
|
-
};
|
|
15
|
-
}
|
|
16
12
|
const PLUGIN_IDENTIFIER = "ssr";
|
|
17
13
|
const hasStringSSREntry = (userConfig) => {
|
|
18
14
|
const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
|
|
@@ -71,7 +67,7 @@ const _default = () => {
|
|
|
71
67
|
source: {
|
|
72
68
|
alias: {
|
|
73
69
|
// ensure that all packages use the same storage in @modern-js/utils/runtime-node
|
|
74
|
-
"@modern-js/utils/runtime-node": require.resolve("@modern-js/utils/runtime-node"),
|
|
70
|
+
"@modern-js/utils/runtime-node$": require.resolve("@modern-js/utils/runtime-node"),
|
|
75
71
|
"@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
|
|
76
72
|
},
|
|
77
73
|
globalVars: (values, { target }) => {
|
|
@@ -2,26 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
const
|
|
5
|
+
const _define_property = require("@swc/helpers/_/_define_property");
|
|
6
|
+
const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
7
|
+
const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
|
|
6
8
|
const _utils = require("@modern-js/utils");
|
|
7
|
-
function _define_property(obj, key, value) {
|
|
8
|
-
if (key in obj) {
|
|
9
|
-
Object.defineProperty(obj, key, {
|
|
10
|
-
value,
|
|
11
|
-
enumerable: true,
|
|
12
|
-
configurable: true,
|
|
13
|
-
writable: true
|
|
14
|
-
});
|
|
15
|
-
} else {
|
|
16
|
-
obj[key] = value;
|
|
17
|
-
}
|
|
18
|
-
return obj;
|
|
19
|
-
}
|
|
20
|
-
function _interop_require_default(obj) {
|
|
21
|
-
return obj && obj.__esModule ? obj : {
|
|
22
|
-
default: obj
|
|
23
|
-
};
|
|
24
|
-
}
|
|
25
9
|
class LoadablePlugin {
|
|
26
10
|
apply(compiler) {
|
|
27
11
|
this.compiler = compiler;
|
|
@@ -97,8 +81,8 @@ class LoadablePlugin {
|
|
|
97
81
|
outputAsset: true,
|
|
98
82
|
chunkLoadingGlobal: "__LOADABLE_LOADED_CHUNKS__"
|
|
99
83
|
}) {
|
|
100
|
-
_define_property(this, "opts", void 0);
|
|
101
|
-
_define_property(this, "compiler", void 0);
|
|
84
|
+
_define_property._(this, "opts", void 0);
|
|
85
|
+
_define_property._(this, "compiler", void 0);
|
|
102
86
|
this.opts = {
|
|
103
87
|
filename,
|
|
104
88
|
path,
|
package/dist/cjs/ssr/index.js
CHANGED
|
@@ -13,33 +13,17 @@ _export(exports, {
|
|
|
13
13
|
ssr: () => ssr,
|
|
14
14
|
default: () => _default
|
|
15
15
|
});
|
|
16
|
+
const _export_star = require("@swc/helpers/_/_export_star");
|
|
17
|
+
const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
16
18
|
const _jsxruntime = require("react/jsx-runtime");
|
|
17
19
|
const _component = require("@loadable/component");
|
|
18
|
-
const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
|
|
20
|
+
const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
|
|
19
21
|
const _runtimebrowser = require("@modern-js/utils/runtime-browser");
|
|
20
22
|
const _types = require("./serverRender/types");
|
|
21
23
|
const _withCallback = require("./react/withCallback");
|
|
22
24
|
const _utils = require("./utils");
|
|
23
25
|
const _utils1 = require("./serverRender/utils");
|
|
24
|
-
_export_star(require("./react"), exports);
|
|
25
|
-
function _export_star(from, to) {
|
|
26
|
-
Object.keys(from).forEach(function(k) {
|
|
27
|
-
if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
|
|
28
|
-
Object.defineProperty(to, k, {
|
|
29
|
-
enumerable: true,
|
|
30
|
-
get: function() {
|
|
31
|
-
return from[k];
|
|
32
|
-
}
|
|
33
|
-
});
|
|
34
|
-
}
|
|
35
|
-
});
|
|
36
|
-
return from;
|
|
37
|
-
}
|
|
38
|
-
function _interop_require_default(obj) {
|
|
39
|
-
return obj && obj.__esModule ? obj : {
|
|
40
|
-
default: obj
|
|
41
|
-
};
|
|
42
|
-
}
|
|
26
|
+
_export_star._(require("./react"), exports);
|
|
43
27
|
const ssr = (config) => {
|
|
44
28
|
return {
|
|
45
29
|
name: "@modern-js/plugin-ssr",
|
|
@@ -13,27 +13,11 @@ _export(exports, {
|
|
|
13
13
|
ssr: () => ssr,
|
|
14
14
|
default: () => _default
|
|
15
15
|
});
|
|
16
|
+
const _export_star = require("@swc/helpers/_/_export_star");
|
|
17
|
+
const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
16
18
|
const _utils = require("./utils");
|
|
17
|
-
const _serverRender = /* @__PURE__ */ _interop_require_default(require("./serverRender"));
|
|
18
|
-
_export_star(require("./react"), exports);
|
|
19
|
-
function _export_star(from, to) {
|
|
20
|
-
Object.keys(from).forEach(function(k) {
|
|
21
|
-
if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
|
|
22
|
-
Object.defineProperty(to, k, {
|
|
23
|
-
enumerable: true,
|
|
24
|
-
get: function() {
|
|
25
|
-
return from[k];
|
|
26
|
-
}
|
|
27
|
-
});
|
|
28
|
-
}
|
|
29
|
-
});
|
|
30
|
-
return from;
|
|
31
|
-
}
|
|
32
|
-
function _interop_require_default(obj) {
|
|
33
|
-
return obj && obj.__esModule ? obj : {
|
|
34
|
-
default: obj
|
|
35
|
-
};
|
|
36
|
-
}
|
|
19
|
+
const _serverRender = /* @__PURE__ */ _interop_require_default._(require("./serverRender"));
|
|
20
|
+
_export_star._(require("./react"), exports);
|
|
37
21
|
const ssr = (config = {}) => {
|
|
38
22
|
return {
|
|
39
23
|
name: "@modern-js/plugin-ssr",
|
|
@@ -6,47 +6,8 @@ Object.defineProperty(exports, "NoSSR", {
|
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: () => NoSSR
|
|
8
8
|
});
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
if (typeof WeakMap !== "function")
|
|
12
|
-
return null;
|
|
13
|
-
var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
|
|
14
|
-
var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
|
|
15
|
-
return (_getRequireWildcardCache = function(nodeInterop2) {
|
|
16
|
-
return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
|
|
17
|
-
})(nodeInterop);
|
|
18
|
-
}
|
|
19
|
-
function _interop_require_wildcard(obj, nodeInterop) {
|
|
20
|
-
if (!nodeInterop && obj && obj.__esModule) {
|
|
21
|
-
return obj;
|
|
22
|
-
}
|
|
23
|
-
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
24
|
-
return {
|
|
25
|
-
default: obj
|
|
26
|
-
};
|
|
27
|
-
}
|
|
28
|
-
var cache = _getRequireWildcardCache(nodeInterop);
|
|
29
|
-
if (cache && cache.has(obj)) {
|
|
30
|
-
return cache.get(obj);
|
|
31
|
-
}
|
|
32
|
-
var newObj = {};
|
|
33
|
-
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
34
|
-
for (var key in obj) {
|
|
35
|
-
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
36
|
-
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
37
|
-
if (desc && (desc.get || desc.set)) {
|
|
38
|
-
Object.defineProperty(newObj, key, desc);
|
|
39
|
-
} else {
|
|
40
|
-
newObj[key] = obj[key];
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
newObj.default = obj;
|
|
45
|
-
if (cache) {
|
|
46
|
-
cache.set(obj, newObj);
|
|
47
|
-
}
|
|
48
|
-
return newObj;
|
|
49
|
-
}
|
|
9
|
+
const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
|
|
10
|
+
const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
|
|
50
11
|
let csr = false;
|
|
51
12
|
const NoSSR = (props) => {
|
|
52
13
|
const [isMounted, setMounted] = (0, _react.useState)(csr);
|
|
@@ -6,67 +6,12 @@ Object.defineProperty(exports, "PreRender", {
|
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: () => PreRender
|
|
8
8
|
});
|
|
9
|
-
const
|
|
10
|
-
const
|
|
9
|
+
const _define_property = require("@swc/helpers/_/_define_property");
|
|
10
|
+
const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
11
|
+
const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
|
|
12
|
+
const _reactsideeffect = /* @__PURE__ */ _interop_require_default._(require("react-side-effect"));
|
|
13
|
+
const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
|
|
11
14
|
const _util = require("./util");
|
|
12
|
-
function _define_property(obj, key, value) {
|
|
13
|
-
if (key in obj) {
|
|
14
|
-
Object.defineProperty(obj, key, {
|
|
15
|
-
value,
|
|
16
|
-
enumerable: true,
|
|
17
|
-
configurable: true,
|
|
18
|
-
writable: true
|
|
19
|
-
});
|
|
20
|
-
} else {
|
|
21
|
-
obj[key] = value;
|
|
22
|
-
}
|
|
23
|
-
return obj;
|
|
24
|
-
}
|
|
25
|
-
function _interop_require_default(obj) {
|
|
26
|
-
return obj && obj.__esModule ? obj : {
|
|
27
|
-
default: obj
|
|
28
|
-
};
|
|
29
|
-
}
|
|
30
|
-
function _getRequireWildcardCache(nodeInterop) {
|
|
31
|
-
if (typeof WeakMap !== "function")
|
|
32
|
-
return null;
|
|
33
|
-
var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
|
|
34
|
-
var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
|
|
35
|
-
return (_getRequireWildcardCache = function(nodeInterop2) {
|
|
36
|
-
return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
|
|
37
|
-
})(nodeInterop);
|
|
38
|
-
}
|
|
39
|
-
function _interop_require_wildcard(obj, nodeInterop) {
|
|
40
|
-
if (!nodeInterop && obj && obj.__esModule) {
|
|
41
|
-
return obj;
|
|
42
|
-
}
|
|
43
|
-
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
44
|
-
return {
|
|
45
|
-
default: obj
|
|
46
|
-
};
|
|
47
|
-
}
|
|
48
|
-
var cache = _getRequireWildcardCache(nodeInterop);
|
|
49
|
-
if (cache && cache.has(obj)) {
|
|
50
|
-
return cache.get(obj);
|
|
51
|
-
}
|
|
52
|
-
var newObj = {};
|
|
53
|
-
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
54
|
-
for (var key in obj) {
|
|
55
|
-
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
56
|
-
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
57
|
-
if (desc && (desc.get || desc.set)) {
|
|
58
|
-
Object.defineProperty(newObj, key, desc);
|
|
59
|
-
} else {
|
|
60
|
-
newObj[key] = obj[key];
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
newObj.default = obj;
|
|
65
|
-
if (cache) {
|
|
66
|
-
cache.set(obj, newObj);
|
|
67
|
-
}
|
|
68
|
-
return newObj;
|
|
69
|
-
}
|
|
70
15
|
const PROP_NAMES = {
|
|
71
16
|
INTERVAL: "interval",
|
|
72
17
|
STALE_LIMIT: "staleLimit",
|
|
@@ -138,9 +83,9 @@ function factory(Component) {
|
|
|
138
83
|
});
|
|
139
84
|
}
|
|
140
85
|
}
|
|
141
|
-
_define_property(Spr, "peek", Component.peek);
|
|
142
|
-
_define_property(Spr, "rewind", Component.rewind);
|
|
143
|
-
_define_property(Spr, "config", () => {
|
|
86
|
+
_define_property._(Spr, "peek", Component.peek);
|
|
87
|
+
_define_property._(Spr, "rewind", Component.rewind);
|
|
88
|
+
_define_property._(Spr, "config", () => {
|
|
144
89
|
const mappedState = Component.rewind();
|
|
145
90
|
return mappedState;
|
|
146
91
|
});
|
|
@@ -6,47 +6,8 @@ Object.defineProperty(exports, "WithCallback", {
|
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: () => WithCallback
|
|
8
8
|
});
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
if (typeof WeakMap !== "function")
|
|
12
|
-
return null;
|
|
13
|
-
var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
|
|
14
|
-
var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
|
|
15
|
-
return (_getRequireWildcardCache = function(nodeInterop2) {
|
|
16
|
-
return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
|
|
17
|
-
})(nodeInterop);
|
|
18
|
-
}
|
|
19
|
-
function _interop_require_wildcard(obj, nodeInterop) {
|
|
20
|
-
if (!nodeInterop && obj && obj.__esModule) {
|
|
21
|
-
return obj;
|
|
22
|
-
}
|
|
23
|
-
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
24
|
-
return {
|
|
25
|
-
default: obj
|
|
26
|
-
};
|
|
27
|
-
}
|
|
28
|
-
var cache = _getRequireWildcardCache(nodeInterop);
|
|
29
|
-
if (cache && cache.has(obj)) {
|
|
30
|
-
return cache.get(obj);
|
|
31
|
-
}
|
|
32
|
-
var newObj = {};
|
|
33
|
-
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
34
|
-
for (var key in obj) {
|
|
35
|
-
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
36
|
-
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
37
|
-
if (desc && (desc.get || desc.set)) {
|
|
38
|
-
Object.defineProperty(newObj, key, desc);
|
|
39
|
-
} else {
|
|
40
|
-
newObj[key] = obj[key];
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
newObj.default = obj;
|
|
45
|
-
if (cache) {
|
|
46
|
-
cache.set(obj, newObj);
|
|
47
|
-
}
|
|
48
|
-
return newObj;
|
|
49
|
-
}
|
|
9
|
+
const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
|
|
10
|
+
const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
|
|
50
11
|
const WithCallback = ({ callback, children }) => {
|
|
51
12
|
const once = (0, _react.useRef)(false);
|
|
52
13
|
(0, _react.useLayoutEffect)(() => {
|
|
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "buildShellAfterTemplate", {
|
|
|
7
7
|
get: () => buildShellAfterTemplate
|
|
8
8
|
});
|
|
9
9
|
const _runtimenode = require("@modern-js/utils/runtime-node");
|
|
10
|
+
const _utils = require("../utils");
|
|
10
11
|
const _buildTemplateshare = require("./buildTemplate.share");
|
|
11
12
|
function buildShellAfterTemplate(afterAppTemplate, options) {
|
|
12
13
|
const callbacks = [
|
|
@@ -18,7 +19,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
|
|
|
18
19
|
return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
|
|
19
20
|
function buildSSRDataScript() {
|
|
20
21
|
const { context: { ssrContext, initialData, __i18nData__ }, renderLevel } = options;
|
|
21
|
-
const { request, enableUnsafeCtx } = ssrContext;
|
|
22
|
+
const { request, enableUnsafeCtx, nonce } = ssrContext;
|
|
22
23
|
const unsafeContext = {
|
|
23
24
|
headers: request.headers
|
|
24
25
|
};
|
|
@@ -39,8 +40,11 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
|
|
|
39
40
|
},
|
|
40
41
|
renderLevel
|
|
41
42
|
};
|
|
43
|
+
const attrsStr = (0, _utils.attributesToString)({
|
|
44
|
+
nonce
|
|
45
|
+
});
|
|
42
46
|
return `
|
|
43
|
-
<script>window._SSR_DATA = ${(0, _runtimenode.serializeJson)(SSRData)}</script>
|
|
47
|
+
<script${attrsStr}>window._SSR_DATA = ${(0, _runtimenode.serializeJson)(SSRData)}</script>
|
|
44
48
|
`;
|
|
45
49
|
}
|
|
46
50
|
}
|
|
@@ -6,16 +6,12 @@ Object.defineProperty(exports, "buildShellBeforeTemplate", {
|
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: () => buildShellBeforeTemplate
|
|
8
8
|
});
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const
|
|
9
|
+
const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
10
|
+
const _reacthelmet = /* @__PURE__ */ _interop_require_default._(require("react-helmet"));
|
|
11
|
+
const _router = require("@modern-js/utils/runtime/router");
|
|
12
|
+
const _helmet = /* @__PURE__ */ _interop_require_default._(require("../helmet"));
|
|
12
13
|
const _utils = require("../utils");
|
|
13
14
|
const _buildTemplateshare = require("./buildTemplate.share");
|
|
14
|
-
function _interop_require_default(obj) {
|
|
15
|
-
return obj && obj.__esModule ? obj : {
|
|
16
|
-
default: obj
|
|
17
|
-
};
|
|
18
|
-
}
|
|
19
15
|
function getHeadTemplate(beforeEntryTemplate, context) {
|
|
20
16
|
const callbacks = [
|
|
21
17
|
(headTemplate2) => {
|
|
@@ -39,7 +35,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
|
|
|
39
35
|
}
|
|
40
36
|
const { routeAssets } = routeManifest;
|
|
41
37
|
const cssChunks = [];
|
|
42
|
-
const matches = (0,
|
|
38
|
+
const matches = (0, _router.matchRoutes)(routes, routerContext.location, routerContext.basename);
|
|
43
39
|
matches === null || matches === void 0 ? void 0 : matches.forEach((match, index) => {
|
|
44
40
|
if (!index) {
|
|
45
41
|
return;
|
|
@@ -6,16 +6,12 @@ Object.defineProperty(exports, "render", {
|
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: () => render
|
|
8
8
|
});
|
|
9
|
+
const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
9
10
|
const _react = require("react");
|
|
10
11
|
const _runtimenode = require("@modern-js/utils/runtime-node");
|
|
11
12
|
const _prerender = require("../../react/prerender");
|
|
12
13
|
const _time = require("../time");
|
|
13
|
-
const _renderToPipe = /* @__PURE__ */ _interop_require_default(require("./renderToPipe"));
|
|
14
|
-
function _interop_require_default(obj) {
|
|
15
|
-
return obj && obj.__esModule ? obj : {
|
|
16
|
-
default: obj
|
|
17
|
-
};
|
|
18
|
-
}
|
|
14
|
+
const _renderToPipe = /* @__PURE__ */ _interop_require_default._(require("./renderToPipe"));
|
|
19
15
|
const render = ({ App, context }) => {
|
|
20
16
|
const { ssrContext } = context;
|
|
21
17
|
if (!ssrContext) {
|
|
@@ -12,13 +12,13 @@ const _common = require("../../../common");
|
|
|
12
12
|
const _template = require("./template");
|
|
13
13
|
var ShellChunkStatus;
|
|
14
14
|
(function(ShellChunkStatus2) {
|
|
15
|
-
ShellChunkStatus2[ShellChunkStatus2["
|
|
16
|
-
ShellChunkStatus2[ShellChunkStatus2["
|
|
17
|
-
ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 2] = "FINIESH";
|
|
15
|
+
ShellChunkStatus2[ShellChunkStatus2["START"] = 0] = "START";
|
|
16
|
+
ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 1] = "FINIESH";
|
|
18
17
|
})(ShellChunkStatus || (ShellChunkStatus = {}));
|
|
19
18
|
function renderToPipe(rootElement, context, options) {
|
|
20
|
-
let shellChunkStatus = ShellChunkStatus.
|
|
19
|
+
let shellChunkStatus = ShellChunkStatus.START;
|
|
21
20
|
const { ssrContext } = context;
|
|
21
|
+
const chunkVec = [];
|
|
22
22
|
const forUserPipe = (stream) => {
|
|
23
23
|
return new Promise((resolve) => {
|
|
24
24
|
let renderToPipeableStream;
|
|
@@ -28,6 +28,7 @@ function renderToPipe(rootElement, context, options) {
|
|
|
28
28
|
}
|
|
29
29
|
const { pipe } = renderToPipeableStream(rootElement, {
|
|
30
30
|
...options,
|
|
31
|
+
nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
|
|
31
32
|
onShellReady() {
|
|
32
33
|
var _options_onShellReady;
|
|
33
34
|
const { shellAfter, shellBefore } = (0, _template.getTemplates)(context, _types.RenderLevel.SERVER_RENDER);
|
|
@@ -36,16 +37,13 @@ function renderToPipe(rootElement, context, options) {
|
|
|
36
37
|
transform(chunk, _encoding, callback) {
|
|
37
38
|
try {
|
|
38
39
|
if (shellChunkStatus !== ShellChunkStatus.FINIESH) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
}
|
|
44
|
-
if (shellChunkStatus === ShellChunkStatus.START && concatedChunk.endsWith(_common.ESCAPED_SHELL_STREAM_END_MARK)) {
|
|
45
|
-
concatedChunk = concatedChunk.replace(_common.ESCAPED_SHELL_STREAM_END_MARK, shellAfter);
|
|
40
|
+
chunkVec.push(chunk.toString());
|
|
41
|
+
let concatedChunk = chunkVec.join("");
|
|
42
|
+
if (concatedChunk.endsWith(_common.ESCAPED_SHELL_STREAM_END_MARK)) {
|
|
43
|
+
concatedChunk = concatedChunk.replace(_common.ESCAPED_SHELL_STREAM_END_MARK, "");
|
|
46
44
|
shellChunkStatus = ShellChunkStatus.FINIESH;
|
|
45
|
+
this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
|
|
47
46
|
}
|
|
48
|
-
this.push(concatedChunk);
|
|
49
47
|
} else {
|
|
50
48
|
this.push(chunk);
|
|
51
49
|
}
|
|
@@ -11,12 +11,12 @@ const _common = require("../../../common");
|
|
|
11
11
|
const _template = require("./template");
|
|
12
12
|
var ShellChunkStatus;
|
|
13
13
|
(function(ShellChunkStatus2) {
|
|
14
|
-
ShellChunkStatus2[ShellChunkStatus2["
|
|
15
|
-
ShellChunkStatus2[ShellChunkStatus2["
|
|
16
|
-
ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 2] = "FINIESH";
|
|
14
|
+
ShellChunkStatus2[ShellChunkStatus2["START"] = 0] = "START";
|
|
15
|
+
ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 1] = "FINIESH";
|
|
17
16
|
})(ShellChunkStatus || (ShellChunkStatus = {}));
|
|
18
17
|
function renderToPipe(rootElement, context, options) {
|
|
19
|
-
let shellChunkStatus = ShellChunkStatus.
|
|
18
|
+
let shellChunkStatus = ShellChunkStatus.START;
|
|
19
|
+
const chunkVec = [];
|
|
20
20
|
const { ssrContext } = context;
|
|
21
21
|
const forUserPipe = async () => {
|
|
22
22
|
let renderToReadableStream;
|
|
@@ -28,6 +28,7 @@ function renderToPipe(rootElement, context, options) {
|
|
|
28
28
|
try {
|
|
29
29
|
const readableOriginal = await renderToReadableStream(rootElement, {
|
|
30
30
|
...options,
|
|
31
|
+
nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
|
|
31
32
|
onError(error) {
|
|
32
33
|
var _options_onError;
|
|
33
34
|
ssrContext.logger.error("An error occurs during streaming SSR", error);
|
|
@@ -45,14 +46,13 @@ function renderToPipe(rootElement, context, options) {
|
|
|
45
46
|
return;
|
|
46
47
|
}
|
|
47
48
|
if (shellChunkStatus !== ShellChunkStatus.FINIESH) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
if (shellChunkStatus === ShellChunkStatus.START && concatedChunk.endsWith(_common.ESCAPED_SHELL_STREAM_END_MARK)) {
|
|
54
|
-
concatedChunk = concatedChunk.replace(_common.ESCAPED_SHELL_STREAM_END_MARK, shellAfter);
|
|
49
|
+
const chunk = new TextDecoder().decode(value);
|
|
50
|
+
chunkVec.push(chunk);
|
|
51
|
+
let concatedChunk = chunkVec.join("");
|
|
52
|
+
if (concatedChunk.endsWith(_common.ESCAPED_SHELL_STREAM_END_MARK)) {
|
|
53
|
+
concatedChunk = concatedChunk.replace(_common.ESCAPED_SHELL_STREAM_END_MARK, "");
|
|
55
54
|
shellChunkStatus = ShellChunkStatus.FINIESH;
|
|
55
|
+
controller.enqueue(encodeForWebStream(`${shellBefore}${concatedChunk}${shellAfter}`));
|
|
56
56
|
}
|
|
57
57
|
controller.enqueue(encodeForWebStream(concatedChunk));
|
|
58
58
|
} else {
|