From e28eed03e53e00008e1bc7cf0800d7b45c118ab9 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 1 Feb 2023 16:02:45 -0800 Subject: [PATCH] chore: use named export from `defu` (#18679) --- packages/cli/src/utils/config.js | 2 +- packages/config/src/load.js | 2 +- packages/config/src/options.js | 2 +- packages/generator/src/generator.js | 2 +- packages/vue-renderer/src/renderer.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/cli/src/utils/config.js b/packages/cli/src/utils/config.js index 0f3122b40cf4..bdb0acb9b0cb 100644 --- a/packages/cli/src/utils/config.js +++ b/packages/cli/src/utils/config.js @@ -1,5 +1,5 @@ import path from 'path' -import defu from 'defu' +import { defu } from 'defu' import { loadNuxtConfig as _loadNuxtConfig, getDefaultNuxtConfig } from '@nuxt/config' export async function loadNuxtConfig (argv, configContext) { diff --git a/packages/config/src/load.js b/packages/config/src/load.js index 94337a1af463..40fde5a1441b 100644 --- a/packages/config/src/load.js +++ b/packages/config/src/load.js @@ -1,6 +1,6 @@ import path from 'path' import fs from 'fs' -import defu from 'defu' +import { defu } from 'defu' import consola from 'consola' import dotenv from 'dotenv' import { clearRequireCache, createRequire, scanRequireTree } from '@nuxt/utils' diff --git a/packages/config/src/options.js b/packages/config/src/options.js index 18c1c2e0fe71..75b6cb4749e9 100644 --- a/packages/config/src/options.js +++ b/packages/config/src/options.js @@ -1,7 +1,7 @@ import path from 'path' import fs from 'fs' import { defaultsDeep, pick, uniq } from 'lodash' -import defu from 'defu' +import { defu } from 'defu' import consola from 'consola' import destr from 'destr' import { TARGETS, MODES, createRequire, guardDir, isNonEmptyString, isPureObject, isUrl, getMainModule, getPKG } from '@nuxt/utils' diff --git a/packages/generator/src/generator.js b/packages/generator/src/generator.js index 339f5a65afb2..85f32a9480cc 100644 --- a/packages/generator/src/generator.js +++ b/packages/generator/src/generator.js @@ -3,7 +3,7 @@ import chalk from 'chalk' import consola from 'consola' import { uneval } from 'devalue' import fsExtra from 'fs-extra' -import defu from 'defu' +import { defu } from 'defu' import htmlMinifier from 'html-minifier' import { parse } from 'node-html-parser' import { withTrailingSlash, withoutTrailingSlash, decode } from 'ufo' diff --git a/packages/vue-renderer/src/renderer.js b/packages/vue-renderer/src/renderer.js index 0b68ce6ecbb7..8d84661b059f 100644 --- a/packages/vue-renderer/src/renderer.js +++ b/packages/vue-renderer/src/renderer.js @@ -4,7 +4,7 @@ import consola from 'consola' import { template } from 'lodash' import { TARGETS, isModernRequest, urlJoin, waitFor } from '@nuxt/utils' import { normalizeURL } from 'ufo' -import defu from 'defu' +import { defu } from 'defu' import SPARenderer from './renderers/spa' import SSRRenderer from './renderers/ssr'