From 17e904e74a41f5df36dcb331ff3dbe35974b2560 Mon Sep 17 00:00:00 2001 From: Arthur Danjou Date: Mon, 22 Mar 2021 22:01:49 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=BB=20|=20Move=20typescript=20types=20?= =?UTF-8?q?file=20into=20the=20directory=20+=20Convert=20Nuxt=20config=20i?= =?UTF-8?q?nto=20a=20ts=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.d.ts => @types/index.d.ts | 0 vue-shim.d.ts => @types/vue-shim.d.ts | 0 nuxt.config.ts | 2 +- settings/BuildModules.ts | 6 ++++-- settings/Head.ts | 4 +++- settings/Modules.ts | 4 +++- 6 files changed, 11 insertions(+), 5 deletions(-) rename index.d.ts => @types/index.d.ts (100%) rename vue-shim.d.ts => @types/vue-shim.d.ts (100%) diff --git a/index.d.ts b/@types/index.d.ts similarity index 100% rename from index.d.ts rename to @types/index.d.ts diff --git a/vue-shim.d.ts b/@types/vue-shim.d.ts similarity index 100% rename from vue-shim.d.ts rename to @types/vue-shim.d.ts diff --git a/nuxt.config.ts b/nuxt.config.ts index 26354c1..b708479 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -16,4 +16,4 @@ export default defineNuxtConfig({ plugins, css, buildModules -} as any as NuxtConfig) +} as NuxtConfig) diff --git a/settings/BuildModules.ts b/settings/BuildModules.ts index a2cdb5c..bcdfa96 100644 --- a/settings/BuildModules.ts +++ b/settings/BuildModules.ts @@ -1,4 +1,6 @@ // Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules +import {NuxtOptionsModule} from "@nuxt/types/config/module"; + const color_mode = { preference: 'system', fallback: 'light', @@ -13,11 +15,11 @@ const tailwindcss = { jit: true } -export default [ +export default [ '@nuxt/typescript-build', '@nuxtjs/composition-api', '@nuxt/postcss8', ['@nuxtjs/tailwindcss', tailwindcss], //'nuxt-vite', ['@nuxtjs/color-mode', color_mode], -] +] as NuxtOptionsModule[] diff --git a/settings/Head.ts b/settings/Head.ts index 25789bf..1b7f095 100644 --- a/settings/Head.ts +++ b/settings/Head.ts @@ -1,4 +1,6 @@ // Global page headers: https://go.nuxtjs.dev/config-head +import {NuxtOptionsHead} from "@nuxt/types/config/head"; + const params = { title: 'artsite', color: '#0DA5FF', @@ -36,4 +38,4 @@ export default { { name: 'theme-color', content: params.color }, ], link: [{ rel: 'icon', type: params.favicon.type, href: params.favicon.href }], -} +} as NuxtOptionsHead diff --git a/settings/Modules.ts b/settings/Modules.ts index dba93b2..e10c2b3 100644 --- a/settings/Modules.ts +++ b/settings/Modules.ts @@ -1,3 +1,5 @@ +import {NuxtOptionsModule} from "@nuxt/types/config/module"; + const axios = { credentials: true, baseURL: process.env.NODE_ENV == 'production' @@ -51,4 +53,4 @@ export default [ ['@nuxtjs/axios', axios], ['nuxt-i18n', i18n], ['@nuxt/content', content], -] +] as NuxtOptionsModule[]