fix: type errors (#1571)

nuxt-modules · Oct 20, 2022 · ba86c4b · ba86c4b
1 parent afb33b1
commit ba86c4b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -57,6 +57,7 @@
     "lint": "eslint --ext .js,.ts,.vue,.json .",
     "lint:fix": "pnpm lint --fix",
     "test": "run-s test:unit test:spec",
+    "test:types": "tsc --noEmit",
     "test:unit": "vitest run test",
     "test:spec": "pnpm build && vitest run specs"
   },

diff --git a/src/runtime/plugin.ts b/src/runtime/plugin.ts
@@ -186,7 +186,7 @@ export default defineNuxtPlugin(async nuxt => {
           }
           setLocale(i18n, i18n.__pendingLocale)
           if (i18n.__resolvePendingLocalePromise) {
-            await i18n.__resolvePendingLocalePromise('')
+            await i18n.__resolvePendingLocalePromise()
           }
           i18n.__pendingLocale = undefined
         }

diff --git a/src/runtime/vue-i18n-bridge.d.ts b/src/runtime/vue-i18n-bridge.d.ts
@@ -37,8 +37,8 @@ declare module 'vue-i18n' {
 
   export interface I18n {
     __pendingLocale?: string
-    __pendingLocalePromise?: Promise
-    __resolvePendingLocalePromise?: (value: unknown) => void
+    __pendingLocalePromise?: Promise<void>
+    __resolvePendingLocalePromise?: (value: void | PromiseLike<void>) => void
   }
 }
 
@@ -62,8 +62,8 @@ declare module 'vue-i18n-bridge' {
 
   export interface I18n {
     __pendingLocale?: string
-    __pendingLocalePromise?: Promise
-    __resolvePendingLocalePromise?: (value: unknown) => void
+    __pendingLocalePromise?: Promise<void>
+    __resolvePendingLocalePromise?: (value: void | PromiseLike<void>) => void
   }
 }
 declare module '@intlify/vue-i18n-bridge' {
@@ -85,8 +85,8 @@ declare module '@intlify/vue-i18n-bridge' {
   }
   export interface I18n {
     __pendingLocale?: string
-    __pendingLocalePromise?: Promise
-    __resolvePendingLocalePromise?: (value: unknown) => void
+    __pendingLocalePromise?: Promise<void>
+    __resolvePendingLocalePromise?: (value: void | PromiseLike<void>) => void
   }
 }
 

diff --git a/test/gen.test.ts b/test/gen.test.ts
@@ -4,6 +4,7 @@ import { generateLoaderOptions } from '../src/gen'
 import { DEFAULT_OPTIONS } from '../src/constants'
 
 import type { NuxtI18nOptions, NuxtI18nInternalOptions } from '../src/types'
+import type { AdditionalMessages } from '../src/messages'
 
 const LOCALE_CODES = ['en', 'ja', 'fr']
 const LOCALE_INFO = [
@@ -25,7 +26,7 @@ const ADDITIONAL_MESSAGES = {
     { buz: 'buz', hello: 'hello3' },
     { baz: 'baz', hello: 'hello4' }
   ]
-}
+} as AdditionalMessages
 const NUXT_I18N_OPTIONS = {
   defaultLocale: 'en',
   vueI18n: {

diff --git a/tsconfig.json b/tsconfig.json
@@ -110,5 +110,5 @@
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
     "skipLibCheck": true /* Skip type checking all .d.ts files. */
   },
-  "exclude": ["**/.nuxt/**", "**/*/dist/*"]
+  "exclude": ["**/.nuxt/**", "**/*/dist/*", "docs/**", "playground/**", "specs/**"]
 }