chore: stable version for nuxt 3

Intevel · Nov 17, 2022 · 102e2ee · 102e2ee
1 parent 3471cc4
commit 102e2ee
Show file tree

Hide file tree

Showing 3 changed files with 725 additions and 749 deletions.
diff --git a/package.json b/package.json
@@ -33,14 +33,14 @@
     "lint": "eslint --ext .js,.ts,.vue"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.0.0-rc.13",
+    "@nuxt/kit": "^3.0.0",
     "standard-version": "^9.3.2"
   },
   "devDependencies": {
     "@nuxt/module-builder": "latest",
     "@nuxtjs/eslint-config-typescript": "latest",
     "eslint": "latest",
-    "nuxt": "^3.0.0-rc.13"
+    "nuxt": "^3.0.0"
   },
   "keywords": [
     "nuxt",

diff --git a/src/module.ts b/src/module.ts
@@ -1,7 +1,7 @@
 import { resolve } from 'path'
 import { fileURLToPath } from 'url'
 import { defu } from 'defu'
-import { defineNuxtModule, addPlugin, addAutoImportDir } from '@nuxt/kit'
+import { defineNuxtModule, addPlugin, addImportsDir, isNuxt2 } from '@nuxt/kit'
 import { DirectusQueryParams } from './runtime/types'
 export interface ModuleOptions {
   /**
@@ -43,9 +43,9 @@ export default defineNuxtModule<ModuleOptions>({
   },
   setup (options, nuxt) {
     // Nuxt 2 / Bridge
-    if (!nuxt?.options?.runtimeConfig?.public?.directus) {
-      nuxt.options.publicRuntimeConfig.directus = defu(
-        nuxt.options.publicRuntimeConfig.directus,
+    if (isNuxt2() && !nuxt?.options?.runtimeConfig?.public?.directus) {
+      // @ts-ignore
+      nuxt.options.publicRuntimeConfig.directus = defu(nuxt.options.publicRuntimeConfig.directus,
         {
           url: options.url,
           autoFetch: options.autoFetch,
@@ -56,6 +56,7 @@ export default defineNuxtModule<ModuleOptions>({
     }
 
     // Nuxt 3
+    nuxt.options.runtimeConfig.public = nuxt.options.runtimeConfig.public || {}
     nuxt.options.runtimeConfig.public.directus = defu(nuxt.options.runtimeConfig.directus, {
       url: options.url,
       autoFetch: options.autoFetch,
@@ -67,7 +68,7 @@ export default defineNuxtModule<ModuleOptions>({
     nuxt.options.build.transpile.push(runtimeDir)
 
     addPlugin(resolve(runtimeDir, 'plugin'))
-    addAutoImportDir(resolve(runtimeDir, 'composables'))
+    addImportsDir(resolve(runtimeDir, 'composables'))
   }
 })