isr-engine 4.0.1 → 4.1.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/README.md +4 -1
- package/dist/cli/cli.js +1 -1
- package/dist/config/defineConfig.d.ts +1 -1
- package/dist/config/defineConfig.d.ts.map +1 -1
- package/dist/config/defineConfig.js +2 -1
- package/dist/config/defineConfig.js.map +1 -1
- package/dist/cookie-DcUeYm6E.js +42 -0
- package/dist/cookie-DcUeYm6E.js.map +1 -0
- package/dist/{createCacheInspectorMiddleware-C2QOaq2z.js → createCacheInspectorMiddleware-D6c-CINz.js} +2 -2
- package/dist/{createCacheInspectorMiddleware-C2QOaq2z.js.map → createCacheInspectorMiddleware-D6c-CINz.js.map} +1 -1
- package/dist/{createISRApp-CR1EeHfI.js → createISRApp-DTlZvKBm.js} +49 -28
- package/dist/createISRApp-DTlZvKBm.js.map +1 -0
- package/dist/defaults/runtime/client-navigation-policy.d.ts +1 -0
- package/dist/defaults/runtime/client-navigation-policy.d.ts.map +1 -1
- package/dist/defaults/runtime/defineSiteHooks.d.ts +1 -1
- package/dist/defaults/runtime/defineSiteHooks.d.ts.map +1 -1
- package/dist/defaults/runtime/defineSiteHooks.js +2 -2
- package/dist/defaults/runtime/locale-links.client.d.ts +6 -0
- package/dist/defaults/runtime/locale-links.client.d.ts.map +1 -0
- package/dist/defaults/runtime/navigation-history.client.d.ts +8 -0
- package/dist/defaults/runtime/navigation-history.client.d.ts.map +1 -1
- package/dist/{defineSiteHooks-DUEds_hB.js → defineSiteHooks-iwLiVChy.js} +15 -32
- package/dist/defineSiteHooks-iwLiVChy.js.map +1 -0
- package/dist/engine/ISREngine.d.ts.map +1 -1
- package/dist/engine/seo/SEOEngine.d.ts +2 -3
- package/dist/engine/seo/SEOEngine.d.ts.map +1 -1
- package/dist/engine/seo/resolveSeoConfig.d.ts +2 -0
- package/dist/engine/seo/resolveSeoConfig.d.ts.map +1 -1
- package/dist/{i18n-CJ0leKhc.js → i18n-B2mWmifk.js} +79 -57
- package/dist/i18n-B2mWmifk.js.map +1 -0
- package/dist/isr-engine.js +4 -3
- package/dist/isr-engine.js.map +1 -1
- package/dist/middlewares/LocaleRedirect.d.ts +4 -3
- package/dist/middlewares/LocaleRedirect.d.ts.map +1 -1
- package/dist/runtime/LocaleLink.d.ts +9 -0
- package/dist/runtime/LocaleLink.d.ts.map +1 -0
- package/dist/runtime/i18n.d.ts +6 -1
- package/dist/runtime/i18n.d.ts.map +1 -1
- package/dist/runtime/index.d.ts +1 -0
- package/dist/runtime/index.d.ts.map +1 -1
- package/dist/server/productionRuntime.d.ts.map +1 -1
- package/dist/types/ISRConfig.d.ts +1 -1
- package/dist/types/ISRConfig.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/defaults/runtime/client-navigation-policy.ts +11 -0
- package/src/defaults/runtime/defineClientEntry.tsx +86 -43
- package/src/defaults/runtime/defineServerEntry.tsx +9 -1
- package/src/defaults/runtime/defineSiteHooks.ts +19 -41
- package/src/defaults/runtime/locale-links.client.ts +85 -0
- package/src/defaults/runtime/navigation-history.client.ts +166 -1
- package/src/runtime/LocaleContext.tsx +1 -1
- package/src/runtime/LocaleLink.tsx +26 -0
- package/src/runtime/i18n.ts +67 -19
- package/src/runtime/index.ts +1 -0
- package/src/types/ISRConfig.ts +1 -1
- package/dist/createISRApp-CR1EeHfI.js.map +0 -1
- package/dist/defineSiteHooks-DUEds_hB.js.map +0 -1
- package/dist/i18n-CJ0leKhc.js.map +0 -1
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
* Locale redirect 中间件 ——
|
|
3
3
|
*
|
|
4
4
|
* `runtime.i18n.prefixDefault: true` 时,根目录 / 业务路径裸 URL(无 locale 前缀)
|
|
5
|
-
*
|
|
5
|
+
* 302 到 `/{negotiated}/path`。negotiated 来源优先级:
|
|
6
6
|
* 1. cookie 'locale'(用户上次切过的)
|
|
7
|
-
* 2. Accept-Language
|
|
8
|
-
* 3. i18n.defaultLocale
|
|
7
|
+
* 2. Accept-Language 头协商(按权重匹配 i18n.locales)
|
|
8
|
+
* 3. i18n.defaultLocale 或首个未被拒绝的 locale
|
|
9
|
+
* 所有 locale 都被 Accept-Language 明确拒绝时返回 406。
|
|
9
10
|
*
|
|
10
11
|
* 命中条件外的请求一概放行:
|
|
11
12
|
* - 已带 locale 前缀的 URL(/zh-CN/books 等)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocaleRedirect.d.ts","sourceRoot":"","sources":["../../src/middlewares/LocaleRedirect.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"LocaleRedirect.d.ts","sourceRoot":"","sources":["../../src/middlewares/LocaleRedirect.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAIlD,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,UAAU,CAAC;IACjB,4CAA4C;IAC5C,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACtC;AA0BD,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,2BAA2B,GACnC,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC,GAAG,IAAI,CAgFpE"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { ComponentPropsWithoutRef } from 'react';
|
|
2
|
+
import type { I18nConfig } from './i18n';
|
|
3
|
+
export type LocaleLinkProps = Omit<ComponentPropsWithoutRef<'a'>, 'href' | 'hrefLang' | 'role' | 'aria-disabled' | 'download' | 'onClick' | 'onClickCapture'> & {
|
|
4
|
+
locale: string;
|
|
5
|
+
config: I18nConfig;
|
|
6
|
+
};
|
|
7
|
+
/** Switch the current route's locale through the engine's browser navigation. */
|
|
8
|
+
export declare function LocaleLink({ locale, config, ...props }: LocaleLinkProps): import("react").JSX.Element;
|
|
9
|
+
//# sourceMappingURL=LocaleLink.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LocaleLink.d.ts","sourceRoot":"","sources":["../../src/runtime/LocaleLink.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEzC,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,wBAAwB,CAAC,GAAG,CAAC,EAC7B,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,eAAe,GAAG,UAAU,GAAG,SAAS,GAAG,gBAAgB,CAC3F,GAAG;IACF,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,iFAAiF;AACjF,wBAAgB,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,eAAe,+BAavE"}
|
package/dist/runtime/i18n.d.ts
CHANGED
|
@@ -64,7 +64,7 @@ export declare function parseLocale(pathname: string, config: I18nConfig): Parse
|
|
|
64
64
|
*/
|
|
65
65
|
export declare function withLocale(pathname: string, locale: string, config: I18nConfig): string;
|
|
66
66
|
/**
|
|
67
|
-
* Accept-Language
|
|
67
|
+
* 按权重协商 Accept-Language(支持主语言回退和通配符)
|
|
68
68
|
*
|
|
69
69
|
* negotiateLocale('zh-CN,en;q=0.9', { locales: ['zh','en'], defaultLocale: 'en' })
|
|
70
70
|
* → 'zh' ('zh-CN' 命中 'zh')
|
|
@@ -73,8 +73,13 @@ export declare function withLocale(pathname: string, locale: string, config: I18
|
|
|
73
73
|
* → 'en-us' ('en-GB' 主语言 'en' 回退到第一个 en-*)
|
|
74
74
|
*
|
|
75
75
|
* negotiateLocale(null, ...) → defaultLocale
|
|
76
|
+
*
|
|
77
|
+
* @throws {RangeError} When the header explicitly rejects every available locale.
|
|
76
78
|
*/
|
|
77
79
|
export declare function negotiateLocale(acceptLanguage: string | null | undefined, config: I18nConfig): string;
|
|
80
|
+
export declare function isNoAcceptableLocaleError(error: unknown): boolean;
|
|
81
|
+
/** Returns null when the header explicitly rejects every available locale. */
|
|
82
|
+
export declare function selectAcceptableLocale(acceptLanguage: string | null | undefined, config: I18nConfig): string | null;
|
|
78
83
|
/**
|
|
79
84
|
* 列出某业务 pathname 在所有 locale 下的 URL —— 用于 <link rel="alternate" hreflang>
|
|
80
85
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../src/runtime/i18n.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAGH,MAAM,WAAW,UAAU;IACzB,yCAAyC;IACzC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,iCAAiC;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,iEAAiE;IACjE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,2BAA2B;IAC3B,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,YAAY,CAa9E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAOvF;AAED
|
|
1
|
+
{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../src/runtime/i18n.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAGH,MAAM,WAAW,UAAU;IACzB,yCAAyC;IACzC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,iCAAiC;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,iEAAiE;IACjE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,2BAA2B;IAC3B,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,YAAY,CAa9E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAOvF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACzC,MAAM,EAAE,UAAU,GACjB,MAAM,CAMR;AAKD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAEjE;AAED,8EAA8E;AAC9E,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACzC,MAAM,EAAE,UAAU,GACjB,MAAM,GAAG,IAAI,CAoDf;AAMD;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,GACjB,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAK3C;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,CAAC,EAAE;IACL,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GAAG,IAAI,GACP,UAAU,CAQZ"}
|
package/dist/runtime/index.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ export { Boundary, ErrorBoundary } from './boundary';
|
|
|
10
10
|
export { parseLocale, withLocale, negotiateLocale, alternates, resolveI18nConfig, type I18nConfig, type ParsedLocale, } from './i18n';
|
|
11
11
|
export { getI18n, getI18nLocale, getCurrentI18n, setClientI18n, type I18nParams, type Translate, } from './i18n-store';
|
|
12
12
|
export { LocaleProvider, useLocale } from './LocaleContext';
|
|
13
|
+
export { LocaleLink, type LocaleLinkProps } from './LocaleLink';
|
|
13
14
|
export { capture, flushTelemetry, getTelemetry, measure, page, setTelemetryUser, track, type TelemetryCaptureOptions, type TelemetryEventOptions, type TelemetryLevel, type TelemetryMeasureOptions, type TelemetryRuntimeHandle, type TelemetryUser, } from './telemetry';
|
|
14
15
|
export { defineRoutes, resolvePageSeoMeta, type RouteEntry, type RouteModuleLoader, type RouteModuleRef, type PageProps, type PageComponent, type ResolveRoute, type RouteManifest, type DefinedRoutes, type PageSeoContext, type PageSeoExport, } from './routes';
|
|
15
16
|
export { getEdgeContext, type EdgeContext } from './edge-context';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EACL,WAAW,EACX,UAAU,EACV,eAAe,EACf,UAAU,EACV,iBAAiB,EACjB,KAAK,UAAU,EACf,KAAK,YAAY,GAClB,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,OAAO,EACP,aAAa,EACb,cAAc,EACd,aAAa,EACb,KAAK,UAAU,EACf,KAAK,SAAS,GACf,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EACL,OAAO,EACP,cAAc,EACd,YAAY,EACZ,OAAO,EACP,IAAI,EACJ,gBAAgB,EAChB,KAAK,EACL,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EACnB,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAC3B,KAAK,aAAa,GACnB,MAAM,aAAa,CAAC;AAGrB,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,aAAa,GACnB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EACL,WAAW,EACX,UAAU,EACV,eAAe,EACf,UAAU,EACV,iBAAiB,EACjB,KAAK,UAAU,EACf,KAAK,YAAY,GAClB,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,OAAO,EACP,aAAa,EACb,cAAc,EACd,aAAa,EACb,KAAK,UAAU,EACf,KAAK,SAAS,GACf,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EACL,OAAO,EACP,cAAc,EACd,YAAY,EACZ,OAAO,EACP,IAAI,EACJ,gBAAgB,EAChB,KAAK,EACL,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EACnB,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAC3B,KAAK,aAAa,GACnB,MAAM,aAAa,CAAC;AAGrB,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,aAAa,GACnB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"productionRuntime.d.ts","sourceRoot":"","sources":["../../src/server/productionRuntime.ts"],"names":[],"mappings":"AAKA,OAAO,OAAO,EAAE,EAAE,KAAK,OAAO,EAAE,MAAM,SAAS,CAAC;AAuChD,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AAWtC;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAAG,MAAM,EAAE,CAS9F;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI,CAoDrF;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,wBAAsB,sBAAsB,CAAC,IAAI,SAAgB;;;;GAYhE;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,SAAS,EACjB,OAAO,GAAE;IACP,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC;IAC3D,WAAW,CAAC,EAAE,YAAY,CAAC;CACvB,GACL,OAAO,CAAC,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"productionRuntime.d.ts","sourceRoot":"","sources":["../../src/server/productionRuntime.ts"],"names":[],"mappings":"AAKA,OAAO,OAAO,EAAE,EAAE,KAAK,OAAO,EAAE,MAAM,SAAS,CAAC;AAuChD,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AAWtC;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAAG,MAAM,EAAE,CAS9F;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI,CAoDrF;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,wBAAsB,sBAAsB,CAAC,IAAI,SAAgB;;;;GAYhE;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,SAAS,EACjB,OAAO,GAAE;IACP,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC;IAC3D,WAAW,CAAC,EAAE,YAAY,CAAC;CACvB,GACL,OAAO,CAAC,iBAAiB,CAAC,CA+Z5B;AAOD,wBAAgB,8BAA8B,IAAI,OAAO,CAAC,cAAc,CAOvE;AAED,wFAAwF;AACxF,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,EAChD,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,KAAK,IAAI,GAC7E,OAAO,CAAC,cAAc,CAsCxB;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CA4BpF;AAED,wBAAsB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAqD9F;AAED,oFAAoF;AACpF,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,cAAc,EACrB,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,cAAc,CAMxB;AA2DD,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAyBrF"}
|
|
@@ -163,7 +163,7 @@ export interface DynamicSeoResolver {
|
|
|
163
163
|
export interface RuntimeSeoConfig {
|
|
164
164
|
/** 远端 SEO 端点;支持 {pathname} */
|
|
165
165
|
endpoint: string | undefined;
|
|
166
|
-
/** 本地兜底 SEO
|
|
166
|
+
/** 本地兜底 SEO 路由表。可为已知更新时间的 sitemap URL 声明 ISO 8601 modifiedTime。 */
|
|
167
167
|
fallbackLocal: readonly Record<string, unknown>[] | undefined;
|
|
168
168
|
/** SEO 元数据缓存 TTL(毫秒) */
|
|
169
169
|
ttl: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ISRConfig.d.ts","sourceRoot":"","sources":["../../src/types/ISRConfig.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ISRConfig.d.ts","sourceRoot":"","sources":["../../src/types/ISRConfig.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,6 +3,17 @@ export interface PrefetchConnection {
|
|
|
3
3
|
effectiveType?: string;
|
|
4
4
|
}
|
|
5
5
|
|
|
6
|
+
export function isPrimaryLinkClick(event: MouseEvent): boolean {
|
|
7
|
+
return (
|
|
8
|
+
event.button === 0 &&
|
|
9
|
+
!event.defaultPrevented &&
|
|
10
|
+
!event.metaKey &&
|
|
11
|
+
!event.ctrlKey &&
|
|
12
|
+
!event.altKey &&
|
|
13
|
+
!event.shiftKey
|
|
14
|
+
);
|
|
15
|
+
}
|
|
16
|
+
|
|
6
17
|
export function isRscNavigation(href: string, current: string): boolean {
|
|
7
18
|
try {
|
|
8
19
|
const url = new URL(href, current);
|
|
@@ -33,6 +33,7 @@ import { GlobalErrorBoundary } from './error-boundary';
|
|
|
33
33
|
import { createNavigationRequestLifecycle } from './navigation-request.client';
|
|
34
34
|
import {
|
|
35
35
|
createPrefetcher,
|
|
36
|
+
isPrimaryLinkClick,
|
|
36
37
|
isRscNavigation,
|
|
37
38
|
shouldPrefetch as canPrefetch,
|
|
38
39
|
type PrefetchConnection,
|
|
@@ -49,9 +50,14 @@ import {
|
|
|
49
50
|
import { getOrCreateDevStyleRegistry } from './dev-style-registry.client';
|
|
50
51
|
import { observeDevRscResponse } from './dev-rsc-response.client';
|
|
51
52
|
import {
|
|
53
|
+
createNavigationScroll,
|
|
54
|
+
historyStateWithScrollEntry,
|
|
52
55
|
isInternalNavigationHistoryMutation,
|
|
56
|
+
pushLinkNavigation,
|
|
53
57
|
syncBrowserUrlToFinalRedirect,
|
|
58
|
+
type HistoryChange,
|
|
54
59
|
} from './navigation-history.client';
|
|
60
|
+
import { installLocaleLinks } from './locale-links.client';
|
|
55
61
|
import { installDevRenderInspector } from './dev-render-inspector';
|
|
56
62
|
import { setClientI18n } from '../../runtime/i18n-store';
|
|
57
63
|
import {
|
|
@@ -81,6 +87,7 @@ interface DefaultRscPayloadState {
|
|
|
81
87
|
payload: DefaultRscPayload;
|
|
82
88
|
generation: number | undefined;
|
|
83
89
|
styleIds: string[];
|
|
90
|
+
finishNavigation?: () => void;
|
|
84
91
|
}
|
|
85
92
|
|
|
86
93
|
async function preparePayloadDevStyles(generation: number | undefined): Promise<string[]> {
|
|
@@ -91,9 +98,10 @@ async function preparePayloadDevStyles(generation: number | undefined): Promise<
|
|
|
91
98
|
function createPayloadState(
|
|
92
99
|
payload: DefaultRscPayload,
|
|
93
100
|
generation: number | undefined,
|
|
94
|
-
styleIds: string[] = []
|
|
101
|
+
styleIds: string[] = [],
|
|
102
|
+
finishNavigation?: () => void
|
|
95
103
|
): DefaultRscPayloadState {
|
|
96
|
-
return { payload, generation, styleIds };
|
|
104
|
+
return { payload, generation, styleIds, finishNavigation };
|
|
97
105
|
}
|
|
98
106
|
|
|
99
107
|
type TemporaryReferences = ReturnType<typeof createTemporaryReferenceSet>;
|
|
@@ -149,10 +157,18 @@ function transitionPayload(
|
|
|
149
157
|
React.startTransition(() => setState(state));
|
|
150
158
|
}
|
|
151
159
|
|
|
152
|
-
function PayloadRoot({
|
|
160
|
+
function PayloadRoot({
|
|
161
|
+
payload,
|
|
162
|
+
generation,
|
|
163
|
+
styleIds,
|
|
164
|
+
finishNavigation,
|
|
165
|
+
}: DefaultRscPayloadState): React.ReactNode {
|
|
153
166
|
React.useLayoutEffect(() => {
|
|
154
167
|
applySeoToDocument(payload.seoMeta, payload.siteBaseUrl ?? undefined, payload.routeStatus);
|
|
155
168
|
}, [payload]);
|
|
169
|
+
React.useLayoutEffect(() => {
|
|
170
|
+
finishNavigation?.();
|
|
171
|
+
}, [finishNavigation]);
|
|
156
172
|
if (!import.meta.env.DEV || generation === undefined) return payload.root;
|
|
157
173
|
return (
|
|
158
174
|
<DevStyleCommitBoundary key={generation} generation={generation} styleIds={styleIds}>
|
|
@@ -286,6 +302,7 @@ export function defineClientEntry(hooks: ClientEntryHooks = {}): void {
|
|
|
286
302
|
}
|
|
287
303
|
|
|
288
304
|
async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
305
|
+
const localeLinks = installLocaleLinks();
|
|
289
306
|
if (import.meta.env.DEV) {
|
|
290
307
|
const registry = getOrCreateDevStyleRegistry(document, {
|
|
291
308
|
onRscCommit: completeDevStyleNavigation,
|
|
@@ -331,6 +348,27 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
331
348
|
}
|
|
332
349
|
|
|
333
350
|
const navigationRequests = createNavigationRequestLifecycle();
|
|
351
|
+
let finishPendingNavigation: (() => void) | undefined;
|
|
352
|
+
function startNavigation(onNavigation: (finishNavigation?: () => void) => void): () => void {
|
|
353
|
+
const stop = listenNavigation(
|
|
354
|
+
finish => {
|
|
355
|
+
const commit = () => {
|
|
356
|
+
if (finishPendingNavigation === commit) finishPendingNavigation = undefined;
|
|
357
|
+
finish?.();
|
|
358
|
+
};
|
|
359
|
+
finishPendingNavigation = commit;
|
|
360
|
+
onNavigation(commit);
|
|
361
|
+
},
|
|
362
|
+
hooks.onNavigate,
|
|
363
|
+
observability,
|
|
364
|
+
hookContext
|
|
365
|
+
);
|
|
366
|
+
localeLinks.connect();
|
|
367
|
+
return () => {
|
|
368
|
+
localeLinks.disconnect();
|
|
369
|
+
stop();
|
|
370
|
+
};
|
|
371
|
+
}
|
|
334
372
|
|
|
335
373
|
function mountRscShellFallback(): void {
|
|
336
374
|
document.body.classList.remove('csr-shell-body');
|
|
@@ -338,7 +376,7 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
338
376
|
|
|
339
377
|
let setPayload: (v: DefaultRscPayloadState) => void = () => {};
|
|
340
378
|
|
|
341
|
-
async function fetchRscPayload(): Promise<void> {
|
|
379
|
+
async function fetchRscPayload(finishNavigation?: () => void): Promise<void> {
|
|
342
380
|
await navigationRequests.run(async signal => {
|
|
343
381
|
await runWithDevStyleNavigation(
|
|
344
382
|
async generation => {
|
|
@@ -353,7 +391,7 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
353
391
|
signal.throwIfAborted();
|
|
354
392
|
syncBrowserUrlToFinalRedirect(response, requestedUrl);
|
|
355
393
|
setClientI18n(payload.intl);
|
|
356
|
-
setPayload(createPayloadState(payload, generation, styleIds));
|
|
394
|
+
setPayload(createPayloadState(payload, generation, styleIds, finishNavigation));
|
|
357
395
|
},
|
|
358
396
|
async (result, generation) => {
|
|
359
397
|
signal.throwIfAborted();
|
|
@@ -374,15 +412,10 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
374
412
|
|
|
375
413
|
React.useEffect(() => {
|
|
376
414
|
fetchRscPayload().catch(() => setFailed(true));
|
|
377
|
-
return
|
|
378
|
-
()
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
},
|
|
382
|
-
hooks.onNavigate,
|
|
383
|
-
observability,
|
|
384
|
-
hookContext
|
|
385
|
-
);
|
|
415
|
+
return startNavigation(finishNavigation => {
|
|
416
|
+
setFailed(false);
|
|
417
|
+
fetchRscPayload(finishNavigation).catch(() => setFailed(true));
|
|
418
|
+
});
|
|
386
419
|
}, []);
|
|
387
420
|
|
|
388
421
|
if (failed) return React.createElement(CsrShellFallback);
|
|
@@ -480,20 +513,21 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
480
513
|
}, [setPayload_]);
|
|
481
514
|
React.useEffect(() => {
|
|
482
515
|
const onNavigation = import.meta.env.DEV
|
|
483
|
-
? () =>
|
|
484
|
-
|
|
516
|
+
? (finishNavigation?: () => void) =>
|
|
517
|
+
observeDevNavigationFailure(fetchRscPayload(finishNavigation))
|
|
518
|
+
: (finishNavigation?: () => void) => {
|
|
485
519
|
const requestedUrl = window.location.href;
|
|
486
|
-
void fetchRscPayload().catch(error => {
|
|
520
|
+
void fetchRscPayload(finishNavigation).catch(error => {
|
|
487
521
|
console.error('RSC navigation failed; falling back to document navigation', error);
|
|
488
522
|
if (window.location.href === requestedUrl) window.location.assign(requestedUrl);
|
|
489
523
|
});
|
|
490
524
|
};
|
|
491
|
-
return
|
|
525
|
+
return startNavigation(onNavigation);
|
|
492
526
|
}, []);
|
|
493
527
|
return <PayloadRoot {...payloadState} />;
|
|
494
528
|
}
|
|
495
529
|
|
|
496
|
-
async function fetchRscPayload(): Promise<void> {
|
|
530
|
+
async function fetchRscPayload(finishNavigation?: () => void): Promise<void> {
|
|
497
531
|
await navigationRequests.run(async signal => {
|
|
498
532
|
await runWithDevStyleNavigation(
|
|
499
533
|
async generation => {
|
|
@@ -509,7 +543,7 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
509
543
|
signal.throwIfAborted();
|
|
510
544
|
syncBrowserUrlToFinalRedirect(response, requestedUrl);
|
|
511
545
|
setClientI18n(payload.intl);
|
|
512
|
-
setPayload(createPayloadState(payload, generation, styleIds));
|
|
546
|
+
setPayload(createPayloadState(payload, generation, styleIds, finishNavigation));
|
|
513
547
|
},
|
|
514
548
|
async (result, generation) => {
|
|
515
549
|
signal.throwIfAborted();
|
|
@@ -573,7 +607,7 @@ async function main(hooks: ClientEntryHooks): Promise<void> {
|
|
|
573
607
|
|
|
574
608
|
if (import.meta.hot) {
|
|
575
609
|
import.meta.hot.on('rsc:update', () => {
|
|
576
|
-
observeDevNavigationFailure(fetchRscPayload());
|
|
610
|
+
observeDevNavigationFailure(fetchRscPayload(finishPendingNavigation));
|
|
577
611
|
});
|
|
578
612
|
}
|
|
579
613
|
}
|
|
@@ -599,18 +633,20 @@ function captureActionError(
|
|
|
599
633
|
}
|
|
600
634
|
|
|
601
635
|
function listenNavigation(
|
|
602
|
-
onNavigation: () => void,
|
|
636
|
+
onNavigation: (finishNavigation?: () => void) => void,
|
|
603
637
|
onNavigateHook?: (url: URL, ctx: ClientEntryHookContext) => void,
|
|
604
638
|
observability?: BrowserObservabilityHandle | null,
|
|
605
639
|
hookContext: ClientEntryHookContext = createHookContext(null)
|
|
606
640
|
): () => void {
|
|
641
|
+
const scroll = createNavigationScroll();
|
|
607
642
|
let previousUrl = window.location.href;
|
|
608
|
-
const fire = () => {
|
|
643
|
+
const fire = (kind: HistoryChange) => {
|
|
609
644
|
const nextUrl = window.location.href;
|
|
610
645
|
const needsPayload = isRscNavigation(nextUrl, previousUrl);
|
|
611
646
|
previousUrl = nextUrl;
|
|
647
|
+
const finishNavigation = scroll.changed(kind, needsPayload);
|
|
612
648
|
if (!needsPayload) return;
|
|
613
|
-
onNavigation();
|
|
649
|
+
onNavigation(finishNavigation);
|
|
614
650
|
const url = new URL(window.location.href);
|
|
615
651
|
try {
|
|
616
652
|
observability?.page(url);
|
|
@@ -626,21 +662,35 @@ function listenNavigation(
|
|
|
626
662
|
}
|
|
627
663
|
};
|
|
628
664
|
|
|
629
|
-
|
|
665
|
+
function onPopState() {
|
|
666
|
+
scroll.save();
|
|
667
|
+
fire('traverse');
|
|
668
|
+
}
|
|
669
|
+
function onHashChange() {
|
|
670
|
+
if (previousUrl !== window.location.href) fire('hash');
|
|
671
|
+
}
|
|
672
|
+
window.addEventListener('popstate', onPopState);
|
|
673
|
+
window.addEventListener('hashchange', onHashChange);
|
|
630
674
|
|
|
631
675
|
const oldPushState = window.history.pushState;
|
|
632
676
|
window.history.pushState = function (...args) {
|
|
677
|
+
scroll.save();
|
|
678
|
+
args[0] = historyStateWithScrollEntry(args[0], false);
|
|
633
679
|
const res = oldPushState.apply(this, args);
|
|
634
680
|
if (isInternalNavigationHistoryMutation()) previousUrl = window.location.href;
|
|
635
|
-
else fire();
|
|
681
|
+
else fire('push');
|
|
636
682
|
return res;
|
|
637
683
|
};
|
|
638
684
|
|
|
639
685
|
const oldReplaceState = window.history.replaceState;
|
|
640
686
|
window.history.replaceState = function (...args) {
|
|
687
|
+
scroll.save();
|
|
688
|
+
args[0] = historyStateWithScrollEntry(args[0], true);
|
|
641
689
|
const res = oldReplaceState.apply(this, args);
|
|
642
|
-
if (isInternalNavigationHistoryMutation())
|
|
643
|
-
|
|
690
|
+
if (isInternalNavigationHistoryMutation()) {
|
|
691
|
+
previousUrl = window.location.href;
|
|
692
|
+
scroll.changed('replace', false);
|
|
693
|
+
} else fire('replace');
|
|
644
694
|
return res;
|
|
645
695
|
};
|
|
646
696
|
|
|
@@ -658,20 +708,11 @@ function listenNavigation(
|
|
|
658
708
|
const target = e.target;
|
|
659
709
|
if (!(target instanceof Element)) return;
|
|
660
710
|
const link = target.closest('a');
|
|
661
|
-
if (
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
!e.metaKey &&
|
|
667
|
-
!e.ctrlKey &&
|
|
668
|
-
!e.altKey &&
|
|
669
|
-
!e.shiftKey &&
|
|
670
|
-
!e.defaultPrevented
|
|
671
|
-
) {
|
|
672
|
-
e.preventDefault();
|
|
673
|
-
history.pushState(null, '', link.href);
|
|
674
|
-
}
|
|
711
|
+
if (!(link instanceof HTMLAnchorElement) || !isPrimaryLinkClick(e)) return;
|
|
712
|
+
scroll.save();
|
|
713
|
+
if (!isInternalLink(link)) return;
|
|
714
|
+
e.preventDefault();
|
|
715
|
+
pushLinkNavigation(link.href);
|
|
675
716
|
}
|
|
676
717
|
document.addEventListener('click', onClick);
|
|
677
718
|
|
|
@@ -752,7 +793,9 @@ function listenNavigation(
|
|
|
752
793
|
document.removeEventListener('focusin', onPointerEnter);
|
|
753
794
|
observer?.disconnect();
|
|
754
795
|
mutationObserver?.disconnect();
|
|
755
|
-
window.removeEventListener('popstate',
|
|
796
|
+
window.removeEventListener('popstate', onPopState);
|
|
797
|
+
window.removeEventListener('hashchange', onHashChange);
|
|
798
|
+
scroll.dispose();
|
|
756
799
|
window.history.pushState = oldPushState;
|
|
757
800
|
window.history.replaceState = oldReplaceState;
|
|
758
801
|
};
|
|
@@ -44,7 +44,12 @@ import { type IntlPayload, type PageSeoMeta, injectSeoMeta, mergePageSeoMeta } f
|
|
|
44
44
|
import { injectHeadExtras } from './head-extras-runtime';
|
|
45
45
|
import { runWithI18n } from './i18n-server';
|
|
46
46
|
import { resolvePageRoute, type ResolveRoute } from '../../runtime/routes';
|
|
47
|
-
import {
|
|
47
|
+
import {
|
|
48
|
+
isNoAcceptableLocaleError,
|
|
49
|
+
parseLocale,
|
|
50
|
+
resolveI18nConfig,
|
|
51
|
+
type I18nConfig,
|
|
52
|
+
} from '../../runtime/i18n';
|
|
48
53
|
import type { RuntimeConfig } from '../../types/ISRConfig';
|
|
49
54
|
import { getRequestContext } from '../../context/RequestContext';
|
|
50
55
|
|
|
@@ -269,6 +274,9 @@ export function defineServerEntry<C extends ServerCtx = ServerCtx>(
|
|
|
269
274
|
}
|
|
270
275
|
return response;
|
|
271
276
|
} catch (err) {
|
|
277
|
+
if (isNoAcceptableLocaleError(err)) {
|
|
278
|
+
return new Response(null, { status: 406, headers: { vary: 'Accept-Language, Cookie' } });
|
|
279
|
+
}
|
|
272
280
|
if (hooks.onError) {
|
|
273
281
|
try {
|
|
274
282
|
await hooks.onError(err, request, ctx);
|
|
@@ -40,7 +40,12 @@ import type {
|
|
|
40
40
|
RuntimeSeoConfig,
|
|
41
41
|
} from '../../types';
|
|
42
42
|
import { readCookie } from '../../utils/cookie';
|
|
43
|
-
import {
|
|
43
|
+
import {
|
|
44
|
+
negotiateLocale,
|
|
45
|
+
parseLocale,
|
|
46
|
+
resolveI18nConfig,
|
|
47
|
+
type I18nConfig,
|
|
48
|
+
} from '../../runtime/i18n';
|
|
44
49
|
|
|
45
50
|
export { getCookieHeader, parseCookieHeader, readCookie } from '../../utils/cookie';
|
|
46
51
|
|
|
@@ -153,7 +158,7 @@ export interface IntlConfig {
|
|
|
153
158
|
) => IntlPayload | null | undefined | Promise<IntlPayload | null | undefined>;
|
|
154
159
|
/** 本地或自定义加载器;与 endpoint 互斥(优先级更高) */
|
|
155
160
|
load?: (locale: string, ctx: SiteRuntimeContext) => Promise<IntlPayload | null>;
|
|
156
|
-
/** locale 检测(默认:cookie `locale` → Accept-Language
|
|
161
|
+
/** locale 检测(默认:URL locale → cookie `locale` → Accept-Language → defaultLocale) */
|
|
157
162
|
detect?: (req: Request) => string;
|
|
158
163
|
/** 缓存 TTL 毫秒,默认 60_000 */
|
|
159
164
|
ttl?: number;
|
|
@@ -290,7 +295,7 @@ export function createAdminIntlLoader(
|
|
|
290
295
|
return async (locale, ctx) => {
|
|
291
296
|
const normalizedLocale =
|
|
292
297
|
supportedLocales.length && defaultLocale
|
|
293
|
-
?
|
|
298
|
+
? (matchConfiguredLocale(locale, supportedLocales) ?? defaultLocale)
|
|
294
299
|
: locale;
|
|
295
300
|
const remoteUrl = resolveAdminUrl(endpoint, { locale: normalizedLocale }, ctx);
|
|
296
301
|
const remote = remoteUrl
|
|
@@ -560,8 +565,10 @@ function createSiteHooks(config: SiteHooksConfig, runtime: SiteRuntimeConfig): S
|
|
|
560
565
|
|
|
561
566
|
// ─── i18n 缓存(一次创建,请求级复用)──────────────
|
|
562
567
|
const intlCfg = config.intl ?? {};
|
|
563
|
-
const fallbackLocale = intlCfg.defaultLocale ?? 'zh-CN';
|
|
564
568
|
const supportedLocales = intlCfg.locales?.length ? intlCfg.locales : undefined;
|
|
569
|
+
const negotiationConfig = supportedLocales
|
|
570
|
+
? resolveI18nConfig(intlCfg)
|
|
571
|
+
: { locales: ['zh-CN', 'en'], defaultLocale: intlCfg.defaultLocale ?? 'zh-CN' };
|
|
565
572
|
// 默认 detect 优先级(业界标准 i18n 顺序):
|
|
566
573
|
// 1. URL pathname 前缀 /en-US/... → 'en-US' ← 显式路由意图,最高优先级
|
|
567
574
|
// 2. locale cookie ← 用户手动切换过的偏好
|
|
@@ -595,15 +602,13 @@ function createSiteHooks(config: SiteHooksConfig, runtime: SiteRuntimeConfig): S
|
|
|
595
602
|
// 2. cookie
|
|
596
603
|
const localeCookie = readCookie(req, 'locale');
|
|
597
604
|
if (localeCookie) {
|
|
598
|
-
|
|
599
|
-
?
|
|
605
|
+
const matchedCookie = supportedLocales
|
|
606
|
+
? matchConfiguredLocale(localeCookie, supportedLocales)
|
|
600
607
|
: localeCookie;
|
|
608
|
+
if (matchedCookie) return matchedCookie;
|
|
601
609
|
}
|
|
602
610
|
// 3. Accept-Language → 4. fallbackLocale
|
|
603
|
-
|
|
604
|
-
return supportedLocales
|
|
605
|
-
? normalizeLocale(parseAcceptLanguage(accept), supportedLocales, fallbackLocale)
|
|
606
|
-
: inferLocaleFromAcceptLanguage(accept, fallbackLocale);
|
|
611
|
+
return negotiateLocale(req.headers.get('accept-language'), negotiationConfig);
|
|
607
612
|
});
|
|
608
613
|
|
|
609
614
|
const intlLoader = createCachedFetcher<string, IntlPayload>({
|
|
@@ -779,42 +784,15 @@ function rtlOf(locale: string): 'ltr' | 'rtl' {
|
|
|
779
784
|
return /^(ar|he|fa|ur)/.test(locale) ? 'rtl' : 'ltr';
|
|
780
785
|
}
|
|
781
786
|
|
|
782
|
-
function
|
|
783
|
-
let best = '';
|
|
784
|
-
let bestQ = -1;
|
|
785
|
-
for (const part of accept.split(',')) {
|
|
786
|
-
const [rawLocale, ...attrs] = part.trim().split(';');
|
|
787
|
-
if (!rawLocale) continue;
|
|
788
|
-
const qAttr = attrs.find(attr => attr.trim().startsWith('q='));
|
|
789
|
-
const q = qAttr ? Number(qAttr.trim().slice(2)) : 1;
|
|
790
|
-
if (Number.isFinite(q) && q > bestQ) {
|
|
791
|
-
best = rawLocale;
|
|
792
|
-
bestQ = q;
|
|
793
|
-
}
|
|
794
|
-
}
|
|
795
|
-
return best;
|
|
796
|
-
}
|
|
797
|
-
|
|
798
|
-
function inferLocaleFromAcceptLanguage(accept: string, fallbackLocale: string): string {
|
|
799
|
-
const best = parseAcceptLanguage(accept);
|
|
800
|
-
if (!best) return fallbackLocale;
|
|
801
|
-
const primary = best.toLowerCase().split('-')[0];
|
|
802
|
-
if (primary === 'zh') return 'zh-CN';
|
|
803
|
-
if (primary === 'en') return 'en';
|
|
804
|
-
return fallbackLocale;
|
|
805
|
-
}
|
|
806
|
-
|
|
807
|
-
function normalizeLocale(
|
|
787
|
+
function matchConfiguredLocale(
|
|
808
788
|
value: string,
|
|
809
|
-
supportedLocales: readonly string[]
|
|
810
|
-
|
|
811
|
-
): string {
|
|
789
|
+
supportedLocales: readonly string[]
|
|
790
|
+
): string | undefined {
|
|
812
791
|
const lower = value.toLowerCase();
|
|
813
792
|
const exact = supportedLocales.find(locale => locale.toLowerCase() === lower);
|
|
814
793
|
if (exact) return exact;
|
|
815
794
|
const prefix = lower.split('-')[0];
|
|
816
|
-
|
|
817
|
-
return byPrefix ?? fallbackLocale;
|
|
795
|
+
return supportedLocales.find(locale => locale.toLowerCase().split('-')[0] === prefix);
|
|
818
796
|
}
|
|
819
797
|
|
|
820
798
|
function extractIntlMessages(data: unknown): Record<string, unknown> {
|