From 186df335d926b56f8eec5249d6330363622390b3 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 17 May 2021 19:53:20 +0100 Subject: [PATCH] feat(config): support `nuxtrc` in dist directory (#9280) --- packages/config/src/load.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/config/src/load.js b/packages/config/src/load.js index 72f832e2c2d7..94337a1af463 100644 --- a/packages/config/src/load.js +++ b/packages/config/src/load.js @@ -88,10 +88,13 @@ export async function loadNuxtConfig ({ } // Load Combine configs - // Priority: configOverrides > nuxtConfig > .nuxtrc > .nuxtrc (global) + // Priority: configOverrides > nuxtConfig > .nuxt/dist/nuxtrc > .nuxtrc > .nuxtrc (global) + const dev = configOverrides.dev ?? options.dev ?? configContext.dev + const buildDir = configOverrides.buildDir ?? options.buildDir ?? configContext.buildDir ?? '.nuxt' options = defu( configOverrides, options, + !dev ? rc.read({ name: 'nuxtrc', dir: path.resolve(buildDir, 'dist') }) : {}, rc.read({ name: '.nuxtrc', dir: options.rootDir }), rc.readUser('.nuxtrc') )