summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-07-07 14:06:09 -0500
committerMike Greiling <mike@pixelcog.com>2017-08-07 11:08:58 -0500
commit489c3bccd13584f2f6a64bded1f9b34b5df68afc (patch)
tree3df7a9163b6e5fc77b2b29c379ba36318aa6b371
parente4937c69f21dd670eca48c9f4b89d8fa36d75428 (diff)
downloadgitlab-ce-489c3bccd13584f2f6a64bded1f9b34b5df68afc.tar.gz
upgrade webpack to v3.1.0
-rw-r--r--package.json2
-rw-r--r--yarn.lock18
2 files changed, 10 insertions, 10 deletions
diff --git a/package.json b/package.json
index c92eb10d25f..32d4155fe26 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
"vue-loader": "^11.3.4",
"vue-resource": "^1.3.4",
"vue-template-compiler": "^2.2.6",
- "webpack": "^3.0.0",
+ "webpack": "^3.1.0",
"webpack-bundle-analyzer": "^2.8.2",
"webpack-stats-plugin": "^0.1.5"
},
diff --git a/yarn.lock b/yarn.lock
index 75df87afca9..d44234b2513 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1924,9 +1924,9 @@ engine.io@1.8.3:
engine.io-parser "1.3.2"
ws "1.1.2"
-enhanced-resolve@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
+enhanced-resolve@^3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3"
dependencies:
graceful-fs "^4.1.2"
memory-fs "^0.4.0"
@@ -5779,7 +5779,7 @@ uglify-to-browserify@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
-uglifyjs-webpack-plugin@^0.4.4:
+uglifyjs-webpack-plugin@^0.4.6:
version "0.4.6"
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
dependencies:
@@ -6089,16 +6089,16 @@ webpack-stats-plugin@^0.1.5:
version "0.1.5"
resolved "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-0.1.5.tgz#29e5f12ebfd53158d31d656a113ac1f7b86179d9"
-webpack@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
+webpack@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.1.0.tgz#ac0675e500db835f9ab2369d29ba096f51ad0731"
dependencies:
acorn "^5.0.0"
acorn-dynamic-import "^2.0.0"
ajv "^5.1.5"
ajv-keywords "^2.0.0"
async "^2.1.2"
- enhanced-resolve "^3.0.0"
+ enhanced-resolve "^3.3.0"
escope "^3.6.0"
interpret "^1.0.0"
json-loader "^0.5.4"
@@ -6111,7 +6111,7 @@ webpack@^3.0.0:
source-map "^0.5.3"
supports-color "^3.1.0"
tapable "~0.2.5"
- uglifyjs-webpack-plugin "^0.4.4"
+ uglifyjs-webpack-plugin "^0.4.6"
watchpack "^1.3.1"
webpack-sources "^1.0.1"
yargs "^6.0.0"