Skip to content
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

Jump to bottom

feat(config): support nuxtrc in dist directory #9280

Merged
merged 8 commits into from May 17, 2021
Merged

feat(config): support nuxtrc in dist directory #9280

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
69c7bab
feat(config): support `.nuxtrc` in dist directory
danielroe May 11, 2021
e8e06f6
fix: swap `.nuxtrc` priority
danielroe May 11, 2021
1b76cd8
Merge branch 'dev' into feat/build-dir-nuxtrc
danielroe May 11, 2021
c8dd9c0
Merge branch 'dev' into feat/build-dir-nuxtrc
pi0 May 11, 2021
9f9f7c0
fix: don't load `.nuxt/dist/.nuxtrc` in development
danielroe May 11, 2021
6b0880d
fix: respect overriden buildDir
danielroe May 11, 2021
a897837
Merge branch 'dev' into feat/build-dir-nuxtrc
Atinux May 12, 2021
5bba20a
refactor: read `.nuxt/dist/nuxtrc` instead
danielroe May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/config/src/load.js
View file
Open in desktop
Expand Up @@ -88,9 +88,10 @@ export async function loadNuxtConfig ({
}

// Load Combine configs
// Priority: configOverrides > nuxtConfig > .nuxtrc > .nuxtrc (global)
// Priority: configOverrides > .nuxt/dist/.nuxtrc > nuxtConfig > .nuxtrc > .nuxtrc (global)
options = defu(
configOverrides,
rc.read({ name: '.nuxtrc', dir: path.resolve(options.buildDir || '.nuxt', 'dist') }),
danielroe marked this conversation as resolved.
Show resolved Hide resolved
danielroe marked this conversation as resolved.
Show resolved Hide resolved
options,
rc.read({ name: '.nuxtrc', dir: options.rootDir }),
rc.readUser('.nuxtrc')
Expand Down