@nuxtjs/sitemap 7.3.0 → 7.4.0

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

@@ -1,6 +1,6 @@
-import { defineEventHandler, getHeader, setHeader } from "h3";
+import { defineEventHandler, getHeader, setHeader, getQuery as h3GetQuery } from "h3";
 import { getQuery, parseURL, withQuery } from "ufo";
-import { useSitemapRuntimeConfig } from "../utils.js";
+import { useSitemapRuntimeConfig, xmlEscape } from "../utils.js";
 import { useSiteConfig } from "#site-config/server/composables/useSiteConfig";
 import { createSitePathResolver } from "#site-config/server/composables/utils";
 export default defineEventHandler(async (e) => {
@@ -23,17 +23,37 @@ export default defineEventHandler(async (e) => {
   const isShowingCanonical = typeof canonicalQuery !== "undefined" && canonicalQuery !== "false";
   const conditionalTips = [
     'You are looking at a <a href="https://developer.mozilla.org/en-US/docs/Web/XSLT/Transforming_XML_with_XSLT/An_Overview" style="color: #398465" target="_blank">XML stylesheet</a>. Read the <a href="https://nuxtseo.com/sitemap/guides/customising-ui" style="color: #398465" target="_blank">docs</a> to learn how to customize it. View the page source to see the raw XML.',
-    `URLs missing? Check Nuxt Devtools Sitemap tab (or the <a href="${withQuery("/__sitemap__/debug.json", { sitemap: sitemapName })}" style="color: #398465" target="_blank">debug endpoint</a>).`
+    `URLs missing? Check Nuxt Devtools Sitemap tab (or the <a href="${xmlEscape(withQuery("/__sitemap__/debug.json", { sitemap: sitemapName }))}" style="color: #398465" target="_blank">debug endpoint</a>).`
   ];
+  const fetchErrors = [];
+  const xslQuery = h3GetQuery(e);
+  if (xslQuery.error_messages) {
+    const errorMessages = xslQuery.error_messages;
+    const errorUrls = xslQuery.error_urls;
+    if (errorMessages) {
+      const messages = Array.isArray(errorMessages) ? errorMessages : [errorMessages];
+      const urls = Array.isArray(errorUrls) ? errorUrls : errorUrls ? [errorUrls] : [];
+      messages.forEach((msg, i) => {
+        const errorParts = [xmlEscape(msg)];
+        if (urls[i]) {
+          errorParts.push(xmlEscape(urls[i]));
+        }
+        fetchErrors.push(`<strong style="color: #dc2626;">Error ${i + 1}:</strong> ${errorParts.join(" - ")}`);
+      });
+    }
+  }
   if (!isShowingCanonical) {
     const canonicalPreviewUrl = withQuery(referrer, { canonical: "" });
-    conditionalTips.push(`Your canonical site URL is <strong>${siteUrl}</strong>.`);
-    conditionalTips.push(`You can preview your canonical sitemap by visiting <a href="${canonicalPreviewUrl}" style="color: #398465; white-space: nowrap;">${fixPath(canonicalPreviewUrl)}?canonical</a>`);
+    conditionalTips.push(`Your canonical site URL is <strong>${xmlEscape(siteUrl)}</strong>.`);
+    conditionalTips.push(`You can preview your canonical sitemap by visiting <a href="${xmlEscape(canonicalPreviewUrl)}" style="color: #398465; white-space: nowrap;">${xmlEscape(fixPath(canonicalPreviewUrl))}?canonical</a>`);
   } else {
-    conditionalTips.push(`You are viewing the canonical sitemap. You can switch to using the request origin: <a href="${fixPath(referrer)}" style="color: #398465; white-space: nowrap ">${fixPath(referrer)}</a>`);
+    conditionalTips.push(`You are viewing the canonical sitemap. You can switch to using the request origin: <a href="${xmlEscape(fixPath(referrer))}" style="color: #398465; white-space: nowrap ">${xmlEscape(fixPath(referrer))}</a>`);
   }
-  const tips = conditionalTips.map((t) => `<li><p>${t}</p></li>`).join("\n");
-  const showTips = import.meta.dev && xslTips !== false;
+  const hasRuntimeErrors = fetchErrors.length > 0;
+  const showDevTips = import.meta.dev && xslTips !== false;
+  const showSidebar = showDevTips || hasRuntimeErrors;
+  const devTips = showDevTips ? conditionalTips.map((t) => `<li><p>${t}</p></li>`).join("\n") : "";
+  const runtimeErrors = hasRuntimeErrors ? fetchErrors.map((t) => `<li><p>${t}</p></li>`).join("\n") : "";
   let columns = [...xslColumns];
   if (!columns.length) {
     columns = [
@@ -97,12 +117,12 @@ export default defineEventHandler(async (e) => {
           }
 
           .expl a {
-            color: #398465
+            color: #398465;
             font-weight: 600;
           }
 
           .expl a:visited {
-            color: #398465
+            color: #398465;
           }
 
           a {
@@ -153,8 +173,8 @@ export default defineEventHandler(async (e) => {
             <div>
              <div id="content">
           <h1 class="text-2xl mb-3">XML Sitemap</h1>
-          <h2>${title}</h2>
-          ${isNotIndexButHasIndex ? `<p style="font-size: 12px; margin-bottom: 1rem;"><a href="${fixPath("/sitemap_index.xml")}">${fixPath("/sitemap_index.xml")}</a></p>` : ""}
+          <h2>${xmlEscape(title)}</h2>
+          ${isNotIndexButHasIndex ? `<p style="font-size: 12px; margin-bottom: 1rem;"><a href="${xmlEscape(fixPath("/sitemap_index.xml"))}">${xmlEscape(fixPath("/sitemap_index.xml"))}</a></p>` : ""}
           <xsl:if test="count(sitemap:sitemapindex/sitemap:sitemap) &gt; 0">
             <p class="expl" style="margin-bottom: 1rem;">
               This XML Sitemap Index file contains
@@ -221,7 +241,11 @@ export default defineEventHandler(async (e) => {
           </xsl:if>
         </div>
         </div>
-                    ${showTips ? `<div class="w-30 top-2 shadow rounded p-5 right-2" style="margin: 0 auto;"><p><strong>Sitemap Tips (development only)</strong></p><ul style="margin: 1rem; padding: 0;">${tips}</ul><p style="margin-top: 1rem;">${creditName}</p></div>` : ""}
+                    ${showSidebar ? `<div class="w-30 top-2 shadow rounded p-5 right-2" style="margin: 0 auto;">
+                      ${showDevTips ? `<div><p><strong>Development Tips</strong></p><ul style="margin: 1rem 0; padding: 0;">${devTips}</ul></div>` : ""}
+                      ${hasRuntimeErrors ? `<div${showDevTips ? ' style="margin-top: 1.5rem; padding-top: 1rem; border-top: 1px solid #e5e7eb;"' : ""}><p><strong style="color: #dc2626;">Runtime Errors</strong></p><ul style="margin: 1rem 0; padding: 0;">${runtimeErrors}</ul></div>` : ""}
+                      ${showDevTips ? `<p style="margin-top: 1rem;">${creditName}</p>` : ""}
+                    </div>` : ""}
         </div>
       </body>
     </html>

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

@@ -8,7 +8,7 @@ export default defineEventHandler(async (e) => {
   const runtimeConfig = useSitemapRuntimeConfig();
   const nitro = useNitroApp();
   const resolvers = useNitroUrlResolvers(e);
-  const sitemaps = await buildSitemapIndex(resolvers, runtimeConfig, nitro);
+  const { entries: sitemaps, failedSources } = await buildSitemapIndex(resolvers, runtimeConfig, nitro);
   if (import.meta.prerender) {
     appendHeader(
       e,
@@ -18,7 +18,11 @@ export default defineEventHandler(async (e) => {
   }
   const indexResolvedCtx = { sitemaps, event: e };
   await nitro.hooks.callHook("sitemap:index-resolved", indexResolvedCtx);
-  const output = urlsToIndexXml(indexResolvedCtx.sitemaps, resolvers, runtimeConfig);
+  const errorInfo = failedSources.length > 0 ? {
+    messages: failedSources.map((f) => f.error),
+    urls: failedSources.map((f) => f.url)
+  } : void 0;
+  const output = urlsToIndexXml(indexResolvedCtx.sitemaps, resolvers, runtimeConfig, errorInfo);
   const ctx = { sitemap: output, sitemapName: "sitemap", event: e };
   await nitro.hooks.callHook("sitemap:output", ctx);
   setHeader(e, "Content-Type", "text/xml; charset=UTF-8");

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

@@ -1,4 +1,13 @@
 import type { NitroApp } from 'nitropack/types';
 import type { ModuleRuntimeConfig, NitroUrlResolvers, SitemapIndexEntry } from '../../../types.js';
-export declare function urlsToIndexXml(sitemaps: SitemapIndexEntry[], resolvers: NitroUrlResolvers, { version, xsl, credits, minify }: Pick<ModuleRuntimeConfig, 'version' | 'xsl' | 'credits' | 'minify'>): string;
-export declare function buildSitemapIndex(resolvers: NitroUrlResolvers, runtimeConfig: ModuleRuntimeConfig, nitro?: NitroApp): Promise<SitemapIndexEntry[]>;
+export declare function urlsToIndexXml(sitemaps: SitemapIndexEntry[], resolvers: NitroUrlResolvers, { version, xsl, credits, minify }: Pick<ModuleRuntimeConfig, 'version' | 'xsl' | 'credits' | 'minify'>, errorInfo?: {
+    messages: string[];
+    urls: string[];
+}): string;
+export declare function buildSitemapIndex(resolvers: NitroUrlResolvers, runtimeConfig: ModuleRuntimeConfig, nitro?: NitroApp): Promise<{
+    entries: SitemapIndexEntry[];
+    failedSources: Array<{
+        url: string;
+        error: string;
+    }>;
+}>;

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

@@ -1,5 +1,5 @@
 import { defu } from "defu";
-import { joinURL } from "ufo";
+import { joinURL, withQuery } from "ufo";
 import { defineCachedFunction } from "nitropack/runtime";
 import { getHeader } from "h3";
 import { normaliseDate } from "../urlset/normalise.js";
@@ -45,6 +45,7 @@ async function buildSitemapIndexInternal(resolvers, runtimeConfig, nitro) {
     return sortEntries ? sortInPlace(urls) : urls;
   }
   const chunks = {};
+  const allFailedSources = [];
   for (const sitemapName in sitemaps) {
     if (sitemapName === "index" || sitemapName === "chunks") continue;
     const sitemapConfig = sitemaps[sitemapName];
@@ -68,6 +69,11 @@ async function buildSitemapIndexInternal(resolvers, runtimeConfig, nitro) {
       sourcesInput = ctx.sources;
     }
     const sources = await resolveSitemapSources(sourcesInput, resolvers.event);
+    const failedSources = sources.filter((source) => source.error && source._isFailure).map((source) => ({
+      url: typeof source.fetch === "string" ? source.fetch : source.fetch?.[0] || "unknown",
+      error: source.error || "Unknown error"
+    }));
+    allFailedSources.push(...failedSources);
     const resolvedCtx = {
       urls: sources.flatMap((s) => s.urls),
       sitemapName: sitemap.sitemapName,
@@ -113,6 +119,11 @@ async function buildSitemapIndexInternal(resolvers, runtimeConfig, nitro) {
         sourcesInput = ctx.sources;
       }
       const sources = await resolveSitemapSources(sourcesInput, resolvers.event);
+      const failedSources = sources.filter((source) => source.error && source._isFailure).map((source) => ({
+        url: typeof source.fetch === "string" ? source.fetch : source.fetch?.[0] || "unknown",
+        error: source.error || "Unknown error"
+      }));
+      allFailedSources.push(...failedSources);
       const resolvedCtx = {
         urls: sources.flatMap((s) => s.urls),
         sitemapName: sitemapConfig.sitemapName,
@@ -144,9 +155,9 @@ async function buildSitemapIndexInternal(resolvers, runtimeConfig, nitro) {
       return typeof entry === "string" ? { sitemap: entry } : entry;
     }));
   }
-  return entries;
+  return { entries, failedSources: allFailedSources };
 }
-export function urlsToIndexXml(sitemaps, resolvers, { version, xsl, credits, minify }) {
+export function urlsToIndexXml(sitemaps, resolvers, { version, xsl, credits, minify }, errorInfo) {
   const sitemapXml = sitemaps.map((e) => [
     "    <sitemap>",
     `        <loc>${escapeValueForXml(e.sitemap)}</loc>`,
@@ -158,7 +169,14 @@ export function urlsToIndexXml(sitemaps, resolvers, { version, xsl, credits, min
     '<?xml version="1.0" encoding="UTF-8"?>'
   ];
   if (xsl) {
-    const relativeBaseUrl = resolvers.relativeBaseUrlResolver?.(xsl) ?? xsl;
+    let relativeBaseUrl = resolvers.relativeBaseUrlResolver?.(xsl) ?? xsl;
+    if (errorInfo && errorInfo.messages.length > 0) {
+      relativeBaseUrl = withQuery(relativeBaseUrl, {
+        errors: "true",
+        error_messages: errorInfo.messages,
+        error_urls: errorInfo.urls
+      });
+    }
     xmlParts.push(`<?xml-stylesheet type="text/xsl" href="${escapeValueForXml(relativeBaseUrl)}"?>`);
   }
   xmlParts.push(
@@ -172,7 +190,7 @@ export function urlsToIndexXml(sitemaps, resolvers, { version, xsl, credits, min
   return minify ? xmlParts.join("").replace(/(?<!<[^>]*)\s(?![^<]*>)/g, "") : xmlParts.join("\n");
 }
 export async function buildSitemapIndex(resolvers, runtimeConfig, nitro) {
-  if (!import.meta.dev && !!runtimeConfig.cacheMaxAgeSeconds && runtimeConfig.cacheMaxAgeSeconds > 0 && resolvers.event) {
+  if (!import.meta.dev && typeof runtimeConfig.cacheMaxAgeSeconds === "number" && runtimeConfig.cacheMaxAgeSeconds > 0 && resolvers.event) {
     return buildSitemapIndexCached(resolvers.event, resolvers, runtimeConfig, nitro);
   }
   return buildSitemapIndexInternal(resolvers, runtimeConfig, nitro);

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

@@ -6,5 +6,11 @@ export interface NormalizedI18n extends ResolvedSitemapUrl {
     _index?: number;
 }
 export declare function resolveSitemapEntries(sitemap: SitemapDefinition, urls: SitemapUrlInput[], runtimeConfig: Pick<ModuleRuntimeConfig, 'autoI18n' | 'isI18nMapped'>, resolvers?: NitroUrlResolvers): ResolvedSitemapUrl[];
-export declare function buildSitemapUrls(sitemap: SitemapDefinition, resolvers: NitroUrlResolvers, runtimeConfig: ModuleRuntimeConfig, nitro?: NitroApp): Promise<ResolvedSitemapUrl[]>;
+export declare function buildSitemapUrls(sitemap: SitemapDefinition, resolvers: NitroUrlResolvers, runtimeConfig: ModuleRuntimeConfig, nitro?: NitroApp): Promise<{
+    urls: ResolvedSitemapUrl[];
+    failedSources: Array<{
+        url: string;
+        error: string;
+    }>;
+}>;
 export { urlsToXml } from './xml.js';

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

@@ -182,11 +182,11 @@ export async function buildSitemapUrls(sitemap, resolvers, runtimeConfig, nitro)
     defaultSitemapsChunkSize
   } = runtimeConfig;
   const chunkInfo = parseChunkInfo(sitemap.sitemapName, sitemaps, defaultSitemapsChunkSize);
-  function maybeSort(urls) {
-    return sortEntries ? sortInPlace(urls) : urls;
+  function maybeSort(urls2) {
+    return sortEntries ? sortInPlace(urls2) : urls2;
   }
-  function maybeSlice(urls) {
-    return sliceUrlsForChunk(urls, sitemap.sitemapName, sitemaps, defaultSitemapsChunkSize);
+  function maybeSlice(urls2) {
+    return sliceUrlsForChunk(urls2, sitemap.sitemapName, sitemaps, defaultSitemapsChunkSize);
   }
   if (autoI18n?.differentDomains) {
     const domain = autoI18n.locales.find((e) => [e.language, e.code].includes(sitemap.sitemapName))?.domain;
@@ -218,6 +218,10 @@ export async function buildSitemapUrls(sitemap, resolvers, runtimeConfig, nitro)
     sourcesInput = ctx.sources;
   }
   const sources = await resolveSitemapSources(sourcesInput, resolvers.event);
+  const failedSources = sources.filter((source) => source.error && source._isFailure).map((source) => ({
+    url: typeof source.fetch === "string" ? source.fetch : source.fetch?.[0] || "unknown",
+    error: source.error || "Unknown error"
+  }));
   const resolvedCtx = {
     urls: sources.flatMap((s) => s.urls),
     sitemapName: sitemap.sitemapName,
@@ -231,6 +235,7 @@ export async function buildSitemapUrls(sitemap, resolvers, runtimeConfig, nitro)
     return true;
   });
   const sortedUrls = maybeSort(filteredUrls);
-  return maybeSlice(sortedUrls);
+  const urls = maybeSlice(sortedUrls);
+  return { urls, failedSources };
 }
 export { urlsToXml } from "./xml.js";

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

@@ -1,3 +1,6 @@
 import type { ModuleRuntimeConfig, NitroUrlResolvers, ResolvedSitemapUrl } from '../../../types.js';
 export declare function escapeValueForXml(value: boolean | string | number): string;
-export declare function urlsToXml(urls: ResolvedSitemapUrl[], resolvers: NitroUrlResolvers, { version, xsl, credits, minify }: Pick<ModuleRuntimeConfig, 'version' | 'xsl' | 'credits' | 'minify'>): string;
+export declare function urlsToXml(urls: ResolvedSitemapUrl[], resolvers: NitroUrlResolvers, { version, xsl, credits, minify }: Pick<ModuleRuntimeConfig, 'version' | 'xsl' | 'credits' | 'minify'>, errorInfo?: {
+    messages: string[];
+    urls: string[];
+}): string;

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

@@ -1,7 +1,9 @@
+import { withQuery } from "ufo";
+import { xmlEscape } from "../../utils.js";
 export function escapeValueForXml(value) {
   if (value === true || value === false)
     return value ? "yes" : "no";
-  return String(value).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+  return xmlEscape(String(value));
 }
 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) {
@@ -162,13 +164,20 @@ function buildUrlXml(url) {
   parts[partIndex++] = "    </url>";
   return parts.slice(0, partIndex).join("\n");
 }
-export function urlsToXml(urls, resolvers, { version, xsl, credits, minify }) {
+export function urlsToXml(urls, resolvers, { version, xsl, credits, minify }, errorInfo) {
   const estimatedSize = urls.length + 5;
   const xmlParts = Array.from({ length: estimatedSize });
   let partIndex = 0;
-  const xslHref = xsl ? resolvers.relativeBaseUrlResolver(xsl) : false;
+  let xslHref = xsl ? resolvers.relativeBaseUrlResolver(xsl) : false;
+  if (xslHref && errorInfo && errorInfo.messages.length > 0) {
+    xslHref = withQuery(xslHref, {
+      errors: "true",
+      error_messages: errorInfo.messages,
+      error_urls: errorInfo.urls
+    });
+  }
   if (xslHref) {
-    xmlParts[partIndex++] = `<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="${xslHref}"?>`;
+    xmlParts[partIndex++] = `<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="${escapeValueForXml(xslHref)}"?>`;
   } else {
     xmlParts[partIndex++] = '<?xml version="1.0" encoding="UTF-8"?>';
   }

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

@@ -41,7 +41,7 @@ async function buildSitemapXml(event, definition, resolvers, runtimeConfig) {
       });
     }
   }
-  const sitemapUrls = await buildSitemapUrls(definition, resolvers, runtimeConfig, nitro);
+  const { urls: sitemapUrls, failedSources } = await buildSitemapUrls(definition, resolvers, runtimeConfig, nitro);
   const routeRuleMatcher = createNitroRouteRuleMatcher();
   const { autoI18n } = runtimeConfig;
   let validCount = 0;
@@ -94,7 +94,11 @@ async function buildSitemapXml(event, definition, resolvers, runtimeConfig) {
       }
     }
   }
-  const sitemap = urlsToXml(urls, resolvers, runtimeConfig);
+  const errorInfo = failedSources.length > 0 ? {
+    messages: failedSources.map((f) => f.error),
+    urls: failedSources.map((f) => f.url)
+  } : void 0;
+  const sitemap = urlsToXml(urls, resolvers, runtimeConfig, errorInfo);
   const ctx = { sitemap, sitemapName, event };
   await nitro.hooks.callHook("sitemap:output", ctx);
   return ctx.sitemap;
@@ -120,7 +124,7 @@ const buildSitemapXmlCached = defineCachedFunction(
 );
 export async function createSitemap(event, definition, runtimeConfig) {
   const resolvers = useNitroUrlResolvers(event);
-  const shouldCache = !import.meta.dev && runtimeConfig.cacheMaxAgeSeconds > 0;
+  const shouldCache = !import.meta.dev && typeof runtimeConfig.cacheMaxAgeSeconds === "number" && runtimeConfig.cacheMaxAgeSeconds > 0;
   const xml = shouldCache ? await buildSitemapXmlCached(event, definition, resolvers, runtimeConfig) : await buildSitemapXml(event, definition, resolvers, runtimeConfig);
   setHeader(event, "Content-Type", "text/xml; charset=UTF-8");
   if (runtimeConfig.cacheMaxAgeSeconds) {

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

@@ -75,7 +75,7 @@ export function normaliseEntry(_e, defaults, resolvers) {
     delete e.lastmod;
   e.loc = resolve(e.loc, resolvers);
   if (e.alternatives) {
-    const alternatives = e.alternatives;
+    const alternatives = e.alternatives.map((a) => ({ ...a }));
     for (let i = 0; i < alternatives.length; i++) {
       const alt = alternatives[i];
       if (typeof alt.href === "string") {
@@ -87,19 +87,20 @@ export function normaliseEntry(_e, defaults, resolvers) {
     e.alternatives = mergeOnKey(alternatives, "hreflang");
   }
   if (e.images) {
-    const images = e.images;
+    const images = e.images.map((i) => ({ ...i }));
     for (let i = 0; i < images.length; i++) {
       images[i].loc = resolve(images[i].loc, resolvers);
     }
     e.images = mergeOnKey(images, "loc");
   }
   if (e.videos) {
-    const videos = e.videos;
+    const videos = e.videos.map((v) => ({ ...v }));
     for (let i = 0; i < videos.length; i++) {
       if (videos[i].content_loc) {
         videos[i].content_loc = resolve(videos[i].content_loc, resolvers);
       }
     }
+    e.videos = mergeOnKey(videos, "content_loc");
   }
   return e;
 }

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

@@ -2,35 +2,70 @@ import { getRequestHost } from "h3";
 import { defu } from "defu";
 import { parseURL } from "ufo";
 import { extractSitemapXML } from "../utils/extractSitemapXML.js";
+import { logger } from "../../../utils-pure.js";
+async function tryFetchWithFallback(url, options, event) {
+  const isExternalUrl = !url.startsWith("/");
+  if (isExternalUrl) {
+    const strategies = [
+      // 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,
+      // Strategy 3: Use native fetch as last resort
+      () => $fetch(url, options)
+    ].filter(Boolean);
+    let lastError = null;
+    for (const strategy of strategies) {
+      try {
+        return await strategy();
+      } catch (error) {
+        lastError = error;
+        continue;
+      }
+    }
+    throw lastError;
+  }
+  const fetchContainer = url.startsWith("/") && event ? event : globalThis;
+  return await fetchContainer.$fetch(url, options);
+}
 export async function fetchDataSource(input, event) {
   const context = typeof input.context === "string" ? { name: input.context } : input.context || { name: "fetch" };
-  context.tips = context.tips || [];
   const url = typeof input.fetch === "string" ? input.fetch : input.fetch[0];
   const options = typeof input.fetch === "string" ? {} : input.fetch[1];
   const start = Date.now();
-  const timeout = options.timeout || 5e3;
+  const isExternalUrl = !url.startsWith("/");
+  const timeout = isExternalUrl ? 1e4 : options.timeout || 5e3;
   const timeoutController = new AbortController();
   const abortRequestTimeout = setTimeout(() => timeoutController.abort(), timeout);
-  let isMaybeErrorResponse = false;
-  const isXmlRequest = parseURL(url).pathname.endsWith(".xml");
-  const fetchContainer = url.startsWith("/") && event ? event : globalThis;
   try {
-    const res = await fetchContainer.$fetch(url, {
+    let isMaybeErrorResponse = false;
+    const isXmlRequest = parseURL(url).pathname.endsWith(".xml");
+    const mergedHeaders = defu(
+      options?.headers,
+      {
+        Accept: isXmlRequest ? "text/xml" : "application/json"
+      },
+      event ? { host: getRequestHost(event, { xForwardedHost: true }) } : {}
+    );
+    const fetchOptions = {
       ...options,
       responseType: isXmlRequest ? "text" : "json",
       signal: timeoutController.signal,
-      headers: defu(options?.headers, {
-        Accept: isXmlRequest ? "text/xml" : "application/json"
-      }, event ? { host: getRequestHost(event, { xForwardedHost: true }) } : {}),
+      headers: mergedHeaders,
+      // Use ofetch's built-in retry for external sources
+      ...isExternalUrl && {
+        retry: 2,
+        retryDelay: 200
+      },
       // @ts-expect-error untyped
       onResponse({ response }) {
         if (typeof response._data === "string" && response._data.startsWith("<!DOCTYPE html>"))
           isMaybeErrorResponse = true;
       }
-    });
+    };
+    const res = await tryFetchWithFallback(url, fetchOptions, event);
     const timeTakenMs = Date.now() - start;
     if (isMaybeErrorResponse) {
-      context.tips.push("This is usually because the URL isn't correct or is throwing an error. Please check the URL");
       return {
         ...input,
         context,
@@ -53,16 +88,26 @@ export async function fetchDataSource(input, event) {
     };
   } catch (_err) {
     const error = _err;
-    if (error.message.includes("This operation was aborted"))
-      context.tips.push("The request has taken too long. Make sure app sources respond within 5 seconds or adjust the timeout fetch option.");
-    else
-      context.tips.push(`Response returned a status of ${error.response?.status || "unknown"}.`);
-    console.error("[@nuxtjs/sitemap] Failed to fetch source.", { url, error });
+    if (isExternalUrl) {
+      const errorInfo = {
+        url,
+        timeout,
+        error: error.message,
+        statusCode: error.response?.status,
+        statusText: error.response?.statusText,
+        method: options?.method || "GET"
+      };
+      logger.error("Failed to fetch external source.", errorInfo);
+    } else {
+      logger.error("Failed to fetch source.", { url, error: error.message });
+    }
     return {
       ...input,
       context,
       urls: [],
-      error: error.message
+      error: error.message,
+      _isFailure: true
+      // Mark as failure to prevent caching
     };
   } finally {
     if (abortRequestTimeout) {

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

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

package/dist/runtime/server/utils.js

@@ -1,6 +1,9 @@
 import { useRuntimeConfig } from "nitropack/runtime";
 import { normalizeRuntimeFilters } from "../utils-pure.js";
 export * from "../utils-pure.js";
+export function xmlEscape(str) {
+  return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+}
 export function useSitemapRuntimeConfig(e) {
   const clone = JSON.parse(JSON.stringify(useRuntimeConfig(e).sitemap));
   for (const k in clone.sitemaps) {

package/dist/runtime/types.d.ts

@@ -178,6 +178,7 @@ export interface SitemapSourceResolved extends Omit<SitemapSourceBase, 'urls'> {
     urls: SitemapUrlInput[];
     error?: any;
     timeTakenMs?: number;
+    _isFailure?: boolean;
 }
 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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nuxtjs/sitemap",
   "type": "module",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "description": "Powerfully flexible XML Sitemaps that integrate seamlessly, for Nuxt.",
   "author": {
     "name": "Harlan Wilton",
@@ -44,8 +44,8 @@
     }
   },
   "dependencies": {
-    "@nuxt/devtools-kit": "^2.4.1",
-    "@nuxt/kit": "^3.17.3",
+    "@nuxt/devtools-kit": "^2.5.0",
+    "@nuxt/kit": "^3.17.5",
     "chalk": "^5.4.1",
     "defu": "^6.1.4",
     "h3-compression": "^0.3.2",
@@ -59,23 +59,24 @@
     "ufo": "^1.6.1"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.18.1",
-    "@nuxt/content": "^3.5.1",
-    "@nuxt/eslint-config": "^1.4.0",
+    "@arethetypeswrong/cli": "^0.18.2",
+    "@nuxt/content": "^3.6.0",
+    "@nuxt/eslint-config": "^1.4.1",
     "@nuxt/module-builder": "^1.0.1",
-    "@nuxt/test-utils": "^3.19.0",
-    "@nuxt/ui": "^3.1.2",
-    "@nuxtjs/i18n": "^9.5.4",
+    "@nuxt/test-utils": "^3.19.1",
+    "@nuxt/ui": "^3.1.3",
+    "@nuxtjs/i18n": "^9.5.5",
     "@nuxtjs/robots": "^5.2.10",
+    "better-sqlite3": "^11.10.0",
     "bumpp": "^10.1.1",
-    "eslint": "^9.27.0",
-    "eslint-plugin-n": "^17.18.0",
-    "execa": "^9.5.3",
-    "happy-dom": "^17.4.7",
-    "nuxt": "^3.17.3",
+    "eslint": "^9.29.0",
+    "eslint-plugin-n": "^17.20.0",
+    "execa": "^9.6.0",
+    "happy-dom": "^18.0.1",
+    "nuxt": "^3.17.5",
     "nuxt-i18n-micro": "^1.87.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.3",
+    "vitest": "^3.2.3",
     "vue-tsc": "^2.2.10"
   },
   "scripts": {