diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-02-07 18:02:49 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-02-07 18:33:00 +0000 |
| commit | df469864b1ab1e0bfaa1e843d3d0a84042604646 (patch) | |
| tree | 81a59a012180c8e2c43f8573a50d5ddec26040ab /config/webpack.config.js | |
| parent | bc13687c7e374116e4830d004b82e9960d3a55cc (diff) | |
| download | gitlab-ce-update-filenames-regex.tar.gz | |
Updated the filename regexupdate-filenames-regex
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 953ae463c86..495d539c691 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -50,7 +50,7 @@ var config = { module: { loaders: [ { - test: /\.(js|es6)$/, + test: /\.js$/, exclude: /(node_modules|vendor\/assets)/, loader: 'babel-loader', query: { @@ -61,7 +61,7 @@ var config = { } }, { - test: /\.(js|es6)$/, + test: /\.js$/, loader: 'imports-loader', query: 'this=>window' }, @@ -88,7 +88,7 @@ var config = { ], resolve: { - extensions: ['', '.js', '.es6', '.js.es6'], + extensions: ['', '.js'], alias: { '~': path.join(ROOT_PATH, 'app/assets/javascripts'), 'bootstrap/js': 'bootstrap-sass/assets/javascripts/bootstrap', |