Skip to content

Commit dbb5659

Browse files
author
Ives van Hoorne
committed
Update webpack to v3
1 parent 61e3dce commit dbb5659

File tree

3 files changed

+72
-18
lines changed

3 files changed

+72
-18
lines changed

config/webpack.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ const config = {
159159
},
160160

161161
plugins: [
162+
new webpack.optimize.ModuleConcatenationPlugin(),
162163
// Generates an `index.html` file with the <script> injected.
163164
new HtmlWebpackPlugin({
164165
inject: true,

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"babel-core": "^6.24.1",
99
"babel-eslint": "^7.2.3",
1010
"babel-jest": "^20.0.3",
11-
"babel-loader": "^7.0.0",
11+
"babel-loader": "^7.1.0",
1212
"babel-plugin-lodash": "^3.2.11",
1313
"babel-plugin-syntax-dynamic-import": "^6.18.0",
1414
"babel-plugin-transform-class-properties": "^6.24.1",
@@ -63,7 +63,7 @@
6363
"strip-ansi": "3.0.1",
6464
"style-loader": "^0.18.1",
6565
"url-loader": "^0.5.8",
66-
"webpack": "^2.6.1",
66+
"webpack": "^3.0.0",
6767
"webpack-dev-middleware": "^1.10.2",
6868
"webpack-dev-server": "^2.4.5",
6969
"whatwg-fetch": "^2.0.3"

yarn.lock

Lines changed: 69 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,22 @@ acorn@^5.0.0, acorn@^5.0.1:
4747
version "5.0.3"
4848
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
4949

50-
ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
50+
ajv-keywords@^1.0.0:
5151
version "1.5.1"
5252
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
5353

54+
ajv-keywords@^2.0.0:
55+
version "2.1.0"
56+
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
57+
5458
ajv@^4.11.2, ajv@^4.7.0, ajv@^4.9.1:
5559
version "4.11.7"
5660
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.7.tgz#8655a5d86d0824985cc471a1d913fb6729a0ec48"
5761
dependencies:
5862
co "^4.6.0"
5963
json-stable-stringify "^1.0.1"
6064

61-
ajv@^5.0.0:
65+
ajv@^5.0.0, ajv@^5.1.5:
6266
version "5.1.5"
6367
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.1.5.tgz#8734931b601f00d4feef7c65738d77d1b65d1f68"
6468
dependencies:
@@ -508,11 +512,11 @@ babel-jest@^20.0.3:
508512
babel-plugin-istanbul "^4.0.0"
509513
babel-preset-jest "^20.0.3"
510514

511-
babel-loader@^7.0.0:
512-
version "7.0.0"
513-
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.0.0.tgz#2e43a66bee1fff4470533d0402c8a4532fafbaf7"
515+
babel-loader@^7.1.0:
516+
version "7.1.0"
517+
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.0.tgz#3fbf2581f085774bd9642dca9990e6d6c1491144"
514518
dependencies:
515-
find-cache-dir "^0.1.1"
519+
find-cache-dir "^1.0.0"
516520
loader-utils "^1.0.2"
517521
mkdirp "^0.5.1"
518522

@@ -2835,6 +2839,14 @@ find-cache-dir@^0.1.1:
28352839
mkdirp "^0.5.1"
28362840
pkg-dir "^1.0.0"
28372841

2842+
find-cache-dir@^1.0.0:
2843+
version "1.0.0"
2844+
resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
2845+
dependencies:
2846+
commondir "^1.0.1"
2847+
make-dir "^1.0.0"
2848+
pkg-dir "^2.0.0"
2849+
28382850
find-index@^0.1.1:
28392851
version "0.1.1"
28402852
resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
@@ -4382,7 +4394,7 @@ loader-utils@^0.2.16:
43824394
json5 "^0.5.0"
43834395
object-assign "^4.0.1"
43844396

4385-
loader-utils@^1.0.2:
4397+
loader-utils@^1.0.2, loader-utils@^1.1.0:
43864398
version "1.1.0"
43874399
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
43884400
dependencies:
@@ -4586,6 +4598,12 @@ macaddress@^0.2.8:
45864598
version "0.2.8"
45874599
resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
45884600

4601+
make-dir@^1.0.0:
4602+
version "1.0.0"
4603+
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
4604+
dependencies:
4605+
pify "^2.3.0"
4606+
45894607
makeerror@1.0.x:
45904608
version "1.0.11"
45914609
resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -5249,6 +5267,12 @@ pkg-dir@^1.0.0:
52495267
dependencies:
52505268
find-up "^1.0.0"
52515269

5270+
pkg-dir@^2.0.0:
5271+
version "2.0.0"
5272+
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
5273+
dependencies:
5274+
find-up "^2.1.0"
5275+
52525276
pluralize@^1.2.1:
52535277
version "1.2.1"
52545278
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
@@ -6425,6 +6449,10 @@ source-list-map@^1.1.1:
64256449
version "1.1.1"
64266450
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.1.tgz#1a33ac210ca144d1e561f906ebccab5669ff4cb4"
64276451

6452+
source-list-map@^2.0.0:
6453+
version "2.0.0"
6454+
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
6455+
64286456
source-map-support@^0.4.2:
64296457
version "0.4.14"
64306458
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef"
@@ -6859,7 +6887,16 @@ ua-parser-js@^0.7.9:
68596887
version "0.7.12"
68606888
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
68616889

6862-
uglify-js@^2.6, uglify-js@^2.8.27, uglify-js@~2.8.22:
6890+
uglify-js@^2.6, uglify-js@^2.8.29:
6891+
version "2.8.29"
6892+
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
6893+
dependencies:
6894+
source-map "~0.5.1"
6895+
yargs "~3.10.0"
6896+
optionalDependencies:
6897+
uglify-to-browserify "~1.0.0"
6898+
6899+
uglify-js@~2.8.22:
68636900
version "2.8.27"
68646901
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.27.tgz#47787f912b0f242e5b984343be8e35e95f694c9c"
68656902
dependencies:
@@ -6872,6 +6909,14 @@ uglify-to-browserify@~1.0.0:
68726909
version "1.0.2"
68736910
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
68746911

6912+
uglifyjs-webpack-plugin@^0.4.4:
6913+
version "0.4.6"
6914+
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
6915+
dependencies:
6916+
source-map "^0.5.6"
6917+
uglify-js "^2.8.29"
6918+
webpack-sources "^1.0.1"
6919+
68756920
uid-number@^0.0.6:
68766921
version "0.0.6"
68776922
resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -7145,30 +7190,38 @@ webpack-sources@^0.2.3:
71457190
source-list-map "^1.1.1"
71467191
source-map "~0.5.3"
71477192

7148-
webpack@^2.6.1:
7149-
version "2.6.1"
7150-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"
7193+
webpack-sources@^1.0.1:
7194+
version "1.0.1"
7195+
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
7196+
dependencies:
7197+
source-list-map "^2.0.0"
7198+
source-map "~0.5.3"
7199+
7200+
webpack@^3.0.0:
7201+
version "3.0.0"
7202+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
71517203
dependencies:
71527204
acorn "^5.0.0"
71537205
acorn-dynamic-import "^2.0.0"
7154-
ajv "^4.7.0"
7155-
ajv-keywords "^1.1.1"
7206+
ajv "^5.1.5"
7207+
ajv-keywords "^2.0.0"
71567208
async "^2.1.2"
71577209
enhanced-resolve "^3.0.0"
7210+
escope "^3.6.0"
71587211
interpret "^1.0.0"
71597212
json-loader "^0.5.4"
71607213
json5 "^0.5.1"
71617214
loader-runner "^2.3.0"
7162-
loader-utils "^0.2.16"
7215+
loader-utils "^1.1.0"
71637216
memory-fs "~0.4.1"
71647217
mkdirp "~0.5.0"
71657218
node-libs-browser "^2.0.0"
71667219
source-map "^0.5.3"
71677220
supports-color "^3.1.0"
71687221
tapable "~0.2.5"
7169-
uglify-js "^2.8.27"
7222+
uglifyjs-webpack-plugin "^0.4.4"
71707223
watchpack "^1.3.1"
7171-
webpack-sources "^0.2.3"
7224+
webpack-sources "^1.0.1"
71727225
yargs "^6.0.0"
71737226

71747227
websocket-driver@>=0.5.1:

0 commit comments

Comments
 (0)