|
1 | 1 | 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' |
3 | 3 | import type { UnimportOptions } from 'unimport' |
4 | 4 | import { createConsola } from 'consola' |
5 | 5 | import { join } from 'pathe' |
@@ -405,23 +405,20 @@ export default defineNuxtModule<ModuleOptions>({ |
405 | 405 | } |
406 | 406 |
|
407 | 407 | if (options.composables) { |
| 408 | + addServerImportsDir(resolveLocal('./runtime/server/composables/')) |
| 409 | + |
408 | 410 | // Add server-side auto-imports |
409 | 411 | nuxt.hook( |
410 | 412 | 'nitro:config', |
411 | 413 | (config) => { |
412 | 414 | // Push externals |
413 | 415 | config.externals ??= {} |
414 | 416 | 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')) |
421 | 418 |
|
422 | 419 | // Push server aliases |
423 | 420 | config.alias ??= {} |
424 | | - config.alias['#edgedb/server'] = resolveLocal('./runtime/server') |
| 421 | + config.alias['#edgedb/server'] = resolveLocal('./runtime/server/index') |
425 | 422 | config.alias['#edgedb/queries'] = join(dbschemaDir, '/queries.ts') |
426 | 423 | config.alias['#edgedb/interfaces'] = join(dbschemaDir, '/interfaces.ts') |
427 | 424 | config.alias['#edgedb/builder'] = join(dbschemaDir, '/query-builder/index.ts') |
|
0 commit comments