refactor: update nuxt

Author: posva

packages/nuxt/package.json

@@ -37,7 +37,7 @@
     "dev:prepare": "nuxt-module-build --stub"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.0.0",
+    "@nuxt/kit": "^3.6.2",
     "lru-cache": "^10.0.0"
   },
   "peerDependencies": {
@@ -60,14 +60,14 @@
   },
   "devDependencies": {
     "@firebase/app-types": "^0.9.0",
-    "@nuxt/module-builder": "^0.2.1",
-    "@nuxt/schema": "^3.0.0",
+    "@nuxt/module-builder": "^0.4.0",
+    "@nuxt/schema": "^3.6.2",
     "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "eslint": "^8.44.0",
     "firebase": "^9.23.0",
     "firebase-admin": "^11.9.0",
     "firebase-functions": "^4.4.1",
-    "nuxt": "^3.0.0",
+    "nuxt": "^3.6.2",
     "vuefire": "workspace:*"
   }
 }

packages/nuxt/playground/package.json

@@ -8,7 +8,7 @@
     "prepare": "nuxi prepare"
   },
   "devDependencies": {
-    "nuxt": "^3.0.0"
+    "nuxt": "^3.6.2"
   },
   "dependencies": {
     "@firebase/app-types": "^0.9.0",

packages/nuxt/src/firebaseAliases.ts

@@ -1,5 +1,6 @@
 // handle aliases of firebase packages until https://github.com/vitejs/vite/issues/11114 is fixed
 
+import { join } from 'node:path'
 import { resolvePath } from '@nuxt/kit'
 
 /**
@@ -18,10 +19,13 @@ export async function addMissingAlias(
   if (!aliases[libToCheck]) {
     // this gives an absolute path which is needed for the alias to work since the firebase package is not including the dist folder in exports
     const resolvedLibFolder = await resolvePath(libToCheck)
-    const resolvedLibFile =
-      resolvedLibFolder.slice(0, resolvedLibFolder.lastIndexOf('dist')) +
-      'dist/' +
+    console.log('resolvedLibFolder', libToCheck, resolvedLibFolder)
+    const resolvedLibFile = join(
+      resolvedLibFolder.slice(0, resolvedLibFolder.lastIndexOf('dist')),
+      'dist',
       filename
+    )
+    console.log('fixedTo', libToCheck, resolvedLibFile)
     aliases[libToCheck] = resolvedLibFile
   }
 }

packages/nuxt/src/module.ts

@@ -94,15 +94,9 @@ export default defineNuxtModule<VueFireNuxtModuleOptions>({
     nuxt.options.appConfig.firebaseConfig = markRaw(options.config)
     nuxt.options.appConfig.vuefireOptions = markRaw(options)
 
-    // nuxt.options.build.transpile.push(templatesDir)
     nuxt.options.build.transpile.push(runtimeDir)
     nuxt.options.build.transpile.push(templatesDir)
 
-    // FIXME: this is a workaround because of the resolve issue with firebase
-    // without this, we use different firebase packages within vuefire and nuxt-vuefire
-    nuxt.options.build.transpile.push('vuefire')
-    nuxt.options.build.transpile.push('vuefire/server')
-
     // This one is set by servers, we set the GOOGLE_APPLICATION_CREDENTIALS env variable instead that has a lower priority and can be both a path or a JSON string
     // process.env.FIREBASE_CONFIG ||= JSON.stringify(options.config)
     if (typeof options.admin?.serviceAccount === 'string') {
@@ -238,38 +232,6 @@ export default defineNuxtModule<VueFireNuxtModuleOptions>({
       { from: 'vuefire', name: 'useDatabaseList' },
       { from: 'vuefire', name: 'useDatabaseObject' },
     ])
-
-    // TODO: refactor
-    // NOTE: Because of https://github.com/nuxt/framework/issues/9865
-    // otherwise, move to the `hooks` option
-    if (nuxt.options.ssr) {
-      // NOTE: workaround until https://github.com/vitejs/vite/issues/11114 is fixed
-      // TODO: refactor
-      nuxt.addHooks({
-        // Resolve the correct firebase/firestore path on server only since vite is resolving the wrong one in dev
-        'vite:extendConfig': async (config, { isServer }) => {
-          config.resolve ??= {}
-          config.resolve.alias ??= {}
-          const aliases: Record<string, string> = config.resolve
-            .alias as Record<string, string>
-
-          const promises: Promise<void>[] = []
-
-          if (isServer) {
-            promises.push(
-              addMissingAlias(aliases, 'firebase/firestore', 'index.mjs')
-            )
-            promises.push(
-              addMissingAlias(aliases, '@firebase/firestore', 'index.node.mjs')
-            )
-          }
-
-          promises.push(addMissingAlias(aliases, 'firebase/app', 'index.mjs'))
-
-          await Promise.all(promises)
-        },
-      })
-    }
   },
 
   // workaround for vite
@@ -288,6 +250,9 @@ export default defineNuxtModule<VueFireNuxtModuleOptions>({
         'firebase/auth',
         '@firebase/auth',
         '@firebase/component',
+        'firebase-admin/auth',
+        'firebase-admin/app',
+        'firebase-admin/app-check',
       ]
       viteInlineConfig.resolve.dedupe.push(...deps)
 

packages/nuxt/src/runtime/admin/plugin-auth-user.server.ts

@@ -6,8 +6,8 @@ import {
   AUTH_COOKIE_NAME,
 } from 'vuefire/server'
 import { getCookie } from 'h3'
-import { defineNuxtPlugin, useRequestEvent } from '#app'
 import { UserSymbol } from '../constants'
+import { defineNuxtPlugin, useRequestEvent } from '#app'
 
 /**
  * Check if there is a cookie and if it is valid, extracts the user from it. This only requires the admin app.
@@ -21,7 +21,9 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     getCookie(event, AUTH_COOKIE_NAME),
     adminApp
   )
-  const user = await (decodedToken && adminAuth.getUser(decodedToken.uid))
+  const user = await Promise.resolve(
+    decodedToken && adminAuth.getUser(decodedToken.uid)
+  )
 
   // expose the user to code
   event.context.user = user