@modern-js/runtime 3.8.2 → 3.9.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/document/DocumentContext.js +1 -1
- package/dist/cjs/document/DocumentStructureContext.js +1 -1
- package/dist/cjs/document/cli/index.js +1 -2
- package/dist/cjs/router/runtime/PrefetchLink.js +1 -1
- package/dist/cjs/router/runtime/rsc-router.js +2 -2
- package/dist/cjs/router/runtime/utils.js +1 -1
- package/dist/esm/cli/code.mjs +12 -12
- package/dist/esm/document/cli/index.mjs +2 -3
- package/dist/esm/router/cli/code/index.mjs +5 -5
- package/dist/esm/router/cli/handler.mjs +3 -3
- package/dist/esm-node/cli/code.mjs +12 -12
- package/dist/esm-node/document/cli/index.mjs +2 -3
- package/dist/esm-node/router/cli/code/index.mjs +5 -5
- package/dist/esm-node/router/cli/handler.mjs +3 -3
- package/package.json +14 -14
|
@@ -41,7 +41,7 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
41
41
|
});
|
|
42
42
|
const external_react_namespaceObject = require("react");
|
|
43
43
|
var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_namespaceObject);
|
|
44
|
-
const DocumentContext = /*#__PURE__*/ external_react_default().createContext({
|
|
44
|
+
const DocumentContext = /*#__PURE__*/ (external_react_default()).createContext({
|
|
45
45
|
config: {},
|
|
46
46
|
templateParams: {},
|
|
47
47
|
processEnv: {}
|
|
@@ -41,7 +41,7 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
41
41
|
});
|
|
42
42
|
const external_react_namespaceObject = require("react");
|
|
43
43
|
var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_namespaceObject);
|
|
44
|
-
const DocumentStructureContext = /*#__PURE__*/ external_react_default().createContext({
|
|
44
|
+
const DocumentStructureContext = /*#__PURE__*/ (external_react_default()).createContext({
|
|
45
45
|
hasSetHead: false,
|
|
46
46
|
hasSetScripts: false,
|
|
47
47
|
hasSetBody: false,
|
|
@@ -146,8 +146,7 @@ const applyExternalsPlugin = (child, compiler)=>{
|
|
|
146
146
|
]).apply(child);
|
|
147
147
|
};
|
|
148
148
|
const generateEntryCode = (docPath, _entryName)=>{
|
|
149
|
-
const
|
|
150
|
-
const esmRuntimeAPI = runtimeAPI.replace("cjs", "esm").replace(/.js$/, '.mjs');
|
|
149
|
+
const esmRuntimeAPI = require.resolve('@modern-js/runtime/document');
|
|
151
150
|
return `import React from 'react';
|
|
152
151
|
import ReactDomServer from 'react-dom/server';
|
|
153
152
|
import Document from ${JSON.stringify(docPath)};
|
|
@@ -172,7 +172,7 @@ const PrefetchDataLinks = ({ matches, path, routeManifest })=>{
|
|
|
172
172
|
children: dataHrefs
|
|
173
173
|
});
|
|
174
174
|
};
|
|
175
|
-
const createPrefetchLink = (Link)=>/*#__PURE__*/ external_react_default().forwardRef(({ to, prefetch = 'none', ...props }, forwardedRef)=>{
|
|
175
|
+
const createPrefetchLink = (Link)=>/*#__PURE__*/ (external_react_default()).forwardRef(({ to, prefetch = 'none', ...props }, forwardedRef)=>{
|
|
176
176
|
const isAbsolute = 'string' == typeof to && ABSOLUTE_URL_REGEX.test(to);
|
|
177
177
|
const [shouldPrefetch, prefetchHandlers] = usePrefetchBehavior(prefetch, props);
|
|
178
178
|
const resolvedPath = (0, router_namespaceObject.useResolvedPath)(to);
|
|
@@ -105,8 +105,8 @@ const createServerPayload = (routerContext, routes)=>{
|
|
|
105
105
|
handle: m.route.handle
|
|
106
106
|
}))
|
|
107
107
|
};
|
|
108
|
-
const routeElement = /*#__PURE__*/ external_react_default().createElement(ElementComponent, elementProps);
|
|
109
|
-
processedElement = index === cssInjectionIndex ? /*#__PURE__*/ external_react_default().createElement(external_react_default().Fragment, null, /*#__PURE__*/ external_react_default().createElement(external_CSSLinks_js_namespaceObject.CSSLinks, {
|
|
108
|
+
const routeElement = /*#__PURE__*/ (external_react_default()).createElement(ElementComponent, elementProps);
|
|
109
|
+
processedElement = index === cssInjectionIndex ? /*#__PURE__*/ (external_react_default()).createElement(external_react_default().Fragment, null, /*#__PURE__*/ (external_react_default()).createElement(external_CSSLinks_js_namespaceObject.CSSLinks, {
|
|
110
110
|
cssFiles
|
|
111
111
|
}), routeElement) : routeElement;
|
|
112
112
|
}
|
|
@@ -139,7 +139,7 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
|
|
|
139
139
|
const LayoutComponent = createLayoutElement(route.component);
|
|
140
140
|
const routeObject = {
|
|
141
141
|
path: route.path,
|
|
142
|
-
element: /*#__PURE__*/ external_react_default().createElement(LayoutComponent)
|
|
142
|
+
element: /*#__PURE__*/ (external_react_default()).createElement(LayoutComponent)
|
|
143
143
|
};
|
|
144
144
|
routeObjects.push(routeObject);
|
|
145
145
|
}
|
package/dist/esm/cli/code.mjs
CHANGED
|
@@ -2,8 +2,8 @@ import path from "path";
|
|
|
2
2
|
import { formatImportPath, fs } from "@modern-js/utils";
|
|
3
3
|
import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME, INDEX_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants.mjs";
|
|
4
4
|
import { resolveSSRMode } from "./ssr/mode.mjs";
|
|
5
|
-
import * as
|
|
6
|
-
import * as
|
|
5
|
+
import * as __rspack_external__template_mjs_d1604447 from "./template.mjs";
|
|
6
|
+
import * as __rspack_external__template_server_mjs_f98cfe58 from "./template.server.mjs";
|
|
7
7
|
const normalizePreEntry = (preEntry)=>{
|
|
8
8
|
if (!preEntry) return [];
|
|
9
9
|
if (Array.isArray(preEntry)) return preEntry.filter((v)=>'string' == typeof v && v.length > 0);
|
|
@@ -35,7 +35,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
|
|
|
35
35
|
nestedRoutesEntry
|
|
36
36
|
});
|
|
37
37
|
let indexCode = '';
|
|
38
|
-
indexCode = ssrMode || !config.server.rsc || customEntry ?
|
|
38
|
+
indexCode = ssrMode || !config.server.rsc || customEntry ? __rspack_external__template_mjs_d1604447.index({
|
|
39
39
|
srcDirectory,
|
|
40
40
|
internalSrcAlias,
|
|
41
41
|
metaName,
|
|
@@ -45,7 +45,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
|
|
|
45
45
|
mountId,
|
|
46
46
|
enableRsc: config.server.rsc,
|
|
47
47
|
isNestedRouter: !!entrypoint.nestedRoutesEntry
|
|
48
|
-
}) :
|
|
48
|
+
}) : __rspack_external__template_mjs_d1604447.entryForCSRWithRSC({
|
|
49
49
|
metaName,
|
|
50
50
|
entryName,
|
|
51
51
|
mountId,
|
|
@@ -76,7 +76,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
|
|
|
76
76
|
if (ssrMode) await fs.outputFile(bootstrapServerFile, `export const requestHandler = import('./${SERVER_ENTRY_POINT_FILE_NAME}').then((m) => m.requestHandler)`, 'utf8');
|
|
77
77
|
}
|
|
78
78
|
if (ssrMode) {
|
|
79
|
-
const indexServerCode =
|
|
79
|
+
const indexServerCode = __rspack_external__template_server_mjs_f98cfe58.serverIndex({
|
|
80
80
|
entry,
|
|
81
81
|
entryName,
|
|
82
82
|
internalSrcAlias,
|
|
@@ -90,16 +90,16 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
|
|
|
90
90
|
await fs.outputFile(indexServerFile, indexServerCode, 'utf8');
|
|
91
91
|
} else if (config.server.rsc) {
|
|
92
92
|
const indexServerFile = path.resolve(internalDirectory, `./${entryName}/${SERVER_ENTRY_POINT_FILE_NAME}`);
|
|
93
|
-
const indexServerCode =
|
|
93
|
+
const indexServerCode = __rspack_external__template_server_mjs_f98cfe58.entryForCSRWithRSC({
|
|
94
94
|
entryName,
|
|
95
95
|
metaName
|
|
96
96
|
});
|
|
97
97
|
await fs.outputFile(indexServerFile, indexServerCode, 'utf8');
|
|
98
98
|
}
|
|
99
|
-
const registerCode =
|
|
99
|
+
const registerCode = __rspack_external__template_mjs_d1604447.register();
|
|
100
100
|
const registerFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_REGISTER_FILE_NAME}`);
|
|
101
101
|
await fs.outputFile(registerFile, registerCode, 'utf8');
|
|
102
|
-
const registerRuntimeCode =
|
|
102
|
+
const registerRuntimeCode = __rspack_external__template_mjs_d1604447.runtimeRegister({
|
|
103
103
|
entryName,
|
|
104
104
|
srcDirectory,
|
|
105
105
|
internalSrcAlias,
|
|
@@ -113,7 +113,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
|
|
|
113
113
|
if (!config.server.rsc || entrypoint.nestedRoutesEntry) {
|
|
114
114
|
const route = serverRoutes.find((r)=>r.entryName === entryName);
|
|
115
115
|
const basename = route?.urlPath || '/';
|
|
116
|
-
contextCode =
|
|
116
|
+
contextCode = __rspack_external__template_mjs_d1604447.runtimeGlobalContext({
|
|
117
117
|
entryName,
|
|
118
118
|
srcDirectory,
|
|
119
119
|
internalSrcAlias,
|
|
@@ -124,18 +124,18 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
|
|
|
124
124
|
});
|
|
125
125
|
} else {
|
|
126
126
|
const AppProxyPath = path.join(internalDirectory, entryName, './AppProxy.jsx');
|
|
127
|
-
const appProxyCode =
|
|
127
|
+
const appProxyCode = __rspack_external__template_mjs_d1604447.AppProxyForRSC({
|
|
128
128
|
srcDirectory,
|
|
129
129
|
internalSrcAlias,
|
|
130
130
|
entry,
|
|
131
131
|
customEntry
|
|
132
132
|
});
|
|
133
133
|
await fs.outputFile(AppProxyPath, appProxyCode);
|
|
134
|
-
contextCode =
|
|
134
|
+
contextCode = __rspack_external__template_mjs_d1604447.runtimeGlobalContextForRSCClient({
|
|
135
135
|
metaName,
|
|
136
136
|
customEntry
|
|
137
137
|
});
|
|
138
|
-
const contextServerCode =
|
|
138
|
+
const contextServerCode = __rspack_external__template_mjs_d1604447.runtimeGlobalContextForRSCServer({
|
|
139
139
|
metaName
|
|
140
140
|
});
|
|
141
141
|
const contextFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}.server.js`);
|
|
@@ -48,7 +48,7 @@ const processCommentPlaceholders = (html)=>{
|
|
|
48
48
|
return html.replace(new RegExp(`${DOCUMENT_COMMENT_PLACEHOLDER_START}([\\s\\S]*?)${DOCUMENT_COMMENT_PLACEHOLDER_END}`, 'g'), (_scriptStr, $1)=>`${decodeHtmlEntities(decodeURIComponent($1))}`);
|
|
49
49
|
};
|
|
50
50
|
const requireFromString = (code, filename)=>{
|
|
51
|
-
const m = new module_0.Module(filename,
|
|
51
|
+
const m = new module_0.Module(filename, void 0);
|
|
52
52
|
m.filename = filename;
|
|
53
53
|
m.paths = module_0.Module._nodeModulePaths(path.dirname(filename));
|
|
54
54
|
m._compile(code, filename);
|
|
@@ -101,8 +101,7 @@ const applyExternalsPlugin = (child, compiler)=>{
|
|
|
101
101
|
]).apply(child);
|
|
102
102
|
};
|
|
103
103
|
const generateEntryCode = (docPath, _entryName)=>{
|
|
104
|
-
const
|
|
105
|
-
const esmRuntimeAPI = runtimeAPI.replace("cjs", "esm").replace(/.js$/, '.mjs');
|
|
104
|
+
const esmRuntimeAPI = require.resolve('@modern-js/runtime/document');
|
|
106
105
|
return `import React from 'react';
|
|
107
106
|
import ReactDomServer from 'react-dom/server';
|
|
108
107
|
import Document from ${JSON.stringify(docPath)};
|
|
@@ -6,7 +6,7 @@ import { resolveSSRMode } from "../../../cli/ssr/mode.mjs";
|
|
|
6
6
|
import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants.mjs";
|
|
7
7
|
import { walk } from "./nestedRoutes.mjs";
|
|
8
8
|
import { getServerCombinedModuleFile, getServerLoadersFile } from "./utils.mjs";
|
|
9
|
-
import * as
|
|
9
|
+
import * as __rspack_external__templates_mjs_ab577925 from "./templates.mjs";
|
|
10
10
|
async function generateRoutesForEntry(entrypoint, appContext) {
|
|
11
11
|
const routes = [];
|
|
12
12
|
if (entrypoint.nestedRoutesEntry) {
|
|
@@ -87,7 +87,7 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
|
|
|
87
87
|
}
|
|
88
88
|
const { code } = await hooks.onBeforeGenerateRoutes.call({
|
|
89
89
|
entrypoint,
|
|
90
|
-
code: await
|
|
90
|
+
code: await __rspack_external__templates_mjs_ab577925.fileSystemRoutes({
|
|
91
91
|
metaName,
|
|
92
92
|
routes: routes,
|
|
93
93
|
ssrMode: isUseRsc(config) ? 'stream' : ssrMode,
|
|
@@ -104,12 +104,12 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
|
|
|
104
104
|
const routesServerFile = getServerLoadersFile(internalDirectory, entryName);
|
|
105
105
|
const filtedRoutesForServer = filterRoutesForServer(routes);
|
|
106
106
|
const routesForServerLoaderMatches = filterRoutesLoader(routes);
|
|
107
|
-
const code =
|
|
107
|
+
const code = __rspack_external__templates_mjs_ab577925.routesForServer({
|
|
108
108
|
routesForServerLoaderMatches
|
|
109
109
|
});
|
|
110
110
|
await fs.ensureFile(routesServerFile);
|
|
111
111
|
await fs.writeFile(routesServerFile, code);
|
|
112
|
-
const serverRoutesCode = await
|
|
112
|
+
const serverRoutesCode = await __rspack_external__templates_mjs_ab577925.fileSystemRoutes({
|
|
113
113
|
metaName,
|
|
114
114
|
routes: filtedRoutesForServer,
|
|
115
115
|
ssrMode,
|
|
@@ -123,7 +123,7 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
|
|
|
123
123
|
});
|
|
124
124
|
await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/routes.server.js`), serverRoutesCode, 'utf8');
|
|
125
125
|
}
|
|
126
|
-
const serverLoaderCombined =
|
|
126
|
+
const serverLoaderCombined = __rspack_external__templates_mjs_ab577925.ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext);
|
|
127
127
|
if (serverLoaderCombined) {
|
|
128
128
|
const serverLoaderFile = getServerCombinedModuleFile(internalDirectory, entryName);
|
|
129
129
|
await fs.outputFile(serverLoaderFile, serverLoaderCombined);
|
|
@@ -3,7 +3,7 @@ import { getMeta } from "@modern-js/utils";
|
|
|
3
3
|
import { cloneDeep } from "@modern-js/utils/lodash";
|
|
4
4
|
import { isPageComponentFile } from "./code/utils.mjs";
|
|
5
5
|
import { modifyEntrypoints } from "./entry.mjs";
|
|
6
|
-
import * as
|
|
6
|
+
import * as __rspack_external__code_templates_mjs_f6c22489 from "./code/templates.mjs";
|
|
7
7
|
let originEntrypoints = [];
|
|
8
8
|
async function handleModifyEntrypoints(entrypoints) {
|
|
9
9
|
return modifyEntrypoints(entrypoints);
|
|
@@ -20,7 +20,7 @@ async function handleGeneratorEntryCode(api, entrypoints) {
|
|
|
20
20
|
if (entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry) {
|
|
21
21
|
const route = appContext.serverRoutes.find((r)=>r.entryName === entrypoint.entryName);
|
|
22
22
|
const basename = route?.urlPath || '/';
|
|
23
|
-
generatorRegisterCode(internalDirectory, entrypoint.entryName, await
|
|
23
|
+
generatorRegisterCode(internalDirectory, entrypoint.entryName, await __rspack_external__code_templates_mjs_f6c22489.runtimeGlobalContext({
|
|
24
24
|
entryName: entrypoint.entryName,
|
|
25
25
|
metaName: appContext.metaName,
|
|
26
26
|
srcDirectory: appContext.srcDirectory,
|
|
@@ -30,7 +30,7 @@ async function handleGeneratorEntryCode(api, entrypoints) {
|
|
|
30
30
|
rscType: enableRsc ? 'client' : void 0,
|
|
31
31
|
basename
|
|
32
32
|
}));
|
|
33
|
-
if (enableRsc) generatorServerRegisterCode(internalDirectory, entrypoint.entryName, await
|
|
33
|
+
if (enableRsc) generatorServerRegisterCode(internalDirectory, entrypoint.entryName, await __rspack_external__code_templates_mjs_f6c22489.runtimeGlobalContext({
|
|
34
34
|
entryName: entrypoint.entryName,
|
|
35
35
|
metaName: appContext.metaName,
|
|
36
36
|
srcDirectory: appContext.srcDirectory,
|
|
@@ -3,8 +3,8 @@ import path from "path";
|
|
|
3
3
|
import { formatImportPath, fs } from "@modern-js/utils";
|
|
4
4
|
import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME, INDEX_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants.mjs";
|
|
5
5
|
import { resolveSSRMode } from "./ssr/mode.mjs";
|
|
6
|
-
import * as
|
|
7
|
-
import * as
|
|
6
|
+
import * as __rspack_external__template_mjs_d1604447 from "./template.mjs";
|
|
7
|
+
import * as __rspack_external__template_server_mjs_f98cfe58 from "./template.server.mjs";
|
|
8
8
|
const normalizePreEntry = (preEntry)=>{
|
|
9
9
|
if (!preEntry) return [];
|
|
10
10
|
if (Array.isArray(preEntry)) return preEntry.filter((v)=>'string' == typeof v && v.length > 0);
|
|
@@ -36,7 +36,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
|
|
|
36
36
|
nestedRoutesEntry
|
|
37
37
|
});
|
|
38
38
|
let indexCode = '';
|
|
39
|
-
indexCode = ssrMode || !config.server.rsc || customEntry ?
|
|
39
|
+
indexCode = ssrMode || !config.server.rsc || customEntry ? __rspack_external__template_mjs_d1604447.index({
|
|
40
40
|
srcDirectory,
|
|
41
41
|
internalSrcAlias,
|
|
42
42
|
metaName,
|
|
@@ -46,7 +46,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
|
|
|
46
46
|
mountId,
|
|
47
47
|
enableRsc: config.server.rsc,
|
|
48
48
|
isNestedRouter: !!entrypoint.nestedRoutesEntry
|
|
49
|
-
}) :
|
|
49
|
+
}) : __rspack_external__template_mjs_d1604447.entryForCSRWithRSC({
|
|
50
50
|
metaName,
|
|
51
51
|
entryName,
|
|
52
52
|
mountId,
|
|
@@ -77,7 +77,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
|
|
|
77
77
|
if (ssrMode) await fs.outputFile(bootstrapServerFile, `export const requestHandler = import('./${SERVER_ENTRY_POINT_FILE_NAME}').then((m) => m.requestHandler)`, 'utf8');
|
|
78
78
|
}
|
|
79
79
|
if (ssrMode) {
|
|
80
|
-
const indexServerCode =
|
|
80
|
+
const indexServerCode = __rspack_external__template_server_mjs_f98cfe58.serverIndex({
|
|
81
81
|
entry,
|
|
82
82
|
entryName,
|
|
83
83
|
internalSrcAlias,
|
|
@@ -91,16 +91,16 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
|
|
|
91
91
|
await fs.outputFile(indexServerFile, indexServerCode, 'utf8');
|
|
92
92
|
} else if (config.server.rsc) {
|
|
93
93
|
const indexServerFile = path.resolve(internalDirectory, `./${entryName}/${SERVER_ENTRY_POINT_FILE_NAME}`);
|
|
94
|
-
const indexServerCode =
|
|
94
|
+
const indexServerCode = __rspack_external__template_server_mjs_f98cfe58.entryForCSRWithRSC({
|
|
95
95
|
entryName,
|
|
96
96
|
metaName
|
|
97
97
|
});
|
|
98
98
|
await fs.outputFile(indexServerFile, indexServerCode, 'utf8');
|
|
99
99
|
}
|
|
100
|
-
const registerCode =
|
|
100
|
+
const registerCode = __rspack_external__template_mjs_d1604447.register();
|
|
101
101
|
const registerFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_REGISTER_FILE_NAME}`);
|
|
102
102
|
await fs.outputFile(registerFile, registerCode, 'utf8');
|
|
103
|
-
const registerRuntimeCode =
|
|
103
|
+
const registerRuntimeCode = __rspack_external__template_mjs_d1604447.runtimeRegister({
|
|
104
104
|
entryName,
|
|
105
105
|
srcDirectory,
|
|
106
106
|
internalSrcAlias,
|
|
@@ -114,7 +114,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
|
|
|
114
114
|
if (!config.server.rsc || entrypoint.nestedRoutesEntry) {
|
|
115
115
|
const route = serverRoutes.find((r)=>r.entryName === entryName);
|
|
116
116
|
const basename = route?.urlPath || '/';
|
|
117
|
-
contextCode =
|
|
117
|
+
contextCode = __rspack_external__template_mjs_d1604447.runtimeGlobalContext({
|
|
118
118
|
entryName,
|
|
119
119
|
srcDirectory,
|
|
120
120
|
internalSrcAlias,
|
|
@@ -125,18 +125,18 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
|
|
|
125
125
|
});
|
|
126
126
|
} else {
|
|
127
127
|
const AppProxyPath = path.join(internalDirectory, entryName, './AppProxy.jsx');
|
|
128
|
-
const appProxyCode =
|
|
128
|
+
const appProxyCode = __rspack_external__template_mjs_d1604447.AppProxyForRSC({
|
|
129
129
|
srcDirectory,
|
|
130
130
|
internalSrcAlias,
|
|
131
131
|
entry,
|
|
132
132
|
customEntry
|
|
133
133
|
});
|
|
134
134
|
await fs.outputFile(AppProxyPath, appProxyCode);
|
|
135
|
-
contextCode =
|
|
135
|
+
contextCode = __rspack_external__template_mjs_d1604447.runtimeGlobalContextForRSCClient({
|
|
136
136
|
metaName,
|
|
137
137
|
customEntry
|
|
138
138
|
});
|
|
139
|
-
const contextServerCode =
|
|
139
|
+
const contextServerCode = __rspack_external__template_mjs_d1604447.runtimeGlobalContextForRSCServer({
|
|
140
140
|
metaName
|
|
141
141
|
});
|
|
142
142
|
const contextFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}.server.js`);
|
|
@@ -50,7 +50,7 @@ const processCommentPlaceholders = (html)=>{
|
|
|
50
50
|
return html.replace(new RegExp(`${DOCUMENT_COMMENT_PLACEHOLDER_START}([\\s\\S]*?)${DOCUMENT_COMMENT_PLACEHOLDER_END}`, 'g'), (_scriptStr, $1)=>`${decodeHtmlEntities(decodeURIComponent($1))}`);
|
|
51
51
|
};
|
|
52
52
|
const requireFromString = (code, filename)=>{
|
|
53
|
-
const m = new module_0.Module(filename,
|
|
53
|
+
const m = new module_0.Module(filename, void 0);
|
|
54
54
|
m.filename = filename;
|
|
55
55
|
m.paths = module_0.Module._nodeModulePaths(path.dirname(filename));
|
|
56
56
|
m._compile(code, filename);
|
|
@@ -103,8 +103,7 @@ const applyExternalsPlugin = (child, compiler)=>{
|
|
|
103
103
|
]).apply(child);
|
|
104
104
|
};
|
|
105
105
|
const generateEntryCode = (docPath, _entryName)=>{
|
|
106
|
-
const
|
|
107
|
-
const esmRuntimeAPI = runtimeAPI.replace("cjs", "esm").replace(/.js$/, '.mjs');
|
|
106
|
+
const esmRuntimeAPI = require.resolve('@modern-js/runtime/document');
|
|
108
107
|
return `import React from 'react';
|
|
109
108
|
import ReactDomServer from 'react-dom/server';
|
|
110
109
|
import Document from ${JSON.stringify(docPath)};
|
|
@@ -7,7 +7,7 @@ import { resolveSSRMode } from "../../../cli/ssr/mode.mjs";
|
|
|
7
7
|
import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants.mjs";
|
|
8
8
|
import { walk } from "./nestedRoutes.mjs";
|
|
9
9
|
import { getServerCombinedModuleFile, getServerLoadersFile } from "./utils.mjs";
|
|
10
|
-
import * as
|
|
10
|
+
import * as __rspack_external__templates_mjs_ab577925 from "./templates.mjs";
|
|
11
11
|
async function generateRoutesForEntry(entrypoint, appContext) {
|
|
12
12
|
const routes = [];
|
|
13
13
|
if (entrypoint.nestedRoutesEntry) {
|
|
@@ -88,7 +88,7 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
|
|
|
88
88
|
}
|
|
89
89
|
const { code } = await hooks.onBeforeGenerateRoutes.call({
|
|
90
90
|
entrypoint,
|
|
91
|
-
code: await
|
|
91
|
+
code: await __rspack_external__templates_mjs_ab577925.fileSystemRoutes({
|
|
92
92
|
metaName,
|
|
93
93
|
routes: routes,
|
|
94
94
|
ssrMode: isUseRsc(config) ? 'stream' : ssrMode,
|
|
@@ -105,12 +105,12 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
|
|
|
105
105
|
const routesServerFile = getServerLoadersFile(internalDirectory, entryName);
|
|
106
106
|
const filtedRoutesForServer = filterRoutesForServer(routes);
|
|
107
107
|
const routesForServerLoaderMatches = filterRoutesLoader(routes);
|
|
108
|
-
const code =
|
|
108
|
+
const code = __rspack_external__templates_mjs_ab577925.routesForServer({
|
|
109
109
|
routesForServerLoaderMatches
|
|
110
110
|
});
|
|
111
111
|
await fs.ensureFile(routesServerFile);
|
|
112
112
|
await fs.writeFile(routesServerFile, code);
|
|
113
|
-
const serverRoutesCode = await
|
|
113
|
+
const serverRoutesCode = await __rspack_external__templates_mjs_ab577925.fileSystemRoutes({
|
|
114
114
|
metaName,
|
|
115
115
|
routes: filtedRoutesForServer,
|
|
116
116
|
ssrMode,
|
|
@@ -124,7 +124,7 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
|
|
|
124
124
|
});
|
|
125
125
|
await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/routes.server.js`), serverRoutesCode, 'utf8');
|
|
126
126
|
}
|
|
127
|
-
const serverLoaderCombined =
|
|
127
|
+
const serverLoaderCombined = __rspack_external__templates_mjs_ab577925.ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext);
|
|
128
128
|
if (serverLoaderCombined) {
|
|
129
129
|
const serverLoaderFile = getServerCombinedModuleFile(internalDirectory, entryName);
|
|
130
130
|
await fs.outputFile(serverLoaderFile, serverLoaderCombined);
|
|
@@ -4,7 +4,7 @@ import { getMeta } from "@modern-js/utils";
|
|
|
4
4
|
import { cloneDeep } from "@modern-js/utils/lodash";
|
|
5
5
|
import { isPageComponentFile } from "./code/utils.mjs";
|
|
6
6
|
import { modifyEntrypoints } from "./entry.mjs";
|
|
7
|
-
import * as
|
|
7
|
+
import * as __rspack_external__code_templates_mjs_f6c22489 from "./code/templates.mjs";
|
|
8
8
|
let originEntrypoints = [];
|
|
9
9
|
async function handleModifyEntrypoints(entrypoints) {
|
|
10
10
|
return modifyEntrypoints(entrypoints);
|
|
@@ -21,7 +21,7 @@ async function handleGeneratorEntryCode(api, entrypoints) {
|
|
|
21
21
|
if (entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry) {
|
|
22
22
|
const route = appContext.serverRoutes.find((r)=>r.entryName === entrypoint.entryName);
|
|
23
23
|
const basename = route?.urlPath || '/';
|
|
24
|
-
generatorRegisterCode(internalDirectory, entrypoint.entryName, await
|
|
24
|
+
generatorRegisterCode(internalDirectory, entrypoint.entryName, await __rspack_external__code_templates_mjs_f6c22489.runtimeGlobalContext({
|
|
25
25
|
entryName: entrypoint.entryName,
|
|
26
26
|
metaName: appContext.metaName,
|
|
27
27
|
srcDirectory: appContext.srcDirectory,
|
|
@@ -31,7 +31,7 @@ async function handleGeneratorEntryCode(api, entrypoints) {
|
|
|
31
31
|
rscType: enableRsc ? 'client' : void 0,
|
|
32
32
|
basename
|
|
33
33
|
}));
|
|
34
|
-
if (enableRsc) generatorServerRegisterCode(internalDirectory, entrypoint.entryName, await
|
|
34
|
+
if (enableRsc) generatorServerRegisterCode(internalDirectory, entrypoint.entryName, await __rspack_external__code_templates_mjs_f6c22489.runtimeGlobalContext({
|
|
35
35
|
entryName: entrypoint.entryName,
|
|
36
36
|
metaName: appContext.metaName,
|
|
37
37
|
srcDirectory: appContext.srcDirectory,
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "3.
|
|
18
|
+
"version": "3.9.0",
|
|
19
19
|
"engines": {
|
|
20
20
|
"node": ">=20"
|
|
21
21
|
},
|
|
@@ -205,7 +205,7 @@
|
|
|
205
205
|
"@loadable/server": "5.16.7",
|
|
206
206
|
"@swc/core": "1.15.41",
|
|
207
207
|
"@swc/helpers": "^0.5.17",
|
|
208
|
-
"@swc/plugin-loadable-components": "^
|
|
208
|
+
"@swc/plugin-loadable-components": "^12.0.0",
|
|
209
209
|
"@types/loadable__component": "^5.13.10",
|
|
210
210
|
"@types/react-helmet": "^6.1.11",
|
|
211
211
|
"cookie": "0.7.2",
|
|
@@ -215,20 +215,20 @@
|
|
|
215
215
|
"isbot": "3.8.0",
|
|
216
216
|
"react-helmet": "^6.1.0",
|
|
217
217
|
"react-is": "^18.3.1",
|
|
218
|
-
"@modern-js/plugin": "3.
|
|
219
|
-
"@modern-js/
|
|
220
|
-
"@modern-js/
|
|
221
|
-
"@modern-js/runtime-utils": "3.
|
|
222
|
-
"@modern-js/types": "3.
|
|
223
|
-
"@modern-js/utils": "3.
|
|
218
|
+
"@modern-js/plugin": "3.9.0",
|
|
219
|
+
"@modern-js/render": "3.9.0",
|
|
220
|
+
"@modern-js/plugin-data-loader": "3.9.0",
|
|
221
|
+
"@modern-js/runtime-utils": "3.9.0",
|
|
222
|
+
"@modern-js/types": "3.9.0",
|
|
223
|
+
"@modern-js/utils": "3.9.0"
|
|
224
224
|
},
|
|
225
225
|
"peerDependencies": {
|
|
226
|
-
"react": ">=18.
|
|
227
|
-
"react-dom": ">=18.
|
|
226
|
+
"react": ">=18.3.1",
|
|
227
|
+
"react-dom": ">=18.3.1"
|
|
228
228
|
},
|
|
229
229
|
"devDependencies": {
|
|
230
230
|
"@remix-run/web-fetch": "^4.1.3",
|
|
231
|
-
"@rsbuild/core": "2.
|
|
231
|
+
"@rsbuild/core": "2.2.0-rc.0",
|
|
232
232
|
"@rslib/core": "0.23.2",
|
|
233
233
|
"@testing-library/dom": "^10.4.1",
|
|
234
234
|
"@testing-library/react": "^16.3.2",
|
|
@@ -236,11 +236,11 @@
|
|
|
236
236
|
"@types/invariant": "^2.2.37",
|
|
237
237
|
"@types/loadable__server": "5.12.11",
|
|
238
238
|
"@types/node": "^20",
|
|
239
|
-
"react": "^19.2.
|
|
240
|
-
"react-dom": "^19.2.
|
|
239
|
+
"react": "^19.2.8",
|
|
240
|
+
"react-dom": "^19.2.8",
|
|
241
241
|
"ts-node": "^10.9.2",
|
|
242
242
|
"typescript": "^5",
|
|
243
|
-
"@modern-js/app-tools": "3.
|
|
243
|
+
"@modern-js/app-tools": "3.9.0",
|
|
244
244
|
"@modern-js/rslib": "2.68.10",
|
|
245
245
|
"@scripts/rstest-config": "2.66.0"
|
|
246
246
|
},
|