summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 03:09:00 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 03:09:00 +0000
commit56201db1dc66f3a2d598f6f8da0bec170dc26ba1 (patch)
tree8317b0a17c76866b981b497b13786dadceee5abf /config
parentce2a803dc413f289352deecbf2cfd32896c8b2ef (diff)
downloadgitlab-ce-56201db1dc66f3a2d598f6f8da0bec170dc26ba1.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/webpack.vendor.config.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/webpack.vendor.config.js b/config/webpack.vendor.config.js
index 8da4938191c..90736349d91 100644
--- a/config/webpack.vendor.config.js
+++ b/config/webpack.vendor.config.js
@@ -1,6 +1,7 @@
const path = require('path');
const webpack = require('webpack');
const vendorDllHash = require('./helpers/vendor_dll_hash');
+const { YarnCheck } = require('yarn-check-webpack-plugin');
const ROOT_PATH = path.resolve(__dirname, '..');
@@ -60,6 +61,11 @@ module.exports = {
path: path.join(dllCachePath, '[name].dll.manifest.json'),
name: '[name]_[hash]',
}),
+ new YarnCheck({
+ rootDirectory: ROOT_PATH,
+ exclude: /ts-jest/,
+ forceKill: true,
+ }),
],
node: {