@modern-js/runtime 2.64.1 → 2.64.3
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/code.js +67 -28
- package/dist/cjs/cli/constants.js +1 -1
- package/dist/cjs/cli/ssr/index.js +4 -1
- package/dist/cjs/cli/template.js +91 -4
- package/dist/cjs/cli/template.server.js +65 -3
- package/dist/cjs/core/context/index.js +6 -0
- package/dist/cjs/core/server/requestHandler.js +11 -5
- package/dist/cjs/core/server/stream/afterTemplate.js +2 -0
- package/dist/cjs/core/server/stream/createReadableStream.worker.js +8 -4
- package/dist/cjs/core/server/stream/index.js +12 -2
- package/dist/cjs/core/server/stream/shared.js +19 -6
- package/dist/cjs/core/server/string/index.js +4 -4
- package/dist/cjs/core/server/string/prefetch.js +3 -3
- package/dist/cjs/core/server/tracer.js +3 -18
- package/dist/cjs/router/cli/code/index.js +1 -1
- package/dist/cjs/router/cli/code/templates.js +27 -15
- package/dist/cjs/rsc/client.js +22 -0
- package/dist/cjs/rsc/server.js +22 -0
- package/dist/esm/cli/code.js +178 -51
- package/dist/esm/cli/constants.js +1 -1
- package/dist/esm/cli/ssr/index.js +4 -1
- package/dist/esm/cli/template.js +29 -4
- package/dist/esm/cli/template.server.js +11 -3
- package/dist/esm/core/context/index.js +5 -0
- package/dist/esm/core/server/requestHandler.js +12 -6
- package/dist/esm/core/server/stream/afterTemplate.js +5 -0
- package/dist/esm/core/server/stream/createReadableStream.worker.js +9 -5
- package/dist/esm/core/server/stream/index.js +5 -1
- package/dist/esm/core/server/stream/shared.js +76 -54
- package/dist/esm/core/server/string/index.js +5 -5
- package/dist/esm/core/server/string/prefetch.js +3 -3
- package/dist/esm/core/server/tracer.js +2 -16
- package/dist/esm/router/cli/code/index.js +1 -1
- package/dist/esm/router/cli/code/templates.js +29 -16
- package/dist/esm/rsc/client.js +1 -0
- package/dist/esm/rsc/server.js +1 -0
- package/dist/esm-node/cli/code.js +67 -28
- package/dist/esm-node/cli/constants.js +1 -1
- package/dist/esm-node/cli/ssr/index.js +4 -1
- package/dist/esm-node/cli/template.js +87 -4
- package/dist/esm-node/cli/template.server.js +64 -3
- package/dist/esm-node/core/context/index.js +5 -0
- package/dist/esm-node/core/server/requestHandler.js +12 -6
- package/dist/esm-node/core/server/stream/afterTemplate.js +2 -0
- package/dist/esm-node/core/server/stream/createReadableStream.worker.js +8 -4
- package/dist/esm-node/core/server/stream/index.js +1 -1
- package/dist/esm-node/core/server/stream/shared.js +20 -7
- package/dist/esm-node/core/server/string/index.js +5 -5
- package/dist/esm-node/core/server/string/prefetch.js +3 -3
- package/dist/esm-node/core/server/tracer.js +2 -15
- package/dist/esm-node/router/cli/code/index.js +1 -1
- package/dist/esm-node/router/cli/code/templates.js +27 -15
- package/dist/esm-node/rsc/client.js +1 -0
- package/dist/esm-node/rsc/server.js +1 -0
- package/dist/types/cli/constants.d.ts +1 -1
- package/dist/types/cli/template.d.ts +20 -1
- package/dist/types/cli/template.server.d.ts +4 -0
- package/dist/types/core/context/index.d.ts +5 -0
- package/dist/types/core/server/requestHandler.d.ts +3 -1
- package/dist/types/core/server/stream/shared.d.ts +8 -2
- package/dist/types/core/server/tracer.d.ts +3 -5
- package/dist/types/core/types.d.ts +3 -2
- package/dist/types/rsc/client.d.ts +1 -0
- package/dist/types/rsc/server.d.ts +1 -0
- package/package.json +29 -12
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { OnError } from '@modern-js/app-tools';
|
|
2
|
+
import type { ClientManifest as RscClientManifest, SSRManifest as RscSSRManifest, ServerManifest as RscServerManifest } from '@modern-js/types/server';
|
|
1
3
|
import type React from 'react';
|
|
2
4
|
import type { RuntimeContext } from '../../context';
|
|
3
5
|
import type { HandleRequestConfig } from '../requestHandler';
|
|
@@ -8,10 +10,14 @@ export type CreateReadableStreamFromElementOptions = {
|
|
|
8
10
|
ssrConfig: SSRConfig;
|
|
9
11
|
htmlTemplate: string;
|
|
10
12
|
entryName: string;
|
|
13
|
+
rscClientManifest?: RscClientManifest;
|
|
14
|
+
rscSSRManifest?: RscSSRManifest;
|
|
15
|
+
rscServerManifest?: RscServerManifest;
|
|
16
|
+
rscRoot?: React.ReactElement;
|
|
11
17
|
onShellReady?: () => void;
|
|
12
18
|
onShellError?: (error: unknown) => void;
|
|
13
19
|
onAllReady?: () => void;
|
|
14
|
-
onError
|
|
20
|
+
onError: OnError;
|
|
15
21
|
};
|
|
16
22
|
export type CreateReadableStreamFromElement = (request: Request, rootElement: React.ReactElement, options: CreateReadableStreamFromElementOptions) => Promise<ReadableStream<Uint8Array>>;
|
|
17
23
|
export declare enum ShellChunkStatus {
|
|
@@ -20,4 +26,4 @@ export declare enum ShellChunkStatus {
|
|
|
20
26
|
}
|
|
21
27
|
export declare function encodeForWebStream(thing: unknown): unknown;
|
|
22
28
|
export declare function getReadableStreamFromString(content: string): ReadableStream;
|
|
23
|
-
export declare function createRenderStreaming(
|
|
29
|
+
export declare function createRenderStreaming(createReadableStreamPromise: Promise<CreateReadableStreamFromElement>): RenderStreaming;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { OnError, OnTiming } from '@modern-js/app-tools';
|
|
1
2
|
export declare enum SSRTimings {
|
|
2
3
|
PRERENDER = "ssr-prerender",
|
|
3
4
|
RENDER_HTML = "ssr-render-html",
|
|
@@ -9,13 +10,10 @@ export declare enum SSRErrors {
|
|
|
9
10
|
USE_LOADER = "App run useLoader",
|
|
10
11
|
RENDER_HTML = "App Render To HTML",
|
|
11
12
|
RENDER_STREAM = "An error occurs during streaming SSR",
|
|
12
|
-
RENDER_SHELL = "An error occurs during streaming render shell"
|
|
13
|
+
RENDER_SHELL = "An error occurs during streaming render shell",
|
|
14
|
+
LOADER_ERROR = "App error occurs during data loader"
|
|
13
15
|
}
|
|
14
16
|
export type Tracer = {
|
|
15
17
|
onError: OnError;
|
|
16
18
|
onTiming: OnTiming;
|
|
17
19
|
};
|
|
18
|
-
export type OnError = (key: SSRErrors, e: unknown) => void;
|
|
19
|
-
export declare function createOnError(onError?: (e: unknown) => void): OnError;
|
|
20
|
-
export type OnTiming = (key: SSRTimings, cost: number) => void;
|
|
21
|
-
export declare function createOnTiming(onTiming?: (name: string, dur: number) => void): OnTiming;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { OnError, OnTiming } from '@modern-js/app-tools';
|
|
1
2
|
import type { BaseSSRServerContext } from '@modern-js/types';
|
|
2
3
|
import type { RenderLevel } from './constants';
|
|
3
4
|
import type { LoaderResult } from './loader/loaderManager';
|
|
@@ -50,8 +51,8 @@ export type SSRServerContext = Pick<BaseSSRServerContext, 'redirection' | 'respo
|
|
|
50
51
|
};
|
|
51
52
|
htmlModifiers: BuildHtmlCb[];
|
|
52
53
|
loaderFailureMode?: 'clientRender' | 'errorBoundary';
|
|
53
|
-
onError
|
|
54
|
-
onTiming
|
|
54
|
+
onError: OnError;
|
|
55
|
+
onTiming: OnTiming;
|
|
55
56
|
useJsonScript?: boolean;
|
|
56
57
|
};
|
|
57
58
|
interface TSSRBaseContext {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from '@modern-js/render/client';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from '@modern-js/render/rsc';
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "2.64.
|
|
18
|
+
"version": "2.64.3",
|
|
19
19
|
"engines": {
|
|
20
20
|
"node": ">=14.17.6"
|
|
21
21
|
},
|
|
@@ -115,6 +115,16 @@
|
|
|
115
115
|
"types": "./dist/types/cli/ssr/loadable-bundler-plugin.d.ts",
|
|
116
116
|
"jsnext:source": "./src/cli/ssr/loadable-bundler-plugin.ts",
|
|
117
117
|
"default": "./dist/cjs/cli/ssr/loadable-bundler-plugin.js"
|
|
118
|
+
},
|
|
119
|
+
"./rsc/server": {
|
|
120
|
+
"types": "./dist/types/rsc/server.d.ts",
|
|
121
|
+
"jsnext:source": "./src/rsc/server.ts",
|
|
122
|
+
"default": "./dist/esm/rsc/server.js"
|
|
123
|
+
},
|
|
124
|
+
"./rsc/client": {
|
|
125
|
+
"types": "./dist/types/rsc/client.d.ts",
|
|
126
|
+
"jsnext:source": "./src/rsc/client.ts",
|
|
127
|
+
"default": "./dist/esm/rsc/client.js"
|
|
118
128
|
}
|
|
119
129
|
},
|
|
120
130
|
"typesVersions": {
|
|
@@ -172,6 +182,12 @@
|
|
|
172
182
|
],
|
|
173
183
|
"loadable-bundler-plugin": [
|
|
174
184
|
"./dist/types/cli/ssr/loadable-bundler-plugin.d.ts"
|
|
185
|
+
],
|
|
186
|
+
"rsc/server": [
|
|
187
|
+
"./dist/types/rsc/server.d.ts"
|
|
188
|
+
],
|
|
189
|
+
"rsc/client": [
|
|
190
|
+
"./dist/types/rsc/client.d.ts"
|
|
175
191
|
]
|
|
176
192
|
}
|
|
177
193
|
},
|
|
@@ -200,12 +216,13 @@
|
|
|
200
216
|
"react-is": "^18",
|
|
201
217
|
"react-side-effect": "^2.1.1",
|
|
202
218
|
"styled-components": "^5.3.1",
|
|
203
|
-
"@modern-js/plugin": "2.64.
|
|
204
|
-
"@modern-js/plugin-
|
|
205
|
-
"@modern-js/plugin-
|
|
206
|
-
"@modern-js/
|
|
207
|
-
"@modern-js/runtime-utils": "2.64.
|
|
208
|
-
"@modern-js/
|
|
219
|
+
"@modern-js/plugin": "2.64.3",
|
|
220
|
+
"@modern-js/plugin-data-loader": "2.64.3",
|
|
221
|
+
"@modern-js/plugin-v2": "2.64.3",
|
|
222
|
+
"@modern-js/render": "2.64.3",
|
|
223
|
+
"@modern-js/runtime-utils": "2.64.3",
|
|
224
|
+
"@modern-js/types": "2.64.3",
|
|
225
|
+
"@modern-js/utils": "2.64.3"
|
|
209
226
|
},
|
|
210
227
|
"peerDependencies": {
|
|
211
228
|
"react": ">=17",
|
|
@@ -213,7 +230,7 @@
|
|
|
213
230
|
},
|
|
214
231
|
"devDependencies": {
|
|
215
232
|
"@remix-run/web-fetch": "^4.1.3",
|
|
216
|
-
"@rsbuild/core": "1.
|
|
233
|
+
"@rsbuild/core": "1.2.8",
|
|
217
234
|
"@testing-library/react": "^13.4.0",
|
|
218
235
|
"@types/cookie": "0.6.0",
|
|
219
236
|
"@types/invariant": "^2.2.30",
|
|
@@ -228,10 +245,10 @@
|
|
|
228
245
|
"ts-jest": "^29.1.0",
|
|
229
246
|
"ts-node": "^10.9.1",
|
|
230
247
|
"typescript": "^5",
|
|
231
|
-
"webpack": "^5.
|
|
232
|
-
"@
|
|
233
|
-
"@scripts/
|
|
234
|
-
"@
|
|
248
|
+
"webpack": "^5.98.0",
|
|
249
|
+
"@scripts/build": "2.64.3",
|
|
250
|
+
"@scripts/jest-config": "2.64.3",
|
|
251
|
+
"@modern-js/app-tools": "2.64.3"
|
|
235
252
|
},
|
|
236
253
|
"sideEffects": false,
|
|
237
254
|
"publishConfig": {
|