Skip to content

Commit

Permalink
fix: use named export from defu in all places (#18624)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielroe authored Jan 30, 2023
1 parent d83dc79 commit 5037dd6
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion packages/nuxi/src/utils/prepare.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { promises as fsp } from 'node:fs'
import { isAbsolute, join, relative, resolve } from 'pathe'
import type { Nuxt, TSReference } from '@nuxt/schema'
import defu from 'defu'
import { defu } from 'defu'
import type { TSConfig } from 'pkg-types'
import { getModulePaths, getNearestPackage } from './cjs'

Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt/src/core/app.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { promises as fsp } from 'node:fs'
import { dirname, resolve, join } from 'pathe'
import defu from 'defu'
import { defu } from 'defu'
import type { Nuxt, NuxtApp, NuxtPlugin, NuxtTemplate, ResolvedNuxtTemplate } from '@nuxt/schema'
import { findPath, resolveFiles, normalizePlugin, normalizeTemplate, compileTemplate, templateUtils, tryResolveModule, resolvePath, resolveAlias } from '@nuxt/kit'

Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt/src/core/nitro.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { NitroConfig, Nitro } from 'nitropack'
import type { Nuxt } from '@nuxt/schema'
import { logger, resolvePath } from '@nuxt/kit'
import escapeRE from 'escape-string-regexp'
import defu from 'defu'
import { defu } from 'defu'
import fsExtra from 'fs-extra'
import { dynamicEventHandler } from 'h3'
import type { Plugin } from 'rollup'
Expand Down
2 changes: 1 addition & 1 deletion packages/schema/src/config/app.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineUntypedSchema } from 'untyped'
import defu from 'defu'
import { defu } from 'defu'
import type { AppHeadMetaObject } from '../types/meta'

export default defineUntypedSchema({
Expand Down
2 changes: 1 addition & 1 deletion packages/schema/src/config/build.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineUntypedSchema } from 'untyped'
import defu from 'defu'
import { defu } from 'defu'
import { join } from 'pathe'

export default defineUntypedSchema({
Expand Down
2 changes: 1 addition & 1 deletion packages/schema/src/config/common.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { defineUntypedSchema } from 'untyped'
import { join, resolve } from 'pathe'
import { isDebug, isDevelopment } from 'std-env'
import defu from 'defu'
import { defu } from 'defu'
import { findWorkspaceDir } from 'pkg-types'
import type { RuntimeConfig } from '../types/config'

Expand Down
2 changes: 1 addition & 1 deletion packages/schema/src/config/postcss.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import defu from 'defu'
import { defu } from 'defu'
import createResolver from 'postcss-import-resolver'
import { defineUntypedSchema } from 'untyped'

Expand Down
2 changes: 1 addition & 1 deletion packages/test-utils/src/context.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { resolve } from 'node:path'
import defu from 'defu'
import { defu } from 'defu'
import type { TestContext, TestOptions, TestRunner } from './types'

let currentContext: TestContext | undefined
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { ServerOptions } from 'vite'
import { logger } from '@nuxt/kit'
import { getPort } from 'get-port-please'
import { joinURL, withoutLeadingSlash } from 'ufo'
import defu from 'defu'
import { defu } from 'defu'
import type { OutputOptions } from 'rollup'
import { defineEventHandler } from 'h3'
import { cacheDirPlugin } from './plugins/cache-dir'
Expand Down

0 comments on commit 5037dd6

Please sign in to comment.