perf: clone only once

vitejs · Nov 12, 2024 · ffb92fd · ffb92fd
1 parent 72ccc7d
commit ffb92fd
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
@@ -1110,12 +1110,11 @@ type MergeWithDefaultsResult<D, V> =
             : MaybeFallback<D, V>
           : MaybeFallback<D, V>
 
-export function mergeWithDefaults<
+function mergeWithDefaultsRecursively<
   D extends Record<string, any>,
   V extends Record<string, any>,
 >(defaults: D, values: V): MergeWithDefaultsResult<D, V> {
-  // NOTE: we need to clone the value here to avoid mutating the defaults
-  const merged: Record<string, any> = deepClone(defaults)
+  const merged: Record<string, any> = defaults
   for (const key in values) {
     const value = values[key]
     // let null to set the value (e.g. `server.watch: null`)
@@ -1138,6 +1137,15 @@ export function mergeWithDefaults<
   return merged as MergeWithDefaultsResult<D, V>
 }
 
+export function mergeWithDefaults<
+  D extends Record<string, any>,
+  V extends Record<string, any>,
+>(defaults: D, values: V): MergeWithDefaultsResult<D, V> {
+  // NOTE: we need to clone the value here to avoid mutating the defaults
+  const clonedDefaults = deepClone(defaults)
+  return mergeWithDefaultsRecursively(clonedDefaults, values)
+}
+
 function mergeConfigRecursively(
   defaults: Record<string, any>,
   overrides: Record<string, any>,