Skip to content

fix(module): check modules existence using import #3348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
farnabaz merged 1 commit into from
May 13, 2025
Merged

fix(module): check modules existence using import #3348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ export default defineNuxtModule<ModuleOptions>({

const resolveOptions = { resolver, sqliteConnector: options.experimental?.sqliteConnector || (options.experimental?.nativeSqlite ? 'native' : undefined) }
config.alias ||= {}
config.alias['#content/adapter'] = resolveDatabaseAdapter(config.runtimeConfig!.content!.database?.type || options.database.type, resolveOptions)
config.alias['#content/local-adapter'] = resolveDatabaseAdapter(options._localDatabase!.type || 'sqlite', resolveOptions)
config.alias['#content/adapter'] = await resolveDatabaseAdapter(config.runtimeConfig!.content!.database?.type || options.database.type, resolveOptions)
config.alias['#content/local-adapter'] = await resolveDatabaseAdapter(options._localDatabase!.type || 'sqlite', resolveOptions)

config.handlers ||= []
config.handlers.push({
Expand Down
14 changes: 7 additions & 7 deletions src/utils/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ export async function refineDatabaseConfig(database: ModuleOptions['database'],
}
}

export function resolveDatabaseAdapter(adapter: 'sqlite' | 'bunsqlite' | 'postgres' | 'libsql' | 'd1' | 'nodesqlite', opts: { resolver: Resolver, sqliteConnector?: SQLiteConnector }) {
export async function resolveDatabaseAdapter(adapter: 'sqlite' | 'bunsqlite' | 'postgres' | 'libsql' | 'd1' | 'nodesqlite', opts: { resolver: Resolver, sqliteConnector?: SQLiteConnector }) {
const databaseConnectors = {
sqlite: findBestSqliteAdapter({ sqliteConnector: opts.sqliteConnector }),
sqlite: await findBestSqliteAdapter({ sqliteConnector: opts.sqliteConnector }),
nodesqlite: 'db0/connectors/node-sqlite',
bunsqlite: opts.resolver.resolve('./runtime/internal/connectors/bunsqlite'),
postgres: 'db0/connectors/postgresql',
Expand All @@ -59,7 +59,7 @@ async function getDatabase(database: SqliteDatabaseConfig | D1DatabaseConfig, op
return cloudflareD1Connector({ bindingName: database.bindingName })
}

return import(findBestSqliteAdapter(opts))
return import(await findBestSqliteAdapter(opts))
.then((m) => {
const connector = (m.default || m) as (config: unknown) => Connector
return connector({ path: database.filename })
Expand Down Expand Up @@ -153,7 +153,7 @@ export async function getLocalDatabase(database: SqliteDatabaseConfig | D1Databa
}
}

function findBestSqliteAdapter(opts: { sqliteConnector?: SQLiteConnector }) {
async function findBestSqliteAdapter(opts: { sqliteConnector?: SQLiteConnector }) {
if (process.versions.bun) {
return 'db0/connectors/bun-sqlite'
}
Expand All @@ -172,7 +172,7 @@ function findBestSqliteAdapter(opts: { sqliteConnector?: SQLiteConnector }) {
}

if (isWebContainer()) {
if (!isSqlite3PackageInstalled()) {
if (!await isSqlite3PackageInstalled()) {
logger.error('Nuxt Content requires `sqlite3` module to work in WebContainer environment. Please run `npm install sqlite3` to install it and try again.')
process.exit(1)
}
Expand Down Expand Up @@ -217,9 +217,9 @@ function isNodeSqliteAvailable() {
}
}

function isSqlite3PackageInstalled() {
async function isSqlite3PackageInstalled() {
try {
require.resolve('sqlite3')
await import('sqlite3')
return true
}
catch {
Expand Down