@nuxtjs/sitemap 5.0.5 → 5.1.1

package/dist/module.mjs

@@ -120,14 +120,15 @@ function convertNuxtPagesToSitemapEntries(pages, config) {
   }).filter(Boolean).flat();
 }
 function generateExtraRoutesFromNuxtConfig(nuxt = useNuxt()) {
+  const filterForValidPage = (p) => p && !extname(p) && !p.startsWith("/api/") && !p.startsWith("/_");
   const routeRules = Object.entries(nuxt.options.routeRules || {}).filter(([k, v]) => {
     if (k.includes("*") || k.includes(".") || k.includes(":"))
       return false;
     if (typeof v.index === "boolean" && !v.index)
       return false;
     return !v.redirect;
-  }).map(([k]) => k);
-  const prerenderUrls = (nuxt.options.nitro.prerender?.routes || []).filter((p) => p && !extname(p) && !p.startsWith("/api/"));
+  }).map(([k]) => k).filter(filterForValidPage);
+  const prerenderUrls = (nuxt.options.nitro.prerender?.routes || []).filter(filterForValidPage);
   return { routeRules, prerenderUrls };
 }
 
@@ -441,7 +442,7 @@ function normaliseDate(d) {
 
 function splitPathForI18nLocales(path, autoI18n) {
   const locales = autoI18n.strategy === "prefix_except_default" ? autoI18n.locales.filter((l) => l.code !== autoI18n.defaultLocale) : autoI18n.locales;
-  if (typeof path !== "string" || path.startsWith("/api") || path.startsWith("/_nuxt"))
+  if (typeof path !== "string" || path.startsWith("/_"))
     return path;
   const match = splitForLocales(path, locales.map((l) => l.code));
   const locale = match[0];
@@ -514,7 +515,7 @@ const module = defineNuxtModule({
     defaults: {},
     // index sitemap options filtering
     include: [],
-    exclude: ["/_nuxt/**", "/api/**"],
+    exclude: ["/_nuxt/**", "/_**"],
     // sources
     sources: [],
     excludeAppSources: [],
@@ -529,6 +530,7 @@ const module = defineNuxtModule({
       logger.debug("The module is disabled, skipping setup.");
       return;
     }
+    nuxt.options.alias["#sitemap"] = resolve("./runtime/types");
     config.xslColumns = config.xslColumns || [
       { label: "URL", width: "50%" },
       { label: "Images", width: "25%", select: "count(image:image)" },
@@ -629,7 +631,7 @@ const module = defineNuxtModule({
           canI18nMap = false;
       }
       if (canI18nMap && resolvedAutoI18n) {
-        config.sitemaps = { index: config.sitemaps?.index || [] };
+        config.sitemaps = { index: [...config.sitemaps?.index || [], ...config.appendSitemaps || []] };
         for (const locale of resolvedAutoI18n.locales)
           config.sitemaps[locale.iso || locale.code] = { includeAppSources: true };
         isI18nMapped = true;
@@ -772,9 +774,8 @@ declare module 'vue-router' {
       sitemaps.index = {
         sitemapName: "index",
         _route: withBase("sitemap_index.xml", nuxt.options.app.baseURL || "/"),
-        // TODO better index support
         // @ts-expect-error untyped
-        sitemaps: config.sitemaps.index || []
+        sitemaps: [...config.sitemaps.index || [], ...config.appendSitemaps || []]
       };
       if (typeof config.sitemaps === "object") {
         for (const sitemapName in config.sitemaps) {
@@ -886,7 +887,10 @@ declare module 'vue-router' {
         const { prerenderUrls, routeRules: routeRules2 } = generateExtraRoutesFromNuxtConfig();
         const prerenderUrlsFinal = [
           ...prerenderUrls,
-          ...((await nitroPromise)._prerenderedRoutes || []).filter((r) => (!r.fileName || r.fileName.endsWith(".html")) && !r.route.endsWith(".html") && !r.route.startsWith("/api/")).map((r) => r._sitemap)
+          ...((await nitroPromise)._prerenderedRoutes || []).filter((r) => {
+            const isExplicitFile = r.route.split("/").pop().includes(".");
+            return r.contentType?.includes("text/html") && !isExplicitFile;
+          }).map((r) => r._sitemap)
         ];
         const pageSource = convertNuxtPagesToSitemapEntries(await pagesPromise, {
           isI18nMapped,

package/dist/runtime/nitro/plugins/nuxt-content.mjs

@@ -4,7 +4,8 @@ import { useSimpleSitemapRuntimeConfig } from "../utils.mjs";
 export default defineNitroPlugin((nitroApp) => {
   const { discoverImages, isNuxtContentDocumentDriven } = useSimpleSitemapRuntimeConfig();
   nitroApp.hooks.hook("content:file:afterParse", async (content) => {
-    if (content.sitemap === false || content._draft || content._extension !== "md" || content._partial || content.indexable === false || content.index === false)
+    const validExtensions = ["md", "mdx"];
+    if (content.sitemap === false || content._draft || !validExtensions.includes(content._extension) || content._partial || content.indexable === false || content.index === false)
       return;
     let images = [];
     if (discoverImages) {

package/dist/runtime/nitro/sitemap/builder/sitemap-index.mjs

@@ -69,8 +69,11 @@ export async function buildSitemapIndex(resolvers, runtimeConfig) {
       entry.lastmod = normaliseDate(lastmod);
     entries.push(entry);
   }
-  if (sitemaps.index)
-    entries.push(...sitemaps.index.sitemaps);
+  if (sitemaps.index) {
+    entries.push(...sitemaps.index.sitemaps.map((entry) => {
+      return typeof entry === "string" ? { sitemap: entry } : entry;
+    }));
+  }
   const sitemapXml = entries.map((e) => [
     "    <sitemap>",
     `        <loc>${escapeValueForXml(e.sitemap)}</loc>`,

package/dist/runtime/types.d.ts

@@ -39,6 +39,12 @@ export interface ModuleOptions extends SitemapDefinition {
      * @default false
      */
     sitemaps?: boolean | MultiSitemapsInput;
+    /**
+     * Sitemaps to append to the sitemap index.
+     *
+     * This will only do anything when using multiple sitemaps.
+     */
+    appendSitemaps?: (string | SitemapIndexEntry)[];
     /**
      * Path to the xsl that styles sitemap.xml.
      *
@@ -149,7 +155,7 @@ export interface IndexSitemapRemotes {
 export interface MultiSitemapEntry {
     [key: string]: Partial<SitemapDefinition>;
 }
-export type MultiSitemapsInput = Partial<MultiSitemapEntry & IndexSitemapRemotes>;
+export type MultiSitemapsInput = Partial<MultiSitemapEntry> & Partial<IndexSitemapRemotes>;
 export type MaybeFunction<T> = T | (() => T);
 export type MaybePromise<T> = T | Promise<T>;
 export type SitemapUrlInput = SitemapUrl | string;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nuxtjs/sitemap",
   "type": "module",
-  "version": "5.0.5",
-  "packageManager": "pnpm@8.14.1",
+  "version": "5.1.1",
+  "packageManager": "pnpm@8.15.4",
   "description": "Powerfully flexible XML Sitemaps that integrate seamlessly, for Nuxt.",
   "author": {
     "name": "Harlan Wilton",
@@ -34,40 +34,41 @@
   "dependencies": {
     "@nuxt/devtools-kit": "^1.0.8",
     "@nuxt/devtools-ui-kit": "^1.0.8",
-    "@nuxt/kit": "^3.9.3",
-    "@vueuse/core": "^10.7.2",
+    "@nuxt/kit": "^3.10.3",
+    "@vueuse/core": "^10.9.0",
     "chalk": "^5.3.0",
     "defu": "^6.1.4",
-    "floating-vue": "5.2.0",
+    "floating-vue": "5.2.2",
     "h3-compression": "^0.3.2",
-    "nuxt-site-config": "^2.2.5",
-    "nuxt-site-config-kit": "^2.2.5",
+    "nuxt-site-config": "^2.2.10",
+    "nuxt-site-config-kit": "^2.2.10",
     "ofetch": "^1.3.3",
     "pathe": "^1.1.2",
     "pkg-types": "^1.0.3",
     "radix3": "^1.1.0",
-    "semver": "^7.5.4",
+    "semver": "^7.6.0",
+    "shiki": "1.1.7",
     "sirv": "^2.0.4",
-    "site-config-stack": "^2.2.5",
-    "ufo": "^1.3.2"
+    "site-config-stack": "^2.2.9",
+    "ufo": "^1.4.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.6.3",
-    "@nuxt/content": "^2.10.0",
-    "@nuxt/kit": "^3.9.3",
+    "@antfu/eslint-config": "^2.7.0",
+    "@nuxt/content": "^2.12.0",
+    "@nuxt/kit": "^3.10.3",
     "@nuxt/module-builder": "^0.5.5",
-    "@nuxt/test-utils": "^3.10.0",
-    "@nuxt/ui": "^2.12.0",
+    "@nuxt/test-utils": "^3.11.0",
+    "@nuxt/ui": "^2.14.1",
     "@nuxtjs/eslint-config-typescript": "^12.1.0",
-    "@nuxtjs/i18n": "8.0.0",
-    "bumpp": "^9.3.0",
-    "eslint": "8.56.0",
+    "@nuxtjs/i18n": "8.1.1",
+    "bumpp": "^9.3.1",
+    "eslint": "8.57.0",
     "execa": "^8.0.1",
-    "nuxt": "^3.9.3",
+    "nuxt": "^3.10.3",
     "nuxt-icon": "^0.6.8",
-    "nuxt-simple-robots": "^4.0.0-rc.11",
+    "nuxt-simple-robots": "^4.0.0-rc.14",
     "typescript": "^5.3.3",
-    "vitest": "^1.2.1"
+    "vitest": "^1.3.1"
   },
   "build": {
     "externals": [
@@ -84,7 +85,7 @@
     "dev": "nuxi dev .playground",
     "dev:devtool": "nuxi dev .playground-devtools",
     "dev:build": "nuxi build .playground",
-    "dev:prepare": "nuxt-module-build --stub && nuxi prepare .playground",
+    "dev:prepare": "nuxt-module-build build --stub && nuxi prepare .playground",
     "release": "pnpm build && bumpp && pnpm -r publish",
     "typecheck": "tsc --noEmit ",
     "test": "vitest"

package/dist/client/_nuxt/Icon.igAZdNwU.css

@@ -1 +0,0 @@
-.icon[data-v-53e9bd5a]{display:inline-block;vertical-align:middle}

package/dist/client/_nuxt/IconCSS.TGpF5Cou.js

@@ -1 +0,0 @@
-import{g as m,A as f,i as I,l as r,o as d,c as x,q as v,_}from"./entry.8vuPgEH3.js";import{r as S}from"./index.P7jyS_57.js";const g=m({__name:"IconCSS",props:{name:{type:String,required:!0},size:{type:String,default:""}},setup(u){f(e=>({"283d93ca":p.value}));const t=I(),o=u,l=r(()=>{var e,n;return(n=(e=t.nuxtIcon)==null?void 0:e.aliases)!=null&&n[o.name]?t.nuxtIcon.aliases[o.name]:o.name}),a=r(()=>S(l.value)),p=r(()=>{var s,c;const e=(c=(s=t.nuxtIcon)==null?void 0:s.iconifyApiOptions)==null?void 0:c.url;if(e)try{new URL(e)}catch{console.warn("Nuxt IconCSS: Invalid custom Iconify API URL");return}return`url('${e||"https://api.iconify.design"}/${a.value.prefix}/${a.value.name}.svg')`}),i=r(()=>{var n,s,c;if(!o.size&&typeof((n=t.nuxtIcon)==null?void 0:n.size)=="boolean"&&!((s=t.nuxtIcon)!=null&&s.size))return;const e=o.size||((c=t.nuxtIcon)==null?void 0:c.size)||"1em";return String(Number(e))===e?`${e}px`:e});return(e,n)=>(d(),x("span",{style:v({width:i.value,height:i.value})},null,4))}}),h=_(g,[["__scopeId","data-v-cc1c7737"]]);export{h as default};

package/dist/client/_nuxt/IconCSS._VVd0cfH.css

@@ -1 +0,0 @@
-span[data-v-cc1c7737]{background-color:currentColor;display:inline-block;-webkit-mask-image:var(--283d93ca);mask-image:var(--283d93ca);-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:100% 100%;mask-size:100% 100%;vertical-align:middle}

package/dist/client/_nuxt/builds/meta/d17e65fe-31ee-4916-8142-618e3f8935de.json

@@ -1 +0,0 @@
-{"id":"d17e65fe-31ee-4916-8142-618e3f8935de","timestamp":1705549597485,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}