diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-09 21:04:46 +0300 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-02-15 00:46:35 +0300 |
| commit | 42cce7d14ef067ae9aae28695426dcf0e51497ad (patch) | |
| tree | 2ee069d43227d4aa32dfd2e40b1edb00cdf30412 /config | |
| parent | 8f4ad1daea658345297eebebb657faa97f8a549c (diff) | |
Merge branch 'upgrade-babel-v6' into 'master'
Upgrade from Babel 5 to Babel 6
See merge request !9072
Diffstat (limited to 'config')
| -rw-r--r-- | config/dependency_decisions.yml | 6 | ||||
| -rw-r--r-- | config/webpack.config.js | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index aabe859730a..54389eeb9ef 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -302,3 +302,9 @@ :why: https://github.com/dchest/tweetnacl-js/blob/master/LICENSE :versions: [] :when: 2017-01-14 20:10:57.812077000 Z +- - :approve + - wordwrap + - :who: Mike Greiling + :why: https://github.com/substack/node-wordwrap/blob/0.0.3/LICENSE + :versions: [] + :when: 2017-02-08 20:17:13.084968000 Z diff --git a/config/webpack.config.js b/config/webpack.config.js index 953ae463c86..55828a85490 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -54,14 +54,12 @@ 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'] } }, { test: /\.(js|es6)$/, + exclude: /node_modules/, loader: 'imports-loader', query: 'this=>window' }, |