Merge branch 'main' of https://github.com/dommi10/nuxt-auth

docs/content/3.application-side/4.protecting-pages.md

@@ -131,7 +131,8 @@ export default defineNuxtRouteMiddleware((to) => {
 ```
 ```ts [callWithNuxt]
 // file: ~/middleware/authentication.global.ts
-import { callWithNuxt, useNuxtApp } from '#app'
+import { useNuxtApp } from '#imports'
+import { callWithNuxt } from '#app/nuxt'
 
 export default defineNuxtRouteMiddleware((to) => {
   // It's important to do this as early as possible

docs/content/v0.5/3.application-side/4.protecting-pages.md

@@ -117,7 +117,8 @@ export default defineNuxtRouteMiddleware((to) => {
 ```
 ```ts [callWithNuxt]
 // file: ~/middleware/authentication.global.ts
-import { callWithNuxt, useNuxtApp } from '#app'
+import { useNuxtApp } from '#imports'
+import { callWithNuxt } from '#app/nuxt'
 
 export default defineNuxtRouteMiddleware((to) => {
   // It's important to do this as early as possible

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sidebase/nuxt-auth",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "license": "MIT",
   "type": "module",
   "exports": {

src/runtime/composables/authjs/useAuth.ts

@@ -2,8 +2,8 @@ import type { AppProvider, BuiltInProviderType } from 'next-auth/providers'
 import { defu } from 'defu'
 import { readonly, Ref } from 'vue'
 import { appendHeader } from 'h3'
-import { callWithNuxt } from '#app'
-import type { NuxtApp } from '#app'
+import { callWithNuxt } from '#app/nuxt'
+import type { NuxtApp } from '#app/nuxt'
 import { determineCallbackUrl } from '../../utils/url'
 import { makeCWN, joinPathToApiURLWN, navigateToAuthPageWN, getRequestURLWN } from '../../utils/callWithNuxt'
 import { _fetch } from '../../utils/fetch'

src/runtime/composables/commonAuthState.ts

@@ -1,9 +1,8 @@
 import { computed } from 'vue'
 import getURL from 'requrl'
 import { joinURL } from 'ufo'
-import { useRuntimeConfig, useRequestEvent } from '#app'
 import { SessionLastRefreshedAt, SessionStatus } from '../types'
-import { useState } from '#imports'
+import { useRuntimeConfig, useRequestEvent, useState } from '#imports'
 
 export const makeCommonAuthState = <SessionData>() => {
   const data = useState<SessionData | undefined | null>('auth:data', () => undefined)

src/runtime/composables/local/useAuth.ts

@@ -1,5 +1,5 @@
 import { readonly, Ref } from 'vue'
-import { callWithNuxt } from '#app'
+import { callWithNuxt } from '#app/nuxt'
 import { CommonUseAuthReturn, SignOutFunc, SignInFunc, GetSessionFunc, SecondarySignInOptions } from '../../types'
 import { _fetch } from '../../utils/fetch'
 import { jsonPointerGet, useTypedBackendConfig } from '../../helpers'

src/runtime/composables/local/useAuthState.ts

@@ -1,5 +1,5 @@
 import { computed, watch, ComputedRef } from 'vue'
-import { CookieRef } from '#app'
+import type { CookieRef } from '#app'
 import { CommonUseAuthStateReturn } from '../../types'
 import { makeCommonAuthState } from '../commonAuthState'
 import { useTypedBackendConfig } from '../../helpers'

src/runtime/middleware/auth.ts

@@ -1,6 +1,5 @@
-import { navigateTo, defineNuxtRouteMiddleware, useRuntimeConfig } from '#app'
 import { navigateToAuthPages, determineCallbackUrl } from '../utils/url'
-import { useAuth } from '#imports'
+import { navigateTo, defineNuxtRouteMiddleware, useRuntimeConfig, useAuth } from '#imports'
 
 type MiddlewareMeta = boolean | {
   /** Whether to only allow unauthenticated users to access this page.
@@ -22,7 +21,7 @@ type MiddlewareMeta = boolean | {
   navigateUnauthenticatedTo?: string
 }
 
-declare module '#app/../pages/runtime/composables' {
+declare module '#app' {
   interface PageMeta {
     auth?: MiddlewareMeta
   }

src/runtime/plugin.ts

@@ -1,7 +1,6 @@
-import { addRouteMiddleware, defineNuxtPlugin, useRuntimeConfig } from '#app'
 import { getHeader } from 'h3'
 import authMiddleware from './middleware/auth'
-import { useAuth, useAuthState } from '#imports'
+import { addRouteMiddleware, defineNuxtPlugin, useRuntimeConfig, useAuth, useAuthState } from '#imports'
 
 export default defineNuxtPlugin(async (nuxtApp) => {
   // 1. Initialize authentication state, potentially fetch current session

src/runtime/utils/callWithNuxt.ts

@@ -1,5 +1,5 @@
-import type { NuxtApp } from '#app'
-import { callWithNuxt } from '#app'
+import type { NuxtApp } from '#app/nuxt'
+import { callWithNuxt } from '#app/nuxt'
 import { getRequestURL, joinPathToApiURL, navigateToAuthPages } from './url'
 
 export const navigateToAuthPageWN = (nuxt: NuxtApp, href: string) => callWithNuxt(nuxt, navigateToAuthPages, [href])

src/runtime/utils/fetch.ts

@@ -1,4 +1,4 @@
-import { callWithNuxt } from '#app'
+import { callWithNuxt } from '#app/nuxt'
 import { joinPathToApiURL } from './url'
 import { useNuxtApp } from '#imports'
 

src/runtime/utils/url.ts

@@ -1,8 +1,7 @@
 import { joinURL } from 'ufo'
 import getURL from 'requrl'
 import { sendRedirect } from 'h3'
-import { useRequestEvent, useNuxtApp, abortNavigation } from '#app'
-import { useAuthState, useRuntimeConfig } from '#imports'
+import { useRequestEvent, useNuxtApp, abortNavigation, useAuthState, useRuntimeConfig } from '#imports'
 
 export const getRequestURL = (includePath = true) => getURL(useRequestEvent()?.node.req, includePath)
 export const joinPathToApiURL = (path: string) => joinURL(useAuthState()._internal.baseURL, path)