diff options
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 39052d29287..39dc08d15c6 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -311,6 +311,7 @@ let shouldExcludeFromCompliling = (modulePath) => if (EXPLICIT_VUE_VERSION) { Object.assign(alias, { '@gitlab/ui/scss_to_js': path.join(ROOT_PATH, 'node_modules/@gitlab/ui/scss_to_js'), + '@gitlab/ui/dist/tokens/js': path.join(ROOT_PATH, 'node_modules/@gitlab/ui/dist/tokens/js'), '@gitlab/ui/dist': '@gitlab/ui/src', '@gitlab/ui': '@gitlab/ui/src', }); @@ -371,6 +372,20 @@ module.exports = { loader: 'babel-loader', }, { + test: /_worker\.js$/, + resourceQuery: /worker/, + use: [ + { + loader: 'worker-loader', + options: { + name: '[name].[contenthash:8].worker.js', + inline: IS_DEV_SERVER, + }, + }, + 'babel-loader', + ], + }, + { test: /mermaid\/.*\.js?$/, include: /node_modules/, loader: 'babel-loader', @@ -439,20 +454,6 @@ module.exports = { options: { limit: 2048 }, }, { - test: /_worker\.js$/, - resourceQuery: /worker/, - use: [ - { - loader: 'worker-loader', - options: { - name: '[name].[contenthash:8].worker.js', - inline: IS_DEV_SERVER, - }, - }, - 'babel-loader', - ], - }, - { test: /\.(worker(\.min)?\.js|pdf)$/, exclude: /node_modules/, loader: 'file-loader', |