Skip to content

Commit 19888e0

Browse files
author
Raice Hannay
committed
replace merge-deep with ts-deepmerge
1 parent 5d4266d commit 19888e0

File tree

5 files changed

+12
-75
lines changed

5 files changed

+12
-75
lines changed

global.d.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"author": "Raice Hannay <[email protected]>",
44
"description": "A set of classes to make setting up React components for unit tests easy.",
55
"license": "ISC",
6-
"version": "1.0.3",
6+
"version": "1.0.4",
77
"keywords": [
88
"component",
99
"enzyme",
@@ -87,6 +87,6 @@
8787
"typescript-fsa-reducers": "^1.2.1"
8888
},
8989
"dependencies": {
90-
"merge-deep": "^3.0.2"
90+
"ts-deepmerge": "^1.0.0"
9191
}
9292
}

src/Wrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ComponentType, mount, render, shallow } from "enzyme";
2-
import merge from "merge-deep";
32
import * as React from "react";
3+
import merge from "ts-deepmerge";
44

55
export default class Wrapper<
66
C extends React.ComponentType<any>,

src/WrapperWithRedux.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import merge from "merge-deep";
21
import * as React from "react";
32
import { Provider } from "react-redux";
43
import { AnyAction, DeepPartial, Middleware, Store } from "redux";
4+
import merge from "ts-deepmerge";
55

66
import Wrapper from "./Wrapper";
77

yarn.lock

Lines changed: 8 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -892,17 +892,6 @@ cliui@^5.0.0:
892892
strip-ansi "^5.2.0"
893893
wrap-ansi "^5.1.0"
894894

895-
clone-deep@^0.2.4:
896-
version "0.2.4"
897-
resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6"
898-
integrity sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=
899-
dependencies:
900-
for-own "^0.1.3"
901-
is-plain-object "^2.0.1"
902-
kind-of "^3.0.2"
903-
lazy-cache "^1.0.3"
904-
shallow-clone "^0.1.2"
905-
906895
co@^4.6.0:
907896
version "4.6.0"
908897
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -1512,23 +1501,11 @@ find-up@^3.0.0:
15121501
dependencies:
15131502
locate-path "^3.0.0"
15141503

1515-
for-in@^0.1.3:
1516-
version "0.1.8"
1517-
resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
1518-
integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
1519-
1520-
for-in@^1.0.1, for-in@^1.0.2:
1504+
for-in@^1.0.2:
15211505
version "1.0.2"
15221506
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
15231507
integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
15241508

1525-
for-own@^0.1.3:
1526-
version "0.1.5"
1527-
resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
1528-
integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
1529-
dependencies:
1530-
for-in "^1.0.1"
1531-
15321509
forever-agent@~0.6.1:
15331510
version "0.6.1"
15341511
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -1880,7 +1857,7 @@ is-boolean-object@^1.0.0:
18801857
resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
18811858
integrity sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=
18821859

1883-
is-buffer@^1.0.2, is-buffer@^1.1.5:
1860+
is-buffer@^1.1.5:
18841861
version "1.1.6"
18851862
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
18861863
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -1975,7 +1952,7 @@ is-number@^3.0.0:
19751952
dependencies:
19761953
kind-of "^3.0.2"
19771954

1978-
is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
1955+
is-plain-object@^2.0.3, is-plain-object@^2.0.4:
19791956
version "2.0.4"
19801957
resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
19811958
integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
@@ -2544,13 +2521,6 @@ jsprim@^1.2.2:
25442521
json-schema "0.2.3"
25452522
verror "1.10.0"
25462523

2547-
kind-of@^2.0.1:
2548-
version "2.0.1"
2549-
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
2550-
integrity sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=
2551-
dependencies:
2552-
is-buffer "^1.0.2"
2553-
25542524
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
25552525
version "3.2.2"
25562526
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -2580,16 +2550,6 @@ kleur@^3.0.3:
25802550
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
25812551
integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
25822552

2583-
lazy-cache@^0.2.3:
2584-
version "0.2.7"
2585-
resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
2586-
integrity sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=
2587-
2588-
lazy-cache@^1.0.3:
2589-
version "1.0.4"
2590-
resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
2591-
integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
2592-
25932553
left-pad@^1.3.0:
25942554
version "1.3.0"
25952555
resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
@@ -2700,15 +2660,6 @@ memorystream@^0.3.1:
27002660
resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
27012661
integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
27022662

2703-
merge-deep@^3.0.2:
2704-
version "3.0.2"
2705-
resolved "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.2.tgz#f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2"
2706-
integrity sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA==
2707-
dependencies:
2708-
arr-union "^3.1.0"
2709-
clone-deep "^0.2.4"
2710-
kind-of "^3.0.2"
2711-
27122663
merge-stream@^2.0.0:
27132664
version "2.0.0"
27142665
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -2790,14 +2741,6 @@ mixin-deep@^1.2.0:
27902741
for-in "^1.0.2"
27912742
is-extendable "^1.0.1"
27922743

2793-
mixin-object@^2.0.1:
2794-
version "2.0.1"
2795-
resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
2796-
integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
2797-
dependencies:
2798-
for-in "^0.1.3"
2799-
is-extendable "^0.1.1"
2800-
28012744
[email protected], mkdirp@^0.5.0, mkdirp@^0.5.1:
28022745
version "0.5.1"
28032746
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -3728,16 +3671,6 @@ set-value@^2.0.0, set-value@^2.0.1:
37283671
is-plain-object "^2.0.3"
37293672
split-string "^3.0.1"
37303673

3731-
shallow-clone@^0.1.2:
3732-
version "0.1.2"
3733-
resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060"
3734-
integrity sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=
3735-
dependencies:
3736-
is-extendable "^0.1.1"
3737-
kind-of "^2.0.1"
3738-
lazy-cache "^0.2.3"
3739-
mixin-object "^2.0.1"
3740-
37413674
shallow-equal@^1.2.1:
37423675
version "1.2.1"
37433676
resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da"
@@ -4155,6 +4088,11 @@ tr46@^1.0.1:
41554088
dependencies:
41564089
punycode "^2.1.0"
41574090

4091+
ts-deepmerge@^1.0.0:
4092+
version "1.0.0"
4093+
resolved "https://registry.yarnpkg.com/ts-deepmerge/-/ts-deepmerge-1.0.0.tgz#f068b4ffc547fa67124d46f6b89f3a4f15a9bd61"
4094+
integrity sha512-ExxHq1g8SptwuDLYiW5yFtk6DyNIZ4pOeSRwE38VffDJAMUk51yD/Jn8j7AsPVhY4rfeajYi2+i8r9r2nVDTRA==
4095+
41584096
ts-jest@^24.2.0:
41594097
version "24.2.0"
41604098
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.2.0.tgz#7abca28c2b4b0a1fdd715cd667d65d047ea4e768"

0 commit comments

Comments
 (0)