Skip to content

Commit 978fb4f

Browse files
authored
Merge branch 'master' into greenkeeper/rollup-0.60.0
2 parents 535ea14 + 6848f55 commit 978fb4f

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959
"enzyme": "^3.3.0",
6060
"enzyme-adapter-react-16": "^1.1.1",
6161
"greenkeeper-lockfile": "^1.15.0",
62-
"gzip-size": "^4.1.0",
62+
"gzip-size": "^5.0.0",
6363
"jest": "^22.4.3",
6464
"jest-enzyme": "^6.0.0",
6565
"jsdom": "^11.10.0",
6666
"pretty-bytes": "^5.0.0",
6767
"react": "^16.3.2",
6868
"react-dom": "^16.3.2",
6969
"react-test-renderer": "^16.3.2",
70-
"regenerator-runtime": "^0.11.1",
70+
"regenerator-runtime": "^0.12.0",
7171
"rollup": "^0.60.0",
7272
"rollup-plugin-babel": "^3.0.4",
7373
"rollup-plugin-commonjs": "^9.1.3",

yarn.lock

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1751,9 +1751,9 @@ growly@^1.3.0:
17511751
version "1.3.0"
17521752
resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
17531753

1754-
gzip-size@^4.1.0:
1755-
version "4.1.0"
1756-
resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-4.1.0.tgz#8ae096257eabe7d69c45be2b67c448124ffb517c"
1754+
gzip-size@^5.0.0:
1755+
version "5.0.0"
1756+
resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz#a55ecd99222f4c48fd8c01c625ce3b349d0a0e80"
17571757
dependencies:
17581758
duplexer "^0.1.1"
17591759
pify "^3.0.0"
@@ -3447,10 +3447,14 @@ regenerator-runtime@^0.10.5:
34473447
version "0.10.5"
34483448
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
34493449

3450-
regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
3450+
regenerator-runtime@^0.11.0:
34513451
version "0.11.1"
34523452
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
34533453

3454+
regenerator-runtime@^0.12.0:
3455+
version "0.12.0"
3456+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.0.tgz#8052ac952d85b10f3425192cd0c53f45cf65c6cb"
3457+
34543458
regenerator-transform@^0.10.0:
34553459
version "0.10.1"
34563460
resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"

0 commit comments

Comments
 (0)