@nuxtjs/sitemap 8.1.0 → 8.2.0

package/dist/module.json

@@ -4,7 +4,7 @@
     "nuxt": ">=3.9.0"
   },
   "configKey": "sitemap",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -75,6 +75,7 @@ export async function readSourcesFromFilesystem(filename) {
       if (!route.fileName?.endsWith(".html") || !html || ["/200.html", "/404.html"].includes(route.route))
         return;
       if (NuxtRedirectHtmlRegex.test(html)) {
+        route._sitemap = { loc: route.route, _sitemap: false };
         return;
       }
       const extractedMeta = parseHtmlExtractSitemapMeta(html, {
@@ -1128,7 +1129,13 @@ ${onUrlEntries.join("\n")}`;
       const nitro = await nitroPromise;
       const prerenderedRoutes2 = nitro._prerenderedRoutes || [];
       const prerenderUrlsFinal = [
-        ...prerenderedRoutes2.filter(isValidPrerenderRoute).map((r) => r._sitemap).filter((entry) => entry && (typeof entry === "string" || entry._sitemap !== false))
+        ...prerenderedRoutes2.filter(isValidPrerenderRoute).map((r) => {
+          if (r._sitemap)
+            return r._sitemap;
+          if (r.route.startsWith("/api/") || r.route.startsWith("/_"))
+            return void 0;
+          return { loc: r.route };
+        }).filter((entry) => entry && (typeof entry === "string" || entry._sitemap !== false))
       ];
       if (config.debug) {
         logger.info("Prerendered routes:", prerenderUrlsFinal);

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

@@ -3,7 +3,7 @@ import { defineCachedFunction, useRuntimeConfig } from "nitropack/runtime";
 import { resolveSitePath } from "nuxt-site-config/urls";
 import { joinURL, withHttps } from "ufo";
 import staticConfig from "#sitemap-virtual/static-config.mjs";
-import { applyDynamicParams, createPathFilter, findPageMapping, logger, splitForLocales } from "../../../utils-pure.js";
+import { applyDynamicParams, createPathFilter, findPageMapping, logger, resolveI18nSitemapLocaleKey, splitForLocales } from "../../../utils-pure.js";
 import { preNormalizeEntry } from "../urlset/normalise.js";
 import { sortInPlace } from "../urlset/sort.js";
 import { childSitemapSources, globalSitemapSources, resolveSitemapSources } from "../urlset/sources.js";
@@ -189,11 +189,12 @@ export async function buildResolvedSitemapUrls(effectiveSitemap, matchName, isCh
   };
   await nitro?.hooks.callHook("sitemap:input", resolvedCtx);
   const enhancedUrls = resolveSitemapEntries(effectiveSitemap, resolvedCtx.urls, { autoI18n, isI18nMapped }, resolvers, useRuntimeConfig().app.baseURL);
+  const localeSitemapKeys = isI18nMapped && autoI18n ? autoI18n.locales.map((l) => l._sitemap) : [];
   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}-`)));
+      const hasMatchingSitemap = typeof e._sitemap === "string" && (sitemapNames.includes(e._sitemap) || isI18nMapped && sitemapNames.some((name) => resolveI18nSitemapLocaleKey(name, localeSitemapKeys) === e._sitemap));
       if (typeof e._sitemap === "string" && !hasMatchingSitemap) {
         if (!warnedSitemaps.has(e._sitemap)) {
           warnedSitemaps.add(e._sitemap);
@@ -211,7 +212,11 @@ export async function buildResolvedSitemapUrls(effectiveSitemap, matchName, isCh
     if (isMultiSitemap && e._sitemap && matchName) {
       if (isChunked)
         return e._sitemap === matchName;
-      return e._sitemap === matchName || isI18nMapped && matchName.startsWith(`${e._sitemap}-`);
+      if (e._sitemap === matchName)
+        return true;
+      if (isI18nMapped)
+        return e._sitemap === resolveI18nSitemapLocaleKey(matchName, localeSitemapKeys);
+      return false;
     }
     return true;
   });

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

@@ -3,6 +3,16 @@ 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];
+/**
+ * Resolve which locale a multi-sitemap name belongs to.
+ *
+ * i18n-mapped sitemaps are named either `<localeSitemap>` (default) or
+ * `<localeSitemap>-<name>` (custom sitemaps). Locale `_sitemap` keys can share a
+ * prefix (e.g. `zh` and `zh-Hant`), so a naive `name.startsWith(`${key}-`)` check
+ * collides: `zh-Hant` would match the `zh` locale. Resolve by the longest matching
+ * key to disambiguate.
+ */
+export declare function resolveI18nSitemapLocaleKey(sitemapName: string, localeSitemapKeys: string[]): string | null;
 /**
  * Transform a literal notation string regex to RegExp
  */

package/dist/runtime/utils-pure.js

@@ -36,6 +36,16 @@ export function splitForLocales(path, locales) {
     return [prefix, path.replace(`/${prefix}`, "")];
   return [null, path];
 }
+export function resolveI18nSitemapLocaleKey(sitemapName, localeSitemapKeys) {
+  let best = null;
+  for (const key of localeSitemapKeys) {
+    if (sitemapName === key || sitemapName.startsWith(`${key}-`)) {
+      if (best === null || key.length > best.length)
+        best = key;
+    }
+  }
+  return best;
+}
 const StringifiedRegExpPattern = /\/(.*?)\/([gimsuy]*)$/;
 export function normalizeRuntimeFilters(input) {
   return (input || []).map((rule) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nuxtjs/sitemap",
   "type": "module",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "description": "Powerfully flexible XML Sitemaps that integrate seamlessly, for Nuxt.",
   "author": {
     "name": "Harlan Wilton",
@@ -55,12 +55,12 @@
     }
   },
   "dependencies": {
-    "@nuxt/kit": "^4.4.7",
+    "@nuxt/kit": "^4.4.8",
     "consola": "^3.4.2",
     "defu": "^6.1.7",
     "fast-xml-parser": "^5.8.0",
     "nuxt-site-config": "^4.0.8",
-    "nuxtseo-shared": "^5.1.4",
+    "nuxtseo-shared": "^5.2.6",
     "ofetch": "^1.5.1",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.1",
@@ -85,10 +85,10 @@
     "eslint-plugin-harlanzw": "^0.17.0",
     "execa": "^9.6.1",
     "happy-dom": "^20.10.2",
-    "nuxt": "^4.4.7",
+    "nuxt": "^4.4.8",
     "nuxt-i18n-micro": "^3.18.2",
-    "nuxtseo-layer-devtools": "^5.1.4",
-    "semver": "^7.8.3",
+    "nuxtseo-layer-devtools": "^5.2.6",
+    "semver": "^7.8.4",
     "sirv": "^3.0.2",
     "std-env": "^4.1.0",
     "typescript": "^6.0.3",
@@ -96,18 +96,17 @@
     "vitest": "^4.1.8",
     "vue-tsc": "^3.3.4",
     "zod": "^4.4.3",
-    "@nuxtjs/sitemap": "8.1.0"
+    "@nuxtjs/sitemap": "8.2.0"
   },
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "client:build": "nuxt generate devtools",
-    "devtools": "nuxt dev devtools --port 3030",
+    "client:build": "node -e \"require('fs').cpSync('devtools','dist/devtools',{recursive:true})\"",
     "build": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxt-module-build build && npm run client:build",
     "dev": "nuxt dev playground",
     "prepare:fixtures": "nuxt prepare test/fixtures/basic && nuxt prepare test/fixtures/i18n && nuxt prepare test/fixtures/i18n-micro",
     "dev:build": "nuxt build playground",
-    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxt prepare playground",
+    "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\"",
     "test": "vitest run && pnpm run test:attw",
     "test:unit": "vitest --project=unit",