@modern-js/runtime 2.35.1 → 2.36.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 +60 -42
- 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 +155 -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/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 +12 -8
- 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 +70 -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/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 +6 -2
- 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 +70 -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/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/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
|
@@ -4,7 +4,7 @@ const RE_BODY_ATTR = /<body[^>]*>/;
|
|
|
4
4
|
const RE_LAST_IN_HEAD = /<\/head>/;
|
|
5
5
|
const RE_TITLE = /<title[^>]*>([\s\S\n\r]*?)<\/title>/;
|
|
6
6
|
const TEST_TITLE_CONTENT = RegExp("(?<=<title[^>]*>)([\\s\\S\\n\\r]*?)([.|\\S])([\\s\\S\\n\\r]*?)(?=<\\/title>)");
|
|
7
|
-
|
|
7
|
+
function helmet(content, helmetData) {
|
|
8
8
|
let result = content;
|
|
9
9
|
const 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, `${helmetStr}</head>`);
|
|
41
41
|
}
|
|
42
|
+
export {
|
|
43
|
+
helmet as default
|
|
44
|
+
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { isReact18 } from "../utils";
|
|
2
2
|
import { CSS_CHUNKS_PLACEHOLDER } from "./utils";
|
|
3
|
-
|
|
3
|
+
async function serverRender(options) {
|
|
4
4
|
var _options_context_ssrContext;
|
|
5
5
|
if ((_options_context_ssrContext = options.context.ssrContext) === null || _options_context_ssrContext === void 0 ? void 0 : _options_context_ssrContext.template) {
|
|
6
6
|
var _options_context_ssrContext1;
|
|
@@ -14,3 +14,6 @@ export default async function serverRender(options) {
|
|
|
14
14
|
return html;
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
+
export {
|
|
18
|
+
serverRender as default
|
|
19
|
+
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { serializeJson } from "@modern-js/runtime-utils/node";
|
|
2
2
|
import { attributesToString } from "../utils";
|
|
3
3
|
import { buildTemplate } from "./buildTemplate.share";
|
|
4
|
-
|
|
4
|
+
function buildShellAfterTemplate(afterAppTemplate, options) {
|
|
5
5
|
const callbacks = [
|
|
6
6
|
injectSSRDataScript
|
|
7
7
|
];
|
|
@@ -44,3 +44,6 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
|
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
+
export {
|
|
48
|
+
buildShellAfterTemplate
|
|
49
|
+
};
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
const HEAD_REG_EXP = /<head(.|\n)*>(.|\n)*<\/head>/;
|
|
2
|
+
function buildTemplate(template, callbacks) {
|
|
3
3
|
return callbacks.reduce((template2, buildTemplateCb) => buildTemplateCb(template2), template);
|
|
4
4
|
}
|
|
5
|
+
export {
|
|
6
|
+
HEAD_REG_EXP,
|
|
7
|
+
buildTemplate
|
|
8
|
+
};
|
|
@@ -48,7 +48,10 @@ function getHeadTemplate(beforeEntryTemplate, context) {
|
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
-
|
|
51
|
+
function buildShellBeforeTemplate(beforeAppTemplate, context) {
|
|
52
52
|
const headTemplate = getHeadTemplate(beforeAppTemplate, context);
|
|
53
53
|
return beforeAppTemplate.replace(HEAD_REG_EXP, headTemplate);
|
|
54
54
|
}
|
|
55
|
+
export {
|
|
56
|
+
buildShellBeforeTemplate
|
|
57
|
+
};
|
|
@@ -4,7 +4,7 @@ import { time } from "@modern-js/runtime-utils/time";
|
|
|
4
4
|
import { PreRender } from "../../react/prerender";
|
|
5
5
|
import { SSRErrors, SSRTimings } from "../tracker";
|
|
6
6
|
import renderToPipe from "./renderToPipe";
|
|
7
|
-
|
|
7
|
+
const render = ({ App, context }) => {
|
|
8
8
|
const { ssrContext } = context;
|
|
9
9
|
if (!ssrContext) {
|
|
10
10
|
throw new Error('The "ssrContext" must not be undefined, but received undefined');
|
|
@@ -40,3 +40,6 @@ export const render = ({ App, context }) => {
|
|
|
40
40
|
return pipe;
|
|
41
41
|
});
|
|
42
42
|
};
|
|
43
|
+
export {
|
|
44
|
+
render
|
|
45
|
+
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { buildShellAfterTemplate } from "./buildTemplate.after";
|
|
2
2
|
import { buildShellBeforeTemplate } from "./bulidTemplate.before";
|
|
3
3
|
const HTML_SEPARATOR = "<!--<?- html ?>-->";
|
|
4
|
-
|
|
4
|
+
const getTemplates = (context, renderLevel) => {
|
|
5
5
|
const { ssrContext } = context;
|
|
6
6
|
const [beforeAppTemplate = "", afterAppHtmlTemplate = ""] = ssrContext.template.split(HTML_SEPARATOR) || [];
|
|
7
7
|
const builtBeforeTemplate = buildShellBeforeTemplate(beforeAppTemplate, context);
|
|
@@ -14,3 +14,6 @@ export const getTemplates = (context, renderLevel) => {
|
|
|
14
14
|
shellAfter: builtAfterTemplate
|
|
15
15
|
};
|
|
16
16
|
};
|
|
17
|
+
export {
|
|
18
|
+
getTemplates
|
|
19
|
+
};
|
|
@@ -1,19 +1,26 @@
|
|
|
1
|
-
|
|
1
|
+
function buildHtml(template, callbacks) {
|
|
2
2
|
return callbacks.reduce((tmp, cb) => cb(tmp), template);
|
|
3
3
|
}
|
|
4
|
-
|
|
4
|
+
function createReplaceHtml(html) {
|
|
5
5
|
const HTML_REG = /<!--<\?-\s*html\s*\?>-->/;
|
|
6
6
|
return (template) => template.replace(HTML_REG, html);
|
|
7
7
|
}
|
|
8
|
-
|
|
8
|
+
function createReplaceSSRDataScript(data) {
|
|
9
9
|
const SSR_DATA_REG = /<!--<\?-\s*SSRDataScript\s*\?>-->/;
|
|
10
10
|
return (template) => template.replace(SSR_DATA_REG, data);
|
|
11
11
|
}
|
|
12
|
-
|
|
12
|
+
function createReplaceChunkJs(js) {
|
|
13
13
|
const CHUNK_JS_REG = /<!--<\?-\s*chunksMap\.js\s*\?>-->/;
|
|
14
14
|
return (template) => template.replace(CHUNK_JS_REG, js);
|
|
15
15
|
}
|
|
16
|
-
|
|
16
|
+
function createReplaceChunkCss(css) {
|
|
17
17
|
const CHUNK_CSS_REG = /<!--<\?-\s*chunksMap\.css\s*\?>-->/;
|
|
18
18
|
return (template) => template.replace(CHUNK_CSS_REG, css);
|
|
19
19
|
}
|
|
20
|
+
export {
|
|
21
|
+
buildHtml,
|
|
22
|
+
createReplaceChunkCss,
|
|
23
|
+
createReplaceChunkJs,
|
|
24
|
+
createReplaceHtml,
|
|
25
|
+
createReplaceSSRDataScript
|
|
26
|
+
};
|
|
@@ -3,7 +3,7 @@ import { time } from "@modern-js/runtime-utils/time";
|
|
|
3
3
|
import { PreRender } from "../../react/prerender";
|
|
4
4
|
import { SSRTimings } from "../tracker";
|
|
5
5
|
import SSREntry from "./entry";
|
|
6
|
-
|
|
6
|
+
const render = ({ App, context, config }) => {
|
|
7
7
|
const ssrContext = context.ssrContext;
|
|
8
8
|
return run(ssrContext.request.headers, async () => {
|
|
9
9
|
const entry = new SSREntry({
|
|
@@ -23,3 +23,6 @@ export const render = ({ App, context, config }) => {
|
|
|
23
23
|
return html;
|
|
24
24
|
});
|
|
25
25
|
};
|
|
26
|
+
export {
|
|
27
|
+
render
|
|
28
|
+
};
|
|
@@ -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,11 +1,11 @@
|
|
|
1
|
-
|
|
1
|
+
var SSRTimings;
|
|
2
2
|
(function(SSRTimings2) {
|
|
3
3
|
SSRTimings2[SSRTimings2["SSR_RENDER_TOTAL"] = 0] = "SSR_RENDER_TOTAL";
|
|
4
4
|
SSRTimings2[SSRTimings2["SSR_PREFETCH"] = 1] = "SSR_PREFETCH";
|
|
5
5
|
SSRTimings2[SSRTimings2["SSR_RENDER_HTML"] = 2] = "SSR_RENDER_HTML";
|
|
6
6
|
SSRTimings2[SSRTimings2["SSR_RENDER_SHELL"] = 3] = "SSR_RENDER_SHELL";
|
|
7
7
|
})(SSRTimings || (SSRTimings = {}));
|
|
8
|
-
|
|
8
|
+
var SSRErrors;
|
|
9
9
|
(function(SSRErrors2) {
|
|
10
10
|
SSRErrors2[SSRErrors2["PREFETCH"] = 0] = "PREFETCH";
|
|
11
11
|
SSRErrors2[SSRErrors2["RENDER_HTML"] = 1] = "RENDER_HTML";
|
|
@@ -55,7 +55,7 @@ const timings = {
|
|
|
55
55
|
reporter: "ssr-render-shell"
|
|
56
56
|
}
|
|
57
57
|
};
|
|
58
|
-
|
|
58
|
+
function createSSRTracker({ reporter, serverTiming, metrics, logger }) {
|
|
59
59
|
const tracker = {
|
|
60
60
|
get sessionId() {
|
|
61
61
|
return reporter.sessionId;
|
|
@@ -76,3 +76,8 @@ export function createSSRTracker({ reporter, serverTiming, metrics, logger }) {
|
|
|
76
76
|
};
|
|
77
77
|
return tracker;
|
|
78
78
|
}
|
|
79
|
+
export {
|
|
80
|
+
SSRErrors,
|
|
81
|
+
SSRTimings,
|
|
82
|
+
createSSRTracker
|
|
83
|
+
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
const CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
|
|
2
|
+
const SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";
|
|
3
|
+
const ROUTER_DATA_JSON_ID = "__MODERN_ROUTER_DATA__";
|
|
4
|
+
function getLoadableScripts(extractor) {
|
|
5
5
|
const check = (scripts2) => (scripts2 || "").includes("__LOADABLE_REQUIRED_CHUNKS___ext");
|
|
6
6
|
const scripts = extractor.getScriptTags();
|
|
7
7
|
if (!check(scripts)) {
|
|
@@ -9,8 +9,15 @@ export function getLoadableScripts(extractor) {
|
|
|
9
9
|
}
|
|
10
10
|
return scripts.split("</script>").slice(0, 2).map((i) => `${i}</script>`).join("");
|
|
11
11
|
}
|
|
12
|
-
|
|
12
|
+
function attributesToString(attributes) {
|
|
13
13
|
return Object.entries(attributes).reduce((str, [key, value]) => {
|
|
14
14
|
return value === void 0 ? str : `${str} ${key}="${value}"`;
|
|
15
15
|
}, "");
|
|
16
16
|
}
|
|
17
|
+
export {
|
|
18
|
+
CSS_CHUNKS_PLACEHOLDER,
|
|
19
|
+
ROUTER_DATA_JSON_ID,
|
|
20
|
+
SSR_DATA_JSON_ID,
|
|
21
|
+
attributesToString,
|
|
22
|
+
getLoadableScripts
|
|
23
|
+
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import cookieTool from "cookie";
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
const isReact18 = () => process.env.IS_REACT18 === "true";
|
|
3
|
+
const formatServer = (request) => {
|
|
4
4
|
const { cookie = "", "user-agent": userAgent = "", referer } = request.headers || {};
|
|
5
5
|
return {
|
|
6
6
|
cookie,
|
|
@@ -17,7 +17,7 @@ const getQuery = () => window.location.search.substring(1).split("&").reduce((re
|
|
|
17
17
|
}
|
|
18
18
|
return res;
|
|
19
19
|
}, {});
|
|
20
|
-
|
|
20
|
+
const formatClient = (request) => {
|
|
21
21
|
var _request_headers;
|
|
22
22
|
return {
|
|
23
23
|
params: request.params || {},
|
|
@@ -35,7 +35,7 @@ export const formatClient = (request) => {
|
|
|
35
35
|
url: location.href
|
|
36
36
|
};
|
|
37
37
|
};
|
|
38
|
-
|
|
38
|
+
const mockResponse = () => {
|
|
39
39
|
return {
|
|
40
40
|
setHeader() {
|
|
41
41
|
console.warn("response.setHeader() can only be used in the server side");
|
|
@@ -49,3 +49,9 @@ export const mockResponse = () => {
|
|
|
49
49
|
}
|
|
50
50
|
};
|
|
51
51
|
};
|
|
52
|
+
export {
|
|
53
|
+
formatClient,
|
|
54
|
+
formatServer,
|
|
55
|
+
isReact18,
|
|
56
|
+
mockResponse
|
|
57
|
+
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getEntryOptions, createRuntimeExportsUtils } from "@modern-js/utils";
|
|
2
2
|
const PLUGIN_IDENTIFIER = "state";
|
|
3
|
-
|
|
3
|
+
const statePlugin = () => ({
|
|
4
4
|
name: "@modern-js/plugin-state",
|
|
5
5
|
required: [
|
|
6
6
|
"@modern-js/runtime"
|
|
@@ -74,4 +74,8 @@ export const statePlugin = () => ({
|
|
|
74
74
|
};
|
|
75
75
|
}
|
|
76
76
|
});
|
|
77
|
-
|
|
77
|
+
var cli_default = statePlugin;
|
|
78
|
+
export {
|
|
79
|
+
cli_default as default,
|
|
80
|
+
statePlugin
|
|
81
|
+
};
|
|
@@ -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,7 +1,13 @@
|
|
|
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
|
-
|
|
6
|
-
|
|
7
|
-
|
|
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
|
+
};
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "2.
|
|
18
|
+
"version": "2.36.0",
|
|
19
19
|
"engines": {
|
|
20
20
|
"node": ">=14.17.6"
|
|
21
21
|
},
|
|
@@ -162,7 +162,6 @@
|
|
|
162
162
|
"@remix-run/node": "^1.12.0",
|
|
163
163
|
"@types/loadable__component": "^5.13.4",
|
|
164
164
|
"@types/react-helmet": "^6.1.2",
|
|
165
|
-
"@types/redux-logger": "^3.0.9",
|
|
166
165
|
"@types/styled-components": "^5.1.14",
|
|
167
166
|
"esbuild": "0.17.19",
|
|
168
167
|
"hoist-non-react-statics": "^3.3.2",
|
|
@@ -170,13 +169,12 @@
|
|
|
170
169
|
"react-helmet": "^6.1.0",
|
|
171
170
|
"react-is": "^18",
|
|
172
171
|
"react-side-effect": "^2.1.1",
|
|
173
|
-
"redux-logger": "^3.0.6",
|
|
174
172
|
"styled-components": "^5.3.1",
|
|
175
173
|
"@swc/helpers": "0.5.1",
|
|
176
|
-
"@modern-js/plugin": "2.
|
|
177
|
-
"@modern-js/types": "2.
|
|
178
|
-
"@modern-js/utils": "2.
|
|
179
|
-
"@modern-js/runtime-utils": "2.
|
|
174
|
+
"@modern-js/plugin": "2.36.0",
|
|
175
|
+
"@modern-js/types": "2.36.0",
|
|
176
|
+
"@modern-js/utils": "2.36.0",
|
|
177
|
+
"@modern-js/runtime-utils": "2.36.0"
|
|
180
178
|
},
|
|
181
179
|
"peerDependencies": {
|
|
182
180
|
"react": ">=17",
|
|
@@ -197,11 +195,11 @@
|
|
|
197
195
|
"ts-jest": "^29.1.0",
|
|
198
196
|
"typescript": "^5",
|
|
199
197
|
"webpack": "^5.88.1",
|
|
200
|
-
"@modern-js/app-tools": "2.
|
|
201
|
-
"@modern-js/core": "2.
|
|
202
|
-
"@modern-js/server-core": "2.
|
|
203
|
-
"@scripts/build": "2.
|
|
204
|
-
"@scripts/jest-config": "2.
|
|
198
|
+
"@modern-js/app-tools": "2.36.0",
|
|
199
|
+
"@modern-js/core": "2.36.0",
|
|
200
|
+
"@modern-js/server-core": "2.36.0",
|
|
201
|
+
"@scripts/build": "2.36.0",
|
|
202
|
+
"@scripts/jest-config": "2.36.0"
|
|
205
203
|
},
|
|
206
204
|
"sideEffects": false,
|
|
207
205
|
"publishConfig": {
|
package/dist/cjs/state/types.js
DELETED
package/dist/esm/state/types.js
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import { createStore } from '@modern-js-reduck/store';
|
|
2
|
-
import { ReduxLoggerOptions } from 'redux-logger';
|
|
3
|
-
export type PluginOptions = Parameters<typeof createStore>[0] & {
|
|
4
|
-
/**
|
|
5
|
-
* If it's false, the logger will be disabled.
|
|
6
|
-
* If it's a object, it means options will pass to createLogger function
|
|
7
|
-
*/
|
|
8
|
-
logger?: false | ReduxLoggerOptions;
|
|
9
|
-
effects?: any;
|
|
10
|
-
/**
|
|
11
|
-
* When it's true, will remove immer plugin
|
|
12
|
-
* @default false
|
|
13
|
-
*/
|
|
14
|
-
disableImmer?: boolean;
|
|
15
|
-
devtools?: any;
|
|
16
|
-
};
|