Skip to content

Commit

Permalink
chore: clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
harlan-zw committed Jan 11, 2023
1 parent 3d2b70b commit aee27cb
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .playground/nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {NuxtConfig} from "@nuxt/schema";
import { defineNuxtConfig } from 'nuxt/config'

export default defineNuxtConfig(<NuxtConfig> {
export default defineNuxtConfig({
extends: ['nuxt-seo-kit'],

runtimeConfig: {
Expand Down
17 changes: 11 additions & 6 deletions modules/nuxt-seo-kit/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,27 @@ export default defineNuxtModule<ModuleOptions>({
},
// @ts-expect-error type issue
defaults(nuxt) {
const defaults: Record<any, string> = {}
const defaults: Record<any, any> = {}
for (const k of publicRuntimeConfigKeys)
defaults[k] = nuxt.options.runtimeConfig.public[k]
let indexable = true
if (typeof process.env.NUXT_INDEXABLE !== 'undefined')
indexable = String(process.env.NUXT_INDEXABLE) !== 'false'
else if (typeof nuxt.options.runtimeConfig.indexable !== 'undefined')
indexable = String(nuxt.options.runtimeConfig.indexable) !== 'false'
else if (process.env.NODE_ENV !== 'production')
indexable = false
return {
splash: nuxt.options.dev,
indexable: nuxt.options.runtimeConfig.indexable,
...defaults,
indexable,
}
},
// @ts-expect-error type issue
async setup(config, nuxt) {
const { resolve } = createResolver(import.meta.url)

nuxt.options.unhead = nuxt.options.unhead || {}
nuxt.options.unhead.ogTitleTemplate = `%s ${config.titleSeparator} ${config.siteName}`
nuxt.options.unhead.ogTitleTemplate = nuxt.options.unhead.ogTitleTemplate || `%s ${config.titleSeparator} ${config.siteName}`

// configure nuxt-simple-sitemap
nuxt.options.sitemap = nuxt.options.sitemap || {}
Expand All @@ -67,6 +73,7 @@ export default defineNuxtModule<ModuleOptions>({
nuxt.options.linkChecker.trailingSlash = config.trailingSlash

nuxt.options.robots = nuxt.options.robots || {}
nuxt.options.robots.indexable = config.indexable

nuxt.options.robots.sitemap = [
withBase('/sitemap.xml', config.siteUrl),
Expand All @@ -92,7 +99,6 @@ declare module '#nuxt-seo-kit/config' {
},
})

// @ts-expect-error type issue
nuxt.hooks.hook('prepare:types', ({ references }) => {
references.push({ path: resolve(nuxt.options.buildDir, 'nuxt-seo-kit.d.ts') })
})
Expand Down Expand Up @@ -128,7 +134,6 @@ declare module '#nuxt-seo-kit/config' {
})
nuxt.options.alias['#nuxt-seo-kit/config'] = dst.dst

// @ts-expect-error type issue
nuxt.hooks.hook('nitro:config', (nitroConfig) => {
nitroConfig.virtual!['nuxt-seo-kit/config'] = exports
})
Expand Down
3 changes: 1 addition & 2 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { createResolver } from '@nuxt/kit'
import { defineNuxtConfig } from 'nuxt/config'

const { resolve } = createResolver(import.meta.url)

Expand Down Expand Up @@ -28,7 +27,7 @@ export default defineNuxtConfig({
},

runtimeConfig: {
indexable: typeof process.env.NUXT_INDEXABLE !== 'undefined' ? String(process.env.NUXT_INDEXABLE) === 'true' : process.env.NODE_ENV === 'production',
indexable: typeof process.env.NUXT_INDEXABLE !== 'undefined' ? String(process.env.NUXT_INDEXABLE) !== 'false' : process.env.NODE_ENV === 'production',
public: {
trailingSlash: process.env.NUXT_PUBLIC_TRAILING_SLASH || false,
titleSeparator: process.env.NUXT_PUBLIC_TITLE_SEPARATOR || '|',
Expand Down
3 changes: 0 additions & 3 deletions todo.md

This file was deleted.

0 comments on commit aee27cb

Please sign in to comment.