chore: bump deps & lint

nuxt-modules · Sep 19, 2023 · 9538ab0 · 9538ab0
1 parent a3cdc6b
commit 9538ab0
Show file tree

Hide file tree

Showing 11 changed files with 277 additions and 92 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "nuxt-simple-sitemap",
   "type": "module",
   "version": "3.3.3",
-  "packageManager": "[email protected].5",
+  "packageManager": "[email protected].6",
   "description": "Powerfully flexible XML Sitemaps that integrate seamlessly, for Nuxt.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -43,16 +43,16 @@
     "escape-string-regexp": "^5.0.0",
     "fast-glob": "^3.3.1",
     "knitwork": "^1.0.0",
-    "nuxt-site-config": "^1.2.2",
-    "nuxt-site-config-kit": "^1.2.2",
+    "nuxt-site-config": "^1.3.0",
+    "nuxt-site-config-kit": "^1.3.0",
     "pathe": "^1.1.1",
     "radix3": "^1.1.0",
     "semver": "^7.5.4",
-    "site-config-stack": "^1.2.1",
+    "site-config-stack": "^1.3.0",
     "ufo": "^1.3.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.42.0",
+    "@antfu/eslint-config": "^0.43.0",
     "@nuxt/content": "^2.8.2",
     "@nuxt/kit": "^3.7.3",
     "@nuxt/module-builder": "^0.5.1",
@@ -63,7 +63,7 @@
     "eslint": "8.49.0",
     "execa": "^8.0.1",
     "nuxt": "^3.7.3",
-    "nuxt-simple-robots": "3.1.2",
+    "nuxt-simple-robots": "3.1.3",
     "vitest": "0.34.4"
   },
   "build": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/module.ts b/src/module.ts
@@ -241,7 +241,7 @@ export default defineNuxtModule<ModuleOptions>({
         driver: 'memory',
       }
     }
-    else if (config.runtimeCacheStorage && !nuxt.options.dev && typeof config.runtimeCacheStorage === 'object') {
+ else if (config.runtimeCacheStorage && !nuxt.options.dev && typeof config.runtimeCacheStorage === 'object') {
       nuxt.options.nitro.storage['nuxt-simple-sitemap'] = config.runtimeCacheStorage
     }
 
@@ -402,11 +402,11 @@ declare module 'nitropack' {
           for (const k in config.sitemaps)
             nuxt.options.routeRules[`/${k}-sitemap.xml`] = routeRules
         }
-        else {
+ else {
           nuxt.options.routeRules[`/${config.sitemapName}`] = routeRules
         }
       }
-      else {
+ else {
         nuxt.options.routeRules[`/${config.sitemapName}`] = routeRules
       }
     }

diff --git a/src/prerender.ts b/src/prerender.ts
@@ -144,7 +144,7 @@ export function setupPrerenderHandler(moduleConfig: ModuleRuntimeConfig['moduleC
           logs.push(`/${sitemap.sitemapName}-sitemap.xml (${generateTimeMS}ms)`)
         }
       }
-      else {
+ else {
         let sitemapXml = await buildSitemap(options)
         const ctx = { sitemap: sitemapXml, sitemapName: moduleConfig.sitemapName }
         await nuxt.hooks.callHook('sitemap:output', ctx)

diff --git a/src/runtime/routes/sitemap.xsl.ts b/src/runtime/routes/sitemap.xsl.ts
@@ -34,7 +34,7 @@ export default defineEventHandler(async (e) => {
     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>`)
   }
-  else {
+ else {
     // avoid text wrap
     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>`)
   }

diff --git a/src/runtime/sitemap/builder/sitemap-index.ts b/src/runtime/sitemap/builder/sitemap-index.ts
@@ -25,7 +25,7 @@ export async function buildSitemapIndex(options: BuildSitemapIndexInput) {
       chunks[chunkIndex].urls.push(url)
     })
   }
-  else {
+ else {
     for (const sitemap in multiSitemapConfig) {
       if (sitemap !== 'index') {
         // user provided sitemap config

diff --git a/src/runtime/sitemap/entries/normalise.ts b/src/runtime/sitemap/entries/normalise.ts
@@ -112,7 +112,7 @@ export async function normaliseSitemapData(data: SitemapEntryInput[], options: B
         // xDefault is the e.loc replacing the prefix with the default lang
         xDefault = joinURL('/', autoI18n.defaultLocale, withoutPrefix)
       }
-      else if (autoI18n.strategy === 'prefix_except_default') {
+ else if (autoI18n.strategy === 'prefix_except_default') {
         // xDefault is the e.loc without the prefix
         xDefault = withoutPrefix
       }
@@ -123,12 +123,12 @@ export async function normaliseSitemapData(data: SitemapEntryInput[], options: B
           if (autoI18n.strategy === 'prefix') {
             href = joinURL('/', locale.code, withoutPrefix)
           }
-          else if (autoI18n.strategy === 'prefix_except_default') {
+ else if (autoI18n.strategy === 'prefix_except_default') {
             if (isDefault) {
               // no prefix
               href = withoutPrefix
             }
-            else {
+ else {
               href = joinURL('/', locale.code, withoutPrefix)
             }
           }

diff --git a/src/runtime/sitemap/entries/sources.ts b/src/runtime/sitemap/entries/sources.ts
@@ -72,7 +72,7 @@ export async function resolveAsyncDataSources(input: BuildSitemapInput | BuildSi
             error: 'Received HTML response instead of JSON',
           })
         }
-        else {
+ else {
           entries.push({
             context,
             timeTakenMs,
@@ -123,7 +123,7 @@ export async function resolveAsyncDataSources(input: BuildSitemapInput | BuildSi
       })
     }
   }
-  else if (input.sitemap) {
+ else if (input.sitemap) {
     await loadSitemapSources(input.sitemap)
   }
 

diff --git a/src/runtime/util/cache.ts b/src/runtime/util/cache.ts
@@ -22,13 +22,13 @@ export async function setupCache(e: H3Event, key: string) {
         xSitemapCacheHeader = 'PURGE'
         await cache.removeItem(key)
       }
-      else {
+ else {
         xSitemapCacheHeader = 'HIT'
         xSitemapCacheExpires = expiresAt
         cachedSitemap = value as string
       }
     }
-    else {
+ else {
       await cache.removeItem(key)
     }
   }

diff --git a/src/runtime/util/pageUtils.ts b/src/runtime/util/pageUtils.ts
@@ -109,10 +109,10 @@ export function generateRoutesFromFiles(files: string[], pagesDir: string): Nuxt
         parent = child.children
         route.path = ''
       }
-      else if (segmentName === 'index' && !route.path) {
+ else if (segmentName === 'index' && !route.path) {
         route.path += '/'
       }
-      else if (segmentName !== 'index') {
+ else if (segmentName !== 'index') {
         route.path += getRoutePath(tokens)
       }
     }
@@ -126,8 +126,8 @@ export function generateRoutesFromFiles(files: string[], pagesDir: string): Nuxt
 function getRoutePath(tokens: SegmentToken[]): string {
   return tokens.reduce((path, token) => {
     return (
-      path
-      + (token.type === SegmentTokenType.optional
+      path +
+      (token.type === SegmentTokenType.optional
         ? `:${token.value}?`
         : token.type === SegmentTokenType.dynamic
           ? `:${token.value}`
@@ -178,7 +178,7 @@ function parseSegment(segment: string) {
         if (c === '[') {
           state = SegmentParserState.dynamic
         }
-        else {
+ else {
           i--
           state = SegmentParserState.static
         }
@@ -189,7 +189,7 @@ function parseSegment(segment: string) {
           consumeBuffer()
           state = SegmentParserState.dynamic
         }
-        else {
+ else {
           buffer += c
         }
         break
@@ -212,10 +212,10 @@ function parseSegment(segment: string) {
 
           state = SegmentParserState.initial
         }
-        else if (PARAM_CHAR_RE.test(c)) {
+ else if (PARAM_CHAR_RE.test(c)) {
           buffer += c
         }
-        else {
+ else {
 
           // console.debug(`[pages]Ignored character "${c}" while building param "${buffer}" from "segment"`)
         }

diff --git a/src/utils.ts b/src/utils.ts
@@ -37,7 +37,7 @@ export function convertNuxtPagesToSitemapEntries(pages: NuxtPage[], config: Nuxt
         if (stats)
           p.lastmod = stats.mtime
       }
-      catch (e) {}
+ catch (e) {}
     }
     return p
   })
@@ -49,7 +49,7 @@ export function convertNuxtPagesToSitemapEntries(pages: NuxtPage[], config: Nuxt
         acc[name] = []
       acc[name].push({ ...entry, locale })
     }
-    else {
+ else {
       acc.default = acc.default || []
       acc.default.push(entry)
     }