Commit 52da628a authored by Alfredo Sumaran's avatar Alfredo Sumaran

Merge branch 'upgrade-webpack-v2.2-ee' into 'master'

Port "Upgrade to webpack v2.2.1" to EE

See merge request !1203
parents 7f5db9ff e56ed662
...@@ -308,3 +308,15 @@ ...@@ -308,3 +308,15 @@
:why: https://github.com/substack/node-wordwrap/blob/0.0.3/LICENSE :why: https://github.com/substack/node-wordwrap/blob/0.0.3/LICENSE
:versions: [] :versions: []
:when: 2017-02-08 20:17:13.084968000 Z :when: 2017-02-08 20:17:13.084968000 Z
- - :approve
- spdx-expression-parse
- :who: Mike Greiling
:why: https://github.com/kemitchell/spdx-expression-parse.js/blob/v1.0.4/LICENSE
:versions: []
:when: 2017-02-08 22:33:01.806977000 Z
- - :approve
- spdx-license-ids
- :who: Mike Greiling
:why: https://github.com/shinnn/spdx-license-ids/blob/v1.2.2/LICENSE
:versions: []
:when: 2017-02-08 22:35:00.225232000 Z
...@@ -49,24 +49,23 @@ var config = { ...@@ -49,24 +49,23 @@ var config = {
devtool: 'inline-source-map', devtool: 'inline-source-map',
module: { module: {
loaders: [ rules: [
{ {
test: /\.(js|es6)$/, test: /\.(js|es6)$/,
exclude: /(node_modules|vendor\/assets)/, exclude: /(node_modules|vendor\/assets)/,
loader: 'babel-loader', loader: 'babel-loader',
query: { options: {
presets: ['es2015', 'stage-2'] presets: [
["es2015", {"modules": false}],
'stage-2'
]
} }
}, },
{ {
test: /\.(js|es6)$/, test: /\.(js|es6)$/,
exclude: /node_modules/, exclude: /node_modules/,
loader: 'imports-loader', loader: 'imports-loader',
query: 'this=>window' options: 'this=>window'
},
{
test: /\.json$/,
loader: 'json-loader'
} }
] ]
}, },
...@@ -87,7 +86,7 @@ var config = { ...@@ -87,7 +86,7 @@ var config = {
], ],
resolve: { resolve: {
extensions: ['', '.js', '.es6', '.js.es6'], extensions: ['.js', '.es6', '.js.es6'],
alias: { alias: {
'~': path.join(ROOT_PATH, 'app/assets/javascripts'), '~': path.join(ROOT_PATH, 'app/assets/javascripts'),
'bootstrap/js': 'bootstrap-sass/assets/javascripts/bootstrap', 'bootstrap/js': 'bootstrap-sass/assets/javascripts/bootstrap',
...@@ -103,14 +102,16 @@ if (IS_PRODUCTION) { ...@@ -103,14 +102,16 @@ if (IS_PRODUCTION) {
config.devtool = 'source-map'; config.devtool = 'source-map';
config.plugins.push( config.plugins.push(
new webpack.NoErrorsPlugin(), new webpack.NoErrorsPlugin(),
new webpack.LoaderOptionsPlugin({
minimize: true,
debug: false
}),
new webpack.optimize.UglifyJsPlugin({ new webpack.optimize.UglifyJsPlugin({
compress: { warnings: false } sourceMap: true
}), }),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { NODE_ENV: JSON.stringify('production') } 'process.env': { NODE_ENV: JSON.stringify('production') }
}), })
new webpack.optimize.DedupePlugin(),
new webpack.optimize.OccurrenceOrderPlugin()
); );
} }
......
...@@ -19,21 +19,19 @@ ...@@ -19,21 +19,19 @@
"compression-webpack-plugin": "^0.3.2", "compression-webpack-plugin": "^0.3.2",
"d3": "3.5.11", "d3": "3.5.11",
"dropzone": "4.2.0", "dropzone": "4.2.0",
"exports-loader": "^0.6.3",
"imports-loader": "^0.6.5", "imports-loader": "^0.6.5",
"jquery": "2.2.1", "jquery": "2.2.1",
"jquery-ui": "github:jquery/jquery-ui#1.11.4", "jquery-ui": "github:jquery/jquery-ui#1.11.4",
"jquery-ujs": "1.2.1", "jquery-ujs": "1.2.1",
"json-loader": "^0.5.4",
"mousetrap": "1.4.6", "mousetrap": "1.4.6",
"pikaday": "^1.5.1", "pikaday": "^1.5.1",
"select2": "3.5.2-browserify", "select2": "3.5.2-browserify",
"stats-webpack-plugin": "^0.4.2", "stats-webpack-plugin": "^0.4.3",
"underscore": "1.8.3", "underscore": "1.8.3",
"vue": "2.0.3", "vue": "2.0.3",
"vue-resource": "0.9.3", "vue-resource": "0.9.3",
"webpack": "^1.14.0", "webpack": "^2.2.1",
"webpack-dev-server": "^1.16.2" "webpack-dev-server": "^2.3.0"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^3.10.1", "eslint": "^3.10.1",
...@@ -44,10 +42,10 @@ ...@@ -44,10 +42,10 @@
"istanbul": "^0.4.5", "istanbul": "^0.4.5",
"jasmine-core": "^2.5.2", "jasmine-core": "^2.5.2",
"jasmine-jquery": "^2.1.1", "jasmine-jquery": "^2.1.1",
"karma": "^1.3.0", "karma": "^1.4.1",
"karma-jasmine": "^1.1.0", "karma-jasmine": "^1.1.0",
"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": "^1.8.0" "karma-webpack": "^2.0.2"
} }
} }
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