Skip to content

Commit 5aec489

Browse files
committed
upgrading to webpack 3
1 parent 5ca96e9 commit 5aec489

File tree

2 files changed

+47
-62
lines changed

2 files changed

+47
-62
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"pretty-error": "^2.1.0",
4242
"resolve-url-loader": "^2.0.2",
4343
"style-loader": "^0.13.2",
44-
"webpack": "^2.2.0",
44+
"webpack": ">=2.2.0 <4",
4545
"webpack-chunk-hash": "^0.4.0",
4646
"webpack-dev-server": "^2.4.5",
4747
"yargs": "^8.0.1"

yarn.lock

Lines changed: 46 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,22 @@ agent-base@2:
7070
extend "~3.0.0"
7171
semver "~5.0.1"
7272

73-
ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
73+
ajv-keywords@^1.0.0:
7474
version "1.5.1"
7575
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
7676

77+
ajv-keywords@^2.0.0:
78+
version "2.1.0"
79+
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
80+
7781
ajv@^4.7.0, ajv@^4.9.1:
7882
version "4.11.8"
7983
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
8084
dependencies:
8185
co "^4.6.0"
8286
json-stable-stringify "^1.0.1"
8387

84-
ajv@^5.0.0:
88+
ajv@^5.0.0, ajv@^5.1.5:
8589
version "5.2.0"
8690
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.0.tgz#c1735024c5da2ef75cc190713073d44f098bf486"
8791
dependencies:
@@ -818,8 +822,8 @@ balanced-match@^1.0.0:
818822
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
819823

820824
base64-js@^1.0.2:
821-
version "1.2.0"
822-
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
825+
version "1.2.1"
826+
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
823827

824828
825829
version "0.6.1"
@@ -856,8 +860,8 @@ bluebird@^3.0:
856860
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
857861

858862
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
859-
version "4.11.6"
860-
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
863+
version "4.11.7"
864+
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.7.tgz#ddb048e50d9482790094c13eb3fcfc833ce7ab46"
861865

862866
bonjour@^3.5.0:
863867
version "3.5.0"
@@ -1043,12 +1047,12 @@ caniuse-api@^1.5.2:
10431047
lodash.uniq "^4.5.0"
10441048

10451049
caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
1046-
version "1.0.30000692"
1047-
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000692.tgz#3da9a99353adbcea1e142b99f60ecc6216df47a5"
1050+
version "1.0.30000693"
1051+
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000693.tgz#8510e7a9ab04adcca23a5dcefa34df9d28c1ce20"
10481052

10491053
caniuse-lite@^1.0.30000684:
1050-
version "1.0.30000692"
1051-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000692.tgz#34600fd7152352d85a47f4662a3b51b02d8b646f"
1054+
version "1.0.30000693"
1055+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000693.tgz#c9c6298697c71fdf6cb13eefe8aa93926f2f8613"
10521056

10531057
caseless@~0.12.0:
10541058
version "0.12.0"
@@ -3095,15 +3099,6 @@ loader-runner@^2.3.0:
30953099
version "2.3.0"
30963100
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
30973101

3098-
loader-utils@^0.2.16:
3099-
version "0.2.17"
3100-
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
3101-
dependencies:
3102-
big.js "^3.1.3"
3103-
emojis-list "^2.0.0"
3104-
json5 "^0.5.0"
3105-
object-assign "^4.0.1"
3106-
31073102
loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
31083103
version "1.1.0"
31093104
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
@@ -3433,18 +3428,14 @@ [email protected]:
34333428
version "0.7.1"
34343429
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
34353430

3436-
3431+
[email protected], ms@^0.7.1:
34373432
version "0.7.2"
34383433
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
34393434

34403435
34413436
version "2.0.0"
34423437
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
34433438

3444-
ms@^0.7.1:
3445-
version "0.7.3"
3446-
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
3447-
34483439
multicast-dns-service-types@^1.1.0:
34493440
version "1.1.0"
34503441
resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -4401,8 +4392,8 @@ [email protected]:
44014392
string_decoder "~0.10.x"
44024393

44034394
readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9:
4404-
version "2.3.0"
4405-
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.0.tgz#640f5dcda88c91a8dc60787145629170813a1ed2"
4395+
version "2.3.2"
4396+
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.2.tgz#5a04df05e4f57fe3f0dc68fdd11dc5c97c7e6f4d"
44064397
dependencies:
44074398
core-util-is "~1.0.0"
44084399
inherits "~2.0.3"
@@ -4677,12 +4668,8 @@ rx-lite@^3.1.2:
46774668
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
46784669

46794670
safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0:
4680-
version "5.1.0"
4681-
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223"
4682-
4683-
safe-buffer@~5.0.1:
4684-
version "5.0.1"
4685-
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
4671+
version "5.1.1"
4672+
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
46864673

46874674
[email protected], samsam@^1.1.3:
46884675
version "1.2.1"
@@ -4708,8 +4695,8 @@ sass-loader@^6.0.3:
47084695
pify "^3.0.0"
47094696

47104697
sax@^1.1.4, sax@~1.2.1:
4711-
version "1.2.2"
4712-
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
4698+
version "1.2.4"
4699+
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
47134700

47144701
schema-utils@^0.3.0:
47154702
version "0.3.0"
@@ -4825,8 +4812,8 @@ signal-exit@^3.0.0:
48254812
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
48264813

48274814
sinon@^2.3.4:
4828-
version "2.3.4"
4829-
resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.3.4.tgz#466ad8d1bae86d6db51aa218b92e997bc3e5db88"
4815+
version "2.3.5"
4816+
resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.3.5.tgz#9a2fc0ff8d526da716f30953aa2c65d518917f6c"
48304817
dependencies:
48314818
diff "^3.1.0"
48324819
formatio "1.2.0"
@@ -4879,10 +4866,6 @@ source-list-map@^0.1.7:
48794866
version "0.1.8"
48804867
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
48814868

4882-
source-list-map@^1.1.1:
4883-
version "1.1.2"
4884-
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
4885-
48864869
source-list-map@^2.0.0:
48874870
version "2.0.0"
48884871
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
@@ -5044,10 +5027,10 @@ string_decoder@^0.10.25, string_decoder@~0.10.x:
50445027
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
50455028

50465029
string_decoder@~1.0.0:
5047-
version "1.0.2"
5048-
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.2.tgz#b29e1f4e1125fa97a10382b8a533737b7491e179"
5030+
version "1.0.3"
5031+
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
50495032
dependencies:
5050-
safe-buffer "~5.0.1"
5033+
safe-buffer "~5.1.0"
50515034

50525035
stringstream@~0.0.4:
50535036
version "0.0.5"
@@ -5267,7 +5250,7 @@ typedarray@^0.0.6:
52675250
version "0.0.6"
52685251
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
52695252

5270-
uglify-js@^2.8.27:
5253+
uglify-js@^2.8.29:
52715254
version "2.8.29"
52725255
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
52735256
dependencies:
@@ -5280,6 +5263,14 @@ uglify-to-browserify@~1.0.0:
52805263
version "1.0.2"
52815264
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
52825265

5266+
uglifyjs-webpack-plugin@^0.4.4:
5267+
version "0.4.6"
5268+
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
5269+
dependencies:
5270+
source-map "^0.5.6"
5271+
uglify-js "^2.8.29"
5272+
webpack-sources "^1.0.1"
5273+
52835274
uid-number@^0.0.6:
52845275
version "0.0.6"
52855276
resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -5427,8 +5418,8 @@ webpack-chunk-hash@^0.4.0:
54275418
resolved "https://registry.yarnpkg.com/webpack-chunk-hash/-/webpack-chunk-hash-0.4.0.tgz#6b40c3070fbc9ff0cfe0fe781c7174af6c7c16a4"
54285419

54295420
webpack-dev-middleware@^1.10.2:
5430-
version "1.10.2"
5431-
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
5421+
version "1.11.0"
5422+
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz#09691d0973a30ad1f82ac73a12e2087f0a4754f9"
54325423
dependencies:
54335424
memory-fs "~0.4.1"
54345425
mime "^1.3.4"
@@ -5461,44 +5452,38 @@ webpack-dev-server@^2.4.5:
54615452
webpack-dev-middleware "^1.10.2"
54625453
yargs "^6.0.0"
54635454

5464-
webpack-sources@^0.2.3:
5465-
version "0.2.3"
5466-
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
5467-
dependencies:
5468-
source-list-map "^1.1.1"
5469-
source-map "~0.5.3"
5470-
54715455
webpack-sources@^1.0.1:
54725456
version "1.0.1"
54735457
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
54745458
dependencies:
54755459
source-list-map "^2.0.0"
54765460
source-map "~0.5.3"
54775461

5478-
webpack@^2.2.0:
5479-
version "2.6.1"
5480-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"
5462+
"webpack@>=2.2.0 <4":
5463+
version "3.0.0"
5464+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
54815465
dependencies:
54825466
acorn "^5.0.0"
54835467
acorn-dynamic-import "^2.0.0"
5484-
ajv "^4.7.0"
5485-
ajv-keywords "^1.1.1"
5468+
ajv "^5.1.5"
5469+
ajv-keywords "^2.0.0"
54865470
async "^2.1.2"
54875471
enhanced-resolve "^3.0.0"
5472+
escope "^3.6.0"
54885473
interpret "^1.0.0"
54895474
json-loader "^0.5.4"
54905475
json5 "^0.5.1"
54915476
loader-runner "^2.3.0"
5492-
loader-utils "^0.2.16"
5477+
loader-utils "^1.1.0"
54935478
memory-fs "~0.4.1"
54945479
mkdirp "~0.5.0"
54955480
node-libs-browser "^2.0.0"
54965481
source-map "^0.5.3"
54975482
supports-color "^3.1.0"
54985483
tapable "~0.2.5"
5499-
uglify-js "^2.8.27"
5484+
uglifyjs-webpack-plugin "^0.4.4"
55005485
watchpack "^1.3.1"
5501-
webpack-sources "^0.2.3"
5486+
webpack-sources "^1.0.1"
55025487
yargs "^6.0.0"
55035488

55045489
websocket-driver@>=0.5.1:

0 commit comments

Comments
 (0)