From 24c79a1b21a78ebdc4d4c146ee03f21ffe108d4e Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Fri, 21 May 2021 16:23:38 +0100 Subject: [PATCH] fix(config): remove unsupported nullish coalescing * issue introduced in https://github.com/nuxt/nuxt.js/pull/9280 closes #9321 --- packages/config/src/load.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/config/src/load.js b/packages/config/src/load.js index 94337a1af463..f1795e04e6a2 100644 --- a/packages/config/src/load.js +++ b/packages/config/src/load.js @@ -8,6 +8,14 @@ import destr from 'destr' import * as rc from 'rc9' import { defaultNuxtConfigFile } from './config' +function coalesce(...values) { + const value = values.shift() + if (value !== null && value !== undefined) { + return value + } + return coalesce(...values) +} + export async function loadNuxtConfig ({ rootDir = '.', envConfig = {}, @@ -89,8 +97,8 @@ 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' + const dev = coalesce(configOverrides.dev, options.dev, configContext.dev) + const buildDir = coalesce(configOverrides.buildDir, options.buildDir, configContext.buildDir, '.nuxt') options = defu( configOverrides, options,