diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-16 11:06:28 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-16 11:06:28 +0000 |
| commit | 08dd9d48876194cb087014fb3ed46c8c86f7052f (patch) | |
| tree | 498f8561585feab515aaaefc10f6ccfdd2ed95b4 /config | |
| parent | 4e7d4b4dc181dd47db41147291eb0c677fddd4c0 (diff) | |
| parent | 95d38ac9f97e80a26aac8026a4d38a54fbdc98e8 (diff) | |
| download | gitlab-ce-08dd9d48876194cb087014fb3ed46c8c86f7052f.tar.gz | |
Merge branch 'remove-es6-extension-configuration' into 'master'
Remove remaining references to .es6 file extension in our config files and documentation
See merge request !9980
Diffstat (limited to 'config')
| -rw-r--r-- | config/karma.config.js | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index a23e62f5022..c1d3751d88f 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -36,7 +36,7 @@ module.exports = function(config) { { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.html.raw)', included: false }, ], preprocessors: { - 'spec/javascripts/**/*.js?(.es6)': ['webpack', 'sourcemap'], + 'spec/javascripts/**/*.js': ['webpack', 'sourcemap'], }, reporters: [progressReporter, 'coverage-istanbul'], coverageIstanbulReporter: { diff --git a/config/webpack.config.js b/config/webpack.config.js index 8e2b11a4145..cbcc9ac5aea 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -56,7 +56,7 @@ var config = { module: { rules: [ { - test: /\.(js|es6)$/, + test: /\.js$/, exclude: /(node_modules|vendor\/assets)/, loader: 'babel-loader', options: { @@ -130,7 +130,7 @@ var config = { ], resolve: { - extensions: ['.js', '.es6', '.js.es6'], + extensions: ['.js'], alias: { '~': path.join(ROOT_PATH, 'app/assets/javascripts'), 'emojis': path.join(ROOT_PATH, 'fixtures/emojis'), |