Skip to content

Commit 3578ff2

Browse files
committed
fix: remove deepmerge to prevent wrong merges
1 parent b0bd6a5 commit 3578ff2

File tree

4 files changed

+1
-8
lines changed

4 files changed

+1
-8
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
"dependencies": {
7777
"callbag-observe": "^1.0.0",
7878
"callbag-subject": "^1.0.2",
79-
"deepmerge": "^2.1.1",
8079
"fast-deep-equal": "^2.0.1",
8180
"react": "^16.4.2",
8281
"react-dom": "^16.4.2"

src/reworm.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, { PureComponent } from 'react'
22
import observe from 'callbag-observe'
33
import makeSubject from 'callbag-subject'
44
import equal from 'fast-deep-equal'
5-
import merge from 'deepmerge'
65

76
const isPrimitive = (test: any) => test !== Object(test)
87

@@ -48,7 +47,7 @@ export function create<T = any>(initial: T = {} as T): State<T> {
4847
private update = (next: T): void => {
4948
const nextState = typeof next === 'function' ? next(this._state) : next
5049
const newState = !isPrimitive(nextState)
51-
? merge(this._state, nextState)
50+
? Object.assign({}, this._state, nextState)
5251
: nextState
5352

5453
const isEqual = !isPrimitive(newState)

src/types.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
declare module 'deepmerge'
21
declare module 'fast-deep-equal'
32
declare module 'callbag-observe'
43
declare module 'callbag-subject'

yarn.lock

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,10 +1093,6 @@ deep-is@~0.1.3:
10931093
version "0.1.3"
10941094
resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
10951095

1096-
deepmerge@^2.1.1:
1097-
version "2.1.1"
1098-
resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768"
1099-
11001096
default-require-extensions@^2.0.0:
11011097
version "2.0.0"
11021098
resolved "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"

0 commit comments

Comments
 (0)