diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-02-08 12:39:06 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-02-09 10:51:36 -0600 |
| commit | 31c10441fc658de0011e9bae3162c27d0ba937ef (patch) | |
| tree | 732be6c86cd547939be5a44fe994a0404ee21a5e | |
| parent | 7b4cd8c9f01ccaa3e07e026de9d1555f4b9edfa1 (diff) | |
| download | gitlab-ce-31c10441fc658de0011e9bae3162c27d0ba937ef.tar.gz | |
upgrade babel to v6
| -rw-r--r-- | config/webpack.config.js | 5 | ||||
| -rw-r--r-- | package.json | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 51a51e051a2..2d1a16a18dd 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -54,10 +54,7 @@ var config = { exclude: /(node_modules|vendor\/assets)/, loader: 'babel-loader', query: { - // 'use strict' was broken in sprockets-es6 due to sprockets concatination method. - // many es5 strict errors which were never caught ended up in our es6 assets as a result. - // this hack is necessary until they can be fixed. - blacklist: ['useStrict'] + presets: ['es2015', 'stage-2'] } }, { diff --git a/package.json b/package.json index a25e09e4cf2..7f1c8dd6fff 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,10 @@ "webpack-prod": "NODE_ENV=production npm run webpack" }, "dependencies": { - "babel": "^5.8.38", - "babel-core": "^5.8.38", - "babel-loader": "^5.4.2", + "babel-core": "^6.22.1", + "babel-loader": "^6.2.10", + "babel-preset-es2015": "^6.22.0", + "babel-preset-stage-2": "^6.22.0", "bootstrap-sass": "3.3.6", "compression-webpack-plugin": "^0.3.2", "d3": "3.5.11", |