fix: don't overwrite default options unless given new value (vitejs#5111

)
aleclarson · Nov 8, 2021 · 98e5e5e · 98e5e5e
1 parent 5155f64
commit 98e5e5e
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -234,16 +234,6 @@ export function resolveBuildOptions(raw?: BuildOptions): ResolvedBuildOptions {
     cssCodeSplit: !raw?.lib,
     sourcemap: false,
     rollupOptions: {},
-    commonjsOptions: {
-      include: [/node_modules/],
-      extensions: ['.js', '.cjs'],
-      ...raw?.commonjsOptions
-    },
-    dynamicImportVarsOptions: {
-      warnOnError: true,
-      exclude: [/node_modules/],
-      ...raw?.dynamicImportVarsOptions
-    },
     minify: raw?.ssr ? false : 'esbuild',
     terserOptions: {},
     write: true,
@@ -256,7 +246,17 @@ export function resolveBuildOptions(raw?: BuildOptions): ResolvedBuildOptions {
     // brotliSize: true,
     chunkSizeWarningLimit: 500,
     watch: null,
-    ...raw
+    ...raw,
+    commonjsOptions: {
+      include: [/node_modules/],
+      extensions: ['.js', '.cjs'],
+      ...raw?.commonjsOptions
+    },
+    dynamicImportVarsOptions: {
+      warnOnError: true,
+      exclude: [/node_modules/],
+      ...raw?.dynamicImportVarsOptions
+    }
   }
 
   // handle special build targets