Merge pull request #239 from adonisjs/fix/hard-dependency

fix(mixins): remove withAuthFinder from root export

index.ts

@@ -13,5 +13,26 @@ export * as symbols from './src/symbols.js'
 export { AuthManager } from './src/auth_manager.js'
 export { defineConfig } from './src/define_config.js'
 export { Authenticator } from './src/authenticator.js'
-export { withAuthFinder } from './src/mixins/with_auth_finder.js'
 export { AuthenticatorClient } from './src/authenticator_client.js'
+import type { withAuthFinder as withAuthFinderType } from './src/mixins/with_auth_finder.js'
+
+function isModuleInstalled(moduleName: string) {
+  try {
+    import.meta.resolve(moduleName)
+    return true
+  } catch (e) {
+    return false
+  }
+}
+
+/**
+ * @deprecated Import `withAuthFinder` from `@adonisjs/auth/mixins` instead
+ */
+let withAuthFinder: typeof withAuthFinderType
+
+if (isModuleInstalled('@adonisjs/lucid')) {
+  const { withAuthFinder: withAuthFinderFn } = await import('./src/mixins/with_auth_finder.js')
+  withAuthFinder = withAuthFinderFn
+}
+
+export { withAuthFinder }

mixins.ts

@@ -0,0 +1,10 @@
+/*
+ * @adonisjs/auth
+ *
+ * (c) AdonisJS
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+export { withAuthFinder } from './src/mixins/with_auth_finder.js'

package.json

@@ -15,6 +15,7 @@
   },
   "exports": {
     ".": "./build/index.js",
+    "./mixins": "./build/mixins.js",
     "./types": "./build/src/types.js",
     "./auth_provider": "./build/providers/auth_provider.js",
     "./plugins/api_client": "./build/src/plugins/japa/api_client.js",
@@ -177,6 +178,7 @@
   "tsup": {
     "entry": [
       "./index.ts",
+      "./mixins.ts",
       "./src/types.ts",
       "./providers/auth_provider.ts",
       "./src/plugins/japa/api_client.ts",

tests/basic_auth/define_config.spec.ts

@@ -15,7 +15,7 @@ import { AppFactory } from '@adonisjs/core/factories/app'
 import type { ApplicationService } from '@adonisjs/core/types'
 import { HttpContextFactory } from '@adonisjs/core/factories/http'
 
-import { withAuthFinder } from '../../index.js'
+import { withAuthFinder } from '../../src/mixins/with_auth_finder.js'
 import { createEmitter, getHasher } from '../helpers.js'
 import {
   basicAuthGuard,

tests/basic_auth/user_providers/lucid.spec.ts

@@ -11,7 +11,7 @@ import { test } from '@japa/runner'
 import { compose } from '@adonisjs/core/helpers'
 import { BaseModel, column } from '@adonisjs/lucid/orm'
 
-import { withAuthFinder } from '../../../index.js'
+import { withAuthFinder } from '../../../src/mixins/with_auth_finder.js'
 import { createDatabase, createTables, getHasher } from '../../helpers.js'
 import { BasicAuthGuardUser } from '../../../modules/basic_auth_guard/types.js'
 import { BasicAuthLucidUserProvider } from '../../../modules/basic_auth_guard/user_providers/lucid.js'