fix: correct typing

dargmuesli · Oct 12, 2022 · bde33f4 · bde33f4
1 parent 3e2fc33
commit bde33f4
Show file tree

Hide file tree

Showing 19 changed files with 26 additions and 22 deletions.
diff --git a/playground/types.ts b/playground/types.ts
@@ -1,4 +1,4 @@
-import { State } from '../src/types'
+import { State } from '../src/runtime/types'
 
 declare module '#app' {
   interface NuxtApp {

diff --git a/src/module.ts b/src/module.ts
@@ -12,7 +12,7 @@ import {
 import webpack from 'webpack' // eslint-disable-line import/no-named-as-default
 
 import { name, version } from '../package.json'
-import { DEFAULTS, ModuleOptions } from './types'
+import { DEFAULTS, ModuleOptions } from './runtime/types'
 
 export default defineNuxtModule<ModuleOptions>({
   meta: {
@@ -103,10 +103,14 @@ export default defineNuxtModule<ModuleOptions>({
     // })
 
     addTemplate({
-      filename: 'nuxtCookieControl.options.mjs',
+      filename: 'nuxtCookieControl.options.ts',
       write: true,
       getContents: () =>
-        `export default ${JSON.stringify(moduleOptions, null, 2)}`,
+        `import { ModuleOptions } from '../../src/runtime/types'\n\nexport default ${JSON.stringify(
+          moduleOptions,
+          null,
+          2
+        )} as ModuleOptions`,
     })
 
     if (isNuxt2()) {

diff --git a/src/runtime/components/CookieControl.vue b/src/runtime/components/CookieControl.vue
@@ -147,7 +147,7 @@ import { computed, onBeforeMount, ref, watch } from 'vue'
 
 import { useNuxtApp } from '#app'
 
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export interface Props {
   locale?: string

diff --git a/src/runtime/locale/ar.ts b/src/runtime/locale/ar.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'قبول الكل',

diff --git a/src/runtime/locale/de.ts b/src/runtime/locale/de.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'Alle akzeptieren',

diff --git a/src/runtime/locale/en.ts b/src/runtime/locale/en.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'Accept all',

diff --git a/src/runtime/locale/es.ts b/src/runtime/locale/es.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'Aceptar todo',

diff --git a/src/runtime/locale/fr.ts b/src/runtime/locale/fr.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'Tout accepter',

diff --git a/src/runtime/locale/hr.ts b/src/runtime/locale/hr.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'Dozvoli sve',

diff --git a/src/runtime/locale/hu.ts b/src/runtime/locale/hu.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'Összes elfogadása',

diff --git a/src/runtime/locale/it.ts b/src/runtime/locale/it.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'Accetta tutto',

diff --git a/src/runtime/locale/ja.ts b/src/runtime/locale/ja.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: '全て同意',

diff --git a/src/runtime/locale/nl.ts b/src/runtime/locale/nl.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'Accepteer alles',

diff --git a/src/runtime/locale/no.ts b/src/runtime/locale/no.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'Godta alle',

diff --git a/src/runtime/locale/pt.ts b/src/runtime/locale/pt.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'Aceitar todos',

diff --git a/src/runtime/locale/ru.ts b/src/runtime/locale/ru.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'Принять все',

diff --git a/src/runtime/locale/uk.ts b/src/runtime/locale/uk.ts
@@ -1,4 +1,4 @@
-import { I18n } from '../../types'
+import { I18n } from '../types'
 
 export default {
   acceptAll: 'Прийняти усі',

diff --git a/src/runtime/plugin.ts b/src/runtime/plugin.ts
@@ -1,8 +1,8 @@
 import { defineNuxtPlugin } from '#app'
 
-import { State } from '../types'
+import { State } from './types'
 
-import moduleOptions from '#build/nuxtCookieControl.options.mjs'
+import moduleOptions from '#build/nuxtCookieControl.options'
 
 export default defineNuxtPlugin((nuxtApp) => {
   const state: State = {

diff --git a/src/types.ts → src/runtime/types.ts b/src/types.ts → src/runtime/types.ts
@@ -1,4 +1,4 @@
-import en from './runtime/locale/en'
+import en from './locale/en'
 
 export interface Cookie {
   async?: boolean