Skip to content

Commit c5a9869

Browse files
committed
update react
1 parent a8be5a2 commit c5a9869

File tree

2 files changed

+98
-77
lines changed

2 files changed

+98
-77
lines changed

playground/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"dependencies": {
2626
"axios": "0.18.0",
2727
"cuid": "2.1.0",
28-
"react": "16.2.0",
29-
"react-dom": "16.2.0",
28+
"react": "16.3.0",
29+
"react-dom": "16.3.0",
3030
"react-redux": "5.0.7",
3131
"react-router-dom": "4.2.2",
3232
"react-router-redux": "5.0.0-alpha.8",
@@ -35,7 +35,7 @@
3535
"reselect": "3.0.1",
3636
"rxjs": "5.5.8",
3737
"tslib": "1.9.0",
38-
"typesafe-actions": "1.1.2",
38+
"typesafe-actions": "1.2.0-rc.2",
3939
"utility-types": "1.1.0"
4040
},
4141
"devDependencies": {
@@ -59,6 +59,6 @@
5959
"tslint-react": "3.5.1",
6060
"typescript": "2.8.1",
6161
"webpack": "3.10.0",
62-
"webpack-blocks": "1.0.0-rc.2"
62+
"webpack-blocks": "1.0.0"
6363
}
6464
}

playground/yarn.lock

Lines changed: 94 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -85,80 +85,87 @@
8585
version "16.1.0"
8686
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.1.0.tgz#6c0e9955ce73f332b4a1948d45decaf18c764c6e"
8787

88-
"@webpack-blocks/assets@^1.0.0-rc":
89-
version "1.0.0-rc"
90-
resolved "https://registry.yarnpkg.com/@webpack-blocks/assets/-/assets-1.0.0-rc.tgz#a68da5f8d2e7c03d572bad6fe37b87ea11bc992b"
88+
"@webpack-blocks/assets@^1.0.0":
89+
version "1.0.0"
90+
resolved "https://registry.yarnpkg.com/@webpack-blocks/assets/-/assets-1.0.0.tgz#ca412abd95767f37fe36c7cc0e37d908afb32a49"
9191
dependencies:
9292
css-loader "^0.28.4"
9393
file-loader "^0.11.2"
9494
lodash "^4.17.4"
9595
style-loader "^0.18.2"
9696
url-loader "^0.5.9"
9797

98-
"@webpack-blocks/babel@^1.0.0-rc":
99-
version "1.0.0-rc"
100-
resolved "https://registry.yarnpkg.com/@webpack-blocks/babel/-/babel-1.0.0-rc.tgz#4e2848120fe4bde2501052e951cd3bf2219d4f54"
98+
"@webpack-blocks/babel@^1.0.0":
99+
version "1.0.0"
100+
resolved "https://registry.yarnpkg.com/@webpack-blocks/babel/-/babel-1.0.0.tgz#131ecce5decd2b45f5a577cdaa3fa67c243fca58"
101101
dependencies:
102102
babel-loader "^7.1.1"
103103

104-
"@webpack-blocks/core@^1.0.0-rc":
105-
version "1.0.0-rc"
106-
resolved "https://registry.yarnpkg.com/@webpack-blocks/core/-/core-1.0.0-rc.tgz#a820adebea589a684595b74cfff6a290e58a3c96"
104+
"@webpack-blocks/core@^1.0.0":
105+
version "1.0.0"
106+
resolved "https://registry.yarnpkg.com/@webpack-blocks/core/-/core-1.0.0.tgz#896bc9ea3e6861ec06ac13ce997ae3af2efe0c95"
107107
dependencies:
108108
glob-to-regexp "^0.3.0"
109109
lodash "^4.17.4"
110110
webpack-merge "^2.6.1"
111111

112-
"@webpack-blocks/dev-server@^1.0.0-rc":
113-
version "1.0.0-rc"
114-
resolved "https://registry.yarnpkg.com/@webpack-blocks/dev-server/-/dev-server-1.0.0-rc.tgz#5a1d8b1e4607f7c6e873470d5669683616b817cb"
112+
"@webpack-blocks/dev-server@^1.0.0":
113+
version "1.0.0"
114+
resolved "https://registry.yarnpkg.com/@webpack-blocks/dev-server/-/dev-server-1.0.0.tgz#c4f9a045bce4e02c511478a530892a0d4da63de6"
115115
dependencies:
116116
webpack-dev-server "^2.9.1"
117117

118-
"@webpack-blocks/extract-text@^1.0.0-rc":
119-
version "1.0.0-rc"
120-
resolved "https://registry.yarnpkg.com/@webpack-blocks/extract-text/-/extract-text-1.0.0-rc.tgz#7cfe4c37f82fd6e1ad43f48e118c694a47dee8a5"
118+
"@webpack-blocks/extract-text@^1.0.0":
119+
version "1.0.0"
120+
resolved "https://registry.yarnpkg.com/@webpack-blocks/extract-text/-/extract-text-1.0.0.tgz#8db782e62de8f808de270a40de7fc55958a8f1fc"
121121
dependencies:
122-
extract-text-webpack-plugin "^3.0.0"
122+
extract-text-webpack-plugin "^3.0.2"
123123

124-
"@webpack-blocks/postcss@^1.0.0-rc":
125-
version "1.0.0-rc"
126-
resolved "https://registry.yarnpkg.com/@webpack-blocks/postcss/-/postcss-1.0.0-rc.tgz#aeba5a45fe5a44c16c09787a72e217bb5889183b"
124+
"@webpack-blocks/postcss@^1.0.0":
125+
version "1.0.0"
126+
resolved "https://registry.yarnpkg.com/@webpack-blocks/postcss/-/postcss-1.0.0.tgz#c6c2c01f053d1de976db35bac18fc5265e688e6b"
127127
dependencies:
128-
lodash "^4.17.4"
128+
lodash "^4.17.5"
129129
postcss-loader "^1.3.3"
130130

131-
"@webpack-blocks/sass@^1.0.0-rc":
132-
version "1.0.0-rc"
133-
resolved "https://registry.yarnpkg.com/@webpack-blocks/sass/-/sass-1.0.0-rc.tgz#b173795974898958e72a53baba447558fa6026a6"
131+
"@webpack-blocks/sass@^1.0.0":
132+
version "1.0.0"
133+
resolved "https://registry.yarnpkg.com/@webpack-blocks/sass/-/sass-1.0.0.tgz#7e6667daaa38ac7a8c3168c1b96f629190289d0f"
134134
dependencies:
135-
css-loader "^0.28.4"
136-
lodash "^4.17.4"
137-
node-sass "^4.5.3"
138-
sass-loader "^6.0.6"
135+
css-loader "^0.28.11"
136+
lodash "^4.17.5"
137+
node-sass "^4.8.3"
138+
sass-loader "^6.0.7"
139139
style-loader "^0.18.2"
140140

141-
"@webpack-blocks/[email protected]", "@webpack-blocks/typescript@^1.0.0-rc":
141+
"@webpack-blocks/[email protected]":
142142
version "1.0.0-rc"
143143
resolved "https://registry.yarnpkg.com/@webpack-blocks/typescript/-/typescript-1.0.0-rc.tgz#8ce56d347024fd69bf2126c828d1401f37a9c211"
144144
dependencies:
145145
awesome-typescript-loader "^3.2.2"
146146
typescript "^2.4.2"
147147

148-
"@webpack-blocks/uglify@^1.1.0":
149-
version "1.1.0"
150-
resolved "https://registry.yarnpkg.com/@webpack-blocks/uglify/-/uglify-1.1.0.tgz#481461489a32cc9eb2269094599a8a65f1b22075"
148+
"@webpack-blocks/typescript@^1.0.0":
149+
version "1.0.0"
150+
resolved "https://registry.yarnpkg.com/@webpack-blocks/typescript/-/typescript-1.0.0.tgz#56b32a5bd350f61b6761d587aefced9b229c1269"
151151
dependencies:
152-
uglifyjs-webpack-plugin "^1.0.1"
153-
webpack-merge "^4.1.0"
152+
awesome-typescript-loader "^3.5.0"
153+
typescript "^2.8.1"
154154

155-
"@webpack-blocks/webpack@^1.0.0-rc":
156-
version "1.0.0-rc"
157-
resolved "https://registry.yarnpkg.com/@webpack-blocks/webpack/-/webpack-1.0.0-rc.tgz#14611375d412163334e3f115af51cb432e300be7"
155+
"@webpack-blocks/uglify@^1.0.0":
156+
version "1.0.0"
157+
resolved "https://registry.yarnpkg.com/@webpack-blocks/uglify/-/uglify-1.0.0.tgz#7ed82f2ba9371bc8ef4e716cb4c25a2944d873b0"
158158
dependencies:
159-
"@webpack-blocks/core" "^1.0.0-rc"
159+
uglifyjs-webpack-plugin "^1.0.0-beta"
160160
webpack-merge "^4.1.0"
161161

162+
"@webpack-blocks/webpack@^1.0.0":
163+
version "1.0.0"
164+
resolved "https://registry.yarnpkg.com/@webpack-blocks/webpack/-/webpack-1.0.0.tgz#d05d855d4ff8e789c559e0bf959aa3bc817827f2"
165+
dependencies:
166+
"@webpack-blocks/core" "^1.0.0"
167+
webpack-merge "^4.1.2"
168+
162169
abab@^1.0.4:
163170
version "1.0.4"
164171
resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
@@ -496,7 +503,7 @@ autoprefixer@^6.3.1:
496503
postcss "^5.2.16"
497504
postcss-value-parser "^3.2.3"
498505

499-
awesome-typescript-loader@^3.2.2:
506+
awesome-typescript-loader@^3.2.2, awesome-typescript-loader@^3.5.0:
500507
version "3.5.0"
501508
resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.5.0.tgz#4d4d10cba7a04ed433dfa0334250846fb11a1a5a"
502509
dependencies:
@@ -2395,7 +2402,7 @@ extglob@^2.0.4:
23952402
snapdragon "^0.8.1"
23962403
to-regex "^3.0.1"
23972404

2398-
extract-text-webpack-plugin@^3.0.0:
2405+
extract-text-webpack-plugin@^3.0.2:
23992406
version "3.0.2"
24002407
resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
24012408
dependencies:
@@ -3146,7 +3153,7 @@ http-deceiver@^1.2.7:
31463153
version "1.2.7"
31473154
resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
31483155

3149-
[email protected], http-errors@~1.6.2:
3156+
31503157
version "1.6.2"
31513158
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
31523159
dependencies:
@@ -3155,6 +3162,15 @@ [email protected], http-errors@~1.6.2:
31553162
setprototypeof "1.0.3"
31563163
statuses ">= 1.3.1 < 2"
31573164

3165+
http-errors@~1.6.2:
3166+
version "1.6.3"
3167+
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
3168+
dependencies:
3169+
depd "~1.1.2"
3170+
inherits "2.0.3"
3171+
setprototypeof "1.1.0"
3172+
statuses ">= 1.4.0 < 2"
3173+
31583174
http-parser-js@>=0.4.0:
31593175
version "0.4.11"
31603176
resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.11.tgz#5b720849c650903c27e521633d94696ee95f3529"
@@ -4798,7 +4814,7 @@ node-pre-gyp@^0.6.39:
47984814
tar "^2.2.1"
47994815
tar-pack "^3.4.0"
48004816

4801-
node-sass@^4.5.3:
4817+
node-sass@^4.8.3:
48024818
version "4.8.3"
48034819
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.8.3.tgz#d077cc20a08ac06f661ca44fb6f19cd2ed41debb"
48044820
dependencies:
@@ -5857,9 +5873,9 @@ react-docgen@^3.0.0-beta9:
58575873
node-dir "^0.1.10"
58585874
recast "^0.12.6"
58595875

5860-
react-dom@16.2.0:
5861-
version "16.2.0"
5862-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
5876+
react-dom@16.3.0:
5877+
version "16.3.0"
5878+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.0.tgz#b318e52184188ecb5c3e81117420cca40618643e"
58635879
dependencies:
58645880
fbjs "^0.8.16"
58655881
loose-envify "^1.1.0"
@@ -5886,6 +5902,10 @@ react-icons@^2.2.7:
58865902
dependencies:
58875903
react-icon-base "2.1.0"
58885904

5905+
react-is@^16.3.0:
5906+
version "16.3.0"
5907+
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.0.tgz#f0e8bfd8c09b480dd610b8639d9ed65c13601224"
5908+
58895909
react-reconciler@^0.7.0:
58905910
version "0.7.0"
58915911
resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d"
@@ -6000,16 +6020,17 @@ [email protected]:
60006020
webpack-merge "^4.1.2"
60016021

60026022
react-test-renderer@^16.0.0-0:
6003-
version "16.2.0"
6004-
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211"
6023+
version "16.3.0"
6024+
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.3.0.tgz#7e88d8cb4c2b95c161b6c6c998991166f74d473e"
60056025
dependencies:
60066026
fbjs "^0.8.16"
60076027
object-assign "^4.1.1"
60086028
prop-types "^15.6.0"
6029+
react-is "^16.3.0"
60096030

6010-
react@16.2.0:
6011-
version "16.2.0"
6012-
resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
6031+
react@16.3.0:
6032+
version "16.3.0"
6033+
resolved "https://registry.yarnpkg.com/react/-/react-16.3.0.tgz#fc5a01c68f91e9b38e92cf83f7b795ebdca8ddff"
60136034
dependencies:
60146035
fbjs "^0.8.16"
60156036
loose-envify "^1.1.0"
@@ -6512,7 +6533,7 @@ sass-graph@^2.2.4:
65126533
scss-tokenizer "^0.2.3"
65136534
yargs "^7.0.0"
65146535

6515-
sass-loader@^6.0.6:
6536+
sass-loader@^6.0.7:
65166537
version "6.0.7"
65176538
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.7.tgz#dd2fdb3e7eeff4a53f35ba6ac408715488353d00"
65186539
dependencies:
@@ -6896,7 +6917,7 @@ static-extend@^0.1.1:
68966917
define-property "^0.2.5"
68976918
object-copy "^0.1.0"
68986919

6899-
"statuses@>= 1.3.1 < 2":
6920+
"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
69006921
version "1.5.0"
69016922
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
69026923

@@ -6969,8 +6990,8 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
69696990
strip-ansi "^4.0.0"
69706991

69716992
string_decoder@^1.0.0:
6972-
version "1.1.0"
6973-
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.0.tgz#384f322ee8a848e500effde99901bba849c5d403"
6993+
version "1.1.1"
6994+
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
69746995
dependencies:
69756996
safe-buffer "~5.1.0"
69766997

@@ -7350,11 +7371,11 @@ typedarray@^0.0.6:
73507371
version "0.0.6"
73517372
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
73527373

7353-
typesafe-actions@1.1.2:
7354-
version "1.1.2"
7355-
resolved "https://registry.yarnpkg.com/typesafe-actions/-/typesafe-actions-1.1.2.tgz#af88ede3ee254be425c3e0e02de11b182830ae48"
7374+
typesafe-actions@1.2.0-rc.2:
7375+
version "1.2.0-rc.2"
7376+
resolved "https://registry.yarnpkg.com/typesafe-actions/-/typesafe-actions-1.2.0-rc.2.tgz#7058ccd9b85b29159e745262eb84095dddc3e723"
73567377

7357-
[email protected], typescript@^2.4.2:
7378+
[email protected], typescript@^2.4.2, typescript@^2.8.1:
73587379
version "2.8.1"
73597380
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.1.tgz#6160e4f8f195d5ba81d4876f9c0cc1fbc0820624"
73607381

@@ -7389,7 +7410,7 @@ uglify-to-browserify@~1.0.0:
73897410
version "1.0.2"
73907411
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
73917412

7392-
[email protected], uglifyjs-webpack-plugin@^1.0.1:
7413+
[email protected], uglifyjs-webpack-plugin@^1.0.0-beta:
73937414
version "1.2.4"
73947415
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz#5eec941b2e9b8538be0a20fc6eda25b14c7c1043"
73957416
dependencies:
@@ -7715,19 +7736,19 @@ webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
77157736
version "4.0.2"
77167737
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
77177738

7718-
7719-
version "1.0.0-rc.2"
7720-
resolved "https://registry.yarnpkg.com/webpack-blocks/-/webpack-blocks-1.0.0-rc.2.tgz#c2825cfd96e945f578c3f62e0dfb5e87c4607e4e"
7721-
dependencies:
7722-
"@webpack-blocks/assets" "^1.0.0-rc"
7723-
"@webpack-blocks/babel" "^1.0.0-rc"
7724-
"@webpack-blocks/dev-server" "^1.0.0-rc"
7725-
"@webpack-blocks/extract-text" "^1.0.0-rc"
7726-
"@webpack-blocks/postcss" "^1.0.0-rc"
7727-
"@webpack-blocks/sass" "^1.0.0-rc"
7728-
"@webpack-blocks/typescript" "^1.0.0-rc"
7729-
"@webpack-blocks/uglify" "^1.1.0"
7730-
"@webpack-blocks/webpack" "^1.0.0-rc"
7739+
7740+
version "1.0.0"
7741+
resolved "https://registry.yarnpkg.com/webpack-blocks/-/webpack-blocks-1.0.0.tgz#54f8ca53d0be88c6ca49de03978c5142742983d0"
7742+
dependencies:
7743+
"@webpack-blocks/assets" "^1.0.0"
7744+
"@webpack-blocks/babel" "^1.0.0"
7745+
"@webpack-blocks/dev-server" "^1.0.0"
7746+
"@webpack-blocks/extract-text" "^1.0.0"
7747+
"@webpack-blocks/postcss" "^1.0.0"
7748+
"@webpack-blocks/sass" "^1.0.0"
7749+
"@webpack-blocks/typescript" "^1.0.0"
7750+
"@webpack-blocks/uglify" "^1.0.0"
7751+
"@webpack-blocks/webpack" "^1.0.0"
77317752

77327753
77337754
version "1.12.2"
@@ -7835,8 +7856,8 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
78357856
iconv-lite "0.4.19"
78367857

78377858
whatwg-fetch@>=0.10.0:
7838-
version "2.0.3"
7839-
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
7859+
version "2.0.4"
7860+
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
78407861

78417862
whatwg-url@^6.4.0:
78427863
version "6.4.0"

0 commit comments

Comments
 (0)