fix: deep merge user's module options (#578)

nuxt · Mar 19, 2023 · d95453e · d95453e
1 parent 057e32b
commit d95453e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/packages/typescript-build/package.json b/packages/typescript-build/package.json
@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "consola": "^2.15.3",
+    "defu": "^6.0.0",
     "fork-ts-checker-webpack-plugin": "^6.5.3",
     "ts-loader": "^8.4.0"
   },

diff --git a/packages/typescript-build/src/index.ts b/packages/typescript-build/src/index.ts
@@ -1,4 +1,5 @@
 import path from 'path'
+import { defu } from 'defu'
 import consola from 'consola'
 import { Module } from '@nuxt/types'
 import { Options as TsLoaderOptions } from 'ts-loader'
@@ -27,11 +28,7 @@ const defaults: Options = {
 
 const tsModule: Module<Options> = function (moduleOptions) {
   // Combine options
-  const options = Object.assign(
-    defaults,
-    this.options.typescript,
-    moduleOptions
-  )
+  const options = defu(this.options.typescript, moduleOptions, defaults)
 
   // Change color of CLI banner
   this.options.cli.bannerColor = 'blue'
@@ -75,15 +72,15 @@ const tsModule: Module<Options> = function (moduleOptions) {
     if (options.typeCheck && isClient && !isModern) {
       // eslint-disable-next-line @typescript-eslint/no-var-requires
       const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin')
-      config.plugins!.push(new ForkTsCheckerWebpackPlugin(Object.assign({
+      config.plugins!.push(new ForkTsCheckerWebpackPlugin(defu(options.typeCheck, {
         typescript: {
           configFile: path.resolve(this.options.rootDir!, 'tsconfig.json'),
           extensions: {
             vue: true
           }
         },
         logger: consola.withScope('nuxt:typescript')
-      } as TsCheckerOptions, options.typeCheck)))
+      } as TsCheckerOptions)))
     }
   })
 }