Merge branch 'diff-worker-js-fix' into 'master'

Fixed diff_worker not compiling correctly Closes #41182 See merge request gitlab-org/gitlab-ce!15966
2017-12-21 18:27:56 +00:00 · 2017-12-21 18:27:56 +00:00 · baa6438b96
parent f13b9bbb97 a69e7affbc
commit baa6438b96
1 changed files with 4 additions and 1 deletions
--- 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)$/,