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

nuxt · May 17, 2021 · 186df33 · mercs600 · May 21, 2021 · pi0
1 parent 00aeff6
commit 186df33
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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')
   )