@modern-js/runtime 2.0.0-beta.4 → 2.0.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/js/modern/document/Body.js +2 -2
- package/dist/js/modern/document/Root.js +1 -1
- package/dist/js/modern/router/cli/index.js +7 -9
- package/dist/js/modern/router/runtime/plugin.js +10 -1
- package/dist/js/modern/router/runtime/utils.js +8 -4
- package/dist/js/modern/ssr/cli/index.js +2 -2
- package/dist/js/node/cli/index.js +13 -11
- package/dist/js/node/common.js +7 -3
- package/dist/js/node/core/app-config.js +8 -3
- package/dist/js/node/core/compatible.js +41 -37
- package/dist/js/node/core/index.js +17 -6
- package/dist/js/node/core/loader/index.js +7 -3
- package/dist/js/node/core/loader/loaderManager.js +19 -14
- package/dist/js/node/core/loader/useLoader.js +22 -22
- package/dist/js/node/core/plugin.js +17 -10
- package/dist/js/node/document/Body.js +8 -4
- package/dist/js/node/document/DocumentContext.js +7 -3
- package/dist/js/node/document/DocumentStructrueContext.js +7 -3
- package/dist/js/node/document/Head.js +8 -3
- package/dist/js/node/document/Html.js +7 -3
- package/dist/js/node/document/Root.js +9 -4
- package/dist/js/node/document/Script.js +7 -3
- package/dist/js/node/document/Scripts.js +7 -3
- package/dist/js/node/document/cli/index.js +28 -28
- package/dist/js/node/document/constants.js +20 -3
- package/dist/js/node/document/index.js +11 -11
- package/dist/js/node/exports/head.js +6 -4
- package/dist/js/node/exports/loadable.js +6 -4
- package/dist/js/node/exports/server.js +7 -3
- package/dist/js/node/exports/styled.js +6 -4
- package/dist/js/node/index.js +15 -3
- package/dist/js/node/router/cli/index.js +29 -31
- package/dist/js/node/router/index.js +8 -4
- package/dist/js/node/router/runtime/DefaultNotFound.js +7 -3
- package/dist/js/node/router/runtime/index.js +9 -5
- package/dist/js/node/router/runtime/plugin.js +34 -22
- package/dist/js/node/router/runtime/plugin.node.js +37 -34
- package/dist/js/node/router/runtime/root/index.js +7 -3
- package/dist/js/node/router/runtime/root/load.js +14 -8
- package/dist/js/node/router/runtime/server.js +3 -3
- package/dist/js/node/router/runtime/types.js +15 -0
- package/dist/js/node/router/runtime/utils.js +48 -38
- package/dist/js/node/router/runtime/withRouter.js +24 -22
- package/dist/js/node/runtime-context.js +8 -3
- package/dist/js/node/ssr/cli/babel-plugin-ssr-loader-id.js +109 -128
- package/dist/js/node/ssr/cli/index.js +21 -21
- package/dist/js/node/ssr/index.js +34 -32
- package/dist/js/node/ssr/index.node.js +30 -28
- package/dist/js/node/ssr/prefetch.js +11 -9
- package/dist/js/node/ssr/react/index.js +8 -3
- package/dist/js/node/ssr/react/nossr/index.js +7 -3
- package/dist/js/node/ssr/react/prerender/index.js +24 -22
- package/dist/js/node/ssr/react/prerender/type.js +15 -0
- package/dist/js/node/ssr/react/prerender/util.js +11 -3
- package/dist/js/node/ssr/react/withCallback/index.js +7 -3
- package/dist/js/node/ssr/serverRender/helmet.js +5 -3
- package/dist/js/node/ssr/serverRender/index.js +8 -6
- package/dist/js/node/ssr/serverRender/renderToStream/buildTemplate.after.js +7 -3
- package/dist/js/node/ssr/serverRender/renderToStream/buildTemplate.share.js +8 -3
- package/dist/js/node/ssr/serverRender/renderToStream/bulidTemplate.before.js +7 -3
- package/dist/js/node/ssr/serverRender/renderToStream/index.js +14 -10
- package/dist/js/node/ssr/serverRender/renderToStream/loadable.js +7 -3
- package/dist/js/node/ssr/serverRender/renderToStream/renderToPipe.js +22 -22
- package/dist/js/node/ssr/serverRender/renderToStream/styledComponent.js +7 -3
- package/dist/js/node/ssr/serverRender/renderToStream/template.js +7 -3
- package/dist/js/node/ssr/serverRender/renderToStream/type.js +15 -0
- package/dist/js/node/ssr/serverRender/renderToString/entry.js +19 -17
- package/dist/js/node/ssr/serverRender/renderToString/index.js +13 -9
- package/dist/js/node/ssr/serverRender/renderToString/loadable.js +7 -3
- package/dist/js/node/ssr/serverRender/renderToString/reduce.js +7 -3
- package/dist/js/node/ssr/serverRender/renderToString/styledComponent.js +7 -3
- package/dist/js/node/ssr/serverRender/renderToString/template.js +8 -3
- package/dist/js/node/ssr/serverRender/renderToString/type.js +7 -3
- package/dist/js/node/ssr/serverRender/types.js +7 -3
- package/dist/js/node/ssr/serverRender/utils.js +8 -3
- package/dist/js/node/ssr/utils.js +25 -19
- package/dist/js/node/state/cli/index.js +5 -3
- package/dist/js/node/state/index.js +8 -4
- package/dist/js/node/state/plugins.js +10 -3
- package/dist/js/node/state/runtime/index.js +10 -5
- package/dist/js/node/state/runtime/plugin.js +23 -23
- package/dist/js/node/state/types.js +15 -0
- package/dist/js/treeshaking/document/Body.js +2 -2
- package/dist/js/treeshaking/document/Root.js +1 -1
- package/dist/js/treeshaking/router/cli/index.js +7 -9
- package/dist/js/treeshaking/router/runtime/plugin.js +11 -1
- package/dist/js/treeshaking/router/runtime/utils.js +8 -4
- package/dist/js/treeshaking/ssr/cli/index.js +2 -2
- package/dist/types/router/runtime/plugin.d.ts +1 -1
- package/dist/types/router/runtime/types.d.ts +1 -1
- package/package.json +14 -11
- package/types/index.d.ts +2 -2
- package/types/router.d.ts +2 -2
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { jsxs } from "react/jsx-runtime";
|
|
1
|
+
import { jsx, jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { useContext } from "react";
|
|
3
3
|
import {
|
|
4
4
|
DOCUMENT_CHUNKSMAP_PLACEHOLDER,
|
|
@@ -11,7 +11,7 @@ function Body(props) {
|
|
|
11
11
|
const { children } = props;
|
|
12
12
|
return /* @__PURE__ */ jsxs("body", {
|
|
13
13
|
children: [
|
|
14
|
-
hasSetRoot ? null : DefaultRoot,
|
|
14
|
+
hasSetRoot ? null : /* @__PURE__ */ jsx(DefaultRoot, {}),
|
|
15
15
|
children,
|
|
16
16
|
`${DOCUMENT_CHUNKSMAP_PLACEHOLDER}`,
|
|
17
17
|
`${DOCUMENT_SSRDATASCRIPT_PLACEHOLDER}`
|
|
@@ -24,6 +24,10 @@ import {
|
|
|
24
24
|
} from "@modern-js/utils";
|
|
25
25
|
const PLUGIN_IDENTIFIER = "router";
|
|
26
26
|
const ROUTES_IDENTIFIER = "routes";
|
|
27
|
+
const isV5 = (config) => {
|
|
28
|
+
var _a, _b;
|
|
29
|
+
return ((_b = (_a = config == null ? void 0 : config.runtime) == null ? void 0 : _a.router) == null ? void 0 : _b.mode) === "react-router-5";
|
|
30
|
+
};
|
|
27
31
|
var cli_default = () => ({
|
|
28
32
|
name: "@modern-js/plugin-router",
|
|
29
33
|
required: ["@modern-js/runtime"],
|
|
@@ -49,10 +53,8 @@ var cli_default = () => ({
|
|
|
49
53
|
return PLUGIN_SCHEMAS["@modern-js/plugin-router"];
|
|
50
54
|
},
|
|
51
55
|
modifyEntryImports({ entrypoint, imports }) {
|
|
52
|
-
var _a, _b;
|
|
53
56
|
const { entryName, fileSystemRoutes } = entrypoint;
|
|
54
57
|
const userConfig = api.useResolvedConfigContext();
|
|
55
|
-
const isLegacy = Boolean((_b = (_a = userConfig == null ? void 0 : userConfig.runtime) == null ? void 0 : _a.router) == null ? void 0 : _b.legacy);
|
|
56
58
|
const { packageName } = api.useAppContext();
|
|
57
59
|
const runtimeConfig = getEntryOptions(
|
|
58
60
|
entryName,
|
|
@@ -62,7 +64,7 @@ var cli_default = () => ({
|
|
|
62
64
|
);
|
|
63
65
|
runtimeConfigMap.set(entryName, runtimeConfig);
|
|
64
66
|
if (runtimeConfig == null ? void 0 : runtimeConfig.router) {
|
|
65
|
-
if (!
|
|
67
|
+
if (!isV5(userConfig)) {
|
|
66
68
|
imports.push({
|
|
67
69
|
value: "@modern-js/runtime/plugins",
|
|
68
70
|
specifiers: [{ imported: PLUGIN_IDENTIFIER }]
|
|
@@ -79,13 +81,11 @@ var cli_default = () => ({
|
|
|
79
81
|
};
|
|
80
82
|
},
|
|
81
83
|
modifyEntryRuntimePlugins({ entrypoint, plugins }) {
|
|
82
|
-
var _a, _b;
|
|
83
84
|
const { entryName, fileSystemRoutes } = entrypoint;
|
|
84
85
|
const { serverRoutes } = api.useAppContext();
|
|
85
86
|
const userConfig = api.useResolvedConfigContext();
|
|
86
|
-
const isLegacy = Boolean((_b = (_a = userConfig == null ? void 0 : userConfig.runtime) == null ? void 0 : _a.router) == null ? void 0 : _b.legacy);
|
|
87
87
|
const runtimeConfig = runtimeConfigMap.get(entryName);
|
|
88
|
-
if (runtimeConfig.router && !
|
|
88
|
+
if (runtimeConfig.router && !isV5(userConfig)) {
|
|
89
89
|
const serverBase = serverRoutes.filter((route) => route.entryName === entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
|
|
90
90
|
plugins.push({
|
|
91
91
|
name: PLUGIN_IDENTIFIER,
|
|
@@ -105,10 +105,8 @@ var cli_default = () => ({
|
|
|
105
105
|
};
|
|
106
106
|
},
|
|
107
107
|
addRuntimeExports() {
|
|
108
|
-
var _a, _b;
|
|
109
108
|
const userConfig = api.useResolvedConfigContext();
|
|
110
|
-
|
|
111
|
-
if (!isLegacy) {
|
|
109
|
+
if (!isV5(userConfig)) {
|
|
112
110
|
pluginsExportsUtils.addExport(
|
|
113
111
|
`export { default as router } from '@modern-js/runtime/router'`
|
|
114
112
|
);
|
|
@@ -22,7 +22,9 @@ import {
|
|
|
22
22
|
createBrowserRouter,
|
|
23
23
|
createHashRouter,
|
|
24
24
|
RouterProvider,
|
|
25
|
-
createRoutesFromElements
|
|
25
|
+
createRoutesFromElements,
|
|
26
|
+
useMatches,
|
|
27
|
+
useLocation
|
|
26
28
|
} from "react-router-dom";
|
|
27
29
|
import hoistNonReactStatics from "hoist-non-react-statics";
|
|
28
30
|
import { renderRoutes, urlJoin } from "./utils";
|
|
@@ -54,6 +56,13 @@ const routerPlugin = ({
|
|
|
54
56
|
name: "@modern-js/plugin-router",
|
|
55
57
|
setup: () => {
|
|
56
58
|
return {
|
|
59
|
+
init({ context }, next) {
|
|
60
|
+
context.router = {
|
|
61
|
+
useMatches,
|
|
62
|
+
useLocation
|
|
63
|
+
};
|
|
64
|
+
return next({ context });
|
|
65
|
+
},
|
|
57
66
|
hoc: ({ App }, next) => {
|
|
58
67
|
if (!finalRouteConfig && !createRoutes) {
|
|
59
68
|
return next({ App });
|
|
@@ -36,9 +36,6 @@ import { DefaultNotFound } from "./DefaultNotFound";
|
|
|
36
36
|
import { RootLayout } from "./root";
|
|
37
37
|
const renderNestedRoute = (nestedRoute, parent) => {
|
|
38
38
|
const { children, index, id, component: Component } = nestedRoute;
|
|
39
|
-
const childElements = children == null ? void 0 : children.map((childRoute) => {
|
|
40
|
-
return renderNestedRoute(childRoute, nestedRoute);
|
|
41
|
-
});
|
|
42
39
|
const routeProps = {
|
|
43
40
|
caseSensitive: nestedRoute.caseSensitive,
|
|
44
41
|
path: nestedRoute.path,
|
|
@@ -64,11 +61,15 @@ const renderNestedRoute = (nestedRoute, parent) => {
|
|
|
64
61
|
fallback: /* @__PURE__ */ jsx(Loading, {}),
|
|
65
62
|
children: /* @__PURE__ */ jsx(Component, {})
|
|
66
63
|
});
|
|
67
|
-
} else {
|
|
64
|
+
} else if (!(parent == null ? void 0 : parent.index)) {
|
|
68
65
|
element = /* @__PURE__ */ jsx(Suspense, {
|
|
69
66
|
children: /* @__PURE__ */ jsx(Component, {})
|
|
70
67
|
});
|
|
68
|
+
} else {
|
|
69
|
+
element = /* @__PURE__ */ jsx(Component, {});
|
|
71
70
|
}
|
|
71
|
+
} else {
|
|
72
|
+
nestedRoute.loading = parent == null ? void 0 : parent.loading;
|
|
72
73
|
}
|
|
73
74
|
if (!parent && element) {
|
|
74
75
|
element = /* @__PURE__ */ jsx(RootLayout, {
|
|
@@ -79,6 +80,9 @@ const renderNestedRoute = (nestedRoute, parent) => {
|
|
|
79
80
|
if (element) {
|
|
80
81
|
routeProps.element = element;
|
|
81
82
|
}
|
|
83
|
+
const childElements = children == null ? void 0 : children.map((childRoute) => {
|
|
84
|
+
return renderNestedRoute(childRoute, nestedRoute);
|
|
85
|
+
});
|
|
82
86
|
const routeElement = index ? /* @__PURE__ */ jsx(Route, __spreadProps(__spreadValues({}, routeProps), {
|
|
83
87
|
index: true
|
|
84
88
|
}), id) : /* @__PURE__ */ jsx(Route, __spreadProps(__spreadValues({}, routeProps), {
|
|
@@ -114,9 +114,9 @@ var cli_default = () => ({
|
|
|
114
114
|
userConfig.runtimeByEntries,
|
|
115
115
|
packageName
|
|
116
116
|
);
|
|
117
|
-
if ((_a = runtimeConfig == null ? void 0 : runtimeConfig.router) == null ? void 0 : _a.
|
|
117
|
+
if (((_a = runtimeConfig == null ? void 0 : runtimeConfig.router) == null ? void 0 : _a.mode) === "react-router-5") {
|
|
118
118
|
throw new Error(
|
|
119
|
-
`
|
|
119
|
+
`router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'`
|
|
120
120
|
);
|
|
121
121
|
}
|
|
122
122
|
if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
|
|
@@ -21,17 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
21
21
|
mod
|
|
22
22
|
));
|
|
23
23
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
24
|
-
var stdin_exports = {};
|
|
25
|
-
__export(stdin_exports, {
|
|
26
|
-
default: () => cli_default
|
|
27
|
-
});
|
|
28
|
-
module.exports = __toCommonJS(stdin_exports);
|
|
29
|
-
var import_path = __toESM(require("path"));
|
|
30
|
-
var import_utils = require("@modern-js/utils");
|
|
31
|
-
var import_cli = __toESM(require("../state/cli"));
|
|
32
|
-
var import_cli2 = __toESM(require("../ssr/cli"));
|
|
33
|
-
var import_cli3 = __toESM(require("../router/cli"));
|
|
34
|
-
var import_cli4 = __toESM(require("../document/cli"));
|
|
35
24
|
var __async = (__this, __arguments, generator) => {
|
|
36
25
|
return new Promise((resolve, reject) => {
|
|
37
26
|
var fulfilled = (value) => {
|
|
@@ -52,6 +41,17 @@ var __async = (__this, __arguments, generator) => {
|
|
|
52
41
|
step((generator = generator.apply(__this, __arguments)).next());
|
|
53
42
|
});
|
|
54
43
|
};
|
|
44
|
+
var cli_exports = {};
|
|
45
|
+
__export(cli_exports, {
|
|
46
|
+
default: () => cli_default
|
|
47
|
+
});
|
|
48
|
+
module.exports = __toCommonJS(cli_exports);
|
|
49
|
+
var import_path = __toESM(require("path"));
|
|
50
|
+
var import_utils = require("@modern-js/utils");
|
|
51
|
+
var import_cli = __toESM(require("../state/cli"));
|
|
52
|
+
var import_cli2 = __toESM(require("../ssr/cli"));
|
|
53
|
+
var import_cli3 = __toESM(require("../router/cli"));
|
|
54
|
+
var import_cli4 = __toESM(require("../document/cli"));
|
|
55
55
|
var cli_default = () => ({
|
|
56
56
|
name: "@modern-js/runtime",
|
|
57
57
|
post: [
|
|
@@ -95,3 +95,5 @@ var cli_default = () => ({
|
|
|
95
95
|
};
|
|
96
96
|
}
|
|
97
97
|
});
|
|
98
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
99
|
+
0 && (module.exports = {});
|
package/dist/js/node/common.js
CHANGED
|
@@ -15,9 +15,13 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
15
15
|
return to;
|
|
16
16
|
};
|
|
17
17
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
-
var
|
|
19
|
-
__export(
|
|
18
|
+
var common_exports = {};
|
|
19
|
+
__export(common_exports, {
|
|
20
20
|
isBrowser: () => isBrowser
|
|
21
21
|
});
|
|
22
|
-
module.exports = __toCommonJS(
|
|
22
|
+
module.exports = __toCommonJS(common_exports);
|
|
23
23
|
const isBrowser = () => typeof window !== "undefined" && window.name !== "nodejs";
|
|
24
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
25
|
+
0 && (module.exports = {
|
|
26
|
+
isBrowser
|
|
27
|
+
});
|
|
@@ -15,15 +15,20 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
15
15
|
return to;
|
|
16
16
|
};
|
|
17
17
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
-
var
|
|
19
|
-
__export(
|
|
18
|
+
var app_config_exports = {};
|
|
19
|
+
__export(app_config_exports, {
|
|
20
20
|
defineConfig: () => defineConfig,
|
|
21
21
|
getConfig: () => getConfig
|
|
22
22
|
});
|
|
23
|
-
module.exports = __toCommonJS(
|
|
23
|
+
module.exports = __toCommonJS(app_config_exports);
|
|
24
24
|
const APP_CONFIG_SYMBOL = "config";
|
|
25
25
|
const getConfig = (Component) => Component[APP_CONFIG_SYMBOL];
|
|
26
26
|
const defineConfig = (Component, config) => {
|
|
27
27
|
Component[APP_CONFIG_SYMBOL] = config;
|
|
28
28
|
return Component;
|
|
29
29
|
};
|
|
30
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
31
|
+
0 && (module.exports = {
|
|
32
|
+
defineConfig,
|
|
33
|
+
getConfig
|
|
34
|
+
});
|
|
@@ -2,47 +2,14 @@ var __create = Object.create;
|
|
|
2
2
|
var __defProp = Object.defineProperty;
|
|
3
3
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
4
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
5
6
|
var __getProtoOf = Object.getPrototypeOf;
|
|
6
7
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
7
|
-
var __export = (target, all) => {
|
|
8
|
-
for (var name in all)
|
|
9
|
-
__defProp(target, name, { get: all[name], enumerable: true });
|
|
10
|
-
};
|
|
11
|
-
var __copyProps = (to, from, except, desc) => {
|
|
12
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
13
|
-
for (let key of __getOwnPropNames(from))
|
|
14
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
15
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
16
|
-
}
|
|
17
|
-
return to;
|
|
18
|
-
};
|
|
19
|
-
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
20
|
-
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
21
|
-
mod
|
|
22
|
-
));
|
|
23
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
24
|
-
var stdin_exports = {};
|
|
25
|
-
__export(stdin_exports, {
|
|
26
|
-
bootstrap: () => bootstrap,
|
|
27
|
-
createApp: () => createApp,
|
|
28
|
-
useRuntimeContext: () => useRuntimeContext
|
|
29
|
-
});
|
|
30
|
-
module.exports = __toCommonJS(stdin_exports);
|
|
31
|
-
var import_jsx_runtime = require("react/jsx-runtime");
|
|
32
|
-
var import_react = __toESM(require("react"));
|
|
33
|
-
var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
|
|
34
|
-
var import_constants = require("@modern-js/utils/constants");
|
|
35
|
-
var import_runtime_context = require("../runtime-context");
|
|
36
|
-
var import_plugin = require("./plugin");
|
|
37
|
-
var import_loaderManager = require("./loader/loaderManager");
|
|
38
|
-
var __defProp2 = Object.defineProperty;
|
|
39
|
-
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
40
|
-
var __hasOwnProp2 = Object.prototype.hasOwnProperty;
|
|
41
8
|
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
42
|
-
var __defNormalProp = (obj, key, value) => key in obj ?
|
|
9
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
43
10
|
var __spreadValues = (a, b) => {
|
|
44
11
|
for (var prop in b || (b = {}))
|
|
45
|
-
if (
|
|
12
|
+
if (__hasOwnProp.call(b, prop))
|
|
46
13
|
__defNormalProp(a, prop, b[prop]);
|
|
47
14
|
if (__getOwnPropSymbols)
|
|
48
15
|
for (var prop of __getOwnPropSymbols(b)) {
|
|
@@ -54,7 +21,7 @@ var __spreadValues = (a, b) => {
|
|
|
54
21
|
var __objRest = (source, exclude) => {
|
|
55
22
|
var target = {};
|
|
56
23
|
for (var prop in source)
|
|
57
|
-
if (
|
|
24
|
+
if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
|
|
58
25
|
target[prop] = source[prop];
|
|
59
26
|
if (source != null && __getOwnPropSymbols)
|
|
60
27
|
for (var prop of __getOwnPropSymbols(source)) {
|
|
@@ -63,6 +30,23 @@ var __objRest = (source, exclude) => {
|
|
|
63
30
|
}
|
|
64
31
|
return target;
|
|
65
32
|
};
|
|
33
|
+
var __export = (target, all) => {
|
|
34
|
+
for (var name in all)
|
|
35
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
36
|
+
};
|
|
37
|
+
var __copyProps = (to, from, except, desc) => {
|
|
38
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
39
|
+
for (let key of __getOwnPropNames(from))
|
|
40
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
41
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
42
|
+
}
|
|
43
|
+
return to;
|
|
44
|
+
};
|
|
45
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
46
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
47
|
+
mod
|
|
48
|
+
));
|
|
49
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
66
50
|
var __async = (__this, __arguments, generator) => {
|
|
67
51
|
return new Promise((resolve, reject) => {
|
|
68
52
|
var fulfilled = (value) => {
|
|
@@ -83,6 +67,20 @@ var __async = (__this, __arguments, generator) => {
|
|
|
83
67
|
step((generator = generator.apply(__this, __arguments)).next());
|
|
84
68
|
});
|
|
85
69
|
};
|
|
70
|
+
var compatible_exports = {};
|
|
71
|
+
__export(compatible_exports, {
|
|
72
|
+
bootstrap: () => bootstrap,
|
|
73
|
+
createApp: () => createApp,
|
|
74
|
+
useRuntimeContext: () => useRuntimeContext
|
|
75
|
+
});
|
|
76
|
+
module.exports = __toCommonJS(compatible_exports);
|
|
77
|
+
var import_jsx_runtime = require("react/jsx-runtime");
|
|
78
|
+
var import_react = __toESM(require("react"));
|
|
79
|
+
var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
|
|
80
|
+
var import_constants = require("@modern-js/utils/constants");
|
|
81
|
+
var import_runtime_context = require("../runtime-context");
|
|
82
|
+
var import_plugin = require("./plugin");
|
|
83
|
+
var import_loaderManager = require("./loader/loaderManager");
|
|
86
84
|
const IS_REACT18 = process.env.IS_REACT18 === "true";
|
|
87
85
|
function isClientArgs(id) {
|
|
88
86
|
return typeof id === "string" || typeof HTMLElement !== "undefined" && id instanceof HTMLElement;
|
|
@@ -306,3 +304,9 @@ const useRuntimeContext = () => {
|
|
|
306
304
|
);
|
|
307
305
|
return memoizedContext;
|
|
308
306
|
};
|
|
307
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
308
|
+
0 && (module.exports = {
|
|
309
|
+
bootstrap,
|
|
310
|
+
createApp,
|
|
311
|
+
useRuntimeContext
|
|
312
|
+
});
|
|
@@ -16,8 +16,8 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
16
16
|
};
|
|
17
17
|
var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
|
|
18
18
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
-
var
|
|
20
|
-
__export(
|
|
19
|
+
var core_exports = {};
|
|
20
|
+
__export(core_exports, {
|
|
21
21
|
RuntimeReactContext: () => import_runtime_context.RuntimeReactContext,
|
|
22
22
|
ServerRouterContext: () => import_runtime_context.ServerRouterContext,
|
|
23
23
|
createPlugin: () => import_plugin.createPlugin,
|
|
@@ -27,10 +27,21 @@ __export(stdin_exports, {
|
|
|
27
27
|
registerInit: () => import_plugin.registerInit,
|
|
28
28
|
runtime: () => import_plugin.runtime
|
|
29
29
|
});
|
|
30
|
-
module.exports = __toCommonJS(
|
|
30
|
+
module.exports = __toCommonJS(core_exports);
|
|
31
31
|
var import_plugin = require("./plugin");
|
|
32
32
|
var import_app_config = require("./app-config");
|
|
33
|
-
__reExport(
|
|
33
|
+
__reExport(core_exports, require("./compatible"), module.exports);
|
|
34
34
|
var import_runtime_context = require("../runtime-context");
|
|
35
|
-
__reExport(
|
|
36
|
-
__reExport(
|
|
35
|
+
__reExport(core_exports, require("./loader"), module.exports);
|
|
36
|
+
__reExport(core_exports, require("@modern-js/plugin"), module.exports);
|
|
37
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
38
|
+
0 && (module.exports = {
|
|
39
|
+
RuntimeReactContext,
|
|
40
|
+
ServerRouterContext,
|
|
41
|
+
createPlugin,
|
|
42
|
+
createRuntime,
|
|
43
|
+
defineConfig,
|
|
44
|
+
getConfig,
|
|
45
|
+
registerInit,
|
|
46
|
+
runtime
|
|
47
|
+
});
|
|
@@ -21,9 +21,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
21
21
|
mod
|
|
22
22
|
));
|
|
23
23
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
24
|
-
var
|
|
25
|
-
__export(
|
|
24
|
+
var loader_exports = {};
|
|
25
|
+
__export(loader_exports, {
|
|
26
26
|
useLoader: () => import_useLoader.default
|
|
27
27
|
});
|
|
28
|
-
module.exports = __toCommonJS(
|
|
28
|
+
module.exports = __toCommonJS(loader_exports);
|
|
29
29
|
var import_useLoader = __toESM(require("./useLoader"));
|
|
30
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
31
|
+
0 && (module.exports = {
|
|
32
|
+
useLoader
|
|
33
|
+
});
|
|
@@ -21,13 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
21
21
|
mod
|
|
22
22
|
));
|
|
23
23
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
24
|
-
var stdin_exports = {};
|
|
25
|
-
__export(stdin_exports, {
|
|
26
|
-
LoaderStatus: () => LoaderStatus,
|
|
27
|
-
createLoaderManager: () => createLoaderManager
|
|
28
|
-
});
|
|
29
|
-
module.exports = __toCommonJS(stdin_exports);
|
|
30
|
-
var import_invariant = __toESM(require("invariant"));
|
|
31
24
|
var __async = (__this, __arguments, generator) => {
|
|
32
25
|
return new Promise((resolve, reject) => {
|
|
33
26
|
var fulfilled = (value) => {
|
|
@@ -48,6 +41,13 @@ var __async = (__this, __arguments, generator) => {
|
|
|
48
41
|
step((generator = generator.apply(__this, __arguments)).next());
|
|
49
42
|
});
|
|
50
43
|
};
|
|
44
|
+
var loaderManager_exports = {};
|
|
45
|
+
__export(loaderManager_exports, {
|
|
46
|
+
LoaderStatus: () => LoaderStatus,
|
|
47
|
+
createLoaderManager: () => createLoaderManager
|
|
48
|
+
});
|
|
49
|
+
module.exports = __toCommonJS(loaderManager_exports);
|
|
50
|
+
var import_invariant = __toESM(require("invariant"));
|
|
51
51
|
const createGetId = () => {
|
|
52
52
|
const idCache = /* @__PURE__ */ new Map();
|
|
53
53
|
return (objectId) => {
|
|
@@ -75,7 +75,7 @@ const createLoader = (id, initialData = {
|
|
|
75
75
|
error: void 0
|
|
76
76
|
}, loaderFn, skip = false) => {
|
|
77
77
|
let promise;
|
|
78
|
-
let status = 0
|
|
78
|
+
let status = 0 /* idle */;
|
|
79
79
|
let { data, error } = initialData;
|
|
80
80
|
let hasLoaded = false;
|
|
81
81
|
const handlers = /* @__PURE__ */ new Set();
|
|
@@ -83,19 +83,19 @@ const createLoader = (id, initialData = {
|
|
|
83
83
|
if (skip) {
|
|
84
84
|
return promise;
|
|
85
85
|
}
|
|
86
|
-
if (status === 1) {
|
|
86
|
+
if (status === 1 /* loading */) {
|
|
87
87
|
return promise;
|
|
88
88
|
}
|
|
89
|
-
status = 1
|
|
89
|
+
status = 1 /* loading */;
|
|
90
90
|
notify();
|
|
91
91
|
promise = loaderFn().then((value) => {
|
|
92
92
|
data = value;
|
|
93
93
|
error = null;
|
|
94
|
-
status = 2
|
|
94
|
+
status = 2 /* fulfilled */;
|
|
95
95
|
}).catch((e) => {
|
|
96
96
|
error = e;
|
|
97
97
|
data = null;
|
|
98
|
-
status = 3
|
|
98
|
+
status = 3 /* rejected */;
|
|
99
99
|
}).finally(() => {
|
|
100
100
|
promise = null;
|
|
101
101
|
hasLoaded = true;
|
|
@@ -104,8 +104,8 @@ const createLoader = (id, initialData = {
|
|
|
104
104
|
return promise;
|
|
105
105
|
});
|
|
106
106
|
const getResult = () => ({
|
|
107
|
-
loading: !hasLoaded && status === 1
|
|
108
|
-
reloading: hasLoaded && status === 1
|
|
107
|
+
loading: !hasLoaded && status === 1 /* loading */,
|
|
108
|
+
reloading: hasLoaded && status === 1 /* loading */,
|
|
109
109
|
data,
|
|
110
110
|
error: error instanceof Error ? `${error.message}` : error,
|
|
111
111
|
_error: error
|
|
@@ -188,3 +188,8 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
|
|
|
188
188
|
get
|
|
189
189
|
};
|
|
190
190
|
};
|
|
191
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
192
|
+
0 && (module.exports = {
|
|
193
|
+
LoaderStatus,
|
|
194
|
+
createLoaderManager
|
|
195
|
+
});
|
|
@@ -1,9 +1,26 @@
|
|
|
1
1
|
var __create = Object.create;
|
|
2
2
|
var __defProp = Object.defineProperty;
|
|
3
|
+
var __defProps = Object.defineProperties;
|
|
3
4
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
4
6
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
7
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
5
8
|
var __getProtoOf = Object.getPrototypeOf;
|
|
6
9
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
10
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
11
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
12
|
+
var __spreadValues = (a, b) => {
|
|
13
|
+
for (var prop in b || (b = {}))
|
|
14
|
+
if (__hasOwnProp.call(b, prop))
|
|
15
|
+
__defNormalProp(a, prop, b[prop]);
|
|
16
|
+
if (__getOwnPropSymbols)
|
|
17
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
18
|
+
if (__propIsEnum.call(b, prop))
|
|
19
|
+
__defNormalProp(a, prop, b[prop]);
|
|
20
|
+
}
|
|
21
|
+
return a;
|
|
22
|
+
};
|
|
23
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
7
24
|
var __export = (target, all) => {
|
|
8
25
|
for (var name in all)
|
|
9
26
|
__defProp(target, name, { get: all[name], enumerable: true });
|
|
@@ -21,34 +38,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
21
38
|
mod
|
|
22
39
|
));
|
|
23
40
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
24
|
-
var
|
|
25
|
-
__export(
|
|
41
|
+
var useLoader_exports = {};
|
|
42
|
+
__export(useLoader_exports, {
|
|
26
43
|
default: () => useLoader_default
|
|
27
44
|
});
|
|
28
|
-
module.exports = __toCommonJS(
|
|
45
|
+
module.exports = __toCommonJS(useLoader_exports);
|
|
29
46
|
var import_react = require("react");
|
|
30
47
|
var import_invariant = __toESM(require("invariant"));
|
|
31
48
|
var import_runtime_context = require("../../runtime-context");
|
|
32
49
|
var import_loaderManager = require("./loaderManager");
|
|
33
|
-
var __defProp2 = Object.defineProperty;
|
|
34
|
-
var __defProps = Object.defineProperties;
|
|
35
|
-
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
36
|
-
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
37
|
-
var __hasOwnProp2 = Object.prototype.hasOwnProperty;
|
|
38
|
-
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
39
|
-
var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
40
|
-
var __spreadValues = (a, b) => {
|
|
41
|
-
for (var prop in b || (b = {}))
|
|
42
|
-
if (__hasOwnProp2.call(b, prop))
|
|
43
|
-
__defNormalProp(a, prop, b[prop]);
|
|
44
|
-
if (__getOwnPropSymbols)
|
|
45
|
-
for (var prop of __getOwnPropSymbols(b)) {
|
|
46
|
-
if (__propIsEnum.call(b, prop))
|
|
47
|
-
__defNormalProp(a, prop, b[prop]);
|
|
48
|
-
}
|
|
49
|
-
return a;
|
|
50
|
-
};
|
|
51
|
-
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
52
50
|
const useLoader = (loaderFn, options = { params: void 0 }) => {
|
|
53
51
|
const context = (0, import_react.useContext)(import_runtime_context.RuntimeReactContext);
|
|
54
52
|
const isSSRRender = Boolean(context.ssr);
|
|
@@ -130,3 +128,5 @@ const useLoader = (loaderFn, options = { params: void 0 }) => {
|
|
|
130
128
|
});
|
|
131
129
|
};
|
|
132
130
|
var useLoader_default = useLoader;
|
|
131
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
132
|
+
0 && (module.exports = {});
|
|
@@ -15,16 +15,6 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
15
15
|
return to;
|
|
16
16
|
};
|
|
17
17
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
-
var stdin_exports = {};
|
|
19
|
-
__export(stdin_exports, {
|
|
20
|
-
createPlugin: () => createPlugin,
|
|
21
|
-
createRuntime: () => createRuntime,
|
|
22
|
-
registerInit: () => registerInit,
|
|
23
|
-
runtime: () => runtime
|
|
24
|
-
});
|
|
25
|
-
module.exports = __toCommonJS(stdin_exports);
|
|
26
|
-
var import_plugin = require("@modern-js/plugin");
|
|
27
|
-
var import_loaderManager = require("./loader/loaderManager");
|
|
28
18
|
var __async = (__this, __arguments, generator) => {
|
|
29
19
|
return new Promise((resolve, reject) => {
|
|
30
20
|
var fulfilled = (value) => {
|
|
@@ -45,6 +35,16 @@ var __async = (__this, __arguments, generator) => {
|
|
|
45
35
|
step((generator = generator.apply(__this, __arguments)).next());
|
|
46
36
|
});
|
|
47
37
|
};
|
|
38
|
+
var plugin_exports = {};
|
|
39
|
+
__export(plugin_exports, {
|
|
40
|
+
createPlugin: () => createPlugin,
|
|
41
|
+
createRuntime: () => createRuntime,
|
|
42
|
+
registerInit: () => registerInit,
|
|
43
|
+
runtime: () => runtime
|
|
44
|
+
});
|
|
45
|
+
module.exports = __toCommonJS(plugin_exports);
|
|
46
|
+
var import_plugin = require("@modern-js/plugin");
|
|
47
|
+
var import_loaderManager = require("./loader/loaderManager");
|
|
48
48
|
const hoc = (0, import_plugin.createPipeline)();
|
|
49
49
|
const provide = (0, import_plugin.createPipeline)();
|
|
50
50
|
const client = (0, import_plugin.createAsyncPipeline)();
|
|
@@ -71,3 +71,10 @@ const registerInit = (App, _init) => {
|
|
|
71
71
|
};
|
|
72
72
|
const runtime = createRuntime();
|
|
73
73
|
const { createPlugin } = runtime;
|
|
74
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
75
|
+
0 && (module.exports = {
|
|
76
|
+
createPlugin,
|
|
77
|
+
createRuntime,
|
|
78
|
+
registerInit,
|
|
79
|
+
runtime
|
|
80
|
+
});
|
|
@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
15
15
|
return to;
|
|
16
16
|
};
|
|
17
17
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
-
var
|
|
19
|
-
__export(
|
|
18
|
+
var Body_exports = {};
|
|
19
|
+
__export(Body_exports, {
|
|
20
20
|
Body: () => Body
|
|
21
21
|
});
|
|
22
|
-
module.exports = __toCommonJS(
|
|
22
|
+
module.exports = __toCommonJS(Body_exports);
|
|
23
23
|
var import_jsx_runtime = require("react/jsx-runtime");
|
|
24
24
|
var import_react = require("react");
|
|
25
25
|
var import_constants = require("./constants");
|
|
@@ -30,10 +30,14 @@ function Body(props) {
|
|
|
30
30
|
const { children } = props;
|
|
31
31
|
return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("body", {
|
|
32
32
|
children: [
|
|
33
|
-
hasSetRoot ? null : import_Root.DefaultRoot,
|
|
33
|
+
hasSetRoot ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Root.DefaultRoot, {}),
|
|
34
34
|
children,
|
|
35
35
|
`${import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER}`,
|
|
36
36
|
`${import_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER}`
|
|
37
37
|
]
|
|
38
38
|
});
|
|
39
39
|
}
|
|
40
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
41
|
+
0 && (module.exports = {
|
|
42
|
+
Body
|
|
43
|
+
});
|
|
@@ -21,14 +21,18 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
21
21
|
mod
|
|
22
22
|
));
|
|
23
23
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
24
|
-
var
|
|
25
|
-
__export(
|
|
24
|
+
var DocumentContext_exports = {};
|
|
25
|
+
__export(DocumentContext_exports, {
|
|
26
26
|
DocumentContext: () => DocumentContext
|
|
27
27
|
});
|
|
28
|
-
module.exports = __toCommonJS(
|
|
28
|
+
module.exports = __toCommonJS(DocumentContext_exports);
|
|
29
29
|
var import_react = __toESM(require("react"));
|
|
30
30
|
const DocumentContext = import_react.default.createContext({
|
|
31
31
|
config: {},
|
|
32
32
|
templateParams: {},
|
|
33
33
|
processEnv: {}
|
|
34
34
|
});
|
|
35
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
36
|
+
0 && (module.exports = {
|
|
37
|
+
DocumentContext
|
|
38
|
+
});
|