@nuxtjs/sitemap 8.3.3 → 8.3.4

package/dist/module.json

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

package/dist/module.mjs

@@ -6,7 +6,7 @@ import { isNuxtGenerate, renderNitroTypeAugmentations, useModuleLogger, setupNit
 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';
@@ -15,7 +15,7 @@ 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';
 
 function setupDevToolsUI(_options, resolve, nuxt = useNuxt()) {
@@ -260,6 +260,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 {
@@ -966,38 +993,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))

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/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.3.4",
   "description": "Powerfully flexible XML Sitemaps that integrate seamlessly, for Nuxt.",
   "author": {
     "name": "Harlan Wilton",
@@ -55,11 +55,11 @@
     }
   },
   "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.0",
+    "nuxtseo-shared": "^5.3.11",
     "ofetch": "^1.5.1",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.1",
@@ -69,7 +69,7 @@
     "sitemapd": "^0.2.1"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^9.2.0",
+    "@antfu/eslint-config": "^9.3.0",
     "@arethetypeswrong/cli": "^0.18.5",
     "@nuxt/content": "^3.15.2",
     "@nuxt/devtools-kit": "4.0.0-alpha.9",
@@ -77,23 +77,23 @@
     "@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.4",
     "@vue/test-utils": "^2.4.11",
-    "better-sqlite3": "^13.0.2",
-    "bumpp": "^12.1.1",
-    "eslint": "^10.8.0",
+    "better-sqlite3": "^13.0.3",
+    "bumpp": "^12.2.0",
+    "eslint": "^10.8.1",
     "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",
+    "happy-dom": "^20.11.2",
+    "nuxt": "^4.5.2",
+    "nuxt-i18n-micro": "^3.28.0",
+    "nuxtseo-layer-devtools": "^5.3.11",
     "std-env": "^4.2.0",
     "typescript": "6.0.3",
     "unbuild": "^3.6.1",
     "vitest": "^4.1.10",
     "vue-tsc": "^3.3.9",
     "zod": "^4.4.3",
-    "@nuxtjs/sitemap": "8.3.3"
+    "@nuxtjs/sitemap": "8.3.4"
   },
   "scripts": {
     "lint": "eslint .",