Skip to content

Commit 6a331b8

Browse files
authored
Merge pull request #114 from canjs/greenkeeper/deep-assign-3.0.0
Update deep-assign to the latest version 🚀
2 parents be4c186 + 63b1dcd commit 6a331b8

File tree

2 files changed

+139
-35
lines changed

2 files changed

+139
-35
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"homepage": "https://github.com/canjs/can-migrate#readme",
5050
"dependencies": {
5151
"can-view-parser": "^4.0.2",
52-
"deep-assign": "^2.0.0",
52+
"deep-assign": "^3.0.0",
5353
"disparity": "^2.0.0",
5454
"execa": "^0.9.0",
5555
"fs-extra": "^5.0.0",

yarn.lock

Lines changed: 138 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ ast-traverse@~0.1.1:
110110
version "0.1.1"
111111
resolved "https://registry.yarnpkg.com/ast-traverse/-/ast-traverse-0.1.1.tgz#69cf2b8386f19dcda1bb1e05d68fe359d8897de6"
112112

113+
ast-types@0.10.1:
114+
version "0.10.1"
115+
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.10.1.tgz#f52fca9715579a14f841d67d7f8d25432ab6a3dd"
116+
113117
ast-types@0.8.12:
114118
version "0.8.12"
115119
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc"
@@ -897,6 +901,10 @@ babylon@^6.11.0, babylon@^6.8.1:
897901
version "6.11.6"
898902
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.11.6.tgz#56dc52e624882841c7fe095257fbcb4a5bb61ae1"
899903

904+
babylon@^6.17.3:
905+
version "6.18.0"
906+
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
907+
900908
balanced-match@^0.4.1:
901909
version "0.4.2"
902910
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@@ -982,9 +990,9 @@ breakable@~1.0.0:
982990
version "1.0.0"
983991
resolved "https://registry.yarnpkg.com/breakable/-/breakable-1.0.0.tgz#784a797915a38ead27bad456b5572cb4bbaa78c1"
984992

985-
browser-stdout@1.3.0:
986-
version "1.3.0"
987-
resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
993+
browser-stdout@1.3.1:
994+
version "1.3.1"
995+
resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
988996

989997
buffer-shims@^1.0.0:
990998
version "1.0.0"
@@ -1009,6 +1017,29 @@ camelcase@^2.0.0:
10091017
version "2.1.1"
10101018
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
10111019

1020+
can-attribute-encoder@^1.0.0:
1021+
version "1.1.0"
1022+
resolved "https://registry.yarnpkg.com/can-attribute-encoder/-/can-attribute-encoder-1.1.0.tgz#a60c81e7d327236405f8a1c52d3604131fc52f22"
1023+
dependencies:
1024+
can-log "^1.0.0"
1025+
can-namespace "^1.0.0"
1026+
1027+
can-log@^1.0.0:
1028+
version "1.0.0"
1029+
resolved "https://registry.yarnpkg.com/can-log/-/can-log-1.0.0.tgz#844b20c9c8db7cc8b771cc67b7e84730206379ec"
1030+
1031+
can-namespace@1.0.0, can-namespace@^1.0.0:
1032+
version "1.0.0"
1033+
resolved "https://registry.yarnpkg.com/can-namespace/-/can-namespace-1.0.0.tgz#0b8fafafbb11352b9ead4222ffe3822405b43e99"
1034+
1035+
can-view-parser@^4.0.2:
1036+
version "4.1.2"
1037+
resolved "https://registry.yarnpkg.com/can-view-parser/-/can-view-parser-4.1.2.tgz#a795e2b60aea0c6f2098333d75ce2aae9565108f"
1038+
dependencies:
1039+
can-attribute-encoder "^1.0.0"
1040+
can-log "^1.0.0"
1041+
can-namespace "1.0.0"
1042+
10121043
caseless@~0.11.0:
10131044
version "0.11.0"
10141045
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
@@ -1103,9 +1134,9 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
11031134
dependencies:
11041135
delayed-stream "~1.0.0"
11051136

1106-
commander@2.11.0:
1107-
version "2.11.0"
1108-
resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
1137+
commander@2.15.1:
1138+
version "2.15.1"
1139+
resolved "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
11091140

11101141
commander@^2.5.0, commander@^2.8.1, commander@^2.9.0:
11111142
version "2.9.0"
@@ -1160,6 +1191,10 @@ core-js@^2.4.0:
11601191
version "2.4.1"
11611192
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
11621193

1194+
core-js@^2.4.1:
1195+
version "2.5.7"
1196+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
1197+
11631198
core-util-is@~1.0.0:
11641199
version "1.0.2"
11651200
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -1278,9 +1313,9 @@ detective@^4.3.1:
12781313
acorn "^1.0.3"
12791314
defined "^1.0.0"
12801315

1281-
diff@3.3.1:
1282-
version "3.3.1"
1283-
resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
1316+
diff@3.5.0:
1317+
version "3.5.0"
1318+
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
12841319

12851320
diff@^1.3.2:
12861321
version "1.4.0"
@@ -1340,6 +1375,10 @@ ejs@^2.5.2:
13401375
version "2.5.2"
13411376
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.2.tgz#21444ba09386f0c65b6eafb96a3d51bcb3be80d1"
13421377

1378+
emitter-component@^1.1.1:
1379+
version "1.1.1"
1380+
resolved "https://registry.yarnpkg.com/emitter-component/-/emitter-component-1.1.1.tgz#065e2dbed6959bf470679edabeaf7981d1003ab6"
1381+
13431382
entities@1.0:
13441383
version "1.0.0"
13451384
resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26"
@@ -1424,6 +1463,10 @@ esprima@~3.0.0:
14241463
version "3.0.0"
14251464
resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
14261465

1466+
esprima@~4.0.0:
1467+
version "4.0.1"
1468+
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
1469+
14271470
esutils@^2.0.0, esutils@^2.0.2:
14281471
version "2.0.2"
14291472
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -1693,6 +1736,10 @@ globby:
16931736
pify "^2.0.0"
16941737
pinkie-promise "^2.0.0"
16951738

1739+
graceful-fs@^4.1.11:
1740+
version "4.1.15"
1741+
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
1742+
16961743
graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6:
16971744
version "4.1.9"
16981745
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.9.tgz#baacba37d19d11f9d146d3578bc99958c3787e29"
@@ -1701,9 +1748,9 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6:
17011748
version "1.0.1"
17021749
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
17031750

1704-
growl@1.10.3:
1705-
version "1.10.3"
1706-
resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"
1751+
growl@1.10.5:
1752+
version "1.10.5"
1753+
resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
17071754

17081755
har-validator@~2.0.6:
17091756
version "2.0.6"
@@ -1724,9 +1771,9 @@ has-color@^0.1.7, has-color@~0.1.0:
17241771
version "0.1.7"
17251772
resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
17261773

1727-
has-flag@^2.0.0:
1728-
version "2.0.0"
1729-
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
1774+
has-flag@^3.0.0:
1775+
version "3.0.0"
1776+
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
17301777

17311778
has-unicode@^2.0.0:
17321779
version "2.0.1"
@@ -1782,6 +1829,10 @@ iconv-lite@^0.4.5:
17821829
version "0.4.13"
17831830
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
17841831

1832+
imurmurhash@^0.1.4:
1833+
version "0.1.4"
1834+
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
1835+
17851836
indent-string@^2.1.0:
17861837
version "2.1.0"
17871838
resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@@ -2006,7 +2057,7 @@ jscodeshift@0.3.5:
20062057
nomnom "^1.8.1"
20072058
recast "^0.10.28"
20082059

2009-
jscodeshift@^0.3.0, jscodeshift@^0.3.2, jscodeshift@^0.3.29:
2060+
jscodeshift@^0.3.0, jscodeshift@^0.3.2:
20102061
version "0.3.29"
20112062
resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.3.29.tgz#aa4dcf9682ac3589b0d3163af78e2de03c5b71ab"
20122063
dependencies:
@@ -2027,6 +2078,26 @@ jscodeshift@^0.3.0, jscodeshift@^0.3.2, jscodeshift@^0.3.29:
20272078
recast "^0.11.11"
20282079
temp "^0.8.1"
20292080

2081+
jscodeshift@^0.4.0:
2082+
version "0.4.1"
2083+
resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.4.1.tgz#da91a1c2eccfa03a3387a21d39948e251ced444a"
2084+
dependencies:
2085+
async "^1.5.0"
2086+
babel-plugin-transform-flow-strip-types "^6.8.0"
2087+
babel-preset-es2015 "^6.9.0"
2088+
babel-preset-stage-1 "^6.5.0"
2089+
babel-register "^6.9.0"
2090+
babylon "^6.17.3"
2091+
colors "^1.1.2"
2092+
flow-parser "^0.*"
2093+
lodash "^4.13.1"
2094+
micromatch "^2.3.7"
2095+
node-dir "0.1.8"
2096+
nomnom "^1.8.1"
2097+
recast "^0.12.5"
2098+
temp "^0.8.1"
2099+
write-file-atomic "^1.2.0"
2100+
20302101
jsesc@^1.3.0:
20312102
version "1.3.0"
20322103
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -2235,18 +2306,18 @@ mime-types@^2.1.11, mime-types@~2.1.7:
22352306
dependencies:
22362307
brace-expansion "^1.0.0"
22372308

2309+
minimatch@3.0.4, minimatch@^3.0.4:
2310+
version "3.0.4"
2311+
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
2312+
dependencies:
2313+
brace-expansion "^1.1.7"
2314+
22382315
minimatch@^2.0.3:
22392316
version "2.0.10"
22402317
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
22412318
dependencies:
22422319
brace-expansion "^1.0.0"
22432320

2244-
minimatch@^3.0.4:
2245-
version "3.0.4"
2246-
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
2247-
dependencies:
2248-
brace-expansion "^1.1.7"
2249-
22502321
minimist@0.0.8:
22512322
version "0.0.8"
22522323
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
@@ -2267,20 +2338,21 @@ mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
22672338
dependencies:
22682339
minimist "0.0.8"
22692340

2270-
mocha@^4.0.1:
2271-
version "4.0.1"
2272-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.0.1.tgz#0aee5a95cf69a4618820f5e51fa31717117daf1b"
2341+
mocha@^5.0.0:
2342+
version "5.2.0"
2343+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
22732344
dependencies:
2274-
browser-stdout "1.3.0"
2275-
commander "2.11.0"
2345+
browser-stdout "1.3.1"
2346+
commander "2.15.1"
22762347
debug "3.1.0"
2277-
diff "3.3.1"
2348+
diff "3.5.0"
22782349
escape-string-regexp "1.0.5"
22792350
glob "7.1.2"
2280-
growl "1.10.3"
2351+
growl "1.10.5"
22812352
he "1.1.1"
2353+
minimatch "3.0.4"
22822354
mkdirp "0.5.1"
2283-
supports-color "4.4.0"
2355+
supports-color "5.4.0"
22842356

22852357
ms@0.7.1:
22862358
version "0.7.1"
@@ -2641,6 +2713,16 @@ recast@^0.11.11:
26412713
private "~0.1.5"
26422714
source-map "~0.5.0"
26432715

2716+
recast@^0.12.5:
2717+
version "0.12.9"
2718+
resolved "https://registry.yarnpkg.com/recast/-/recast-0.12.9.tgz#e8e52bdb9691af462ccbd7c15d5a5113647a15f1"
2719+
dependencies:
2720+
ast-types "0.10.1"
2721+
core-js "^2.4.1"
2722+
esprima "~4.0.0"
2723+
private "~0.1.5"
2724+
source-map "~0.6.1"
2725+
26442726
redent@^1.0.0:
26452727
version "1.0.0"
26462728
resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -2830,6 +2912,10 @@ slash@^1.0.0:
28302912
version "1.0.0"
28312913
resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
28322914

2915+
slide@^1.1.5:
2916+
version "1.1.6"
2917+
resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
2918+
28332919
sntp@1.x.x:
28342920
version "1.0.9"
28352921
resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
@@ -2858,6 +2944,10 @@ source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.0:
28582944
version "0.5.6"
28592945
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
28602946

2947+
source-map@~0.6.1:
2948+
version "0.6.1"
2949+
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
2950+
28612951
spdx-correct@~1.0.0:
28622952
version "1.0.2"
28632953
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
@@ -2891,6 +2981,12 @@ stable@~0.1.3:
28912981
version "0.1.5"
28922982
resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.5.tgz#08232f60c732e9890784b5bed0734f8b32a887b9"
28932983

2984+
stream@0.0.2:
2985+
version "0.0.2"
2986+
resolved "https://registry.yarnpkg.com/stream/-/stream-0.0.2.tgz#7f5363f057f6592c5595f00bc80a27f5cec1f0ef"
2987+
dependencies:
2988+
emitter-component "^1.1.1"
2989+
28942990
string-width@^1.0.1:
28952991
version "1.0.2"
28962992
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -2945,11 +3041,11 @@ strip-json-comments@1.0.x, strip-json-comments@~1.0.4:
29453041
version "1.0.4"
29463042
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
29473043

2948-
supports-color@4.4.0:
2949-
version "4.4.0"
2950-
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
3044+
supports-color@5.4.0:
3045+
version "5.4.0"
3046+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
29513047
dependencies:
2952-
has-flag "^2.0.0"
3048+
has-flag "^3.0.0"
29533049

29543050
supports-color@^2.0.0:
29553051
version "2.0.0"
@@ -3089,6 +3185,14 @@ wrappy@1:
30893185
version "1.0.2"
30903186
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
30913187

3188+
write-file-atomic@^1.2.0:
3189+
version "1.3.4"
3190+
resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
3191+
dependencies:
3192+
graceful-fs "^4.1.11"
3193+
imurmurhash "^0.1.4"
3194+
slide "^1.1.5"
3195+
30923196
xtend@^4.0.0:
30933197
version "4.0.1"
30943198
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"

0 commit comments

Comments
 (0)