reroute-js 0.40.1 → 0.41.0

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.40.1
+ * reroute-js v0.41.0
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>

package/cli/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v0.40.1
+ * reroute-js v0.41.0
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -48,7 +48,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "0.40.1";
+    return "0.41.0";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -66,7 +66,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "3de1ba2";
+    return "fdadb6d";
   }
   return "dev";
 }
@@ -475,7 +475,7 @@ async function getContentMeta(absPath, isWatchMode) {
     }
   }
 }
-function buildHeadFromMeta(meta) {
+function buildHeadFromMeta(meta, ogConfig) {
   if (!meta || typeof meta !== "object")
     return "";
   const parts = [];
@@ -485,6 +485,23 @@ function buildHeadFromMeta(meta) {
     parts.push(`<title>${escapeHtml(title)}</title>`);
   if (description)
     parts.push(`<meta name="description" content="${escapeHtml(description)}" />`);
+  const ogType = typeof meta.ogType === "string" ? meta.ogType : ogConfig?.defaultType || "website";
+  parts.push(`<meta property="og:type" content="${escapeHtml(ogType)}" />`);
+  if (title) {
+    parts.push(`<meta property="og:title" content="${escapeHtml(title)}" />`);
+  }
+  const finalDescription = description || ogConfig?.siteDescription;
+  if (finalDescription) {
+    parts.push(`<meta property="og:description" content="${escapeHtml(finalDescription)}" />`);
+  }
+  const twitterCard = ogConfig?.twitterCard || "summary_large_image";
+  parts.push(`<meta name="twitter:card" content="${twitterCard}" />`);
+  if (title) {
+    parts.push(`<meta name="twitter:title" content="${escapeHtml(title)}" />`);
+  }
+  if (finalDescription) {
+    parts.push(`<meta name="twitter:description" content="${escapeHtml(finalDescription)}" />`);
+  }
   return parts.length ? `
 ${parts.join(`
 `)}` : "";
@@ -1947,6 +1964,28 @@ function removeDefaultMetaTags(templateHtml) {
   } catch {}
   return result;
 }
+function removeOverriddenMetaTags(templateHtml, injectedHead) {
+  let result = templateHtml;
+  try {
+    const injectedOgProps = [
+      ...injectedHead.matchAll(/<meta\s+property\s*=\s*['"]([^'"]+)['"][^>]*>/gi)
+    ].map((m) => m[1].toLowerCase());
+    const injectedNameMetas = [
+      ...injectedHead.matchAll(/<meta\s+name\s*=\s*['"]([^'"]+)['"][^>]*>/gi)
+    ].map((m) => m[1].toLowerCase());
+    for (const prop of injectedOgProps) {
+      const escapedProp = prop.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const regex = new RegExp(`<meta\\s+property\\s*=\\s*['"]${escapedProp}['"][^>]*>`, "gi");
+      result = result.replace(regex, "");
+    }
+    for (const name of injectedNameMetas) {
+      const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const regex = new RegExp(`<meta\\s+name\\s*=\\s*['"]${escapedName}['"][^>]*>`, "gi");
+      result = result.replace(regex, "");
+    }
+  } catch {}
+  return result;
+}
 function deduplicateHeadContent(templateHtml, headToInject) {
   let cleanedTemplate = templateHtml;
   let cleanedHead = headToInject;
@@ -1957,6 +1996,7 @@ function deduplicateHeadContent(templateHtml, headToInject) {
     } else if (/<meta\s+name\s*=\s*['"]description['"][^>]*>/i.test(cleanedHead)) {
       cleanedTemplate = cleanedTemplate.replace(/<meta\s+name\s*=\s*['"]description['"][^>]*>/i, "");
     }
+    cleanedTemplate = removeOverriddenMetaTags(cleanedTemplate, cleanedHead);
   } catch {}
   return { cleanedTemplate, cleanedHead };
 }
@@ -2075,7 +2115,6 @@ async function generateOGImageMetaTags(pathname, clientDir, ogConfig) {
   return `<meta property="og:image" content="${ogImagePath}" />
 <meta property="og:image:width" content="${width}" />
 <meta property="og:image:height" content="${height}" />
-<meta name="twitter:card" content="summary_large_image" />
 <meta name="twitter:image" content="${ogImagePath}" />`;
 }
 var init_meta = __esm(() => {
@@ -2083,6 +2122,22 @@ var init_meta = __esm(() => {
 });
 
 // packages/core/src/ssr/lib/metadata.ts
+async function loadModuleMetaAndSSR(moduleObj, absolutePath, isWatchMode) {
+  const bundledMeta = moduleObj?.meta;
+  const bundledSSR = moduleObj?.ssr;
+  if (bundledMeta !== undefined || bundledSSR !== undefined) {
+    return { meta: bundledMeta, ssr: bundledSSR };
+  }
+  try {
+    const mod = await dynamicImport(absolutePath, isWatchMode);
+    return {
+      meta: mod?.meta,
+      ssr: mod?.ssr
+    };
+  } catch {
+    return {};
+  }
+}
 function generateCanonicalUrl(baseUrl, pathname) {
   const cleanBaseUrl = baseUrl.replace(/\/$/, "");
   const cleanPathname = pathname.split("?")[0];
@@ -2097,7 +2152,25 @@ function generateOgUrl(baseUrl, pathname) {
   const ogUrl = `${cleanBaseUrl}${normalizedPath}`;
   return `<meta property="og:url" content="${ogUrl}" />`;
 }
-async function extractPageMetadata(pathname, clientDir, cwd, isWatchMode, currentStatusOverride, ogConfig, baseUrl, autoCanonical, ssrData) {
+function generateGlobalOGTags(ogConfig) {
+  const tags = [];
+  if (ogConfig.siteName) {
+    tags.push(`<meta property="og:site_name" content="${escapeHtml2(ogConfig.siteName)}" />`);
+  }
+  if (ogConfig.locale) {
+    tags.push(`<meta property="og:locale" content="${escapeHtml2(ogConfig.locale)}" />`);
+  }
+  if (ogConfig.twitterSite) {
+    const handle = ogConfig.twitterSite.startsWith("@") ? ogConfig.twitterSite : `@${ogConfig.twitterSite}`;
+    tags.push(`<meta name="twitter:site" content="${escapeHtml2(handle)}" />`);
+  }
+  return tags.length ? tags.join(`
+`) : "";
+}
+function escapeHtml2(input) {
+  return input.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+}
+async function extractPageMetadata(pathname, clientDir, cwd, isWatchMode, currentStatusOverride, ogImageConfig, ogConfig, baseUrl, autoCanonical, ssrData) {
   let perPageHead = "";
   let pageLang;
   let statusOverride = currentStatusOverride;
@@ -2106,7 +2179,7 @@ async function extractPageMetadata(pathname, clientDir, cwd, isWatchMode, curren
   }, (lang) => {
     if (!pageLang)
       pageLang = lang;
-  });
+  }, ogConfig);
   const shouldGenerateCanonical = autoCanonical !== false && baseUrl !== undefined;
   if (shouldGenerateCanonical) {
     const canonicalTag = generateCanonicalUrl(baseUrl, pathname);
@@ -2116,8 +2189,15 @@ ${canonicalTag}`;
     perPageHead += `
 ${ogUrlTag}`;
   }
+  if (ogConfig) {
+    const ogGlobalTags = generateGlobalOGTags(ogConfig);
+    if (ogGlobalTags) {
+      perPageHead += `
+${ogGlobalTags}`;
+    }
+  }
   try {
-    const ogMetaTags = await generateOGImageMetaTags(pathname, clientDir, ogConfig);
+    const ogMetaTags = await generateOGImageMetaTags(pathname, clientDir, ogImageConfig);
     if (ogMetaTags) {
       perPageHead += `
 ${ogMetaTags}`;
@@ -2129,24 +2209,22 @@ ${ogMetaTags}`;
     perPageHead += head;
   }, (lang) => {
     pageLang = lang;
-  });
-  const routeResult = await extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ssrData);
+  }, ogConfig);
+  const routeResult = await extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ssrData, ogConfig);
   perPageHead += routeResult.head;
   if (routeResult.lang)
     pageLang = routeResult.lang;
   statusOverride = routeResult.statusOverride;
   return { perPageHead, pageLang, statusOverride };
 }
-async function processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang) {
+async function processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang, ogConfig) {
   if (typeof layout?.path !== "string")
     return;
   try {
     const abs = join2(clientDir, "routes", String(layout.path));
-    const mod = await dynamicImport(abs, isWatchMode);
-    const meta = mod?.meta;
-    const ssr = mod?.ssr;
+    const { meta, ssr } = await loadModuleMetaAndSSR(layout, abs, isWatchMode);
     if (meta)
-      addHead(buildHeadFromMeta(meta));
+      addHead(buildHeadFromMeta(meta, ogConfig));
     if (ssr) {
       const ssrHead = extractSSRHead(ssr);
       if (ssrHead)
@@ -2158,17 +2236,16 @@ ${ssrHead}`);
     }
   } catch {}
 }
-async function extractLayoutMetadata(pathname, clientDir, cwd, isWatchMode, addHead, setLang) {
+async function extractLayoutMetadata(pathname, clientDir, cwd, isWatchMode, addHead, setLang, ogConfig) {
   try {
-    const routesPath = join2(cwd, ".reroute", "routes.ts");
-    const m = await dynamicImport(routesPath, isWatchMode);
+    const m = await loadRoutesModule(cwd, isWatchMode);
     const matchingLayouts = getMatchingLayouts(pathname, m?.layouts);
     for (const layout of matchingLayouts) {
-      await processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang);
+      await processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang, ogConfig);
     }
   } catch {}
 }
-function extractContentMetadata(pathname, addHead, setLang) {
+function extractContentMetadata(pathname, addHead, setLang, ogConfig) {
   try {
     const parts = pathname.split("/").filter(Boolean);
     if (parts.length < 2)
@@ -2178,7 +2255,7 @@ function extractContentMetadata(pathname, addHead, setLang) {
     const exp = g.__REROUTE_SSR_EXPORTS__?.[key];
     const meta = exp?.meta;
     const ssr = exp?.ssr;
-    addHead(buildHeadFromMeta(meta));
+    addHead(buildHeadFromMeta(meta, ogConfig));
     const ssrHead = extractSSRHead(ssr);
     if (ssrHead)
       addHead(`
@@ -2188,7 +2265,7 @@ ${ssrHead}`);
       setLang(lang);
   } catch {}
 }
-async function extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode, statusOverride, ssrData) {
+async function extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode, statusOverride, ssrData, ogConfig) {
   const pathnameOnly = pathname.split("?")[0];
   const match = typeof m.matchRoute === "function" ? m.matchRoute(pathnameOnly) : null;
   const r = match?.route;
@@ -2198,12 +2275,10 @@ async function extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode,
   if (r && typeof r.path === "string") {
     try {
       const abs = join2(clientDir, "routes", String(r.path));
-      const mod = await dynamicImport(abs, isWatchMode);
-      const meta = mod?.meta;
-      const ssr = mod?.ssr;
+      const { meta, ssr } = await loadModuleMetaAndSSR(r, abs, isWatchMode);
       let head = "";
       if (meta)
-        head += buildHeadFromMeta(meta);
+        head += buildHeadFromMeta(meta, ogConfig);
       if (ssr) {
         const routeData = ssrData && typeof ssrData === "object" ? ssrData[pathname] : undefined;
         const ssrHead = extractSSRHead(ssr, routeData);
@@ -2217,7 +2292,7 @@ ${ssrHead}`;
   }
   return { head: "", statusOverride };
 }
-async function extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, currentStatusOverride, ssrData) {
+async function extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, currentStatusOverride, ssrData, ogConfig) {
   let head = "";
   let lang;
   let statusOverride = currentStatusOverride;
@@ -2233,14 +2308,14 @@ async function extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, curre
       statusOverride = statusOverride || 404;
     }
     if (r && typeof r.path === "string") {
-      const result = await extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode, statusOverride, ssrData);
+      const result = await extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode, statusOverride, ssrData, ogConfig);
       head = result.head;
       lang = result.lang;
       statusOverride = result.statusOverride;
     } else {
       head += await extractNotFoundMetadata(pathname, clientDir, m, isWatchMode, (l) => {
         lang = l;
-      });
+      }, ogConfig);
     }
   } catch {}
   return { head, lang, statusOverride };
@@ -2260,7 +2335,7 @@ function findBestNotFoundRoute(list, pathname) {
   }
   return chosen;
 }
-async function extractNotFoundMetadata(pathname, clientDir, routesModule, isWatchMode, setLang) {
+async function extractNotFoundMetadata(pathname, clientDir, routesModule, isWatchMode, setLang, ogConfig) {
   let head = "";
   try {
     const list = routesModule?.notFoundRoutes;
@@ -2269,11 +2344,9 @@ async function extractNotFoundMetadata(pathname, clientDir, routesModule, isWatc
     const chosen = findBestNotFoundRoute(list, pathname);
     if (chosen && typeof chosen.path === "string") {
       const abs = join2(clientDir, "routes", String(chosen.path));
-      const mod = await dynamicImport(abs, isWatchMode);
-      const meta = mod?.meta;
-      const ssr = mod?.ssr;
+      const { meta, ssr } = await loadModuleMetaAndSSR(chosen, abs, isWatchMode);
       if (meta)
-        head += buildHeadFromMeta(meta);
+        head += buildHeadFromMeta(meta, ogConfig);
       const ssrHead = extractSSRHead(ssr);
       if (ssrHead)
         head += `
@@ -2860,7 +2933,7 @@ async function performSSRSetupInternal(options, streaming) {
     statusOverride = computeResult.statusContainer.value;
   }
   const metadataResult = await withSpan("ssr.extract.metadata", async (span) => {
-    const result = await extractPageMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ogConfig, options.baseUrl, options.autoCanonical, computeResult.data);
+    const result = await extractPageMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ogConfig, options.ogMetaConfig, options.baseUrl, options.autoCanonical, computeResult.data);
     span.setAttributes({
       "reroute.pathname": pathname,
       "reroute.metadata.exists": !!result.perPageHead
@@ -3030,6 +3103,7 @@ async function renderSSRDocument(options) {
     maxAge,
     searchParams,
     ogConfig,
+    ogMetaConfig: options.ogMetaConfig,
     baseUrl: options.baseUrl,
     autoCanonical: options.autoCanonical,
     cachedCollections: options.cachedCollections,
@@ -5140,6 +5214,7 @@ async function renderSSRDocumentStream(options) {
     maxAge,
     searchParams,
     ogConfig,
+    ogMetaConfig: options.ogMetaConfig,
     baseUrl: options.baseUrl,
     autoCanonical: options.autoCanonical,
     cachedCollections: options.cachedCollections,
@@ -5174,7 +5249,11 @@ async function renderSSRDocumentStream(options) {
     };
   });
   const pageLang = setup2.metadataResult.pageLang || lang;
-  let headWithLang = htmlHead.replace(/<html([^>]*)>/i, `<html$1 lang="${pageLang}">`);
+  let headWithLang = htmlHead.replace(/<html([^>]*)>/i, (_m, attrs) => {
+    const hasLang = /(^|\s)lang\s*=/.test(attrs);
+    const newAttrs = hasLang ? attrs.replace(/lang\s*=\s*("[^"]*"|'[^']*'|[^\s>]+)/i, `lang="${pageLang}"`) : `${attrs} lang="${pageLang}"`;
+    return `<html${newAttrs}>`;
+  });
   const extraHead = setup2.bundlePreload + setup2.preloadExtraHead + setup2.metadataResult.perPageHead;
   if (/<title[\s\S]*?<\/title>/i.test(extraHead)) {
     headWithLang = headWithLang.replace(/<title[\s\S]*?<\/title>/i, "");
@@ -5182,6 +5261,7 @@ async function renderSSRDocumentStream(options) {
   if (/<meta\s+name\s*=\s*['"]description['"][^>]*>/i.test(extraHead)) {
     headWithLang = headWithLang.replace(/<meta\s+name\s*=\s*['"]description['"][^>]*>/i, "");
   }
+  headWithLang = removeOverriddenMetaTags(headWithLang, extraHead);
   const config = await loadConfig(cwd);
   const browserTelemetryConfigRaw = config.telemetry?.browser;
   const { serializeBrowserTelemetryConfig: serializeBrowserTelemetryConfig2 } = await Promise.resolve().then(() => exports_serialize);
@@ -5230,7 +5310,7 @@ async function streamSSRContent(writer, encoder, ctx) {
     try {
       const combinedHead = deduplicateMetaTags([ctx.inlineStyleTag, ctx.head, ctx.extraHead].filter(Boolean).join(`
 `));
-      const headWithLangAndContent = ctx.headWithLang.replace(/<html([^>]*)>/i, `<html$1 lang="${ctx.pageLang}">`).replace(/<\/head>/i, `${combinedHead ? `${combinedHead}
+      const headWithLangAndContent = ctx.headWithLang.replace(/<\/head>/i, `${combinedHead ? `${combinedHead}
 ` : ""}</head>`);
       const headContent = `${headWithLangAndContent}`;
       await writer.write(encoder.encode(headContent));
@@ -5370,6 +5450,7 @@ __export(exports_core, {
   renderSSRDocumentStream: () => renderSSRDocumentStream,
   renderSSRDocument: () => renderSSRDocument,
   renderOGImageToPNG: () => renderOGImageToPNG,
+  removeOverriddenMetaTags: () => removeOverriddenMetaTags,
   processCollections: () => processCollections,
   preloadContentModule: () => preloadContentModule,
   performSSRSetup: () => performSSRSetup,
@@ -105691,7 +105772,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "0.40.1";
+    return "0.41.0";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -105708,10 +105789,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "3de1ba2";
+    return "fdadb6d";
   }
   return "dev";
 }
 main();
 
-//# debugId=B438EB8A747E943564756E2164756E21
+//# debugId=E4248FFA7E75804564756E2164756E21