From 71791d836c4c771df0a3d3efc0399a697509d718 Mon Sep 17 00:00:00 2001 From: QWp6t Date: Mon, 9 Jan 2017 13:09:34 -0800 Subject: [PATCH] Update webpack 2.2.0-rc.3 --- assets/build/webpack.config.js | 8 +++---- package.json | 2 +- yarn.lock | 38 +++++++++++++++++----------------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/assets/build/webpack.config.js b/assets/build/webpack.config.js index a1e04e3..f296c51 100644 --- a/assets/build/webpack.config.js +++ b/assets/build/webpack.config.js @@ -71,11 +71,9 @@ let webpackConfig = { { test: /\.(png|jpe?g|gif|svg|ico)$/, include: config.paths.assets, - use: [ - `file?${qs.stringify({ - name: `[path]${assetsFilenames}.[ext]`, - })}`, - ], + loader: `file?${qs.stringify({ + name: `[path]${assetsFilenames}.[ext]`, + })}`, }, { test: /\.(ttf|eot)$/, diff --git a/package.json b/package.json index 4d7cf08..7581623 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "sass-loader": "^4.1.1", "style-loader": "^0.13.1", "url-loader": "^0.5.7", - "webpack": "^2.1.0-beta.26", + "webpack": "^2.2.0-rc.3", "webpack-assets-manifest": "^0.6.1", "webpack-dev-middleware": "^1.9.0", "webpack-hot-middleware": "^2.15.0" diff --git a/yarn.lock b/yarn.lock index 24d37fd..ba33d53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1470,14 +1470,14 @@ engine.io@1.8.0: engine.io-parser "1.3.1" ws "1.1.1" -enhanced-resolve@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz#a115c32504b6302e85a76269d7a57ccdd962e359" +enhanced-resolve@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.0.2.tgz#0fa709f29e59ee23e6bbcb070c85f992d6247cd1" dependencies: graceful-fs "^4.1.2" - memory-fs "^0.3.0" + memory-fs "^0.4.0" object-assign "^4.0.1" - tapable "^0.2.3" + tapable "^0.2.5" enhanced-resolve@~0.9.0: version "0.9.1" @@ -3256,16 +3256,16 @@ memory-fs@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290" -memory-fs@^0.3.0, memory-fs@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20" +memory-fs@^0.4.0, memory-fs@~0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" dependencies: errno "^0.1.3" readable-stream "^2.0.1" -memory-fs@~0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" +memory-fs@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20" dependencies: errno "^0.1.3" readable-stream "^2.0.1" @@ -5053,7 +5053,7 @@ tapable@^0.1.8, tapable@~0.1.8: version "0.1.10" resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4" -tapable@^0.2.3, tapable@~0.2.3: +tapable@^0.2.5, tapable@~0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.5.tgz#1ff6ce7ade58e734ca9bfe36ba342304b377a4d0" @@ -5215,7 +5215,7 @@ ua-parser-js@0.7.12: version "0.7.12" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb" -uglify-js@~2.7.3: +uglify-js@^2.7.5, uglify-js@~2.7.3: version "2.7.5" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8" dependencies: @@ -5500,16 +5500,16 @@ webpack@*: watchpack "^0.2.1" webpack-core "~0.6.9" -webpack@^2.1.0-beta.26: - version "2.1.0-beta.28" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.1.0-beta.28.tgz#8f9402c05bae04ab8d3918489b3547544a2e2641" +webpack@^2.2.0-rc.3: + version "2.2.0-rc.3" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.0-rc.3.tgz#ac072c06c88aae75abdfd33510e7c5fd965f843f" dependencies: acorn "^4.0.3" acorn-dynamic-import "^2.0.0" ajv "^4.7.0" ajv-keywords "^1.1.1" async "^2.1.2" - enhanced-resolve "^2.2.0" + enhanced-resolve "^3.0.0" interpret "^1.0.0" json-loader "^0.5.4" loader-runner "^2.2.0" @@ -5520,8 +5520,8 @@ webpack@^2.1.0-beta.26: object-assign "^4.0.1" source-map "^0.5.3" supports-color "^3.1.0" - tapable "~0.2.3" - uglify-js "~2.7.3" + tapable "~0.2.5" + uglify-js "^2.7.5" watchpack "^1.0.0" webpack-sources "^0.1.0" yargs "^6.0.0"