Skip to content
This repository was archived by the owner on May 10, 2021. It is now read-only.

Commit 12dcad7

Browse files
authored
Merge pull request #11 from ksxnodeapps/renovate/deepmerge-3.x
Update dependency deepmerge to v3
2 parents 3476d09 + 3ea97c7 commit 12dcad7

File tree

3 files changed

+53
-37
lines changed

3 files changed

+53
-37
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
},
2323
"dependencies": {
24-
"deepmerge": "^2.1.0",
24+
"deepmerge": "^3.0.0",
2525
"fs-force": "^3.1.1",
2626
"get-stdin": "^6.0.0",
2727
"js-yaml": "^3.10.0",

shrinkwrap.yaml

Lines changed: 49 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dependencies:
2-
deepmerge: 2.2.1
2+
deepmerge: 3.0.0
33
fs-force: 3.1.1
44
get-stdin: 6.0.0
55
js-yaml: 3.12.0
66
number-enum: 3.0.0
7-
ramda: 0.26.0
7+
ramda: 0.26.1
88
string-template: 1.0.0
99
yargs: 11.1.0
1010
devDependencies:
@@ -33,37 +33,44 @@ packages:
3333
dev: true
3434
resolution:
3535
integrity: sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
36-
/@babel/runtime/7.1.5:
36+
/@babel/runtime-corejs2/7.2.0:
37+
dependencies:
38+
core-js: 2.5.7
39+
regenerator-runtime: 0.12.1
40+
dev: false
41+
resolution:
42+
integrity: sha512-kPfmKoRI8Hpo5ZJGACWyrc9Eq1j3ZIUpUAQT2yH045OuYpccFJ9kYA/eErwzOM2jeBG1sC8XX1nl1EArtuM8tg==
43+
/@babel/runtime/7.2.0:
3744
dependencies:
3845
regenerator-runtime: 0.12.1
3946
dev: false
4047
resolution:
41-
integrity: sha512-xKnPpXG/pvK1B90JkwwxSGii90rQGKtzcMt2gI5G6+M0REXaq6rOHsGC2ay6/d0Uje7zzvSzjEzfR3ENhFlrfA==
48+
integrity: sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==
4249
/@pnpm/types/1.8.0:
4350
dev: true
4451
resolution:
4552
integrity: sha512-NsEzBVa5aMgn/n79piyJtpUQFzJ97tB2R2r8PSJlLnMA6LJmchKuv7ATN+/nZH/3QRd/+uFXEq07/i/ajsqVGQ==
4653
/@types/deepmerge/2.2.0:
4754
dependencies:
48-
deepmerge: 2.2.1
55+
deepmerge: 3.0.0
4956
deprecated: 'This is a stub types definition. deepmerge provides its own type definitions, so you do not need this installed.'
5057
dev: true
5158
resolution:
5259
integrity: sha512-FEQYDHh6+Q+QXKSrIY46m+/lAmAj/bk4KpLaam+hArmzaVpMBHLcfwOH2Q2UOkWM7XsdY9PmZpGyPAjh/JRGhQ==
5360
/@types/get-stdin/5.0.1:
5461
dependencies:
55-
'@types/node': 10.12.9
62+
'@types/node': 10.12.12
5663
dev: true
5764
resolution:
5865
integrity: sha1-Rq+8rwnpT+Alr6B66ZSsMWitvfM=
5966
/@types/js-yaml/3.11.2:
6067
dev: true
6168
resolution:
6269
integrity: sha512-JRDtMPEqXrzfuYAdqbxLot1GvAr/QvicIZAnOAigZaj8xVMhuSJTg/xsv9E1TvyL+wujYhRLx9ZsQ0oFOSmwyA==
63-
/@types/node/10.12.9:
70+
/@types/node/10.12.12:
6471
dev: true
6572
resolution:
66-
integrity: sha512-eajkMXG812/w3w4a1OcBlaTwsFPO5F7fJ/amy+tieQxEMWBlbV1JGSjkFM+zkHNf81Cad+dfIRA+IBkvmvdAeA==
73+
integrity: sha512-Pr+6JRiKkfsFvmU/LK68oBRCQeEg36TyAbPhc2xpez24OOZZCuoIhWGTd39VZy6nGafSbxzGouFPTFD/rR1A0A==
6774
/@types/ramda/0.26.0:
6875
dev: true
6976
resolution:
@@ -134,15 +141,15 @@ packages:
134141
dev: true
135142
resolution:
136143
integrity: sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
137-
/ajv/6.5.5:
144+
/ajv/6.6.1:
138145
dependencies:
139146
fast-deep-equal: 2.0.1
140147
fast-json-stable-stringify: 2.0.0
141148
json-schema-traverse: 0.4.1
142149
uri-js: 4.2.2
143150
dev: true
144151
resolution:
145-
integrity: sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==
152+
integrity: sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==
146153
/ansi-escapes/3.1.0:
147154
dev: true
148155
engines:
@@ -744,7 +751,6 @@ packages:
744751
resolution:
745752
integrity: sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
746753
/core-js/2.5.7:
747-
dev: true
748754
resolution:
749755
integrity: sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
750756
/core-util-is/1.0.2:
@@ -753,7 +759,7 @@ packages:
753759
integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
754760
/cross-spawn/5.1.0:
755761
dependencies:
756-
lru-cache: 4.1.3
762+
lru-cache: 4.1.5
757763
shebang-command: 1.2.0
758764
which: 1.3.1
759765
resolution:
@@ -779,7 +785,7 @@ packages:
779785
/data-urls/1.1.0:
780786
dependencies:
781787
abab: 2.0.0
782-
whatwg-mimetype: 2.2.0
788+
whatwg-mimetype: 2.3.0
783789
whatwg-url: 7.0.0
784790
dev: true
785791
resolution:
@@ -827,11 +833,11 @@ packages:
827833
node: '>=6.0.0'
828834
resolution:
829835
integrity: sha1-YelrWbVV4sx14gQN3Ufwso6B/sw=
830-
/deepmerge/2.2.1:
836+
/deepmerge/3.0.0:
831837
engines:
832838
node: '>=0.10.0'
833839
resolution:
834-
integrity: sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
840+
integrity: sha512-a8z8bkgHsAML+uHLqmMS83HHlpy3PvZOOuiTQqaa3wu8ZVg3h0hqHk6aCsGdOnZV2XMM/FRimNGjUh0KCcmHBw==
835841
/default-require-extensions/1.0.0:
836842
dependencies:
837843
strip-bom: 2.0.0
@@ -1149,7 +1155,7 @@ packages:
11491155
optionator: 0.8.2
11501156
path-is-inside: 1.0.2
11511157
pluralize: 7.0.0
1152-
progress: 2.0.1
1158+
progress: 2.0.2
11531159
require-uncached: 1.0.3
11541160
semver: 5.6.0
11551161
strip-ansi: 4.0.0
@@ -1693,7 +1699,7 @@ packages:
16931699
integrity: sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
16941700
/har-validator/5.1.3:
16951701
dependencies:
1696-
ajv: 6.5.5
1702+
ajv: 6.6.1
16971703
har-schema: 2.0.0
16981704
dev: true
16991705
engines:
@@ -2196,16 +2202,17 @@ packages:
21962202
dev: true
21972203
resolution:
21982204
integrity: sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==
2199-
/iter-tools/6.1.6:
2205+
/iter-tools/6.1.7:
22002206
dependencies:
2201-
'@babel/runtime': 7.1.5
2207+
'@babel/runtime': 7.2.0
2208+
'@babel/runtime-corejs2': 7.2.0
22022209
dequeue: 1.0.5
22032210
little-ds-toolkit: 1.1.0
22042211
typescript-tuple: 1.7.3
22052212
typescript-union: 0.0.0
22062213
dev: false
22072214
resolution:
2208-
integrity: sha512-dCJ5FTc9xv10Cs84sd7oYt0mHbjcQQTKI+5K2E60qDVH5Jn7gtWhtRkeDeflIwRUC7W1sa+Jca/Vs5YT0B9DZw==
2215+
integrity: sha512-UlHmWCnzDuwSNzz7MwBl5mUwnMYKC2StNjaWeRTasEmgc5A+5mPcX7pHUETMf5XRaBeznyK5gXsEH+J83IswGw==
22092216
/jest-changed-files/23.4.2:
22102217
dependencies:
22112218
throat: 4.1.0
@@ -2532,11 +2539,11 @@ packages:
25322539
request-promise-native: /request-promise-native/1.0.5/[email protected]
25332540
sax: 1.2.4
25342541
symbol-tree: 3.2.2
2535-
tough-cookie: 2.4.3
2542+
tough-cookie: 2.5.0
25362543
w3c-hr-time: 1.0.1
25372544
webidl-conversions: 4.0.2
25382545
whatwg-encoding: 1.0.5
2539-
whatwg-mimetype: 2.2.0
2546+
whatwg-mimetype: 2.3.0
25402547
whatwg-url: 6.5.0
25412548
ws: 5.2.2
25422549
xml-name-validator: 3.0.0
@@ -2730,12 +2737,12 @@ packages:
27302737
hasBin: true
27312738
resolution:
27322739
integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
2733-
/lru-cache/4.1.3:
2740+
/lru-cache/4.1.5:
27342741
dependencies:
27352742
pseudomap: 1.0.2
27362743
yallist: 2.1.2
27372744
resolution:
2738-
integrity: sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
2745+
integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
27392746
/makeerror/1.0.11:
27402747
dependencies:
27412748
tmpl: 1.0.4
@@ -2948,7 +2955,7 @@ packages:
29482955
integrity: sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
29492956
/number-enum/3.0.0:
29502957
dependencies:
2951-
iter-tools: 6.1.6
2958+
iter-tools: 6.1.7
29522959
dev: false
29532960
engines:
29542961
node: '>= 8.9.0'
@@ -3319,12 +3326,12 @@ packages:
33193326
node: '>=6.0.0'
33203327
resolution:
33213328
integrity: sha1-vwwtrzeHZ/EDW18lLCdYqEFLsrw=
3322-
/progress/2.0.1:
3329+
/progress/2.0.2:
33233330
dev: true
33243331
engines:
33253332
node: '>=0.4.0'
33263333
resolution:
3327-
integrity: sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==
3334+
integrity: sha512-/OLz5F9beZUWwSHZDreXgap1XShX6W+DCHQCqwCF7uZ88s6uTlD2cR3JBE77SegCmNtb1Idst+NfmwcdU6KVhw==
33283335
/prompts/0.1.14:
33293336
dependencies:
33303337
kleur: 2.0.2
@@ -3364,10 +3371,10 @@ packages:
33643371
node: '>=0.6'
33653372
resolution:
33663373
integrity: sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
3367-
/ramda/0.26.0:
3374+
/ramda/0.26.1:
33683375
dev: false
33693376
resolution:
3370-
integrity: sha512-maK1XqpgsOo5DwjhROjqDvpm1vkphLQbpleVv+b3t5Y9uOQ0t8hTHT582+mDs7RLrex1kd4lWYizNXWLVjsq9w==
3377+
integrity: sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
33713378
/randomatic/3.1.1:
33723379
dependencies:
33733380
is-number: 4.0.0
@@ -3511,7 +3518,7 @@ packages:
35113518
request: 2.88.0
35123519
request-promise-core: /request-promise-core/1.1.1/[email protected]
35133520
stealthy-require: 1.1.1
3514-
tough-cookie: 2.4.3
3521+
tough-cookie: 2.5.0
35153522
dev: true
35163523
engines:
35173524
node: '>=0.12.0'
@@ -4130,6 +4137,15 @@ packages:
41304137
node: '>=0.8'
41314138
resolution:
41324139
integrity: sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
4140+
/tough-cookie/2.5.0:
4141+
dependencies:
4142+
psl: 1.1.29
4143+
punycode: 2.1.1
4144+
dev: true
4145+
engines:
4146+
node: '>=0.8'
4147+
resolution:
4148+
integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
41334149
/tr46/1.0.1:
41344150
dependencies:
41354151
punycode: 2.1.1
@@ -4307,10 +4323,10 @@ packages:
43074323
dev: true
43084324
resolution:
43094325
integrity: sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
4310-
/whatwg-mimetype/2.2.0:
4326+
/whatwg-mimetype/2.3.0:
43114327
dev: true
43124328
resolution:
4313-
integrity: sha512-5YSO1nMd5D1hY3WzAQV3PzZL83W3YeyR1yW9PcH26Weh1t+Vzh9B6XkDh7aXm83HBZ4nSMvkjvN2H2ySWIvBgw==
4329+
integrity: sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
43144330
/whatwg-url/6.5.0:
43154331
dependencies:
43164332
lodash.sortby: 4.7.0
@@ -4485,7 +4501,7 @@ specifiers:
44854501
'@types/js-yaml': ^3.10.1
44864502
'@types/ramda': ^0.26.0
44874503
'@types/string-template': ^1.0.2
4488-
deepmerge: ^2.1.0
4504+
deepmerge: ^3.0.0
44894505
fs-force: ^3.1.1
44904506
get-stdin: ^6.0.0
44914507
jest-cli: ^23.0.0

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -804,9 +804,9 @@ deep-iterable@^3.0.0:
804804
x-iterable-base "^4.0.0"
805805
x-iterable-utils "^1.0.1"
806806

807-
deepmerge@^2.1.0:
808-
version "2.1.0"
809-
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.0.tgz#511a54fff405fc346f0240bb270a3e9533a31102"
807+
deepmerge@^3.0.0:
808+
version "3.0.0"
809+
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.0.0.tgz#ca7903b34bfa1f8c2eab6779280775a411bfc6ba"
810810

811811
default-require-extensions@^1.0.0:
812812
version "1.0.0"

0 commit comments

Comments
 (0)