@nuxtjs/sitemap 8.3.2 → 8.3.4

package/dist/module.json

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

package/dist/module.mjs

@@ -2,11 +2,11 @@ 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, useModuleLogger, getNuxtModuleOptions, resolveNitroPreset, resolveNuxtContentVersion, createPagesPromise, createNitroPromise } from 'nuxtseo-shared/kit';
+import { isNuxtGenerate, renderNitroTypeAugmentations, useModuleLogger, setupNitroRuntimeCompatibility, getNuxtModuleOptions, resolveNitroPreset, resolveNuxtContentVersion, 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';
@@ -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()) {
@@ -174,53 +174,31 @@ async function prerenderRoute(nitro, route) {
   return { filePath, prerenderUrls };
 }
 
-function registerTypeTemplates() {
+function registerTypeTemplates(nitroCompatibility) {
   const hasRobotsModule = hasNuxtModule("@nuxtjs/robots") || hasNuxtModule("nuxt-simple-robots");
   addTypeTemplate({
     filename: "types/nuxt-sitemap-augments.d.ts",
     getContents: () => {
-      const robotsType = hasRobotsModule ? "" : "    robots?: boolean\n";
+      const robotsType = hasRobotsModule ? "" : "robots?: boolean\n";
+      const routeRules = `${robotsType}sitemap?: SitemapItemDefaults | false`;
+      const runtimeHooks = `'sitemap:index-resolved': (ctx: SitemapIndexRenderCtx<${nitroCompatibility.eventType}>) => void | Promise<void>
+'sitemap:input': (ctx: SitemapInputCtx<${nitroCompatibility.eventType}>) => void | Promise<void>
+'sitemap:resolved': (ctx: SitemapRenderCtx<${nitroCompatibility.eventType}>) => void | Promise<void>
+'sitemap:output': (ctx: SitemapOutputHookCtx<${nitroCompatibility.eventType}>) => void | Promise<void>
+'sitemap:sources': (ctx: SitemapSourcesHookCtx<${nitroCompatibility.eventType}>) => void | Promise<void>`;
+      const nitroTypes = renderNitroTypeAugmentations(nitroCompatibility, {
+        nitroInterfaces: {
+          PrerenderRoute: "_sitemap?: SitemapUrl"
+        },
+        routeConfig: routeRules,
+        routeRules,
+        runtimeHooks
+      });
       return `// Generated by @nuxtjs/sitemap
 /// <reference path="./nuxt-sitemap-virtual.d.ts" />
 import type { SitemapUrl, SitemapItemDefaults, SitemapIndexRenderCtx, SitemapInputCtx, SitemapRenderCtx, SitemapOutputHookCtx, SitemapSourcesHookCtx } from '@nuxtjs/sitemap'
 
-declare module 'nitropack' {
-  interface PrerenderRoute {
-    _sitemap?: SitemapUrl
-  }
-  interface NitroRouteRules {
-${robotsType}    sitemap?: SitemapItemDefaults | false
-  }
-  interface NitroRouteConfig {
-${robotsType}    sitemap?: SitemapItemDefaults | false
-  }
-  interface NitroRuntimeHooks {
-    'sitemap:index-resolved': (ctx: SitemapIndexRenderCtx) => void | Promise<void>
-    'sitemap:input': (ctx: SitemapInputCtx) => void | Promise<void>
-    'sitemap:resolved': (ctx: SitemapRenderCtx) => void | Promise<void>
-    'sitemap:output': (ctx: SitemapOutputHookCtx) => void | Promise<void>
-    'sitemap:sources': (ctx: SitemapSourcesHookCtx) => void | Promise<void>
-  }
-}
-
-declare module 'nitropack/types' {
-  interface PrerenderRoute {
-    _sitemap?: SitemapUrl
-  }
-  interface NitroRouteRules {
-${robotsType}    sitemap?: SitemapItemDefaults | false
-  }
-  interface NitroRouteConfig {
-${robotsType}    sitemap?: SitemapItemDefaults | false
-  }
-  interface NitroRuntimeHooks {
-    'sitemap:index-resolved': (ctx: SitemapIndexRenderCtx) => void | Promise<void>
-    'sitemap:input': (ctx: SitemapInputCtx) => void | Promise<void>
-    'sitemap:resolved': (ctx: SitemapRenderCtx) => void | Promise<void>
-    'sitemap:output': (ctx: SitemapOutputHookCtx) => void | Promise<void>
-    'sitemap:sources': (ctx: SitemapSourcesHookCtx) => void | Promise<void>
-  }
-}
+${nitroTypes}
 
 declare module 'vue-router' {
   interface RouteMeta {
@@ -282,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 {
@@ -518,6 +523,7 @@ const module$1 = defineNuxtModule({
       logger.debug("The module is disabled, skipping setup.");
       return;
     }
+    const nitroCompatibility = setupNitroRuntimeCompatibility(nuxt);
     config.exclude.push(`${withTrailingSlash(nuxt.options.app.buildAssetsDir)}**`);
     nuxt.options.alias["#sitemap"] = resolve("./runtime");
     nuxt.options.nitro.alias = nuxt.options.nitro.alias || {};
@@ -709,7 +715,7 @@ const module$1 = defineNuxtModule({
         }]);
       }
     });
-    registerTypeTemplates();
+    registerTypeTemplates(nitroCompatibility);
     const prerenderedRoutes = nuxt.options.nitro.prerender?.routes || [];
     let prerenderSitemap = isNuxtGenerate() || includesSitemapRoot(config.sitemapName, prerenderedRoutes);
     if (resolveNitroPreset() === "vercel-edge") {
@@ -987,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/composables/defineSitemapEventHandler.d.ts

@@ -1,4 +1,4 @@
-import type { EventHandlerRequest, EventHandlerResponse } from 'h3';
+import type { EventHandlerRequest, EventHandlerResponse } from '#nuxtseo/h3';
 import type { SitemapUrlInput } from '../../types.js';
-import { defineEventHandler } from 'h3';
+import { defineEventHandler } from '#nuxtseo/h3';
 export declare const defineSitemapEventHandler: typeof defineEventHandler<EventHandlerRequest, EventHandlerResponse<SitemapUrlInput[]>>;

package/dist/runtime/server/composables/defineSitemapEventHandler.js

@@ -1,2 +1,2 @@
-import { defineEventHandler } from "h3";
+import { defineEventHandler } from "#nuxtseo/h3";
 export const defineSitemapEventHandler = defineEventHandler;

package/dist/runtime/server/plugins/compression.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("nitropack/types").NitroAppPlugin;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/plugins/compression.js

@@ -1,5 +1,5 @@
-import { appendResponseHeader, getRequestHeader, getResponseHeader, removeResponseHeader, setResponseHeader } from "h3";
-import { defineNitroPlugin } from "nitropack/runtime";
+import { appendResponseHeader, getRequestHeader, getResponseHeader, removeResponseHeader, setResponseHeader } from "#nuxtseo/h3";
+import { defineNitroPlugin } from "#nuxtseo/nitro";
 import { logger } from "../../utils-pure.js";
 import { hasNonIdentityEncoding, isReadableStream, negotiateCompressionEncoding } from "../sitemap/stream.js";
 let warnedAboutCompressionStream = false;

package/dist/runtime/server/plugins/nuxt-content-v2.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("nitropack/types").NitroAppPlugin;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/plugins/nuxt-content-v2.js

@@ -1,5 +1,5 @@
 import { defu } from "defu";
-import { defineNitroPlugin } from "nitropack/runtime";
+import { defineNitroPlugin } from "#nuxtseo/nitro";
 import { useSitemapRuntimeConfig } from "../utils.js";
 export default defineNitroPlugin((nitroApp) => {
   const { discoverImages, isNuxtContentDocumentDriven } = useSitemapRuntimeConfig();

package/dist/runtime/server/plugins/stream-transport.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("nitropack/types").NitroAppPlugin;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/plugins/stream-transport.js

@@ -1,5 +1,5 @@
-import { removeResponseHeader } from "h3";
-import { defineNitroPlugin } from "nitropack/runtime";
+import { removeResponseHeader } from "#nuxtseo/h3";
+import { defineNitroPlugin } from "#nuxtseo/nitro";
 import { logger } from "../../utils-pure.js";
 import { createNodeResponseStream, isReadableStream } from "../sitemap/stream.js";
 export default defineNitroPlugin((nitro) => {

package/dist/runtime/server/plugins/warm-up.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("nitropack/types").NitroAppPlugin;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/plugins/warm-up.js

@@ -1,5 +1,5 @@
-import { defineNitroPlugin } from "nitropack/runtime";
 import { joinURL, withLeadingSlash } from "ufo";
+import { defineNitroPlugin } from "#nuxtseo/nitro";
 import { useSitemapRuntimeConfig } from "../utils.js";
 export default defineNitroPlugin((nitroApp) => {
   const { sitemaps, sitemapsPathPrefix } = useSitemapRuntimeConfig();

package/dist/runtime/server/robots-polyfill/getPathRobotConfig.d.ts

@@ -1,4 +1,4 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 export declare function getPathRobotConfig(_e: H3Event, _options: any): {
     indexable: boolean;
     rule: string;

package/dist/runtime/server/routes/__sitemap__/debug-production.d.ts

@@ -13,5 +13,5 @@ export interface ProductionDebugResponse {
     warnings: SitemapIssue[];
     error?: string;
 }
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<Record<string, any> | ProductionDebugResponse>>;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/routes/__sitemap__/debug-production.js

@@ -1,5 +1,5 @@
-import { defineEventHandler, getQuery } from "h3";
 import { collectSitemap } from "sitemapd/parse";
+import { defineEventHandler, getQuery } from "#nuxtseo/h3";
 async function fetchSitemapBody(url) {
   const response = await fetch(url, {
     headers: { Accept: "application/xml, text/xml, application/gzip" },

package/dist/runtime/server/routes/__sitemap__/debug.d.ts

@@ -1,47 +1,2 @@
-import type { SitemapDefinition, SitemapSourceResolved } from '../../../types.js';
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<{
-    nitroOrigin: string;
-    sitemaps: Record<string, SitemapDefinition>;
-    runtimeConfig: {
-        version: string;
-        isNuxtContentDocumentDriven: boolean;
-        sitemaps: {
-            index?: Pick<SitemapDefinition, "sitemapName" | "_route"> & {
-                sitemaps: import("../../../types.js").SitemapIndexEntry[];
-            };
-        } & Record<string, Omit<SitemapDefinition, "urls"> & {
-            _hasSourceChunk?: boolean;
-        }>;
-        autoI18n?: import("../../../types.js").AutoI18nConfig;
-        hasDisabledAutoI18n?: boolean;
-        isMultiSitemap: boolean;
-        isI18nMapped: boolean;
-        sitemapsPathPrefix: string | false;
-        cacheMaxAgeSeconds: number | false;
-        sitemapName: string;
-        excludeAppSources: true | (import("../../../types.js").AppSourceContext[]);
-        sortEntries: boolean;
-        defaultSitemapsChunkSize: number | false;
-        xslColumns?: {
-            label: string;
-            width: `${string}%`;
-            select?: string;
-        }[] | undefined;
-        xslTips: boolean;
-        debug: boolean;
-        discoverImages: boolean;
-        discoverVideos: boolean;
-        autoLastmod: boolean;
-        xsl: string | false;
-        credits: boolean;
-        minify: boolean;
-        experimentalStreaming?: boolean | undefined;
-    };
-    globalSources: SitemapSourceResolved[];
-    siteConfig: {
-        [x: string]: any;
-        [x: number]: any;
-        url: string;
-    };
-}>>;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/routes/__sitemap__/debug.js

@@ -1,4 +1,4 @@
-import { defineEventHandler } from "h3";
+import { defineEventHandler } from "#nuxtseo/h3";
 import { getNitroOrigin, getSiteConfig } from "#site-config/server/composables";
 import { validateSitemapUrl } from "../../sitemap/urlset/normalise.js";
 import {

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

@@ -1,2 +1,2 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<unknown[]>>;
+declare const _default: any;
 export default _default;

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

@@ -1,5 +1,5 @@
-import { defineEventHandler } from "h3";
 import { serverQueryContent } from "#content/server";
+import { defineEventHandler } from "#nuxtseo/h3";
 export default defineEventHandler(async (e) => {
   const contentList = await serverQueryContent(e).find();
   return contentList.map((c) => c.sitemap).filter(Boolean);

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

@@ -1,2 +1,2 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<Record<string, unknown>[]>>;
+declare const _default: any;
 export default _default;

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

@@ -1,6 +1,6 @@
 import { queryCollection } from "@nuxt/content/server";
-import { defineEventHandler } from "h3";
 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) => {

package/dist/runtime/server/routes/__zero-runtime/sitemap/[sitemap].xml.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<string | ReadableStream<Uint8Array<ArrayBufferLike>> | undefined>>;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/routes/__zero-runtime/sitemap/[sitemap].xml.js

@@ -1,4 +1,4 @@
-import { createError, defineEventHandler } from "h3";
+import { createError, defineEventHandler } from "#nuxtseo/h3";
 export default defineEventHandler(async (e) => {
   if (import.meta.dev || import.meta.prerender) {
     const { sitemapChildXmlEventHandler } = await import("../../../sitemap/event-handlers.js");

package/dist/runtime/server/routes/__zero-runtime/sitemap.xml.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<string | void | ReadableStream<Uint8Array<ArrayBufferLike>>>>;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/routes/__zero-runtime/sitemap.xml.js

@@ -1,4 +1,4 @@
-import { createError, defineEventHandler } from "h3";
+import { createError, defineEventHandler } from "#nuxtseo/h3";
 export default defineEventHandler(async (e) => {
   if (import.meta.dev || import.meta.prerender) {
     const { sitemapXmlEventHandler } = await import("../../sitemap/event-handlers.js");

package/dist/runtime/server/routes/__zero-runtime/sitemap_index.xml.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<string | ReadableStream<Uint8Array<ArrayBufferLike>>>>;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/routes/__zero-runtime/sitemap_index.xml.js

@@ -1,4 +1,4 @@
-import { createError, defineEventHandler } from "h3";
+import { createError, defineEventHandler } from "#nuxtseo/h3";
 export default defineEventHandler(async (e) => {
   if (import.meta.dev || import.meta.prerender) {
     const { sitemapIndexXmlEventHandler } = await import("../../sitemap/event-handlers.js");

package/dist/runtime/server/routes/sitemap/[sitemap].xml.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<string | ReadableStream<Uint8Array<ArrayBufferLike>> | undefined>>;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/routes/sitemap/[sitemap].xml.js

@@ -1,3 +1,3 @@
-import { defineEventHandler } from "h3";
+import { defineEventHandler } from "#nuxtseo/h3";
 import { sitemapChildXmlEventHandler } from "../../sitemap/event-handlers.js";
 export default defineEventHandler(sitemapChildXmlEventHandler);

package/dist/runtime/server/routes/sitemap.xml.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<string | void | ReadableStream<Uint8Array<ArrayBufferLike>>>>;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/routes/sitemap.xml.js

@@ -1,3 +1,3 @@
-import { defineEventHandler } from "h3";
+import { defineEventHandler } from "#nuxtseo/h3";
 import { sitemapXmlEventHandler } from "../sitemap/event-handlers.js";
 export default defineEventHandler(sitemapXmlEventHandler);

package/dist/runtime/server/routes/sitemap.xsl.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<string>>;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/routes/sitemap.xsl.js

@@ -1,5 +1,5 @@
-import { defineEventHandler, getHeader, getQuery as h3GetQuery, setHeader } from "h3";
 import { getQuery, parseURL, withQuery } from "ufo";
+import { defineEventHandler, getHeader, getQuery as h3GetQuery, setHeader } from "#nuxtseo/h3";
 import { getSiteConfig } from "#site-config/server/composables";
 import { createSitePathResolver } from "#site-config/server/composables/utils";
 import { useSitemapRuntimeConfig, xmlEscape } from "../utils.js";

package/dist/runtime/server/routes/sitemap_index.xml.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<string | ReadableStream<Uint8Array<ArrayBufferLike>>>>;
+declare const _default: any;
 export default _default;

package/dist/runtime/server/routes/sitemap_index.xml.js

@@ -1,3 +1,3 @@
-import { defineEventHandler } from "h3";
+import { defineEventHandler } from "#nuxtseo/h3";
 import { sitemapIndexXmlEventHandler } from "../sitemap/event-handlers.js";
 export default defineEventHandler(sitemapIndexXmlEventHandler);

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-index.d.ts

@@ -1,10 +1,4 @@
-import type { NitroApp } from 'nitropack/types';
-import type { ModuleRuntimeConfig, NitroUrlResolvers, SitemapIndexEntry } from '../../../types.js';
-export declare function buildSitemapIndex(resolvers: NitroUrlResolvers, runtimeConfig: ModuleRuntimeConfig, nitro?: NitroApp): Promise<{
-    entries: SitemapIndexEntry[];
-    failedSources: Array<{
-        url: string;
-        error: string;
-    }>;
-}>;
+import type { ModuleRuntimeConfig, NitroUrlResolvers } from '../../../types.js';
+type NitroApp = ReturnType<typeof import('#nuxtseo/nitro').useNitroApp>;
+export declare function buildSitemapIndex(resolvers: NitroUrlResolvers, runtimeConfig: ModuleRuntimeConfig, nitro?: NitroApp): Promise<any>;
 export { urlsToIndexXml, urlsToIndexXmlStream } from './index-xml.js';

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

@@ -1,6 +1,6 @@
-import { getHeader } from "h3";
-import { defineCachedFunction } from "nitropack/runtime";
 import { joinURL } from "ufo";
+import { getHeader } from "#nuxtseo/h3";
+import { defineCachedFunction } from "#nuxtseo/nitro";
 import staticConfig from "#sitemap-virtual/static-config.mjs";
 import { normaliseDate } from "../urlset/normalise.js";
 import { getResolvedSitemapUrls } from "./sitemap.js";

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

@@ -1,12 +1,5 @@
-import type { H3Event } from 'h3';
-import type { NitroApp } from 'nitropack/types';
-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[];
+import type { ModuleRuntimeConfig, NitroUrlResolvers, ResolvedSitemapUrl, SitemapDefinition } from '../../../types.js';
+type NitroApp = ReturnType<typeof import('#nuxtseo/nitro').useNitroApp>;
 export interface ResolvedSitemapUrlsResult {
     urls: ResolvedSitemapUrl[];
     failedSources: Array<{
@@ -15,7 +8,7 @@ export interface ResolvedSitemapUrlsResult {
     }>;
 }
 export declare function buildResolvedSitemapUrls(effectiveSitemap: SitemapDefinition, matchName: string, isChunked: boolean, resolvers: NitroUrlResolvers, runtimeConfig: ModuleRuntimeConfig, nitro?: NitroApp): Promise<ResolvedSitemapUrlsResult>;
-export declare const buildResolvedSitemapUrlsCached: (_event: H3Event<import("h3").EventHandlerRequest>, effectiveSitemap: SitemapDefinition, matchName: string, isChunked: boolean, resolvers: NitroUrlResolvers, runtimeConfig: ModuleRuntimeConfig, nitro?: NitroApp | undefined) => Promise<ResolvedSitemapUrlsResult>;
+export declare const buildResolvedSitemapUrlsCached: any;
 export declare function getResolvedSitemapUrls(effectiveSitemap: SitemapDefinition, matchName: string, isChunked: boolean, resolvers: NitroUrlResolvers, runtimeConfig: ModuleRuntimeConfig, nitro?: NitroApp): Promise<ResolvedSitemapUrlsResult>;
 export declare function buildSitemapUrls(sitemap: SitemapDefinition, resolvers: NitroUrlResolvers, runtimeConfig: ModuleRuntimeConfig, nitro?: NitroApp): Promise<ResolvedSitemapUrlsResult>;
 export { urlsToXml, urlsToXmlStream } from './xml.js';

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

@@ -1,172 +1,14 @@
-import { getHeader } from "h3";
-import { defineCachedFunction, useRuntimeConfig } from "nitropack/runtime";
 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/server/sitemap/event-handlers.d.ts

@@ -1,4 +1,4 @@
-import type { H3Event } from 'h3';
-export declare function sitemapXmlEventHandler(e: H3Event): Promise<string | void | ReadableStream<Uint8Array<ArrayBufferLike>>>;
+import type { H3Event } from '#nuxtseo/h3';
+export declare function sitemapXmlEventHandler(e: H3Event): Promise<any>;
 export declare function sitemapIndexXmlEventHandler(e: H3Event): Promise<string | ReadableStream<Uint8Array<ArrayBufferLike>>>;
 export declare function sitemapChildXmlEventHandler(e: H3Event): Promise<string | ReadableStream<Uint8Array<ArrayBufferLike>> | undefined>;

package/dist/runtime/server/sitemap/event-handlers.js

@@ -1,6 +1,6 @@
-import { appendHeader, createError, getRequestURL, getRouterParam, sendRedirect } from "h3";
-import { useNitroApp, useRuntimeConfig } from "nitropack/runtime";
 import { joinURL, withBase, withLeadingSlash, withoutLeadingSlash, withoutTrailingSlash } from "ufo";
+import { appendHeader, createError, getRequestURL, getRouterParam, sendRedirect } from "#nuxtseo/h3";
+import { useNitroApp, useRuntimeConfig } from "#nuxtseo/nitro";
 import { useSitemapRuntimeConfig } from "../utils.js";
 import { urlsToIndexXml, urlsToIndexXmlStream } from "./builder/index-xml.js";
 import { buildSitemapIndex } from "./builder/sitemap-index.js";

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

@@ -1,7 +1,9 @@
-import type { H3Event } from 'h3';
-import type { NitroApp } from 'nitropack/types';
+import type { H3Event } from '#nuxtseo/h3';
 import type { ModuleRuntimeConfig, NitroUrlResolvers, SitemapDefinition } from '../../types.js';
+import { useNitroApp } from '#nuxtseo/nitro';
+type NitroApp = ReturnType<typeof useNitroApp>;
 export declare function useNitroUrlResolvers(e: H3Event): NitroUrlResolvers;
 export declare function renderSitemapOutput(nitro: NitroApp, event: H3Event, sitemapName: string, renderString: () => string, renderStream: () => ReadableStream<Uint8Array>, shouldStream: boolean, debug: boolean): Promise<string | ReadableStream<Uint8Array>>;
 export declare function setSitemapResponseHeaders(event: H3Event, runtimeConfig: ModuleRuntimeConfig): void;
 export declare function createSitemap(event: H3Event, definition: SitemapDefinition, runtimeConfig: ModuleRuntimeConfig): Promise<string | ReadableStream<Uint8Array<ArrayBufferLike>>>;
+export {};

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

@@ -1,9 +1,9 @@
 import { defu } from "defu";
-import { createError, getHeader, getQuery, setHeader } from "h3";
-import { defineCachedFunction, useNitroApp, useRuntimeConfig } from "nitropack/runtime";
 import { fixSlashes } from "nuxt-site-config/urls";
 import { createNitroRouteRuleMatcher } from "nuxtseo-shared/server";
 import { getPathRobotConfig } from "#internal/nuxt-robots/getPathRobotConfig";
+import { createError, getHeader, getQuery, setHeader } from "#nuxtseo/h3";
+import { defineCachedFunction, useNitroApp, useRuntimeConfig } from "#nuxtseo/nitro";
 import { getSiteConfig } from "#site-config/server/composables/getSiteConfig";
 import { createSitePathResolver } from "#site-config/server/composables/utils";
 import staticConfig from "#sitemap-virtual/static-config.mjs";

package/dist/runtime/server/sitemap/urlset/sources.d.ts

@@ -1,4 +1,4 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 import type { ModuleRuntimeConfig, SitemapSourceBase, SitemapSourceInput, SitemapSourceResolved } from '../../../types.js';
 export declare function normalizeSourceInput(source: SitemapSourceInput): SitemapSourceBase | SitemapSourceResolved;
 export declare function fetchDataSource(input: SitemapSourceBase | SitemapSourceResolved, event?: H3Event): Promise<SitemapSourceResolved>;

package/dist/runtime/server/sitemap/urlset/sources.js

@@ -1,7 +1,9 @@
 import { defu } from "defu";
-import { getRequestHost } from "h3";
+import { $fetch } from "ofetch";
 import { collectSitemap } from "sitemapd/parse";
 import { parseURL } from "ufo";
+import { getRequestHost } from "#nuxtseo/h3";
+import { fetchWithEvent } from "#nuxtseo/nitro";
 import { logger } from "../../../utils-pure.js";
 const changeFrequencies = /* @__PURE__ */ new Set([
   "always",
@@ -50,7 +52,7 @@ async function tryFetchWithFallback(url, options, event) {
       // Strategy 1: Use globalThis.$fetch (original approach)
       () => globalThis.$fetch(url, options),
       // Strategy 2: If event is available, try using event context even for external URLs
-      event ? () => event.$fetch(url, options) : null,
+      event ? () => fetchWithEvent(event, url, options) : null,
       // Strategy 3: Use native fetch as last resort
       () => $fetch(url, options)
     ].filter(Boolean);
@@ -65,8 +67,7 @@ async function tryFetchWithFallback(url, options, event) {
     }
     throw lastError;
   }
-  const fetchContainer = url.startsWith("/") && event ? event : globalThis;
-  return await fetchContainer.$fetch(url, options);
+  return event ? await fetchWithEvent(event, url, options) : await globalThis.$fetch(url, options);
 }
 export async function fetchDataSource(input, event) {
   const context = typeof input.context === "string" ? { name: input.context } : input.context || { name: "fetch" };

package/dist/runtime/server/utils.d.ts

@@ -1,4 +1,4 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 import type { ModuleRuntimeConfig } from '../types.js';
 export * from '../utils-pure.js';
 export declare function useSitemapRuntimeConfig(e?: H3Event): ModuleRuntimeConfig;

package/dist/runtime/server/utils.js

@@ -1,4 +1,4 @@
-import { useRuntimeConfig } from "nitropack/runtime";
+import { useRuntimeConfig } from "#nuxtseo/nitro";
 import staticConfig from "#sitemap-virtual/static-config.mjs";
 import { normalizeRuntimeFilters } from "../utils-pure.js";
 export * from "../utils-pure.js";

package/dist/runtime/types.d.ts

@@ -376,25 +376,25 @@ export interface SitemapDefinition {
      */
     _chunkCount?: number;
 }
-interface NitroBaseHook {
-    event: H3Event;
+interface NitroBaseHook<Event = H3Event> {
+    event: Event;
 }
-export interface SitemapIndexRenderCtx extends NitroBaseHook {
+export interface SitemapIndexRenderCtx<Event = H3Event> extends NitroBaseHook<Event> {
     sitemaps: SitemapIndexEntry[];
 }
-export interface SitemapRenderCtx extends NitroBaseHook {
+export interface SitemapRenderCtx<Event = H3Event> extends NitroBaseHook<Event> {
     sitemapName: string;
     urls: ResolvedSitemapUrl[];
 }
-export interface SitemapInputCtx extends NitroBaseHook {
+export interface SitemapInputCtx<Event = H3Event> extends NitroBaseHook<Event> {
     sitemapName: string;
     urls: SitemapUrlInput[];
 }
-export interface SitemapOutputHookCtx extends NitroBaseHook {
+export interface SitemapOutputHookCtx<Event = H3Event> extends NitroBaseHook<Event> {
     sitemapName: string;
     sitemap: string;
 }
-export interface SitemapSourcesHookCtx extends NitroBaseHook {
+export interface SitemapSourcesHookCtx<Event = H3Event> extends NitroBaseHook<Event> {
     sitemapName: string;
     sources: SitemapSourceInput[];
 }

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.2",
+  "version": "8.3.4",
   "description": "Powerfully flexible XML Sitemaps that integrate seamlessly, for Nuxt.",
   "author": {
     "name": "Harlan Wilton",
@@ -55,45 +55,45 @@
     }
   },
   "dependencies": {
-    "@nuxt/kit": "^4.5.1",
+    "@nuxt/kit": "^4.5.2",
     "consola": "^3.4.2",
     "defu": "^6.1.7",
-    "nuxt-site-config": "^4.1.2",
-    "nuxtseo-shared": "^5.3.6",
+    "nuxt-site-config": "^4.2.0",
+    "nuxtseo-shared": "^5.3.11",
     "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.0"
+    "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",
     "@nuxt/module-builder": "^1.0.3",
     "@nuxt/test-utils": "^4.1.0",
     "@nuxt/ui": "^4.10.0",
-    "@nuxtjs/i18n": "^10.5.0",
-    "@nuxtjs/robots": "^6.1.3",
+    "@nuxtjs/i18n": "^10.6.0",
+    "@nuxtjs/robots": "^6.1.4",
     "@vue/test-utils": "^2.4.11",
-    "better-sqlite3": "^13.0.1",
-    "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.21.4",
-    "nuxtseo-layer-devtools": "^5.3.6",
+    "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.8",
+    "vue-tsc": "^3.3.9",
     "zod": "^4.4.3",
-    "@nuxtjs/sitemap": "8.3.2"
+    "@nuxtjs/sitemap": "8.3.4"
   },
   "scripts": {
     "lint": "eslint .",
@@ -106,8 +106,9 @@
     "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxt prepare playground && pnpm run client:build",
     "release": "pnpm build && bumpp -x \"npx changelogen --output=CHANGELOG.md\"",
     "release:sitemapd": "pnpm --filter sitemapd release",
-    "test": "pnpm --filter sitemapd test && vitest run && pnpm run test:attw",
+    "test": "pnpm --filter sitemapd test && vitest run && pnpm run test:attw && pnpm run test:nuxt5",
     "test:unit": "vitest --project=unit",
+    "test:nuxt5": "pnpm pack --out test/fixtures/nuxt5/module.tgz && pnpm install --dir test/fixtures/nuxt5 --no-frozen-lockfile --update-checksums && pnpm --dir test/fixtures/nuxt5 test",
     "test:attw": "attw --pack && pnpm --filter sitemapd test:attw",
     "typecheck": "pnpm --filter sitemapd typecheck && nuxt typecheck"
   }