Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-31 07:40:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(kit): load .env before loading nuxt.config (#1086)

Browse Source
This commit is contained in:
Daniel Roe 2021-10-18 10:03:39 +01:00 committed by GitHub
parent 4f050e50bf
commit d6ad4f3b16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/kit/src/config/env.ts
View File

@ -1,4 +1,4 @@
import { existsSync, promises as fsp } from 'fs' import { promises as fsp, existsSync } from 'fs'
import { resolve } from 'pathe' import { resolve } from 'pathe'
import dotenv from 'dotenv' import dotenv from 'dotenv'
import { LoadNuxtConfigOptions } from './load' import { LoadNuxtConfigOptions } from './load'

6
packages/kit/src/config/load.ts
View File

@ -22,9 +22,11 @@ export interface LoadNuxtConfigOptions {
} }
} }
export function loadNuxtConfig (opts: LoadNuxtConfigOptions): NuxtOptions { export async function loadNuxtConfig (opts: LoadNuxtConfigOptions): Promise<NuxtOptions> {
const rootDir = resolve(process.cwd(), opts.rootDir || '.') const rootDir = resolve(process.cwd(), opts.rootDir || '.')
await loadEnv(rootDir, opts.envConfig)
const nuxtConfigFile = tryResolveModule(resolve(rootDir, opts.configFile || 'nuxt.config')) const nuxtConfigFile = tryResolveModule(resolve(rootDir, opts.configFile || 'nuxt.config'))
let nuxtConfig: any = {} let nuxtConfig: any = {}
@ -50,8 +52,6 @@ export function loadNuxtConfig (opts: LoadNuxtConfigOptions): NuxtOptions {
nuxtConfig.rootDir = rootDir nuxtConfig.rootDir = rootDir
} }
loadEnv(rootDir, opts.envConfig)
// Resolve and apply defaults // Resolve and apply defaults
return applyDefaults(nuxtConfigSchema, nuxtConfig) as NuxtOptions return applyDefaults(nuxtConfigSchema, nuxtConfig) as NuxtOptions
} }

2
packages/nuxt3/src/core/nuxt.ts
View File

@ -64,7 +64,7 @@ async function initNuxt (nuxt: Nuxt) {
} }
export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> { export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
const options = loadNuxtConfig(opts) const options = await loadNuxtConfig(opts)
// Temp // Temp
options.appDir = options.alias['#app'] = resolve(distDir, 'app') options.appDir = options.alias['#app'] = resolve(distDir, 'app')