From 69c7babde1733fd7e371dd3d147f1cdfd93a424c Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Tue, 11 May 2021 10:57:39 +0100 Subject: [PATCH 1/5] feat(config): support `.nuxtrc` in dist directory * allows buildModules to inject runtime modules --- packages/config/src/load.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/config/src/load.js b/packages/config/src/load.js index 72f832e2c2d7..bb10dd404e21 100644 --- a/packages/config/src/load.js +++ b/packages/config/src/load.js @@ -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') }), options, rc.read({ name: '.nuxtrc', dir: options.rootDir }), rc.readUser('.nuxtrc') From e8e06f6ca7568936bc4482e10f55293a32d0b040 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Tue, 11 May 2021 11:15:02 +0100 Subject: [PATCH 2/5] fix: swap `.nuxtrc` priority --- packages/config/src/load.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/config/src/load.js b/packages/config/src/load.js index bb10dd404e21..0af6bec4c33e 100644 --- a/packages/config/src/load.js +++ b/packages/config/src/load.js @@ -88,11 +88,11 @@ export async function loadNuxtConfig ({ } // Load Combine configs - // Priority: configOverrides > .nuxt/dist/.nuxtrc > nuxtConfig > .nuxtrc > .nuxtrc (global) + // Priority: configOverrides > nuxtConfig > .nuxt/dist/.nuxtrc > .nuxtrc > .nuxtrc (global) options = defu( configOverrides, - rc.read({ name: '.nuxtrc', dir: path.resolve(options.buildDir || '.nuxt', 'dist') }), options, + rc.read({ name: '.nuxtrc', dir: path.resolve(options.buildDir || '.nuxt', 'dist') }), rc.read({ name: '.nuxtrc', dir: options.rootDir }), rc.readUser('.nuxtrc') ) From 9f9f7c069f3f28a7f88630bd83a38ab8c085898e Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Tue, 11 May 2021 14:39:49 +0100 Subject: [PATCH 3/5] fix: don't load `.nuxt/dist/.nuxtrc` in development --- packages/config/src/load.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/config/src/load.js b/packages/config/src/load.js index 0af6bec4c33e..03215c14cbc2 100644 --- a/packages/config/src/load.js +++ b/packages/config/src/load.js @@ -89,10 +89,11 @@ export async function loadNuxtConfig ({ // Load Combine configs // Priority: configOverrides > nuxtConfig > .nuxt/dist/.nuxtrc > .nuxtrc > .nuxtrc (global) + const dev = configOverrides.dev ?? options.dev ?? configContext.dev options = defu( configOverrides, options, - rc.read({ name: '.nuxtrc', dir: path.resolve(options.buildDir || '.nuxt', 'dist') }), + !dev ? rc.read({ name: '.nuxtrc', dir: path.resolve(options.buildDir || '.nuxt', 'dist') }) : {}, rc.read({ name: '.nuxtrc', dir: options.rootDir }), rc.readUser('.nuxtrc') ) From 6b0880d28b1779ca054af84f961d04c9ad20415e Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Tue, 11 May 2021 14:51:59 +0100 Subject: [PATCH 4/5] fix: respect overriden buildDir --- packages/config/src/load.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/config/src/load.js b/packages/config/src/load.js index 03215c14cbc2..c29c7d55b366 100644 --- a/packages/config/src/load.js +++ b/packages/config/src/load.js @@ -90,10 +90,11 @@ export async function loadNuxtConfig ({ // Load Combine configs // 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(options.buildDir || '.nuxt', 'dist') }) : {}, + !dev ? rc.read({ name: '.nuxtrc', dir: path.resolve(buildDir, 'dist') }) : {}, rc.read({ name: '.nuxtrc', dir: options.rootDir }), rc.readUser('.nuxtrc') ) From 5bba20a3010d6cf2fe1564c4a96390fa79764464 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 12 May 2021 17:29:34 +0100 Subject: [PATCH 5/5] refactor: read `.nuxt/dist/nuxtrc` instead --- packages/config/src/load.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/config/src/load.js b/packages/config/src/load.js index c29c7d55b366..94337a1af463 100644 --- a/packages/config/src/load.js +++ b/packages/config/src/load.js @@ -88,13 +88,13 @@ export async function loadNuxtConfig ({ } // Load Combine configs - // Priority: configOverrides > nuxtConfig > .nuxt/dist/.nuxtrc > .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') }) : {}, + !dev ? rc.read({ name: 'nuxtrc', dir: path.resolve(buildDir, 'dist') }) : {}, rc.read({ name: '.nuxtrc', dir: options.rootDir }), rc.readUser('.nuxtrc') )