@modern-js/runtime 2.35.1 → 2.37.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/dist/cjs/cli/index.js +48 -30
- package/dist/cjs/common.js +27 -18
- package/dist/cjs/config.js +15 -3
- package/dist/cjs/core/appConfig.js +25 -15
- package/dist/cjs/core/compatible.js +60 -43
- package/dist/cjs/core/index.js +47 -40
- package/dist/cjs/core/loader/index.js +35 -9
- package/dist/cjs/core/loader/loaderManager.js +37 -18
- package/dist/cjs/core/loader/useLoader.js +45 -23
- package/dist/cjs/core/plugin.js +39 -31
- package/dist/cjs/core/types.js +15 -3
- package/dist/cjs/document/Body.js +35 -19
- package/dist/cjs/document/Comment.js +29 -14
- package/dist/cjs/document/DocumentContext.js +36 -10
- package/dist/cjs/document/DocumentStructureContext.js +36 -10
- package/dist/cjs/document/Head.js +40 -31
- package/dist/cjs/document/Html.js +34 -19
- package/dist/cjs/document/Links.js +28 -13
- package/dist/cjs/document/Root.js +37 -28
- package/dist/cjs/document/Script.js +29 -14
- package/dist/cjs/document/Scripts.js +28 -13
- package/dist/cjs/document/Style.js +29 -14
- package/dist/cjs/document/cli/index.js +68 -51
- package/dist/cjs/document/constants.js +64 -72
- package/dist/cjs/document/index.js +42 -15
- package/dist/cjs/exports/head.js +38 -11
- package/dist/cjs/exports/loadable.js +38 -11
- package/dist/cjs/exports/server.js +24 -7
- package/dist/cjs/exports/styled.js +38 -11
- package/dist/cjs/index.js +41 -38
- package/dist/cjs/router/cli/index.js +31 -22
- package/dist/cjs/router/index.js +39 -18
- package/dist/cjs/router/runtime/DefaultNotFound.js +26 -11
- package/dist/cjs/router/runtime/DeferredDataScripts.js +21 -8
- package/dist/cjs/router/runtime/DeferredDataScripts.node.js +47 -34
- package/dist/cjs/router/runtime/PrefetchLink.js +81 -47
- package/dist/cjs/router/runtime/fetch.js +24 -7
- package/dist/cjs/router/runtime/fetch.node.js +25 -8
- package/dist/cjs/router/runtime/fetch.worker.js +24 -7
- package/dist/cjs/router/runtime/hooks.js +26 -9
- package/dist/cjs/router/runtime/index.js +158 -208
- package/dist/cjs/router/runtime/plugin.js +62 -46
- package/dist/cjs/router/runtime/plugin.node.js +65 -48
- package/dist/cjs/router/runtime/server.js +20 -4
- package/dist/cjs/router/runtime/shouldRevalidate.js +38 -0
- package/dist/cjs/router/runtime/types.js +15 -3
- package/dist/cjs/router/runtime/utils.js +61 -48
- package/dist/cjs/router/runtime/withRouter.js +30 -15
- package/dist/cjs/runtimeContext.js +28 -18
- package/dist/cjs/ssr/cli/babel-plugin-ssr-loader-id.js +40 -23
- package/dist/cjs/ssr/cli/index.js +48 -30
- package/dist/cjs/ssr/cli/loadable-bundler-plugin.js +31 -13
- package/dist/cjs/ssr/index.js +71 -52
- package/dist/cjs/ssr/index.node.js +44 -25
- package/dist/cjs/ssr/prefetch.js +29 -16
- package/dist/cjs/ssr/react/index.js +27 -17
- package/dist/cjs/ssr/react/nossr/index.js +38 -12
- package/dist/cjs/ssr/react/prerender/index.js +52 -27
- package/dist/cjs/ssr/react/prerender/type.js +15 -3
- package/dist/cjs/ssr/react/prerender/util.js +31 -24
- package/dist/cjs/ssr/react/withCallback/index.js +27 -11
- package/dist/cjs/ssr/serverRender/helmet.js +23 -15
- package/dist/cjs/ssr/serverRender/index.js +24 -11
- package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.after.js +30 -13
- package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.share.js +25 -15
- package/dist/cjs/ssr/serverRender/renderToStream/bulidTemplate.before.js +46 -20
- package/dist/cjs/ssr/serverRender/renderToStream/index.js +49 -23
- package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.js +30 -17
- package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.worker.js +30 -17
- package/dist/cjs/ssr/serverRender/renderToStream/template.js +28 -11
- package/dist/cjs/ssr/serverRender/renderToString/buildHtml.js +31 -24
- package/dist/cjs/ssr/serverRender/renderToString/entry.js +81 -59
- package/dist/cjs/ssr/serverRender/renderToString/index.js +44 -18
- package/dist/cjs/ssr/serverRender/renderToString/loadable.js +33 -16
- package/dist/cjs/ssr/serverRender/renderToString/render.js +39 -13
- package/dist/cjs/ssr/serverRender/renderToString/styledComponent.js +28 -11
- package/dist/cjs/ssr/serverRender/renderToString/type.js +24 -7
- package/dist/cjs/ssr/serverRender/tracker.js +27 -18
- package/dist/cjs/ssr/serverRender/types.js +25 -8
- package/dist/cjs/ssr/serverRender/utils.js +31 -24
- package/dist/cjs/ssr/utils.js +42 -25
- package/dist/cjs/state/cli/index.js +28 -19
- package/dist/cjs/state/index.js +39 -18
- package/dist/cjs/state/plugins.js +46 -29
- package/dist/cjs/state/runtime/index.js +39 -11
- package/dist/cjs/state/runtime/plugin.js +55 -28
- package/dist/esm/cli/index.js +6 -2
- package/dist/esm/common.js +8 -3
- package/dist/esm/config.js +0 -1
- package/dist/esm/core/appConfig.js +6 -2
- package/dist/esm/core/compatible.js +20 -15
- package/dist/esm/core/index.js +13 -3
- package/dist/esm/core/loader/index.js +4 -1
- package/dist/esm/core/loader/loaderManager.js +13 -9
- package/dist/esm/core/loader/useLoader.js +5 -2
- package/dist/esm/core/plugin.js +15 -10
- package/dist/esm/core/types.js +0 -1
- package/dist/esm/document/Body.js +4 -1
- package/dist/esm/document/Comment.js +4 -1
- package/dist/esm/document/DocumentContext.js +4 -1
- package/dist/esm/document/DocumentStructureContext.js +4 -1
- package/dist/esm/document/Head.js +6 -2
- package/dist/esm/document/Html.js +9 -6
- package/dist/esm/document/Links.js +4 -1
- package/dist/esm/document/Root.js +6 -2
- package/dist/esm/document/Script.js +4 -1
- package/dist/esm/document/Scripts.js +4 -1
- package/dist/esm/document/Style.js +4 -1
- package/dist/esm/document/cli/index.js +14 -9
- package/dist/esm/document/constants.js +42 -20
- package/dist/esm/exports/head.js +4 -1
- package/dist/esm/exports/loadable.js +4 -1
- package/dist/esm/exports/server.js +4 -1
- package/dist/esm/exports/styled.js +4 -1
- package/dist/esm/index.js +13 -2
- package/dist/esm/router/cli/index.js +11 -7
- package/dist/esm/router/index.js +6 -2
- package/dist/esm/router/runtime/DefaultNotFound.js +4 -1
- package/dist/esm/router/runtime/DeferredDataScripts.js +4 -1
- package/dist/esm/router/runtime/DeferredDataScripts.node.js +10 -7
- package/dist/esm/router/runtime/PrefetchLink.js +31 -11
- package/dist/esm/router/runtime/fetch.js +3 -1
- package/dist/esm/router/runtime/fetch.node.js +3 -1
- package/dist/esm/router/runtime/fetch.worker.js +3 -1
- package/dist/esm/router/runtime/hooks.js +3 -1
- package/dist/esm/router/runtime/index.js +72 -6
- package/dist/esm/router/runtime/plugin.js +22 -16
- package/dist/esm/router/runtime/plugin.node.js +20 -15
- package/dist/esm/router/runtime/shouldRevalidate.js +14 -0
- package/dist/esm/router/runtime/types.js +0 -1
- package/dist/esm/router/runtime/utils.js +23 -14
- package/dist/esm/router/runtime/withRouter.js +7 -4
- package/dist/esm/runtimeContext.js +6 -2
- package/dist/esm/ssr/cli/babel-plugin-ssr-loader-id.js +107 -98
- package/dist/esm/ssr/cli/index.js +17 -13
- package/dist/esm/ssr/cli/loadable-bundler-plugin.js +105 -96
- package/dist/esm/ssr/index.js +18 -14
- package/dist/esm/ssr/index.node.js +14 -10
- package/dist/esm/ssr/prefetch.js +7 -4
- package/dist/esm/ssr/react/index.js +6 -2
- package/dist/esm/ssr/react/nossr/index.js +4 -1
- package/dist/esm/ssr/react/prerender/index.js +4 -1
- package/dist/esm/ssr/react/prerender/type.js +0 -1
- package/dist/esm/ssr/react/prerender/util.js +12 -5
- package/dist/esm/ssr/react/withCallback/index.js +4 -1
- package/dist/esm/ssr/serverRender/helmet.js +4 -1
- package/dist/esm/ssr/serverRender/index.js +4 -1
- package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.after.js +7 -4
- package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.share.js +6 -2
- package/dist/esm/ssr/serverRender/renderToStream/bulidTemplate.before.js +4 -1
- package/dist/esm/ssr/serverRender/renderToStream/index.js +4 -1
- package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.js +4 -1
- package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.worker.js +4 -1
- package/dist/esm/ssr/serverRender/renderToStream/template.js +6 -3
- package/dist/esm/ssr/serverRender/renderToString/buildHtml.js +12 -5
- package/dist/esm/ssr/serverRender/renderToString/entry.js +5 -3
- package/dist/esm/ssr/serverRender/renderToString/index.js +6 -3
- package/dist/esm/ssr/serverRender/renderToString/loadable.js +5 -2
- package/dist/esm/ssr/serverRender/renderToString/render.js +4 -1
- package/dist/esm/ssr/serverRender/renderToString/styledComponent.js +4 -1
- package/dist/esm/ssr/serverRender/renderToString/type.js +4 -1
- package/dist/esm/ssr/serverRender/tracker.js +8 -3
- package/dist/esm/ssr/serverRender/types.js +3 -1
- package/dist/esm/ssr/serverRender/utils.js +12 -5
- package/dist/esm/ssr/utils.js +13 -7
- package/dist/esm/state/cli/index.js +10 -6
- package/dist/esm/state/index.js +6 -2
- package/dist/esm/state/plugins.js +10 -4
- package/dist/esm/state/runtime/index.js +4 -1
- package/dist/esm/state/runtime/plugin.js +10 -7
- package/dist/esm-node/cli/index.js +6 -2
- package/dist/esm-node/common.js +8 -3
- package/dist/esm-node/config.js +0 -1
- package/dist/esm-node/core/appConfig.js +6 -2
- package/dist/esm-node/core/compatible.js +8 -3
- package/dist/esm-node/core/index.js +13 -3
- package/dist/esm-node/core/loader/index.js +4 -1
- package/dist/esm-node/core/loader/loaderManager.js +6 -2
- package/dist/esm-node/core/loader/useLoader.js +4 -1
- package/dist/esm-node/core/plugin.js +9 -4
- package/dist/esm-node/core/types.js +0 -1
- package/dist/esm-node/document/Body.js +4 -1
- package/dist/esm-node/document/Comment.js +4 -1
- package/dist/esm-node/document/DocumentContext.js +4 -1
- package/dist/esm-node/document/DocumentStructureContext.js +4 -1
- package/dist/esm-node/document/Head.js +6 -2
- package/dist/esm-node/document/Html.js +4 -1
- package/dist/esm-node/document/Links.js +4 -1
- package/dist/esm-node/document/Root.js +6 -2
- package/dist/esm-node/document/Script.js +4 -1
- package/dist/esm-node/document/Scripts.js +4 -1
- package/dist/esm-node/document/Style.js +4 -1
- package/dist/esm-node/document/cli/index.js +8 -3
- package/dist/esm-node/document/constants.js +42 -20
- package/dist/esm-node/exports/head.js +4 -1
- package/dist/esm-node/exports/loadable.js +4 -1
- package/dist/esm-node/exports/server.js +4 -1
- package/dist/esm-node/exports/styled.js +4 -1
- package/dist/esm-node/index.js +13 -2
- package/dist/esm-node/router/cli/index.js +6 -2
- package/dist/esm-node/router/index.js +6 -2
- package/dist/esm-node/router/runtime/DefaultNotFound.js +4 -1
- package/dist/esm-node/router/runtime/DeferredDataScripts.js +4 -1
- package/dist/esm-node/router/runtime/DeferredDataScripts.node.js +4 -1
- package/dist/esm-node/router/runtime/PrefetchLink.js +27 -7
- package/dist/esm-node/router/runtime/fetch.js +3 -1
- package/dist/esm-node/router/runtime/fetch.node.js +3 -1
- package/dist/esm-node/router/runtime/fetch.worker.js +3 -1
- package/dist/esm-node/router/runtime/hooks.js +3 -1
- package/dist/esm-node/router/runtime/index.js +72 -6
- package/dist/esm-node/router/runtime/plugin.js +10 -4
- package/dist/esm-node/router/runtime/plugin.node.js +8 -3
- package/dist/esm-node/router/runtime/shouldRevalidate.js +14 -0
- package/dist/esm-node/router/runtime/types.js +0 -1
- package/dist/esm-node/router/runtime/utils.js +16 -7
- package/dist/esm-node/router/runtime/withRouter.js +4 -1
- package/dist/esm-node/runtimeContext.js +6 -2
- package/dist/esm-node/ssr/cli/babel-plugin-ssr-loader-id.js +108 -99
- package/dist/esm-node/ssr/cli/index.js +6 -2
- package/dist/esm-node/ssr/cli/loadable-bundler-plugin.js +92 -83
- package/dist/esm-node/ssr/index.js +6 -2
- package/dist/esm-node/ssr/index.node.js +6 -2
- package/dist/esm-node/ssr/prefetch.js +4 -1
- package/dist/esm-node/ssr/react/index.js +6 -2
- package/dist/esm-node/ssr/react/nossr/index.js +4 -1
- package/dist/esm-node/ssr/react/prerender/index.js +4 -1
- package/dist/esm-node/ssr/react/prerender/type.js +0 -1
- package/dist/esm-node/ssr/react/prerender/util.js +12 -5
- package/dist/esm-node/ssr/react/withCallback/index.js +4 -1
- package/dist/esm-node/ssr/serverRender/helmet.js +4 -1
- package/dist/esm-node/ssr/serverRender/index.js +4 -1
- package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.after.js +4 -1
- package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.share.js +6 -2
- package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js +4 -1
- package/dist/esm-node/ssr/serverRender/renderToStream/index.js +4 -1
- package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.js +4 -1
- package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.worker.js +4 -1
- package/dist/esm-node/ssr/serverRender/renderToStream/template.js +4 -1
- package/dist/esm-node/ssr/serverRender/renderToString/buildHtml.js +12 -5
- package/dist/esm-node/ssr/serverRender/renderToString/entry.js +3 -1
- package/dist/esm-node/ssr/serverRender/renderToString/index.js +4 -1
- package/dist/esm-node/ssr/serverRender/renderToString/loadable.js +4 -1
- package/dist/esm-node/ssr/serverRender/renderToString/render.js +4 -1
- package/dist/esm-node/ssr/serverRender/renderToString/styledComponent.js +4 -1
- package/dist/esm-node/ssr/serverRender/renderToString/type.js +4 -1
- package/dist/esm-node/ssr/serverRender/tracker.js +8 -3
- package/dist/esm-node/ssr/serverRender/types.js +3 -1
- package/dist/esm-node/ssr/serverRender/utils.js +12 -5
- package/dist/esm-node/ssr/utils.js +10 -4
- package/dist/esm-node/state/cli/index.js +6 -2
- package/dist/esm-node/state/index.js +6 -2
- package/dist/esm-node/state/plugins.js +10 -4
- package/dist/esm-node/state/runtime/index.js +4 -1
- package/dist/esm-node/state/runtime/plugin.js +4 -1
- package/dist/types/router/runtime/index.d.ts +1 -0
- package/dist/types/router/runtime/shouldRevalidate.d.ts +2 -0
- package/package.json +10 -12
- package/dist/cjs/state/types.js +0 -4
- package/dist/esm/state/types.js +0 -1
- package/dist/esm-node/state/types.js +0 -1
- package/dist/types/state/types.d.ts +0 -16
package/dist/esm/ssr/prefetch.js
CHANGED
|
@@ -25,11 +25,11 @@ var prefetch = function() {
|
|
|
25
25
|
].filter(Boolean)
|
|
26
26
|
});
|
|
27
27
|
renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ _jsx(App, {
|
|
28
|
-
context
|
|
28
|
+
context
|
|
29
29
|
})));
|
|
30
30
|
} else {
|
|
31
31
|
renderToStaticMarkup(/* @__PURE__ */ _jsx(App, {
|
|
32
|
-
context
|
|
32
|
+
context
|
|
33
33
|
}));
|
|
34
34
|
}
|
|
35
35
|
}
|
|
@@ -59,7 +59,7 @@ var prefetch = function() {
|
|
|
59
59
|
return [
|
|
60
60
|
2,
|
|
61
61
|
{
|
|
62
|
-
loadersData
|
|
62
|
+
loadersData,
|
|
63
63
|
initialData: context.initialData,
|
|
64
64
|
i18nData: context.__i18nData__,
|
|
65
65
|
// todo: move to plugin state
|
|
@@ -76,4 +76,7 @@ var prefetch = function() {
|
|
|
76
76
|
return _ref.apply(this, arguments);
|
|
77
77
|
};
|
|
78
78
|
}();
|
|
79
|
-
|
|
79
|
+
var prefetch_default = prefetch;
|
|
80
|
+
export {
|
|
81
|
+
prefetch_default as default
|
|
82
|
+
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
|
|
2
2
|
import React, { useEffect, useState } from "react";
|
|
3
3
|
var csr = false;
|
|
4
|
-
|
|
4
|
+
var NoSSR = function(props) {
|
|
5
5
|
var _useState = _sliced_to_array(useState(csr), 2), isMounted = _useState[0], setMounted = _useState[1];
|
|
6
6
|
useEffect(function() {
|
|
7
7
|
csr = true;
|
|
@@ -10,3 +10,6 @@ export var NoSSR = function(props) {
|
|
|
10
10
|
var children = props.children, _props_fallback = props.fallback, fallback = _props_fallback === void 0 ? null : _props_fallback;
|
|
11
11
|
return React.createElement(React.Fragment, null, isMounted ? children : fallback);
|
|
12
12
|
};
|
|
13
|
+
export {
|
|
14
|
+
NoSSR
|
|
15
|
+
};
|
|
@@ -104,4 +104,7 @@ var NullComponent = function() {
|
|
|
104
104
|
return null;
|
|
105
105
|
};
|
|
106
106
|
var SprSideEffects = withSideEffect(reducePropsToState, handleClientStateChange, mapStateOnServer)(NullComponent);
|
|
107
|
-
|
|
107
|
+
var PreRender = factory(SprSideEffects);
|
|
108
|
+
export {
|
|
109
|
+
PreRender
|
|
110
|
+
};
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -2,7 +2,7 @@ var REQUEST_META = [
|
|
|
2
2
|
"header",
|
|
3
3
|
"query"
|
|
4
4
|
];
|
|
5
|
-
|
|
5
|
+
var getInnermostProperty = function getInnermostProperty2(propsList, propName) {
|
|
6
6
|
for (var i = propsList.length - 1; i >= 0; i--) {
|
|
7
7
|
var props = propsList[i];
|
|
8
8
|
if (props.hasOwnProperty(propName)) {
|
|
@@ -11,7 +11,7 @@ export var getInnermostProperty = function getInnermostProperty2(propsList, prop
|
|
|
11
11
|
}
|
|
12
12
|
return null;
|
|
13
13
|
};
|
|
14
|
-
|
|
14
|
+
var getOutermostProperty = function getOutermostProperty2(propsList, propName) {
|
|
15
15
|
var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
|
|
16
16
|
try {
|
|
17
17
|
for (var _iterator = propsList[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
|
|
@@ -36,7 +36,7 @@ export var getOutermostProperty = function getOutermostProperty2(propsList, prop
|
|
|
36
36
|
}
|
|
37
37
|
return null;
|
|
38
38
|
};
|
|
39
|
-
|
|
39
|
+
var aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, propName) {
|
|
40
40
|
var initResult = REQUEST_META.reduce(function(result, next) {
|
|
41
41
|
var key = next;
|
|
42
42
|
result[key] = [];
|
|
@@ -62,7 +62,7 @@ export var aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, prop
|
|
|
62
62
|
return result;
|
|
63
63
|
}, res);
|
|
64
64
|
};
|
|
65
|
-
|
|
65
|
+
var aggMatchesFromPropsList = function aggMatchesFromPropsList2(propsList, propName) {
|
|
66
66
|
var initResult = REQUEST_META.reduce(function(result, next) {
|
|
67
67
|
var key = next;
|
|
68
68
|
result[key] = {};
|
|
@@ -102,6 +102,13 @@ function usefulArray(target) {
|
|
|
102
102
|
}
|
|
103
103
|
return Array.isArray(target) && target.length > 0;
|
|
104
104
|
}
|
|
105
|
-
|
|
105
|
+
function exist(target) {
|
|
106
106
|
return target != null;
|
|
107
107
|
}
|
|
108
|
+
export {
|
|
109
|
+
aggKeysFromPropsList,
|
|
110
|
+
aggMatchesFromPropsList,
|
|
111
|
+
exist,
|
|
112
|
+
getInnermostProperty,
|
|
113
|
+
getOutermostProperty
|
|
114
|
+
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useRef, useLayoutEffect } from "react";
|
|
2
|
-
|
|
2
|
+
var WithCallback = function(param) {
|
|
3
3
|
var callback = param.callback, children = param.children;
|
|
4
4
|
var once = useRef(false);
|
|
5
5
|
useLayoutEffect(function() {
|
|
@@ -13,3 +13,6 @@ export var WithCallback = function(param) {
|
|
|
13
13
|
]);
|
|
14
14
|
return children;
|
|
15
15
|
};
|
|
16
|
+
export {
|
|
17
|
+
WithCallback
|
|
18
|
+
};
|
|
@@ -4,7 +4,7 @@ var RE_BODY_ATTR = /<body[^>]*>/;
|
|
|
4
4
|
var RE_LAST_IN_HEAD = /<\/head>/;
|
|
5
5
|
var RE_TITLE = /<title[^>]*>([\s\S\n\r]*?)<\/title>/;
|
|
6
6
|
var TEST_TITLE_CONTENT = RegExp("(?<=<title[^>]*>)([\\s\\S\\n\\r]*?)([.|\\S])([\\s\\S\\n\\r]*?)(?=<\\/title>)");
|
|
7
|
-
|
|
7
|
+
function helmet(content, helmetData) {
|
|
8
8
|
var result = content;
|
|
9
9
|
var bodyAttributes = helmetData.bodyAttributes.toString();
|
|
10
10
|
if (bodyAttributes) {
|
|
@@ -39,3 +39,6 @@ export default function helmet(content, helmetData) {
|
|
|
39
39
|
}, "");
|
|
40
40
|
return result.replace(RE_LAST_IN_HEAD, "".concat(helmetStr, "</head>"));
|
|
41
41
|
}
|
|
42
|
+
export {
|
|
43
|
+
helmet as default
|
|
44
|
+
};
|
|
@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
|
2
2
|
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
3
3
|
import { isReact18 } from "../utils";
|
|
4
4
|
import { CSS_CHUNKS_PLACEHOLDER } from "./utils";
|
|
5
|
-
|
|
5
|
+
function serverRender(options) {
|
|
6
6
|
return _serverRender.apply(this, arguments);
|
|
7
7
|
}
|
|
8
8
|
function _serverRender() {
|
|
@@ -50,3 +50,6 @@ function _serverRender() {
|
|
|
50
50
|
});
|
|
51
51
|
return _serverRender.apply(this, arguments);
|
|
52
52
|
}
|
|
53
|
+
export {
|
|
54
|
+
serverRender as default
|
|
55
|
+
};
|
|
@@ -2,7 +2,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
|
2
2
|
import { serializeJson } from "@modern-js/runtime-utils/node";
|
|
3
3
|
import { attributesToString } from "../utils";
|
|
4
4
|
import { buildTemplate } from "./buildTemplate.share";
|
|
5
|
-
|
|
5
|
+
function buildShellAfterTemplate(afterAppTemplate, options) {
|
|
6
6
|
var injectSSRDataScript = function injectSSRDataScript2(template) {
|
|
7
7
|
var ssrDataScript = buildSSRDataScript();
|
|
8
8
|
return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
|
|
@@ -14,7 +14,7 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
|
|
|
14
14
|
};
|
|
15
15
|
var SSRData = {
|
|
16
16
|
data: {
|
|
17
|
-
initialData
|
|
17
|
+
initialData,
|
|
18
18
|
i18nData: __i18nData__
|
|
19
19
|
},
|
|
20
20
|
context: {
|
|
@@ -29,10 +29,10 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
|
|
|
29
29
|
url: request.url
|
|
30
30
|
}, enableUnsafeCtx ? unsafeContext : {})
|
|
31
31
|
},
|
|
32
|
-
renderLevel
|
|
32
|
+
renderLevel
|
|
33
33
|
};
|
|
34
34
|
var attrsStr = attributesToString({
|
|
35
|
-
nonce
|
|
35
|
+
nonce
|
|
36
36
|
});
|
|
37
37
|
return "\n <script".concat(attrsStr, ">window._SSR_DATA = ").concat(serializeJson(SSRData), "</script>\n ");
|
|
38
38
|
}
|
|
@@ -42,3 +42,6 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
|
|
|
42
42
|
];
|
|
43
43
|
return buildTemplate(afterAppTemplate, callbacks);
|
|
44
44
|
}
|
|
45
|
+
export {
|
|
46
|
+
buildShellAfterTemplate
|
|
47
|
+
};
|
|
@@ -1,6 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
var HEAD_REG_EXP = /<head(.|\n)*>(.|\n)*<\/head>/;
|
|
2
|
+
function buildTemplate(template, callbacks) {
|
|
3
3
|
return callbacks.reduce(function(template2, buildTemplateCb) {
|
|
4
4
|
return buildTemplateCb(template2);
|
|
5
5
|
}, template);
|
|
6
6
|
}
|
|
7
|
+
export {
|
|
8
|
+
HEAD_REG_EXP,
|
|
9
|
+
buildTemplate
|
|
10
|
+
};
|
|
@@ -53,7 +53,10 @@ function getHeadTemplate(beforeEntryTemplate, context) {
|
|
|
53
53
|
}
|
|
54
54
|
return buildTemplate(headTemplate, callbacks);
|
|
55
55
|
}
|
|
56
|
-
|
|
56
|
+
function buildShellBeforeTemplate(beforeAppTemplate, context) {
|
|
57
57
|
var headTemplate = getHeadTemplate(beforeAppTemplate, context);
|
|
58
58
|
return beforeAppTemplate.replace(HEAD_REG_EXP, headTemplate);
|
|
59
59
|
}
|
|
60
|
+
export {
|
|
61
|
+
buildShellBeforeTemplate
|
|
62
|
+
};
|
|
@@ -6,7 +6,7 @@ import { time } from "@modern-js/runtime-utils/time";
|
|
|
6
6
|
import { PreRender } from "../../react/prerender";
|
|
7
7
|
import { SSRErrors, SSRTimings } from "../tracker";
|
|
8
8
|
import renderToPipe from "./renderToPipe";
|
|
9
|
-
|
|
9
|
+
var render = function(param) {
|
|
10
10
|
var App = param.App, context = param.context;
|
|
11
11
|
var ssrContext = context.ssrContext;
|
|
12
12
|
if (!ssrContext) {
|
|
@@ -49,3 +49,6 @@ export var render = function(param) {
|
|
|
49
49
|
});
|
|
50
50
|
}));
|
|
51
51
|
};
|
|
52
|
+
export {
|
|
53
|
+
render
|
|
54
|
+
};
|
|
@@ -2,16 +2,19 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
|
|
|
2
2
|
import { buildShellAfterTemplate } from "./buildTemplate.after";
|
|
3
3
|
import { buildShellBeforeTemplate } from "./bulidTemplate.before";
|
|
4
4
|
var HTML_SEPARATOR = "<!--<?- html ?>-->";
|
|
5
|
-
|
|
5
|
+
var getTemplates = function(context, renderLevel) {
|
|
6
6
|
var ssrContext = context.ssrContext;
|
|
7
7
|
var _ref = _sliced_to_array(ssrContext.template.split(HTML_SEPARATOR) || [], 2), tmp = _ref[0], beforeAppTemplate = tmp === void 0 ? "" : tmp, tmp1 = _ref[1], afterAppHtmlTemplate = tmp1 === void 0 ? "" : tmp1;
|
|
8
8
|
var builtBeforeTemplate = buildShellBeforeTemplate(beforeAppTemplate, context);
|
|
9
9
|
var builtAfterTemplate = buildShellAfterTemplate(afterAppHtmlTemplate, {
|
|
10
|
-
context
|
|
11
|
-
renderLevel
|
|
10
|
+
context,
|
|
11
|
+
renderLevel
|
|
12
12
|
});
|
|
13
13
|
return {
|
|
14
14
|
shellBefore: builtBeforeTemplate,
|
|
15
15
|
shellAfter: builtAfterTemplate
|
|
16
16
|
};
|
|
17
17
|
};
|
|
18
|
+
export {
|
|
19
|
+
getTemplates
|
|
20
|
+
};
|
|
@@ -1,29 +1,36 @@
|
|
|
1
|
-
|
|
1
|
+
function buildHtml(template, callbacks) {
|
|
2
2
|
return callbacks.reduce(function(tmp, cb) {
|
|
3
3
|
return cb(tmp);
|
|
4
4
|
}, template);
|
|
5
5
|
}
|
|
6
|
-
|
|
6
|
+
function createReplaceHtml(html) {
|
|
7
7
|
var HTML_REG = /<!--<\?-\s*html\s*\?>-->/;
|
|
8
8
|
return function(template) {
|
|
9
9
|
return template.replace(HTML_REG, html);
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
|
-
|
|
12
|
+
function createReplaceSSRDataScript(data) {
|
|
13
13
|
var SSR_DATA_REG = /<!--<\?-\s*SSRDataScript\s*\?>-->/;
|
|
14
14
|
return function(template) {
|
|
15
15
|
return template.replace(SSR_DATA_REG, data);
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
|
-
|
|
18
|
+
function createReplaceChunkJs(js) {
|
|
19
19
|
var CHUNK_JS_REG = /<!--<\?-\s*chunksMap\.js\s*\?>-->/;
|
|
20
20
|
return function(template) {
|
|
21
21
|
return template.replace(CHUNK_JS_REG, js);
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
|
-
|
|
24
|
+
function createReplaceChunkCss(css) {
|
|
25
25
|
var CHUNK_CSS_REG = /<!--<\?-\s*chunksMap\.css\s*\?>-->/;
|
|
26
26
|
return function(template) {
|
|
27
27
|
return template.replace(CHUNK_CSS_REG, css);
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
|
+
export {
|
|
31
|
+
buildHtml,
|
|
32
|
+
createReplaceChunkCss,
|
|
33
|
+
createReplaceChunkJs,
|
|
34
|
+
createReplaceHtml,
|
|
35
|
+
createReplaceSSRDataScript
|
|
36
|
+
};
|
|
@@ -25,7 +25,7 @@ var buildTemplateData = function(context, data, renderLevel, tracker) {
|
|
|
25
25
|
headers: request.headers
|
|
26
26
|
};
|
|
27
27
|
return {
|
|
28
|
-
data
|
|
28
|
+
data,
|
|
29
29
|
context: {
|
|
30
30
|
request: _object_spread({
|
|
31
31
|
params: request.params,
|
|
@@ -38,7 +38,7 @@ var buildTemplateData = function(context, data, renderLevel, tracker) {
|
|
|
38
38
|
sessionId: tracker.sessionId
|
|
39
39
|
}
|
|
40
40
|
},
|
|
41
|
-
renderLevel
|
|
41
|
+
renderLevel
|
|
42
42
|
};
|
|
43
43
|
};
|
|
44
44
|
var Entry = /* @__PURE__ */ function() {
|
|
@@ -231,4 +231,6 @@ var Entry = /* @__PURE__ */ function() {
|
|
|
231
231
|
]);
|
|
232
232
|
return Entry2;
|
|
233
233
|
}();
|
|
234
|
-
export {
|
|
234
|
+
export {
|
|
235
|
+
Entry as default
|
|
236
|
+
};
|
|
@@ -5,7 +5,7 @@ import { time } from "@modern-js/runtime-utils/time";
|
|
|
5
5
|
import { PreRender } from "../../react/prerender";
|
|
6
6
|
import { SSRTimings } from "../tracker";
|
|
7
7
|
import SSREntry from "./entry";
|
|
8
|
-
|
|
8
|
+
var render = function(param) {
|
|
9
9
|
var App = param.App, context = param.context, config = param.config;
|
|
10
10
|
var ssrContext = context.ssrContext;
|
|
11
11
|
return run(ssrContext.request.headers, /* @__PURE__ */ _async_to_generator(function() {
|
|
@@ -15,8 +15,8 @@ export var render = function(param) {
|
|
|
15
15
|
case 0:
|
|
16
16
|
entry = new SSREntry({
|
|
17
17
|
ctx: ssrContext,
|
|
18
|
-
App
|
|
19
|
-
config
|
|
18
|
+
App,
|
|
19
|
+
config
|
|
20
20
|
});
|
|
21
21
|
entry.metrics.emitCounter("app.visit.count", 1);
|
|
22
22
|
end = time();
|
|
@@ -40,3 +40,6 @@ export var render = function(param) {
|
|
|
40
40
|
});
|
|
41
41
|
}));
|
|
42
42
|
};
|
|
43
|
+
export {
|
|
44
|
+
render
|
|
45
|
+
};
|
|
@@ -26,7 +26,7 @@ var LoadableCollector = /* @__PURE__ */ function() {
|
|
|
26
26
|
return comopnent;
|
|
27
27
|
}
|
|
28
28
|
this.extractor = new ChunkExtractor({
|
|
29
|
-
stats
|
|
29
|
+
stats,
|
|
30
30
|
entrypoints: [
|
|
31
31
|
entryName
|
|
32
32
|
]
|
|
@@ -109,6 +109,9 @@ var LoadableCollector = /* @__PURE__ */ function() {
|
|
|
109
109
|
]);
|
|
110
110
|
return LoadableCollector2;
|
|
111
111
|
}();
|
|
112
|
-
|
|
112
|
+
function createLoadableCollector(options) {
|
|
113
113
|
return new LoadableCollector(options);
|
|
114
114
|
}
|
|
115
|
+
export {
|
|
116
|
+
createLoadableCollector
|
|
117
|
+
};
|
|
@@ -27,6 +27,9 @@ var StyledCollector = /* @__PURE__ */ function() {
|
|
|
27
27
|
]);
|
|
28
28
|
return StyledCollector2;
|
|
29
29
|
}();
|
|
30
|
-
|
|
30
|
+
function createStyledCollector(result) {
|
|
31
31
|
return new StyledCollector(result);
|
|
32
32
|
}
|
|
33
|
+
export {
|
|
34
|
+
createStyledCollector
|
|
35
|
+
};
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
|
|
1
|
+
var RenderLevel;
|
|
2
2
|
(function(RenderLevel2) {
|
|
3
3
|
RenderLevel2[RenderLevel2["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
|
|
4
4
|
RenderLevel2[RenderLevel2["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";
|
|
5
5
|
RenderLevel2[RenderLevel2["SERVER_RENDER"] = 2] = "SERVER_RENDER";
|
|
6
6
|
})(RenderLevel || (RenderLevel = {}));
|
|
7
|
+
export {
|
|
8
|
+
RenderLevel
|
|
9
|
+
};
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { _ as _define_property } from "@swc/helpers/_/_define_property";
|
|
2
|
-
|
|
2
|
+
var SSRTimings;
|
|
3
3
|
(function(SSRTimings2) {
|
|
4
4
|
SSRTimings2[SSRTimings2["SSR_RENDER_TOTAL"] = 0] = "SSR_RENDER_TOTAL";
|
|
5
5
|
SSRTimings2[SSRTimings2["SSR_PREFETCH"] = 1] = "SSR_PREFETCH";
|
|
6
6
|
SSRTimings2[SSRTimings2["SSR_RENDER_HTML"] = 2] = "SSR_RENDER_HTML";
|
|
7
7
|
SSRTimings2[SSRTimings2["SSR_RENDER_SHELL"] = 3] = "SSR_RENDER_SHELL";
|
|
8
8
|
})(SSRTimings || (SSRTimings = {}));
|
|
9
|
-
|
|
9
|
+
var SSRErrors;
|
|
10
10
|
(function(SSRErrors2) {
|
|
11
11
|
SSRErrors2[SSRErrors2["PREFETCH"] = 0] = "PREFETCH";
|
|
12
12
|
SSRErrors2[SSRErrors2["RENDER_HTML"] = 1] = "RENDER_HTML";
|
|
@@ -48,7 +48,7 @@ var timings = (_obj1 = {}, _define_property(_obj1, SSRTimings.SSR_PREFETCH, {
|
|
|
48
48
|
}), _define_property(_obj1, SSRTimings.SSR_RENDER_SHELL, {
|
|
49
49
|
reporter: "ssr-render-shell"
|
|
50
50
|
}), _obj1);
|
|
51
|
-
|
|
51
|
+
function createSSRTracker(param) {
|
|
52
52
|
var reporter = param.reporter, serverTiming = param.serverTiming, metrics = param.metrics, logger = param.logger;
|
|
53
53
|
var tracker = {
|
|
54
54
|
get sessionId() {
|
|
@@ -70,3 +70,8 @@ export function createSSRTracker(param) {
|
|
|
70
70
|
};
|
|
71
71
|
return tracker;
|
|
72
72
|
}
|
|
73
|
+
export {
|
|
74
|
+
SSRErrors,
|
|
75
|
+
SSRTimings,
|
|
76
|
+
createSSRTracker
|
|
77
|
+
};
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
var CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
|
|
3
|
+
var SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";
|
|
4
|
+
var ROUTER_DATA_JSON_ID = "__MODERN_ROUTER_DATA__";
|
|
5
|
+
function getLoadableScripts(extractor) {
|
|
6
6
|
var check = function(scripts2) {
|
|
7
7
|
return (scripts2 || "").includes("__LOADABLE_REQUIRED_CHUNKS___ext");
|
|
8
8
|
};
|
|
@@ -14,9 +14,16 @@ export function getLoadableScripts(extractor) {
|
|
|
14
14
|
return "".concat(i, "</script>");
|
|
15
15
|
}).join("");
|
|
16
16
|
}
|
|
17
|
-
|
|
17
|
+
function attributesToString(attributes) {
|
|
18
18
|
return Object.entries(attributes).reduce(function(str, param) {
|
|
19
19
|
var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
|
|
20
20
|
return value === void 0 ? str : "".concat(str, " ").concat(key, '="').concat(value, '"');
|
|
21
21
|
}, "");
|
|
22
22
|
}
|
|
23
|
+
export {
|
|
24
|
+
CSS_CHUNKS_PLACEHOLDER,
|
|
25
|
+
ROUTER_DATA_JSON_ID,
|
|
26
|
+
SSR_DATA_JSON_ID,
|
|
27
|
+
attributesToString,
|
|
28
|
+
getLoadableScripts
|
|
29
|
+
};
|
package/dist/esm/ssr/utils.js
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
2
2
|
import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
|
|
3
3
|
import cookieTool from "cookie";
|
|
4
|
-
|
|
4
|
+
var isReact18 = function() {
|
|
5
5
|
return process.env.IS_REACT18 === "true";
|
|
6
6
|
};
|
|
7
|
-
|
|
7
|
+
var formatServer = function(request) {
|
|
8
8
|
var _ref = request.headers || {}, _ref_cookie = _ref.cookie, cookie = _ref_cookie === void 0 ? "" : _ref_cookie, tmp = _ref["user-agent"], userAgent = tmp === void 0 ? "" : tmp, referer = _ref.referer;
|
|
9
9
|
return _object_spread({
|
|
10
|
-
cookie
|
|
10
|
+
cookie,
|
|
11
11
|
cookieMap: cookieTool.parse(cookie || "") || {},
|
|
12
|
-
userAgent
|
|
13
|
-
referer
|
|
12
|
+
userAgent,
|
|
13
|
+
referer
|
|
14
14
|
}, request);
|
|
15
15
|
};
|
|
16
16
|
var getQuery = function() {
|
|
@@ -22,7 +22,7 @@ var getQuery = function() {
|
|
|
22
22
|
return res;
|
|
23
23
|
}, {});
|
|
24
24
|
};
|
|
25
|
-
|
|
25
|
+
var formatClient = function(request) {
|
|
26
26
|
var _request_headers;
|
|
27
27
|
return {
|
|
28
28
|
params: request.params || {},
|
|
@@ -37,7 +37,7 @@ export var formatClient = function(request) {
|
|
|
37
37
|
url: location.href
|
|
38
38
|
};
|
|
39
39
|
};
|
|
40
|
-
|
|
40
|
+
var mockResponse = function() {
|
|
41
41
|
return {
|
|
42
42
|
setHeader: function setHeader() {
|
|
43
43
|
console.warn("response.setHeader() can only be used in the server side");
|
|
@@ -51,3 +51,9 @@ export var mockResponse = function() {
|
|
|
51
51
|
}
|
|
52
52
|
};
|
|
53
53
|
};
|
|
54
|
+
export {
|
|
55
|
+
formatClient,
|
|
56
|
+
formatServer,
|
|
57
|
+
isReact18,
|
|
58
|
+
mockResponse
|
|
59
|
+
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getEntryOptions, createRuntimeExportsUtils } from "@modern-js/utils";
|
|
2
2
|
var PLUGIN_IDENTIFIER = "state";
|
|
3
|
-
|
|
3
|
+
var statePlugin = function() {
|
|
4
4
|
return {
|
|
5
5
|
name: "@modern-js/plugin-state",
|
|
6
6
|
required: [
|
|
@@ -40,8 +40,8 @@ export var statePlugin = function() {
|
|
|
40
40
|
});
|
|
41
41
|
}
|
|
42
42
|
return {
|
|
43
|
-
entrypoint
|
|
44
|
-
imports
|
|
43
|
+
entrypoint,
|
|
44
|
+
imports
|
|
45
45
|
};
|
|
46
46
|
},
|
|
47
47
|
modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
|
|
@@ -54,8 +54,8 @@ export var statePlugin = function() {
|
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
56
|
return {
|
|
57
|
-
entrypoint
|
|
58
|
-
plugins
|
|
57
|
+
entrypoint,
|
|
58
|
+
plugins
|
|
59
59
|
};
|
|
60
60
|
},
|
|
61
61
|
validateSchema: function validateSchema() {
|
|
@@ -78,4 +78,8 @@ export var statePlugin = function() {
|
|
|
78
78
|
}
|
|
79
79
|
};
|
|
80
80
|
};
|
|
81
|
-
|
|
81
|
+
var cli_default = statePlugin;
|
|
82
|
+
export {
|
|
83
|
+
cli_default as default,
|
|
84
|
+
statePlugin
|
|
85
|
+
};
|
package/dist/esm/state/index.js
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import { default as default2 } from "./runtime";
|
|
2
|
+
import { default as default3 } from "./runtime";
|
|
3
3
|
export * from "./runtime";
|
|
4
|
+
export {
|
|
5
|
+
default3 as default,
|
|
6
|
+
default2 as state
|
|
7
|
+
};
|
|
@@ -1,13 +1,19 @@
|
|
|
1
1
|
import { plugin as effectsPlugin } from "@modern-js-reduck/plugin-effects";
|
|
2
2
|
import autoActionsPlugin from "@modern-js-reduck/plugin-auto-actions";
|
|
3
3
|
import immerPlugin from "@modern-js-reduck/plugin-immutable";
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
import { default as default2 } from "@modern-js-reduck/plugin-devtools";
|
|
5
|
+
var effects = function() {
|
|
6
6
|
return effectsPlugin;
|
|
7
7
|
};
|
|
8
|
-
|
|
8
|
+
var immer = function() {
|
|
9
9
|
return immerPlugin;
|
|
10
10
|
};
|
|
11
|
-
|
|
11
|
+
var autoActions = function() {
|
|
12
12
|
return autoActionsPlugin;
|
|
13
13
|
};
|
|
14
|
+
export {
|
|
15
|
+
autoActions,
|
|
16
|
+
default2 as devtools,
|
|
17
|
+
effects,
|
|
18
|
+
immer
|
|
19
|
+
};
|