fix: support user source fetch shorthand

Fixes #215
nuxt-modules · Jan 16, 2024 · 52104bc · 52104bc
1 parent 9615385
commit 52104bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/module.ts b/src/module.ts
@@ -535,8 +535,8 @@ declare module 'vue-router' {
         }
         const globalSources: SitemapSourceInput[] = [
           ...userGlobalSources.map((s) => {
-            if (typeof s === 'string') {
-              return <SitemapSourceBase>{
+            if (typeof s === 'string' || Array.isArray(s)) {
+              return <SitemapSourceBase> {
                 sourceType: 'user',
                 fetch: s,
               }
@@ -616,7 +616,7 @@ declare module 'vue-router' {
             })
             sitemapSources[sitemapName].push(...(definition.sources || [])
               .map((s) => {
-                if (typeof s === 'string') {
+                if (typeof s === 'string' || Array.isArray(s)) {
                   return <SitemapSourceBase> {
                     sourceType: 'user',
                     fetch: s,

diff --git a/src/runtime/types.ts b/src/runtime/types.ts
@@ -177,7 +177,7 @@ export interface SitemapSourceResolved extends Omit<SitemapSourceBase, 'urls'> {
 
 export type AppSourceContext = 'nuxt:pages' | 'nuxt:prerender' | 'nuxt:route-rules' | '@nuxtjs/i18n:pages' | '@nuxt/content:document-driven'
 
-export type SitemapSourceInput = string | SitemapSourceBase | SitemapSourceResolved
+export type SitemapSourceInput = string | [string, FetchOptions] | SitemapSourceBase | SitemapSourceResolved
 
 export type NormalisedLocales = { code: string, iso?: string, domain?: string }[]
 export interface AutoI18nConfig {
@@ -190,7 +190,7 @@ export interface AutoI18nConfig {
 export interface ModuleRuntimeConfig extends Pick<ModuleOptions, 'cacheMaxAgeSeconds' | 'sitemapName' | 'excludeAppSources' | 'sortEntries' | 'defaultSitemapsChunkSize' | 'xslColumns' | 'xslTips' | 'debug' | 'discoverImages' | 'autoLastmod' | 'xsl' | 'credits' > {
   version: string
   isNuxtContentDocumentDriven: boolean
-  sitemaps: { index?: Pick<SitemapDefinition, 'sitemapName' | '_route'> & { sitemaps: SitemapIndexEntry[] } } & Record<string, Omit<SitemapDefinition, 'urls' | 'sources'> & { _hasSourceChunk?: boolean }>
+  sitemaps: { index?: Pick<SitemapDefinition, 'sitemapName' | '_route'> & { sitemaps: SitemapIndexEntry[] } } & Record<string, Omit<SitemapDefinition, 'urls'> & { _hasSourceChunk?: boolean }>
   autoI18n?: AutoI18nConfig
   isMultiSitemap: boolean
   isI18nMapped: boolean