Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: use named export from defu #18679

Merged
merged 1 commit into from Feb 2, 2023
Merged

chore: use named export from defu #18679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli/src/utils/config.js
View file
Open in desktop
@@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/config/src/load.js
View file
Open in desktop
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/config/src/options.js
View file
Open in desktop
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/generator/src/generator.js
View file
Open in desktop
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-renderer/src/renderer.js
View file
Open in desktop
Expand Up @@ -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'
Expand Down