@nuxtjs/sitemap 8.3.3 → 8.4.0

package/dist/devtools/nuxt.config.ts

@@ -1,7 +1,10 @@
+import { fileURLToPath } from 'node:url'
 import { resolve } from 'pathe'
 
+const currentDir = fileURLToPath(new URL('.', import.meta.url))
+
 // Nuxt SEO devtools panel, shipped as a layer (Model C). Components flat-registered
 // so intra-panel references resolve by name.
 export default defineNuxtConfig({
-  components: [{ path: resolve(__dirname, './components'), pathPrefix: false }],
+  components: [{ path: resolve(currentDir, './components'), pathPrefix: false }],
 })

package/dist/module.json

@@ -4,7 +4,7 @@
     "nuxt": ">=3.9.0"
   },
   "configKey": "sitemap",
-  "version": "8.3.3",
+  "version": "8.4.0",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -2,22 +2,25 @@ import { useNuxt, hasNuxtModule, addTypeTemplate, addTemplate, defineNuxtModule,
 import { defu } from 'defu';
 import { withSiteUrl, installNuxtSiteConfig } from 'nuxt-site-config/kit';
 import { isPathFile } from 'nuxt-site-config/urls';
-import { isNuxtGenerate, renderNitroTypeAugmentations, useModuleLogger, setupNitroRuntimeCompatibility, getNuxtModuleOptions, resolveNitroPreset, resolveNuxtContentVersion, createPagesPromise, createNitroPromise } from 'nuxtseo-shared/kit';
+import { isNuxtGenerate, renderNitroTypeAugmentations, useModuleLogger, setupNitroRuntimeCompatibility, getNuxtModuleOptions, resolveNitroPreset, resolveContentProvider, setupContentRuntime, createPagesPromise, createNitroPromise } from 'nuxtseo-shared/kit';
 import { serializeFilters } from 'nuxtseo-shared/utils';
 import { dirname, extname } from 'pathe';
 import { readPackageJSON } from 'pkg-types';
-import { withBase, withHttps, withTrailingSlash, withoutLeadingSlash, joinURL, withLeadingSlash, withoutTrailingSlash } from 'ufo';
+import { withBase, withHttps, withTrailingSlash, withoutLeadingSlash, joinURL, withLeadingSlash } from 'ufo';
 import { setupDevToolsUI as setupDevToolsUI$1 } from 'nuxtseo-shared/devtools';
 import { readFileSync, statSync } from 'node:fs';
-import { mkdir, writeFile } from 'node:fs/promises';
+import { rm, mkdir, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { colors } from 'consola/utils';
 import { splitForLocales, createPathFilter } from '../dist/runtime/utils-pure.js';
 import { p as parseHtmlExtractSitemapMeta } from './shared/sitemap.BoMnWHOt.mjs';
 import { normaliseDate } from '../dist/runtime/server/sitemap/urlset/normalise.js';
-import { splitPathForI18nLocales as splitPathForI18nLocales$1, expandCompactLocaleRoute, normalizeLocales, generatePathForI18nPages } from 'nuxtseo-shared/i18n';
+import { mapPathForI18nPages, splitPathForI18nLocales as splitPathForI18nLocales$1, expandCompactLocaleRoute, normalizeLocales, generatePathForI18nPages } from 'nuxtseo-shared/i18n';
 import 'ultrahtml';
 
+const COMARK_CONTENT_SOURCE = "@harlan-zw/comark-content:urls";
+const COMARK_CONTENT_SITEMAP_ROUTE = "/__sitemap__/comark-content-urls.json";
+
 function setupDevToolsUI(_options, resolve, nuxt = useNuxt()) {
   setupDevToolsUI$1(
     { route: "/__nuxt-sitemap", name: "sitemap", title: "Sitemap", icon: "carbon:load-balancer-application" },
@@ -72,6 +75,10 @@ export async function readSourcesFromFilesystem(filename) {
 `;
   });
   nuxt.hooks.hook("nitro:init", async (nitro) => {
+    await Promise.all([
+      rm(join(runtimeAssetsPath, "global-sources.json"), { force: true }),
+      rm(join(runtimeAssetsPath, "child-sources.json"), { force: true })
+    ]);
     nitro.hooks.hook("prerender:generate", async (route) => {
       const html = route.contents;
       if (!route.fileName?.endsWith(".html") || !html || ["/200.html", "/404.html"].includes(route.route))
@@ -260,6 +267,33 @@ function splitPathForI18nLocales(path, autoI18n) {
     return path;
   return splitPathForI18nLocales$1(path, autoI18n);
 }
+function uniquePaths(paths) {
+  return [...new Set(paths)];
+}
+function resolveI18nFilterPaths(path, autoI18n) {
+  if (typeof path !== "string")
+    return [path];
+  const mappedPaths = mapPathForI18nPages(path, autoI18n);
+  if (mappedPaths === false) {
+    if (autoI18n.strategy === "no_prefix")
+      return [path];
+    const splitPaths = splitPathForI18nLocales$1(path, autoI18n);
+    return Array.isArray(splitPaths) ? splitPaths : [splitPaths];
+  }
+  if (autoI18n.strategy === "prefix" || autoI18n.strategy === "no_prefix")
+    return uniquePaths(mappedPaths);
+  const defaultLocales = autoI18n.locales.filter((locale) => locale.code === autoI18n.defaultLocale);
+  const defaultStrategy = autoI18n.strategy === "prefix_and_default" ? "prefix" : "no_prefix";
+  const defaultPaths = mapPathForI18nPages(path, {
+    ...autoI18n,
+    locales: defaultLocales,
+    strategy: defaultStrategy
+  });
+  return uniquePaths([
+    ...defaultPaths || [path],
+    ...mappedPaths
+  ]);
+}
 
 async function resolveUrls(urls, ctx) {
   try {
@@ -428,7 +462,34 @@ function generateExtraRoutesFromNuxtConfig(nuxt = useNuxt()) {
   }).map(([k]) => k).filter(filterForValidPage);
   return { routeRules };
 }
+function resolveExcludedAppSources(resolved, authored) {
+  if (resolved === true || authored === true)
+    return true;
+  if (!Array.isArray(authored))
+    return resolved;
+  const excluded = [...resolved];
+  for (const source of authored) {
+    if (typeof source === "string" && !excluded.includes(source))
+      excluded.push(source);
+  }
+  return excluded;
+}
 
+const IMAGE_TAGS = /* @__PURE__ */ new Set(["image", "img", "nuxtimg", "nuxt-img"]);
+function discoverContentImages(body) {
+  const images = [];
+  const walk = (nodes) => {
+    for (const node of nodes || []) {
+      if (!Array.isArray(node) || typeof node[0] !== "string")
+        continue;
+      if (IMAGE_TAGS.has(node[0]) && node[1]?.src)
+        images.push({ loc: node[1].src });
+      walk(node.slice(2));
+    }
+  };
+  walk(body?.value ?? body?.nodes);
+  return images;
+}
 const module$1 = defineNuxtModule({
   meta: {
     name: "@nuxtjs/sitemap",
@@ -453,6 +514,10 @@ const module$1 = defineNuxtModule({
       version: ">=2",
       optional: true
     },
+    "@harlan-zw/comark-content": {
+      version: ">=0.1.2",
+      optional: true
+    },
     "@nuxtjs/robots": {
       version: ">=4",
       optional: true
@@ -646,11 +711,11 @@ const module$1 = defineNuxtModule({
         const hasCustomI18nSitemaps = i18nSitemaps.length > 0;
         if (hasCustomI18nSitemaps) {
           for (const { name: name2, cfg } of i18nSitemaps) {
+            const { sitemapName: _sitemapName, _route, _isChunking, _chunkSize, _chunkCount, ...inheritedConfig } = cfg;
             for (const locale of resolvedAutoI18n.locales) {
               newSitemaps[`${locale._sitemap}-${name2}`] = {
-                includeAppSources: true,
-                ...cfg.exclude?.length && { exclude: cfg.exclude },
-                ...cfg.include?.length && { include: cfg.include }
+                ...inheritedConfig,
+                includeAppSources: true
               };
             }
           }
@@ -743,20 +808,13 @@ const module$1 = defineNuxtModule({
         addServerPlugin(resolve("./runtime/server/plugins/stream-transport"));
     }
     const isNuxtContentDocumentDriven = !!nuxt.options.content?.documentDriven || config.strictNuxtContentPaths;
-    const contentVersion = await resolveNuxtContentVersion();
-    const isNuxtContentV3 = contentVersion && contentVersion.version === 3;
+    const contentProvider = await resolveContentProvider(nuxt);
+    const isNuxtContentV3 = contentProvider._tag === "NuxtContent" && contentProvider.version === 3;
+    const isNuxtContentV2 = contentProvider._tag === "NuxtContent" && contentProvider.version === 2;
+    const isComarkContent = contentProvider._tag === "Comark";
     const nuxtV3Collections = /* @__PURE__ */ new Set();
-    const isNuxtContentV2 = contentVersion && contentVersion.version === 2;
-    if (isNuxtContentV3) {
-      if (nuxt.options._installedModules.some((m) => m.meta.name === "Content")) {
-        logger.warn("You have loaded `@nuxt/content` before `@nuxtjs/sitemap`, this may cause issues with the integration. Please ensure `@nuxtjs/sitemap` is loaded first.");
-      }
-      config.exclude.push("/__nuxt_content/**");
-      const needsCustomAlias = await hasNuxtModuleCompatibility("@nuxt/content", "<3.6.0");
-      if (needsCustomAlias) {
-        nuxt.options.alias["#sitemap/content-v3-nitro-path"] = resolve(dirname(resolveModule("@nuxt/content")), "runtime/nitro");
-        nuxt.options.alias["@nuxt/content/nitro"] = resolve("./runtime/server/content-compat");
-      }
+    setupContentRuntime(contentProvider, nuxt);
+    const registerContentSitemapHook = (options) => {
       nuxt.hooks.hook("content:file:afterParse", (ctx) => {
         try {
           const content = ctx.content;
@@ -765,7 +823,7 @@ const module$1 = defineNuxtModule({
             ctx.content.sitemap = null;
             return;
           }
-          if (!ctx.collection.fields || !("sitemap" in ctx.collection.fields)) {
+          if (options.requireCollectionField && (!ctx.collection.fields || !("sitemap" in ctx.collection.fields))) {
             ctx.content.sitemap = null;
             return;
           }
@@ -778,13 +836,8 @@ const module$1 = defineNuxtModule({
             return;
           }
           const images = [];
-          if (config.discoverImages) {
-            images.push(
-              ...content.body?.value?.filter(
-                (c) => ["image", "img", "nuxtimg", "nuxt-img"].includes(c[0])
-              ).filter((c) => c[1]?.src).map((c) => ({ loc: c[1].src })) || []
-            );
-          }
+          if (config.discoverImages)
+            images.push(...discoverContentImages(content.body));
           const lastmod = content.seo?.articleModifiedTime || content.updatedAt;
           const defaults = {
             loc: content.path
@@ -798,6 +851,8 @@ const module$1 = defineNuxtModule({
           logger.warn(`Failed to process sitemap data for content file (collection: ${ctx.collection?.name}, path: ${ctx.content?.path}), skipping.`, e);
         }
       });
+    };
+    const addContentCallbackVirtuals = () => {
       nuxt.hook("nitro:config", (nitroConfig) => {
         const filterEntries = [];
         if (globalThis.__sitemapCollectionFilters) {
@@ -815,9 +870,22 @@ ${filterEntries.join("\n")}`;
         nitroConfig.virtual["#sitemap/content-on-url"] = `export const onUrlFns = new Map()
 ${onUrlEntries.join("\n")}`;
       });
+    };
+    if (isNuxtContentV3) {
+      if (nuxt.options._installedModules.some((m) => m.meta.name === "Content")) {
+        logger.warn("You have loaded `@nuxt/content` before `@nuxtjs/sitemap`, this may cause issues with the integration. Please ensure `@nuxtjs/sitemap` is loaded first.");
+      }
+      config.exclude.push("/__nuxt_content/**");
+      const needsCustomAlias = await hasNuxtModuleCompatibility("@nuxt/content", "<3.6.0");
+      if (needsCustomAlias) {
+        nuxt.options.alias["#sitemap/content-v3-nitro-path"] = resolve(dirname(resolveModule("@nuxt/content")), "runtime/nitro");
+        nuxt.options.alias["@nuxt/content/nitro"] = resolve("./runtime/server/content-compat");
+      }
+      registerContentSitemapHook({ requireCollectionField: true });
+      addContentCallbackVirtuals();
       addServerHandler({
         route: "/__sitemap__/nuxt-content-urls.json",
-        handler: resolve("./runtime/server/routes/__sitemap__/nuxt-content-urls-v3")
+        handler: resolve("./runtime/server/routes/__sitemap__/content-urls")
       });
       if (config.strictNuxtContentPaths) {
         logger.warn("You have set `strictNuxtContentPaths: true` but are using @nuxt/content v3. This is not required, please remove it.");
@@ -830,6 +898,24 @@ ${onUrlEntries.join("\n")}`;
         },
         fetch: "/__sitemap__/nuxt-content-urls.json"
       });
+    } else if (isComarkContent) {
+      registerContentSitemapHook({ requireCollectionField: false });
+      addContentCallbackVirtuals();
+      addServerHandler({
+        route: COMARK_CONTENT_SITEMAP_ROUTE,
+        handler: resolve("./runtime/server/routes/__sitemap__/content-urls")
+      });
+      if (config.strictNuxtContentPaths) {
+        logger.warn("You have set `strictNuxtContentPaths: true` but are using comark-content. This is not required, please remove it.");
+      }
+      appGlobalSources.push({
+        context: {
+          name: COMARK_CONTENT_SOURCE,
+          description: "Generated from your markdown files.",
+          tips: nuxtV3Collections.size ? [`Parsing the following collections: ${Array.from(nuxtV3Collections).join(", ")}`] : ["No collections found. Set `sitemap: false` on a collection to keep it out."]
+        },
+        fetch: COMARK_CONTENT_SITEMAP_ROUTE
+      });
     } else if (isNuxtContentV2) {
       addServerPlugin(resolve("./runtime/server/plugins/nuxt-content-v2"));
       addServerHandler({
@@ -966,38 +1052,15 @@ ${onUrlEntries.join("\n")}`;
       };
     }
     if (resolvedAutoI18n && usingI18nPages && !hasDisabledAutoI18n) {
-      const pages = nuxtI18nConfig?.pages || {};
+      const i18n = resolvedAutoI18n;
       for (const sitemapName in sitemaps) {
-        let mapToI18nPages = function(path) {
-          if (typeof path !== "string")
-            return [path];
-          const withoutSlashes = withoutTrailingSlash(withoutLeadingSlash(path)).replace("/index", "");
-          if (pages && withoutSlashes in pages) {
-            const pageLocales = pages[withoutSlashes];
-            if (pageLocales) {
-              return Object.keys(pageLocales).map((localeCode) => withLeadingSlash(generatePathForI18nPages({
-                localeCode,
-                pageLocales: pageLocales[localeCode],
-                nuxtI18nConfig,
-                normalisedLocales
-              })));
-            }
-          }
-          let match = [path];
-          Object.values(pages).forEach((pageLocales) => {
-            if (pageLocales && nuxtI18nConfig.defaultLocale in pageLocales && pageLocales[nuxtI18nConfig.defaultLocale] === path)
-              match = Object.keys(pageLocales).map((localeCode) => withLeadingSlash(generatePathForI18nPages({ localeCode, pageLocales: pageLocales[localeCode], nuxtI18nConfig, normalisedLocales })));
-          });
-          return match;
-        };
         if (["index", "chunks"].includes(sitemapName))
           continue;
         const sitemap = sitemaps[sitemapName];
-        sitemap.include = (sitemap.include || []).flatMap((path) => mapToI18nPages(path));
-        sitemap.exclude = (sitemap.exclude || []).flatMap((path) => mapToI18nPages(path));
+        sitemap.include = (sitemap.include || []).flatMap((path) => resolveI18nFilterPaths(path, i18n));
+        sitemap.exclude = (sitemap.exclude || []).flatMap((path) => resolveI18nFilterPaths(path, i18n));
       }
-    }
-    if (resolvedAutoI18n && resolvedAutoI18n.locales && resolvedAutoI18n.strategy !== "no_prefix") {
+    } else if (resolvedAutoI18n && resolvedAutoI18n.locales && resolvedAutoI18n.strategy !== "no_prefix") {
       const i18n = resolvedAutoI18n;
       for (const sitemapName in sitemaps) {
         if (["index", "chunks"].includes(sitemapName))
@@ -1093,6 +1156,10 @@ ${onUrlEntries.join("\n")}`;
       return r.contentType?.includes("text/html");
     };
     const generateGlobalSources = async () => {
+      const excludedAppSources = resolveExcludedAppSources(
+        config.excludeAppSources,
+        nuxt.options.sitemap?.excludeAppSources
+      );
       const { routeRules: routeRules2 } = generateExtraRoutesFromNuxtConfig();
       const nitro = await nitroPromise;
       const prerenderedRoutes2 = nitro._prerenderedRoutes || [];
@@ -1169,7 +1236,7 @@ ${onUrlEntries.join("\n")}`;
           s.sourceType = "user";
           return s;
         }),
-        ...(config.excludeAppSources === true ? [] : [
+        ...(excludedAppSources === true ? [] : [
           ...appGlobalSources,
           {
             context: {
@@ -1201,7 +1268,7 @@ ${onUrlEntries.join("\n")}`;
             },
             urls: prerenderUrlsFinal
           }
-        ]).filter((s) => !config.excludeAppSources.includes(s.context.name) && (!!s.urls?.length || !!s.fetch)).map((s) => {
+        ]).filter((s) => !excludedAppSources.includes(s.context.name) && (!!s.urls?.length || !!s.fetch)).map((s) => {
           s.sourceType = "app";
           return s;
         })

package/dist/runtime/server/routes/__sitemap__/content-urls.d.ts

@@ -0,0 +1,9 @@
+/**
+ * URLs from the installed content module's page collections.
+ *
+ * One route for every provider. `#nuxtseo/content` normalizes the manifest shape
+ * and the query builder; the `sitemap` field on each entry is written by the
+ * module's `content:file:afterParse` hook.
+ */
+declare const _default: any;
+export default _default;

package/dist/runtime/server/routes/__sitemap__/content-urls.js

@@ -0,0 +1,34 @@
+import * as contentRuntime from "#nuxtseo/content";
+import { defineEventHandler } from "#nuxtseo/h3";
+import { filters } from "#sitemap/content-filters";
+import { onUrlFns } from "#sitemap/content-on-url";
+const { listPageCollections, provider, queryPages } = contentRuntime;
+export default defineEventHandler(async (e) => {
+  const collections = (await listPageCollections(e)).filter((collection) => collection.inSitemap && collection.hasField("sitemap")).map((collection) => collection.name);
+  const results = await Promise.all(collections.map(async (collection) => {
+    const needsAllFields = filters?.has(collection) || onUrlFns?.has(collection);
+    const query = queryPages(e, collection).where("path", "IS NOT NULL").where("sitemap", "IS NOT NULL");
+    if (!needsAllFields)
+      query.select("path", "sitemap");
+    try {
+      const entries = await query.all();
+      const filter = filters?.get(collection);
+      return { collection, entries: filter ? entries.filter(filter) : entries };
+    } catch (err) {
+      const hint = provider === "nuxt-content-v3" ? " On serverless the content DB is restored from a prerendered sql_dump.txt that isn't readable inside the function (nuxt/content#3805). Fix: prerender the sitemap so content URLs resolve at build, or configure a runtime database (D1/Turso/Postgres)." : "";
+      console.error(`[@nuxtjs/sitemap] Couldn't query content collection "${collection}" for the sitemap, so its URLs will be missing.${hint}`, err);
+      return { collection, entries: [] };
+    }
+  }));
+  return results.flatMap(({ collection, entries }) => {
+    const onUrl = onUrlFns?.get(collection);
+    return entries.filter((entry) => entry.sitemap !== false && entry.path && !entry.path.endsWith(".navigation")).map((entry) => {
+      const url = {
+        loc: entry.path,
+        ...typeof entry.sitemap === "object" && entry.sitemap ? entry.sitemap : {}
+      };
+      onUrl?.(url, entry, collection);
+      return url;
+    });
+  });
+});

package/dist/runtime/server/sitemap/builder/entries.d.ts

@@ -0,0 +1,7 @@
+import type { AutoI18nConfig, ModuleRuntimeConfig, NitroUrlResolvers, ResolvedSitemapUrl, SitemapDefinition, SitemapUrlInput } from '../../../types.js';
+export interface NormalizedI18n extends ResolvedSitemapUrl {
+    _pathWithoutPrefix: string;
+    _locale: AutoI18nConfig['locales'][number];
+    _index?: number;
+}
+export declare function resolveSitemapEntries(sitemap: SitemapDefinition, urls: SitemapUrlInput[], runtimeConfig: Pick<ModuleRuntimeConfig, 'autoI18n' | 'isI18nMapped'>, resolvers?: NitroUrlResolvers, baseURL?: string): ResolvedSitemapUrl[];

package/dist/runtime/server/sitemap/builder/entries.js

@@ -0,0 +1,100 @@
+import { createPathFilter, resolveI18nRouteEntries, splitForLocales } from "../../../utils-pure.js";
+import { preNormalizeEntry } from "../urlset/normalise.js";
+export function resolveSitemapEntries(sitemap, urls, runtimeConfig, resolvers, baseURL) {
+  const {
+    autoI18n,
+    isI18nMapped
+  } = runtimeConfig;
+  const hasFilters = !!sitemap.include?.length || !!sitemap.exclude?.length;
+  const filterPath = hasFilters ? createPathFilter({
+    include: sitemap.include,
+    exclude: sitemap.exclude
+  }, baseURL || "/") : void 0;
+  const _urls = [];
+  for (const _e of urls) {
+    const e = preNormalizeEntry(_e, resolvers);
+    if (e.loc && (!filterPath || filterPath(e.loc, e._path?.pathname)))
+      _urls.push(e);
+  }
+  const withoutPrefixPaths = {};
+  if (autoI18n && autoI18n.strategy !== "no_prefix") {
+    const localeCodes = new Set(autoI18n.locales.map((l) => l.code));
+    const localeByCode = new Map(autoI18n.locales.map((l) => [l.code, l]));
+    const defaultLocale = autoI18n.defaultLocale;
+    const hasDifferentDomains = !!autoI18n.differentDomains;
+    const validI18nUrlsForTransform = [];
+    for (let i = 0; i < _urls.length; i++) {
+      const _e = _urls[i];
+      if (_e._abs)
+        continue;
+      const split = splitForLocales(_e._relativeLoc, localeCodes);
+      let localeCode = split[0];
+      const pathWithoutPrefix = split[1];
+      if (!localeCode)
+        localeCode = defaultLocale;
+      const e = _e;
+      e._pathWithoutPrefix = pathWithoutPrefix;
+      const locale = localeByCode.get(localeCode);
+      if (!locale)
+        continue;
+      e._locale = locale;
+      e._index = i;
+      e._key = `${e._sitemap || ""}${e._path?.pathname || "/"}${e._path?.search || ""}`;
+      withoutPrefixPaths[pathWithoutPrefix] = withoutPrefixPaths[pathWithoutPrefix] || [];
+      if (!withoutPrefixPaths[pathWithoutPrefix].some((e2) => e2._locale.code === locale.code))
+        withoutPrefixPaths[pathWithoutPrefix].push(e);
+      validI18nUrlsForTransform.push(e);
+    }
+    for (const e of validI18nUrlsForTransform) {
+      if (!e._i18nTransform && !e.alternatives?.length) {
+        const alternatives = [];
+        for (const u of withoutPrefixPaths[e._pathWithoutPrefix] || []) {
+          if (u._locale.code === defaultLocale) {
+            alternatives.push({
+              href: u.loc,
+              hreflang: "x-default"
+            });
+          }
+          alternatives.push({
+            href: u.loc,
+            hreflang: u._locale._hreflang || defaultLocale
+          });
+        }
+        if (alternatives.length)
+          e.alternatives = alternatives;
+      } else if (e._i18nTransform) {
+        delete e._i18nTransform;
+        const routeEntries = resolveI18nRouteEntries(e._relativeLoc, autoI18n, (href) => !filterPath || filterPath(href));
+        if (hasDifferentDomains) {
+          e.alternatives = routeEntries[0]?.alternatives;
+        } else {
+          for (const { alternatives, locale: l, loc } of routeEntries) {
+            const _sitemap = isI18nMapped ? l._sitemap : void 0;
+            const { _index: _, ...rest } = e;
+            const newEntry = preNormalizeEntry({
+              _sitemap,
+              ...rest,
+              _key: `${_sitemap || ""}${loc || "/"}`,
+              _locale: l,
+              loc,
+              alternatives
+            }, resolvers);
+            if (e._locale.code === newEntry._locale.code) {
+              _urls[e._index] = newEntry;
+              e._index = void 0;
+            } else {
+              _urls.push(newEntry);
+            }
+          }
+        }
+      }
+      if (isI18nMapped) {
+        e._sitemap = e._sitemap || e._locale._sitemap;
+        e._key = `${e._sitemap || ""}${e.loc || "/"}${e._path?.search || ""}`;
+      }
+      if (e._index)
+        _urls[e._index] = e;
+    }
+  }
+  return _urls;
+}

package/dist/runtime/server/sitemap/builder/sitemap.d.ts

@@ -1,11 +1,5 @@
-import type { AutoI18nConfig, ModuleRuntimeConfig, NitroUrlResolvers, ResolvedSitemapUrl, SitemapDefinition, SitemapUrlInput } from '../../../types.js';
+import type { ModuleRuntimeConfig, NitroUrlResolvers, ResolvedSitemapUrl, SitemapDefinition } from '../../../types.js';
 type NitroApp = ReturnType<typeof import('#nuxtseo/nitro').useNitroApp>;
-export interface NormalizedI18n extends ResolvedSitemapUrl {
-    _pathWithoutPrefix: string;
-    _locale: AutoI18nConfig['locales'][number];
-    _index?: number;
-}
-export declare function resolveSitemapEntries(sitemap: SitemapDefinition, urls: SitemapUrlInput[], runtimeConfig: Pick<ModuleRuntimeConfig, 'autoI18n' | 'isI18nMapped'>, resolvers?: NitroUrlResolvers, baseURL?: string): ResolvedSitemapUrl[];
 export interface ResolvedSitemapUrlsResult {
     urls: ResolvedSitemapUrl[];
     failedSources: Array<{

package/dist/runtime/server/sitemap/builder/sitemap.js

@@ -1,172 +1,14 @@
 import { resolveSitePath } from "nuxt-site-config/urls";
-import { joinURL, withHttps } from "ufo";
+import { withHttps } from "ufo";
 import { getHeader } from "#nuxtseo/h3";
 import { defineCachedFunction, useRuntimeConfig } from "#nuxtseo/nitro";
 import staticConfig from "#sitemap-virtual/static-config.mjs";
-import { applyDynamicParams, createPathFilter, findPageMapping, logger, resolveI18nSitemapLocaleKey, splitForLocales } from "../../../utils-pure.js";
-import { preNormalizeEntry } from "../urlset/normalise.js";
+import { logger, resolveI18nSitemapLocaleKey } from "../../../utils-pure.js";
 import { sortInPlace } from "../urlset/sort.js";
 import { childSitemapSources, globalSitemapSources, resolveSitemapSources } from "../urlset/sources.js";
 import { parseChunkInfo, sliceUrlsForChunk } from "../utils/chunk.js";
+import { resolveSitemapEntries } from "./entries.js";
 const SERVER_CACHE_MAX_AGE = staticConfig.cacheMaxAgeSeconds || 60 * 10;
-export function resolveSitemapEntries(sitemap, urls, runtimeConfig, resolvers, baseURL) {
-  const {
-    autoI18n,
-    isI18nMapped
-  } = runtimeConfig;
-  const hasFilters = !!sitemap.include?.length || !!sitemap.exclude?.length;
-  const filterPath = hasFilters ? createPathFilter({
-    include: sitemap.include,
-    exclude: sitemap.exclude
-  }, baseURL || "/") : void 0;
-  const _urls = [];
-  for (const _e of urls) {
-    const e = preNormalizeEntry(_e, resolvers);
-    if (e.loc && (!filterPath || filterPath(e.loc, e._path?.pathname)))
-      _urls.push(e);
-  }
-  const withoutPrefixPaths = {};
-  if (autoI18n && autoI18n.strategy !== "no_prefix") {
-    const localeCodes = new Set(autoI18n.locales.map((l) => l.code));
-    const localeByCode = new Map(autoI18n.locales.map((l) => [l.code, l]));
-    const isPrefixStrategy = autoI18n.strategy === "prefix";
-    const isPrefixExceptOrAndDefault = autoI18n.strategy === "prefix_and_default" || autoI18n.strategy === "prefix_except_default";
-    const xDefaultAndLocales = [{ code: "x-default", _hreflang: "x-default" }, ...autoI18n.locales];
-    const defaultLocale = autoI18n.defaultLocale;
-    const hasPages = !!autoI18n.pages;
-    const sortedPageKeys = hasPages ? Object.keys(autoI18n.pages).sort((a, b) => b.length - a.length) : void 0;
-    const hasDifferentDomains = !!autoI18n.differentDomains;
-    const validI18nUrlsForTransform = [];
-    for (let i = 0; i < _urls.length; i++) {
-      const _e = _urls[i];
-      if (_e._abs)
-        continue;
-      const split = splitForLocales(_e._relativeLoc, localeCodes);
-      let localeCode = split[0];
-      const pathWithoutPrefix = split[1];
-      if (!localeCode)
-        localeCode = defaultLocale;
-      const e = _e;
-      e._pathWithoutPrefix = pathWithoutPrefix;
-      const locale = localeByCode.get(localeCode);
-      if (!locale)
-        continue;
-      e._locale = locale;
-      e._index = i;
-      e._key = `${e._sitemap || ""}${e._path?.pathname || "/"}${e._path?.search || ""}`;
-      withoutPrefixPaths[pathWithoutPrefix] = withoutPrefixPaths[pathWithoutPrefix] || [];
-      if (!withoutPrefixPaths[pathWithoutPrefix].some((e2) => e2._locale.code === locale.code))
-        withoutPrefixPaths[pathWithoutPrefix].push(e);
-      validI18nUrlsForTransform.push(e);
-    }
-    for (const e of validI18nUrlsForTransform) {
-      if (!e._i18nTransform && !e.alternatives?.length) {
-        const alternatives = [];
-        for (const u of withoutPrefixPaths[e._pathWithoutPrefix] || []) {
-          if (u._locale.code === defaultLocale) {
-            alternatives.push({
-              href: u.loc,
-              hreflang: "x-default"
-            });
-          }
-          alternatives.push({
-            href: u.loc,
-            hreflang: u._locale._hreflang || defaultLocale
-          });
-        }
-        if (alternatives.length)
-          e.alternatives = alternatives;
-      } else if (e._i18nTransform) {
-        delete e._i18nTransform;
-        if (hasDifferentDomains) {
-          const defLocale = localeByCode.get(defaultLocale);
-          e.alternatives = [
-            {
-              ...defLocale,
-              code: "x-default"
-            },
-            ...autoI18n.locales.filter((l) => !!l.domain)
-          ].map((locale) => {
-            return {
-              hreflang: locale._hreflang,
-              href: joinURL(withHttps(locale.domain), e._pathWithoutPrefix)
-            };
-          });
-        } else {
-          const pageMatch = hasPages ? findPageMapping(e._pathWithoutPrefix, autoI18n.pages, sortedPageKeys) : null;
-          const pathSearch = e._path?.search || "";
-          const pathWithoutPrefix = e._pathWithoutPrefix;
-          for (const l of autoI18n.locales) {
-            let loc = pathWithoutPrefix;
-            if (pageMatch && pageMatch.mappings[l.code] !== void 0) {
-              const customPath = pageMatch.mappings[l.code];
-              if (customPath === false)
-                continue;
-              if (typeof customPath === "string") {
-                loc = customPath[0] === "/" ? customPath : `/${customPath}`;
-                loc = applyDynamicParams(loc, pageMatch.paramSegments);
-                if (isPrefixStrategy || isPrefixExceptOrAndDefault && l.code !== defaultLocale)
-                  loc = joinURL(`/${l.code}`, loc);
-              }
-            } else if (!hasDifferentDomains && !(isPrefixExceptOrAndDefault && l.code === defaultLocale)) {
-              loc = joinURL(`/${l.code}`, pathWithoutPrefix);
-            }
-            const _sitemap = isI18nMapped ? l._sitemap : void 0;
-            const alternatives = [];
-            for (const locale of xDefaultAndLocales) {
-              const code = locale.code === "x-default" ? defaultLocale : locale.code;
-              const isDefault = locale.code === "x-default" || locale.code === defaultLocale;
-              let href = pathWithoutPrefix;
-              if (pageMatch && pageMatch.mappings[code] !== void 0) {
-                const customPath = pageMatch.mappings[code];
-                if (customPath === false)
-                  continue;
-                if (typeof customPath === "string") {
-                  href = customPath[0] === "/" ? customPath : `/${customPath}`;
-                  href = applyDynamicParams(href, pageMatch.paramSegments);
-                  if (isPrefixStrategy || isPrefixExceptOrAndDefault && !isDefault)
-                    href = joinURL("/", code, href);
-                }
-              } else if (isPrefixStrategy) {
-                href = joinURL("/", code, pathWithoutPrefix);
-              } else if (isPrefixExceptOrAndDefault && !isDefault) {
-                href = joinURL("/", code, pathWithoutPrefix);
-              }
-              if (filterPath && !filterPath(href))
-                continue;
-              alternatives.push({
-                hreflang: locale._hreflang,
-                href
-              });
-            }
-            const { _index: _, ...rest } = e;
-            const newEntry = preNormalizeEntry({
-              _sitemap,
-              ...rest,
-              _key: `${_sitemap || ""}${loc || "/"}${pathSearch}`,
-              _locale: l,
-              loc,
-              alternatives
-            }, resolvers);
-            if (e._locale.code === newEntry._locale.code) {
-              _urls[e._index] = newEntry;
-              e._index = void 0;
-            } else {
-              _urls.push(newEntry);
-            }
-          }
-        }
-      }
-      if (isI18nMapped) {
-        e._sitemap = e._sitemap || e._locale._sitemap;
-        e._key = `${e._sitemap || ""}${e.loc || "/"}${e._path?.search || ""}`;
-      }
-      if (e._index)
-        _urls[e._index] = e;
-    }
-  }
-  return _urls;
-}
 export async function buildResolvedSitemapUrls(effectiveSitemap, matchName, isChunked, resolvers, runtimeConfig, nitro) {
   const { sitemaps, autoI18n, isI18nMapped, isMultiSitemap, sortEntries } = runtimeConfig;
   let sourcesInput = effectiveSitemap.includeAppSources ? [...await globalSitemapSources(), ...await childSitemapSources(effectiveSitemap)] : await childSitemapSources(effectiveSitemap);

package/dist/runtime/types.d.ts

@@ -204,7 +204,7 @@ export interface SitemapSourceResolved extends Omit<SitemapSourceBase, 'urls'> {
         message: string;
     }[];
 }
-export type AppSourceContext = 'nuxt:pages' | 'nuxt:prerender' | 'nuxt:route-rules' | '@nuxtjs/i18n:pages' | 'nuxt-i18n-micro:pages' | '@nuxt/content@v2:urls' | '@nuxt/content@v3:urls';
+export type AppSourceContext = 'nuxt:pages' | 'nuxt:prerender' | 'nuxt:route-rules' | '@nuxtjs/i18n:pages' | 'nuxt-i18n-micro:pages' | '@nuxt/content@v2:urls' | '@nuxt/content@v3:urls' | '@harlan-zw/comark-content:urls';
 export type SitemapSourceInput = string | [string, FetchOptions] | SitemapSourceBase | SitemapSourceResolved;
 interface LocaleObject extends Record<string, any> {
     code: string;

package/dist/runtime/utils-pure.d.ts

@@ -1,9 +1,15 @@
-import type { FilterInput } from './types.js';
+import type { AlternativeEntry, AutoI18nConfig, FilterInput } from './types.js';
 export { createFilter, type CreateFilterOptions } from 'nuxtseo-shared/utils';
 export declare const logger: import("consola").ConsolaInstance;
 export declare function xmlEscape(value: string | number | boolean | Date): string;
 export declare function mergeOnKey<T, K extends keyof T>(arr: T[], key: K, onMerge?: (key: T[K]) => void): T[];
 export declare function splitForLocales(path: string, locales: readonly string[] | Set<string>): [string | null, string];
+export interface ResolvedI18nRouteEntry {
+    locale: AutoI18nConfig['locales'][number];
+    loc: string;
+    alternatives: AlternativeEntry[];
+}
+export declare function resolveI18nRouteEntries(route: string, i18n: AutoI18nConfig, includeHref?: (href: string) => boolean): ResolvedI18nRouteEntry[];
 /**
  * Resolve which locale a multi-sitemap name belongs to.
  *
@@ -22,9 +28,3 @@ export declare function createPathFilter(options?: {
     include?: (FilterInput | string | RegExp)[];
     exclude?: (FilterInput | string | RegExp)[];
 }, baseURL?: string): (loc: string, pathname?: string) => boolean;
-export interface PageMatch {
-    mappings: Record<string, string | false>;
-    paramSegments: string[];
-}
-export declare function findPageMapping(pathWithoutPrefix: string, pages: Record<string, Record<string, string | false>>, sortedKeys?: string[]): PageMatch | null;
-export declare function applyDynamicParams(customPath: string, paramSegments: string[]): string;

package/dist/runtime/utils-pure.js

@@ -1,6 +1,7 @@
 import { createDefu } from "defu";
+import { computeLocaleAlternates, resolveLocaleFromRoute } from "nuxtseo-shared/i18n-runtime";
 import { createFilter, createModuleLogger } from "nuxtseo-shared/utils";
-import { parseURL, withoutBase } from "ufo";
+import { joinURL, parseURL, withHttps, withLeadingSlash, withoutBase } from "ufo";
 export { createFilter } from "nuxtseo-shared/utils";
 export const logger = createModuleLogger("@nuxt/sitemap");
 const XML_ENTITIES = {
@@ -51,6 +52,47 @@ export function splitForLocales(path, locales) {
   }
   return [null, path];
 }
+function toRuntimeI18nConfig(i18n) {
+  return {
+    ...i18n,
+    // Sitemap transforms keep the unprefixed default URL alongside Nuxt's prefixed route.
+    strategy: i18n.strategy === "prefix_and_default" ? "prefix_except_default" : i18n.strategy,
+    pages: i18n.pages && Object.fromEntries(
+      Object.entries(i18n.pages).map(([pageName, pageLocales]) => [
+        pageName,
+        Object.fromEntries(i18n.locales.map((locale) => {
+          const configuredPath = pageLocales[locale.code];
+          return [locale.code, configuredPath === void 0 ? withLeadingSlash(pageName) : configuredPath];
+        }))
+      ])
+    ),
+    locales: i18n.locales.map((locale) => ({
+      ...locale,
+      hreflang: locale._hreflang
+    }))
+  };
+}
+function localeAlternateHref(alternate) {
+  return alternate.domain ? joinURL(withHttps(alternate.domain), alternate.path) : alternate.path;
+}
+export function resolveI18nRouteEntries(route, i18n, includeHref = () => true) {
+  const runtimeConfig = toRuntimeI18nConfig(i18n);
+  const currentLocale = resolveLocaleFromRoute(route, runtimeConfig).locale;
+  const alternates = computeLocaleAlternates(route, runtimeConfig, { locale: currentLocale });
+  const localizedAlternates = alternates.map((alternate) => ({
+    alternate,
+    href: localeAlternateHref(alternate)
+  }));
+  const defaultHref = localizedAlternates.find(({ alternate }) => alternate.code === i18n.defaultLocale)?.href;
+  const sitemapAlternatives = [
+    ...defaultHref && includeHref(defaultHref) ? [{ hreflang: "x-default", href: defaultHref }] : [],
+    ...localizedAlternates.filter(({ href }) => includeHref(href)).map(({ alternate, href }) => ({ hreflang: alternate.hreflang, href }))
+  ];
+  return localizedAlternates.flatMap(({ alternate, href }) => {
+    const locale = i18n.locales.find((locale2) => locale2.code === alternate.code);
+    return locale ? [{ locale, loc: href, alternatives: sitemapAlternatives }] : [];
+  });
+}
 export function resolveI18nSitemapLocaleKey(sitemapName, localeSitemapKeys) {
   let best = null;
   for (const key of localeSitemapKeys) {
@@ -89,26 +131,6 @@ export function createPathFilter(options = {}, baseURL) {
     }
     if (hasBase)
       path = withoutBase(path, baseURL);
-    return urlFilter(path);
+    return urlFilter(withLeadingSlash(path));
   };
 }
-export function findPageMapping(pathWithoutPrefix, pages, sortedKeys) {
-  const stripped = pathWithoutPrefix[0] === "/" ? pathWithoutPrefix.slice(1) : pathWithoutPrefix;
-  const pageKey = stripped.endsWith("/index") ? stripped.slice(0, -6) || "index" : stripped || "index";
-  if (pages[pageKey])
-    return { mappings: pages[pageKey], paramSegments: [] };
-  const keys = sortedKeys || Object.keys(pages).sort((a, b) => b.length - a.length);
-  for (const key of keys) {
-    if (pageKey.startsWith(`${key}/`)) {
-      const paramPath = pageKey.slice(key.length + 1);
-      return { mappings: pages[key], paramSegments: paramPath.split("/") };
-    }
-  }
-  return null;
-}
-export function applyDynamicParams(customPath, paramSegments) {
-  if (!paramSegments.length)
-    return customPath;
-  let i = 0;
-  return customPath.replace(/\[[^\]]+\]/g, () => paramSegments[i++] || "");
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nuxtjs/sitemap",
   "type": "module",
-  "version": "8.3.3",
+  "version": "8.4.0",
   "description": "Powerfully flexible XML Sitemaps that integrate seamlessly, for Nuxt.",
   "author": {
     "name": "Harlan Wilton",
@@ -55,45 +55,46 @@
     }
   },
   "dependencies": {
-    "@nuxt/kit": "^4.5.1",
+    "@nuxt/kit": "^4.5.2",
     "consola": "^3.4.2",
     "defu": "^6.1.7",
-    "nuxt-site-config": "^4.1.5",
-    "nuxtseo-shared": "^5.3.10",
+    "nuxt-site-config": "^4.2.3",
+    "nuxtseo-shared": "^5.3.14",
     "ofetch": "^1.5.1",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.1",
     "radix3": "^1.1.2",
     "ufo": "^1.6.4",
     "ultrahtml": "^1.7.0",
-    "sitemapd": "^0.2.1"
+    "sitemapd": "^0.2.2"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^9.2.0",
+    "@antfu/eslint-config": "^9.3.0",
     "@arethetypeswrong/cli": "^0.18.5",
+    "@harlan-zw/comark-content": "^0.1.3",
     "@nuxt/content": "^3.15.2",
-    "@nuxt/devtools-kit": "4.0.0-alpha.9",
+    "@nuxt/devtools-kit": "4.0.0-alpha.11",
     "@nuxt/module-builder": "^1.0.3",
     "@nuxt/test-utils": "^4.1.0",
     "@nuxt/ui": "^4.10.0",
     "@nuxtjs/i18n": "^10.6.0",
-    "@nuxtjs/robots": "^6.1.3",
+    "@nuxtjs/robots": "^6.1.5",
     "@vue/test-utils": "^2.4.11",
-    "better-sqlite3": "^13.0.2",
-    "bumpp": "^12.1.1",
-    "eslint": "^10.8.0",
-    "eslint-plugin-harlanzw": "^0.17.1",
-    "happy-dom": "^20.11.1",
-    "nuxt": "^4.5.1",
-    "nuxt-i18n-micro": "^3.26.0",
-    "nuxtseo-layer-devtools": "^5.3.10",
+    "better-sqlite3": "^13.0.3",
+    "bumpp": "^12.2.1",
+    "eslint": "^10.8.1",
+    "eslint-plugin-harlanzw": "^0.20.0",
+    "happy-dom": "^20.11.2",
+    "nuxt": "^4.5.2",
+    "nuxt-i18n-micro": "^3.28.0",
+    "nuxtseo-layer-devtools": "^5.3.14",
     "std-env": "^4.2.0",
     "typescript": "6.0.3",
     "unbuild": "^3.6.1",
-    "vitest": "^4.1.10",
-    "vue-tsc": "^3.3.9",
+    "vitest": "^4.1.11",
+    "vue-tsc": "^3.3.10",
     "zod": "^4.4.3",
-    "@nuxtjs/sitemap": "8.3.3"
+    "@nuxtjs/sitemap": "8.4.0"
   },
   "scripts": {
     "lint": "eslint .",

package/dist/runtime/server/routes/__sitemap__/nuxt-content-urls-v3.d.ts

@@ -1,2 +0,0 @@
-declare const _default: any;
-export default _default;

package/dist/runtime/server/routes/__sitemap__/nuxt-content-urls-v3.js

@@ -1,40 +0,0 @@
-import { queryCollection } from "@nuxt/content/server";
-import manifest from "#content/manifest";
-import { defineEventHandler } from "#nuxtseo/h3";
-import { filters } from "#sitemap/content-filters";
-import { onUrlFns } from "#sitemap/content-on-url";
-export default defineEventHandler(async (e) => {
-  const collections = [];
-  for (const collection in manifest) {
-    if (manifest[collection].fields.sitemap)
-      collections.push(collection);
-  }
-  const contentList = [];
-  for (const collection of collections) {
-    const needsAllFields = filters?.has(collection) || onUrlFns?.has(collection);
-    const query = queryCollection(e, collection).where("path", "IS NOT NULL").where("sitemap", "IS NOT NULL");
-    if (!needsAllFields)
-      query.select("path", "sitemap");
-    contentList.push(
-      query.all().then((results2) => {
-        const filter = filters?.get(collection);
-        return { collection, entries: filter ? results2.filter(filter) : results2 };
-      }).catch((err) => {
-        console.error(`[@nuxtjs/sitemap] Couldn't query @nuxt/content collection "${collection}" for the sitemap, so its URLs will be missing. On serverless the content DB is restored from a prerendered sql_dump.txt that isn't readable inside the function (nuxt/content#3805). Fix: prerender the sitemap so content URLs resolve at build, or configure a runtime database (D1/Turso/Postgres).`, err);
-        return { collection, entries: [] };
-      })
-    );
-  }
-  const results = await Promise.all(contentList);
-  return results.flatMap(({ collection, entries }) => {
-    const onUrl = onUrlFns?.get(collection);
-    return entries.filter((c) => c.sitemap !== false && c.path && !c.path.endsWith(".navigation")).map((c) => {
-      const url = {
-        loc: c.path,
-        ...typeof c.sitemap === "object" ? c.sitemap : {}
-      };
-      onUrl?.(url, c, collection);
-      return url;
-    });
-  }).filter(Boolean);
-});