Skip to content

Commit bf36d2a

Browse files
authored
Merge branch 'master' into greenkeeper/rollup-plugin-babel-4.0.2
2 parents 37978b9 + f6d548f commit bf36d2a

File tree

2 files changed

+98
-72
lines changed

2 files changed

+98
-72
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,24 @@
4747
"babel-preset-env": "^1.6.1",
4848
"babel-preset-react": "^6.24.1",
4949
"coveralls": "^3.0.2",
50-
"enzyme": "^3.3.0",
51-
"enzyme-adapter-react-16": "^1.2.0",
50+
"enzyme": "^3.5.0",
51+
"enzyme-adapter-react-16": "^1.3.1",
5252
"greenkeeper-lockfile": "^1.15.1",
5353
"gzip-size": "^5.0.0",
5454
"jest": "^23.4.0",
5555
"jest-enzyme": "^6.0.2",
56-
"jsdom": "^11.11.0",
56+
"jsdom": "^12.0.0",
5757
"pretty-bytes": "^5.1.0",
5858
"react": "^16.4.1",
5959
"react-dom": "^16.4.1",
6060
"react-test-renderer": "^16.4.1",
6161
"regenerator-runtime": "^0.12.0",
62-
"rollup": "^0.64.1",
62+
"rollup": "^0.65.0",
6363
"rollup-plugin-babel": "^4.0.2",
6464
"rollup-plugin-commonjs": "^9.1.0",
6565
"rollup-plugin-json": "^3.0.0",
6666
"rollup-plugin-node-resolve": "^3.2.0",
67-
"rollup-plugin-uglify": "^4.0.0",
67+
"rollup-plugin-uglify": "^5.0.2",
6868
"rollup-watch": "^4.3.1"
6969
},
7070
"jest": {

yarn.lock

Lines changed: 93 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
# yarn lockfile v1
33

44

5-
"@babel/code-frame@^7.0.0-beta.35", "@babel/code-frame@^7.0.0-beta.47":
6-
version "7.0.0-rc.1"
7-
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-rc.1.tgz#5c2154415d6c09959a71845ef519d11157e95d10"
5+
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35":
6+
version "7.0.0"
7+
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
88
dependencies:
9-
"@babel/highlight" "7.0.0-rc.1"
9+
"@babel/highlight" "^7.0.0"
1010

11-
"@babel/highlight@7.0.0-rc.1":
12-
version "7.0.0-rc.1"
13-
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-rc.1.tgz#e0ca4731fa4786f7b9500421d6ff5e5a7753e81e"
11+
"@babel/highlight@^7.0.0":
12+
version "7.0.0"
13+
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
1414
dependencies:
1515
chalk "^2.0.0"
1616
esutils "^2.0.2"
17-
js-tokens "^3.0.0"
17+
js-tokens "^4.0.0"
1818

1919
"@types/estree@0.0.39":
2020
version "0.0.39"
@@ -24,10 +24,6 @@
2424
version "10.7.1"
2525
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.7.1.tgz#b704d7c259aa40ee052eec678758a68d07132a2e"
2626

27-
abab@^1.0.4:
28-
version "1.0.4"
29-
resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
30-
3127
abab@^2.0.0:
3228
version "2.0.0"
3329
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
@@ -42,7 +38,7 @@ acorn-globals@^4.1.0:
4238
dependencies:
4339
acorn "^5.0.0"
4440

45-
acorn@^5.0.0, acorn@^5.5.3:
41+
acorn@^5.0.0, acorn@^5.5.3, acorn@^5.7.1:
4642
version "5.7.1"
4743
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8"
4844

@@ -1093,14 +1089,10 @@ combined-stream@1.0.6, combined-stream@~1.0.6:
10931089
dependencies:
10941090
delayed-stream "~1.0.0"
10951091

1096-
commander@^2.11.0:
1092+
commander@^2.11.0, commander@~2.17.1:
10971093
version "2.17.1"
10981094
resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
10991095

1100-
commander@~2.16.0:
1101-
version "2.16.0"
1102-
resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50"
1103-
11041096
compare-versions@^3.1.0:
11051097
version "3.3.0"
11061098
resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.3.0.tgz#af93ea705a96943f622ab309578b9b90586f39c3"
@@ -1185,13 +1177,13 @@ dashdash@^1.12.0:
11851177
dependencies:
11861178
assert-plus "^1.0.0"
11871179

1188-
data-urls@^1.0.0:
1189-
version "1.0.0"
1190-
resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.0.0.tgz#24802de4e81c298ea8a9388bb0d8e461c774684f"
1180+
data-urls@^1.0.0, data-urls@^1.0.1:
1181+
version "1.0.1"
1182+
resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.0.1.tgz#d416ac3896918f29ca84d81085bc3705834da579"
11911183
dependencies:
1192-
abab "^1.0.4"
1193-
whatwg-mimetype "^2.0.0"
1194-
whatwg-url "^6.4.0"
1184+
abab "^2.0.0"
1185+
whatwg-mimetype "^2.1.0"
1186+
whatwg-url "^7.0.0"
11951187

11961188
debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
11971189
version "2.6.9"
@@ -1315,20 +1307,13 @@ domhandler@^2.3.0:
13151307
dependencies:
13161308
domelementtype "1"
13171309

1318-
domutils@1.5.1:
1310+
domutils@1.5.1, domutils@^1.5.1:
13191311
version "1.5.1"
13201312
resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
13211313
dependencies:
13221314
dom-serializer "0"
13231315
domelementtype "1"
13241316

1325-
domutils@^1.5.1:
1326-
version "1.7.0"
1327-
resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
1328-
dependencies:
1329-
dom-serializer "0"
1330-
domelementtype "1"
1331-
13321317
duplexer@^0.1.1:
13331318
version "0.1.1"
13341319
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
@@ -1438,7 +1423,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
14381423
version "1.0.5"
14391424
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
14401425

1441-
escodegen@^1.9.1:
1426+
escodegen@^1.11.0, escodegen@^1.9.1:
14421427
version "1.11.0"
14431428
resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
14441429
dependencies:
@@ -1566,14 +1551,10 @@ extglob@^2.0.4:
15661551
snapdragon "^0.8.1"
15671552
to-regex "^3.0.1"
15681553

1569-
extsprintf@1.3.0:
1554+
extsprintf@1.3.0, extsprintf@^1.2.0:
15701555
version "1.3.0"
15711556
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
15721557

1573-
extsprintf@^1.2.0:
1574-
version "1.4.0"
1575-
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
1576-
15771558
fast-deep-equal@^1.0.0:
15781559
version "1.1.0"
15791560
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
@@ -2585,14 +2566,14 @@ jest@^23.4.0:
25852566
import-local "^1.0.0"
25862567
jest-cli "^23.5.0"
25872568

2588-
js-tokens@^3.0.0, js-tokens@^3.0.2:
2589-
version "3.0.2"
2590-
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
2591-
2592-
"js-tokens@^3.0.0 || ^4.0.0":
2569+
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
25932570
version "4.0.0"
25942571
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
25952572

2573+
js-tokens@^3.0.2:
2574+
version "3.0.2"
2575+
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
2576+
25962577
js-yaml@^3.11.0, js-yaml@^3.7.0:
25972578
version "3.12.0"
25982579
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
@@ -2604,7 +2585,7 @@ jsbn@~0.1.0:
26042585
version "0.1.1"
26052586
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
26062587

2607-
jsdom@^11.11.0, jsdom@^11.5.1:
2588+
jsdom@^11.5.1:
26082589
version "11.12.0"
26092590
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
26102591
dependencies:
@@ -2635,6 +2616,36 @@ jsdom@^11.11.0, jsdom@^11.5.1:
26352616
ws "^5.2.0"
26362617
xml-name-validator "^3.0.0"
26372618

2619+
jsdom@^12.0.0:
2620+
version "12.0.0"
2621+
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-12.0.0.tgz#043ffaac60605d87adf77a1ec3eb7686918b6b64"
2622+
dependencies:
2623+
abab "^2.0.0"
2624+
acorn "^5.7.1"
2625+
acorn-globals "^4.1.0"
2626+
array-equal "^1.0.0"
2627+
cssom ">= 0.3.2 < 0.4.0"
2628+
cssstyle "^1.0.0"
2629+
data-urls "^1.0.1"
2630+
domexception "^1.0.1"
2631+
escodegen "^1.11.0"
2632+
html-encoding-sniffer "^1.0.2"
2633+
nwsapi "^2.0.8"
2634+
parse5 "5.1.0"
2635+
pn "^1.1.0"
2636+
request "^2.88.0"
2637+
request-promise-native "^1.0.5"
2638+
sax "^1.2.4"
2639+
symbol-tree "^3.2.2"
2640+
tough-cookie "^2.4.3"
2641+
w3c-hr-time "^1.0.1"
2642+
webidl-conversions "^4.0.2"
2643+
whatwg-encoding "^1.0.4"
2644+
whatwg-mimetype "^2.1.0"
2645+
whatwg-url "^7.0.0"
2646+
ws "^6.0.0"
2647+
xml-name-validator "^3.0.0"
2648+
26382649
jsesc@^1.3.0:
26392650
version "1.3.0"
26402651
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -2916,18 +2927,14 @@ minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
29162927
dependencies:
29172928
brace-expansion "^1.1.7"
29182929

2919-
minimist@0.0.8:
2930+
minimist@0.0.8, minimist@~0.0.1:
29202931
version "0.0.8"
29212932
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
29222933

29232934
minimist@^1.1.1, minimist@^1.2.0:
29242935
version "1.2.0"
29252936
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
29262937

2927-
minimist@~0.0.1:
2928-
version "0.0.10"
2929-
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
2930-
29312938
minipass@^2.2.1, minipass@^2.3.3:
29322939
version "2.3.4"
29332940
resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
@@ -3104,7 +3111,7 @@ number-is-nan@^1.0.0:
31043111
version "1.0.1"
31053112
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
31063113

3107-
nwsapi@^2.0.7:
3114+
nwsapi@^2.0.7, nwsapi@^2.0.8:
31083115
version "2.0.8"
31093116
resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.8.tgz#e3603579b7e162b3dbedae4fb24e46f771d8fa24"
31103117

@@ -3283,6 +3290,10 @@ parse5@4.0.0:
32833290
version "4.0.0"
32843291
resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
32853292

3293+
parse5@5.1.0:
3294+
version "5.1.0"
3295+
resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
3296+
32863297
parse5@^3.0.1:
32873298
version "3.0.3"
32883299
resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
@@ -3629,7 +3640,7 @@ request-promise-native@^1.0.5:
36293640
stealthy-require "^1.1.0"
36303641
tough-cookie ">=2.3.3"
36313642

3632-
request@^2.85.0, request@^2.87.0:
3643+
request@^2.85.0, request@^2.87.0, request@^2.88.0:
36333644
version "2.88.0"
36343645
resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
36353646
dependencies:
@@ -3735,12 +3746,13 @@ rollup-plugin-node-resolve@^3.2.0:
37353746
is-module "^1.0.0"
37363747
resolve "^1.1.6"
37373748

3738-
rollup-plugin-uglify@^4.0.0:
3739-
version "4.0.0"
3740-
resolved "https://registry.yarnpkg.com/rollup-plugin-uglify/-/rollup-plugin-uglify-4.0.0.tgz#6eb471738f1ce9ba7d9d4bc43b71cba02417c8fb"
3749+
rollup-plugin-uglify@^5.0.2:
3750+
version "5.0.2"
3751+
resolved "https://registry.yarnpkg.com/rollup-plugin-uglify/-/rollup-plugin-uglify-5.0.2.tgz#3d7985faa9760a933eb451fcfb7f54bf76c0651d"
37413752
dependencies:
3742-
"@babel/code-frame" "^7.0.0-beta.47"
3743-
uglify-js "^3.3.25"
3753+
"@babel/code-frame" "^7.0.0"
3754+
jest-worker "^23.2.0"
3755+
uglify-js "^3.4.8"
37443756

37453757
rollup-pluginutils@^1.5.0:
37463758
version "1.5.2"
@@ -3764,9 +3776,9 @@ rollup-watch@^4.3.1:
37643776
require-relative "0.8.7"
37653777
rollup-pluginutils "^2.0.1"
37663778

3767-
rollup@^0.64.1:
3768-
version "0.64.1"
3769-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.64.1.tgz#9188ee368e5fcd43ffbc00ec414e72eeb5de87ba"
3779+
rollup@^0.65.0:
3780+
version "0.65.0"
3781+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.65.0.tgz#280db1252169b68fc3043028346b337dde453fba"
37703782
dependencies:
37713783
"@types/estree" "0.0.39"
37723784
"@types/node" "*"
@@ -4139,7 +4151,7 @@ to-regex@^3.0.1, to-regex@^3.0.2:
41394151
regex-not "^1.0.2"
41404152
safe-regex "^1.1.0"
41414153

4142-
tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.4.3:
4154+
tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.4.3, tough-cookie@~2.4.3:
41434155
version "2.4.3"
41444156
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
41454157
dependencies:
@@ -4185,11 +4197,11 @@ uglify-js@^2.6:
41854197
optionalDependencies:
41864198
uglify-to-browserify "~1.0.0"
41874199

4188-
uglify-js@^3.3.25:
4189-
version "3.4.7"
4190-
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.7.tgz#4df6b92e54789aa921a254cb1e33704d6ec12b89"
4200+
uglify-js@^3.4.8:
4201+
version "3.4.8"
4202+
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.8.tgz#d590777b208258b54131b1ae45bc9d3f68033a3e"
41914203
dependencies:
4192-
commander "~2.16.0"
4204+
commander "~2.17.1"
41934205
source-map "~0.6.1"
41944206

41954207
uglify-to-browserify@~1.0.0:
@@ -4291,7 +4303,7 @@ webidl-conversions@^4.0.2:
42914303
version "4.0.2"
42924304
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
42934305

4294-
whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
4306+
whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.4:
42954307
version "1.0.4"
42964308
resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.4.tgz#63fb016b7435b795d9025632c086a5209dbd2621"
42974309
dependencies:
@@ -4301,18 +4313,26 @@ whatwg-fetch@>=0.10.0:
43014313
version "2.0.4"
43024314
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
43034315

4304-
whatwg-mimetype@^2.0.0, whatwg-mimetype@^2.1.0:
4316+
whatwg-mimetype@^2.1.0:
43054317
version "2.1.0"
43064318
resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz#f0f21d76cbba72362eb609dbed2a30cd17fcc7d4"
43074319

4308-
whatwg-url@^6.4.0, whatwg-url@^6.4.1:
4320+
whatwg-url@^6.4.1:
43094321
version "6.5.0"
43104322
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
43114323
dependencies:
43124324
lodash.sortby "^4.7.0"
43134325
tr46 "^1.0.1"
43144326
webidl-conversions "^4.0.2"
43154327

4328+
whatwg-url@^7.0.0:
4329+
version "7.0.0"
4330+
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
4331+
dependencies:
4332+
lodash.sortby "^4.7.0"
4333+
tr46 "^1.0.1"
4334+
webidl-conversions "^4.0.2"
4335+
43164336
which-module@^2.0.0:
43174337
version "2.0.0"
43184338
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
@@ -4370,6 +4390,12 @@ ws@^5.2.0:
43704390
dependencies:
43714391
async-limiter "~1.0.0"
43724392

4393+
ws@^6.0.0:
4394+
version "6.0.0"
4395+
resolved "https://registry.yarnpkg.com/ws/-/ws-6.0.0.tgz#eaa494aded00ac4289d455bac8d84c7c651cef35"
4396+
dependencies:
4397+
async-limiter "~1.0.0"
4398+
43734399
xml-name-validator@^3.0.0:
43744400
version "3.0.0"
43754401
resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"

0 commit comments

Comments
 (0)