fix: use lodash merge instead of deepmerge

doczjs · Feb 27, 2019 · 18ac37b · 18ac37b
1 parent 571ffcd
commit 18ac37b
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 10 deletions.
diff --git a/core/docz-core/package.json b/core/docz-core/package.json
@@ -34,7 +34,6 @@
     "chalk": "^2.4.2",
     "chokidar": "^2.1.2",
     "common-tags": "^1.8.0",
-    "deepmerge": "^3.2.0",
     "detect-port": "^1.3.0",
     "docz-utils": "^0.13.6",
     "dotenv": "^6.2.0",

diff --git a/core/docz-core/src/config/babel.ts b/core/docz-core/src/config/babel.ts
@@ -1,5 +1,5 @@
 import { load } from 'load-cfg'
-import merge from 'deepmerge'
+import { merge } from 'lodash'
 import getCacheIdentifier from 'react-dev-utils/getCacheIdentifier'
 
 import { Config, Env } from '../config/argv'

diff --git a/core/docz-utils/src/types.d.ts b/core/docz-utils/src/types.d.ts
@@ -1,4 +1,3 @@
-declare module 'deepmerge'
 declare module 'to-vfile'
 declare module 'unified'
 declare module 'remark-parse'

diff --git a/core/docz/package.json b/core/docz/package.json
@@ -29,7 +29,6 @@
     "@reach/router": "^1.2.1",
     "array-sort": "^1.0.0",
     "capitalize": "^2.0.0",
-    "deepmerge": "^3.2.0",
     "docz-core": "^0.13.6",
     "fast-deep-equal": "^2.0.1",
     "lodash": "^4.17.11",

diff --git a/core/docz/src/hooks/useConfig.ts b/core/docz/src/hooks/useConfig.ts
@@ -1,5 +1,5 @@
 import { useContext } from 'react'
-import merge from 'deepmerge'
+import { merge } from 'lodash/fp'
 
 import { doczState, ThemeConfig, Config } from '../state'
 
@@ -11,7 +11,7 @@ export interface UseConfigObj extends Config {
 export const useConfig = (): UseConfigObj => {
   const state = useContext(doczState.context)
   const { linkComponent, transform, config, themeConfig = {} } = state
-  const newConfig = merge(themeConfig, config ? config.themeConfig : {})
+  const newConfig = merge(config ? config.themeConfig : {}, themeConfig)
   const transformed = transform ? transform(newConfig) : newConfig
 
   return {

diff --git a/other-packages/load-cfg/package.json b/other-packages/load-cfg/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@babel/preset-env": "^7.3.4",
     "@babel/register": "^7.0.0",
-    "deepmerge": "^3.2.0",
+    "lodash": "^4.17.11",
     "find-up": "^3.0.0",
     "fs-extra": "^7.0.1"
   },

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 'deepmerge'
+import { merge } from 'lodash/fp'
 
 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(defaultConfig, file)
+      ? merge(file, defaultConfig)
       : { ...defaultConfig, ...file }
     : file
 

diff --git a/other-packages/load-cfg/src/types.d.ts b/other-packages/load-cfg/src/types.d.ts
@@ -1,2 +1 @@
-declare module 'deepmerge'
 declare module 'esm'