reroute-js 0.40.0 → 0.40.2

package/cli/bin.d.ts

@@ -1,8 +1,8 @@
 /**
- * reroute-js v0.40.0
+ * reroute-js v0.40.2
  *
  * @license MIT
- * @copyright 2025 stewones <hi@stewan.io>
+ * @copyright 2026 stewones <hi@stewan.io>
  * @see https://github.com/stewones/reroute
  *
  * Built with Bun <3

package/cli/bin.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v0.40.0
+ * reroute-js v0.40.2
  *
  * @license MIT
- * @copyright 2025 stewones <hi@stewan.io>
+ * @copyright 2026 stewones <hi@stewan.io>
  * @see https://github.com/stewones/reroute
  *
  * Built with Bun <3
@@ -48,7 +48,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "0.40.0";
+    return "0.40.2";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -66,7 +66,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "f262c0b";
+    return "00b2cc6";
   }
   return "dev";
 }
@@ -2083,6 +2083,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];
@@ -2142,9 +2158,7 @@ async function processLayoutForMetadata(layout, clientDir, isWatchMode, addHead,
     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));
     if (ssr) {
@@ -2160,8 +2174,7 @@ ${ssrHead}`);
 }
 async function extractLayoutMetadata(pathname, clientDir, cwd, isWatchMode, addHead, setLang) {
   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);
@@ -2198,9 +2211,7 @@ 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);
@@ -2269,9 +2280,7 @@ 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);
       const ssrHead = extractSSRHead(ssr);
@@ -4295,7 +4304,7 @@ async function discoverSSRDataRoutes2(cwd, staticRoutes, isWatchMode, baseUrl, s
   const bundledRoutes = globalThis.__REROUTE_ROUTES__;
   if (bundledRoutes && Array.isArray(bundledRoutes)) {
     for (const route of staticRoutes) {
-      if (sitemapConfig?.excludeDiscovery?.includes(route.pattern)) {
+      if (sitemapConfig?.excludeDiscovery?.some((excluded) => route.pattern.startsWith(excluded))) {
         continue;
       }
       const bundledRoute = bundledRoutes.find((r) => r?.pattern === route.pattern);
@@ -4320,7 +4329,7 @@ async function discoverSSRDataRoutes2(cwd, staticRoutes, isWatchMode, baseUrl, s
     }
   } else {
     for (const route of staticRoutes) {
-      if (sitemapConfig?.excludeDiscovery?.includes(route.pattern)) {
+      if (sitemapConfig?.excludeDiscovery?.some((excluded) => route.pattern.startsWith(excluded))) {
         continue;
       }
       try {
@@ -4728,7 +4737,7 @@ async function discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfi
     const { discoverRoutes: discoverRoutes2 } = await Promise.resolve().then(() => (init_discovery4(), exports_discovery));
     const { staticRoutes } = await discoverRoutes2(cwd, isWatchMode);
     for (const route of staticRoutes) {
-      if (rssConfig?.excludeDiscovery?.includes(route.pattern)) {
+      if (rssConfig?.excludeDiscovery?.some((excluded) => route.pattern.startsWith(excluded))) {
         continue;
       }
       const bundledRoute = bundledRoutes.find((r) => r?.pattern === route.pattern);
@@ -4755,7 +4764,7 @@ async function discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfi
     const { discoverRoutes: discoverRoutes2 } = await Promise.resolve().then(() => (init_discovery4(), exports_discovery));
     const { staticRoutes } = await discoverRoutes2(cwd, isWatchMode);
     for (const route of staticRoutes) {
-      if (rssConfig?.excludeDiscovery?.includes(route.pattern)) {
+      if (rssConfig?.excludeDiscovery?.some((excluded) => route.pattern.startsWith(excluded))) {
         continue;
       }
       const items = await discoverSSRDataFeedItems(cwd, route.pattern, route.path, isWatchMode, baseUrl, rssConfig);
@@ -105691,7 +105700,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "0.40.0";
+    return "0.40.2";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -105708,10 +105717,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "f262c0b";
+    return "00b2cc6";
   }
   return "dev";
 }
 main();
 
-//# debugId=5998D9F96883D01A64756E2164756E21
+//# debugId=D069AFC2D33D785364756E2164756E21