diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-10-20 00:32:56 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-06 10:21:02 -0600 |
| commit | 31bd36845ba1c18404f029f85b6a0f841c1c390c (patch) | |
| tree | f0060948ef4f5e49af16f1f5f27e4e2330632bd6 | |
| parent | 000180e5e469c39f626faccf91cdb2b1d25a97f8 (diff) | |
| download | gitlab-ce-31bd36845ba1c18404f029f85b6a0f841c1c390c.tar.gz | |
temporarily regress to babel 5 for parity with sprockets-es6 gem
| -rw-r--r-- | config/webpack.config.js | 5 | ||||
| -rw-r--r-- | package.json | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 2aa1e8d7dd7..acd5597da3a 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -30,10 +30,7 @@ var config = { { test: /\.es6$/, exclude: /node_modules/, - loader: 'babel-loader', - query: { - presets: ['es2015'] - } + loader: 'babel-loader' } ] }, diff --git a/package.json b/package.json index 526a3c34e01..b089eb805c7 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "eslint-report": "npm run eslint -- --format html --output-file ./eslint-report.html" }, "dependencies": { - "babel-core": "^6.17.0", - "babel-loader": "^6.2.5", - "babel-preset-es2015": "^6.16.0", + "babel": "^5.8.38", + "babel-core": "^5.8.38", + "babel-loader": "^5.4.2", "stats-webpack-plugin": "^0.4.2", "webpack": "^1.13.2", "webpack-dev-server": "^1.16.2" |