Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.

Commit 70f33df

Browse files
authored
Merge branch 'master' into depfu/update/yarn/react-app-rewired-1.5.2
2 parents 7d67150 + fbdc8b6 commit 70f33df

File tree

2 files changed

+60
-10
lines changed

2 files changed

+60
-10
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
]
2424
},
2525
"dependencies": {
26-
"babel-plugin-styled-components": "^1.1.4",
2726
"react-app-rewired": "^1.5.2"
27+
"babel-plugin-styled-components": "^1.5.1",
2828
},
2929
"peerDependencies": {
3030
"styled-components": "2.x || 3.x"
@@ -38,6 +38,6 @@
3838
"jest": "19.x.x",
3939
"lint-staged": "^3.4.1",
4040
"prettier": "^1.3.1",
41-
"rimraf": "^2.6.1"
41+
"rimraf": "^2.6.2"
4242
}
4343
}

yarn.lock

Lines changed: 58 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
# yarn lockfile v1
33

44

5+
"@babel/helper-annotate-as-pure@^7.0.0-beta.37":
6+
version "7.0.0-beta.56"
7+
resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.56.tgz#3814bfda01ec19f7daac810cc2375932a79acbbc"
8+
dependencies:
9+
"@babel/types" "7.0.0-beta.56"
10+
11+
"@babel/types@7.0.0-beta.56":
12+
version "7.0.0-beta.56"
13+
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.56.tgz#df456947a82510ec30361971e566110d89489056"
14+
dependencies:
15+
esutils "^2.0.2"
16+
lodash "^4.17.10"
17+
to-fast-properties "^2.0.0"
18+
519
abab@^1.0.3:
620
version "1.0.3"
721
resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
@@ -354,11 +368,13 @@ babel-plugin-jest-hoist@^19.0.0:
354368
version "19.0.0"
355369
resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-19.0.0.tgz#4ae2a04ea612a6e73651f3fde52c178991304bea"
356370

357-
babel-plugin-styled-components@^1.1.4:
358-
version "1.1.4"
359-
resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.1.4.tgz#b0e6d5bb01059bc7ab9118d3d686f6472ee8e91f"
371+
babel-plugin-styled-components@^1.5.1:
372+
version "1.5.1"
373+
resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.5.1.tgz#31dbeb696d1354d1585e60d66c7905f5e474afcd"
360374
dependencies:
361-
stylis "2.0.0"
375+
"@babel/helper-annotate-as-pure" "^7.0.0-beta.37"
376+
babel-types "^6.26.0"
377+
stylis "^3.0.0"
362378

363379
babel-plugin-syntax-async-functions@^6.8.0:
364380
version "6.13.0"
@@ -653,6 +669,13 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0:
653669
core-js "^2.4.0"
654670
regenerator-runtime "^0.10.0"
655671

672+
babel-runtime@^6.26.0:
673+
version "6.26.0"
674+
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
675+
dependencies:
676+
core-js "^2.4.0"
677+
regenerator-runtime "^0.11.0"
678+
656679
babel-template@^6.16.0, babel-template@^6.24.1:
657680
version "6.24.1"
658681
resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
@@ -686,6 +709,15 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1:
686709
lodash "^4.2.0"
687710
to-fast-properties "^1.0.1"
688711

712+
babel-types@^6.26.0:
713+
version "6.26.0"
714+
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
715+
dependencies:
716+
babel-runtime "^6.26.0"
717+
esutils "^2.0.2"
718+
lodash "^4.17.4"
719+
to-fast-properties "^1.0.3"
720+
689721
babylon@7.0.0-beta.8:
690722
version "7.0.0-beta.8"
691723
resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.8.tgz#2bdc5ae366041442c27e068cce6f0d7c06ea9949"
@@ -1999,6 +2031,10 @@ lodash@^4.14.0, lodash@^4.2.0:
19992031
version "4.17.4"
20002032
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
20012033

2034+
lodash@^4.17.10, lodash@^4.17.4:
2035+
version "4.17.10"
2036+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
2037+
20022038
log-symbols@^1.0.2:
20032039
version "1.0.2"
20042040
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -2475,6 +2511,10 @@ regenerator-runtime@^0.10.0:
24752511
version "0.10.5"
24762512
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
24772513

2514+
regenerator-runtime@^0.11.0:
2515+
version "0.11.1"
2516+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
2517+
24782518
regenerator-transform@0.9.11:
24792519
version "0.9.11"
24802520
resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
@@ -2594,6 +2634,12 @@ rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
25942634
dependencies:
25952635
glob "^7.0.5"
25962636

2637+
rimraf@^2.6.2:
2638+
version "2.6.2"
2639+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
2640+
dependencies:
2641+
glob "^7.0.5"
2642+
25972643
rxjs@^5.0.0-beta.11:
25982644
version "5.3.1"
25992645
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.3.1.tgz#9ecc9e722247e4f4490d30a878577a3740fd0cb7"
@@ -2775,9 +2821,9 @@ strip-json-comments@~2.0.1:
27752821
version "2.0.1"
27762822
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
27772823

2778-
stylis@2.0.0:
2779-
version "2.0.0"
2780-
resolved "https://registry.yarnpkg.com/stylis/-/stylis-2.0.0.tgz#6785a6546bd73478799a67d49d67086953b50ad5"
2824+
stylis@^3.0.0:
2825+
version "3.5.3"
2826+
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.3.tgz#99fdc46afba6af4deff570825994181a5e6ce546"
27812827

27822828
supports-color@^2.0.0:
27832829
version "2.0.0"
@@ -2836,10 +2882,14 @@ tmpl@1.0.x:
28362882
version "1.0.4"
28372883
resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
28382884

2839-
to-fast-properties@^1.0.1:
2885+
to-fast-properties@^1.0.1, to-fast-properties@^1.0.3:
28402886
version "1.0.3"
28412887
resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
28422888

2889+
to-fast-properties@^2.0.0:
2890+
version "2.0.0"
2891+
resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
2892+
28432893
tough-cookie@^2.3.2, tough-cookie@~2.3.0:
28442894
version "2.3.2"
28452895
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"

0 commit comments

Comments
 (0)