fix(load-cfg): merge default config on load

doczjs · Feb 27, 2019 · d3b4bc6 · d3b4bc6
1 parent e12c37d
commit d3b4bc6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/other-packages/load-cfg/src/index.ts b/other-packages/load-cfg/src/index.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs-extra'
 import * as path from 'path'
 import * as findup from 'find-up'
-import { merge } from 'lodash/fp'
+import { merge } from 'lodash'
 
 export const loadFile = (filepath: string, noCache?: boolean) => {
   require('@babel/register')({
@@ -51,7 +51,7 @@ export function load<C = any>(
   const file = filepath ? loadFile(filepath, noCache) : {}
   const next = defaultConfig
     ? deep
-      ? merge(file, defaultConfig)
+      ? merge(defaultConfig, file)
       : { ...defaultConfig, ...file }
     : file