@modern-js/runtime 2.21.0 → 2.22.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/CHANGELOG.md +37 -0
- package/dist/cjs/cli/index.js +11 -1
- package/dist/cjs/common.js +9 -3
- package/dist/cjs/core/appConfig.js +6 -2
- package/dist/cjs/core/compatible.js +9 -3
- package/dist/cjs/core/index.js +24 -8
- package/dist/cjs/core/loader/index.js +3 -1
- package/dist/cjs/core/loader/loaderManager.js +6 -2
- package/dist/cjs/core/loader/useLoader.js +3 -1
- package/dist/cjs/core/plugin.js +12 -4
- package/dist/cjs/document/Body.js +3 -1
- package/dist/cjs/document/Comment.js +3 -1
- package/dist/cjs/document/DocumentContext.js +3 -1
- package/dist/cjs/document/DocumentStructureContext.js +3 -1
- package/dist/cjs/document/Head.js +6 -2
- package/dist/cjs/document/Html.js +3 -1
- package/dist/cjs/document/Links.js +3 -1
- package/dist/cjs/document/Root.js +6 -2
- package/dist/cjs/document/Script.js +3 -1
- package/dist/cjs/document/Scripts.js +3 -1
- package/dist/cjs/document/cli/index.js +6 -2
- package/dist/cjs/document/constants.js +51 -17
- package/dist/cjs/exports/head.js +3 -1
- package/dist/cjs/exports/loadable.js +3 -1
- package/dist/cjs/exports/server.js +3 -1
- package/dist/cjs/exports/styled.js +3 -1
- package/dist/cjs/index.js +27 -9
- package/dist/cjs/router/cli/index.js +3 -1
- package/dist/cjs/router/index.js +6 -2
- package/dist/cjs/router/runtime/DefaultNotFound.js +3 -1
- package/dist/cjs/router/runtime/DeferredDataScripts.js +3 -1
- package/dist/cjs/router/runtime/DeferredDataScripts.node.js +3 -1
- package/dist/cjs/router/runtime/PrefetchLink.js +9 -3
- package/dist/cjs/router/runtime/fetch.js +3 -1
- package/dist/cjs/router/runtime/fetch.node.js +3 -1
- package/dist/cjs/router/runtime/fetch.worker.js +3 -1
- package/dist/cjs/router/runtime/hooks.js +3 -1
- package/dist/cjs/router/runtime/index.js +183 -61
- package/dist/cjs/router/runtime/plugin.js +33 -5
- package/dist/cjs/router/runtime/plugin.node.js +28 -6
- package/dist/cjs/router/runtime/utils.js +21 -7
- package/dist/cjs/router/runtime/withRouter.js +3 -1
- package/dist/cjs/runtimeContext.js +6 -2
- package/dist/cjs/ssr/cli/index.js +10 -3
- package/dist/cjs/ssr/index.js +11 -4
- package/dist/cjs/ssr/index.node.js +6 -2
- package/dist/cjs/ssr/prefetch.js +3 -1
- package/dist/cjs/ssr/react/index.js +6 -2
- package/dist/cjs/ssr/react/nossr/index.js +3 -1
- package/dist/cjs/ssr/react/prerender/index.js +3 -1
- package/dist/cjs/ssr/react/prerender/util.js +15 -5
- package/dist/cjs/ssr/react/withCallback/index.js +3 -1
- package/dist/cjs/ssr/serverRender/helmet.js +3 -1
- package/dist/cjs/ssr/serverRender/index.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.after.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.share.js +6 -2
- package/dist/cjs/ssr/serverRender/renderToStream/bulidTemplate.before.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToStream/index.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToStream/loadable.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.worker.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToStream/styledComponent.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToStream/template.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToString/entry.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToString/index.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToString/loadable.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToString/reduce.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToString/styledComponent.js +3 -1
- package/dist/cjs/ssr/serverRender/renderToString/template.js +6 -2
- package/dist/cjs/ssr/serverRender/renderToString/type.js +3 -1
- package/dist/cjs/ssr/serverRender/time.js +3 -1
- package/dist/cjs/ssr/serverRender/time.worker.js +3 -1
- package/dist/cjs/ssr/serverRender/types.js +3 -1
- package/dist/cjs/ssr/serverRender/utils.js +15 -5
- package/dist/cjs/ssr/utils.js +15 -5
- package/dist/cjs/state/cli/index.js +3 -1
- package/dist/cjs/state/index.js +6 -2
- package/dist/cjs/state/plugins.js +12 -4
- package/dist/cjs/state/runtime/index.js +3 -1
- package/dist/cjs/state/runtime/plugin.js +3 -1
- package/dist/esm/cli/index.js +8 -0
- package/dist/esm/router/runtime/plugin.js +20 -0
- package/dist/esm/router/runtime/plugin.node.js +19 -3
- package/dist/esm/ssr/cli/index.js +10 -2
- package/dist/esm/ssr/index.js +5 -2
- package/dist/esm-node/cli/index.js +8 -0
- package/dist/esm-node/router/runtime/plugin.js +20 -0
- package/dist/esm-node/router/runtime/plugin.node.js +19 -3
- package/dist/esm-node/ssr/cli/index.js +7 -2
- package/dist/esm-node/ssr/index.js +5 -2
- package/dist/types/runtimeContext.d.ts +5 -1
- package/dist/types/ssr/serverRender/types.d.ts +1 -0
- package/package.json +10 -9
|
@@ -39,6 +39,9 @@ export const ssr = (config) => {
|
|
|
39
39
|
context
|
|
40
40
|
}));
|
|
41
41
|
} else if (renderLevel === RenderLevel.SERVER_RENDER) {
|
|
42
|
+
const loadableReadyOptions = {
|
|
43
|
+
chunkLoadingGlobal: config.chunkLoadingGlobal
|
|
44
|
+
};
|
|
42
45
|
if (isReact18()) {
|
|
43
46
|
loadableReady(() => {
|
|
44
47
|
let SSRApp = () => /* @__PURE__ */ _jsx(WithCallback, {
|
|
@@ -49,13 +52,13 @@ export const ssr = (config) => {
|
|
|
49
52
|
});
|
|
50
53
|
SSRApp = hoistNonReactStatics(SSRApp, App);
|
|
51
54
|
ModernHydrate(/* @__PURE__ */ _jsx(SSRApp, {}));
|
|
52
|
-
});
|
|
55
|
+
}, loadableReadyOptions);
|
|
53
56
|
} else {
|
|
54
57
|
loadableReady(() => {
|
|
55
58
|
ModernHydrate(/* @__PURE__ */ _jsx(App, {
|
|
56
59
|
context: hydrateContext
|
|
57
60
|
}), callback);
|
|
58
|
-
});
|
|
61
|
+
}, loadableReadyOptions);
|
|
59
62
|
}
|
|
60
63
|
} else {
|
|
61
64
|
console.warn(`unknow render level: ${renderLevel}, execute render()`);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { Store } from '@modern-js-reduck/store';
|
|
3
|
-
import type
|
|
3
|
+
import { type StaticHandlerContext, type Router, type RouterState } from '@modern-js/utils/runtime/remix-router';
|
|
4
4
|
import { createLoaderManager } from './core/loader/loaderManager';
|
|
5
5
|
import { runtime } from './core/plugin';
|
|
6
6
|
import { RouteManifest } from './router/runtime/types';
|
|
@@ -24,6 +24,10 @@ export interface BaseTRuntimeContext {
|
|
|
24
24
|
request?: SSRServerContext['request'];
|
|
25
25
|
response?: SSRServerContext['response'];
|
|
26
26
|
store?: Store;
|
|
27
|
+
router?: {
|
|
28
|
+
navigate: Router['navigate'];
|
|
29
|
+
location: RouterState['location'];
|
|
30
|
+
};
|
|
27
31
|
}
|
|
28
32
|
export interface TRuntimeContext extends BaseTRuntimeContext {
|
|
29
33
|
[key: string]: any;
|
|
@@ -7,6 +7,7 @@ export type ModernSSRReactComponent = React.ComponentType<any>;
|
|
|
7
7
|
export { RuntimeContext, RenderLevel };
|
|
8
8
|
export type SSRPluginConfig = {
|
|
9
9
|
crossorigin?: boolean | 'anonymous' | 'use-credentials';
|
|
10
|
+
chunkLoadingGlobal?: string;
|
|
10
11
|
} & Exclude<ServerUserConfig['ssr'], boolean>;
|
|
11
12
|
export type ServerRenderOptions = {
|
|
12
13
|
App: ModernSSRReactComponent;
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "2.
|
|
18
|
+
"version": "2.22.0",
|
|
19
19
|
"engines": {
|
|
20
20
|
"node": ">=14.17.6"
|
|
21
21
|
},
|
|
@@ -169,9 +169,9 @@
|
|
|
169
169
|
"redux-logger": "^3.0.6",
|
|
170
170
|
"styled-components": "^5.3.1",
|
|
171
171
|
"@swc/helpers": "0.5.1",
|
|
172
|
-
"@modern-js/plugin": "2.
|
|
173
|
-
"@modern-js/types": "2.
|
|
174
|
-
"@modern-js/utils": "2.
|
|
172
|
+
"@modern-js/plugin": "2.22.0",
|
|
173
|
+
"@modern-js/types": "2.22.0",
|
|
174
|
+
"@modern-js/utils": "2.22.0"
|
|
175
175
|
},
|
|
176
176
|
"peerDependencies": {
|
|
177
177
|
"react": ">=17",
|
|
@@ -191,11 +191,12 @@
|
|
|
191
191
|
"react-dom": "^18",
|
|
192
192
|
"ts-jest": "^29.1.0",
|
|
193
193
|
"typescript": "^5",
|
|
194
|
-
"
|
|
195
|
-
"@modern-js/
|
|
196
|
-
"@modern-js/
|
|
197
|
-
"@
|
|
198
|
-
"@scripts/
|
|
194
|
+
"webpack": "^5.82.1",
|
|
195
|
+
"@modern-js/app-tools": "2.22.0",
|
|
196
|
+
"@modern-js/core": "2.22.0",
|
|
197
|
+
"@modern-js/server-core": "2.22.0",
|
|
198
|
+
"@scripts/build": "2.22.0",
|
|
199
|
+
"@scripts/jest-config": "2.22.0"
|
|
199
200
|
},
|
|
200
201
|
"sideEffects": false,
|
|
201
202
|
"modernConfig": {},
|