Commit 60ec9c8d authored by Jacob Schatz's avatar Jacob Schatz

Merge branch '30588-fix-javascript-sourcemaps-w-chrome-breakpoints' into 'master'

Upgrade webpack and webpack-dev-server to latest

Closes #30588 and #28438

See merge request !10552
parents 63cbf905 174dca9d
---
title: Upgrade webpack to v2.3.3 and webpack-dev-server to v2.4.2
merge_request: 10552
author:
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
"visibilityjs": "^1.2.4", "visibilityjs": "^1.2.4",
"vue": "^2.2.4", "vue": "^2.2.4",
"vue-resource": "^0.9.3", "vue-resource": "^0.9.3",
"webpack": "^2.2.1", "webpack": "^2.3.3",
"webpack-bundle-analyzer": "^2.3.0" "webpack-bundle-analyzer": "^2.3.0"
}, },
"devDependencies": { "devDependencies": {
...@@ -65,6 +65,6 @@ ...@@ -65,6 +65,6 @@
"karma-phantomjs-launcher": "^1.0.2", "karma-phantomjs-launcher": "^1.0.2",
"karma-sourcemap-loader": "^0.3.7", "karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.2", "karma-webpack": "^2.0.2",
"webpack-dev-server": "^2.3.0" "webpack-dev-server": "^2.4.2"
} }
} }
...@@ -25,7 +25,7 @@ acorn-jsx@^3.0.0: ...@@ -25,7 +25,7 @@ acorn-jsx@^3.0.0:
dependencies: dependencies:
acorn "^3.0.4" acorn "^3.0.4"
acorn@4.0.4, acorn@^4.0.4: acorn@4.0.4:
version "4.0.4" version "4.0.4"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
...@@ -33,7 +33,7 @@ acorn@^3.0.4: ...@@ -33,7 +33,7 @@ acorn@^3.0.4:
version "3.3.0" version "3.3.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
acorn@^4.0.11, acorn@^4.0.3: acorn@^4.0.11, acorn@^4.0.3, acorn@^4.0.4:
version "4.0.11" version "4.0.11"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
...@@ -184,7 +184,7 @@ async-each@^1.0.0: ...@@ -184,7 +184,7 @@ async-each@^1.0.0:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
async@0.2.x, async@~0.2.6: async@0.2.x:
version "0.2.10" version "0.2.10"
resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
...@@ -1809,7 +1809,7 @@ events@^1.0.0: ...@@ -1809,7 +1809,7 @@ events@^1.0.0:
version "1.1.1" version "1.1.1"
resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
eventsource@~0.1.6: eventsource@0.1.6:
version "0.1.6" version "0.1.6"
resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232" resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
dependencies: dependencies:
...@@ -2309,9 +2309,9 @@ http-errors@~1.5.0, http-errors@~1.5.1: ...@@ -2309,9 +2309,9 @@ http-errors@~1.5.0, http-errors@~1.5.1:
setprototypeof "1.0.2" setprototypeof "1.0.2"
statuses ">= 1.3.1 < 2" statuses ">= 1.3.1 < 2"
http-proxy-middleware@~0.17.1: http-proxy-middleware@~0.17.4:
version "0.17.3" version "0.17.4"
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833"
dependencies: dependencies:
http-proxy "^1.16.2" http-proxy "^1.16.2"
is-glob "^3.1.0" is-glob "^3.1.0"
...@@ -4062,12 +4062,12 @@ socket.io@1.7.2: ...@@ -4062,12 +4062,12 @@ socket.io@1.7.2:
socket.io-client "1.7.2" socket.io-client "1.7.2"
socket.io-parser "2.3.1" socket.io-parser "2.3.1"
sockjs-client@1.1.1: sockjs-client@1.1.2:
version "1.1.1" version "1.1.2"
resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.1.tgz#284843e9a9784d7c474b1571b3240fca9dda4bb0" resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.2.tgz#f0212a8550e4c9468c8cceaeefd2e3493c033ad5"
dependencies: dependencies:
debug "^2.2.0" debug "^2.2.0"
eventsource "~0.1.6" eventsource "0.1.6"
faye-websocket "~0.11.0" faye-websocket "~0.11.0"
inherits "^2.0.1" inherits "^2.0.1"
json3 "^3.3.2" json3 "^3.3.2"
...@@ -4080,6 +4080,10 @@ sockjs@0.3.18: ...@@ -4080,6 +4080,10 @@ sockjs@0.3.18:
faye-websocket "^0.10.0" faye-websocket "^0.10.0"
uuid "^2.0.2" uuid "^2.0.2"
source-list-map@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.1.tgz#1a33ac210ca144d1e561f906ebccab5669ff4cb4"
source-list-map@~0.1.7: source-list-map@~0.1.7:
version "0.1.8" version "0.1.8"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
...@@ -4406,14 +4410,14 @@ typedarray@^0.0.6, typedarray@~0.0.5: ...@@ -4406,14 +4410,14 @@ typedarray@^0.0.6, typedarray@~0.0.5:
version "0.0.6" version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
uglify-js@^2.6, uglify-js@^2.7.5: uglify-js@^2.6, uglify-js@^2.8.5:
version "2.7.5" version "2.8.21"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.21.tgz#1733f669ae6f82fc90c7b25ec0f5c783ee375314"
dependencies: dependencies:
async "~0.2.6"
source-map "~0.5.1" source-map "~0.5.1"
uglify-to-browserify "~1.0.0"
yargs "~3.10.0" yargs "~3.10.0"
optionalDependencies:
uglify-to-browserify "~1.0.0"
uglify-to-browserify@~1.0.0: uglify-to-browserify@~1.0.0:
version "1.0.2" version "1.0.2"
...@@ -4534,9 +4538,9 @@ vue@^2.2.4: ...@@ -4534,9 +4538,9 @@ vue@^2.2.4:
version "2.2.4" version "2.2.4"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.4.tgz#d0a3a050a80a12356d7950ae5a7b3131048209cc" resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.4.tgz#d0a3a050a80a12356d7950ae5a7b3131048209cc"
watchpack@^1.2.0: watchpack@^1.3.1:
version "1.2.1" version "1.3.1"
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.2.1.tgz#01efa80c5c29e5c56ba55d6f5470a35b6402f0b2" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
dependencies: dependencies:
async "^2.1.2" async "^2.1.2"
chokidar "^1.4.3" chokidar "^1.4.3"
...@@ -4572,9 +4576,9 @@ webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.9.0: ...@@ -4572,9 +4576,9 @@ webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.9.0:
path-is-absolute "^1.0.0" path-is-absolute "^1.0.0"
range-parser "^1.0.3" range-parser "^1.0.3"
webpack-dev-server@^2.3.0: webpack-dev-server@^2.4.2:
version "2.3.0" version "2.4.2"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.3.0.tgz#0437704bbd4d941a6e4c061eb3cc232ed7d06101" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.2.tgz#cf595d6b40878452b6d2ad7229056b686f8a16be"
dependencies: dependencies:
ansi-html "0.0.7" ansi-html "0.0.7"
chokidar "^1.6.0" chokidar "^1.6.0"
...@@ -4582,28 +4586,35 @@ webpack-dev-server@^2.3.0: ...@@ -4582,28 +4586,35 @@ webpack-dev-server@^2.3.0:
connect-history-api-fallback "^1.3.0" connect-history-api-fallback "^1.3.0"
express "^4.13.3" express "^4.13.3"
html-entities "^1.2.0" html-entities "^1.2.0"
http-proxy-middleware "~0.17.1" http-proxy-middleware "~0.17.4"
opn "4.0.2" opn "4.0.2"
portfinder "^1.0.9" portfinder "^1.0.9"
serve-index "^1.7.2" serve-index "^1.7.2"
sockjs "0.3.18" sockjs "0.3.18"
sockjs-client "1.1.1" sockjs-client "1.1.2"
spdy "^3.4.1" spdy "^3.4.1"
strip-ansi "^3.0.0" strip-ansi "^3.0.0"
supports-color "^3.1.1" supports-color "^3.1.1"
webpack-dev-middleware "^1.9.0" webpack-dev-middleware "^1.9.0"
yargs "^6.0.0" yargs "^6.0.0"
webpack-sources@^0.1.0, webpack-sources@^0.1.4: webpack-sources@^0.1.0:
version "0.1.4" version "0.1.4"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.4.tgz#ccc2c817e08e5fa393239412690bb481821393cd" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.4.tgz#ccc2c817e08e5fa393239412690bb481821393cd"
dependencies: dependencies:
source-list-map "~0.1.7" source-list-map "~0.1.7"
source-map "~0.5.3" source-map "~0.5.3"
webpack@^2.2.1: webpack-sources@^0.2.3:
version "2.2.1" version "0.2.3"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.1.tgz#7bb1d72ae2087dd1a4af526afec15eed17dda475" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
dependencies:
source-list-map "^1.1.1"
source-map "~0.5.3"
webpack@^2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.3.tgz#eecc083c18fb7bf958ea4f40b57a6640c5a0cc78"
dependencies: dependencies:
acorn "^4.0.4" acorn "^4.0.4"
acorn-dynamic-import "^2.0.0" acorn-dynamic-import "^2.0.0"
...@@ -4621,9 +4632,9 @@ webpack@^2.2.1: ...@@ -4621,9 +4632,9 @@ webpack@^2.2.1:
source-map "^0.5.3" source-map "^0.5.3"
supports-color "^3.1.0" supports-color "^3.1.0"
tapable "~0.2.5" tapable "~0.2.5"
uglify-js "^2.7.5" uglify-js "^2.8.5"
watchpack "^1.2.0" watchpack "^1.3.1"
webpack-sources "^0.1.4" webpack-sources "^0.2.3"
yargs "^6.0.0" yargs "^6.0.0"
websocket-driver@>=0.5.1: websocket-driver@>=0.5.1:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment