vinext 0.0.45 → 0.0.47

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 (311) hide show
  1. package/README.md +7 -5
  2. package/dist/build/prerender.d.ts +2 -1
  3. package/dist/build/prerender.js +80 -17
  4. package/dist/build/prerender.js.map +1 -1
  5. package/dist/build/report.d.ts +1 -1
  6. package/dist/build/route-classification-injector.d.ts +35 -0
  7. package/dist/build/route-classification-injector.js +61 -0
  8. package/dist/build/route-classification-injector.js.map +1 -0
  9. package/dist/build/route-classification-manifest.d.ts +1 -1
  10. package/dist/build/standalone.js +4 -3
  11. package/dist/build/standalone.js.map +1 -1
  12. package/dist/build/static-export.d.ts +1 -1
  13. package/dist/check.js +30 -18
  14. package/dist/check.js.map +1 -1
  15. package/dist/cli-args.d.ts +31 -0
  16. package/dist/cli-args.js +104 -0
  17. package/dist/cli-args.js.map +1 -0
  18. package/dist/cli.js +6 -19
  19. package/dist/cli.js.map +1 -1
  20. package/dist/cloudflare/kv-cache-handler.js +29 -9
  21. package/dist/cloudflare/kv-cache-handler.js.map +1 -1
  22. package/dist/config/config-matchers.js +1 -0
  23. package/dist/config/config-matchers.js.map +1 -1
  24. package/dist/config/next-config.d.ts +42 -4
  25. package/dist/config/next-config.js +27 -0
  26. package/dist/config/next-config.js.map +1 -1
  27. package/dist/deploy.js +18 -23
  28. package/dist/deploy.js.map +1 -1
  29. package/dist/entries/app-rsc-entry.d.ts +4 -3
  30. package/dist/entries/app-rsc-entry.js +435 -2317
  31. package/dist/entries/app-rsc-entry.js.map +1 -1
  32. package/dist/entries/app-rsc-manifest.d.ts +24 -0
  33. package/dist/entries/app-rsc-manifest.js +155 -0
  34. package/dist/entries/app-rsc-manifest.js.map +1 -0
  35. package/dist/entries/pages-server-entry.js +18 -105
  36. package/dist/entries/pages-server-entry.js.map +1 -1
  37. package/dist/index.js +82 -85
  38. package/dist/index.js.map +1 -1
  39. package/dist/plugins/fonts.js +54 -32
  40. package/dist/plugins/fonts.js.map +1 -1
  41. package/dist/plugins/rsc-client-shim-excludes.d.ts +6 -0
  42. package/dist/plugins/rsc-client-shim-excludes.js +28 -0
  43. package/dist/plugins/rsc-client-shim-excludes.js.map +1 -0
  44. package/dist/routing/app-route-graph.d.ts +109 -0
  45. package/dist/routing/app-route-graph.js +819 -0
  46. package/dist/routing/app-route-graph.js.map +1 -0
  47. package/dist/routing/app-router.d.ts +2 -79
  48. package/dist/routing/app-router.js +7 -621
  49. package/dist/routing/app-router.js.map +1 -1
  50. package/dist/routing/route-pattern.d.ts +9 -0
  51. package/dist/routing/route-pattern.js +90 -0
  52. package/dist/routing/route-pattern.js.map +1 -0
  53. package/dist/routing/route-trie.js +10 -11
  54. package/dist/routing/route-trie.js.map +1 -1
  55. package/dist/server/app-browser-entry.js +94 -232
  56. package/dist/server/app-browser-entry.js.map +1 -1
  57. package/dist/server/app-browser-error.d.ts +3 -4
  58. package/dist/server/app-browser-error.js +8 -4
  59. package/dist/server/app-browser-error.js.map +1 -1
  60. package/dist/server/app-browser-navigation-controller.d.ts +73 -0
  61. package/dist/server/app-browser-navigation-controller.js +282 -0
  62. package/dist/server/app-browser-navigation-controller.js.map +1 -0
  63. package/dist/server/app-browser-state.d.ts +1 -1
  64. package/dist/server/app-browser-state.js.map +1 -1
  65. package/dist/server/app-elements.js +1 -5
  66. package/dist/server/app-elements.js.map +1 -1
  67. package/dist/server/app-fallback-renderer.d.ts +57 -0
  68. package/dist/server/app-fallback-renderer.js +79 -0
  69. package/dist/server/app-fallback-renderer.js.map +1 -0
  70. package/dist/server/app-hook-warning-suppression.d.ts +7 -0
  71. package/dist/server/app-hook-warning-suppression.js +12 -0
  72. package/dist/server/app-hook-warning-suppression.js.map +1 -0
  73. package/dist/server/app-middleware.d.ts +32 -0
  74. package/dist/server/app-middleware.js +147 -0
  75. package/dist/server/app-middleware.js.map +1 -0
  76. package/dist/server/app-mounted-slots-header.d.ts +17 -0
  77. package/dist/server/app-mounted-slots-header.js +21 -0
  78. package/dist/server/app-mounted-slots-header.js.map +1 -0
  79. package/dist/server/app-page-boundary-render.d.ts +4 -2
  80. package/dist/server/app-page-boundary-render.js +50 -30
  81. package/dist/server/app-page-boundary-render.js.map +1 -1
  82. package/dist/server/app-page-boundary.d.ts +12 -1
  83. package/dist/server/app-page-boundary.js +27 -12
  84. package/dist/server/app-page-boundary.js.map +1 -1
  85. package/dist/server/app-page-cache.d.ts +22 -5
  86. package/dist/server/app-page-cache.js +90 -11
  87. package/dist/server/app-page-cache.js.map +1 -1
  88. package/dist/server/app-page-dispatch.d.ts +123 -0
  89. package/dist/server/app-page-dispatch.js +348 -0
  90. package/dist/server/app-page-dispatch.js.map +1 -0
  91. package/dist/server/app-page-element-builder.d.ts +61 -0
  92. package/dist/server/app-page-element-builder.js +139 -0
  93. package/dist/server/app-page-element-builder.js.map +1 -0
  94. package/dist/server/app-page-execution.d.ts +4 -3
  95. package/dist/server/app-page-execution.js +5 -8
  96. package/dist/server/app-page-execution.js.map +1 -1
  97. package/dist/server/app-page-head.d.ts +55 -0
  98. package/dist/server/app-page-head.js +196 -0
  99. package/dist/server/app-page-head.js.map +1 -0
  100. package/dist/server/app-page-method.d.ts +16 -0
  101. package/dist/server/app-page-method.js +30 -0
  102. package/dist/server/app-page-method.js.map +1 -0
  103. package/dist/server/app-page-params.d.ts +8 -0
  104. package/dist/server/app-page-params.js +28 -0
  105. package/dist/server/app-page-params.js.map +1 -0
  106. package/dist/server/app-page-render.d.ts +7 -2
  107. package/dist/server/app-page-render.js +131 -32
  108. package/dist/server/app-page-render.js.map +1 -1
  109. package/dist/server/app-page-request.d.ts +23 -8
  110. package/dist/server/app-page-request.js +51 -6
  111. package/dist/server/app-page-request.js.map +1 -1
  112. package/dist/server/app-page-response.d.ts +1 -0
  113. package/dist/server/app-page-response.js +3 -7
  114. package/dist/server/app-page-response.js.map +1 -1
  115. package/dist/server/app-page-route-wiring.d.ts +29 -5
  116. package/dist/server/app-page-route-wiring.js +30 -8
  117. package/dist/server/app-page-route-wiring.js.map +1 -1
  118. package/dist/server/app-page-stream.d.ts +10 -0
  119. package/dist/server/app-page-stream.js +5 -1
  120. package/dist/server/app-page-stream.js.map +1 -1
  121. package/dist/server/app-post-middleware-context.d.ts +16 -0
  122. package/dist/server/app-post-middleware-context.js +28 -0
  123. package/dist/server/app-post-middleware-context.js.map +1 -0
  124. package/dist/server/app-prerender-endpoints.d.ts +19 -0
  125. package/dist/server/app-prerender-endpoints.js +96 -0
  126. package/dist/server/app-prerender-endpoints.js.map +1 -0
  127. package/dist/server/app-prerender-static-params.d.ts +16 -0
  128. package/dist/server/app-prerender-static-params.js +14 -0
  129. package/dist/server/app-prerender-static-params.js.map +1 -0
  130. package/dist/server/app-request-context.d.ts +22 -0
  131. package/dist/server/app-request-context.js +30 -0
  132. package/dist/server/app-request-context.js.map +1 -0
  133. package/dist/server/app-route-handler-cache.d.ts +4 -0
  134. package/dist/server/app-route-handler-cache.js +11 -3
  135. package/dist/server/app-route-handler-cache.js.map +1 -1
  136. package/dist/server/app-route-handler-dispatch.d.ts +43 -0
  137. package/dist/server/app-route-handler-dispatch.js +149 -0
  138. package/dist/server/app-route-handler-dispatch.js.map +1 -0
  139. package/dist/server/app-route-handler-execution.d.ts +8 -3
  140. package/dist/server/app-route-handler-execution.js +25 -4
  141. package/dist/server/app-route-handler-execution.js.map +1 -1
  142. package/dist/server/app-route-handler-response.d.ts +6 -3
  143. package/dist/server/app-route-handler-response.js +52 -11
  144. package/dist/server/app-route-handler-response.js.map +1 -1
  145. package/dist/server/app-route-handler-runtime.d.ts +4 -1
  146. package/dist/server/app-route-handler-runtime.js +107 -1
  147. package/dist/server/app-route-handler-runtime.js.map +1 -1
  148. package/dist/server/app-router-entry.js.map +1 -1
  149. package/dist/server/app-rsc-error-handler.d.ts +21 -0
  150. package/dist/server/app-rsc-error-handler.js +30 -0
  151. package/dist/server/app-rsc-error-handler.js.map +1 -0
  152. package/dist/server/app-rsc-errors.d.ts +27 -0
  153. package/dist/server/app-rsc-errors.js +42 -0
  154. package/dist/server/app-rsc-errors.js.map +1 -0
  155. package/dist/server/app-rsc-handler.d.ts +117 -0
  156. package/dist/server/app-rsc-handler.js +260 -0
  157. package/dist/server/app-rsc-handler.js.map +1 -0
  158. package/dist/server/app-rsc-request-normalization.d.ts +40 -0
  159. package/dist/server/app-rsc-request-normalization.js +63 -0
  160. package/dist/server/app-rsc-request-normalization.js.map +1 -0
  161. package/dist/server/app-rsc-response-finalizer.d.ts +30 -0
  162. package/dist/server/app-rsc-response-finalizer.js +38 -0
  163. package/dist/server/app-rsc-response-finalizer.js.map +1 -0
  164. package/dist/server/app-rsc-route-matching.d.ts +40 -0
  165. package/dist/server/app-rsc-route-matching.js +66 -0
  166. package/dist/server/app-rsc-route-matching.js.map +1 -0
  167. package/dist/server/app-segment-config.d.ts +33 -0
  168. package/dist/server/app-segment-config.js +86 -0
  169. package/dist/server/app-segment-config.js.map +1 -0
  170. package/dist/server/app-server-action-execution.d.ts +88 -1
  171. package/dist/server/app-server-action-execution.js +257 -5
  172. package/dist/server/app-server-action-execution.js.map +1 -1
  173. package/dist/server/app-ssr-entry.d.ts +7 -0
  174. package/dist/server/app-ssr-entry.js +30 -9
  175. package/dist/server/app-ssr-entry.js.map +1 -1
  176. package/dist/server/app-ssr-stream.d.ts +4 -2
  177. package/dist/server/app-ssr-stream.js +29 -2
  178. package/dist/server/app-ssr-stream.js.map +1 -1
  179. package/dist/server/app-static-generation.d.ts +15 -0
  180. package/dist/server/app-static-generation.js +20 -0
  181. package/dist/server/app-static-generation.js.map +1 -0
  182. package/dist/server/cache-control.d.ts +24 -0
  183. package/dist/server/cache-control.js +33 -0
  184. package/dist/server/cache-control.js.map +1 -0
  185. package/dist/server/dev-error-overlay-store.d.ts +23 -0
  186. package/dist/server/dev-error-overlay-store.js +67 -0
  187. package/dist/server/dev-error-overlay-store.js.map +1 -0
  188. package/dist/server/dev-error-overlay.d.ts +15 -0
  189. package/dist/server/dev-error-overlay.js +548 -0
  190. package/dist/server/dev-error-overlay.js.map +1 -0
  191. package/dist/server/dev-route-files.d.ts +7 -0
  192. package/dist/server/dev-route-files.js +73 -0
  193. package/dist/server/dev-route-files.js.map +1 -0
  194. package/dist/server/dev-server.js +4 -0
  195. package/dist/server/dev-server.js.map +1 -1
  196. package/dist/server/file-based-metadata.d.ts +17 -0
  197. package/dist/server/file-based-metadata.js +356 -0
  198. package/dist/server/file-based-metadata.js.map +1 -0
  199. package/dist/server/implicit-tags.d.ts +6 -0
  200. package/dist/server/implicit-tags.js +42 -0
  201. package/dist/server/implicit-tags.js.map +1 -0
  202. package/dist/server/instrumentation-runtime.d.ts +44 -0
  203. package/dist/server/instrumentation-runtime.js +29 -0
  204. package/dist/server/instrumentation-runtime.js.map +1 -0
  205. package/dist/server/instrumentation.js.map +1 -1
  206. package/dist/server/isr-cache.d.ts +16 -3
  207. package/dist/server/isr-cache.js +56 -8
  208. package/dist/server/isr-cache.js.map +1 -1
  209. package/dist/server/metadata-route-build-data.d.ts +25 -0
  210. package/dist/server/metadata-route-build-data.js +150 -0
  211. package/dist/server/metadata-route-build-data.js.map +1 -0
  212. package/dist/server/metadata-route-response.d.ts +17 -0
  213. package/dist/server/metadata-route-response.js +187 -0
  214. package/dist/server/metadata-route-response.js.map +1 -0
  215. package/dist/server/metadata-routes.d.ts +42 -4
  216. package/dist/server/metadata-routes.js +127 -11
  217. package/dist/server/metadata-routes.js.map +1 -1
  218. package/dist/server/middleware-matcher.d.ts +15 -0
  219. package/dist/server/middleware-matcher.js +102 -0
  220. package/dist/server/middleware-matcher.js.map +1 -0
  221. package/dist/server/middleware-request-headers.js +2 -1
  222. package/dist/server/middleware-request-headers.js.map +1 -1
  223. package/dist/server/middleware-runtime.d.ts +39 -0
  224. package/dist/server/middleware-runtime.js +159 -0
  225. package/dist/server/middleware-runtime.js.map +1 -0
  226. package/dist/server/middleware.d.ts +4 -36
  227. package/dist/server/middleware.js +18 -228
  228. package/dist/server/middleware.js.map +1 -1
  229. package/dist/server/pages-page-data.d.ts +7 -2
  230. package/dist/server/pages-page-data.js +10 -5
  231. package/dist/server/pages-page-data.js.map +1 -1
  232. package/dist/server/pages-page-response.d.ts +2 -1
  233. package/dist/server/pages-page-response.js +5 -3
  234. package/dist/server/pages-page-response.js.map +1 -1
  235. package/dist/server/prerender-work-unit-setup.d.ts +7 -0
  236. package/dist/server/prerender-work-unit-setup.js +30 -0
  237. package/dist/server/prerender-work-unit-setup.js.map +1 -0
  238. package/dist/server/prod-server.js +10 -14
  239. package/dist/server/prod-server.js.map +1 -1
  240. package/dist/server/request-pipeline.d.ts +46 -5
  241. package/dist/server/request-pipeline.js +84 -5
  242. package/dist/server/request-pipeline.js.map +1 -1
  243. package/dist/server/rsc-stream-hints.d.ts +7 -0
  244. package/dist/server/rsc-stream-hints.js +38 -0
  245. package/dist/server/rsc-stream-hints.js.map +1 -0
  246. package/dist/server/seed-cache.js +19 -8
  247. package/dist/server/seed-cache.js.map +1 -1
  248. package/dist/server/server-action-not-found.d.ts +9 -0
  249. package/dist/server/server-action-not-found.js +40 -0
  250. package/dist/server/server-action-not-found.js.map +1 -0
  251. package/dist/shims/cache-runtime.js +28 -11
  252. package/dist/shims/cache-runtime.js.map +1 -1
  253. package/dist/shims/cache.d.ts +39 -4
  254. package/dist/shims/cache.js +93 -16
  255. package/dist/shims/cache.js.map +1 -1
  256. package/dist/shims/error-boundary.d.ts +66 -5
  257. package/dist/shims/error-boundary.js +106 -4
  258. package/dist/shims/error-boundary.js.map +1 -1
  259. package/dist/shims/fetch-cache.d.ts +4 -1
  260. package/dist/shims/fetch-cache.js +55 -13
  261. package/dist/shims/fetch-cache.js.map +1 -1
  262. package/dist/shims/font-google-base.d.ts +5 -4
  263. package/dist/shims/font-google-base.js +61 -13
  264. package/dist/shims/font-google-base.js.map +1 -1
  265. package/dist/shims/headers.d.ts +14 -2
  266. package/dist/shims/headers.js +127 -17
  267. package/dist/shims/headers.js.map +1 -1
  268. package/dist/shims/image.js +116 -10
  269. package/dist/shims/image.js.map +1 -1
  270. package/dist/shims/internal/make-hanging-promise.d.ts +16 -0
  271. package/dist/shims/internal/make-hanging-promise.js +46 -0
  272. package/dist/shims/internal/make-hanging-promise.js.map +1 -0
  273. package/dist/shims/internal/work-unit-async-storage.d.ts +26 -3
  274. package/dist/shims/internal/work-unit-async-storage.js +6 -3
  275. package/dist/shims/internal/work-unit-async-storage.js.map +1 -1
  276. package/dist/shims/metadata.d.ts +38 -26
  277. package/dist/shims/metadata.js +75 -45
  278. package/dist/shims/metadata.js.map +1 -1
  279. package/dist/shims/navigation.d.ts +10 -1
  280. package/dist/shims/navigation.js +18 -1
  281. package/dist/shims/navigation.js.map +1 -1
  282. package/dist/shims/navigation.react-server.d.ts +2 -2
  283. package/dist/shims/navigation.react-server.js +2 -2
  284. package/dist/shims/navigation.react-server.js.map +1 -1
  285. package/dist/shims/offline.d.ts +5 -0
  286. package/dist/shims/offline.js +17 -0
  287. package/dist/shims/offline.js.map +1 -0
  288. package/dist/shims/request-state-types.d.ts +3 -2
  289. package/dist/shims/root-params.d.ts +11 -0
  290. package/dist/shims/root-params.js +24 -0
  291. package/dist/shims/root-params.js.map +1 -0
  292. package/dist/shims/router.js +1 -1
  293. package/dist/shims/server.d.ts +3 -1
  294. package/dist/shims/server.js +83 -5
  295. package/dist/shims/server.js.map +1 -1
  296. package/dist/shims/thenable-params.d.ts +5 -0
  297. package/dist/shims/thenable-params.js +37 -0
  298. package/dist/shims/thenable-params.js.map +1 -0
  299. package/dist/shims/unified-request-context.d.ts +3 -2
  300. package/dist/shims/unified-request-context.js +3 -0
  301. package/dist/shims/unified-request-context.js.map +1 -1
  302. package/dist/shims/use-merged-ref.d.ts +7 -0
  303. package/dist/shims/use-merged-ref.js +40 -0
  304. package/dist/shims/use-merged-ref.js.map +1 -0
  305. package/dist/utils/cache-control-metadata.d.ts +6 -0
  306. package/dist/utils/cache-control-metadata.js +16 -0
  307. package/dist/utils/cache-control-metadata.js.map +1 -0
  308. package/package.json +6 -1
  309. package/dist/server/middleware-codegen.d.ts +0 -54
  310. package/dist/server/middleware-codegen.js +0 -414
  311. package/dist/server/middleware-codegen.js.map +0 -1
@@ -0,0 +1,12 @@
1
+ import { AsyncLocalStorage } from "node:async_hooks";
2
+ //#region src/server/app-hook-warning-suppression.ts
3
+ const suppressHookWarningAls = new AsyncLocalStorage();
4
+ const _origConsoleError = console.error;
5
+ console.error = (...args) => {
6
+ if (suppressHookWarningAls.getStore() === true && typeof args[0] === "string" && args[0].includes("Invalid hook call")) return;
7
+ _origConsoleError.apply(console, args);
8
+ };
9
+ //#endregion
10
+ export { suppressHookWarningAls };
11
+
12
+ //# sourceMappingURL=app-hook-warning-suppression.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"app-hook-warning-suppression.js","names":[],"sources":["../../src/server/app-hook-warning-suppression.ts"],"sourcesContent":["import { AsyncLocalStorage } from \"node:async_hooks\";\n\nexport const suppressHookWarningAls = new AsyncLocalStorage<boolean>();\n\nconst _origConsoleError = console.error;\nconsole.error = (...args: unknown[]) => {\n if (\n suppressHookWarningAls.getStore() === true &&\n typeof args[0] === \"string\" &&\n args[0].includes(\"Invalid hook call\")\n )\n return;\n _origConsoleError.apply(console, args);\n};\n"],"mappings":";;AAEA,MAAa,yBAAyB,IAAI,mBAA4B;AAEtE,MAAM,oBAAoB,QAAQ;AAClC,QAAQ,SAAS,GAAG,SAAoB;AACtC,KACE,uBAAuB,UAAU,KAAK,QACtC,OAAO,KAAK,OAAO,YACnB,KAAK,GAAG,SAAS,oBAAoB,CAErC;AACF,mBAAkB,MAAM,SAAS,KAAK"}
@@ -0,0 +1,32 @@
1
+ import { NextI18nConfig } from "../config/next-config.js";
2
+ import { MiddlewareModule } from "./middleware-runtime.js";
3
+
4
+ //#region src/server/app-middleware.d.ts
5
+ type AppMiddlewareContext = {
6
+ headers: Headers | null;
7
+ requestHeaders: Headers | null;
8
+ status: number | null;
9
+ };
10
+ type ApplyAppMiddlewareOptions = {
11
+ basePath?: string;
12
+ cleanPathname: string;
13
+ context: AppMiddlewareContext;
14
+ i18nConfig?: NextI18nConfig | null;
15
+ isProxy: boolean;
16
+ module: MiddlewareModule;
17
+ request: Request;
18
+ };
19
+ type ApplyAppMiddlewareResult = {
20
+ kind: "continue";
21
+ cleanPathname: string;
22
+ search: string | null;
23
+ } | {
24
+ kind: "response";
25
+ response: Response;
26
+ };
27
+ declare function isExternalMiddlewareRewrite(rewriteUrl: string, request: Request): boolean;
28
+ declare function proxyExternalMiddlewareRewrite(request: Request, rewriteUrl: string, context: AppMiddlewareContext): Promise<Response>;
29
+ declare function applyAppMiddleware(options: ApplyAppMiddlewareOptions): Promise<ApplyAppMiddlewareResult>;
30
+ //#endregion
31
+ export { AppMiddlewareContext, ApplyAppMiddlewareOptions, ApplyAppMiddlewareResult, applyAppMiddleware, isExternalMiddlewareRewrite, proxyExternalMiddlewareRewrite };
32
+ //# sourceMappingURL=app-middleware.d.ts.map
@@ -0,0 +1,147 @@
1
+ import { buildRequestHeadersFromMiddlewareResponse } from "./middleware-request-headers.js";
2
+ import { isExternalUrl, proxyExternalRequest } from "../config/config-matchers.js";
3
+ import { processMiddlewareHeaders } from "./request-pipeline.js";
4
+ import { executeMiddleware } from "./middleware-runtime.js";
5
+ import { applyMiddlewareRequestHeaders, setHeadersContext } from "../shims/headers.js";
6
+ import { setNavigationContext } from "../shims/navigation.js";
7
+ import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
8
+ //#region src/server/app-middleware.ts
9
+ function isForwardedMiddlewareContext(value) {
10
+ return !!value && typeof value === "object";
11
+ }
12
+ function appendForwardedHeader(headers, value) {
13
+ if (!Array.isArray(value) || value.length < 2) return;
14
+ const key = value[0];
15
+ const headerValue = value[1];
16
+ if (typeof key === "string" && typeof headerValue === "string") headers.append(key, headerValue);
17
+ }
18
+ function responseFromMiddlewareRedirect(result) {
19
+ if (result.response) return result.response;
20
+ const headers = new Headers(result.responseHeaders);
21
+ if (result.redirectUrl) headers.set("Location", result.redirectUrl);
22
+ return new Response(null, {
23
+ status: result.redirectStatus ?? 307,
24
+ headers
25
+ });
26
+ }
27
+ function isExternalMiddlewareRewrite(rewriteUrl, request) {
28
+ return new URL(rewriteUrl, request.url).origin !== new URL(request.url).origin;
29
+ }
30
+ function requestWithMiddlewareRequestHeaders(request, middlewareHeaders) {
31
+ const nextHeaders = middlewareHeaders ? buildRequestHeadersFromMiddlewareResponse(request.headers, middlewareHeaders) : null;
32
+ if (!nextHeaders) return request;
33
+ const init = {
34
+ method: request.method,
35
+ headers: nextHeaders,
36
+ body: request.body
37
+ };
38
+ if (request.body) Object.defineProperty(init, "duplex", {
39
+ value: "half",
40
+ enumerable: true
41
+ });
42
+ return new Request(request.url, init);
43
+ }
44
+ async function proxyExternalMiddlewareRewrite(request, rewriteUrl, context) {
45
+ const proxyRequest = requestWithMiddlewareRequestHeaders(request, context.requestHeaders ?? context.headers);
46
+ setHeadersContext(null);
47
+ setNavigationContext(null);
48
+ const proxyResponse = await proxyExternalRequest(proxyRequest, rewriteUrl);
49
+ if (!context.headers) return proxyResponse;
50
+ const middlewareHeaders = new Headers(context.headers);
51
+ processMiddlewareHeaders(middlewareHeaders);
52
+ const headers = new Headers(proxyResponse.headers);
53
+ mergeMiddlewareResponseHeaders(headers, middlewareHeaders);
54
+ return new Response(proxyResponse.body, {
55
+ status: proxyResponse.status,
56
+ statusText: proxyResponse.statusText,
57
+ headers
58
+ });
59
+ }
60
+ function applyForwardedMiddlewareContext(request, context) {
61
+ if (process.env.NODE_ENV === "production") return { applied: false };
62
+ const header = request.headers.get("x-vinext-mw-ctx");
63
+ if (!header) return { applied: false };
64
+ try {
65
+ const data = JSON.parse(header);
66
+ if (!isForwardedMiddlewareContext(data)) return { applied: false };
67
+ if (Array.isArray(data.h) && data.h.length > 0) {
68
+ context.headers = new Headers();
69
+ for (const entry of data.h) appendForwardedHeader(context.headers, entry);
70
+ }
71
+ if (typeof data.s === "number") context.status = data.s;
72
+ if (typeof data.r === "string" && data.r.length > 0) return {
73
+ applied: true,
74
+ rewriteUrl: data.r
75
+ };
76
+ return { applied: true };
77
+ } catch (e) {
78
+ console.error("[vinext] Failed to parse forwarded middleware context:", e);
79
+ return { applied: false };
80
+ }
81
+ }
82
+ async function applyAppMiddleware(options) {
83
+ const forwarded = applyForwardedMiddlewareContext(options.request, options.context);
84
+ let cleanPathname = options.cleanPathname;
85
+ let search = null;
86
+ if (forwarded.rewriteUrl) try {
87
+ if (isExternalMiddlewareRewrite(forwarded.rewriteUrl, options.request)) return {
88
+ kind: "response",
89
+ response: await proxyExternalMiddlewareRewrite(options.request, forwarded.rewriteUrl, options.context)
90
+ };
91
+ const rewriteParsed = new URL(forwarded.rewriteUrl, options.request.url);
92
+ cleanPathname = rewriteParsed.pathname;
93
+ search = rewriteParsed.search;
94
+ } catch (e) {
95
+ console.error("[vinext] Failed to apply forwarded middleware rewrite:", e);
96
+ forwarded.applied = false;
97
+ }
98
+ if (!forwarded.applied) {
99
+ const result = await executeMiddleware({
100
+ basePath: options.basePath,
101
+ i18nConfig: options.i18nConfig,
102
+ isProxy: options.isProxy,
103
+ module: options.module,
104
+ normalizedPathname: cleanPathname,
105
+ request: options.request
106
+ });
107
+ if (!result.continue) {
108
+ if (result.redirectUrl) return {
109
+ kind: "response",
110
+ response: responseFromMiddlewareRedirect(result)
111
+ };
112
+ if (result.response) return {
113
+ kind: "response",
114
+ response: result.response
115
+ };
116
+ return {
117
+ kind: "response",
118
+ response: new Response("Internal Server Error", { status: 500 })
119
+ };
120
+ }
121
+ if (result.responseHeaders) options.context.headers = new Headers(result.responseHeaders);
122
+ if (result.rewriteUrl) {
123
+ if (result.rewriteStatus !== void 0) options.context.status = result.rewriteStatus;
124
+ if (isExternalUrl(result.rewriteUrl)) return {
125
+ kind: "response",
126
+ response: await proxyExternalMiddlewareRewrite(options.request, result.rewriteUrl, options.context)
127
+ };
128
+ const rewriteParsed = new URL(result.rewriteUrl, options.request.url);
129
+ cleanPathname = rewriteParsed.pathname;
130
+ search = rewriteParsed.search;
131
+ }
132
+ }
133
+ if (options.context.headers) {
134
+ options.context.requestHeaders = new Headers(options.context.headers);
135
+ applyMiddlewareRequestHeaders(options.context.headers);
136
+ processMiddlewareHeaders(options.context.headers);
137
+ }
138
+ return {
139
+ kind: "continue",
140
+ cleanPathname,
141
+ search
142
+ };
143
+ }
144
+ //#endregion
145
+ export { applyAppMiddleware, isExternalMiddlewareRewrite, proxyExternalMiddlewareRewrite };
146
+
147
+ //# sourceMappingURL=app-middleware.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"app-middleware.js","names":[],"sources":["../../src/server/app-middleware.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport { isExternalUrl, proxyExternalRequest } from \"../config/config-matchers.js\";\nimport { applyMiddlewareRequestHeaders, setHeadersContext } from \"vinext/shims/headers\";\nimport { setNavigationContext } from \"vinext/shims/navigation\";\nimport { buildRequestHeadersFromMiddlewareResponse } from \"./middleware-request-headers.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { executeMiddleware, type MiddlewareModule } from \"./middleware-runtime.js\";\nimport { processMiddlewareHeaders } from \"./request-pipeline.js\";\n\nexport type AppMiddlewareContext = {\n headers: Headers | null;\n requestHeaders: Headers | null;\n status: number | null;\n};\n\nexport type ApplyAppMiddlewareOptions = {\n basePath?: string;\n cleanPathname: string;\n context: AppMiddlewareContext;\n i18nConfig?: NextI18nConfig | null;\n isProxy: boolean;\n module: MiddlewareModule;\n request: Request;\n};\n\nexport type ApplyAppMiddlewareResult =\n | {\n kind: \"continue\";\n cleanPathname: string;\n search: string | null;\n }\n | {\n kind: \"response\";\n response: Response;\n };\n\ntype ForwardedMiddlewareContext = {\n h?: unknown;\n r?: unknown;\n s?: unknown;\n};\n\nfunction isForwardedMiddlewareContext(value: unknown): value is ForwardedMiddlewareContext {\n return !!value && typeof value === \"object\";\n}\n\nfunction appendForwardedHeader(headers: Headers, value: unknown): void {\n if (!Array.isArray(value) || value.length < 2) return;\n const key = value[0];\n const headerValue = value[1];\n if (typeof key === \"string\" && typeof headerValue === \"string\") {\n headers.append(key, headerValue);\n }\n}\n\nfunction responseFromMiddlewareRedirect(result: {\n redirectStatus?: number;\n redirectUrl?: string;\n response?: Response;\n responseHeaders?: Headers;\n}): Response {\n if (result.response) return result.response;\n\n const headers = new Headers(result.responseHeaders);\n if (result.redirectUrl) {\n headers.set(\"Location\", result.redirectUrl);\n }\n return new Response(null, {\n status: result.redirectStatus ?? 307,\n headers,\n });\n}\n\nexport function isExternalMiddlewareRewrite(rewriteUrl: string, request: Request): boolean {\n const rewriteParsed = new URL(rewriteUrl, request.url);\n return rewriteParsed.origin !== new URL(request.url).origin;\n}\n\nfunction requestWithMiddlewareRequestHeaders(\n request: Request,\n middlewareHeaders: Headers | null,\n): Request {\n const nextHeaders = middlewareHeaders\n ? buildRequestHeadersFromMiddlewareResponse(request.headers, middlewareHeaders)\n : null;\n if (!nextHeaders) return request;\n\n const init: RequestInit = {\n method: request.method,\n headers: nextHeaders,\n body: request.body,\n };\n if (request.body) {\n Object.defineProperty(init, \"duplex\", { value: \"half\", enumerable: true });\n }\n\n return new Request(request.url, init);\n}\n\nexport async function proxyExternalMiddlewareRewrite(\n request: Request,\n rewriteUrl: string,\n context: AppMiddlewareContext,\n): Promise<Response> {\n const proxyRequest = requestWithMiddlewareRequestHeaders(\n request,\n context.requestHeaders ?? context.headers,\n );\n setHeadersContext(null);\n setNavigationContext(null);\n\n const proxyResponse = await proxyExternalRequest(proxyRequest, rewriteUrl);\n if (!context.headers) return proxyResponse;\n\n const middlewareHeaders = new Headers(context.headers);\n processMiddlewareHeaders(middlewareHeaders);\n const headers = new Headers(proxyResponse.headers);\n mergeMiddlewareResponseHeaders(headers, middlewareHeaders);\n return new Response(proxyResponse.body, {\n status: proxyResponse.status,\n statusText: proxyResponse.statusText,\n headers,\n });\n}\n\nfunction applyForwardedMiddlewareContext(\n request: Request,\n context: AppMiddlewareContext,\n): { applied: boolean; rewriteUrl?: string } {\n if (process.env.NODE_ENV === \"production\") {\n return { applied: false };\n }\n\n const header = request.headers.get(\"x-vinext-mw-ctx\");\n if (!header) return { applied: false };\n\n try {\n const data = JSON.parse(header);\n if (!isForwardedMiddlewareContext(data)) return { applied: false };\n\n if (Array.isArray(data.h) && data.h.length > 0) {\n context.headers = new Headers();\n for (const entry of data.h) {\n appendForwardedHeader(context.headers, entry);\n }\n }\n if (typeof data.s === \"number\") {\n context.status = data.s;\n }\n if (typeof data.r === \"string\" && data.r.length > 0) {\n return { applied: true, rewriteUrl: data.r };\n }\n return { applied: true };\n } catch (e) {\n console.error(\"[vinext] Failed to parse forwarded middleware context:\", e);\n return { applied: false };\n }\n}\n\nexport async function applyAppMiddleware(\n options: ApplyAppMiddlewareOptions,\n): Promise<ApplyAppMiddlewareResult> {\n const forwarded = applyForwardedMiddlewareContext(options.request, options.context);\n let cleanPathname = options.cleanPathname;\n let search: string | null = null;\n\n if (forwarded.rewriteUrl) {\n try {\n if (isExternalMiddlewareRewrite(forwarded.rewriteUrl, options.request)) {\n return {\n kind: \"response\",\n response: await proxyExternalMiddlewareRewrite(\n options.request,\n forwarded.rewriteUrl,\n options.context,\n ),\n };\n }\n const rewriteParsed = new URL(forwarded.rewriteUrl, options.request.url);\n cleanPathname = rewriteParsed.pathname;\n search = rewriteParsed.search;\n } catch (e) {\n console.error(\"[vinext] Failed to apply forwarded middleware rewrite:\", e);\n forwarded.applied = false;\n }\n }\n\n if (!forwarded.applied) {\n const result = await executeMiddleware({\n basePath: options.basePath,\n i18nConfig: options.i18nConfig,\n isProxy: options.isProxy,\n module: options.module,\n normalizedPathname: cleanPathname,\n request: options.request,\n });\n\n if (!result.continue) {\n if (result.redirectUrl) {\n return { kind: \"response\", response: responseFromMiddlewareRedirect(result) };\n }\n if (result.response) {\n return { kind: \"response\", response: result.response };\n }\n return { kind: \"response\", response: new Response(\"Internal Server Error\", { status: 500 }) };\n }\n\n if (result.responseHeaders) {\n options.context.headers = new Headers(result.responseHeaders);\n }\n\n if (result.rewriteUrl) {\n if (result.rewriteStatus !== undefined) {\n options.context.status = result.rewriteStatus;\n }\n if (isExternalUrl(result.rewriteUrl)) {\n return {\n kind: \"response\",\n response: await proxyExternalMiddlewareRewrite(\n options.request,\n result.rewriteUrl,\n options.context,\n ),\n };\n }\n const rewriteParsed = new URL(result.rewriteUrl, options.request.url);\n cleanPathname = rewriteParsed.pathname;\n search = rewriteParsed.search;\n }\n }\n\n if (options.context.headers) {\n options.context.requestHeaders = new Headers(options.context.headers);\n applyMiddlewareRequestHeaders(options.context.headers);\n processMiddlewareHeaders(options.context.headers);\n }\n\n return { kind: \"continue\", cleanPathname, search };\n}\n"],"mappings":";;;;;;;;AA0CA,SAAS,6BAA6B,OAAqD;AACzF,QAAO,CAAC,CAAC,SAAS,OAAO,UAAU;;AAGrC,SAAS,sBAAsB,SAAkB,OAAsB;AACrE,KAAI,CAAC,MAAM,QAAQ,MAAM,IAAI,MAAM,SAAS,EAAG;CAC/C,MAAM,MAAM,MAAM;CAClB,MAAM,cAAc,MAAM;AAC1B,KAAI,OAAO,QAAQ,YAAY,OAAO,gBAAgB,SACpD,SAAQ,OAAO,KAAK,YAAY;;AAIpC,SAAS,+BAA+B,QAK3B;AACX,KAAI,OAAO,SAAU,QAAO,OAAO;CAEnC,MAAM,UAAU,IAAI,QAAQ,OAAO,gBAAgB;AACnD,KAAI,OAAO,YACT,SAAQ,IAAI,YAAY,OAAO,YAAY;AAE7C,QAAO,IAAI,SAAS,MAAM;EACxB,QAAQ,OAAO,kBAAkB;EACjC;EACD,CAAC;;AAGJ,SAAgB,4BAA4B,YAAoB,SAA2B;AAEzF,QADsB,IAAI,IAAI,YAAY,QAAQ,IAAI,CACjC,WAAW,IAAI,IAAI,QAAQ,IAAI,CAAC;;AAGvD,SAAS,oCACP,SACA,mBACS;CACT,MAAM,cAAc,oBAChB,0CAA0C,QAAQ,SAAS,kBAAkB,GAC7E;AACJ,KAAI,CAAC,YAAa,QAAO;CAEzB,MAAM,OAAoB;EACxB,QAAQ,QAAQ;EAChB,SAAS;EACT,MAAM,QAAQ;EACf;AACD,KAAI,QAAQ,KACV,QAAO,eAAe,MAAM,UAAU;EAAE,OAAO;EAAQ,YAAY;EAAM,CAAC;AAG5E,QAAO,IAAI,QAAQ,QAAQ,KAAK,KAAK;;AAGvC,eAAsB,+BACpB,SACA,YACA,SACmB;CACnB,MAAM,eAAe,oCACnB,SACA,QAAQ,kBAAkB,QAAQ,QACnC;AACD,mBAAkB,KAAK;AACvB,sBAAqB,KAAK;CAE1B,MAAM,gBAAgB,MAAM,qBAAqB,cAAc,WAAW;AAC1E,KAAI,CAAC,QAAQ,QAAS,QAAO;CAE7B,MAAM,oBAAoB,IAAI,QAAQ,QAAQ,QAAQ;AACtD,0BAAyB,kBAAkB;CAC3C,MAAM,UAAU,IAAI,QAAQ,cAAc,QAAQ;AAClD,gCAA+B,SAAS,kBAAkB;AAC1D,QAAO,IAAI,SAAS,cAAc,MAAM;EACtC,QAAQ,cAAc;EACtB,YAAY,cAAc;EAC1B;EACD,CAAC;;AAGJ,SAAS,gCACP,SACA,SAC2C;AAC3C,KAAI,QAAQ,IAAI,aAAa,aAC3B,QAAO,EAAE,SAAS,OAAO;CAG3B,MAAM,SAAS,QAAQ,QAAQ,IAAI,kBAAkB;AACrD,KAAI,CAAC,OAAQ,QAAO,EAAE,SAAS,OAAO;AAEtC,KAAI;EACF,MAAM,OAAO,KAAK,MAAM,OAAO;AAC/B,MAAI,CAAC,6BAA6B,KAAK,CAAE,QAAO,EAAE,SAAS,OAAO;AAElE,MAAI,MAAM,QAAQ,KAAK,EAAE,IAAI,KAAK,EAAE,SAAS,GAAG;AAC9C,WAAQ,UAAU,IAAI,SAAS;AAC/B,QAAK,MAAM,SAAS,KAAK,EACvB,uBAAsB,QAAQ,SAAS,MAAM;;AAGjD,MAAI,OAAO,KAAK,MAAM,SACpB,SAAQ,SAAS,KAAK;AAExB,MAAI,OAAO,KAAK,MAAM,YAAY,KAAK,EAAE,SAAS,EAChD,QAAO;GAAE,SAAS;GAAM,YAAY,KAAK;GAAG;AAE9C,SAAO,EAAE,SAAS,MAAM;UACjB,GAAG;AACV,UAAQ,MAAM,0DAA0D,EAAE;AAC1E,SAAO,EAAE,SAAS,OAAO;;;AAI7B,eAAsB,mBACpB,SACmC;CACnC,MAAM,YAAY,gCAAgC,QAAQ,SAAS,QAAQ,QAAQ;CACnF,IAAI,gBAAgB,QAAQ;CAC5B,IAAI,SAAwB;AAE5B,KAAI,UAAU,WACZ,KAAI;AACF,MAAI,4BAA4B,UAAU,YAAY,QAAQ,QAAQ,CACpE,QAAO;GACL,MAAM;GACN,UAAU,MAAM,+BACd,QAAQ,SACR,UAAU,YACV,QAAQ,QACT;GACF;EAEH,MAAM,gBAAgB,IAAI,IAAI,UAAU,YAAY,QAAQ,QAAQ,IAAI;AACxE,kBAAgB,cAAc;AAC9B,WAAS,cAAc;UAChB,GAAG;AACV,UAAQ,MAAM,0DAA0D,EAAE;AAC1E,YAAU,UAAU;;AAIxB,KAAI,CAAC,UAAU,SAAS;EACtB,MAAM,SAAS,MAAM,kBAAkB;GACrC,UAAU,QAAQ;GAClB,YAAY,QAAQ;GACpB,SAAS,QAAQ;GACjB,QAAQ,QAAQ;GAChB,oBAAoB;GACpB,SAAS,QAAQ;GAClB,CAAC;AAEF,MAAI,CAAC,OAAO,UAAU;AACpB,OAAI,OAAO,YACT,QAAO;IAAE,MAAM;IAAY,UAAU,+BAA+B,OAAO;IAAE;AAE/E,OAAI,OAAO,SACT,QAAO;IAAE,MAAM;IAAY,UAAU,OAAO;IAAU;AAExD,UAAO;IAAE,MAAM;IAAY,UAAU,IAAI,SAAS,yBAAyB,EAAE,QAAQ,KAAK,CAAC;IAAE;;AAG/F,MAAI,OAAO,gBACT,SAAQ,QAAQ,UAAU,IAAI,QAAQ,OAAO,gBAAgB;AAG/D,MAAI,OAAO,YAAY;AACrB,OAAI,OAAO,kBAAkB,KAAA,EAC3B,SAAQ,QAAQ,SAAS,OAAO;AAElC,OAAI,cAAc,OAAO,WAAW,CAClC,QAAO;IACL,MAAM;IACN,UAAU,MAAM,+BACd,QAAQ,SACR,OAAO,YACP,QAAQ,QACT;IACF;GAEH,MAAM,gBAAgB,IAAI,IAAI,OAAO,YAAY,QAAQ,QAAQ,IAAI;AACrE,mBAAgB,cAAc;AAC9B,YAAS,cAAc;;;AAI3B,KAAI,QAAQ,QAAQ,SAAS;AAC3B,UAAQ,QAAQ,iBAAiB,IAAI,QAAQ,QAAQ,QAAQ,QAAQ;AACrE,gCAA8B,QAAQ,QAAQ,QAAQ;AACtD,2BAAyB,QAAQ,QAAQ,QAAQ;;AAGnD,QAAO;EAAE,MAAM;EAAY;EAAe;EAAQ"}
@@ -0,0 +1,17 @@
1
+ //#region src/server/app-mounted-slots-header.d.ts
2
+ /**
3
+ * Normalize the `x-vinext-mounted-slots` header for request handling and cache keying.
4
+ *
5
+ * The browser sends mounted slot ids as a space-separated list in the order slots were
6
+ * rendered, which changes across navigations. This normalizes to a canonical form
7
+ * (sorted, deduplicated) so equivalent slot sets map to the same RSC cache entry.
8
+ *
9
+ * Consumed by:
10
+ * - app-rsc-request-normalization (request lifecycle, reads incoming header)
11
+ * - app-elements (outgoing x-vinext-mounted-slots construction)
12
+ * - isr-cache (RSC cache key generation)
13
+ */
14
+ declare function normalizeMountedSlotsHeader(raw: string | null | undefined): string | null;
15
+ //#endregion
16
+ export { normalizeMountedSlotsHeader };
17
+ //# sourceMappingURL=app-mounted-slots-header.d.ts.map
@@ -0,0 +1,21 @@
1
+ //#region src/server/app-mounted-slots-header.ts
2
+ /**
3
+ * Normalize the `x-vinext-mounted-slots` header for request handling and cache keying.
4
+ *
5
+ * The browser sends mounted slot ids as a space-separated list in the order slots were
6
+ * rendered, which changes across navigations. This normalizes to a canonical form
7
+ * (sorted, deduplicated) so equivalent slot sets map to the same RSC cache entry.
8
+ *
9
+ * Consumed by:
10
+ * - app-rsc-request-normalization (request lifecycle, reads incoming header)
11
+ * - app-elements (outgoing x-vinext-mounted-slots construction)
12
+ * - isr-cache (RSC cache key generation)
13
+ */
14
+ function normalizeMountedSlotsHeader(raw) {
15
+ if (!raw) return null;
16
+ return Array.from(new Set(raw.split(/\s+/).filter(Boolean))).sort().join(" ") || null;
17
+ }
18
+ //#endregion
19
+ export { normalizeMountedSlotsHeader };
20
+
21
+ //# sourceMappingURL=app-mounted-slots-header.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"app-mounted-slots-header.js","names":[],"sources":["../../src/server/app-mounted-slots-header.ts"],"sourcesContent":["/**\n * Normalize the `x-vinext-mounted-slots` header for request handling and cache keying.\n *\n * The browser sends mounted slot ids as a space-separated list in the order slots were\n * rendered, which changes across navigations. This normalizes to a canonical form\n * (sorted, deduplicated) so equivalent slot sets map to the same RSC cache entry.\n *\n * Consumed by:\n * - app-rsc-request-normalization (request lifecycle, reads incoming header)\n * - app-elements (outgoing x-vinext-mounted-slots construction)\n * - isr-cache (RSC cache key generation)\n */\nexport function normalizeMountedSlotsHeader(raw: string | null | undefined): string | null {\n if (!raw) return null;\n const normalized = Array.from(new Set(raw.split(/\\s+/).filter(Boolean)))\n .sort()\n .join(\" \");\n return normalized || null;\n}\n"],"mappings":";;;;;;;;;;;;;AAYA,SAAgB,4BAA4B,KAA+C;AACzF,KAAI,CAAC,IAAK,QAAO;AAIjB,QAHmB,MAAM,KAAK,IAAI,IAAI,IAAI,MAAM,MAAM,CAAC,OAAO,QAAQ,CAAC,CAAC,CACrE,MAAM,CACN,KAAK,IAAI,IACS"}
@@ -1,7 +1,8 @@
1
+ import { MetadataFileRoute } from "./metadata-routes.js";
1
2
  import { AppElements } from "./app-elements.js";
3
+ import { AppPageParams } from "./app-page-boundary.js";
2
4
  import { AppPageFontPreload } from "./app-page-execution.js";
3
5
  import { AppPageMiddlewareContext } from "./app-page-response.js";
4
- import { AppPageParams } from "./app-page-boundary.js";
5
6
  import { AppPageSsrHandler } from "./app-page-stream.js";
6
7
  import { ComponentType, ReactNode } from "react";
7
8
 
@@ -36,6 +37,7 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
36
37
  loadSsrHandler: () => Promise<AppPageSsrHandler>;
37
38
  makeThenableParams: (params: AppPageParams) => unknown;
38
39
  middlewareContext: AppPageMiddlewareContext;
40
+ metadataRoutes: MetadataFileRoute[];
39
41
  renderToReadableStream: (element: ReactNode | AppElements, options: {
40
42
  onError: AppPageBoundaryOnError;
41
43
  }) => ReadableStream<Uint8Array>;
@@ -63,5 +65,5 @@ type RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageMo
63
65
  declare function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(options: RenderAppPageHttpAccessFallbackOptions<TModule>): Promise<Response | null>;
64
66
  declare function renderAppPageErrorBoundary<TModule extends AppPageModule>(options: RenderAppPageErrorBoundaryOptions<TModule>): Promise<Response | null>;
65
67
  //#endregion
66
- export { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback };
68
+ export { AppPageBoundaryRoute, renderAppPageErrorBoundary, renderAppPageHttpAccessFallback };
67
69
  //# sourceMappingURL=app-page-boundary-render.d.ts.map
@@ -1,9 +1,10 @@
1
1
  import { APP_INTERCEPTION_CONTEXT_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, createAppPayloadRouteId } from "./app-elements.js";
2
2
  import { ErrorBoundary } from "../shims/error-boundary.js";
3
3
  import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
4
- import { MetadataHead, ViewportHead, mergeMetadata, mergeViewport, resolveModuleMetadata, resolveModuleViewport } from "../shims/metadata.js";
4
+ import { MetadataHead, ViewportHead } from "../shims/metadata.js";
5
5
  import { createAppPageLayoutEntries } from "./app-page-route-wiring.js";
6
6
  import { buildClientHookErrorMessage } from "../shims/client-hook-error.js";
7
+ import { resolveAppPageHead } from "./app-page-head.js";
7
8
  import { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, wrapAppPageBoundaryElement } from "./app-page-boundary.js";
8
9
  import { createAppPageFontData, renderAppPageHtmlResponse } from "./app-page-stream.js";
9
10
  import { Fragment, createElement } from "react";
@@ -11,33 +12,6 @@ import { Fragment, createElement } from "react";
11
12
  function getDefaultExport(module) {
12
13
  return module?.default ?? null;
13
14
  }
14
- async function resolveAppPageLayoutHead(layoutModules, params) {
15
- const filteredLayouts = layoutModules.filter(Boolean);
16
- const layoutMetadataPromises = [];
17
- let accumulatedMetadata = Promise.resolve({});
18
- for (let index = 0; index < filteredLayouts.length; index++) {
19
- const parentForLayout = accumulatedMetadata;
20
- const metadataPromise = resolveModuleMetadata(filteredLayouts[index], params, void 0, parentForLayout).catch((error) => {
21
- console.error("[vinext] Layout generateMetadata() failed:", error);
22
- return null;
23
- });
24
- layoutMetadataPromises.push(metadataPromise);
25
- accumulatedMetadata = metadataPromise.then(async (metadataResult) => {
26
- if (metadataResult) return mergeMetadata([await parentForLayout, metadataResult]);
27
- return parentForLayout;
28
- });
29
- }
30
- const [metadataResults, viewportResults] = await Promise.all([Promise.all(layoutMetadataPromises), Promise.all(filteredLayouts.map((layoutModule) => resolveModuleViewport(layoutModule, params).catch((error) => {
31
- console.error("[vinext] Layout generateViewport() failed:", error);
32
- return null;
33
- })))]);
34
- const metadataList = metadataResults.filter(Boolean);
35
- const viewportList = viewportResults.filter(Boolean);
36
- return {
37
- metadata: metadataList.length > 0 ? mergeMetadata(metadataList) : null,
38
- viewport: mergeViewport(viewportList)
39
- };
40
- }
41
15
  function wrapRenderedBoundaryElement(options) {
42
16
  return wrapAppPageBoundaryElement({
43
17
  element: options.element,
@@ -82,6 +56,18 @@ function resolveAppPageBoundaryRootLayoutTreePath(route) {
82
56
  }
83
57
  return null;
84
58
  }
59
+ function resolveHttpAccessFallbackHeadRouteSegments(route, layoutModules) {
60
+ if (!route?.routeSegments) return;
61
+ if (!route.layouts || layoutModules.length >= route.layouts.length) return route.routeSegments;
62
+ const lastIncludedLayoutIndex = layoutModules.length - 1;
63
+ if (lastIncludedLayoutIndex < 0) return [];
64
+ const segmentCount = route.layoutTreePositions?.[lastIncludedLayoutIndex] ?? 0;
65
+ return route.routeSegments.slice(0, segmentCount);
66
+ }
67
+ function resolveHttpAccessFallbackHeadLayoutTreePositions(route, layoutModules) {
68
+ if (!route?.layouts || layoutModules.length >= route.layouts.length) return route?.layoutTreePositions;
69
+ return route.layoutTreePositions?.slice(0, layoutModules.length);
70
+ }
85
71
  function createAppPageBoundaryRscPayload(options) {
86
72
  const routeId = createAppPayloadRouteId(options.pathname, null);
87
73
  return {
@@ -140,7 +126,15 @@ async function renderAppPageHttpAccessFallback(options) {
140
126
  });
141
127
  if (!boundaryComponent) return null;
142
128
  const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;
143
- const { metadata, viewport } = await resolveAppPageLayoutHead(layoutModules, options.matchedParams);
129
+ const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, layoutModules);
130
+ const { metadata, viewport } = await resolveAppPageHead({
131
+ layoutModules,
132
+ layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(options.route, layoutModules),
133
+ metadataRoutes: options.metadataRoutes,
134
+ params: options.matchedParams,
135
+ routePath: options.route?.pattern ?? new URL(options.requestUrl).pathname,
136
+ routeSegments
137
+ });
144
138
  const headElements = [createElement("meta", {
145
139
  charSet: "utf-8",
146
140
  key: "charset"
@@ -191,8 +185,34 @@ async function renderAppPageErrorBoundary(options) {
191
185
  const errorObject = options.sanitizeErrorForClient(rawError);
192
186
  const matchedParams = options.matchedParams ?? options.route?.params ?? {};
193
187
  const layoutModules = options.route?.layouts ?? options.rootLayouts;
188
+ const pathname = new URL(options.requestUrl).pathname;
189
+ const headElements = [createElement("meta", {
190
+ charSet: "utf-8",
191
+ key: "charset"
192
+ })];
193
+ if (!errorBoundary.isGlobalError) try {
194
+ const { metadata, viewport } = await resolveAppPageHead({
195
+ fallbackOnFileMetadataError: true,
196
+ layoutModules,
197
+ layoutTreePositions: options.route?.layoutTreePositions,
198
+ metadataRoutes: options.metadataRoutes,
199
+ params: matchedParams,
200
+ routePath: options.route?.pattern ?? pathname,
201
+ routeSegments: options.route?.routeSegments
202
+ });
203
+ if (metadata) headElements.push(createElement(MetadataHead, {
204
+ key: "metadata",
205
+ metadata
206
+ }));
207
+ headElements.push(createElement(ViewportHead, {
208
+ key: "viewport",
209
+ viewport
210
+ }));
211
+ } catch (error) {
212
+ console.error(`[vinext] App page error boundary head resolution failed for ${options.route?.pattern ?? pathname}:`, error);
213
+ }
194
214
  const element = wrapRenderedBoundaryElement({
195
- element: createElement(errorBoundary.component, { error: errorObject }),
215
+ element: createElement(Fragment, null, ...headElements, createElement(errorBoundary.component, { error: errorObject })),
196
216
  globalErrorModule: options.globalErrorModule,
197
217
  includeGlobalErrorBoundary: !errorBoundary.isGlobalError,
198
218
  isRscRequest: options.isRscRequest,
@@ -1 +1 @@
1
- {"version":3,"file":"app-page-boundary-render.js","names":[],"sources":["../../src/server/app-page-boundary-render.ts"],"sourcesContent":["import { Fragment, createElement, type ComponentType, type ReactNode } from \"react\";\nimport { buildClientHookErrorMessage } from \"../shims/client-hook-error.js\";\nimport { ErrorBoundary } from \"../shims/error-boundary.js\";\nimport { LayoutSegmentProvider } from \"../shims/layout-segment-context.js\";\nimport {\n MetadataHead,\n ViewportHead,\n mergeMetadata,\n mergeViewport,\n resolveModuleMetadata,\n resolveModuleViewport,\n type Metadata,\n type Viewport,\n} from \"../shims/metadata.js\";\nimport type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport type { AppPageMiddlewareContext } from \"./app-page-response.js\";\nimport {\n renderAppPageBoundaryResponse,\n resolveAppPageErrorBoundary,\n resolveAppPageHttpAccessBoundaryComponent,\n wrapAppPageBoundaryElement,\n type AppPageParams,\n} from \"./app-page-boundary.js\";\nimport {\n createAppPageFontData,\n renderAppPageHtmlResponse,\n type AppPageSsrHandler,\n} from \"./app-page-stream.js\";\nimport {\n APP_INTERCEPTION_CONTEXT_KEY,\n APP_ROOT_LAYOUT_KEY,\n APP_ROUTE_KEY,\n createAppPayloadRouteId,\n type AppElements,\n} from \"./app-elements.js\";\nimport { createAppPageLayoutEntries } from \"./app-page-route-wiring.js\";\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AppPageComponent = ComponentType<any>;\ntype AppPageModule = Record<string, unknown> & {\n default?: AppPageComponent | null | undefined;\n};\ntype AppPageBoundaryOnError = (\n error: unknown,\n requestInfo: unknown,\n errorContext: unknown,\n) => unknown;\n\ntype AppPageBoundaryRscPayloadOptions<TModule extends AppPageModule = AppPageModule> = {\n element: ReactNode;\n pathname: string;\n route?: AppPageBoundaryRoute<TModule> | null;\n};\n\ntype AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {\n error?: TModule | null;\n errors?: readonly (TModule | null | undefined)[] | null;\n forbidden?: TModule | null;\n layoutTreePositions?: readonly number[] | null;\n layouts?: readonly (TModule | null | undefined)[];\n notFound?: TModule | null;\n params?: AppPageParams;\n pattern?: string;\n routeSegments?: readonly string[];\n unauthorized?: TModule | null;\n};\n\ntype AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageModule> = {\n buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;\n clearRequestContext: () => void;\n createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;\n getFontLinks: () => string[];\n getFontPreloads: () => AppPageFontPreload[];\n getFontStyles: () => string[];\n getNavigationContext: () => unknown;\n globalErrorModule?: TModule | null;\n isRscRequest: boolean;\n loadSsrHandler: () => Promise<AppPageSsrHandler>;\n makeThenableParams: (params: AppPageParams) => unknown;\n middlewareContext: AppPageMiddlewareContext;\n renderToReadableStream: (\n element: ReactNode | AppElements,\n options: { onError: AppPageBoundaryOnError },\n ) => ReadableStream<Uint8Array>;\n requestUrl: string;\n resolveChildSegments: (\n routeSegments: readonly string[],\n treePosition: number,\n params: AppPageParams,\n ) => string[];\n rootLayouts: readonly (TModule | null | undefined)[];\n scriptNonce?: string;\n};\n\ntype RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {\n boundaryComponent?: AppPageComponent | null;\n layoutModules?: readonly (TModule | null | undefined)[] | null;\n matchedParams: AppPageParams;\n rootForbiddenModule?: TModule | null;\n rootNotFoundModule?: TModule | null;\n rootUnauthorizedModule?: TModule | null;\n route?: AppPageBoundaryRoute<TModule> | null;\n statusCode: number;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\ntype RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageModule> = {\n error: unknown;\n matchedParams?: AppPageParams | null;\n route?: AppPageBoundaryRoute<TModule> | null;\n sanitizeErrorForClient: (error: Error) => Error;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\nfunction getDefaultExport<TModule extends AppPageModule>(\n module: TModule | null | undefined,\n): AppPageComponent | null {\n return module?.default ?? null;\n}\n\nasync function resolveAppPageLayoutHead<TModule extends AppPageModule>(\n layoutModules: readonly (TModule | null | undefined)[],\n params: AppPageParams,\n): Promise<{ metadata: Metadata | null; viewport: Viewport }> {\n const filteredLayouts = layoutModules.filter(Boolean) as TModule[];\n const layoutMetadataPromises: Promise<Metadata | null>[] = [];\n let accumulatedMetadata = Promise.resolve<Metadata>({});\n\n for (let index = 0; index < filteredLayouts.length; index++) {\n const parentForLayout = accumulatedMetadata;\n const metadataPromise = resolveModuleMetadata(\n filteredLayouts[index],\n params,\n undefined,\n parentForLayout,\n ).catch((error) => {\n console.error(\"[vinext] Layout generateMetadata() failed:\", error);\n return null;\n });\n layoutMetadataPromises.push(metadataPromise);\n accumulatedMetadata = metadataPromise.then(async (metadataResult) => {\n if (metadataResult) {\n return mergeMetadata([await parentForLayout, metadataResult]);\n }\n return parentForLayout;\n });\n }\n\n const [metadataResults, viewportResults] = await Promise.all([\n Promise.all(layoutMetadataPromises),\n Promise.all(\n filteredLayouts.map((layoutModule) =>\n resolveModuleViewport(layoutModule, params).catch((error) => {\n console.error(\"[vinext] Layout generateViewport() failed:\", error);\n return null;\n }),\n ),\n ),\n ]);\n\n const metadataList = metadataResults.filter(Boolean) as Metadata[];\n const viewportList = viewportResults.filter(Boolean) as Viewport[];\n\n return {\n metadata: metadataList.length > 0 ? mergeMetadata(metadataList) : null,\n viewport: mergeViewport(viewportList),\n };\n}\n\nfunction wrapRenderedBoundaryElement<TModule extends AppPageModule>(\n options: Pick<\n AppPageBoundaryRenderCommonOptions<TModule>,\n \"globalErrorModule\" | \"isRscRequest\" | \"makeThenableParams\" | \"resolveChildSegments\"\n > & {\n element: ReactNode;\n includeGlobalErrorBoundary: boolean;\n layoutModules: readonly (TModule | null | undefined)[];\n layoutTreePositions?: readonly number[] | null;\n matchedParams: AppPageParams;\n routeSegments?: readonly string[];\n skipLayoutWrapping?: boolean;\n },\n): ReactNode {\n return wrapAppPageBoundaryElement({\n element: options.element,\n getDefaultExport,\n globalErrorComponent: getDefaultExport(options.globalErrorModule),\n includeGlobalErrorBoundary: options.includeGlobalErrorBoundary,\n isRscRequest: options.isRscRequest,\n layoutModules: options.layoutModules,\n layoutTreePositions: options.layoutTreePositions,\n makeThenableParams: options.makeThenableParams,\n matchedParams: options.matchedParams,\n renderErrorBoundary(GlobalErrorComponent, children) {\n return createElement(ErrorBoundary, {\n fallback: GlobalErrorComponent,\n // oxlint-disable-next-line react/no-children-prop\n children,\n });\n },\n renderLayout(LayoutComponent, children, asyncParams) {\n return createElement(LayoutComponent as AppPageComponent, {\n // oxlint-disable-next-line react/no-children-prop\n children,\n params: asyncParams,\n });\n },\n renderLayoutSegmentProvider(segmentMap, children) {\n return createElement(\n // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n LayoutSegmentProvider as ComponentType<any>,\n { segmentMap },\n children,\n );\n },\n resolveChildSegments: options.resolveChildSegments,\n routeSegments: options.routeSegments ?? [],\n skipLayoutWrapping: options.skipLayoutWrapping,\n });\n}\n\nfunction resolveAppPageBoundaryRootLayoutTreePath<TModule extends AppPageModule>(\n route: AppPageBoundaryRoute<TModule> | null | undefined,\n): string | null {\n if (route?.layouts) {\n const rootLayoutEntry = createAppPageLayoutEntries({\n errors: route.errors,\n layoutTreePositions: route.layoutTreePositions,\n layouts: route.layouts,\n notFounds: null,\n routeSegments: route.routeSegments,\n })[0];\n\n if (rootLayoutEntry) {\n return rootLayoutEntry.treePath;\n }\n }\n\n // Without route tree metadata we cannot derive a canonical root layout tree path.\n // Returning null keeps boundary payloads soft-navigation compatible.\n return null;\n}\n\nfunction createAppPageBoundaryRscPayload<TModule extends AppPageModule>(\n options: AppPageBoundaryRscPayloadOptions<TModule>,\n): AppElements {\n const routeId = createAppPayloadRouteId(options.pathname, null);\n\n return {\n [APP_INTERCEPTION_CONTEXT_KEY]: null,\n [APP_ROUTE_KEY]: routeId,\n [APP_ROOT_LAYOUT_KEY]: resolveAppPageBoundaryRootLayoutTreePath(options.route),\n [routeId]: options.element,\n };\n}\n\nasync function renderAppPageBoundaryElementResponse<TModule extends AppPageModule>(\n options: AppPageBoundaryRenderCommonOptions<TModule> & {\n element: ReactNode;\n layoutModules: readonly (TModule | null | undefined)[];\n route?: AppPageBoundaryRoute<TModule> | null;\n routePattern?: string;\n status: number;\n },\n): Promise<Response> {\n const pathname = new URL(options.requestUrl).pathname;\n const payload = createAppPageBoundaryRscPayload({\n element: options.element,\n pathname,\n route: options.route,\n });\n\n return renderAppPageBoundaryResponse({\n async createHtmlResponse(rscStream, responseStatus) {\n const fontData = createAppPageFontData({\n getLinks: options.getFontLinks,\n getPreloads: options.getFontPreloads,\n getStyles: options.getFontStyles,\n });\n const ssrHandler = await options.loadSsrHandler();\n return renderAppPageHtmlResponse({\n clearRequestContext: options.clearRequestContext,\n fontData,\n fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),\n middlewareHeaders: options.middlewareContext.headers,\n navigationContext: options.getNavigationContext(),\n rscStream,\n scriptNonce: options.scriptNonce,\n ssrHandler,\n status: responseStatus,\n });\n },\n createRscOnErrorHandler() {\n return options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname);\n },\n element: payload,\n isRscRequest: options.isRscRequest,\n middlewareHeaders: options.middlewareContext.headers,\n renderToReadableStream: options.renderToReadableStream,\n status: options.status,\n });\n}\n\nexport async function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(\n options: RenderAppPageHttpAccessFallbackOptions<TModule>,\n): Promise<Response | null> {\n const boundaryComponent =\n options.boundaryComponent ??\n resolveAppPageHttpAccessBoundaryComponent({\n getDefaultExport,\n rootForbiddenModule: options.rootForbiddenModule,\n rootNotFoundModule: options.rootNotFoundModule,\n rootUnauthorizedModule: options.rootUnauthorizedModule,\n routeForbiddenModule: options.route?.forbidden,\n routeNotFoundModule: options.route?.notFound,\n routeUnauthorizedModule: options.route?.unauthorized,\n statusCode: options.statusCode,\n });\n if (!boundaryComponent) {\n return null;\n }\n\n const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;\n const { metadata, viewport } = await resolveAppPageLayoutHead(\n layoutModules,\n options.matchedParams,\n );\n\n const headElements: ReactNode[] = [\n createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" }),\n createElement(\"meta\", { content: \"noindex\", key: \"robots\", name: \"robots\" }),\n ];\n if (metadata) {\n headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata }));\n }\n headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n\n const element = wrapRenderedBoundaryElement({\n element: createElement(Fragment, null, ...headElements, createElement(boundaryComponent)),\n globalErrorModule: options.globalErrorModule,\n includeGlobalErrorBoundary: true,\n isRscRequest: options.isRscRequest,\n layoutModules,\n layoutTreePositions: options.route?.layoutTreePositions,\n makeThenableParams: options.makeThenableParams,\n matchedParams: options.matchedParams,\n resolveChildSegments: options.resolveChildSegments,\n routeSegments: options.route?.routeSegments,\n });\n\n return renderAppPageBoundaryElementResponse({\n ...options,\n element,\n layoutModules,\n route: options.route,\n routePattern: options.route?.pattern,\n status: options.statusCode,\n });\n}\n\nexport async function renderAppPageErrorBoundary<TModule extends AppPageModule>(\n options: RenderAppPageErrorBoundaryOptions<TModule>,\n): Promise<Response | null> {\n const errorBoundary = resolveAppPageErrorBoundary({\n getDefaultExport,\n globalErrorModule: options.globalErrorModule,\n layoutErrorModules: options.route?.errors,\n pageErrorModule: options.route?.error,\n });\n if (!errorBoundary.component) {\n return null;\n }\n\n const rawError =\n options.error instanceof Error ? options.error : new Error(String(options.error));\n rewriteClientHookError(rawError);\n const errorObject = options.sanitizeErrorForClient(rawError);\n const matchedParams = options.matchedParams ?? options.route?.params ?? {};\n const layoutModules = options.route?.layouts ?? options.rootLayouts;\n\n const element = wrapRenderedBoundaryElement({\n element: createElement(errorBoundary.component, {\n error: errorObject,\n }),\n globalErrorModule: options.globalErrorModule,\n includeGlobalErrorBoundary: !errorBoundary.isGlobalError,\n isRscRequest: options.isRscRequest,\n layoutModules,\n layoutTreePositions: options.route?.layoutTreePositions,\n makeThenableParams: options.makeThenableParams,\n matchedParams,\n resolveChildSegments: options.resolveChildSegments,\n routeSegments: options.route?.routeSegments,\n skipLayoutWrapping: errorBoundary.isGlobalError,\n });\n\n return renderAppPageBoundaryElementResponse({\n ...options,\n element,\n layoutModules,\n route: options.route,\n routePattern: options.route?.pattern,\n status: 200,\n });\n}\n\n// React client-only hooks that are absent from the `react-server` export\n// condition. When called in a Server Component they produce a TypeError like\n// \"useState is not a function\". Rewrite into an actionable message matching\n// the format used by the next/navigation shims (see client-hook-error.ts).\nconst _clientHookPattern =\n /\\b(useState|useEffect|useReducer|useRef|useContext|useLayoutEffect|useInsertionEffect|useSyncExternalStore|useTransition|useImperativeHandle|useDeferredValue|useActionState|useOptimistic|useEffectEvent)\\b.*is not a function/;\n\nfunction rewriteClientHookError(error: Error): void {\n const match = error.message.match(_clientHookPattern);\n if (match) {\n error.message = buildClientHookErrorMessage(`${match[1]}()`);\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"app-page-boundary-render.js","names":[],"sources":["../../src/server/app-page-boundary-render.ts"],"sourcesContent":["import { Fragment, createElement, type ComponentType, type ReactNode } from \"react\";\nimport { buildClientHookErrorMessage } from \"vinext/shims/client-hook-error\";\nimport { ErrorBoundary } from \"vinext/shims/error-boundary\";\nimport { LayoutSegmentProvider } from \"vinext/shims/layout-segment-context\";\nimport { MetadataHead, ViewportHead } from \"vinext/shims/metadata\";\nimport type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport type { AppPageMiddlewareContext } from \"./app-page-response.js\";\nimport type { MetadataFileRoute } from \"./metadata-routes.js\";\nimport { resolveAppPageHead } from \"./app-page-head.js\";\nimport {\n renderAppPageBoundaryResponse,\n resolveAppPageErrorBoundary,\n resolveAppPageHttpAccessBoundaryComponent,\n wrapAppPageBoundaryElement,\n type AppPageParams,\n} from \"./app-page-boundary.js\";\nimport {\n createAppPageFontData,\n renderAppPageHtmlResponse,\n type AppPageSsrHandler,\n} from \"./app-page-stream.js\";\nimport {\n APP_INTERCEPTION_CONTEXT_KEY,\n APP_ROOT_LAYOUT_KEY,\n APP_ROUTE_KEY,\n createAppPayloadRouteId,\n type AppElements,\n} from \"./app-elements.js\";\nimport { createAppPageLayoutEntries } from \"./app-page-route-wiring.js\";\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AppPageComponent = ComponentType<any>;\ntype AppPageModule = Record<string, unknown> & {\n default?: AppPageComponent | null | undefined;\n};\ntype AppPageBoundaryOnError = (\n error: unknown,\n requestInfo: unknown,\n errorContext: unknown,\n) => unknown;\n\ntype AppPageBoundaryRscPayloadOptions<TModule extends AppPageModule = AppPageModule> = {\n element: ReactNode;\n pathname: string;\n route?: AppPageBoundaryRoute<TModule> | null;\n};\n\nexport type AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {\n error?: TModule | null;\n errors?: readonly (TModule | null | undefined)[] | null;\n forbidden?: TModule | null;\n layoutTreePositions?: readonly number[] | null;\n layouts?: readonly (TModule | null | undefined)[];\n notFound?: TModule | null;\n params?: AppPageParams;\n pattern?: string;\n routeSegments?: readonly string[];\n unauthorized?: TModule | null;\n};\n\ntype AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageModule> = {\n buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;\n clearRequestContext: () => void;\n createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;\n getFontLinks: () => string[];\n getFontPreloads: () => AppPageFontPreload[];\n getFontStyles: () => string[];\n getNavigationContext: () => unknown;\n globalErrorModule?: TModule | null;\n isRscRequest: boolean;\n loadSsrHandler: () => Promise<AppPageSsrHandler>;\n makeThenableParams: (params: AppPageParams) => unknown;\n middlewareContext: AppPageMiddlewareContext;\n metadataRoutes: MetadataFileRoute[];\n renderToReadableStream: (\n element: ReactNode | AppElements,\n options: { onError: AppPageBoundaryOnError },\n ) => ReadableStream<Uint8Array>;\n requestUrl: string;\n resolveChildSegments: (\n routeSegments: readonly string[],\n treePosition: number,\n params: AppPageParams,\n ) => string[];\n rootLayouts: readonly (TModule | null | undefined)[];\n scriptNonce?: string;\n};\n\ntype RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {\n boundaryComponent?: AppPageComponent | null;\n layoutModules?: readonly (TModule | null | undefined)[] | null;\n matchedParams: AppPageParams;\n rootForbiddenModule?: TModule | null;\n rootNotFoundModule?: TModule | null;\n rootUnauthorizedModule?: TModule | null;\n route?: AppPageBoundaryRoute<TModule> | null;\n statusCode: number;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\ntype RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageModule> = {\n error: unknown;\n matchedParams?: AppPageParams | null;\n route?: AppPageBoundaryRoute<TModule> | null;\n sanitizeErrorForClient: (error: Error) => Error;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\nfunction getDefaultExport<TModule extends AppPageModule>(\n module: TModule | null | undefined,\n): AppPageComponent | null {\n return module?.default ?? null;\n}\n\nfunction wrapRenderedBoundaryElement<TModule extends AppPageModule>(\n options: Pick<\n AppPageBoundaryRenderCommonOptions<TModule>,\n \"globalErrorModule\" | \"isRscRequest\" | \"makeThenableParams\" | \"resolveChildSegments\"\n > & {\n element: ReactNode;\n includeGlobalErrorBoundary: boolean;\n layoutModules: readonly (TModule | null | undefined)[];\n layoutTreePositions?: readonly number[] | null;\n matchedParams: AppPageParams;\n routeSegments?: readonly string[];\n skipLayoutWrapping?: boolean;\n },\n): ReactNode {\n return wrapAppPageBoundaryElement({\n element: options.element,\n getDefaultExport,\n globalErrorComponent: getDefaultExport(options.globalErrorModule),\n includeGlobalErrorBoundary: options.includeGlobalErrorBoundary,\n isRscRequest: options.isRscRequest,\n layoutModules: options.layoutModules,\n layoutTreePositions: options.layoutTreePositions,\n makeThenableParams: options.makeThenableParams,\n matchedParams: options.matchedParams,\n renderErrorBoundary(GlobalErrorComponent, children) {\n return createElement(ErrorBoundary, {\n fallback: GlobalErrorComponent,\n // oxlint-disable-next-line react/no-children-prop\n children,\n });\n },\n renderLayout(LayoutComponent, children, asyncParams) {\n return createElement(LayoutComponent as AppPageComponent, {\n // oxlint-disable-next-line react/no-children-prop\n children,\n params: asyncParams,\n });\n },\n renderLayoutSegmentProvider(segmentMap, children) {\n return createElement(\n // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n LayoutSegmentProvider as ComponentType<any>,\n { segmentMap },\n children,\n );\n },\n resolveChildSegments: options.resolveChildSegments,\n routeSegments: options.routeSegments ?? [],\n skipLayoutWrapping: options.skipLayoutWrapping,\n });\n}\n\nfunction resolveAppPageBoundaryRootLayoutTreePath<TModule extends AppPageModule>(\n route: AppPageBoundaryRoute<TModule> | null | undefined,\n): string | null {\n if (route?.layouts) {\n const rootLayoutEntry = createAppPageLayoutEntries({\n errors: route.errors,\n layoutTreePositions: route.layoutTreePositions,\n layouts: route.layouts,\n notFounds: null,\n routeSegments: route.routeSegments,\n })[0];\n\n if (rootLayoutEntry) {\n return rootLayoutEntry.treePath;\n }\n }\n\n // Without route tree metadata we cannot derive a canonical root layout tree path.\n // Returning null keeps boundary payloads soft-navigation compatible.\n return null;\n}\n\nfunction resolveHttpAccessFallbackHeadRouteSegments<TModule extends AppPageModule>(\n route: AppPageBoundaryRoute<TModule> | null | undefined,\n layoutModules: readonly (TModule | null | undefined)[],\n): readonly string[] | undefined {\n if (!route?.routeSegments) {\n return undefined;\n }\n\n if (!route.layouts || layoutModules.length >= route.layouts.length) {\n return route.routeSegments;\n }\n\n const lastIncludedLayoutIndex = layoutModules.length - 1;\n if (lastIncludedLayoutIndex < 0) {\n return [];\n }\n\n const segmentCount = route.layoutTreePositions?.[lastIncludedLayoutIndex] ?? 0;\n return route.routeSegments.slice(0, segmentCount);\n}\n\nfunction resolveHttpAccessFallbackHeadLayoutTreePositions<TModule extends AppPageModule>(\n route: AppPageBoundaryRoute<TModule> | null | undefined,\n layoutModules: readonly (TModule | null | undefined)[],\n): readonly number[] | null | undefined {\n if (!route?.layouts || layoutModules.length >= route.layouts.length) {\n return route?.layoutTreePositions;\n }\n\n return route.layoutTreePositions?.slice(0, layoutModules.length);\n}\n\nfunction createAppPageBoundaryRscPayload<TModule extends AppPageModule>(\n options: AppPageBoundaryRscPayloadOptions<TModule>,\n): AppElements {\n const routeId = createAppPayloadRouteId(options.pathname, null);\n\n return {\n [APP_INTERCEPTION_CONTEXT_KEY]: null,\n [APP_ROUTE_KEY]: routeId,\n [APP_ROOT_LAYOUT_KEY]: resolveAppPageBoundaryRootLayoutTreePath(options.route),\n [routeId]: options.element,\n };\n}\n\nasync function renderAppPageBoundaryElementResponse<TModule extends AppPageModule>(\n options: AppPageBoundaryRenderCommonOptions<TModule> & {\n element: ReactNode;\n layoutModules: readonly (TModule | null | undefined)[];\n route?: AppPageBoundaryRoute<TModule> | null;\n routePattern?: string;\n status: number;\n },\n): Promise<Response> {\n const pathname = new URL(options.requestUrl).pathname;\n const payload = createAppPageBoundaryRscPayload({\n element: options.element,\n pathname,\n route: options.route,\n });\n\n return renderAppPageBoundaryResponse({\n async createHtmlResponse(rscStream, responseStatus) {\n const fontData = createAppPageFontData({\n getLinks: options.getFontLinks,\n getPreloads: options.getFontPreloads,\n getStyles: options.getFontStyles,\n });\n const ssrHandler = await options.loadSsrHandler();\n return renderAppPageHtmlResponse({\n clearRequestContext: options.clearRequestContext,\n fontData,\n fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),\n middlewareHeaders: options.middlewareContext.headers,\n navigationContext: options.getNavigationContext(),\n rscStream,\n scriptNonce: options.scriptNonce,\n ssrHandler,\n status: responseStatus,\n });\n },\n createRscOnErrorHandler() {\n return options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname);\n },\n element: payload,\n isRscRequest: options.isRscRequest,\n middlewareHeaders: options.middlewareContext.headers,\n renderToReadableStream: options.renderToReadableStream,\n status: options.status,\n });\n}\n\nexport async function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(\n options: RenderAppPageHttpAccessFallbackOptions<TModule>,\n): Promise<Response | null> {\n const boundaryComponent =\n options.boundaryComponent ??\n resolveAppPageHttpAccessBoundaryComponent({\n getDefaultExport,\n rootForbiddenModule: options.rootForbiddenModule,\n rootNotFoundModule: options.rootNotFoundModule,\n rootUnauthorizedModule: options.rootUnauthorizedModule,\n routeForbiddenModule: options.route?.forbidden,\n routeNotFoundModule: options.route?.notFound,\n routeUnauthorizedModule: options.route?.unauthorized,\n statusCode: options.statusCode,\n });\n if (!boundaryComponent) {\n return null;\n }\n\n const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;\n const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, layoutModules);\n const { metadata, viewport } = await resolveAppPageHead({\n layoutModules,\n layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(\n options.route,\n layoutModules,\n ),\n metadataRoutes: options.metadataRoutes,\n params: options.matchedParams,\n routePath: options.route?.pattern ?? new URL(options.requestUrl).pathname,\n routeSegments,\n });\n\n const headElements: ReactNode[] = [\n createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" }),\n createElement(\"meta\", { content: \"noindex\", key: \"robots\", name: \"robots\" }),\n ];\n if (metadata) {\n headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata }));\n }\n headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n\n const element = wrapRenderedBoundaryElement({\n element: createElement(Fragment, null, ...headElements, createElement(boundaryComponent)),\n globalErrorModule: options.globalErrorModule,\n includeGlobalErrorBoundary: true,\n isRscRequest: options.isRscRequest,\n layoutModules,\n layoutTreePositions: options.route?.layoutTreePositions,\n makeThenableParams: options.makeThenableParams,\n matchedParams: options.matchedParams,\n resolveChildSegments: options.resolveChildSegments,\n routeSegments: options.route?.routeSegments,\n });\n\n return renderAppPageBoundaryElementResponse({\n ...options,\n element,\n layoutModules,\n route: options.route,\n routePattern: options.route?.pattern,\n status: options.statusCode,\n });\n}\n\nexport async function renderAppPageErrorBoundary<TModule extends AppPageModule>(\n options: RenderAppPageErrorBoundaryOptions<TModule>,\n): Promise<Response | null> {\n const errorBoundary = resolveAppPageErrorBoundary({\n getDefaultExport,\n globalErrorModule: options.globalErrorModule,\n layoutErrorModules: options.route?.errors,\n pageErrorModule: options.route?.error,\n });\n if (!errorBoundary.component) {\n return null;\n }\n\n const rawError =\n options.error instanceof Error ? options.error : new Error(String(options.error));\n rewriteClientHookError(rawError);\n const errorObject = options.sanitizeErrorForClient(rawError);\n const matchedParams = options.matchedParams ?? options.route?.params ?? {};\n const layoutModules = options.route?.layouts ?? options.rootLayouts;\n const pathname = new URL(options.requestUrl).pathname;\n\n const headElements: ReactNode[] = [createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" })];\n if (!errorBoundary.isGlobalError) {\n try {\n const { metadata, viewport } = await resolveAppPageHead({\n fallbackOnFileMetadataError: true,\n layoutModules,\n layoutTreePositions: options.route?.layoutTreePositions,\n metadataRoutes: options.metadataRoutes,\n params: matchedParams,\n routePath: options.route?.pattern ?? pathname,\n routeSegments: options.route?.routeSegments,\n });\n if (metadata) {\n headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata }));\n }\n headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n } catch (error) {\n console.error(\n `[vinext] App page error boundary head resolution failed for ${options.route?.pattern ?? pathname}:`,\n error,\n );\n }\n }\n\n const element = wrapRenderedBoundaryElement({\n element: createElement(\n Fragment,\n null,\n ...headElements,\n createElement(errorBoundary.component, {\n error: errorObject,\n }),\n ),\n globalErrorModule: options.globalErrorModule,\n includeGlobalErrorBoundary: !errorBoundary.isGlobalError,\n isRscRequest: options.isRscRequest,\n layoutModules,\n layoutTreePositions: options.route?.layoutTreePositions,\n makeThenableParams: options.makeThenableParams,\n matchedParams,\n resolveChildSegments: options.resolveChildSegments,\n routeSegments: options.route?.routeSegments,\n skipLayoutWrapping: errorBoundary.isGlobalError,\n });\n\n return renderAppPageBoundaryElementResponse({\n ...options,\n element,\n layoutModules,\n route: options.route,\n routePattern: options.route?.pattern,\n status: 200,\n });\n}\n\n// React client-only hooks that are absent from the `react-server` export\n// condition. When called in a Server Component they produce a TypeError like\n// \"useState is not a function\". Rewrite into an actionable message matching\n// the format used by the next/navigation shims (see client-hook-error.ts).\nconst _clientHookPattern =\n /\\b(useState|useEffect|useReducer|useRef|useContext|useLayoutEffect|useInsertionEffect|useSyncExternalStore|useTransition|useImperativeHandle|useDeferredValue|useActionState|useOptimistic|useEffectEvent)\\b.*is not a function/;\n\nfunction rewriteClientHookError(error: Error): void {\n const match = error.message.match(_clientHookPattern);\n if (match) {\n error.message = buildClientHookErrorMessage(`${match[1]}()`);\n }\n}\n"],"mappings":"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"}
@@ -10,6 +10,16 @@ type ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent> = {
10
10
  routeUnauthorizedModule?: TModule | null;
11
11
  statusCode: number;
12
12
  };
13
+ type ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule> = {
14
+ layoutIndex: number;
15
+ rootForbiddenModule?: TModule | null;
16
+ rootNotFoundModule?: TModule | null;
17
+ rootUnauthorizedModule?: TModule | null;
18
+ routeForbiddenModules?: readonly (TModule | null | undefined)[] | null;
19
+ routeNotFoundModules?: readonly (TModule | null | undefined)[] | null;
20
+ routeUnauthorizedModules?: readonly (TModule | null | undefined)[] | null;
21
+ statusCode: number;
22
+ };
13
23
  type ResolveAppPageErrorBoundaryOptions<TModule, TComponent> = {
14
24
  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;
15
25
  globalErrorModule?: TModule | null;
@@ -52,9 +62,10 @@ type RenderAppPageBoundaryResponseOptions<TElement> = {
52
62
  status: number;
53
63
  };
54
64
  declare function resolveAppPageHttpAccessBoundaryComponent<TModule, TComponent>(options: ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent>): TComponent | null;
65
+ declare function resolveAppPageParentHttpAccessBoundaryModule<TModule>(options: ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule>): TModule | null;
55
66
  declare function resolveAppPageErrorBoundary<TModule, TComponent>(options: ResolveAppPageErrorBoundaryOptions<TModule, TComponent>): ResolveAppPageErrorBoundaryResult<TComponent>;
56
67
  declare function wrapAppPageBoundaryElement<TElement, TLayoutModule, TLayoutComponent, TChildSegments, TGlobalErrorComponent>(options: WrapAppPageBoundaryElementOptions<TElement, TLayoutModule, TLayoutComponent, TChildSegments, TGlobalErrorComponent>): TElement;
57
68
  declare function renderAppPageBoundaryResponse<TElement>(options: RenderAppPageBoundaryResponseOptions<TElement>): Promise<Response>;
58
69
  //#endregion
59
- export { AppPageParams, renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, wrapAppPageBoundaryElement };
70
+ export { AppPageParams, renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, resolveAppPageParentHttpAccessBoundaryModule, wrapAppPageBoundaryElement };
60
71
  //# sourceMappingURL=app-page-boundary.d.ts.map
@@ -1,3 +1,4 @@
1
+ import { resolveAppPageSegmentParams } from "./app-page-params.js";
1
2
  import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
2
3
  //#region src/server/app-page-boundary.ts
3
4
  function resolveAppPageHttpAccessBoundaryComponent(options) {
@@ -7,6 +8,22 @@ function resolveAppPageHttpAccessBoundaryComponent(options) {
7
8
  else boundaryModule = options.routeNotFoundModule ?? options.rootNotFoundModule;
8
9
  return options.getDefaultExport(boundaryModule) ?? null;
9
10
  }
11
+ function resolveAppPageParentHttpAccessBoundaryModule(options) {
12
+ let routeModules = options.routeNotFoundModules;
13
+ let rootModule = options.rootNotFoundModule;
14
+ if (options.statusCode === 403) {
15
+ routeModules = options.routeForbiddenModules;
16
+ rootModule = options.rootForbiddenModule;
17
+ } else if (options.statusCode === 401) {
18
+ routeModules = options.routeUnauthorizedModules;
19
+ rootModule = options.rootUnauthorizedModule;
20
+ }
21
+ if (routeModules) for (let index = options.layoutIndex - 1; index >= 0; index--) {
22
+ const module = routeModules[index];
23
+ if (module) return module;
24
+ }
25
+ return rootModule ?? null;
26
+ }
10
27
  function resolveAppPageErrorBoundary(options) {
11
28
  const pageErrorComponent = options.getDefaultExport(options.pageErrorModule);
12
29
  if (pageErrorComponent) return {
@@ -28,17 +45,15 @@ function resolveAppPageErrorBoundary(options) {
28
45
  }
29
46
  function wrapAppPageBoundaryElement(options) {
30
47
  let element = options.element;
31
- if (!options.skipLayoutWrapping) {
32
- const asyncParams = options.makeThenableParams(options.matchedParams);
33
- for (let index = options.layoutModules.length - 1; index >= 0; index--) {
34
- const layoutComponent = options.getDefaultExport(options.layoutModules[index]);
35
- if (!layoutComponent) continue;
36
- element = options.renderLayout(layoutComponent, element, asyncParams);
37
- if (options.isRscRequest && options.renderLayoutSegmentProvider && options.resolveChildSegments) {
38
- const treePosition = options.layoutTreePositions ? options.layoutTreePositions[index] : 0;
39
- const childSegments = options.resolveChildSegments(options.routeSegments ?? [], treePosition, options.matchedParams);
40
- element = options.renderLayoutSegmentProvider({ children: childSegments }, element);
41
- }
48
+ if (!options.skipLayoutWrapping) for (let index = options.layoutModules.length - 1; index >= 0; index--) {
49
+ const layoutComponent = options.getDefaultExport(options.layoutModules[index]);
50
+ if (!layoutComponent) continue;
51
+ const treePosition = options.layoutTreePositions ? options.layoutTreePositions[index] : 0;
52
+ const asyncParams = options.makeThenableParams(resolveAppPageSegmentParams(options.routeSegments, treePosition, options.matchedParams));
53
+ element = options.renderLayout(layoutComponent, element, asyncParams);
54
+ if (options.isRscRequest && options.renderLayoutSegmentProvider && options.resolveChildSegments) {
55
+ const childSegments = options.resolveChildSegments(options.routeSegments ?? [], treePosition, options.matchedParams);
56
+ element = options.renderLayoutSegmentProvider({ children: childSegments }, element);
42
57
  }
43
58
  }
44
59
  if (options.isRscRequest && options.includeGlobalErrorBoundary && options.globalErrorComponent) element = options.renderErrorBoundary(options.globalErrorComponent, element);
@@ -60,6 +75,6 @@ async function renderAppPageBoundaryResponse(options) {
60
75
  return options.createHtmlResponse(rscStream, options.status);
61
76
  }
62
77
  //#endregion
63
- export { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, wrapAppPageBoundaryElement };
78
+ export { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, resolveAppPageParentHttpAccessBoundaryModule, wrapAppPageBoundaryElement };
64
79
 
65
80
  //# sourceMappingURL=app-page-boundary.js.map