@nuxtjs/sitemap 7.5.2 → 8.0.0

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

@@ -1,11 +1,12 @@
+import { useRuntimeConfig } from "nitropack/runtime";
 import { resolveSitePath } from "nuxt-site-config/urls";
 import { joinURL, withHttps } from "ufo";
+import { applyDynamicParams, createPathFilter, findPageMapping, logger, splitForLocales } from "../../../utils-pure.js";
 import { preNormalizeEntry } from "../urlset/normalise.js";
-import { childSitemapSources, globalSitemapSources, resolveSitemapSources } from "../urlset/sources.js";
 import { sortInPlace } from "../urlset/sort.js";
-import { applyDynamicParams, createPathFilter, findPageMapping, splitForLocales } from "../../../utils-pure.js";
+import { childSitemapSources, globalSitemapSources, resolveSitemapSources } from "../urlset/sources.js";
 import { parseChunkInfo, sliceUrlsForChunk } from "../utils/chunk.js";
-export function resolveSitemapEntries(sitemap, urls, runtimeConfig, resolvers) {
+export function resolveSitemapEntries(sitemap, urls, runtimeConfig, resolvers, baseURL) {
   const {
     autoI18n,
     isI18nMapped
@@ -13,7 +14,7 @@ export function resolveSitemapEntries(sitemap, urls, runtimeConfig, resolvers) {
   const filterPath = createPathFilter({
     include: sitemap.include,
     exclude: sitemap.exclude
-  });
+  }, baseURL || "/");
   const _urls = urls.map((_e) => {
     const e = preNormalizeEntry(_e, resolvers);
     if (!e.loc || !filterPath(e.loc))
@@ -220,14 +221,30 @@ export async function buildSitemapUrls(sitemap, resolvers, runtimeConfig, nitro)
     event: resolvers.event
   };
   await nitro?.hooks.callHook("sitemap:input", resolvedCtx);
-  const enhancedUrls = resolveSitemapEntries(sitemap, resolvedCtx.urls, { autoI18n, isI18nMapped }, resolvers);
+  const enhancedUrls = resolveSitemapEntries(sitemap, resolvedCtx.urls, { autoI18n, isI18nMapped }, resolvers, useRuntimeConfig().app.baseURL);
+  if (isMultiSitemap) {
+    const sitemapNames = Object.keys(sitemaps).filter((k) => k !== "index");
+    const warnedSitemaps = nitro?._sitemapWarnedSitemaps || /* @__PURE__ */ new Set();
+    for (const e of enhancedUrls) {
+      const hasMatchingSitemap = typeof e._sitemap === "string" && (sitemapNames.includes(e._sitemap) || isI18nMapped && sitemapNames.some((name) => name.startsWith(`${e._sitemap}-`)));
+      if (typeof e._sitemap === "string" && !hasMatchingSitemap) {
+        if (!warnedSitemaps.has(e._sitemap)) {
+          warnedSitemaps.add(e._sitemap);
+          logger.error(`Sitemap \`${e._sitemap}\` not found in sitemap config. Available sitemaps: ${sitemapNames.join(", ")}. Entry \`${e.loc}\` will be omitted.`);
+        }
+      }
+    }
+    if (nitro) {
+      nitro._sitemapWarnedSitemaps = warnedSitemaps;
+    }
+  }
   const filteredUrls = enhancedUrls.filter((e) => {
     if (e._sitemap === false)
       return false;
     if (isMultiSitemap && e._sitemap && sitemap.sitemapName) {
       if (sitemap._isChunking)
-        return sitemap.sitemapName.startsWith(e._sitemap + "-");
-      return e._sitemap === sitemap.sitemapName;
+        return e._sitemap === baseSitemapName || isI18nMapped && sitemap.sitemapName.startsWith(`${e._sitemap}-`);
+      return e._sitemap === sitemap.sitemapName || isI18nMapped && sitemap.sitemapName.startsWith(`${e._sitemap}-`);
     }
     return true;
   });

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

@@ -5,13 +5,18 @@ export function escapeValueForXml(value) {
     return value ? "yes" : "no";
   return xmlEscape(String(value));
 }
-const yesNo = (v) => v === "yes" || v === true ? "yes" : "no";
+function yesNo(v) {
+  return v === "yes" || v === true ? "yes" : "no";
+}
 const URLSET_OPENING_TAG = '<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd http://www.google.com/schemas/sitemap-image/1.1 http://www.google.com/schemas/sitemap-image/1.1/sitemap-image.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">';
 function buildUrlXml(url, NL, I1, I2, I3, I4) {
   let xml = `${I1}<url>${NL}`;
-  if (url.loc) xml += `${I2}<loc>${xmlEscape(url.loc)}</loc>${NL}`;
-  if (url.lastmod) xml += `${I2}<lastmod>${url.lastmod}</lastmod>${NL}`;
-  if (url.changefreq) xml += `${I2}<changefreq>${url.changefreq}</changefreq>${NL}`;
+  if (url.loc)
+    xml += `${I2}<loc>${xmlEscape(url.loc)}</loc>${NL}`;
+  if (url.lastmod)
+    xml += `${I2}<lastmod>${url.lastmod}</lastmod>${NL}`;
+  if (url.changefreq)
+    xml += `${I2}<changefreq>${url.changefreq}</changefreq>${NL}`;
   if (url.priority !== void 0) {
     const p = typeof url.priority === "number" ? url.priority : Number.parseFloat(url.priority);
     xml += `${I2}<priority>${p.toFixed(1)}</priority>${NL}`;
@@ -26,29 +31,45 @@ function buildUrlXml(url, NL, I1, I2, I3, I4) {
   if (url.images) {
     for (const img of url.images) {
       xml += `${I2}<image:image>${NL}${I3}<image:loc>${xmlEscape(img.loc)}</image:loc>${NL}`;
-      if (img.title) xml += `${I3}<image:title>${xmlEscape(img.title)}</image:title>${NL}`;
-      if (img.caption) xml += `${I3}<image:caption>${xmlEscape(img.caption)}</image:caption>${NL}`;
-      if (img.geo_location) xml += `${I3}<image:geo_location>${xmlEscape(img.geo_location)}</image:geo_location>${NL}`;
-      if (img.license) xml += `${I3}<image:license>${xmlEscape(img.license)}</image:license>${NL}`;
+      if (img.title)
+        xml += `${I3}<image:title>${xmlEscape(img.title)}</image:title>${NL}`;
+      if (img.caption)
+        xml += `${I3}<image:caption>${xmlEscape(img.caption)}</image:caption>${NL}`;
+      if (img.geo_location)
+        xml += `${I3}<image:geo_location>${xmlEscape(img.geo_location)}</image:geo_location>${NL}`;
+      if (img.license)
+        xml += `${I3}<image:license>${xmlEscape(img.license)}</image:license>${NL}`;
       xml += `${I2}</image:image>${NL}`;
     }
   }
   if (url.videos) {
     for (const video of url.videos) {
       xml += `${I2}<video:video>${NL}${I3}<video:title>${xmlEscape(video.title)}</video:title>${NL}`;
-      if (video.thumbnail_loc) xml += `${I3}<video:thumbnail_loc>${xmlEscape(video.thumbnail_loc)}</video:thumbnail_loc>${NL}`;
+      if (video.thumbnail_loc)
+        xml += `${I3}<video:thumbnail_loc>${xmlEscape(video.thumbnail_loc)}</video:thumbnail_loc>${NL}`;
       xml += `${I3}<video:description>${xmlEscape(video.description)}</video:description>${NL}`;
-      if (video.content_loc) xml += `${I3}<video:content_loc>${xmlEscape(video.content_loc)}</video:content_loc>${NL}`;
-      if (video.player_loc) xml += `${I3}<video:player_loc>${xmlEscape(video.player_loc)}</video:player_loc>${NL}`;
-      if (video.duration !== void 0) xml += `${I3}<video:duration>${video.duration}</video:duration>${NL}`;
-      if (video.expiration_date) xml += `${I3}<video:expiration_date>${video.expiration_date}</video:expiration_date>${NL}`;
-      if (video.rating !== void 0) xml += `${I3}<video:rating>${video.rating}</video:rating>${NL}`;
-      if (video.view_count !== void 0) xml += `${I3}<video:view_count>${video.view_count}</video:view_count>${NL}`;
-      if (video.publication_date) xml += `${I3}<video:publication_date>${video.publication_date}</video:publication_date>${NL}`;
-      if (video.family_friendly !== void 0) xml += `${I3}<video:family_friendly>${yesNo(video.family_friendly)}</video:family_friendly>${NL}`;
-      if (video.restriction) xml += `${I3}<video:restriction relationship="${video.restriction.relationship || "allow"}">${xmlEscape(video.restriction.restriction)}</video:restriction>${NL}`;
-      if (video.platform) xml += `${I3}<video:platform relationship="${video.platform.relationship || "allow"}">${xmlEscape(video.platform.platform)}</video:platform>${NL}`;
-      if (video.requires_subscription !== void 0) xml += `${I3}<video:requires_subscription>${yesNo(video.requires_subscription)}</video:requires_subscription>${NL}`;
+      if (video.content_loc)
+        xml += `${I3}<video:content_loc>${xmlEscape(video.content_loc)}</video:content_loc>${NL}`;
+      if (video.player_loc)
+        xml += `${I3}<video:player_loc>${xmlEscape(video.player_loc)}</video:player_loc>${NL}`;
+      if (video.duration !== void 0)
+        xml += `${I3}<video:duration>${video.duration}</video:duration>${NL}`;
+      if (video.expiration_date)
+        xml += `${I3}<video:expiration_date>${video.expiration_date}</video:expiration_date>${NL}`;
+      if (video.rating !== void 0)
+        xml += `${I3}<video:rating>${video.rating}</video:rating>${NL}`;
+      if (video.view_count !== void 0)
+        xml += `${I3}<video:view_count>${video.view_count}</video:view_count>${NL}`;
+      if (video.publication_date)
+        xml += `${I3}<video:publication_date>${video.publication_date}</video:publication_date>${NL}`;
+      if (video.family_friendly !== void 0)
+        xml += `${I3}<video:family_friendly>${yesNo(video.family_friendly)}</video:family_friendly>${NL}`;
+      if (video.restriction)
+        xml += `${I3}<video:restriction relationship="${video.restriction.relationship || "allow"}">${xmlEscape(video.restriction.restriction)}</video:restriction>${NL}`;
+      if (video.platform)
+        xml += `${I3}<video:platform relationship="${video.platform.relationship || "allow"}">${xmlEscape(video.platform.platform)}</video:platform>${NL}`;
+      if (video.requires_subscription !== void 0)
+        xml += `${I3}<video:requires_subscription>${yesNo(video.requires_subscription)}</video:requires_subscription>${NL}`;
       if (video.price) {
         for (const price of video.price) {
           const c = price.currency ? ` currency="${price.currency}"` : "";
@@ -60,13 +81,16 @@ function buildUrlXml(url, NL, I1, I2, I3, I4) {
         const info = video.uploader.info ? ` info="${xmlEscape(video.uploader.info)}"` : "";
         xml += `${I3}<video:uploader${info}>${xmlEscape(video.uploader.uploader)}</video:uploader>${NL}`;
       }
-      if (video.live !== void 0) xml += `${I3}<video:live>${yesNo(video.live)}</video:live>${NL}`;
+      if (video.live !== void 0)
+        xml += `${I3}<video:live>${yesNo(video.live)}</video:live>${NL}`;
       if (video.tag) {
         const tags = Array.isArray(video.tag) ? video.tag : [video.tag];
         for (const t of tags) xml += `${I3}<video:tag>${xmlEscape(t)}</video:tag>${NL}`;
       }
-      if (video.category) xml += `${I3}<video:category>${xmlEscape(video.category)}</video:category>${NL}`;
-      if (video.gallery_loc) xml += `${I3}<video:gallery_loc>${xmlEscape(video.gallery_loc)}</video:gallery_loc>${NL}`;
+      if (video.category)
+        xml += `${I3}<video:category>${xmlEscape(video.category)}</video:category>${NL}`;
+      if (video.gallery_loc)
+        xml += `${I3}<video:gallery_loc>${xmlEscape(video.gallery_loc)}</video:gallery_loc>${NL}`;
       xml += `${I2}</video:video>${NL}`;
     }
   }
@@ -75,10 +99,16 @@ function buildUrlXml(url, NL, I1, I2, I3, I4) {
     xml += `${I4}<news:name>${xmlEscape(url.news.publication.name)}</news:name>${NL}`;
     xml += `${I4}<news:language>${xmlEscape(url.news.publication.language)}</news:language>${NL}`;
     xml += `${I3}</news:publication>${NL}`;
-    if (url.news.title) xml += `${I3}<news:title>${xmlEscape(url.news.title)}</news:title>${NL}`;
-    if (url.news.publication_date) xml += `${I3}<news:publication_date>${url.news.publication_date}</news:publication_date>${NL}`;
+    if (url.news.title)
+      xml += `${I3}<news:title>${xmlEscape(url.news.title)}</news:title>${NL}`;
+    if (url.news.publication_date)
+      xml += `${I3}<news:publication_date>${url.news.publication_date}</news:publication_date>${NL}`;
     xml += `${I2}</news:news>${NL}`;
   }
+  if (import.meta.dev && url._warnings?.length) {
+    for (const w of url._warnings)
+      xml += `${I2}<!-- WARN: ${w} -->${NL}`;
+  }
   xml += `${I1}</url>`;
   return xml;
 }

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

@@ -1,10 +1,10 @@
 import { appendHeader, createError, getRouterParam, sendRedirect, setHeader } from "h3";
-import { joinURL, withBase, withoutLeadingSlash, withoutTrailingSlash } from "ufo";
-import { useRuntimeConfig, useNitroApp } from "nitropack/runtime";
+import { useNitroApp, useRuntimeConfig } from "nitropack/runtime";
+import { joinURL, withBase, withLeadingSlash, withoutLeadingSlash, withoutTrailingSlash } from "ufo";
 import { useSitemapRuntimeConfig } from "../utils.js";
-import { createSitemap, useNitroUrlResolvers } from "./nitro.js";
 import { buildSitemapIndex, urlsToIndexXml } from "./builder/sitemap-index.js";
-import { parseChunkInfo, getSitemapConfig } from "./utils/chunk.js";
+import { createSitemap, useNitroUrlResolvers } from "./nitro.js";
+import { getSitemapConfig, parseChunkInfo } from "./utils/chunk.js";
 export async function sitemapXmlEventHandler(e) {
   const runtimeConfig = useSitemapRuntimeConfig();
   const { sitemaps } = runtimeConfig;
@@ -53,13 +53,22 @@ export async function sitemapChildXmlEventHandler(e) {
   let sitemapName = getRouterParam(e, "sitemap");
   if (!sitemapName) {
     const path = e.path;
-    const match = path.match(/(?:\/__sitemap__\/)?([^/]+)\.xml$/);
+    const match = path.match(/(?:\/__sitemap__\/)?(.+)\.xml$/);
     if (match)
       sitemapName = match[1];
   }
   if (!sitemapName)
     throw createError({ statusCode: 400, message: "Invalid sitemap request" });
-  sitemapName = withoutLeadingSlash(withoutTrailingSlash(sitemapName.replace(".xml", "").replace("__sitemap__/", "").replace(runtimeConfig.sitemapsPathPrefix || "", "")));
+  sitemapName = sitemapName.replace(/\.xml$/, "");
+  sitemapName = withLeadingSlash(sitemapName);
+  if (sitemapName.startsWith("/__sitemap__/"))
+    sitemapName = sitemapName.replace("/__sitemap__/", "/");
+  if (runtimeConfig.sitemapsPathPrefix) {
+    const prefix = withLeadingSlash(runtimeConfig.sitemapsPathPrefix);
+    if (sitemapName.startsWith(prefix))
+      sitemapName = sitemapName.replace(prefix, "/");
+  }
+  sitemapName = withoutLeadingSlash(withoutTrailingSlash(sitemapName));
   const chunkInfo = parseChunkInfo(sitemapName, sitemaps, runtimeConfig.defaultSitemapsChunkSize);
   const isAutoChunked = typeof sitemaps.chunks !== "undefined" && !Number.isNaN(Number(sitemapName));
   const sitemapExists = sitemapName in sitemaps || chunkInfo.baseSitemapName in sitemaps || isAutoChunked;

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

@@ -1,19 +1,19 @@
-import { getQuery, setHeader, createError, getHeader } from "h3";
-import { fixSlashes } from "nuxt-site-config/urls";
+import { getPathRobotConfig } from "#internal/nuxt-robots/getPathRobotConfig";
+import { getSiteConfig } from "#site-config/server/composables/getSiteConfig";
+import { createSitePathResolver } from "#site-config/server/composables/utils";
 import { defu } from "defu";
-import { useNitroApp, defineCachedFunction } from "nitropack/runtime";
+import { createError, getHeader, getQuery, setHeader } from "h3";
+import { defineCachedFunction, useNitroApp } from "nitropack/runtime";
+import { fixSlashes } from "nuxt-site-config/urls";
 import { logger, mergeOnKey, splitForLocales } from "../../utils-pure.js";
 import { createNitroRouteRuleMatcher } from "../kit.js";
 import { buildSitemapUrls, urlsToXml } from "./builder/sitemap.js";
 import { normaliseEntry, preNormalizeEntry } from "./urlset/normalise.js";
 import { sortInPlace } from "./urlset/sort.js";
-import { getPathRobotConfig } from "#internal/nuxt-robots/getPathRobotConfig";
-import { useSiteConfig } from "#site-config/server/composables/useSiteConfig";
-import { createSitePathResolver } from "#site-config/server/composables/utils";
 export function useNitroUrlResolvers(e) {
   const canonicalQuery = getQuery(e).canonical;
   const isShowingCanonical = typeof canonicalQuery !== "undefined" && canonicalQuery !== "false";
-  const siteConfig = useSiteConfig(e);
+  const siteConfig = getSiteConfig(e);
   return {
     event: e,
     fixSlashes: (path) => fixSlashes(siteConfig.trailingSlash, path),
@@ -30,7 +30,7 @@ async function buildSitemapXml(event, definition, resolvers, runtimeConfig) {
   const { sitemapName } = definition;
   const nitro = useNitroApp();
   if (import.meta.prerender) {
-    const config = useSiteConfig(event);
+    const config = getSiteConfig(event);
     if (!config.url && !nitro._sitemapWarned) {
       nitro._sitemapWarned = true;
       logger.error("Sitemap Site URL missing!");
@@ -42,6 +42,12 @@ async function buildSitemapXml(event, definition, resolvers, runtimeConfig) {
     }
   }
   const { urls: sitemapUrls, failedSources } = await buildSitemapUrls(definition, resolvers, runtimeConfig, nitro);
+  if (import.meta.prerender && failedSources.length) {
+    throw createError({
+      statusCode: 500,
+      message: `Sitemap generation failed due to ${failedSources.length} failed sources: ${failedSources.map((s) => `"${s.url}" (${s.error})`).join(", ")}`
+    });
+  }
   const routeRuleMatcher = createNitroRouteRuleMatcher();
   const { autoI18n } = runtimeConfig;
   let validCount = 0;
@@ -67,6 +73,9 @@ async function buildSitemapXml(event, definition, resolvers, runtimeConfig) {
     sitemapUrls[validCount++] = routeRules.sitemap ? defu(u, routeRules.sitemap) : u;
   }
   sitemapUrls.length = validCount;
+  if (import.meta.dev && validCount === 0 && sitemapUrls.length > 0) {
+    logger.warn(`Sitemap had ${sitemapUrls.length} that were all filtered out. This may be due to a robots rules blocking these URLs from indexing. Check your /** route rules or robots.txt configuration.`);
+  }
   const locSize = sitemapUrls.length;
   const resolvedCtx = {
     urls: sitemapUrls,

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

@@ -1,4 +1,5 @@
-import type { NitroUrlResolvers, ResolvedSitemapUrl, SitemapUrl } from '../../../types.js';
+import type { NitroUrlResolvers, ResolvedSitemapUrl, SitemapUrl, SitemapUrlInput } from '../../../types.js';
+export declare function validateSitemapUrl(url: SitemapUrlInput): string[];
 export declare function preNormalizeEntry(_e: SitemapUrl | string, resolvers?: NitroUrlResolvers): ResolvedSitemapUrl;
 export declare function isEncoded(url: string): boolean;
 export declare function normaliseEntry(_e: ResolvedSitemapUrl, defaults: Omit<SitemapUrl, 'loc'>, resolvers?: NitroUrlResolvers): ResolvedSitemapUrl;

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

@@ -1,3 +1,4 @@
+import { defu } from "defu";
 import {
   encodePath,
   hasProtocol,
@@ -8,8 +9,26 @@ import {
   stringifyQuery,
   withoutTrailingSlash
 } from "ufo";
-import { defu } from "defu";
 import { mergeOnKey } from "../../../utils-pure.js";
+const VALID_CHANGEFREQ = ["always", "hourly", "daily", "weekly", "monthly", "yearly", "never"];
+export function validateSitemapUrl(url) {
+  if (typeof url === "string")
+    return [];
+  const warnings = [];
+  if (url.lastmod) {
+    const d = typeof url.lastmod === "string" ? url.lastmod : void 0;
+    if (d && !isValidW3CDate(d))
+      warnings.push(`lastmod "${d}" is not a valid W3C date`);
+  }
+  if (url.changefreq && !VALID_CHANGEFREQ.includes(url.changefreq))
+    warnings.push(`changefreq "${url.changefreq}" is not valid (expected: always|hourly|daily|weekly|monthly|yearly|never)`);
+  if (url.priority !== void 0) {
+    const p = typeof url.priority === "number" ? url.priority : Number.parseFloat(String(url.priority));
+    if (Number.isNaN(p) || p < 0 || p > 1)
+      warnings.push(`priority "${url.priority}" is not valid (expected: number between 0.0 and 1.0)`);
+  }
+  return warnings;
+}
 function resolve(s, resolvers) {
   if (typeof s === "undefined")
     return void 0;
@@ -69,6 +88,11 @@ export function isEncoded(url) {
 }
 export function normaliseEntry(_e, defaults, resolvers) {
   const e = defu(_e, defaults);
+  if (import.meta.dev) {
+    const warnings = validateSitemapUrl(e);
+    if (warnings.length)
+      e._warnings = (e._warnings || []).concat(warnings);
+  }
   if (e.lastmod) {
     const date = normaliseDate(e.lastmod);
     if (date)

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

@@ -1,8 +1,8 @@
-import { getRequestHost } from "h3";
+import { parseSitemapXml } from "@nuxtjs/sitemap/utils";
 import { defu } from "defu";
+import { getRequestHost } from "h3";
 import { parseURL } from "ufo";
 import { logger } from "../../../utils-pure.js";
-import { parseSitemapXml } from "@nuxtjs/sitemap/utils";
 export function normalizeSourceInput(source) {
   if (typeof source === "string") {
     return { context: { name: "hook" }, fetch: source };
@@ -54,7 +54,7 @@ export async function fetchDataSource(input, event) {
       {
         Accept: isXmlRequest ? "text/xml" : "application/json"
       },
-      event ? { host: getRequestHost(event, { xForwardedHost: true }) } : {}
+      event && !isExternalUrl ? { host: getRequestHost(event, { xForwardedHost: true }) } : {}
     );
     const fetchOptions = {
       ...options,

package/dist/runtime/types.d.ts

@@ -1,7 +1,7 @@
-import type { FetchOptions } from 'ofetch';
+import type { NuxtI18nOptions } from '@nuxtjs/i18n';
 import type { H3Event } from 'h3';
+import type { FetchOptions } from 'ofetch';
 import type { ParsedURL } from 'ufo';
-import type { NuxtI18nOptions } from '@nuxtjs/i18n';
 export interface ModuleOptions extends SitemapDefinition {
     /**
      * Whether the sitemap.xml should be generated.
@@ -188,6 +188,10 @@ export interface SitemapSourceResolved extends Omit<SitemapSourceBase, 'urls'> {
     error?: any;
     timeTakenMs?: number;
     _isFailure?: boolean;
+    _urlWarnings?: {
+        loc: string;
+        message: string;
+    }[];
 }
 export type AppSourceContext = 'nuxt:pages' | 'nuxt:prerender' | 'nuxt:route-rules' | '@nuxtjs/i18n:pages' | '@nuxt/content:document-driven';
 export type SitemapSourceInput = string | [string, FetchOptions] | SitemapSourceBase | SitemapSourceResolved;
@@ -202,10 +206,10 @@ interface LocaleObject extends Record<string, any> {
         path: string;
         cache?: boolean;
     };
-    files?: string[] | {
+    files?: (string | {
         path: string;
         cache?: boolean;
-    }[];
+    })[];
     isCatchallLocale?: boolean;
     /**
      * @deprecated in v9, use `language` instead
@@ -265,6 +269,10 @@ export type ResolvedSitemapUrl = Omit<SitemapUrl, 'url'> & Required<Pick<Sitemap
      * @internal
      */
     _abs: boolean;
+    /**
+     * @internal
+     */
+    _warnings?: string[];
 };
 export interface SitemapDefinition {
     /**
@@ -400,6 +408,7 @@ export interface SitemapUrl {
      */
     _encoded?: boolean;
 }
+export type SitemapItemDefaults = Omit<SitemapUrl, 'loc'>;
 export type SitemapStrict = Required<SitemapUrl>;
 export interface AlternativeEntry {
     hreflang: string;
@@ -481,8 +490,5 @@ export interface NitroUrlResolvers {
     relativeBaseUrlResolver: (path: string) => string;
     fixSlashes: (path: string) => string;
 }
-interface NuxtI18nMicro {
-    includeDefaultLocaleRoute?: boolean;
-}
-export type I18nIntegrationOptions = NuxtI18nOptions & NuxtI18nMicro;
+export type I18nIntegrationOptions = NuxtI18nOptions;
 export {};

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

@@ -1,4 +1,5 @@
 import type { FilterInput } from './types.js';
+export { createFilter, type CreateFilterOptions } from 'nuxtseo-shared/utils';
 export declare const logger: import("consola").ConsolaInstance;
 export declare function mergeOnKey<T, K extends keyof T>(arr: T[], key: K): T[];
 export declare function splitForLocales(path: string, locales: string[]): [string | null, string];
@@ -6,15 +7,13 @@ export declare function splitForLocales(path: string, locales: string[]): [strin
  * Transform a literal notation string regex to RegExp
  */
 export declare function normalizeRuntimeFilters(input?: FilterInput[]): (RegExp | string)[];
-export interface CreateFilterOptions {
+export declare function createPathFilter(options?: {
     include?: (FilterInput | string | RegExp)[];
     exclude?: (FilterInput | string | RegExp)[];
-}
-export declare function createPathFilter(options?: CreateFilterOptions): (loc: string) => boolean;
+}, baseURL?: string): (loc: 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>>): PageMatch | null;
 export declare function applyDynamicParams(customPath: string, paramSegments: string[]): string;
-export declare function createFilter(options?: CreateFilterOptions): (path: string) => boolean;

package/dist/runtime/utils-pure.js

@@ -1,7 +1,8 @@
-import { createDefu } from "defu";
-import { parseURL, withLeadingSlash } from "ufo";
-import { createRouter, toRouteMatcher } from "radix3";
 import { createConsola } from "consola";
+import { createDefu } from "defu";
+import { createFilter } from "nuxtseo-shared/utils";
+import { parseURL, withLeadingSlash, withoutBase } from "ufo";
+export { createFilter } from "nuxtseo-shared/utils";
 export const logger = createConsola({
   defaults: {
     tag: "@nuxt/sitemap"
@@ -46,8 +47,12 @@ export function normalizeRuntimeFilters(input) {
     return false;
   }).filter(Boolean);
 }
-export function createPathFilter(options = {}) {
-  const urlFilter = createFilter(options);
+export function createPathFilter(options = {}, baseURL) {
+  const urlFilter = createFilter({
+    include: normalizeRuntimeFilters(options.include),
+    exclude: normalizeRuntimeFilters(options.exclude)
+  });
+  const hasBase = baseURL && baseURL !== "/";
   return (loc) => {
     let path = loc;
     try {
@@ -55,6 +60,8 @@ export function createPathFilter(options = {}) {
     } catch {
       return false;
     }
+    if (hasBase)
+      path = withoutBase(path, baseURL);
     return urlFilter(path);
   };
 }
@@ -65,7 +72,7 @@ export function findPageMapping(pathWithoutPrefix, pages) {
     return { mappings: pages[pageKey], paramSegments: [] };
   const sortedKeys = Object.keys(pages).sort((a, b) => b.length - a.length);
   for (const key of sortedKeys) {
-    if (pageKey.startsWith(key + "/")) {
+    if (pageKey.startsWith(`${key}/`)) {
       const paramPath = pageKey.slice(key.length + 1);
       return { mappings: pages[key], paramSegments: paramPath.split("/") };
     }
@@ -78,38 +85,3 @@ export function applyDynamicParams(customPath, paramSegments) {
   let i = 0;
   return customPath.replace(/\[[^\]]+\]/g, () => paramSegments[i++] || "");
 }
-export function createFilter(options = {}) {
-  const include = options.include || [];
-  const exclude = options.exclude || [];
-  if (include.length === 0 && exclude.length === 0)
-    return () => true;
-  const excludeRegex = exclude.filter((r) => r instanceof RegExp);
-  const includeRegex = include.filter((r) => r instanceof RegExp);
-  const excludeStrings = exclude.filter((r) => typeof r === "string");
-  const includeStrings = include.filter((r) => typeof r === "string");
-  const excludeMatcher = excludeStrings.length > 0 ? toRouteMatcher(createRouter({
-    routes: Object.fromEntries(excludeStrings.map((r) => [r, true])),
-    strictTrailingSlash: false
-  })) : null;
-  const includeMatcher = includeStrings.length > 0 ? toRouteMatcher(createRouter({
-    routes: Object.fromEntries(includeStrings.map((r) => [r, true])),
-    strictTrailingSlash: false
-  })) : null;
-  const excludeExact = new Set(excludeStrings);
-  const includeExact = new Set(includeStrings);
-  return function(path) {
-    if (excludeRegex.some((r) => r.test(path)))
-      return false;
-    if (excludeExact.has(path))
-      return false;
-    if (excludeMatcher && excludeMatcher.matchAll(path).length > 0)
-      return false;
-    if (includeRegex.some((r) => r.test(path)))
-      return true;
-    if (includeExact.has(path))
-      return true;
-    if (includeMatcher && includeMatcher.matchAll(path).length > 0)
-      return true;
-    return include.length === 0;
-  };
-}

package/dist/shared/{sitemap.Bj0OAEtK.mjs → sitemap.B99ug6A9.mjs}

@@ -2,9 +2,11 @@ import { parseURL } from 'ufo';
 import { parse, walkSync, ELEMENT_NODE } from 'ultrahtml';
 
 function isValidUrl(url) {
-  if (!url || typeof url !== "string") return false;
+  if (!url || typeof url !== "string")
+    return false;
   const trimmed = url.trim();
-  if (!trimmed) return false;
+  if (!trimmed)
+    return false;
   if (trimmed.startsWith("data:") || trimmed.startsWith("blob:") || trimmed.startsWith("file:")) {
     return false;
   }
@@ -19,11 +21,13 @@ function isValidString(value) {
   return typeof value === "string" && value.trim().length > 0;
 }
 function sanitizeString(value) {
-  if (!isValidString(value)) return "";
+  if (!isValidString(value))
+    return "";
   return String(value).trim().replace(/[\x00-\x1F\x7F-\x9F]/g, "");
 }
 function isValidDate(dateString) {
-  if (!dateString) return false;
+  if (!dateString)
+    return false;
   const date = new Date(dateString);
   return !Number.isNaN(date.getTime()) && date.getFullYear() > 1900 && date.getFullYear() < 3e3;
 }
@@ -180,7 +184,7 @@ function parseHtmlExtractSitemapMeta(html, options) {
     }
   });
   if (options?.images && images.size > 0) {
-    payload.images = [...images].map((i) => ({ loc: i }));
+    payload.images = Array.from(images, (i) => ({ loc: i }));
   }
   if (options?.videos) {
     const processedVideos = [];

package/dist/utils.d.mts

@@ -1,6 +1,14 @@
-import { SitemapUrlInput, SitemapUrl } from '../dist/runtime/types.js';
+import { SitemapUrl, SitemapUrlInput } from '../dist/runtime/types.js';
 export * from '../dist/runtime/types.js';
 
+declare function parseHtmlExtractSitemapMeta(html: string, options?: {
+    images?: boolean;
+    videos?: boolean;
+    lastmod?: boolean;
+    alternatives?: boolean;
+    resolveUrl?: (s: string) => string;
+}): Partial<SitemapUrl> | null;
+
 interface SitemapWarning {
     type: 'validation';
     message: string;
@@ -16,13 +24,16 @@ interface SitemapParseResult {
 }
 declare function parseSitemapXml(xml: string): Promise<SitemapParseResult>;
 
-declare function parseHtmlExtractSitemapMeta(html: string, options?: {
-    images?: boolean;
-    videos?: boolean;
-    lastmod?: boolean;
-    alternatives?: boolean;
-    resolveUrl?: (s: string) => string;
-}): Partial<SitemapUrl> | null;
+interface SitemapIndexEntry {
+    loc: string;
+    lastmod?: string;
+}
+interface SitemapIndexParseResult {
+    entries: SitemapIndexEntry[];
+    warnings: SitemapWarning[];
+}
+declare function parseSitemapIndex(xml: string): SitemapIndexParseResult;
+declare function isSitemapIndex(xml: string): boolean;
 
-export { parseHtmlExtractSitemapMeta, parseSitemapXml };
-export type { SitemapParseResult, SitemapWarning };
+export { isSitemapIndex, parseHtmlExtractSitemapMeta, parseSitemapIndex, parseSitemapXml };
+export type { SitemapIndexEntry, SitemapIndexParseResult, SitemapParseResult, SitemapWarning };

package/dist/utils.d.ts

@@ -1,6 +1,14 @@
-import { SitemapUrlInput, SitemapUrl } from '../dist/runtime/types.js';
+import { SitemapUrl, SitemapUrlInput } from '../dist/runtime/types.js';
 export * from '../dist/runtime/types.js';
 
+declare function parseHtmlExtractSitemapMeta(html: string, options?: {
+    images?: boolean;
+    videos?: boolean;
+    lastmod?: boolean;
+    alternatives?: boolean;
+    resolveUrl?: (s: string) => string;
+}): Partial<SitemapUrl> | null;
+
 interface SitemapWarning {
     type: 'validation';
     message: string;
@@ -16,13 +24,16 @@ interface SitemapParseResult {
 }
 declare function parseSitemapXml(xml: string): Promise<SitemapParseResult>;
 
-declare function parseHtmlExtractSitemapMeta(html: string, options?: {
-    images?: boolean;
-    videos?: boolean;
-    lastmod?: boolean;
-    alternatives?: boolean;
-    resolveUrl?: (s: string) => string;
-}): Partial<SitemapUrl> | null;
+interface SitemapIndexEntry {
+    loc: string;
+    lastmod?: string;
+}
+interface SitemapIndexParseResult {
+    entries: SitemapIndexEntry[];
+    warnings: SitemapWarning[];
+}
+declare function parseSitemapIndex(xml: string): SitemapIndexParseResult;
+declare function isSitemapIndex(xml: string): boolean;
 
-export { parseHtmlExtractSitemapMeta, parseSitemapXml };
-export type { SitemapParseResult, SitemapWarning };
+export { isSitemapIndex, parseHtmlExtractSitemapMeta, parseSitemapIndex, parseSitemapXml };
+export type { SitemapIndexEntry, SitemapIndexParseResult, SitemapParseResult, SitemapWarning };