@timber-js/app 0.2.0-alpha.245 → 0.2.0-alpha.247
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/_chunks/dev-span-0aG7Q_Ph.js.map +1 -1
- package/dist/native/rsc/manifest.json +1 -0
- package/dist/native/rsc/server/build-manifest.js +1 -4
- package/dist/native/rsc/server/build-manifest.js.map +1 -1
- package/dist/native/rsc/server/early-hints.js +2 -1
- package/dist/native/rsc/server/early-hints.js.map +1 -1
- package/dist/native/rsc/server/internal.js +2 -2
- package/dist/native/rsc/server/metadata-render.js +3 -1
- package/dist/native/rsc/server/metadata-render.js.map +1 -1
- package/dist/native/rsc/server/metadata-urls.js +70 -0
- package/dist/native/rsc/server/metadata-urls.js.map +1 -0
- package/dist/native/rsc/server/metadata.js +1 -64
- package/dist/native/rsc/server/metadata.js.map +1 -1
- package/dist/native/rsc/server/pipeline-phases.js +2 -8
- package/dist/native/rsc/server/pipeline-phases.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js +1 -3
- package/dist/native/rsc/server/rsc-entry/render-route.js.map +1 -1
- package/dist/native/ssr/manifest.json +1 -0
- package/dist/native/ssr/server/build-manifest.js.map +1 -1
- package/dist/native/ssr/server/early-hints.js +2 -1
- package/dist/native/ssr/server/early-hints.js.map +1 -1
- package/dist/native/ssr/server/internal.js +2 -2
- package/dist/native/ssr/server/metadata-render.js +3 -1
- package/dist/native/ssr/server/metadata-render.js.map +1 -1
- package/dist/native/ssr/server/metadata-urls.js +70 -0
- package/dist/native/ssr/server/metadata-urls.js.map +1 -0
- package/dist/native/ssr/server/metadata.js +1 -64
- package/dist/native/ssr/server/metadata.js.map +1 -1
- package/dist/native/ssr/server/pipeline-phases.js +2 -8
- package/dist/native/ssr/server/pipeline-phases.js.map +1 -1
- package/dist/server/build-manifest.d.ts +2 -8
- package/dist/server/build-manifest.d.ts.map +1 -1
- package/dist/server/early-hints.d.ts +2 -2
- package/dist/server/early-hints.d.ts.map +1 -1
- package/dist/server/internal.d.ts +1 -1
- package/dist/server/internal.d.ts.map +1 -1
- package/dist/server/internal.js +169 -168
- package/dist/server/internal.js.map +1 -1
- package/dist/server/metadata-render.d.ts +4 -1
- package/dist/server/metadata-render.d.ts.map +1 -1
- package/dist/server/metadata-urls.d.ts +24 -0
- package/dist/server/metadata-urls.d.ts.map +1 -0
- package/dist/server/metadata.d.ts +0 -7
- package/dist/server/metadata.d.ts.map +1 -1
- package/dist/server/pipeline-phases.d.ts.map +1 -1
- package/dist/server/rsc-entry/render-route.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/server/build-manifest.ts +2 -17
- package/src/server/early-hints.ts +11 -6
- package/src/server/internal.ts +1 -6
- package/src/server/metadata-render.ts +6 -1
- package/src/server/metadata-urls.ts +109 -0
- package/src/server/metadata.ts +0 -108
- package/src/server/pipeline-phases.ts +2 -14
- package/src/server/rsc-entry/render-route.ts +9 -11
|
@@ -15,6 +15,9 @@ import type { HeadElement } from './metadata.ts';
|
|
|
15
15
|
*
|
|
16
16
|
* The framework's MetadataResolver component consumes these descriptors
|
|
17
17
|
* and renders them into the <head>.
|
|
18
|
+
*
|
|
19
|
+
* Relative URLs resolve against `metadataBase` here, so every caller emits
|
|
20
|
+
* absolute URLs (design/16-metadata.md §"metadataBase — URL Resolution").
|
|
18
21
|
*/
|
|
19
|
-
export declare function renderMetadataToElements(
|
|
22
|
+
export declare function renderMetadataToElements(declared: Metadata): HeadElement[];
|
|
20
23
|
//# sourceMappingURL=metadata-render.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-render.d.ts","sourceRoot":"","sources":["../../src/server/metadata-render.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"metadata-render.d.ts","sourceRoot":"","sources":["../../src/server/metadata-render.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAcjD;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,GAAG,WAAW,EAAE,CAyJ1E"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* metadataBase — resolve relative URLs in metadata against the base URL.
|
|
3
|
+
*
|
|
4
|
+
* Runs inside renderMetadataToElements, so every path that turns metadata
|
|
5
|
+
* into head tags (MetadataHead, the deny page) emits absolute URLs. It must
|
|
6
|
+
* not run before findDeclaredImageOwners: that reads which segment supplied
|
|
7
|
+
* the merged images by object identity, and resolving copies the images.
|
|
8
|
+
*
|
|
9
|
+
* Auto-linked metadata route hrefs (metadata-route-links.ts) never pass
|
|
10
|
+
* through here — they are HeadElements, not Metadata — so nothing is
|
|
11
|
+
* resolved twice.
|
|
12
|
+
*
|
|
13
|
+
* See design/16-metadata.md §"metadataBase — URL Resolution".
|
|
14
|
+
*/
|
|
15
|
+
import type { Metadata } from './types.ts';
|
|
16
|
+
/**
|
|
17
|
+
* Resolve relative URLs in metadata fields against metadataBase.
|
|
18
|
+
*
|
|
19
|
+
* Returns a new metadata object with URLs resolved. Absolute and
|
|
20
|
+
* protocol-relative URLs are not modified. If metadataBase is not set,
|
|
21
|
+
* returns the metadata unchanged.
|
|
22
|
+
*/
|
|
23
|
+
export declare function resolveMetadataUrls(metadata: Metadata): Metadata;
|
|
24
|
+
//# sourceMappingURL=metadata-urls.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metadata-urls.d.ts","sourceRoot":"","sources":["../../src/server/metadata-urls.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AA0B3C;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CA4DhE"}
|
|
@@ -65,11 +65,4 @@ export declare function resolveTitle(title: Metadata['title'], template: string
|
|
|
65
65
|
* See design/16-metadata.md §"Merge Algorithm"
|
|
66
66
|
*/
|
|
67
67
|
export declare function resolveMetadata(entries: SegmentMetadataEntry[], options?: ResolveMetadataOptions): Metadata;
|
|
68
|
-
/**
|
|
69
|
-
* Resolve relative URLs in metadata fields against metadataBase.
|
|
70
|
-
*
|
|
71
|
-
* Returns a new metadata object with URLs resolved. Absolute URLs are not modified.
|
|
72
|
-
* If metadataBase is not set, returns the metadata unchanged.
|
|
73
|
-
*/
|
|
74
|
-
export declare function resolveMetadataUrls(metadata: Metadata): Metadata;
|
|
75
68
|
//# sourceMappingURL=metadata.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../src/server/metadata.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEhE;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,YAAY,CAW/E;AAID,4DAA4D;AAC5D,MAAM,WAAW,oBAAoB;IACnC,6EAA6E;IAC7E,QAAQ,EAAE,QAAQ,CAAC;IACnB,yDAAyD;IACzD,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,mCAAmC;AACnC,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,0CAA0C;AAC1C,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAID;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EACxB,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B,MAAM,GAAG,SAAS,CAmBpB;AAID;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,oBAAoB,EAAE,EAC/B,OAAO,GAAE,sBAA2B,GACnC,QAAQ,CAwDV
|
|
1
|
+
{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../src/server/metadata.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEhE;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,YAAY,CAW/E;AAID,4DAA4D;AAC5D,MAAM,WAAW,oBAAoB;IACnC,6EAA6E;IAC7E,QAAQ,EAAE,QAAQ,CAAC;IACnB,yDAAyD;IACzD,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,mCAAmC;AACnC,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,0CAA0C;AAC1C,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAID;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EACxB,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B,MAAM,GAAG,SAAS,CAmBpB;AAID;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,oBAAoB,EAAE,EAC/B,OAAO,GAAE,sBAA2B,GACnC,QAAQ,CAwDV"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline-phases.d.ts","sourceRoot":"","sources":["../../src/server/pipeline-phases.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;
|
|
1
|
+
{"version":3,"file":"pipeline-phases.d.ts","sourceRoot":"","sources":["../../src/server/pipeline-phases.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAyBH,OAAO,EAKL,KAAK,aAAa,EACnB,MAAM,uBAAuB,CAAC;AAM/B,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAMrF,UAAU,aAAa;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAID;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,aAAa,EACvB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,GAC7B,OAAO,CAAC,YAAY,CAAC,CAavB;AAID;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,UAAU,EACjB,eAAe,EAAE,OAAO,GACvB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CA0C9B;AAID;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,UAAU,EACjB,eAAe,EAAE,OAAO,EACxB,EAAE,iBAAiB,EAAE,YAAY,EAAE,EAAE,aAAa,GACjD,OAAO,CAAC,YAAY,CAAC,CAYvB;AAID;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,eAAe,CAAC,EAAE,OAAO,GACxB,OAAO,CAAC,QAAQ,CAAC,CAsNnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-route.d.ts","sourceRoot":"","sources":["../../../src/server/rsc-entry/render-route.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"render-route.d.ts","sourceRoot":"","sources":["../../../src/server/rsc-entry/render-route.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAO1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAMtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAG9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAQ/D;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE,qBAAqB,CAAC;IACvC,gBAAgB,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;IACxC,mEAAmE;IACnE,cAAc,EAAE,sBAAsB,CAAC;IACvC,kBAAkB,EAAE,oBAAoB,CAAC;IACzC,aAAa,EAAE,aAAa,CAAC;IAC7B;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CAClE;AAED;;;;;;;;;GASG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,UAAU,EACjB,eAAe,EAAE,OAAO,EACxB,IAAI,EAAE,eAAe,EACrB,YAAY,CAAC,EAAE,mBAAmB,GACjC,OAAO,CAAC,QAAQ,CAAC,CA2JnB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@timber-js/app",
|
|
3
|
-
"version": "0.2.0-alpha.
|
|
3
|
+
"version": "0.2.0-alpha.247",
|
|
4
4
|
"description": "Vite-native React framework built for Servers and Serverless Platforms — correct HTTP semantics, real status codes, pages that work without JavaScript",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cloudflare-workers",
|
|
@@ -3,7 +3,8 @@
|
|
|
3
3
|
*
|
|
4
4
|
* The build manifest maps route segment file paths to their output
|
|
5
5
|
* chunks from Vite's client build. This enables:
|
|
6
|
-
* - <link rel="stylesheet">
|
|
6
|
+
* - 103 Early Hints / Link preloads for per-route CSS (the <link rel="stylesheet">
|
|
7
|
+
* tags themselves come from React Float, never from this manifest)
|
|
7
8
|
* - <script type="module"> with hashed URLs in production
|
|
8
9
|
* - <link rel="modulepreload"> for client chunk dependencies
|
|
9
10
|
* - Link preload headers for Early Hints (103)
|
|
@@ -94,22 +95,6 @@ export function collectRouteCss(segments: SegmentWithFiles[], manifest: BuildMan
|
|
|
94
95
|
return result;
|
|
95
96
|
}
|
|
96
97
|
|
|
97
|
-
/**
|
|
98
|
-
* Generate <link rel="stylesheet"> tags for CSS URLs.
|
|
99
|
-
*
|
|
100
|
-
* Returns an HTML string to prepend to headHtml for injection
|
|
101
|
-
* via injectHead() before </head>.
|
|
102
|
-
*/
|
|
103
|
-
export function buildCssLinkTags(cssUrls: string[]): string {
|
|
104
|
-
// Emit only <link rel="stylesheet"> — no preload tags. CSS preloading
|
|
105
|
-
// is handled by 103 Early Hints (Link header) which fires before the
|
|
106
|
-
// HTML stream. Float also emits `<link rel="stylesheet" data-precedence>`
|
|
107
|
-
// at the top of <head> during Fizz rendering — the browser discovers
|
|
108
|
-
// CSS from that tag. A <link rel="preload"> here would arrive *after*
|
|
109
|
-
// Float's stylesheet tag and trigger "Preload was ignored" warnings.
|
|
110
|
-
return cssUrls.map((url) => `<link rel="stylesheet" href="${url}">`).join('');
|
|
111
|
-
}
|
|
112
|
-
|
|
113
98
|
// ─── Font utilities ──────────────────────────────────────────────────────
|
|
114
99
|
|
|
115
100
|
/**
|
|
@@ -67,7 +67,7 @@ export interface EarlyHint {
|
|
|
67
67
|
* browser deduplicates them correctly.
|
|
68
68
|
*
|
|
69
69
|
* Examples:
|
|
70
|
-
* `</styles/root.css>; as=style; rel=preload`
|
|
70
|
+
* `</styles/root.css>; as=style; rel=preload; crossorigin=anonymous`
|
|
71
71
|
* `</fonts/inter.woff2>; as=font; rel=preload; crossorigin=anonymous`
|
|
72
72
|
* `</_timber/client.js>; rel=modulepreload`
|
|
73
73
|
* `<https://fonts.googleapis.com>; rel=preconnect`
|
|
@@ -100,7 +100,7 @@ export interface EarlyHintOptions {
|
|
|
100
100
|
* Collect all Link header strings for a matched route's segment chain.
|
|
101
101
|
*
|
|
102
102
|
* Walks the build manifest to emit hints for:
|
|
103
|
-
* - CSS stylesheets (as=style; rel=preload)
|
|
103
|
+
* - CSS stylesheets (as=style; rel=preload; crossorigin=anonymous)
|
|
104
104
|
* - Font assets (as=font; rel=preload; crossorigin)
|
|
105
105
|
* - JS modulepreload hints (rel=modulepreload) — unless skipJs is set
|
|
106
106
|
*
|
|
@@ -126,11 +126,16 @@ export function collectEarlyHintHeaders(
|
|
|
126
126
|
}
|
|
127
127
|
};
|
|
128
128
|
|
|
129
|
-
// Per-route CSS — as=style; rel=preload
|
|
130
|
-
// The
|
|
131
|
-
//
|
|
129
|
+
// Per-route CSS — as=style; rel=preload; crossorigin=anonymous
|
|
130
|
+
// The stylesheet the browser applies is React Float's
|
|
131
|
+
// `<link rel="stylesheet" crossorigin="anonymous">` from @vitejs/plugin-rsc.
|
|
132
|
+
// A preload only satisfies a later request with the same CORS mode, so a
|
|
133
|
+
// no-cors preload would be a wasted, separate download.
|
|
132
134
|
for (const url of collectRouteCss(segments, manifest)) {
|
|
133
|
-
add(
|
|
135
|
+
add(
|
|
136
|
+
url,
|
|
137
|
+
formatLinkHeader({ href: url, rel: 'preload', as: 'style', crossOrigin: 'anonymous' })
|
|
138
|
+
);
|
|
134
139
|
}
|
|
135
140
|
|
|
136
141
|
// Fonts — as=font; rel=preload; crossorigin (crossorigin required per spec)
|
package/src/server/internal.ts
CHANGED
|
@@ -82,12 +82,7 @@ export { parseBodySize, enforceBodyLimits, DEFAULT_LIMITS } from './body-limits.
|
|
|
82
82
|
export type { BodyLimitsConfig, BodyLimitResult, BodyKind } from './body-limits.ts';
|
|
83
83
|
|
|
84
84
|
// ── Metadata ─────────────────────────────────────────────────────────────
|
|
85
|
-
export {
|
|
86
|
-
resolveMetadata,
|
|
87
|
-
resolveTitle,
|
|
88
|
-
resolveMetadataUrls,
|
|
89
|
-
renderMetadataToElements,
|
|
90
|
-
} from './metadata.ts';
|
|
85
|
+
export { resolveMetadata, resolveTitle, renderMetadataToElements } from './metadata.ts';
|
|
91
86
|
export type { SegmentMetadataEntry, ResolveMetadataOptions } from './metadata.ts';
|
|
92
87
|
|
|
93
88
|
// ── Metadata Routes ──────────────────────────────────────────────────────
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
|
|
9
9
|
import type { Metadata } from './types.ts';
|
|
10
10
|
import type { HeadElement } from './metadata.ts';
|
|
11
|
+
import { resolveMetadataUrls } from './metadata-urls.ts';
|
|
11
12
|
import { renderOpenGraph, renderTwitter } from './metadata-social.ts';
|
|
12
13
|
import {
|
|
13
14
|
renderIcons,
|
|
@@ -28,8 +29,12 @@ import {
|
|
|
28
29
|
*
|
|
29
30
|
* The framework's MetadataResolver component consumes these descriptors
|
|
30
31
|
* and renders them into the <head>.
|
|
32
|
+
*
|
|
33
|
+
* Relative URLs resolve against `metadataBase` here, so every caller emits
|
|
34
|
+
* absolute URLs (design/16-metadata.md §"metadataBase — URL Resolution").
|
|
31
35
|
*/
|
|
32
|
-
export function renderMetadataToElements(
|
|
36
|
+
export function renderMetadataToElements(declared: Metadata): HeadElement[] {
|
|
37
|
+
const metadata = resolveMetadataUrls(declared);
|
|
33
38
|
const elements: HeadElement[] = [];
|
|
34
39
|
|
|
35
40
|
// Title
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* metadataBase — resolve relative URLs in metadata against the base URL.
|
|
3
|
+
*
|
|
4
|
+
* Runs inside renderMetadataToElements, so every path that turns metadata
|
|
5
|
+
* into head tags (MetadataHead, the deny page) emits absolute URLs. It must
|
|
6
|
+
* not run before findDeclaredImageOwners: that reads which segment supplied
|
|
7
|
+
* the merged images by object identity, and resolving copies the images.
|
|
8
|
+
*
|
|
9
|
+
* Auto-linked metadata route hrefs (metadata-route-links.ts) never pass
|
|
10
|
+
* through here — they are HeadElements, not Metadata — so nothing is
|
|
11
|
+
* resolved twice.
|
|
12
|
+
*
|
|
13
|
+
* See design/16-metadata.md §"metadataBase — URL Resolution".
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
import type { Metadata } from './types.ts';
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Absolute means the browser would not resolve it against the page: any URL
|
|
20
|
+
* with a scheme (`https:`, `data:`, `mailto:` …) or protocol-relative `//`.
|
|
21
|
+
*/
|
|
22
|
+
function isAbsoluteUrl(url: string): boolean {
|
|
23
|
+
return url.startsWith('//') || URL.canParse(url);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
function resolveUrl(url: string, base: URL): string {
|
|
27
|
+
return isAbsoluteUrl(url) ? url : new URL(url, base).toString();
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
function resolveEach<T extends { url: string }>(items: T[], base: URL): T[] {
|
|
31
|
+
return items.map((item) => ({ ...item, url: resolveUrl(item.url, base) }));
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
function resolveValues(
|
|
35
|
+
record: Record<string, string> | undefined,
|
|
36
|
+
base: URL
|
|
37
|
+
): Record<string, string> | undefined {
|
|
38
|
+
if (!record) return record;
|
|
39
|
+
return Object.fromEntries(Object.entries(record).map(([k, url]) => [k, resolveUrl(url, base)]));
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Resolve relative URLs in metadata fields against metadataBase.
|
|
44
|
+
*
|
|
45
|
+
* Returns a new metadata object with URLs resolved. Absolute and
|
|
46
|
+
* protocol-relative URLs are not modified. If metadataBase is not set,
|
|
47
|
+
* returns the metadata unchanged.
|
|
48
|
+
*/
|
|
49
|
+
export function resolveMetadataUrls(metadata: Metadata): Metadata {
|
|
50
|
+
const base = metadata.metadataBase;
|
|
51
|
+
if (!base) return metadata;
|
|
52
|
+
|
|
53
|
+
const result = { ...metadata };
|
|
54
|
+
|
|
55
|
+
if (result.openGraph) {
|
|
56
|
+
const og = { ...result.openGraph };
|
|
57
|
+
const images = og.images;
|
|
58
|
+
if (typeof images === 'string') og.images = resolveUrl(images, base);
|
|
59
|
+
else if (Array.isArray(images)) og.images = resolveEach(images, base);
|
|
60
|
+
else if (images) og.images = { ...images, url: resolveUrl(images.url, base) };
|
|
61
|
+
if (og.url) og.url = resolveUrl(og.url, base);
|
|
62
|
+
if (og.videos) og.videos = resolveEach(og.videos, base);
|
|
63
|
+
if (og.audio) og.audio = resolveEach(og.audio, base);
|
|
64
|
+
result.openGraph = og;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
if (result.twitter) {
|
|
68
|
+
const twitter = { ...result.twitter };
|
|
69
|
+
const images = twitter.images;
|
|
70
|
+
if (typeof images === 'string') {
|
|
71
|
+
twitter.images = resolveUrl(images, base);
|
|
72
|
+
} else if (Array.isArray(images)) {
|
|
73
|
+
// `string[] | object[]` — map each branch separately so the result
|
|
74
|
+
// keeps the homogeneous array type the field declares.
|
|
75
|
+
twitter.images = images.every((img) => typeof img === 'string')
|
|
76
|
+
? images.map((img) => resolveUrl(img, base))
|
|
77
|
+
: resolveEach(
|
|
78
|
+
images.filter((img) => typeof img !== 'string'),
|
|
79
|
+
base
|
|
80
|
+
);
|
|
81
|
+
} else if (images) {
|
|
82
|
+
twitter.images = { ...images, url: resolveUrl(images.url, base) };
|
|
83
|
+
}
|
|
84
|
+
result.twitter = twitter;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
if (result.alternates) {
|
|
88
|
+
const alternates = { ...result.alternates };
|
|
89
|
+
if (alternates.canonical) alternates.canonical = resolveUrl(alternates.canonical, base);
|
|
90
|
+
alternates.languages = resolveValues(alternates.languages, base);
|
|
91
|
+
alternates.media = resolveValues(alternates.media, base);
|
|
92
|
+
alternates.types = resolveValues(alternates.types, base);
|
|
93
|
+
result.alternates = alternates;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
if (result.icons) {
|
|
97
|
+
const icons = { ...result.icons };
|
|
98
|
+
if (typeof icons.icon === 'string') icons.icon = resolveUrl(icons.icon, base);
|
|
99
|
+
else if (icons.icon) icons.icon = resolveEach(icons.icon, base);
|
|
100
|
+
if (typeof icons.apple === 'string') icons.apple = resolveUrl(icons.apple, base);
|
|
101
|
+
else if (icons.apple) icons.apple = resolveEach(icons.apple, base);
|
|
102
|
+
if (typeof icons.shortcut === 'string') icons.shortcut = resolveUrl(icons.shortcut, base);
|
|
103
|
+
else if (icons.shortcut) icons.shortcut = icons.shortcut.map((url) => resolveUrl(url, base));
|
|
104
|
+
if (icons.other) icons.other = resolveEach(icons.other, base);
|
|
105
|
+
result.icons = icons;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
return result;
|
|
109
|
+
}
|
package/src/server/metadata.ts
CHANGED
|
@@ -174,111 +174,3 @@ export function resolveMetadata(
|
|
|
174
174
|
|
|
175
175
|
return merged;
|
|
176
176
|
}
|
|
177
|
-
|
|
178
|
-
// ─── URL Resolution ──────────────────────────────────────────────────────────
|
|
179
|
-
|
|
180
|
-
/**
|
|
181
|
-
* Check if a string is an absolute URL.
|
|
182
|
-
*/
|
|
183
|
-
function isAbsoluteUrl(url: string): boolean {
|
|
184
|
-
return url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//');
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
/**
|
|
188
|
-
* Resolve a relative URL against a base URL.
|
|
189
|
-
*/
|
|
190
|
-
function resolveUrl(url: string, base: URL): string {
|
|
191
|
-
if (isAbsoluteUrl(url)) return url;
|
|
192
|
-
return new URL(url, base).toString();
|
|
193
|
-
}
|
|
194
|
-
|
|
195
|
-
/**
|
|
196
|
-
* Resolve relative URLs in metadata fields against metadataBase.
|
|
197
|
-
*
|
|
198
|
-
* Returns a new metadata object with URLs resolved. Absolute URLs are not modified.
|
|
199
|
-
* If metadataBase is not set, returns the metadata unchanged.
|
|
200
|
-
*/
|
|
201
|
-
export function resolveMetadataUrls(metadata: Metadata): Metadata {
|
|
202
|
-
const base = metadata.metadataBase;
|
|
203
|
-
if (!base) return metadata;
|
|
204
|
-
|
|
205
|
-
const result = { ...metadata };
|
|
206
|
-
|
|
207
|
-
// Resolve openGraph images
|
|
208
|
-
if (result.openGraph) {
|
|
209
|
-
result.openGraph = { ...result.openGraph };
|
|
210
|
-
if (typeof result.openGraph.images === 'string') {
|
|
211
|
-
result.openGraph.images = resolveUrl(result.openGraph.images, base);
|
|
212
|
-
} else if (Array.isArray(result.openGraph.images)) {
|
|
213
|
-
result.openGraph.images = result.openGraph.images.map((img) => ({
|
|
214
|
-
...img,
|
|
215
|
-
url: resolveUrl(img.url, base),
|
|
216
|
-
}));
|
|
217
|
-
} else if (result.openGraph.images) {
|
|
218
|
-
// Single object: { url, width?, height?, alt? }
|
|
219
|
-
result.openGraph.images = {
|
|
220
|
-
...result.openGraph.images,
|
|
221
|
-
url: resolveUrl(result.openGraph.images.url, base),
|
|
222
|
-
};
|
|
223
|
-
}
|
|
224
|
-
if (result.openGraph.url && !isAbsoluteUrl(result.openGraph.url)) {
|
|
225
|
-
result.openGraph.url = resolveUrl(result.openGraph.url, base);
|
|
226
|
-
}
|
|
227
|
-
}
|
|
228
|
-
|
|
229
|
-
// Resolve twitter images
|
|
230
|
-
if (result.twitter) {
|
|
231
|
-
result.twitter = { ...result.twitter };
|
|
232
|
-
if (typeof result.twitter.images === 'string') {
|
|
233
|
-
result.twitter.images = resolveUrl(result.twitter.images, base);
|
|
234
|
-
} else if (Array.isArray(result.twitter.images)) {
|
|
235
|
-
// Resolve each image URL, preserving the union type structure
|
|
236
|
-
const resolved = result.twitter.images.map((img) =>
|
|
237
|
-
typeof img === 'string' ? resolveUrl(img, base) : { ...img, url: resolveUrl(img.url, base) }
|
|
238
|
-
);
|
|
239
|
-
// If all entries are strings, assign as string[]; otherwise as object[]
|
|
240
|
-
const allStrings = resolved.every((r) => typeof r === 'string');
|
|
241
|
-
result.twitter.images = allStrings
|
|
242
|
-
? (resolved as string[])
|
|
243
|
-
: (resolved as Array<{ url: string; alt?: string; width?: number; height?: number }>);
|
|
244
|
-
} else if (result.twitter.images) {
|
|
245
|
-
// Single object: { url, alt?, width?, height? }
|
|
246
|
-
result.twitter.images = {
|
|
247
|
-
...result.twitter.images,
|
|
248
|
-
url: resolveUrl(result.twitter.images.url, base),
|
|
249
|
-
};
|
|
250
|
-
}
|
|
251
|
-
}
|
|
252
|
-
|
|
253
|
-
// Resolve alternates
|
|
254
|
-
if (result.alternates) {
|
|
255
|
-
result.alternates = { ...result.alternates };
|
|
256
|
-
if (result.alternates.canonical && !isAbsoluteUrl(result.alternates.canonical)) {
|
|
257
|
-
result.alternates.canonical = resolveUrl(result.alternates.canonical, base);
|
|
258
|
-
}
|
|
259
|
-
if (result.alternates.languages) {
|
|
260
|
-
const langs: Record<string, string> = {};
|
|
261
|
-
for (const [lang, url] of Object.entries(result.alternates.languages)) {
|
|
262
|
-
langs[lang] = isAbsoluteUrl(url) ? url : resolveUrl(url, base);
|
|
263
|
-
}
|
|
264
|
-
result.alternates.languages = langs;
|
|
265
|
-
}
|
|
266
|
-
}
|
|
267
|
-
|
|
268
|
-
// Resolve icon URLs
|
|
269
|
-
if (result.icons) {
|
|
270
|
-
result.icons = { ...result.icons };
|
|
271
|
-
if (typeof result.icons.icon === 'string') {
|
|
272
|
-
result.icons.icon = resolveUrl(result.icons.icon, base);
|
|
273
|
-
} else if (Array.isArray(result.icons.icon)) {
|
|
274
|
-
result.icons.icon = result.icons.icon.map((i) => ({ ...i, url: resolveUrl(i.url, base) }));
|
|
275
|
-
}
|
|
276
|
-
if (typeof result.icons.apple === 'string') {
|
|
277
|
-
result.icons.apple = resolveUrl(result.icons.apple, base);
|
|
278
|
-
} else if (Array.isArray(result.icons.apple)) {
|
|
279
|
-
result.icons.apple = result.icons.apple.map((i) => ({ ...i, url: resolveUrl(i.url, base) }));
|
|
280
|
-
}
|
|
281
|
-
}
|
|
282
|
-
|
|
283
|
-
return result;
|
|
284
|
-
}
|
|
@@ -16,6 +16,7 @@ import { canonicalize } from './canonicalize.ts';
|
|
|
16
16
|
import { runProxy } from './proxy.ts';
|
|
17
17
|
import { runMiddlewareChain } from './middleware-runner.ts';
|
|
18
18
|
import { withTiming } from './server-timing.ts';
|
|
19
|
+
import { formatLinkHeader } from './early-hints.ts';
|
|
19
20
|
import {
|
|
20
21
|
applyRequestHeaderOverlay,
|
|
21
22
|
setMutableCookieContext,
|
|
@@ -123,20 +124,7 @@ export async function runMiddlewarePhase(
|
|
|
123
124
|
return requestCspNonce();
|
|
124
125
|
},
|
|
125
126
|
earlyHints: (hints) => {
|
|
126
|
-
for (const hint of hints)
|
|
127
|
-
// Match Cloudflare's cached Early Hints attribute order: `as` before `rel`.
|
|
128
|
-
// Cloudflare caches Link headers and re-emits them on subsequent 200s.
|
|
129
|
-
// If our order differs, the browser sees duplicate preloads and warns.
|
|
130
|
-
let value: string;
|
|
131
|
-
if (hint.as !== undefined) {
|
|
132
|
-
value = `<${hint.href}>; as=${hint.as}; rel=${hint.rel}`;
|
|
133
|
-
} else {
|
|
134
|
-
value = `<${hint.href}>; rel=${hint.rel}`;
|
|
135
|
-
}
|
|
136
|
-
if (hint.crossOrigin !== undefined) value += `; crossorigin=${hint.crossOrigin}`;
|
|
137
|
-
if (hint.fetchPriority !== undefined) value += `; fetchpriority=${hint.fetchPriority}`;
|
|
138
|
-
responseHeaders.append('Link', value);
|
|
139
|
-
}
|
|
127
|
+
for (const hint of hints) responseHeaders.append('Link', formatLinkHeader(hint));
|
|
140
128
|
},
|
|
141
129
|
};
|
|
142
130
|
|
|
@@ -19,10 +19,8 @@
|
|
|
19
19
|
|
|
20
20
|
import type { BuildManifest } from '../build-manifest.ts';
|
|
21
21
|
import {
|
|
22
|
-
buildCssLinkTags,
|
|
23
22
|
buildFontPreloadTags,
|
|
24
23
|
buildModulepreloadTags,
|
|
25
|
-
collectRouteCss,
|
|
26
24
|
collectRouteFonts,
|
|
27
25
|
collectRouteModulepreloads,
|
|
28
26
|
} from '../build-manifest.ts';
|
|
@@ -175,15 +173,15 @@ export async function renderRoute(
|
|
|
175
173
|
headHtml += buildFontPreloadTags(fontEntries);
|
|
176
174
|
}
|
|
177
175
|
|
|
178
|
-
//
|
|
179
|
-
//
|
|
180
|
-
//
|
|
181
|
-
//
|
|
182
|
-
//
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
176
|
+
// No <link rel="stylesheet"> is spliced here. @vitejs/plugin-rsc renders
|
|
177
|
+
// each server component module's CSS as a React <link precedence> element
|
|
178
|
+
// (client-reference CSS through preinit()), and Float hoists those to the
|
|
179
|
+
// top of <head>. Layouts and pages always render in the shell (timber has
|
|
180
|
+
// no loading.tsx boundary), so every segment's CSS is already there. A
|
|
181
|
+
// second, string-spliced tag for the same URL is invisible to Float and
|
|
182
|
+
// differs in CORS mode (no crossorigin), so the browser fetched the file
|
|
183
|
+
// twice. The 103 / Link preload (early-hints.ts) is what gets CSS loading
|
|
184
|
+
// before the HTML arrives.
|
|
187
185
|
|
|
188
186
|
// Skip modulepreload tags when client JavaScript is disabled — no JS to preload.
|
|
189
187
|
if (!clientJsDisabled) {
|