isr-engine 4.2.0 → 4.4.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.
Files changed (58) hide show
  1. package/README.md +7 -1
  2. package/dist/{contentRevalidation-D3SZwwbX.js → CacheTagContext-Btmq8KCD.js} +20 -7
  3. package/dist/CacheTagContext-Btmq8KCD.js.map +1 -0
  4. package/dist/{abVariantContext-BNInoflb.js → abVariantContext-yWZOqscY.js} +94 -36
  5. package/dist/abVariantContext-yWZOqscY.js.map +1 -0
  6. package/dist/cli/cli.js +1 -1
  7. package/dist/context/CacheTagContext.d.ts +10 -0
  8. package/dist/context/CacheTagContext.d.ts.map +1 -0
  9. package/dist/{createCacheInspectorMiddleware-CDOoJXGO.js → createCacheInspectorMiddleware-DUYq46J4.js} +2 -2
  10. package/dist/{createCacheInspectorMiddleware-CDOoJXGO.js.map → createCacheInspectorMiddleware-DUYq46J4.js.map} +1 -1
  11. package/dist/{createCachedFetcher-Y7zbGgjb.js → createCachedFetcher-CgJscexq.js} +29 -10
  12. package/dist/createCachedFetcher-CgJscexq.js.map +1 -0
  13. package/dist/{createISRApp-DA3-5Ezk.js → createISRApp-yBEBvYD5.js} +74 -56
  14. package/dist/createISRApp-yBEBvYD5.js.map +1 -0
  15. package/dist/defaults/runtime/contentRevalidation.d.ts +5 -2
  16. package/dist/defaults/runtime/contentRevalidation.d.ts.map +1 -1
  17. package/dist/defaults/runtime/createCachedFetcher.d.ts +5 -1
  18. package/dist/defaults/runtime/createCachedFetcher.d.ts.map +1 -1
  19. package/dist/defaults/runtime/defineSiteHooks.d.ts +7 -2
  20. package/dist/defaults/runtime/defineSiteHooks.d.ts.map +1 -1
  21. package/dist/defaults/runtime/defineSiteHooks.js +103 -36
  22. package/dist/defaults/runtime/defineSiteHooks.js.map +1 -1
  23. package/dist/defaults/runtime/renderCancellation.d.ts +3 -0
  24. package/dist/defaults/runtime/renderCancellation.d.ts.map +1 -0
  25. package/dist/engine/seo/resolveSeoConfig.d.ts +1 -0
  26. package/dist/engine/seo/resolveSeoConfig.d.ts.map +1 -1
  27. package/dist/isr-engine.js +4 -4
  28. package/dist/plugin/isrCacheMiddleware.d.ts.map +1 -1
  29. package/dist/rsc/browser.js +1 -1
  30. package/dist/rsc/browser.js.map +1 -1
  31. package/dist/rsc/cacheTag.d.ts +1 -8
  32. package/dist/rsc/cacheTag.d.ts.map +1 -1
  33. package/dist/rsc/index.js +3 -2
  34. package/dist/rsc/revalidate.d.ts +3 -2
  35. package/dist/rsc/revalidate.d.ts.map +1 -1
  36. package/dist/{rsc-CbZ-BsWD.js → rsc-BYq2vvnh.js} +2 -2
  37. package/dist/{rsc-CbZ-BsWD.js.map → rsc-BYq2vvnh.js.map} +1 -1
  38. package/dist/server/contentRevalidationRoute.d.ts +4 -0
  39. package/dist/server/contentRevalidationRoute.d.ts.map +1 -0
  40. package/dist/server/opsConfig.d.ts +6 -1
  41. package/dist/server/opsConfig.d.ts.map +1 -1
  42. package/dist/server/productionRuntime.d.ts.map +1 -1
  43. package/dist/server/publishedSitemap.d.ts.map +1 -1
  44. package/dist/types/ISRConfig.d.ts +16 -0
  45. package/dist/types/ISRConfig.d.ts.map +1 -1
  46. package/package.json +2 -2
  47. package/src/context/CacheTagContext.ts +20 -0
  48. package/src/defaults/entry.server.ssr.tsx +10 -0
  49. package/src/defaults/runtime/contentRevalidation.ts +9 -3
  50. package/src/defaults/runtime/createCachedFetcher.ts +45 -10
  51. package/src/defaults/runtime/defineServerEntry.tsx +26 -28
  52. package/src/defaults/runtime/defineSiteHooks.ts +138 -44
  53. package/src/defaults/runtime/renderCancellation.ts +10 -0
  54. package/src/types/ISRConfig.ts +18 -0
  55. package/dist/abVariantContext-BNInoflb.js.map +0 -1
  56. package/dist/contentRevalidation-D3SZwwbX.js.map +0 -1
  57. package/dist/createCachedFetcher-Y7zbGgjb.js.map +0 -1
  58. package/dist/createISRApp-DA3-5Ezk.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"publishedSitemap.d.ts","sourceRoot":"","sources":["../../src/server/publishedSitemap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,SAAS;eAmBvD,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;;cAwB5C"}
1
+ {"version":3,"file":"publishedSitemap.d.ts","sourceRoot":"","sources":["../../src/server/publishedSitemap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,SAAS;eA2BvD,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;;cAuB5C"}
@@ -93,6 +93,16 @@ export interface RuntimeExperimentTrackingConfig {
93
93
  sampleRate: number | undefined;
94
94
  enabled: boolean | undefined;
95
95
  }
96
+ export interface LanguageCatalogEntry {
97
+ readonly locale: string;
98
+ readonly name: string;
99
+ }
100
+ export interface RuntimeLanguageCatalogConfig {
101
+ /** Returns an array of locale/name entries, optionally wrapped in { data }. */
102
+ endpoint: string;
103
+ /** Catalog cache TTL in milliseconds. Defaults to the dictionary TTL. */
104
+ ttl?: number;
105
+ }
96
106
  export interface RuntimeI18nConfig {
97
107
  /** 支持的 locale 列表,用于 URL locale 前缀解析和请求协商 */
98
108
  locales: readonly string[];
@@ -102,6 +112,8 @@ export interface RuntimeI18nConfig {
102
112
  prefixDefault: boolean;
103
113
  /** Opt in to remembering LocaleLink selections for the unprefixed root in prefixDefault mode. */
104
114
  rememberLocale?: boolean;
115
+ /** Optional bulk source for the display names of the configured locales. */
116
+ catalog?: RuntimeLanguageCatalogConfig;
105
117
  /** 远端字典端点;相对路径会拼到 services.api 上 */
106
118
  endpoint: string | undefined;
107
119
  /** 本地兜底字典;配置 API 不可用时使用 */
@@ -180,6 +192,8 @@ export interface RuntimeSitemapConfig {
180
192
  }) => readonly RuntimeSitemapEntry[] | Promise<readonly RuntimeSitemapEntry[]>;
181
193
  /** Catalog cache TTL in milliseconds. Defaults to runtime.seo.ttl. */
182
194
  ttl?: number;
195
+ /** Reuse a successful catalog on refresh errors for at most this long after expiry. Default 300000. */
196
+ staleIfErrorMs?: number;
183
197
  }
184
198
  export interface RuntimeSeoConfig {
185
199
  /** 远端 SEO 端点;支持 {pathname} */
@@ -480,6 +494,8 @@ export interface ISRConfig {
480
494
  enabled: boolean;
481
495
  public: boolean;
482
496
  };
497
+ /** Enable the authenticated Node production publication endpoint. Defaults to false. */
498
+ contentRevalidation?: boolean;
483
499
  };
484
500
  };
485
501
  /** SSG 预生成配置 */
@@ -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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "isr-engine",
3
- "version": "4.2.0",
3
+ "version": "4.4.0",
4
4
  "description": "ISR/SSG/Fallback rendering orchestration on Vite + React 19 RSC.",
5
5
  "license": "UNLICENSED",
6
6
  "repository": {
@@ -90,7 +90,7 @@
90
90
  "test": "vitest run",
91
91
  "pretest:browser": "pnpm run build",
92
92
  "test:browser:production": "pnpm run build && playwright test --config playwright.production.config.ts",
93
- "test:browser": "playwright test e2e/dev-css-lifecycle/dev-css-lifecycle.spec.ts",
93
+ "test:browser": "playwright test",
94
94
  "bench": "node bench/runner.mjs",
95
95
  "check": "pnpm run type-check && pnpm run lint && pnpm run test",
96
96
  "audit:security": "pnpm audit --registry=https://registry.npmjs.org --audit-level=low",
@@ -0,0 +1,20 @@
1
+ import { AsyncLocalStorage } from 'node:async_hooks';
2
+
3
+ interface TagStore {
4
+ tags: Set<string>;
5
+ uncacheable: boolean;
6
+ }
7
+
8
+ // The Vite RSC bundle and the Node response cache share this request context.
9
+ const KEY = Symbol.for('isr-engine:cache-tag-als');
10
+ const runtime = globalThis as typeof globalThis & { [KEY]?: AsyncLocalStorage<TagStore> };
11
+
12
+ export function getCacheTagStorage(): AsyncLocalStorage<TagStore> {
13
+ return (runtime[KEY] ??= new AsyncLocalStorage<TagStore>());
14
+ }
15
+
16
+ /** Exclude a successful but degraded render from the shared response cache. */
17
+ export function markUncacheable(): void {
18
+ const store = getCacheTagStorage().getStore();
19
+ if (store) store.uncacheable = true;
20
+ }
@@ -19,6 +19,7 @@ import { injectRSCPayload } from 'rsc-html-stream/server';
19
19
  import type { IntlPayload } from './runtime/seo-runtime';
20
20
  import { setClientI18n } from '../runtime/i18n-store';
21
21
  import { HydrationShell } from './runtime/hydration-shell';
22
+ import { createRenderErrorHandler, isRenderCancellation } from './runtime/renderCancellation';
22
23
  // @ts-expect-error - 虚拟模块由 plugin-rsc 注入
23
24
  import assetsManifest from 'virtual:vite-rsc/assets-manifest';
24
25
 
@@ -138,6 +139,7 @@ const CSR_SHELL_STYLES = `
138
139
  export interface RenderHtmlOptions {
139
140
  formState?: ReactFormState;
140
141
  nonce?: string;
142
+ signal?: AbortSignal;
141
143
  /** true 时跳过 bootstrap 脚本和 RSC 内联 payload,模拟禁用 JS 场景 */
142
144
  debugNojs?: boolean;
143
145
  /** 强制走 csr-shell 兜底(调试用 —— ?__csr-shell=1 触发) */
@@ -157,6 +159,8 @@ export async function renderHTML(
157
159
  rscStream: ReadableStream<Uint8Array>,
158
160
  options: RenderHtmlOptions = {}
159
161
  ): Promise<RenderHtmlResult> {
162
+ const { signal } = options;
163
+ signal?.throwIfAborted();
160
164
  const [rscStream1, rscStream2] = rscStream.tee();
161
165
 
162
166
  let payload: Promise<DefaultRscPayload> | undefined;
@@ -173,6 +177,7 @@ export async function renderHTML(
173
177
  let htmlStream: ReadableStream<Uint8Array>;
174
178
  let status: number | undefined;
175
179
  let csrShellFallback = false;
180
+ const onError = createRenderErrorHandler(signal);
176
181
 
177
182
  try {
178
183
  if (options.forceCsrShell) throw new Error('forceCsrShell debug flag');
@@ -184,9 +189,12 @@ export async function renderHTML(
184
189
  bootstrapScriptContent: options.debugNojs ? undefined : bootstrapScriptContent,
185
190
  nonce: options.nonce,
186
191
  formState: options.formState,
192
+ signal,
193
+ onError,
187
194
  }
188
195
  );
189
196
  } catch (err) {
197
+ if (isRenderCancellation(signal, err)) throw err;
190
198
  // FallbackChain 末端 csr-shell:SSR 渲染抛异常 → 不出 5xx 白屏,
191
199
  // 改返回最小壳 HTML + self.__NO_HYDRATE=1,让浏览器走 createRoot 自救
192
200
  csrShellFallback = true;
@@ -241,6 +249,8 @@ export async function renderHTML(
241
249
  (options.apiBaseUrl ? `self.__API_BASE__=${JSON.stringify(options.apiBaseUrl)};` : '') +
242
250
  (options.debugNojs ? '' : bootstrapScriptContent),
243
251
  nonce: options.nonce,
252
+ signal,
253
+ onError,
244
254
  }
245
255
  );
246
256
  }
@@ -1,6 +1,9 @@
1
1
  /** Data and response cache scopes to invalidate after a content write commits. */
2
2
  export interface ContentRevalidationOptions {
3
+ /** Exact site paths, including any locale prefix. */
3
4
  paths?: readonly string[];
5
+ /** Business pathnames expanded using the runtime's routing config and the supplied locales. */
6
+ localizedPaths?: readonly string[];
4
7
  tags?: readonly string[];
5
8
  locales?: readonly string[];
6
9
  sitemap?: boolean;
@@ -8,7 +11,7 @@ export interface ContentRevalidationOptions {
8
11
 
9
12
  export interface ContentPublication {
10
13
  id: string;
11
- scopes: Readonly<Required<ContentRevalidationOptions>>;
14
+ scopes: Readonly<Omit<Required<ContentRevalidationOptions>, 'localizedPaths'>>;
12
15
  }
13
16
 
14
17
  type ContentInvalidation = ContentPublication['scopes'] & { allPageMetadata?: true };
@@ -63,11 +66,13 @@ export function invalidateContentCaches(
63
66
  if (errors.length) throw new AggregateError(errors, 'Content metadata invalidation failed');
64
67
  }
65
68
 
66
- export function normalizeContentScopes(input: unknown): ContentPublication['scopes'] {
69
+ export function normalizeContentScopes(
70
+ input: unknown
71
+ ): ContentPublication['scopes'] & Pick<ContentRevalidationOptions, 'localizedPaths'> {
67
72
  if (!input || typeof input !== 'object' || Array.isArray(input)) {
68
73
  throw new TypeError('Invalid content revalidation scopes');
69
74
  }
70
- const { paths, tags, locales, sitemap } = input as ContentRevalidationOptions;
75
+ const { paths, localizedPaths, tags, locales, sitemap } = input as ContentRevalidationOptions;
71
76
  function read(values: unknown): string[] {
72
77
  if (values === undefined) return [];
73
78
  if (
@@ -83,6 +88,7 @@ export function normalizeContentScopes(input: unknown): ContentPublication['scop
83
88
  }
84
89
  return {
85
90
  paths: [...new Set(read(paths))],
91
+ ...(localizedPaths !== undefined && { localizedPaths: [...new Set(read(localizedPaths))] }),
86
92
  tags: [...new Set(read(tags))],
87
93
  locales: [...new Set(read(locales).map(locale => locale.trim().toLowerCase()))],
88
94
  sitemap: sitemap ?? false,
@@ -58,13 +58,17 @@ export interface CachedFetcherOptions<TArg, TValue> {
58
58
  /** 从入参生成缓存 key */
59
59
  key: (arg: TArg) => string;
60
60
  /** 实际加载逻辑(network / fs / dynamic import 都可) */
61
- fetch: (arg: TArg) => Promise<TValue>;
61
+ fetch: (arg: TArg, markDegraded?: () => void) => Promise<TValue>;
62
62
  /** 缓存 TTL(毫秒),默认 60s */
63
63
  ttl?: number;
64
64
  /** LRU 容量,默认 500 */
65
65
  max?: number;
66
66
  /** 启用 stale-while-revalidate:过期仍返回旧值,后台异步刷新(默认 false) */
67
67
  swr?: boolean;
68
+ /** Maximum time after expiry to reuse the last successful value on refresh errors. */
69
+ staleIfErrorMs?: number;
70
+ /** Called in each consumer's context when it receives a stale or degraded result. */
71
+ onDegraded?: () => void;
68
72
  /** 拉取失败时的回退值(如不提供则抛错) */
69
73
  fallback?: (arg: TArg, error: unknown) => TValue | Promise<TValue>;
70
74
  }
@@ -75,6 +79,11 @@ interface Entry<TArg, TValue> {
75
79
  expiresAt: number;
76
80
  }
77
81
 
82
+ interface LoadResult<TValue> {
83
+ value: TValue;
84
+ degraded: boolean;
85
+ }
86
+
78
87
  export type CachedFetcher<TArg, TValue> = (arg: TArg) => Promise<TValue>;
79
88
 
80
89
  export function createCachedFetcher<TArg, TValue>(
@@ -82,27 +91,50 @@ export function createCachedFetcher<TArg, TValue>(
82
91
  ): CachedFetcher<TArg, TValue> & { invalidate(matches?: (arg: TArg) => boolean): void } {
83
92
  const ttl = opts.ttl ?? 60_000;
84
93
  const max = opts.max ?? 500;
85
- type Flight = { arg: TArg; promise?: Promise<TValue> };
94
+ const staleIfErrorMs = opts.staleIfErrorMs ?? 0;
95
+ if (!Number.isSafeInteger(staleIfErrorMs) || staleIfErrorMs < 0) {
96
+ throw new RangeError('staleIfErrorMs must be a non-negative safe integer');
97
+ }
98
+ type Flight = { arg: TArg; promise?: Promise<LoadResult<TValue>> };
86
99
  const cache = new TinyLRU<string, Entry<TArg, TValue>>(max);
87
100
  const inflight = new Map<string, Flight>();
88
101
 
89
- async function load(key: string, flight: Flight): Promise<TValue> {
102
+ async function load(
103
+ key: string,
104
+ flight: Flight,
105
+ previous?: Entry<TArg, TValue>
106
+ ): Promise<LoadResult<TValue>> {
90
107
  try {
91
- const value = await opts.fetch(flight.arg);
92
- if (inflight.get(key) === flight) {
108
+ let degraded = false;
109
+ const value = await opts.fetch(flight.arg, () => {
110
+ degraded = true;
111
+ });
112
+ if (!degraded && inflight.get(key) === flight) {
93
113
  cache.set(key, { arg: flight.arg, value, expiresAt: Date.now() + ttl });
94
114
  }
95
- return value;
115
+ return { value, degraded };
96
116
  } catch (err) {
97
- if (opts.fallback) return await opts.fallback(flight.arg, err);
117
+ if (
118
+ previous &&
119
+ staleIfErrorMs > 0 &&
120
+ inflight.get(key) === flight &&
121
+ Date.now() - previous.expiresAt < staleIfErrorMs
122
+ ) {
123
+ return { value: previous.value, degraded: true };
124
+ }
125
+ if (opts.fallback) return { value: await opts.fallback(flight.arg, err), degraded: true };
98
126
  throw err;
99
127
  }
100
128
  }
101
129
 
102
- function startLoad(key: string, arg: TArg): Promise<TValue> {
130
+ function startLoad(
131
+ key: string,
132
+ arg: TArg,
133
+ previous?: Entry<TArg, TValue>
134
+ ): Promise<LoadResult<TValue>> {
103
135
  const flight: Flight = { arg };
104
136
  inflight.set(key, flight);
105
- flight.promise = load(key, flight).finally(() => {
137
+ flight.promise = load(key, flight, previous).finally(() => {
106
138
  if (inflight.get(key) === flight) inflight.delete(key);
107
139
  });
108
140
  return flight.promise;
@@ -124,11 +156,14 @@ export function createCachedFetcher<TArg, TValue>(
124
156
  /* 后台刷新失败保留旧值 */
125
157
  });
126
158
  }
159
+ opts.onDegraded?.();
127
160
  return entry.value;
128
161
  }
129
162
 
130
163
  // miss 或非 SWR 过期:合并并发到同一个 promise
131
- return inflight.get(key)?.promise ?? startLoad(key, arg);
164
+ const result = await (inflight.get(key)?.promise ?? startLoad(key, arg, entry));
165
+ if (result.degraded) opts.onDegraded?.();
166
+ return result.value;
132
167
  }
133
168
 
134
169
  cachedFetcher.invalidate = (matches: (arg: TArg) => boolean = () => true): void => {
@@ -52,6 +52,8 @@ import {
52
52
  } from '../../runtime/i18n';
53
53
  import type { RuntimeConfig } from '../../types/ISRConfig';
54
54
  import { getRequestContext } from '../../context/RequestContext';
55
+ import { markUncacheable } from '../../context/CacheTagContext';
56
+ import { createRenderErrorHandler, isRenderCancellation } from './renderCancellation';
55
57
 
56
58
  interface DefaultRscPayload {
57
59
  root: React.ReactNode;
@@ -194,6 +196,7 @@ export function defineServerEntry<C extends ServerCtx = ServerCtx>(
194
196
  let ctx: C = { ...(requestStore ?? {}), ...engineCtx } as C;
195
197
 
196
198
  try {
199
+ request.signal.throwIfAborted();
197
200
  if (hooks.beforeRequest) {
198
201
  const userExt = (await hooks.beforeRequest(request, engineCtx)) ?? {};
199
202
  ctx = { ...(requestStore ?? {}), ...engineCtx, ...userExt } as C;
@@ -274,6 +277,7 @@ export function defineServerEntry<C extends ServerCtx = ServerCtx>(
274
277
  }
275
278
  return response;
276
279
  } catch (err) {
280
+ if (isRenderCancellation(request.signal, err)) return new Response(null, { status: 204 });
277
281
  if (isNoAcceptableLocaleError(err)) {
278
282
  return new Response(null, {
279
283
  status: 406,
@@ -310,6 +314,18 @@ async function runRscPipeline(
310
314
  ): Promise<Response> {
311
315
  const { request } = renderRequest;
312
316
  const responseRouteStatus = renderRequest.isAction ? undefined : extras.routeStatus;
317
+ const signal = request.signal;
318
+ signal.throwIfAborted();
319
+ const responseHeaders = new Headers({
320
+ 'content-type': renderRequest.isRsc
321
+ ? 'text/x-component;charset=utf-8'
322
+ : 'text/html; charset=utf-8',
323
+ });
324
+ if (request.method === 'HEAD') {
325
+ // The header-only response has no dependency tags from the component tree.
326
+ markUncacheable();
327
+ return new Response(null, { status: responseRouteStatus, headers: responseHeaders });
328
+ }
313
329
 
314
330
  let returnValue: DefaultRscPayload['returnValue'] | undefined;
315
331
  let formState: ReactFormState | undefined;
@@ -354,45 +370,28 @@ async function runRscPipeline(
354
370
  formState,
355
371
  returnValue,
356
372
  };
373
+ const renderOptions = { temporaryReferences, signal, onError: createRenderErrorHandler(signal) };
357
374
  const rscStream = import.meta.env.DEV
358
375
  ? runWithDevStyleDeclarationCollection(
359
376
  devStyleDeclarations!,
360
377
  () =>
361
- renderToReadableStream<DefaultRscPayload>(
362
- rscPayload,
363
- { temporaryReferences },
364
- {
365
- onClientReference: declareDevClientReferenceStyles,
366
- }
367
- ),
378
+ renderToReadableStream<DefaultRscPayload>(rscPayload, renderOptions, {
379
+ onClientReference: declareDevClientReferenceStyles,
380
+ }),
368
381
  { transportGeneration: renderRequest.devStyleGeneration }
369
382
  )
370
- : renderToReadableStream<DefaultRscPayload>(rscPayload, { temporaryReferences });
383
+ : renderToReadableStream<DefaultRscPayload>(rscPayload, renderOptions);
371
384
 
372
385
  if (renderRequest.isRsc) {
373
386
  return new Response(rscStream, {
374
387
  status: actionStatus ?? responseRouteStatus,
375
- headers: { 'content-type': 'text/x-component;charset=utf-8' },
388
+ headers: responseHeaders,
376
389
  });
377
390
  }
378
391
 
379
- interface SsrModule {
380
- renderHTML: (
381
- rscStream: ReadableStream<Uint8Array>,
382
- options: {
383
- formState?: ReactFormState;
384
- nonce?: string;
385
- debugNojs?: boolean;
386
- forceCsrShell?: boolean;
387
- apiBaseUrl?: string;
388
- }
389
- ) => Promise<{
390
- stream: ReadableStream<Uint8Array>;
391
- status?: number;
392
- csrShellFallback?: boolean;
393
- }>;
394
- }
395
- const ssrEntry = await import.meta.viteRsc.loadModule<SsrModule>('ssr', 'index');
392
+ const ssrEntry = await import.meta.viteRsc.loadModule<
393
+ Pick<typeof import('../entry.server.ssr'), 'renderHTML'>
394
+ >('ssr', 'index');
396
395
 
397
396
  // CSP nonce —— 由上游 createCspNonceMiddleware 生成并写到 req header 'x-csp-nonce'。
398
397
  // React 19 renderToReadableStream 接 nonce 选项后,自动给所有内联 script (RSC payload、
@@ -406,10 +405,9 @@ async function runRscPipeline(
406
405
  debugNojs: renderRequest.url.searchParams.has('__nojs'),
407
406
  forceCsrShell: renderRequest.url.searchParams.has('__csr-shell'),
408
407
  apiBaseUrl: extras.apiBaseUrl,
408
+ signal,
409
409
  });
410
410
 
411
- const responseHeaders = new Headers();
412
- responseHeaders.set('content-type', 'text/html; charset=utf-8');
413
411
  responseHeaders.set('x-render-strategy', ssrResult.csrShellFallback ? 'csr-shell' : 'rsc-ssr');
414
412
  responseHeaders.set('x-fallback-used', ssrResult.csrShellFallback ? 'true' : 'false');
415
413
  if (ssrResult.csrShellFallback) {