@timber-js/app 0.2.0-alpha.246 → 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/native/rsc/manifest.json +1 -0
- 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/ssr/manifest.json +1 -0
- 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/server/internal.d.ts +1 -1
- package/dist/server/internal.d.ts.map +1 -1
- package/dist/server/internal.js +84 -77
- 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/package.json +1 -1
- 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/dist/server/internal.js
CHANGED
|
@@ -3251,6 +3251,84 @@ function resolveLimit(kind, config) {
|
|
|
3251
3251
|
if (kind === "action") return userLimits?.actionBodySize ? parseBodySize(userLimits.actionBodySize) : DEFAULT_LIMITS.actionBodySize;
|
|
3252
3252
|
return userLimits?.uploadBodySize ? parseBodySize(userLimits.uploadBodySize) : DEFAULT_LIMITS.uploadBodySize;
|
|
3253
3253
|
}
|
|
3254
|
+
// src/server/metadata-urls.ts
|
|
3255
|
+
/**
|
|
3256
|
+
* Absolute means the browser would not resolve it against the page: any URL
|
|
3257
|
+
* with a scheme (`https:`, `data:`, `mailto:` …) or protocol-relative `//`.
|
|
3258
|
+
*/
|
|
3259
|
+
function isAbsoluteUrl(url) {
|
|
3260
|
+
return url.startsWith("//") || URL.canParse(url);
|
|
3261
|
+
}
|
|
3262
|
+
function resolveUrl(url, base) {
|
|
3263
|
+
return isAbsoluteUrl(url) ? url : new URL(url, base).toString();
|
|
3264
|
+
}
|
|
3265
|
+
function resolveEach(items, base) {
|
|
3266
|
+
return items.map((item) => ({
|
|
3267
|
+
...item,
|
|
3268
|
+
url: resolveUrl(item.url, base)
|
|
3269
|
+
}));
|
|
3270
|
+
}
|
|
3271
|
+
function resolveValues(record, base) {
|
|
3272
|
+
if (!record) return record;
|
|
3273
|
+
return Object.fromEntries(Object.entries(record).map(([k, url]) => [k, resolveUrl(url, base)]));
|
|
3274
|
+
}
|
|
3275
|
+
/**
|
|
3276
|
+
* Resolve relative URLs in metadata fields against metadataBase.
|
|
3277
|
+
*
|
|
3278
|
+
* Returns a new metadata object with URLs resolved. Absolute and
|
|
3279
|
+
* protocol-relative URLs are not modified. If metadataBase is not set,
|
|
3280
|
+
* returns the metadata unchanged.
|
|
3281
|
+
*/
|
|
3282
|
+
function resolveMetadataUrls(metadata) {
|
|
3283
|
+
const base = metadata.metadataBase;
|
|
3284
|
+
if (!base) return metadata;
|
|
3285
|
+
const result = { ...metadata };
|
|
3286
|
+
if (result.openGraph) {
|
|
3287
|
+
const og = { ...result.openGraph };
|
|
3288
|
+
const images = og.images;
|
|
3289
|
+
if (typeof images === "string") og.images = resolveUrl(images, base);
|
|
3290
|
+
else if (Array.isArray(images)) og.images = resolveEach(images, base);
|
|
3291
|
+
else if (images) og.images = {
|
|
3292
|
+
...images,
|
|
3293
|
+
url: resolveUrl(images.url, base)
|
|
3294
|
+
};
|
|
3295
|
+
if (og.url) og.url = resolveUrl(og.url, base);
|
|
3296
|
+
if (og.videos) og.videos = resolveEach(og.videos, base);
|
|
3297
|
+
if (og.audio) og.audio = resolveEach(og.audio, base);
|
|
3298
|
+
result.openGraph = og;
|
|
3299
|
+
}
|
|
3300
|
+
if (result.twitter) {
|
|
3301
|
+
const twitter = { ...result.twitter };
|
|
3302
|
+
const images = twitter.images;
|
|
3303
|
+
if (typeof images === "string") twitter.images = resolveUrl(images, base);
|
|
3304
|
+
else if (Array.isArray(images)) twitter.images = images.every((img) => typeof img === "string") ? images.map((img) => resolveUrl(img, base)) : resolveEach(images.filter((img) => typeof img !== "string"), base);
|
|
3305
|
+
else if (images) twitter.images = {
|
|
3306
|
+
...images,
|
|
3307
|
+
url: resolveUrl(images.url, base)
|
|
3308
|
+
};
|
|
3309
|
+
result.twitter = twitter;
|
|
3310
|
+
}
|
|
3311
|
+
if (result.alternates) {
|
|
3312
|
+
const alternates = { ...result.alternates };
|
|
3313
|
+
if (alternates.canonical) alternates.canonical = resolveUrl(alternates.canonical, base);
|
|
3314
|
+
alternates.languages = resolveValues(alternates.languages, base);
|
|
3315
|
+
alternates.media = resolveValues(alternates.media, base);
|
|
3316
|
+
alternates.types = resolveValues(alternates.types, base);
|
|
3317
|
+
result.alternates = alternates;
|
|
3318
|
+
}
|
|
3319
|
+
if (result.icons) {
|
|
3320
|
+
const icons = { ...result.icons };
|
|
3321
|
+
if (typeof icons.icon === "string") icons.icon = resolveUrl(icons.icon, base);
|
|
3322
|
+
else if (icons.icon) icons.icon = resolveEach(icons.icon, base);
|
|
3323
|
+
if (typeof icons.apple === "string") icons.apple = resolveUrl(icons.apple, base);
|
|
3324
|
+
else if (icons.apple) icons.apple = resolveEach(icons.apple, base);
|
|
3325
|
+
if (typeof icons.shortcut === "string") icons.shortcut = resolveUrl(icons.shortcut, base);
|
|
3326
|
+
else if (icons.shortcut) icons.shortcut = icons.shortcut.map((url) => resolveUrl(url, base));
|
|
3327
|
+
if (icons.other) icons.other = resolveEach(icons.other, base);
|
|
3328
|
+
result.icons = icons;
|
|
3329
|
+
}
|
|
3330
|
+
return result;
|
|
3331
|
+
}
|
|
3254
3332
|
// src/server/metadata-social.ts
|
|
3255
3333
|
/**
|
|
3256
3334
|
* Render Open Graph metadata into head element descriptors.
|
|
@@ -3686,8 +3764,12 @@ function renderItunes(itunes, elements) {
|
|
|
3686
3764
|
*
|
|
3687
3765
|
* The framework's MetadataResolver component consumes these descriptors
|
|
3688
3766
|
* and renders them into the <head>.
|
|
3767
|
+
*
|
|
3768
|
+
* Relative URLs resolve against `metadataBase` here, so every caller emits
|
|
3769
|
+
* absolute URLs (design/16-metadata.md §"metadataBase — URL Resolution").
|
|
3689
3770
|
*/
|
|
3690
|
-
function renderMetadataToElements(
|
|
3771
|
+
function renderMetadataToElements(declared) {
|
|
3772
|
+
const metadata = resolveMetadataUrls(declared);
|
|
3691
3773
|
const elements = [];
|
|
3692
3774
|
if (typeof metadata.title === "string") elements.push({
|
|
3693
3775
|
tag: "title",
|
|
@@ -3871,81 +3953,6 @@ function resolveMetadata(entries, options = {}) {
|
|
|
3871
3953
|
if (errorState) merged.robots = "noindex";
|
|
3872
3954
|
return merged;
|
|
3873
3955
|
}
|
|
3874
|
-
/**
|
|
3875
|
-
* Check if a string is an absolute URL.
|
|
3876
|
-
*/
|
|
3877
|
-
function isAbsoluteUrl(url) {
|
|
3878
|
-
return url.startsWith("http://") || url.startsWith("https://") || url.startsWith("//");
|
|
3879
|
-
}
|
|
3880
|
-
/**
|
|
3881
|
-
* Resolve a relative URL against a base URL.
|
|
3882
|
-
*/
|
|
3883
|
-
function resolveUrl(url, base) {
|
|
3884
|
-
if (isAbsoluteUrl(url)) return url;
|
|
3885
|
-
return new URL(url, base).toString();
|
|
3886
|
-
}
|
|
3887
|
-
/**
|
|
3888
|
-
* Resolve relative URLs in metadata fields against metadataBase.
|
|
3889
|
-
*
|
|
3890
|
-
* Returns a new metadata object with URLs resolved. Absolute URLs are not modified.
|
|
3891
|
-
* If metadataBase is not set, returns the metadata unchanged.
|
|
3892
|
-
*/
|
|
3893
|
-
function resolveMetadataUrls(metadata) {
|
|
3894
|
-
const base = metadata.metadataBase;
|
|
3895
|
-
if (!base) return metadata;
|
|
3896
|
-
const result = { ...metadata };
|
|
3897
|
-
if (result.openGraph) {
|
|
3898
|
-
result.openGraph = { ...result.openGraph };
|
|
3899
|
-
if (typeof result.openGraph.images === "string") result.openGraph.images = resolveUrl(result.openGraph.images, base);
|
|
3900
|
-
else if (Array.isArray(result.openGraph.images)) result.openGraph.images = result.openGraph.images.map((img) => ({
|
|
3901
|
-
...img,
|
|
3902
|
-
url: resolveUrl(img.url, base)
|
|
3903
|
-
}));
|
|
3904
|
-
else if (result.openGraph.images) result.openGraph.images = {
|
|
3905
|
-
...result.openGraph.images,
|
|
3906
|
-
url: resolveUrl(result.openGraph.images.url, base)
|
|
3907
|
-
};
|
|
3908
|
-
if (result.openGraph.url && !isAbsoluteUrl(result.openGraph.url)) result.openGraph.url = resolveUrl(result.openGraph.url, base);
|
|
3909
|
-
}
|
|
3910
|
-
if (result.twitter) {
|
|
3911
|
-
result.twitter = { ...result.twitter };
|
|
3912
|
-
if (typeof result.twitter.images === "string") result.twitter.images = resolveUrl(result.twitter.images, base);
|
|
3913
|
-
else if (Array.isArray(result.twitter.images)) {
|
|
3914
|
-
const resolved = result.twitter.images.map((img) => typeof img === "string" ? resolveUrl(img, base) : {
|
|
3915
|
-
...img,
|
|
3916
|
-
url: resolveUrl(img.url, base)
|
|
3917
|
-
});
|
|
3918
|
-
const allStrings = resolved.every((r) => typeof r === "string");
|
|
3919
|
-
result.twitter.images = allStrings ? resolved : resolved;
|
|
3920
|
-
} else if (result.twitter.images) result.twitter.images = {
|
|
3921
|
-
...result.twitter.images,
|
|
3922
|
-
url: resolveUrl(result.twitter.images.url, base)
|
|
3923
|
-
};
|
|
3924
|
-
}
|
|
3925
|
-
if (result.alternates) {
|
|
3926
|
-
result.alternates = { ...result.alternates };
|
|
3927
|
-
if (result.alternates.canonical && !isAbsoluteUrl(result.alternates.canonical)) result.alternates.canonical = resolveUrl(result.alternates.canonical, base);
|
|
3928
|
-
if (result.alternates.languages) {
|
|
3929
|
-
const langs = {};
|
|
3930
|
-
for (const [lang, url] of Object.entries(result.alternates.languages)) langs[lang] = isAbsoluteUrl(url) ? url : resolveUrl(url, base);
|
|
3931
|
-
result.alternates.languages = langs;
|
|
3932
|
-
}
|
|
3933
|
-
}
|
|
3934
|
-
if (result.icons) {
|
|
3935
|
-
result.icons = { ...result.icons };
|
|
3936
|
-
if (typeof result.icons.icon === "string") result.icons.icon = resolveUrl(result.icons.icon, base);
|
|
3937
|
-
else if (Array.isArray(result.icons.icon)) result.icons.icon = result.icons.icon.map((i) => ({
|
|
3938
|
-
...i,
|
|
3939
|
-
url: resolveUrl(i.url, base)
|
|
3940
|
-
}));
|
|
3941
|
-
if (typeof result.icons.apple === "string") result.icons.apple = resolveUrl(result.icons.apple, base);
|
|
3942
|
-
else if (Array.isArray(result.icons.apple)) result.icons.apple = result.icons.apple.map((i) => ({
|
|
3943
|
-
...i,
|
|
3944
|
-
url: resolveUrl(i.url, base)
|
|
3945
|
-
}));
|
|
3946
|
-
}
|
|
3947
|
-
return result;
|
|
3948
|
-
}
|
|
3949
3956
|
// src/server/prebuilt/cache-key.ts
|
|
3950
3957
|
/**
|
|
3951
3958
|
* Component cache-key hashing for prebuilt (cache.component) entries.
|
|
@@ -5193,6 +5200,6 @@ function getPrebuiltRegistration(id) {
|
|
|
5193
5200
|
function getPrebuiltRegistry() {
|
|
5194
5201
|
return registry;
|
|
5195
5202
|
}
|
|
5196
|
-
export { AccessGate, DEFAULT_LIMITS, DenySignal, METADATA_ROUTE_CONVENTIONS, RedirectSignal, RenderTimeoutError, SlotAccessGate, __prebuilt, callOnRequestError, canonicalize, classifyMetadataRoute, coerce, collectEarlyHintHeaders, computeComponentCacheKey, createPipeline, enforceBodyLimits, executeAction, formatLinkHeader, generateTraceId, getCookie, getHeader, getLogger, getMetadataRouteAutoLink, getMetadataRouteServePath, getPrebuiltRegistration, getPrebuiltRegistry, getSearchParams, getSegmentParams, getSetCookieHeaders, handleRouteRequest, hasOnRequestError, hasPrebuiltPayloadSource, loadInstrumentation, logCacheMiss, logMiddlewareError, logMiddlewareShortCircuit, logProxyError, logRenderError, logRequestCompleted, logRequestReceived, logSlowRequest, logSwrRefetchFailed, logWaitUntilRejected, logWaitUntilUnsupported, markResponseFlushed, parseBodySize, renderMetadataToElements, replaceTraceId, resolveAllowedMethods, resolveMetadata,
|
|
5203
|
+
export { AccessGate, DEFAULT_LIMITS, DenySignal, METADATA_ROUTE_CONVENTIONS, RedirectSignal, RenderTimeoutError, SlotAccessGate, __prebuilt, callOnRequestError, canonicalize, classifyMetadataRoute, coerce, collectEarlyHintHeaders, computeComponentCacheKey, createPipeline, enforceBodyLimits, executeAction, formatLinkHeader, generateTraceId, getCookie, getHeader, getLogger, getMetadataRouteAutoLink, getMetadataRouteServePath, getPrebuiltRegistration, getPrebuiltRegistry, getSearchParams, getSegmentParams, getSetCookieHeaders, handleRouteRequest, hasOnRequestError, hasPrebuiltPayloadSource, loadInstrumentation, logCacheMiss, logMiddlewareError, logMiddlewareShortCircuit, logProxyError, logRenderError, logRequestCompleted, logRequestReceived, logSlowRequest, logSwrRefetchFailed, logWaitUntilRejected, logWaitUntilUnsupported, markResponseFlushed, parseBodySize, renderMetadataToElements, replaceTraceId, resolveAllowedMethods, resolveMetadata, resolveSlotDenied, resolveStatusFile, resolveTitle, runMiddleware, runProxy, runWithEarlyHintsSender, runWithRequestContext, runWithTraceId, sendEarlyHints103, setLogger, setMutableCookieContext, setPrebuiltPayloadSource, setSegmentParams };
|
|
5197
5204
|
|
|
5198
5205
|
//# sourceMappingURL=internal.js.map
|