@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
|
@@ -1,40 +1,53 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var DeferredDataScripts_node_exports = {};
|
|
20
|
+
__export(DeferredDataScripts_node_exports, {
|
|
21
|
+
default: () => DeferredDataScripts_node_default
|
|
10
22
|
});
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
23
|
+
module.exports = __toCommonJS(DeferredDataScripts_node_exports);
|
|
24
|
+
var import_jsx_runtime = require("react/jsx-runtime");
|
|
25
|
+
var import_react = require("react");
|
|
26
|
+
var import_router = require("@modern-js/runtime-utils/router");
|
|
27
|
+
var import_node = require("@modern-js/runtime-utils/node");
|
|
28
|
+
var import_common = require("../../common");
|
|
29
|
+
var import_utils = require("./utils");
|
|
17
30
|
const setupFnStr = `function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};`;
|
|
18
31
|
const resolveFnStr = `function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};`;
|
|
19
32
|
const preResolvedFnStr = `function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};`;
|
|
20
33
|
const DeferredDataScripts = (props) => {
|
|
21
|
-
const context = (0,
|
|
34
|
+
const context = (0, import_react.useContext)(import_router.UNSAFE_DataRouterContext);
|
|
22
35
|
const { staticContext } = context || {};
|
|
23
|
-
const hydratedRef = (0,
|
|
24
|
-
(0,
|
|
36
|
+
const hydratedRef = (0, import_react.useRef)(false);
|
|
37
|
+
(0, import_react.useEffect)(() => {
|
|
25
38
|
hydratedRef.current = true;
|
|
26
39
|
}, []);
|
|
27
|
-
const deferredScripts = (0,
|
|
40
|
+
const deferredScripts = (0, import_react.useMemo)(() => {
|
|
28
41
|
if (!staticContext) {
|
|
29
42
|
return null;
|
|
30
43
|
}
|
|
31
44
|
const activeDeferreds = staticContext.activeDeferreds || [];
|
|
32
45
|
const _ROUTER_DATA = {
|
|
33
46
|
loaderData: staticContext.loaderData,
|
|
34
|
-
errors: (0,
|
|
47
|
+
errors: (0, import_utils.serializeErrors)(staticContext.errors)
|
|
35
48
|
};
|
|
36
49
|
let initialScripts = [
|
|
37
|
-
`_ROUTER_DATA = ${(0,
|
|
50
|
+
`_ROUTER_DATA = ${(0, import_node.serializeJson)(_ROUTER_DATA)};`,
|
|
38
51
|
`_ROUTER_DATA.s = ${setupFnStr}`,
|
|
39
52
|
`_ROUTER_DATA.r = ${resolveFnStr}`,
|
|
40
53
|
`_ROUTER_DATA.p = ${preResolvedFnStr}`
|
|
@@ -45,7 +58,7 @@ const DeferredDataScripts = (props) => {
|
|
|
45
58
|
const { deferredKeys } = deferredData;
|
|
46
59
|
const deferredKeyPromiseStr = deferredKeys.map((key) => {
|
|
47
60
|
if (pendingKeys.has(key)) {
|
|
48
|
-
deferredDataScripts.push(/* @__PURE__ */ (0,
|
|
61
|
+
deferredDataScripts.push(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DeferredDataScript, {
|
|
49
62
|
nonce: props === null || props === void 0 ? void 0 : props.nonce,
|
|
50
63
|
data: deferredData.data[key],
|
|
51
64
|
dataKey: key,
|
|
@@ -59,12 +72,12 @@ const DeferredDataScripts = (props) => {
|
|
|
59
72
|
message: trackedPromise._error.message,
|
|
60
73
|
stack: process.env.NODE_ENV !== "production" ? trackedPromise._error.stack : void 0
|
|
61
74
|
};
|
|
62
|
-
return `${JSON.stringify(key)}: _ROUTER_DATA.p(${void 0}, ${(0,
|
|
75
|
+
return `${JSON.stringify(key)}: _ROUTER_DATA.p(${void 0}, ${(0, import_node.serializeJson)(error)})`;
|
|
63
76
|
} else {
|
|
64
77
|
if (typeof trackedPromise._data === "undefined") {
|
|
65
78
|
throw new Error(`The deferred data for ${key} was not resolved, did you forget to return data from a deferred promise`);
|
|
66
79
|
}
|
|
67
|
-
return `${JSON.stringify(key)}: _ROUTER_DATA.p(${(0,
|
|
80
|
+
return `${JSON.stringify(key)}: _ROUTER_DATA.p(${(0, import_node.serializeJson)(trackedPromise._data)})`;
|
|
68
81
|
}
|
|
69
82
|
}
|
|
70
83
|
}).join(",\n");
|
|
@@ -78,9 +91,9 @@ const DeferredDataScripts = (props) => {
|
|
|
78
91
|
if (!deferredScripts) {
|
|
79
92
|
return null;
|
|
80
93
|
}
|
|
81
|
-
return /* @__PURE__ */ (0,
|
|
94
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
|
|
82
95
|
children: [
|
|
83
|
-
!hydratedRef.current && /* @__PURE__ */ (0,
|
|
96
|
+
!hydratedRef.current && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
|
|
84
97
|
async: true,
|
|
85
98
|
nonce: props === null || props === void 0 ? void 0 : props.nonce,
|
|
86
99
|
suppressHydrationWarning: true,
|
|
@@ -89,41 +102,41 @@ const DeferredDataScripts = (props) => {
|
|
|
89
102
|
}
|
|
90
103
|
}),
|
|
91
104
|
!hydratedRef.current && deferredScripts[1],
|
|
92
|
-
|
|
105
|
+
import_common.JSX_SHELL_STREAM_END_MARK
|
|
93
106
|
]
|
|
94
107
|
});
|
|
95
108
|
};
|
|
96
109
|
const DeferredDataScript = ({ data, routeId, dataKey, nonce }) => {
|
|
97
|
-
return /* @__PURE__ */ (0,
|
|
98
|
-
children: typeof document === "undefined" && data && dataKey && routeId ? /* @__PURE__ */ (0,
|
|
110
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, {
|
|
111
|
+
children: typeof document === "undefined" && data && dataKey && routeId ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_router.Await, {
|
|
99
112
|
resolve: data,
|
|
100
|
-
errorElement: /* @__PURE__ */ (0,
|
|
113
|
+
errorElement: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorDeferredDataScript, {
|
|
101
114
|
routeId,
|
|
102
115
|
dataKey,
|
|
103
116
|
nonce
|
|
104
117
|
}),
|
|
105
|
-
children: (data2) => /* @__PURE__ */ (0,
|
|
118
|
+
children: (data2) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
|
|
106
119
|
async: true,
|
|
107
120
|
nonce,
|
|
108
121
|
suppressHydrationWarning: true,
|
|
109
122
|
dangerouslySetInnerHTML: {
|
|
110
|
-
__html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${(0,
|
|
123
|
+
__html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${(0, import_node.serializeJson)(data2)});`
|
|
111
124
|
}
|
|
112
125
|
})
|
|
113
126
|
}) : null
|
|
114
127
|
});
|
|
115
128
|
};
|
|
116
129
|
const ErrorDeferredDataScript = ({ routeId, dataKey, nonce }) => {
|
|
117
|
-
const error = (0,
|
|
118
|
-
return /* @__PURE__ */ (0,
|
|
130
|
+
const error = (0, import_router.useAsyncError)();
|
|
131
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
|
|
119
132
|
nonce,
|
|
120
133
|
suppressHydrationWarning: true,
|
|
121
134
|
dangerouslySetInnerHTML: {
|
|
122
|
-
__html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${void 0}, ${(0,
|
|
135
|
+
__html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${void 0}, ${(0, import_node.serializeJson)({
|
|
123
136
|
message: error.message,
|
|
124
137
|
stack: error.stack
|
|
125
138
|
})});`
|
|
126
139
|
}
|
|
127
140
|
});
|
|
128
141
|
};
|
|
129
|
-
|
|
142
|
+
var DeferredDataScripts_node_default = DeferredDataScripts;
|
|
@@ -1,30 +1,42 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
6
9
|
for (var name in all)
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return composeEventHandlers;
|
|
15
|
-
},
|
|
16
|
-
Link: function() {
|
|
17
|
-
return Link;
|
|
18
|
-
},
|
|
19
|
-
NavLink: function() {
|
|
20
|
-
return NavLink;
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
21
17
|
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var PrefetchLink_exports = {};
|
|
30
|
+
__export(PrefetchLink_exports, {
|
|
31
|
+
Link: () => Link,
|
|
32
|
+
NavLink: () => NavLink,
|
|
33
|
+
composeEventHandlers: () => composeEventHandlers
|
|
22
34
|
});
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
35
|
+
module.exports = __toCommonJS(PrefetchLink_exports);
|
|
36
|
+
var import_jsx_runtime = require("react/jsx-runtime");
|
|
37
|
+
var import_react = __toESM(require("react"));
|
|
38
|
+
var import_router = require("@modern-js/runtime-utils/router");
|
|
39
|
+
var import_core = require("../../core");
|
|
28
40
|
function composeEventHandlers(theirHandler, ourHandler) {
|
|
29
41
|
return (event) => {
|
|
30
42
|
theirHandler === null || theirHandler === void 0 ? void 0 : theirHandler(event);
|
|
@@ -35,10 +47,10 @@ function composeEventHandlers(theirHandler, ourHandler) {
|
|
|
35
47
|
}
|
|
36
48
|
const ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
|
|
37
49
|
function usePrefetchBehavior(prefetch, theirElementProps) {
|
|
38
|
-
const [maybePrefetch, setMaybePrefetch] =
|
|
39
|
-
const [shouldPrefetch, setShouldPrefetch] =
|
|
50
|
+
const [maybePrefetch, setMaybePrefetch] = import_react.default.useState(false);
|
|
51
|
+
const [shouldPrefetch, setShouldPrefetch] = import_react.default.useState(false);
|
|
40
52
|
const { onFocus, onBlur, onMouseEnter, onMouseLeave, onTouchStart } = theirElementProps;
|
|
41
|
-
|
|
53
|
+
import_react.default.useEffect(() => {
|
|
42
54
|
if (prefetch === "render") {
|
|
43
55
|
setShouldPrefetch(true);
|
|
44
56
|
}
|
|
@@ -56,7 +68,7 @@ function usePrefetchBehavior(prefetch, theirElementProps) {
|
|
|
56
68
|
setShouldPrefetch(false);
|
|
57
69
|
}
|
|
58
70
|
};
|
|
59
|
-
|
|
71
|
+
import_react.default.useEffect(() => {
|
|
60
72
|
if (maybePrefetch) {
|
|
61
73
|
const id = setTimeout(() => {
|
|
62
74
|
setShouldPrefetch(true);
|
|
@@ -109,7 +121,7 @@ const getRequestUrl = (pathname, routeId) => {
|
|
|
109
121
|
return url;
|
|
110
122
|
};
|
|
111
123
|
const createDataHref = (href) => {
|
|
112
|
-
return /* @__PURE__ */ (0,
|
|
124
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("link", {
|
|
113
125
|
rel: "prefetch",
|
|
114
126
|
as: "fetch",
|
|
115
127
|
href
|
|
@@ -122,26 +134,26 @@ const getDataHref = (route, pathname, basename) => {
|
|
|
122
134
|
return createDataHref(url.toString());
|
|
123
135
|
};
|
|
124
136
|
const PrefetchPageLinks = ({ pathname }) => {
|
|
125
|
-
const context = (0,
|
|
137
|
+
const context = (0, import_react.useContext)(import_core.RuntimeReactContext);
|
|
126
138
|
const { routeManifest, routes } = context;
|
|
127
139
|
const { routeAssets } = routeManifest || {};
|
|
128
|
-
const matches = Array.isArray(routes) ? (0,
|
|
140
|
+
const matches = Array.isArray(routes) ? (0, import_router.matchRoutes)(routes, pathname) : [];
|
|
129
141
|
if (Array.isArray(matches) && routeAssets) {
|
|
130
142
|
matches === null || matches === void 0 ? void 0 : matches.forEach((match) => loadRouteModule(match.route, routeAssets));
|
|
131
143
|
}
|
|
132
144
|
if (!window._SSR_DATA) {
|
|
133
145
|
return null;
|
|
134
146
|
}
|
|
135
|
-
return /* @__PURE__ */ (0,
|
|
147
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PrefetchDataLinks, {
|
|
136
148
|
matches,
|
|
137
149
|
pathname,
|
|
138
150
|
routeManifest
|
|
139
151
|
});
|
|
140
152
|
};
|
|
141
153
|
const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
|
|
142
|
-
const currentMatches = (0,
|
|
143
|
-
const basename = (0,
|
|
144
|
-
const dataHrefs = (0,
|
|
154
|
+
const currentMatches = (0, import_router.useMatches)();
|
|
155
|
+
const basename = (0, import_router.useHref)("/");
|
|
156
|
+
const dataHrefs = (0, import_react.useMemo)(() => {
|
|
145
157
|
return matches === null || matches === void 0 ? void 0 : matches.filter((match, index) => {
|
|
146
158
|
if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
|
|
147
159
|
return false;
|
|
@@ -163,32 +175,38 @@ const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
|
|
|
163
175
|
pathname,
|
|
164
176
|
routeManifest
|
|
165
177
|
]);
|
|
166
|
-
return /* @__PURE__ */ (0,
|
|
178
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
|
|
167
179
|
children: dataHrefs
|
|
168
180
|
});
|
|
169
181
|
};
|
|
170
182
|
const createPrefetchLink = (Link2) => {
|
|
171
|
-
return /* @__PURE__ */
|
|
183
|
+
return /* @__PURE__ */ import_react.default.forwardRef(({ to, prefetch = "none", ...props }, forwardedRef) => {
|
|
172
184
|
const isAbsolute = typeof to === "string" && ABSOLUTE_URL_REGEX.test(to);
|
|
173
185
|
const [shouldPrefetch, prefetchHandlers] = usePrefetchBehavior(prefetch, props);
|
|
174
|
-
const resolvedPath = (0,
|
|
186
|
+
const resolvedPath = (0, import_router.useResolvedPath)(to);
|
|
175
187
|
const { pathname } = resolvedPath;
|
|
176
|
-
return /* @__PURE__ */ (0,
|
|
188
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
|
|
177
189
|
children: [
|
|
178
|
-
/* @__PURE__ */ (0,
|
|
190
|
+
/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Link2, {
|
|
179
191
|
ref: forwardedRef,
|
|
180
192
|
to,
|
|
181
193
|
...props,
|
|
182
194
|
...prefetchHandlers
|
|
183
195
|
}),
|
|
184
|
-
shouldPrefetch && __webpack_chunk_load__ && !isAbsolute ? /* @__PURE__ */ (0,
|
|
196
|
+
shouldPrefetch && __webpack_chunk_load__ && !isAbsolute ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PrefetchPageLinks, {
|
|
185
197
|
pathname
|
|
186
198
|
}) : null
|
|
187
199
|
]
|
|
188
200
|
});
|
|
189
201
|
});
|
|
190
202
|
};
|
|
191
|
-
const Link = createPrefetchLink(
|
|
203
|
+
const Link = createPrefetchLink(import_router.Link);
|
|
192
204
|
Link.displayName = "Link";
|
|
193
|
-
const NavLink = createPrefetchLink(
|
|
205
|
+
const NavLink = createPrefetchLink(import_router.NavLink);
|
|
194
206
|
NavLink.displayName = "NavLink";
|
|
207
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
208
|
+
0 && (module.exports = {
|
|
209
|
+
Link,
|
|
210
|
+
NavLink,
|
|
211
|
+
composeEventHandlers
|
|
212
|
+
});
|
|
@@ -1,12 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var fetch_exports = {};
|
|
20
|
+
__export(fetch_exports, {
|
|
21
|
+
installGlobals: () => installGlobals
|
|
10
22
|
});
|
|
23
|
+
module.exports = __toCommonJS(fetch_exports);
|
|
11
24
|
function installGlobals() {
|
|
12
25
|
}
|
|
26
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
27
|
+
0 && (module.exports = {
|
|
28
|
+
installGlobals
|
|
29
|
+
});
|
|
@@ -1,11 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var fetch_node_exports = {};
|
|
20
|
+
__export(fetch_node_exports, {
|
|
21
|
+
installGlobals: () => import_node.installGlobals
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(fetch_node_exports);
|
|
24
|
+
var import_node = require("@remix-run/node");
|
|
25
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
26
|
+
0 && (module.exports = {
|
|
27
|
+
installGlobals
|
|
10
28
|
});
|
|
11
|
-
const _node = require("@remix-run/node");
|
|
@@ -1,12 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var fetch_worker_exports = {};
|
|
20
|
+
__export(fetch_worker_exports, {
|
|
21
|
+
installGlobals: () => installGlobals
|
|
10
22
|
});
|
|
23
|
+
module.exports = __toCommonJS(fetch_worker_exports);
|
|
11
24
|
function installGlobals() {
|
|
12
25
|
}
|
|
26
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
27
|
+
0 && (module.exports = {
|
|
28
|
+
installGlobals
|
|
29
|
+
});
|
|
@@ -1,12 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var hooks_exports = {};
|
|
20
|
+
__export(hooks_exports, {
|
|
21
|
+
modifyRoutes: () => modifyRoutes
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(hooks_exports);
|
|
24
|
+
var import_plugin = require("@modern-js/plugin");
|
|
25
|
+
const modifyRoutes = (0, import_plugin.createWaterfall)();
|
|
26
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
27
|
+
0 && (module.exports = {
|
|
28
|
+
modifyRoutes
|
|
10
29
|
});
|
|
11
|
-
const _plugin = require("@modern-js/plugin");
|
|
12
|
-
const modifyRoutes = (0, _plugin.createWaterfall)();
|