isr-engine 3.1.1 → 3.1.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/cli/cli.js +1 -1
- package/dist/config/loadConfig.d.ts.map +1 -1
- package/dist/{createCacheInspectorMiddleware-BpMpmP_a.js → createCacheInspectorMiddleware-GgzKVkq2.js} +2 -2
- package/dist/{createCacheInspectorMiddleware-BpMpmP_a.js.map → createCacheInspectorMiddleware-GgzKVkq2.js.map} +1 -1
- package/dist/{createISRApp-D88Xp0Fb.js → createISRApp-DPD3Er4F.js} +25 -33
- package/dist/createISRApp-DPD3Er4F.js.map +1 -0
- package/dist/{createImagePlugin-Cdz3QfrJ.js → createImagePlugin-QNvY9vPB.js} +2 -2
- package/dist/{createImagePlugin-Cdz3QfrJ.js.map → createImagePlugin-QNvY9vPB.js.map} +1 -1
- package/dist/defaults/runtime/seo-runtime.d.ts +2 -0
- package/dist/defaults/runtime/seo-runtime.d.ts.map +1 -1
- package/dist/isr-engine.js +3 -3
- package/dist/isr-engine.js.map +1 -1
- package/dist/runtime/routes.d.ts +18 -2
- package/dist/runtime/routes.d.ts.map +1 -1
- package/package.json +20 -28
- package/src/defaults/runtime/defineClientEntry.tsx +26 -15
- package/src/defaults/runtime/defineServerEntry.tsx +47 -44
- package/src/defaults/runtime/request.tsx +2 -2
- package/src/defaults/runtime/seo-runtime.ts +26 -30
- package/src/runtime/routes.tsx +102 -94
- package/dist/Logger-DqBS_3v8.cjs +0 -184
- package/dist/Logger-DqBS_3v8.cjs.map +0 -1
- package/dist/abVariantContext-BvAMuhjj.cjs +0 -510
- package/dist/abVariantContext-BvAMuhjj.cjs.map +0 -1
- package/dist/adapters/observability/index.cjs +0 -152
- package/dist/adapters/observability/index.cjs.map +0 -1
- package/dist/adapters/runtime/index.cjs +0 -100
- package/dist/adapters/runtime/index.cjs.map +0 -1
- package/dist/cli/cli.cjs +0 -372
- package/dist/cli/cli.cjs.map +0 -1
- package/dist/config/defineConfig.cjs +0 -26
- package/dist/config/defineConfig.cjs.map +0 -1
- package/dist/createCacheInspectorMiddleware-DvRhF_-D.cjs +0 -112
- package/dist/createCacheInspectorMiddleware-DvRhF_-D.cjs.map +0 -1
- package/dist/createISRApp-D88Xp0Fb.js.map +0 -1
- package/dist/createISRApp-tRkpdmpp.cjs +0 -8232
- package/dist/createISRApp-tRkpdmpp.cjs.map +0 -1
- package/dist/createImagePlugin-DomuzpoI.cjs +0 -487
- package/dist/createImagePlugin-DomuzpoI.cjs.map +0 -1
- package/dist/defaults/auto-observability.cjs +0 -147
- package/dist/defaults/auto-observability.cjs.map +0 -1
- package/dist/defaults/runtime/defineSiteHooks.cjs +0 -11
- package/dist/defineSiteHooks-BuhvW5YB.cjs +0 -770
- package/dist/defineSiteHooks-BuhvW5YB.cjs.map +0 -1
- package/dist/error500-template-BvZmvKoa.cjs +0 -63
- package/dist/error500-template-BvZmvKoa.cjs.map +0 -1
- package/dist/i18n-CS5QhOO0.cjs +0 -221
- package/dist/i18n-CS5QhOO0.cjs.map +0 -1
- package/dist/image/index.cjs +0 -93
- package/dist/image/index.cjs.map +0 -1
- package/dist/isr-engine.cjs +0 -3332
- package/dist/isr-engine.cjs.map +0 -1
- package/dist/rolldown-runtime-DakpK96I.cjs +0 -43
- package/dist/rsc/browser.cjs +0 -109
- package/dist/rsc/browser.cjs.map +0 -1
- package/dist/rsc/index.cjs +0 -32
- package/dist/rsc-CYT6B6bf.cjs +0 -237
- package/dist/rsc-CYT6B6bf.cjs.map +0 -1
package/dist/runtime/routes.d.ts
CHANGED
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
import * as React from 'react';
|
|
41
41
|
import type { PageSeoMeta } from '../defaults/runtime/seo-runtime';
|
|
42
42
|
declare global {
|
|
43
|
-
var
|
|
43
|
+
var __ISR_ENGINE_COMPILED_ROUTE_MANIFESTS__: Map<ResolveRoute, CompiledManifest> | undefined;
|
|
44
44
|
}
|
|
45
45
|
/** 路由匹配后传给 page 的 props */
|
|
46
46
|
export interface PageProps {
|
|
@@ -67,7 +67,7 @@ export interface RouteEntry extends RouteModuleRef {
|
|
|
67
67
|
}
|
|
68
68
|
export interface RouteManifest {
|
|
69
69
|
routes: readonly RouteEntry[];
|
|
70
|
-
/**
|
|
70
|
+
/** 路由未匹配时渲染此模块,使用其 seo 导出并返回 HTTP 404。 */
|
|
71
71
|
notFound?: RouteModuleRef;
|
|
72
72
|
}
|
|
73
73
|
export interface DefinedRoutes {
|
|
@@ -78,11 +78,27 @@ export interface PageSeoContext extends PageProps {
|
|
|
78
78
|
url: URL;
|
|
79
79
|
}
|
|
80
80
|
export type PageSeoExport = PageSeoMeta | null | undefined | ((ctx: PageSeoContext) => PageSeoMeta | null | undefined | Promise<PageSeoMeta | null | undefined>);
|
|
81
|
+
interface PreparedPage {
|
|
82
|
+
ref: RouteModuleRef;
|
|
83
|
+
Component: PageComponent;
|
|
84
|
+
}
|
|
85
|
+
interface CompiledRoute extends PreparedPage {
|
|
86
|
+
re: RegExp;
|
|
87
|
+
keys: string[];
|
|
88
|
+
}
|
|
89
|
+
interface CompiledManifest {
|
|
90
|
+
routes: CompiledRoute[];
|
|
91
|
+
notFound?: PreparedPage;
|
|
92
|
+
}
|
|
81
93
|
export type ResolveRoute = (ctx: {
|
|
82
94
|
pathname: string;
|
|
83
95
|
searchParams: URLSearchParams;
|
|
84
96
|
}) => React.ReactNode;
|
|
85
97
|
export declare function defineRoutes(config: RouteManifest): DefinedRoutes;
|
|
98
|
+
export declare function resolvePageRoute(url: URL, routes?: ResolveRoute, includeUnambiguousFallback?: boolean): Promise<{
|
|
99
|
+
notFound: boolean;
|
|
100
|
+
seoMeta: PageSeoMeta | null;
|
|
101
|
+
}>;
|
|
86
102
|
export declare function resolvePageSeoMeta(url: URL): Promise<PageSeoMeta | null>;
|
|
87
103
|
export {};
|
|
88
104
|
//# sourceMappingURL=routes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/runtime/routes.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAGH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,
|
|
1
|
+
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/runtime/routes.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAGH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,uCAAuC,EAAE,GAAG,CAAC,YAAY,EAAE,gBAAgB,CAAC,GAAG,SAAS,CAAC;CAC9F;AAED,2BAA2B;AAC3B,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,eAAe,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED;;;;;GAKG;AAEH,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;AAErD,KAAK,WAAW,GAAG,MAAM,CAAC;AAC1B,MAAM,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;AAE3D,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,iBAAiB,CAAC;IACxB,wBAAwB;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,UAAW,SAAQ,cAAc;IAChD,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;IAC9B,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,uBAAuB;IACvB,MAAM,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,cAAe,SAAQ,SAAS;IAC/C,GAAG,EAAE,GAAG,CAAC;CACV;AAED,MAAM,MAAM,aAAa,GACrB,WAAW,GACX,IAAI,GACJ,SAAS,GACT,CAAC,CACC,GAAG,EAAE,cAAc,KAChB,WAAW,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC;AAEnF,UAAU,YAAY;IACpB,GAAG,EAAE,cAAc,CAAC;IACpB,SAAS,EAAE,aAAa,CAAC;CAC1B;AAED,UAAU,aAAc,SAAQ,YAAY;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,UAAU,gBAAgB;IACxB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAuBD,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,eAAe,CAAC;CAC/B,KAAK,KAAK,CAAC,SAAS,CAAC;AAiCtB,wBAAgB,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa,CAiBjE;AA0BD,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,GAAG,EACR,MAAM,CAAC,EAAE,YAAY,EACrB,0BAA0B,UAAQ,GACjC,OAAO,CAAC;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAAA;CAAE,CAAC,CAW7D;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAE9E"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "isr-engine",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.3",
|
|
4
4
|
"description": "ISR/SSG/Fallback rendering orchestration on Vite + React 19 RSC.",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"repository": {
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"registry": "https://registry.npmjs.org/"
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
|
-
"main": "./dist/isr-engine.
|
|
17
|
+
"main": "./dist/isr-engine.js",
|
|
18
18
|
"module": "./dist/isr-engine.js",
|
|
19
19
|
"types": "./dist/index.d.ts",
|
|
20
20
|
"bin": {
|
|
@@ -35,15 +35,13 @@
|
|
|
35
35
|
],
|
|
36
36
|
"exports": {
|
|
37
37
|
".": {
|
|
38
|
-
"
|
|
39
|
-
"
|
|
40
|
-
"types": "./dist/index.d.ts"
|
|
38
|
+
"types": "./dist/index.d.ts",
|
|
39
|
+
"default": "./dist/isr-engine.js"
|
|
41
40
|
},
|
|
42
41
|
"./rsc": {
|
|
42
|
+
"types": "./dist/rsc/index.d.ts",
|
|
43
43
|
"browser": "./dist/rsc/browser.js",
|
|
44
|
-
"
|
|
45
|
-
"require": "./dist/rsc/index.cjs",
|
|
46
|
-
"types": "./dist/rsc/index.d.ts"
|
|
44
|
+
"default": "./dist/rsc/index.js"
|
|
47
45
|
},
|
|
48
46
|
"./server-entry": {
|
|
49
47
|
"default": "./src/defaults/runtime/defineServerEntry.tsx"
|
|
@@ -53,33 +51,27 @@
|
|
|
53
51
|
},
|
|
54
52
|
"./auto-observability": {
|
|
55
53
|
"types": "./dist/defaults/auto-observability.d.ts",
|
|
56
|
-
"
|
|
57
|
-
"require": "./dist/defaults/auto-observability.cjs"
|
|
54
|
+
"default": "./dist/defaults/auto-observability.js"
|
|
58
55
|
},
|
|
59
56
|
"./site-hooks": {
|
|
60
57
|
"types": "./dist/defaults/runtime/defineSiteHooks.d.ts",
|
|
61
|
-
"
|
|
62
|
-
"require": "./dist/defaults/runtime/defineSiteHooks.cjs"
|
|
58
|
+
"default": "./dist/defaults/runtime/defineSiteHooks.js"
|
|
63
59
|
},
|
|
64
60
|
"./config": {
|
|
65
61
|
"types": "./dist/config/defineConfig.d.ts",
|
|
66
|
-
"
|
|
67
|
-
"require": "./dist/config/defineConfig.cjs"
|
|
62
|
+
"default": "./dist/config/defineConfig.js"
|
|
68
63
|
},
|
|
69
64
|
"./adapters/observability": {
|
|
70
|
-
"
|
|
71
|
-
"
|
|
72
|
-
"types": "./dist/adapters/observability/index.d.ts"
|
|
65
|
+
"types": "./dist/adapters/observability/index.d.ts",
|
|
66
|
+
"default": "./dist/adapters/observability/index.js"
|
|
73
67
|
},
|
|
74
68
|
"./adapters/runtime": {
|
|
75
|
-
"
|
|
76
|
-
"
|
|
77
|
-
"types": "./dist/adapters/runtime/index.d.ts"
|
|
69
|
+
"types": "./dist/adapters/runtime/index.d.ts",
|
|
70
|
+
"default": "./dist/adapters/runtime/index.js"
|
|
78
71
|
},
|
|
79
72
|
"./image": {
|
|
80
|
-
"
|
|
81
|
-
"
|
|
82
|
-
"types": "./dist/runtime/Image.d.ts"
|
|
73
|
+
"types": "./dist/runtime/Image.d.ts",
|
|
74
|
+
"default": "./dist/image/index.js"
|
|
83
75
|
},
|
|
84
76
|
"./runtime": {
|
|
85
77
|
"types": "./dist/runtime/index.d.ts",
|
|
@@ -88,7 +80,7 @@
|
|
|
88
80
|
"./package.json": "./package.json"
|
|
89
81
|
},
|
|
90
82
|
"scripts": {
|
|
91
|
-
"build": "vite build && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && chmod +x dist/cli/cli.js
|
|
83
|
+
"build": "vite build && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && chmod +x dist/cli/cli.js",
|
|
92
84
|
"watch": "vite build --watch",
|
|
93
85
|
"clean": "rimraf dist",
|
|
94
86
|
"lint": "eslint . --ext .ts,.tsx,.js,.jsx",
|
|
@@ -102,13 +94,13 @@
|
|
|
102
94
|
"bench": "node bench/runner.mjs",
|
|
103
95
|
"check": "pnpm run type-check && pnpm run lint && pnpm run test",
|
|
104
96
|
"audit:security": "pnpm audit --registry=https://registry.npmjs.org --audit-level=low",
|
|
97
|
+
"version": "pnpm run build",
|
|
105
98
|
"prepublishOnly": "pnpm run audit:security",
|
|
106
99
|
"release": "semantic-release",
|
|
107
100
|
"prepare": "husky",
|
|
108
|
-
"test:package": "node
|
|
109
|
-
"test:
|
|
110
|
-
"test:
|
|
111
|
-
"test:release": "node scripts/check-release.mjs"
|
|
101
|
+
"test:package": "node e2e/package/check.mjs",
|
|
102
|
+
"test:workers": "tsc -p e2e/workers && node --test e2e/workers/runtime.test.mjs",
|
|
103
|
+
"test:release": "node --test e2e/release-policy.test.mjs"
|
|
112
104
|
},
|
|
113
105
|
"engines": {
|
|
114
106
|
"node": "24.15.0"
|
|
@@ -54,7 +54,12 @@ import {
|
|
|
54
54
|
} from './navigation-history.client';
|
|
55
55
|
import { installDevRenderInspector } from './dev-render-inspector';
|
|
56
56
|
import { setClientI18n } from '../../runtime/i18n-store';
|
|
57
|
-
import {
|
|
57
|
+
import {
|
|
58
|
+
applySeoToDocument,
|
|
59
|
+
clearInjectedSeo,
|
|
60
|
+
type IntlPayload,
|
|
61
|
+
type PageSeoMeta,
|
|
62
|
+
} from './seo-runtime';
|
|
58
63
|
import {
|
|
59
64
|
installBrowserObservability,
|
|
60
65
|
type BrowserObservabilityHandle,
|
|
@@ -134,11 +139,19 @@ async function prepareFetchedDevStyles(
|
|
|
134
139
|
result.styleIds = await preparePayloadDevStyles(generation);
|
|
135
140
|
}
|
|
136
141
|
|
|
137
|
-
function
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
+
function transitionPayload(
|
|
143
|
+
setState: (state: DefaultRscPayloadState) => void,
|
|
144
|
+
state: DefaultRscPayloadState
|
|
145
|
+
): void {
|
|
146
|
+
// App head nodes must be reconciled without the previous route's injected tags.
|
|
147
|
+
clearInjectedSeo();
|
|
148
|
+
React.startTransition(() => setState(state));
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
function PayloadRoot({ payload, generation, styleIds }: DefaultRscPayloadState): React.ReactNode {
|
|
152
|
+
React.useLayoutEffect(() => {
|
|
153
|
+
applySeoToDocument(payload.seoMeta, payload.siteBaseUrl ?? undefined);
|
|
154
|
+
}, [payload]);
|
|
142
155
|
if (!import.meta.env.DEV || generation === undefined) return payload.root;
|
|
143
156
|
return (
|
|
144
157
|
<DevStyleCommitBoundary key={generation} generation={generation} styleIds={styleIds}>
|
|
@@ -339,7 +352,6 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
339
352
|
signal.throwIfAborted();
|
|
340
353
|
syncBrowserUrlToFinalRedirect(response, requestedUrl);
|
|
341
354
|
setClientI18n(payload.intl);
|
|
342
|
-
applySeoToDocument(payload.seoMeta, payload.siteBaseUrl ?? undefined);
|
|
343
355
|
setPayload(createPayloadState(payload, generation, styleIds));
|
|
344
356
|
},
|
|
345
357
|
async (result, generation) => {
|
|
@@ -356,7 +368,7 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
356
368
|
const [failed, setFailed] = React.useState(false);
|
|
357
369
|
|
|
358
370
|
React.useEffect(() => {
|
|
359
|
-
setPayload =
|
|
371
|
+
setPayload = state => transitionPayload(setPayload_, state);
|
|
360
372
|
}, [setPayload_]);
|
|
361
373
|
|
|
362
374
|
React.useEffect(() => {
|
|
@@ -384,7 +396,7 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
384
396
|
)
|
|
385
397
|
);
|
|
386
398
|
}
|
|
387
|
-
return
|
|
399
|
+
return <PayloadRoot {...payloadState} />;
|
|
388
400
|
}
|
|
389
401
|
|
|
390
402
|
setServerCallback(async (id: string, args: unknown[]) => {
|
|
@@ -403,7 +415,6 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
403
415
|
},
|
|
404
416
|
({ payload, styleIds }, generation) => {
|
|
405
417
|
setClientI18n(payload.intl);
|
|
406
|
-
applySeoToDocument(payload.seoMeta, payload.siteBaseUrl ?? undefined);
|
|
407
418
|
setPayload(createPayloadState(payload, generation, styleIds));
|
|
408
419
|
return payload;
|
|
409
420
|
},
|
|
@@ -464,7 +475,7 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
464
475
|
function BrowserRoot(): React.ReactNode {
|
|
465
476
|
const [payloadState, setPayload_] = React.useState<DefaultRscPayloadState>(initialPayloadState);
|
|
466
477
|
React.useEffect(() => {
|
|
467
|
-
setPayload =
|
|
478
|
+
setPayload = state => transitionPayload(setPayload_, state);
|
|
468
479
|
}, [setPayload_]);
|
|
469
480
|
React.useEffect(() => {
|
|
470
481
|
const onNavigation = import.meta.env.DEV
|
|
@@ -478,7 +489,7 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
478
489
|
};
|
|
479
490
|
return listenNavigation(onNavigation, hooks.onNavigate, observability, hookContext);
|
|
480
491
|
}, []);
|
|
481
|
-
return
|
|
492
|
+
return <PayloadRoot {...payloadState} />;
|
|
482
493
|
}
|
|
483
494
|
|
|
484
495
|
async function fetchRscPayload(): Promise<void> {
|
|
@@ -497,7 +508,6 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
497
508
|
signal.throwIfAborted();
|
|
498
509
|
syncBrowserUrlToFinalRedirect(response, requestedUrl);
|
|
499
510
|
setClientI18n(payload.intl);
|
|
500
|
-
applySeoToDocument(payload.seoMeta, payload.siteBaseUrl ?? undefined);
|
|
501
511
|
setPayload(createPayloadState(payload, generation, styleIds));
|
|
502
512
|
},
|
|
503
513
|
async (result, generation) => {
|
|
@@ -525,7 +535,6 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
525
535
|
},
|
|
526
536
|
({ payload, styleIds }, generation) => {
|
|
527
537
|
setClientI18n(payload.intl);
|
|
528
|
-
applySeoToDocument(payload.seoMeta, payload.siteBaseUrl ?? undefined);
|
|
529
538
|
setPayload(createPayloadState(payload, generation, styleIds));
|
|
530
539
|
return payload;
|
|
531
540
|
},
|
|
@@ -554,7 +563,9 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
554
563
|
</HydrationShell>
|
|
555
564
|
);
|
|
556
565
|
|
|
557
|
-
//
|
|
566
|
+
// Reconcile the app's head without adopting injected nodes. PayloadRoot
|
|
567
|
+
// reapplies metadata after hydration.
|
|
568
|
+
clearInjectedSeo();
|
|
558
569
|
hydrateRoot(document, browserRoot, { formState: initialPayload.formState });
|
|
559
570
|
installInspector();
|
|
560
571
|
schedulePostCommitInspectorInstall();
|
|
@@ -30,10 +30,12 @@ import type { ReactFormState } from 'react-dom/client';
|
|
|
30
30
|
|
|
31
31
|
// @ts-expect-error - @app 别名在 createIsrPlugin 注入;指向用户的 src/app.tsx
|
|
32
32
|
import { App } from '@app/_entry';
|
|
33
|
-
// @
|
|
34
|
-
import '@app/_routes';
|
|
33
|
+
// @ts-expect-error - App route manifest resolved by createIsrPlugin.
|
|
34
|
+
import * as appRoutes from '@app/_routes';
|
|
35
|
+
// @ts-expect-error - Runtime config resolved by createIsrPlugin.
|
|
36
|
+
import runtimeConfig from 'virtual:isr-engine/runtime-config';
|
|
35
37
|
|
|
36
|
-
import { parseRenderRequest } from './request';
|
|
38
|
+
import { parseRenderRequest, type RenderRequest } from './request';
|
|
37
39
|
import {
|
|
38
40
|
declareDevClientReferenceStyles,
|
|
39
41
|
runWithDevStyleDeclarationCollection,
|
|
@@ -41,7 +43,9 @@ import {
|
|
|
41
43
|
import { type IntlPayload, type PageSeoMeta, injectSeoMeta, mergePageSeoMeta } from './seo-runtime';
|
|
42
44
|
import { injectHeadExtras } from './head-extras-runtime';
|
|
43
45
|
import { runWithI18n } from './i18n-server';
|
|
44
|
-
import {
|
|
46
|
+
import { resolvePageRoute, type ResolveRoute } from '../../runtime/routes';
|
|
47
|
+
import { parseLocale, resolveI18nConfig, type I18nConfig } from '../../runtime/i18n';
|
|
48
|
+
import type { RuntimeConfig } from '../../types/ISRConfig';
|
|
45
49
|
import { getRequestContext } from '../../context/RequestContext';
|
|
46
50
|
|
|
47
51
|
interface DefaultRscPayload {
|
|
@@ -111,6 +115,8 @@ export interface ServerEntryHooks<C extends ServerCtx = ServerCtx> {
|
|
|
111
115
|
* 不要在这里返回 Response —— 兜底由 engine 处理
|
|
112
116
|
*/
|
|
113
117
|
onError?: (error: unknown, request: Request, ctx: C) => void | Promise<void>;
|
|
118
|
+
/** URL locale settings exposed by site hooks. */
|
|
119
|
+
intl?: Partial<I18nConfig>;
|
|
114
120
|
/**
|
|
115
121
|
* 单页 i18n 数据加载器 —— 返回值经 RSC payload 序列化到客户端
|
|
116
122
|
*
|
|
@@ -162,6 +168,10 @@ function genTraceId(): string {
|
|
|
162
168
|
export function defineServerEntry<C extends ServerCtx = ServerCtx>(
|
|
163
169
|
hooks: ServerEntryHooks<C> = {}
|
|
164
170
|
): ServerEntryModule {
|
|
171
|
+
const configuredIntl = hooks.intl?.locales?.length
|
|
172
|
+
? hooks.intl
|
|
173
|
+
: (runtimeConfig as Partial<RuntimeConfig> | undefined)?.i18n;
|
|
174
|
+
const routeI18n = configuredIntl?.locales?.length ? resolveI18nConfig(configuredIntl) : undefined;
|
|
165
175
|
return {
|
|
166
176
|
async fetch(request) {
|
|
167
177
|
const requestStore = getRequestContext();
|
|
@@ -195,44 +205,33 @@ export function defineServerEntry<C extends ServerCtx = ServerCtx>(
|
|
|
195
205
|
}
|
|
196
206
|
}
|
|
197
207
|
|
|
198
|
-
const
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
let localePrefix = '';
|
|
211
|
-
if (intl?.locale) {
|
|
212
|
-
localePrefix = `/${intl.locale}`;
|
|
213
|
-
if (url.pathname === localePrefix) {
|
|
214
|
-
url.pathname = '/';
|
|
215
|
-
} else if (url.pathname.startsWith(`${localePrefix}/`)) {
|
|
216
|
-
url.pathname = url.pathname.slice(localePrefix.length);
|
|
217
|
-
}
|
|
218
|
-
}
|
|
219
|
-
const [pageSeoMeta, hookSeoMeta] = await Promise.all([
|
|
220
|
-
resolvePageSeoMeta(url),
|
|
208
|
+
const renderRequest = parseRenderRequest(request);
|
|
209
|
+
const url = new URL(renderRequest.url);
|
|
210
|
+
const localeConfig =
|
|
211
|
+
routeI18n ?? (intl?.locale && { locales: [intl.locale], defaultLocale: intl.locale });
|
|
212
|
+
const localized = localeConfig ? parseLocale(url.pathname, localeConfig) : undefined;
|
|
213
|
+
if (localized?.hasPrefix) url.pathname = localized.pathname;
|
|
214
|
+
|
|
215
|
+
const routeResolver = (Reflect.get(appRoutes, 'routes') ??
|
|
216
|
+
Reflect.get(appRoutes, 'default')) as ResolveRoute | undefined;
|
|
217
|
+
const { seoMeta, notFound } = await runWithI18n(intl, async () => {
|
|
218
|
+
const [page, hookSeoMeta] = await Promise.all([
|
|
219
|
+
resolvePageRoute(url, routeResolver),
|
|
221
220
|
hooks.loadSeoMeta
|
|
222
221
|
? Promise.resolve(hooks.loadSeoMeta(request, ctx))
|
|
223
222
|
: Promise.resolve(null),
|
|
224
223
|
]);
|
|
225
|
-
const merged = mergePageSeoMeta(
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
return
|
|
224
|
+
const merged = mergePageSeoMeta(page.seoMeta, hookSeoMeta);
|
|
225
|
+
const canonical = merged?.canonical;
|
|
226
|
+
const seoMeta =
|
|
227
|
+
localized?.hasPrefix && canonical?.startsWith('/') && !canonical.startsWith('//')
|
|
228
|
+
? {
|
|
229
|
+
...merged,
|
|
230
|
+
canonical:
|
|
231
|
+
canonical === '/' ? `/${localized.locale}` : `/${localized.locale}${canonical}`,
|
|
232
|
+
}
|
|
233
|
+
: merged;
|
|
234
|
+
return { seoMeta, notFound: page.notFound };
|
|
236
235
|
});
|
|
237
236
|
if (seoMeta) (ctx as ServerCtx).seoMeta = seoMeta;
|
|
238
237
|
|
|
@@ -248,7 +247,8 @@ export function defineServerEntry<C extends ServerCtx = ServerCtx>(
|
|
|
248
247
|
}
|
|
249
248
|
|
|
250
249
|
const response = await runWithI18n(intl, () =>
|
|
251
|
-
runRscPipeline(
|
|
250
|
+
runRscPipeline(renderRequest, {
|
|
251
|
+
routeStatus: notFound && !renderRequest.isAction ? 404 : undefined,
|
|
252
252
|
intl,
|
|
253
253
|
seoMeta,
|
|
254
254
|
siteBaseUrl: hooks.siteBaseUrl,
|
|
@@ -282,6 +282,7 @@ export function defineServerEntry<C extends ServerCtx = ServerCtx>(
|
|
|
282
282
|
}
|
|
283
283
|
|
|
284
284
|
interface PipelineExtras {
|
|
285
|
+
routeStatus?: 404;
|
|
285
286
|
intl: IntlPayload | null | undefined;
|
|
286
287
|
seoMeta: PageSeoMeta | null | undefined;
|
|
287
288
|
siteBaseUrl?: string;
|
|
@@ -291,9 +292,11 @@ interface PipelineExtras {
|
|
|
291
292
|
}
|
|
292
293
|
|
|
293
294
|
/** 内部固化的 RSC + SSR 协议流水线 —— 用户不可见 */
|
|
294
|
-
async function runRscPipeline(
|
|
295
|
-
|
|
296
|
-
|
|
295
|
+
async function runRscPipeline(
|
|
296
|
+
renderRequest: RenderRequest,
|
|
297
|
+
extras: PipelineExtras
|
|
298
|
+
): Promise<Response> {
|
|
299
|
+
const { request } = renderRequest;
|
|
297
300
|
|
|
298
301
|
let returnValue: DefaultRscPayload['returnValue'] | undefined;
|
|
299
302
|
let formState: ReactFormState | undefined;
|
|
@@ -354,7 +357,7 @@ async function runRscPipeline(request: Request, extras: PipelineExtras): Promise
|
|
|
354
357
|
|
|
355
358
|
if (renderRequest.isRsc) {
|
|
356
359
|
return new Response(rscStream, {
|
|
357
|
-
status: actionStatus,
|
|
360
|
+
status: actionStatus ?? extras.routeStatus,
|
|
358
361
|
headers: { 'content-type': 'text/x-component;charset=utf-8' },
|
|
359
362
|
});
|
|
360
363
|
}
|
|
@@ -415,7 +418,7 @@ async function runRscPipeline(request: Request, extras: PipelineExtras): Promise
|
|
|
415
418
|
}
|
|
416
419
|
|
|
417
420
|
return new Response(finalStream, {
|
|
418
|
-
status: ssrResult.status,
|
|
421
|
+
status: ssrResult.status ?? extras.routeStatus,
|
|
419
422
|
headers: responseHeaders,
|
|
420
423
|
});
|
|
421
424
|
}
|
|
@@ -21,7 +21,7 @@ export type RenderRequest = {
|
|
|
21
21
|
isAction: boolean;
|
|
22
22
|
/** Server Action ID(仅 isAction 为 true 时有意义) */
|
|
23
23
|
actionId?: string;
|
|
24
|
-
/**
|
|
24
|
+
/** 原始请求,供读取请求头与 Server Action 正文。 */
|
|
25
25
|
request: Request;
|
|
26
26
|
/** 已去除 `_.rsc` 后缀的规范化 URL */
|
|
27
27
|
url: URL;
|
|
@@ -84,7 +84,7 @@ export function parseRenderRequest(request: Request): RenderRequest {
|
|
|
84
84
|
isRsc: true,
|
|
85
85
|
isAction,
|
|
86
86
|
actionId,
|
|
87
|
-
request
|
|
87
|
+
request,
|
|
88
88
|
url,
|
|
89
89
|
devStyleGeneration,
|
|
90
90
|
};
|
|
@@ -75,10 +75,8 @@ export function renderPageSeoMeta(meta: PageSeoMeta, baseUrl?: string): string {
|
|
|
75
75
|
const esc = (s: string) =>
|
|
76
76
|
s.replace(/&/g, '&').replace(/"/g, '"').replace(/</g, '<').replace(/>/g, '>');
|
|
77
77
|
|
|
78
|
-
//
|
|
79
|
-
|
|
80
|
-
// <title> 是单值元素由 document.title 直接管理,不打标。
|
|
81
|
-
if (meta.title) tags.push(`<title>${esc(meta.title)}</title>`);
|
|
78
|
+
// Mark injected nodes so navigation can remove them without touching the app's head.
|
|
79
|
+
if (meta.title) tags.push(`<title data-isr-seo>${esc(meta.title)}</title>`);
|
|
82
80
|
if (meta.description) {
|
|
83
81
|
tags.push(`<meta data-isr-seo name="description" content="${esc(meta.description)}">`);
|
|
84
82
|
}
|
|
@@ -174,39 +172,37 @@ export function injectSeoMeta(
|
|
|
174
172
|
return source.pipeThrough(transform);
|
|
175
173
|
}
|
|
176
174
|
|
|
177
|
-
|
|
178
|
-
//
|
|
179
|
-
// 首屏 SSR 走 injectSeoMeta(HTML 流注入 <title> / <meta>)。
|
|
180
|
-
// 但 RSC 客户端导航(pushState + 拉新 RSC payload)只换 React 树,<head> 不会自动跟。
|
|
181
|
-
// Next.js / Remix / Astro 同样的问题,做法都是把页面的 metadata 序列化进 RSC payload,
|
|
182
|
-
// 客户端在每次 setPayload 之后把 metadata 应用到 document(title / meta / link / jsonLd)。
|
|
183
|
-
//
|
|
184
|
-
// 本函数只在浏览器调用:业务侧通常不直接 import,engine 客户端 entry 自动调用。
|
|
185
|
-
//
|
|
186
|
-
// 关键点:
|
|
187
|
-
// - 用 `data-isr-seo` 标记本函数管理的 <head> 节点,避免误删用户/插件加的 meta
|
|
188
|
-
// - 先按 `data-isr-seo` 抓出旧节点,再按 meta 重建写回(删→建,避免顺序漂移)
|
|
189
|
-
// - jsonLd 也一并管,按 data-isr-seo='jsonld' 标记 + 全删全建
|
|
190
|
-
// - 初次调用(即 SSR 注入的初始 head)首先把已有的 <title> / <meta> / <link> / 含
|
|
191
|
-
// SSR injection marker 的节点打 data-isr-seo 标,让后续导航能精准替换
|
|
192
|
-
export function applySeoToDocument(meta: PageSeoMeta | null | undefined, baseUrl?: string): void {
|
|
193
|
-
if (typeof document === 'undefined') return;
|
|
194
|
-
if (!meta) return;
|
|
195
|
-
const head = document.head;
|
|
196
|
-
if (!head) return;
|
|
175
|
+
const managedTitles = new WeakMap<HTMLTitleElement, { base: string; applied: string }>();
|
|
197
176
|
|
|
198
|
-
|
|
199
|
-
head.querySelectorAll('[data-isr-seo]').forEach(el => el.remove());
|
|
177
|
+
export function clearInjectedSeo(): void {
|
|
178
|
+
document.head.querySelectorAll('[data-isr-seo]').forEach(el => el.remove());
|
|
179
|
+
}
|
|
200
180
|
|
|
201
|
-
|
|
202
|
-
|
|
181
|
+
/** Replace managed head metadata after the route commits. */
|
|
182
|
+
export function applySeoToDocument(meta: PageSeoMeta | null | undefined, baseUrl?: string): void {
|
|
183
|
+
if (typeof document === 'undefined' || !document.head) return;
|
|
184
|
+
const head = document.head;
|
|
185
|
+
clearInjectedSeo();
|
|
186
|
+
|
|
187
|
+
// React owns the app title node and may update or replace it at commit.
|
|
188
|
+
const title = head.querySelector('title');
|
|
189
|
+
const previous = title ? managedTitles.get(title) : undefined;
|
|
190
|
+
const baseTitle = previous?.applied === document.title ? previous.base : document.title;
|
|
191
|
+
if (meta?.title) {
|
|
192
|
+
document.title = meta.title;
|
|
193
|
+
const active = head.querySelector('title');
|
|
194
|
+
if (active) managedTitles.set(active, { base: baseTitle, applied: meta.title });
|
|
195
|
+
} else if (title && previous) {
|
|
196
|
+
document.title = baseTitle;
|
|
197
|
+
managedTitles.delete(title);
|
|
198
|
+
}
|
|
199
|
+
if (!meta) return;
|
|
203
200
|
|
|
204
|
-
// 3. 用与 renderPageSeoMeta 相同的逻辑重建 head 节点(保持 SSR / 客户端语义一致)
|
|
205
201
|
const fragments: HTMLElement[] = [];
|
|
206
202
|
const tag = (name: 'meta' | 'link' | 'script', attrs: Record<string, string>): HTMLElement => {
|
|
207
203
|
const el = document.createElement(name);
|
|
208
204
|
el.setAttribute('data-isr-seo', '');
|
|
209
|
-
for (const [
|
|
205
|
+
for (const [key, value] of Object.entries(attrs)) el.setAttribute(key, value);
|
|
210
206
|
return el;
|
|
211
207
|
};
|
|
212
208
|
|