diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-12-21 21:27:56 +0300 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-12-21 21:55:14 +0300 |
commit | a305be3f6727f21e482a3025287084effb506762 (patch) | |
tree | 6b7716565a2bbc28ce4a35cb2c051d6f6aa0f703 | |
parent | fc02921a993cf9c17cb29398dce3d6b8499bd5fa (diff) |
Merge branch 'diff-worker-js-fix' into 'master'
Fixed diff_worker not compiling correctly
Closes #41182
See merge request gitlab-org/gitlab-ce!15966
(cherry picked from commit baa6438b966a3f96041c8069a81836a7cd1e9a65)
df4fe43d Fixed diff_worker not compiling correctly
a69e7aff changed webpack config
-rw-r--r-- | config/webpack.config.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 78ced4c3e8c..e850f6174b1 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -118,7 +118,10 @@ var config = { }, { test: /\_worker\.js$/, - loader: 'worker-loader', + use: [ + { loader: 'worker-loader' }, + { loader: 'babel-loader' }, + ], }, { test: /\.(worker(\.min)?\.js|pdf|bmpr)$/, |