Skip to content

Commit 0bc8113

Browse files
committed
use options template for all database configs
1 parent 8312e46 commit 0bc8113

File tree

3 files changed

+8
-19
lines changed

3 files changed

+8
-19
lines changed

src/module.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ export default defineNuxtModule({
5959
const dbName = `db-${dbHash}.json`
6060
const dbUrl = joinURL(baseURL, dbFolder, dbName)
6161
const dbPath = resolve(baseDir, dbFolder, dbName)
62-
63-
nuxt.options.runtimeConfig.db = { dbPath }
64-
nuxt.options.runtimeConfig.public.db = { dbUrl }
62+
const config = { dbPath, dbUrl }
6563

6664
addPlugin(resolve(runtimeDir, 'plugins', 'db.server'))
6765
addPlugin(resolve(runtimeDir, 'plugins', 'db.client'))
@@ -80,7 +78,9 @@ export default defineNuxtModule({
8078
filename: 'nuxtdb-options.mjs',
8179
write: true,
8280
getContents() {
83-
return `export const dbDirs = ${JSON.stringify(database.dirs)}`
81+
return Object.entries({ ...config, dbDirs: database.dirs })
82+
.map(([key, val]) => `export const ${key} = ${JSON.stringify(val)}`)
83+
.join('\n')
8484
}
8585
})
8686

@@ -98,11 +98,6 @@ export default defineNuxtModule({
9898
nitroConfig.publicAssets.push({ dir: baseDir })
9999
})
100100

101-
nuxt.hook('nitro:build:before', async ctx => {
102-
const dbPath = join(dbFolder, dbName)
103-
nuxt.options.runtimeConfig.db.dbPath = dbPath
104-
})
105-
106101
nuxt.hook('close', async () => {
107102
await database.close()
108103
})

src/runtime/plugins/db.client.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import { defineNuxtPlugin, useRuntimeConfig } from '#app'
2-
import { dbDirs } from '#build/nuxtdb-options'
1+
import { defineNuxtPlugin } from '#app'
2+
import { dbUrl, dbDirs } from '#build/nuxtdb-options'
33
import { useDB } from '#imports'
44

55
export default defineNuxtPlugin(async nuxtApp => {
6-
const config = useRuntimeConfig()
7-
const dbUrl = config.public.db.dbUrl
8-
96
nuxtApp._nuxtDB = {
107
dirs: dbDirs,
118
fetchAt: null,

src/runtime/plugins/db.server.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import { readFile } from 'fs/promises'
2-
import { defineNuxtPlugin, useRuntimeConfig } from '#app'
3-
import { dbDirs } from '#build/nuxtdb-options'
2+
import { defineNuxtPlugin } from '#app'
3+
import { dbPath, dbDirs } from '#build/nuxtdb-options'
44
import { useDB } from '#imports'
55

66
export default defineNuxtPlugin(async nuxtApp => {
7-
const config = useRuntimeConfig()
8-
const dbPath = config.db.dbPath
9-
107
nuxtApp._nuxtDB = {
118
dirs: dbDirs,
129
fetchAt: null,

0 commit comments

Comments
 (0)