diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-09 19:59:19 +0000 |
---|---|---|
committer | Regis <boudinot.regis@yahoo.com> | 2017-02-14 15:00:44 -0700 |
commit | 934cb7d2c68904b2313cb34e5d4e0806aafcc927 (patch) | |
tree | e2c6c1e878b6ea7f465f8bb1fd9bf18350fc09cf | |
parent | e0d8c9d4ecf19561be2b00e71f387f48bb8b8cc7 (diff) | |
download | gitlab-ce-934cb7d2c68904b2313cb34e5d4e0806aafcc927.tar.gz |
Merge branch 'upgrade-webpack-v2.2' into 'master'
Upgrade to webpack v2.2.1
See merge request !9078
-rw-r--r-- | changelogs/unreleased/upgrade-webpack-v2-2.yml | 4 | ||||
-rw-r--r-- | config/dependency_decisions.yml | 12 | ||||
-rw-r--r-- | config/webpack.config.js | 27 | ||||
-rw-r--r-- | package.json | 12 |
4 files changed, 35 insertions, 20 deletions
diff --git a/changelogs/unreleased/upgrade-webpack-v2-2.yml b/changelogs/unreleased/upgrade-webpack-v2-2.yml new file mode 100644 index 00000000000..6a49859d68c --- /dev/null +++ b/changelogs/unreleased/upgrade-webpack-v2-2.yml @@ -0,0 +1,4 @@ +--- +title: upgrade to webpack v2.2 +merge_request: 9078 +author: diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index 54389eeb9ef..7336d7c842a 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -308,3 +308,15 @@ :why: https://github.com/substack/node-wordwrap/blob/0.0.3/LICENSE :versions: [] :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 diff --git a/config/webpack.config.js b/config/webpack.config.js index 55828a85490..d1bf9c63df3 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -48,24 +48,23 @@ var config = { devtool: 'inline-source-map', module: { - loaders: [ + rules: [ { test: /\.(js|es6)$/, exclude: /(node_modules|vendor\/assets)/, loader: 'babel-loader', - query: { - presets: ['es2015', 'stage-2'] + options: { + presets: [ + ["es2015", {"modules": false}], + 'stage-2' + ] } }, { test: /\.(js|es6)$/, exclude: /node_modules/, loader: 'imports-loader', - query: 'this=>window' - }, - { - test: /\.json$/, - loader: 'json-loader' + options: 'this=>window' } ] }, @@ -86,7 +85,7 @@ var config = { ], resolve: { - extensions: ['', '.js', '.es6', '.js.es6'], + extensions: ['.js', '.es6', '.js.es6'], alias: { '~': path.join(ROOT_PATH, 'app/assets/javascripts'), 'bootstrap/js': 'bootstrap-sass/assets/javascripts/bootstrap', @@ -102,14 +101,16 @@ if (IS_PRODUCTION) { config.devtool = 'source-map'; config.plugins.push( new webpack.NoErrorsPlugin(), + new webpack.LoaderOptionsPlugin({ + minimize: true, + debug: false + }), new webpack.optimize.UglifyJsPlugin({ - compress: { warnings: false } + sourceMap: true }), new webpack.DefinePlugin({ 'process.env': { NODE_ENV: JSON.stringify('production') } - }), - new webpack.optimize.DedupePlugin(), - new webpack.optimize.OccurrenceOrderPlugin() + }) ); } diff --git a/package.json b/package.json index 5891535b4d3..b4b4aacc7ac 100644 --- a/package.json +++ b/package.json @@ -19,20 +19,18 @@ "compression-webpack-plugin": "^0.3.2", "d3": "3.5.11", "dropzone": "4.2.0", - "exports-loader": "^0.6.3", "imports-loader": "^0.6.5", "jquery": "2.2.1", "jquery-ui": "github:jquery/jquery-ui#1.11.4", "jquery-ujs": "1.2.1", - "json-loader": "^0.5.4", "mousetrap": "1.4.6", "select2": "3.5.2-browserify", - "stats-webpack-plugin": "^0.4.2", + "stats-webpack-plugin": "^0.4.3", "underscore": "1.8.3", "vue": "2.0.3", "vue-resource": "0.9.3", - "webpack": "^1.14.0", - "webpack-dev-server": "^1.16.2" + "webpack": "^2.2.1", + "webpack-dev-server": "^2.3.0" }, "devDependencies": { "eslint": "^3.10.1", @@ -43,10 +41,10 @@ "istanbul": "^0.4.5", "jasmine-core": "^2.5.2", "jasmine-jquery": "^2.1.1", - "karma": "^1.3.0", + "karma": "^1.4.1", "karma-jasmine": "^1.1.0", "karma-phantomjs-launcher": "^1.0.2", "karma-sourcemap-loader": "^0.3.7", - "karma-webpack": "^1.8.0" + "karma-webpack": "^2.0.2" } } |