Skip to content

Commit 85f0ea8

Browse files
committed
feat(server-imports): fix auto imports in server
1 parent d52513b commit 85f0ea8

7 files changed

Lines changed: 10 additions & 13 deletions

File tree

src/module.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { existsSync } from 'node:fs'
2-
import { addComponentsDir, addImportsDir, addPlugin, addServerHandler, createResolver, defineNuxtModule } from '@nuxt/kit'
2+
import { addComponentsDir, addImportsDir, addPlugin, addServerHandler, addServerImportsDir, createResolver, defineNuxtModule } from '@nuxt/kit'
33
import type { UnimportOptions } from 'unimport'
44
import { createConsola } from 'consola'
55
import { join } from 'pathe'
@@ -405,23 +405,20 @@ export default defineNuxtModule<ModuleOptions>({
405405
}
406406

407407
if (options.composables) {
408+
addServerImportsDir(resolveLocal('./runtime/server/composables/'))
409+
408410
// Add server-side auto-imports
409411
nuxt.hook(
410412
'nitro:config',
411413
(config) => {
412414
// Push externals
413415
config.externals ??= {}
414416
config.externals.inline ??= []
415-
config.externals.inline.push(resolveLocal('./runtime'))
416-
417-
// Push server auto-imports
418-
config.imports ??= {} as UnimportOptions
419-
(config.imports as UnimportOptions).dirs = [] as any[]
420-
(config.imports as UnimportOptions).dirs?.push(resolveLocal('./runtime/server/composables'))
417+
config.externals.inline.push(resolveLocal('./runtime/server'))
421418

422419
// Push server aliases
423420
config.alias ??= {}
424-
config.alias['#edgedb/server'] = resolveLocal('./runtime/server')
421+
config.alias['#edgedb/server'] = resolveLocal('./runtime/server/index')
425422
config.alias['#edgedb/queries'] = join(dbschemaDir, '/queries.ts')
426423
config.alias['#edgedb/interfaces'] = join(dbschemaDir, '/interfaces.ts')
427424
config.alias['#edgedb/builder'] = join(dbschemaDir, '/query-builder/index.ts')
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/runtime/server/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
export { useEdgeDb } from './useEdgeDb'
2-
export { useEdgeDbEnv } from './useEdgeDbEnv'
3-
export { useEdgeDbPKCE } from './useEdgeDbPKCE'
4-
export { useEdgeDbQueries } from './useEdgeDbQueries'
5-
export { useEdgeDbQueryBuilder } from './useEdgeDbQueryBuilder'
1+
export { useEdgeDb } from './composables/useEdgeDb'
2+
export { useEdgeDbEnv } from './composables/useEdgeDbEnv'
3+
export { useEdgeDbPKCE } from './composables/useEdgeDbPKCE'
4+
export { useEdgeDbQueries } from './composables/useEdgeDbQueries'
5+
export { useEdgeDbQueryBuilder } from './composables/useEdgeDbQueryBuilder'

0 commit comments

Comments
 (0)