Merge branch '36152-enable-scope-hoisting-with-webpack' into 'master'

Resolve "Enable scope hoisting with webpack"

Closes #36152

See merge request !13374
This commit is contained in:
Jacob Schatz 2017-08-15 15:15:41 +00:00
commit d8b166846d
3 changed files with 7 additions and 4 deletions

View file

@ -223,6 +223,9 @@ var config = {
names: ['main', 'locale', 'common', 'webpack_runtime'], names: ['main', 'locale', 'common', 'webpack_runtime'],
}), }),
// enable scope hoisting
new webpack.optimize.ModuleConcatenationPlugin(),
// copy pre-compiled vendor libraries verbatim // copy pre-compiled vendor libraries verbatim
new CopyWebpackPlugin([ new CopyWebpackPlugin([
{ {

View file

@ -63,7 +63,7 @@
"vue-loader": "^11.3.4", "vue-loader": "^11.3.4",
"vue-resource": "^1.3.4", "vue-resource": "^1.3.4",
"vue-template-compiler": "^2.2.6", "vue-template-compiler": "^2.2.6",
"webpack": "^3.4.0", "webpack": "^3.5.4",
"webpack-bundle-analyzer": "^2.8.2", "webpack-bundle-analyzer": "^2.8.2",
"webpack-stats-plugin": "^0.1.5" "webpack-stats-plugin": "^0.1.5"
}, },

View file

@ -6275,9 +6275,9 @@ webpack-stats-plugin@^0.1.5:
version "0.1.5" version "0.1.5"
resolved "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-0.1.5.tgz#29e5f12ebfd53158d31d656a113ac1f7b86179d9" resolved "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-0.1.5.tgz#29e5f12ebfd53158d31d656a113ac1f7b86179d9"
webpack@^3.4.0: webpack@^3.5.4:
version "3.4.0" version "3.5.4"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.4.0.tgz#e9465b660ad79dd2d33874d968b31746ea9a8e63" resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.4.tgz#5583eb263ed27b78b5bd17bfdfb0eb1b1cd1bf81"
dependencies: dependencies:
acorn "^5.0.0" acorn "^5.0.0"
acorn-dynamic-import "^2.0.0" acorn-dynamic-import "^2.0.0"