Skip to content

Commit f7ff482

Browse files
committed
fix: proper resolving in production dist
1 parent b394581 commit f7ff482

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

src/features/ai.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { createResolver, addServerImportsDir, addServerScanDir, addTypeTemplate, logger } from '@nuxt/kit'
1+
import { addServerImportsDir, addServerScanDir, addTypeTemplate, logger } from '@nuxt/kit'
22
import { ensureDependencyInstalled } from 'nypm'
33
import { logWhenReady } from '../features'
4+
import { resolve } from '../module'
45

56
import type { Nuxt } from '@nuxt/schema'
67
import type { Nitro } from 'nitropack'
78
import type { HubConfig } from '../features'
89

910
const log = logger.withTag('nuxt:hub')
10-
const { resolve } = createResolver(import.meta.url)
1111

1212
export async function setupAI(nuxt: Nuxt, hub: HubConfig) {
1313
const providerName = hub.ai === 'vercel' ? 'Vercel AI Gateway' : 'Workers AI Provider'
@@ -52,8 +52,8 @@ export async function setupAI(nuxt: Nuxt, hub: HubConfig) {
5252
}
5353

5454
// Add Server scanning
55-
addServerScanDir(resolve('../runtime/ai/server'))
56-
addServerImportsDir(resolve('../runtime/ai/server/utils'))
55+
addServerScanDir(resolve('runtime/ai/server'))
56+
addServerImportsDir(resolve('runtime/ai/server/utils'))
5757

5858
logWhenReady(nuxt, `\`hubAI()\` configured with \`${providerName}\``)
5959
}

src/features/blob.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { join } from 'pathe'
22
import { defu } from 'defu'
3-
import { createResolver, addServerScanDir, addServerImportsDir, addImportsDir, logger } from '@nuxt/kit'
3+
import { addServerScanDir, addServerImportsDir, addImportsDir, logger } from '@nuxt/kit'
44
import { logWhenReady } from '../features'
55

66
import type { Nuxt } from '@nuxt/schema'
77
import type { Nitro, NitroOptions } from 'nitropack'
88
import type { HubConfig } from '../features'
9+
import { resolve } from '../module'
910

1011
import { ensureDependencyInstalled } from 'nypm'
1112

1213
const log = logger.withTag('nuxt:hub')
13-
const { resolve } = createResolver(import.meta.url)
1414

1515
export function setupBlob(nuxt: Nuxt, hub: HubConfig) {
1616
// Configure dev storage
@@ -21,11 +21,11 @@ export function setupBlob(nuxt: Nuxt, hub: HubConfig) {
2121
})
2222

2323
// Add Server scanning
24-
addServerScanDir(resolve('../runtime/blob/server'))
25-
addServerImportsDir(resolve('../runtime/blob/server/utils'))
24+
addServerScanDir(resolve('runtime/blob/server'))
25+
addServerImportsDir(resolve('runtime/blob/server/utils'))
2626

2727
// Add Composables
28-
addImportsDir(resolve('../runtime/blob/app/composables'))
28+
addImportsDir(resolve('runtime/blob/app/composables'))
2929

3030
if (nuxt.options.nitro.storage?.blob?.driver === 'vercel-blob') {
3131
nuxt.options.runtimeConfig.public.hub.blobProvider = 'vercel-blob'

src/features/cache.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import { pathToFileURL } from 'node:url'
22
import { join } from 'pathe'
33
import { defu } from 'defu'
44
import { isWindows } from 'std-env'
5-
import { createResolver, addServerScanDir, logger, resolvePath } from '@nuxt/kit'
5+
import { addServerScanDir, logger } from '@nuxt/kit'
66
import { logWhenReady } from '../features'
7+
import { resolve, resolvePath } from '../module'
78

89
import type { Nuxt } from '@nuxt/schema'
910
import type { Nitro, NitroOptions } from 'nitropack'
1011
import type { HubConfig } from '../features'
1112

1213
const log = logger.withTag('nuxt:hub')
13-
const { resolve } = createResolver(import.meta.url)
1414

1515
export async function setupCache(nuxt: Nuxt, hub: HubConfig) {
1616
// Configure dev storage
@@ -21,7 +21,7 @@ export async function setupCache(nuxt: Nuxt, hub: HubConfig) {
2121
})
2222

2323
// Add Server scanning
24-
addServerScanDir(resolve('../runtime/cache/server'))
24+
addServerScanDir(resolve('runtime/cache/server'))
2525

2626
logWhenReady(nuxt, `Application cache configured with \`${nuxt.options.nitro.devStorage.cache.driver}\` driver`)
2727
}
@@ -52,7 +52,7 @@ export async function setupProductionCache(nitro: Nitro, _hub: HubConfig) {
5252
case 'cloudflare-durable':
5353
case 'cloudflare-pages': {
5454
// TODO: cloudflare cache binding https://github.com/unjs/unstorage/pull/603
55-
let driver = await resolvePath('./runtime/cache/cloudflare-driver')
55+
let driver = await resolvePath('runtime/cache/cloudflare-driver')
5656
if (isWindows) {
5757
driver = pathToFileURL(driver).href
5858
}

src/features/database.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ import { mkdir, writeFile } from 'node:fs/promises'
22
import { defu } from 'defu'
33
import { join } from 'pathe'
44
import { ensureDependencyInstalled } from 'nypm'
5-
import { createResolver, addServerImportsDir, addServerScanDir, logger } from '@nuxt/kit'
5+
import { addServerImportsDir, addServerScanDir, logger } from '@nuxt/kit'
66
import { copyDatabaseMigrationsToHubDir, copyDatabaseQueriesToHubDir } from '../runtime/database/server/utils/migrations/helpers'
77
import { logWhenReady } from '../features'
8+
import { resolve } from '../module'
89

910
import type { Nuxt } from '@nuxt/schema'
1011
import type { NitroOptions, Nitro } from 'nitropack'
1112
import type { ConnectorName } from 'db0'
1213
import type { HubConfig } from '../features'
1314

1415
const log = logger.withTag('nuxt:hub')
15-
const { resolve } = createResolver(import.meta.url)
1616

1717
export async function setupDatabase(nuxt: Nuxt, hub: HubConfig) {
1818
// Configure dev storage
@@ -129,8 +129,8 @@ export async function setupDatabase(nuxt: Nuxt, hub: HubConfig) {
129129
nuxt.options.nitro.experimental.database = true
130130

131131
// Add Server scanning
132-
addServerScanDir(resolve('../runtime/database/server'))
133-
addServerImportsDir(resolve('../runtime/database/server/utils'))
132+
addServerScanDir(resolve('runtime/database/server'))
133+
addServerImportsDir(resolve('runtime/database/server/utils'))
134134

135135
// Handle migrations
136136
nuxt.hook('modules:done', async () => {

src/features/kv.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { join } from 'pathe'
22
import { defu } from 'defu'
33
import { ensureDependencyInstalled } from 'nypm'
4-
import { createResolver, addServerScanDir, addServerImportsDir, logger } from '@nuxt/kit'
4+
import { addServerScanDir, addServerImportsDir, logger } from '@nuxt/kit'
55
import { logWhenReady } from '../features'
6+
import { resolve } from '../module'
67

78
import type { Nuxt } from '@nuxt/schema'
89
import type { Nitro, NitroOptions } from 'nitropack'
910
import type { HubConfig } from '../features'
1011

1112
const log = logger.withTag('nuxt:hub')
12-
const { resolve } = createResolver(import.meta.url)
1313

1414
export function setupKV(nuxt: Nuxt, hub: HubConfig) {
1515
// Configure dev storage
@@ -20,8 +20,8 @@ export function setupKV(nuxt: Nuxt, hub: HubConfig) {
2020
})
2121

2222
// Add Server scanning
23-
addServerScanDir(resolve('../runtime/kv/server'))
24-
addServerImportsDir(resolve('../runtime/kv/server/utils'))
23+
addServerScanDir(resolve('runtime/kv/server'))
24+
addServerImportsDir(resolve('runtime/kv/server/utils'))
2525

2626
const driver = nuxt.options.dev ? nuxt.options.nitro.devStorage.kv.driver : nuxt.options.nitro.storage?.kv?.driver
2727

src/module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import { addBuildHooks } from './utils/build'
1111

1212
export * from './types'
1313

14-
const log = logger.withTag('nuxt:hub')
14+
const log = logger.withTag('nuxt:hub');
15+
16+
export const { resolve, resolvePath } = createResolver(import.meta.url)
1517

1618
export default defineNuxtModule<ModuleOptions>({
1719
meta: {

0 commit comments

Comments
 (0)