isr-engine 3.1.0 → 3.1.2
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.cjs +1 -1
- package/dist/cli/cli.js +1 -1
- package/dist/{createCacheInspectorMiddleware-DG1_VLBS.cjs → createCacheInspectorMiddleware-Cq1C9TOB.cjs} +2 -2
- package/dist/{createCacheInspectorMiddleware-DG1_VLBS.cjs.map → createCacheInspectorMiddleware-Cq1C9TOB.cjs.map} +1 -1
- package/dist/{createCacheInspectorMiddleware-Bjku5v62.js → createCacheInspectorMiddleware-Dhc_2DWt.js} +2 -2
- package/dist/{createCacheInspectorMiddleware-Bjku5v62.js.map → createCacheInspectorMiddleware-Dhc_2DWt.js.map} +1 -1
- package/dist/{createISRApp-HX6X8UNb.cjs → createISRApp-CMBRb7yC.cjs} +5 -5
- package/dist/createISRApp-CMBRb7yC.cjs.map +1 -0
- package/dist/{createISRApp-DYVU8ydT.js → createISRApp-GKE91WpD.js} +5 -5
- package/dist/createISRApp-GKE91WpD.js.map +1 -0
- package/dist/{createImagePlugin-BZJHOvN9.js → createImagePlugin-BkCgZvI4.js} +2 -2
- package/dist/{createImagePlugin-BZJHOvN9.js.map → createImagePlugin-BkCgZvI4.js.map} +1 -1
- package/dist/{createImagePlugin-Ca4t_WhM.cjs → createImagePlugin-D3zO2lFv.cjs} +2 -2
- package/dist/{createImagePlugin-Ca4t_WhM.cjs.map → createImagePlugin-D3zO2lFv.cjs.map} +1 -1
- package/dist/defaults/runtime/defineSiteHooks.cjs +1 -1
- package/dist/defaults/runtime/defineSiteHooks.d.ts.map +1 -1
- package/dist/defaults/runtime/defineSiteHooks.js +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/{defineSiteHooks-w2IrF5-D.cjs → defineSiteHooks-BuhvW5YB.cjs} +45 -36
- package/dist/defineSiteHooks-BuhvW5YB.cjs.map +1 -0
- package/dist/{defineSiteHooks-CV4tqHvB.js → defineSiteHooks-bHtGQftZ.js} +45 -36
- package/dist/defineSiteHooks-bHtGQftZ.js.map +1 -0
- package/dist/isr-engine.cjs +4 -4
- package/dist/isr-engine.cjs.map +1 -1
- package/dist/isr-engine.js +4 -4
- 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/dist/types/ISRConfig.d.ts +3 -2
- package/dist/types/ISRConfig.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/defaults/runtime/defineClientEntry.tsx +26 -15
- package/src/defaults/runtime/defineServerEntry.tsx +47 -44
- package/src/defaults/runtime/defineSiteHooks.ts +58 -54
- 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/src/types/ISRConfig.ts +3 -2
- package/dist/createISRApp-DYVU8ydT.js.map +0 -1
- package/dist/createISRApp-HX6X8UNb.cjs.map +0 -1
- package/dist/defineSiteHooks-CV4tqHvB.js.map +0 -1
- package/dist/defineSiteHooks-w2IrF5-D.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"}
|
|
@@ -137,7 +137,7 @@ export interface RuntimeI18nConfig {
|
|
|
137
137
|
*/
|
|
138
138
|
export interface DynamicSeoResolver {
|
|
139
139
|
/**
|
|
140
|
-
* 路径 pattern。支持 `:name`
|
|
140
|
+
* 路径 pattern。支持 `:name` 匹配单段和末尾 `/*` 匹配路径本身及其子路径。
|
|
141
141
|
* 例:`/books/:id`、`/u/:handle`、`/dashboard/*`
|
|
142
142
|
*/
|
|
143
143
|
pattern: string;
|
|
@@ -145,7 +145,8 @@ export interface DynamicSeoResolver {
|
|
|
145
145
|
* 命中后的 resolver。返回 PageSeoMeta(平铺)或 null。
|
|
146
146
|
* 抛错会被引擎吞掉并写到 onError,不会导致 SSR 失败。
|
|
147
147
|
*
|
|
148
|
-
* input.params
|
|
148
|
+
* input.params 包含命名参数。末尾 `/*` 还会返回 `wildcard`,
|
|
149
|
+
* 其值为不带起始斜杠的剩余路径,本身命中时为空字符串。
|
|
149
150
|
* input.locale 是当前请求 locale(可能 undefined,特别是没启 i18n 时)。
|
|
150
151
|
* input.services / input.runtime 给到完整 runtime context,可拿 api origin。
|
|
151
152
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ISRConfig.d.ts","sourceRoot":"","sources":["../../src/types/ISRConfig.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;;;;;;GASG;AACH,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;AAEnD;;;;;;;;;;GAUG;AACH,MAAM,MAAM,oBAAoB,GAAG,QAAQ,GAAG,QAAQ,GAAG,YAAY,GAAG,QAAQ,GAAG,WAAW,CAAC;AAC/F;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,mDAAmD;IACnD,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,qDAAqD;IACrD,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C;AAED;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG,cAAc,GAAG,eAAe,CAAC;AAEzD,MAAM,WAAW,kBAAkB;IACjC,iEAAiE;IACjE,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,0CAA0C;IAC1C,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,0BAA0B;IAC1B,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;CACxC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,eAAe,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;IAC1D,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;CACzD;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;CAC9B;AAED,MAAM,WAAW,iBAAiB;IAChC,4CAA4C;IAC5C,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,iCAAiC;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,2BAA2B;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,oCAAoC;IACpC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,2BAA2B;IAC3B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IACnE,mBAAmB;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,oCAAoC;IACpC,YAAY,EAAE,MAAM,CAAC;IACrB,sCAAsC;IACtC,cAAc,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB
|
|
1
|
+
{"version":3,"file":"ISRConfig.d.ts","sourceRoot":"","sources":["../../src/types/ISRConfig.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -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
|
}
|
|
@@ -108,36 +108,6 @@ export interface CreateAdminSeoLoaderOptions {
|
|
|
108
108
|
dynamicResolvers?: readonly DynamicSeoResolver[];
|
|
109
109
|
}
|
|
110
110
|
|
|
111
|
-
/**
|
|
112
|
-
* 内部用:把 `/books/:id` 这种 pattern 编译成 RegExp + 参数名列表。
|
|
113
|
-
* `:name` 匹配单段(不跨 /)。`*` 匹配任意后缀(包括 /),收成 ":wildcard" param。
|
|
114
|
-
* 编译后缓存,避免每次请求重算。
|
|
115
|
-
*/
|
|
116
|
-
interface CompiledSeoResolver {
|
|
117
|
-
re: RegExp;
|
|
118
|
-
paramNames: string[];
|
|
119
|
-
resolver: DynamicSeoResolver;
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
function compileSeoResolver(resolver: DynamicSeoResolver): CompiledSeoResolver {
|
|
123
|
-
const paramNames: string[] = [];
|
|
124
|
-
const reSrc = resolver.pattern
|
|
125
|
-
.replace(/[.+?^${}()|[\]\\]/g, '\\$&')
|
|
126
|
-
.replace(/:([A-Za-z_][A-Za-z0-9_]*)|\\\*/g, (m, name) => {
|
|
127
|
-
if (m === '\\*') {
|
|
128
|
-
paramNames.push('wildcard');
|
|
129
|
-
return '(.*)';
|
|
130
|
-
}
|
|
131
|
-
paramNames.push(name);
|
|
132
|
-
return '([^/]+)';
|
|
133
|
-
});
|
|
134
|
-
return {
|
|
135
|
-
re: new RegExp(`^${reSrc}$`),
|
|
136
|
-
paramNames,
|
|
137
|
-
resolver,
|
|
138
|
-
};
|
|
139
|
-
}
|
|
140
|
-
|
|
141
111
|
export interface DefineAdminSiteHooksOptions {
|
|
142
112
|
i18n?: {
|
|
143
113
|
locales?: readonly string[];
|
|
@@ -271,23 +241,38 @@ export interface SiteHooksConfig {
|
|
|
271
241
|
headExtras?: (ctx: { nonce?: string }) => string | undefined;
|
|
272
242
|
}
|
|
273
243
|
|
|
274
|
-
interface
|
|
244
|
+
interface CompiledSeoPattern {
|
|
275
245
|
re: RegExp;
|
|
276
246
|
paramNames: string[];
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
interface CompiledRoute extends CompiledSeoPattern {
|
|
277
250
|
resolver: (params: Record<string, string>) => Promise<PageSeoMeta | null> | PageSeoMeta | null;
|
|
278
251
|
}
|
|
279
252
|
|
|
280
|
-
|
|
281
|
-
|
|
253
|
+
function escapeSeoPatternLiteral(literal: string): string {
|
|
254
|
+
return literal.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
/** Both SEO entry points recognize named parameters and a terminal /* before escaping literals. */
|
|
258
|
+
function compileSeoPattern(pattern: string, captureWildcard = false): CompiledSeoPattern {
|
|
282
259
|
const paramNames: string[] = [];
|
|
283
260
|
const wildcard = pattern.endsWith('/*');
|
|
284
261
|
const base = wildcard ? pattern.slice(0, -2) : pattern;
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
262
|
+
let cursor = 0;
|
|
263
|
+
let source = '';
|
|
264
|
+
for (const match of base.matchAll(/:(\w+)/g)) {
|
|
265
|
+
source += escapeSeoPatternLiteral(base.slice(cursor, match.index)) + '([^/]+)';
|
|
266
|
+
paramNames.push(match[1]);
|
|
267
|
+
cursor = match.index + match[0].length;
|
|
268
|
+
}
|
|
269
|
+
source += escapeSeoPatternLiteral(base.slice(cursor));
|
|
270
|
+
|
|
271
|
+
if (wildcard) {
|
|
272
|
+
if (captureWildcard) paramNames.push('wildcard');
|
|
273
|
+
source += captureWildcard ? '(?:/(.*))?' : '(?:/.*)?';
|
|
274
|
+
}
|
|
275
|
+
return { re: new RegExp(`^${source}$`), paramNames };
|
|
291
276
|
}
|
|
292
277
|
|
|
293
278
|
function fillTemplate(template: string, vars: Record<string, string>): string {
|
|
@@ -335,9 +320,10 @@ export function createAdminSeoLoader(
|
|
|
335
320
|
const endpoint = options.endpoint ?? '/api/seo?path={pathname}';
|
|
336
321
|
const fallbackEntries = options.fallbackEntries ?? [];
|
|
337
322
|
// 编译一次 + 缓存。N 个 resolver 在每个请求里只是 N 次正则 test,cost 可忽略。
|
|
338
|
-
const compiledResolvers
|
|
339
|
-
|
|
340
|
-
|
|
323
|
+
const compiledResolvers = (options.dynamicResolvers ?? []).map(resolver => ({
|
|
324
|
+
...compileSeoPattern(resolver.pattern, true),
|
|
325
|
+
resolver,
|
|
326
|
+
}));
|
|
341
327
|
|
|
342
328
|
return async (params, ctx) => {
|
|
343
329
|
const pathname = normalizePathname(params.pathname || '/');
|
|
@@ -390,6 +376,23 @@ export function defineAdminSiteHooks(options: DefineAdminSiteHooksOptions = {}):
|
|
|
390
376
|
return createAdminSiteHooks(options, createEmptyRuntimeConfig());
|
|
391
377
|
}
|
|
392
378
|
|
|
379
|
+
function createAdminSeoEntry(
|
|
380
|
+
seo: NonNullable<DefineAdminSiteHooksOptions['seo']>,
|
|
381
|
+
runtimeSeo: Partial<RuntimeSeoConfig>
|
|
382
|
+
): SeoLocalEntry {
|
|
383
|
+
return {
|
|
384
|
+
load: createAdminSeoLoader({
|
|
385
|
+
endpoint: seo.endpoint ?? runtimeSeo.endpoint,
|
|
386
|
+
fallbackEntries: normalizeAdminSeoFallbackEntries(
|
|
387
|
+
seo.fallbackLocal ?? runtimeSeo.fallbackLocal
|
|
388
|
+
),
|
|
389
|
+
timeoutMs: seo.timeoutMs ?? runtimeSeo.timeoutMs,
|
|
390
|
+
dynamicResolvers: seo.dynamicResolvers ?? runtimeSeo.dynamicResolvers,
|
|
391
|
+
}),
|
|
392
|
+
ttl: seo.ttl ?? runtimeSeo.ttl ?? 60_000,
|
|
393
|
+
};
|
|
394
|
+
}
|
|
395
|
+
|
|
393
396
|
function createAdminSiteHooks(
|
|
394
397
|
options: DefineAdminSiteHooksOptions,
|
|
395
398
|
runtime: SiteRuntimeConfig
|
|
@@ -426,17 +429,7 @@ function createAdminSiteHooks(
|
|
|
426
429
|
ttl: i18n.ttl ?? runtimeI18n.ttl ?? 60_000,
|
|
427
430
|
},
|
|
428
431
|
seo: {
|
|
429
|
-
'/*':
|
|
430
|
-
load: createAdminSeoLoader({
|
|
431
|
-
endpoint: seo.endpoint ?? runtimeSeo.endpoint,
|
|
432
|
-
fallbackEntries: normalizeAdminSeoFallbackEntries(
|
|
433
|
-
seo.fallbackLocal ?? runtimeSeo.fallbackLocal
|
|
434
|
-
),
|
|
435
|
-
timeoutMs: seo.timeoutMs ?? runtimeSeo.timeoutMs,
|
|
436
|
-
dynamicResolvers: seo.dynamicResolvers ?? runtimeSeo.dynamicResolvers,
|
|
437
|
-
}),
|
|
438
|
-
ttl: seo.ttl ?? runtimeSeo.ttl ?? 60_000,
|
|
439
|
-
},
|
|
432
|
+
'/*': createAdminSeoEntry(seo, runtimeSeo),
|
|
440
433
|
},
|
|
441
434
|
},
|
|
442
435
|
runtime
|
|
@@ -526,10 +519,21 @@ export function applyRuntimeToServerHooks<T extends object>(
|
|
|
526
519
|
} as T;
|
|
527
520
|
}
|
|
528
521
|
|
|
522
|
+
// A dynamic SEO table on its own does not opt a plain server entry into the admin i18n
|
|
523
|
+
// loader or wrap its beforeRequest callback.
|
|
524
|
+
const runtimeSeo = runtime.seo;
|
|
525
|
+
const runtimeSeoHook =
|
|
526
|
+
!hasUserContentHooks && runtimeSeo?.dynamicResolvers?.length
|
|
527
|
+
? createSiteHooks(
|
|
528
|
+
{ intl: runtime.i18n, seo: { '/*': createAdminSeoEntry({}, runtimeSeo) } },
|
|
529
|
+
runtime
|
|
530
|
+
).loadSeoMeta
|
|
531
|
+
: undefined;
|
|
529
532
|
return {
|
|
530
533
|
...hooks,
|
|
531
534
|
siteBaseUrl,
|
|
532
535
|
apiBaseUrl,
|
|
536
|
+
...(runtimeSeoHook && { loadSeoMeta: runtimeSeoHook }),
|
|
533
537
|
} as T;
|
|
534
538
|
}
|
|
535
539
|
|
|
@@ -642,7 +646,7 @@ function createSiteHooks(config: SiteHooksConfig, runtime: SiteRuntimeConfig): S
|
|
|
642
646
|
>();
|
|
643
647
|
|
|
644
648
|
for (const [pattern, value] of Object.entries(config.seo ?? {})) {
|
|
645
|
-
const { re, paramNames } =
|
|
649
|
+
const { re, paramNames } = compileSeoPattern(pattern);
|
|
646
650
|
|
|
647
651
|
if (typeof value === 'function') {
|
|
648
652
|
// 自定义 resolver
|
|
@@ -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
|
};
|