diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /config/webpack.vendor.config.js | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'config/webpack.vendor.config.js')
-rw-r--r-- | config/webpack.vendor.config.js | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/config/webpack.vendor.config.js b/config/webpack.vendor.config.js index bebd1d656b5..548eca4200f 100644 --- a/config/webpack.vendor.config.js +++ b/config/webpack.vendor.config.js @@ -38,7 +38,7 @@ module.exports = { 'katex', 'three', 'select2', - 'moment', + 'moment-mini', 'aws-sdk', 'sanitize-html', 'bootstrap/dist/js/bootstrap.js', @@ -65,7 +65,23 @@ module.exports = { }), new YarnCheck({ rootDirectory: ROOT_PATH, - exclude: /ts-jest/, + exclude: new RegExp( + [ + /* + chokidar has a newer version which do not depend on fsevents, + is faster and only compatible with newer node versions (>=8) + + Their actual interface remains the same and we can safely _force_ + newer versions to get performance and security benefits. + + This can be removed once all dependencies are up to date: + https://gitlab.com/gitlab-org/gitlab/-/issues/219353 + */ + 'chokidar', + // We are ignoring ts-jest, because we force a newer version, compatible with our current jest version + 'ts-jest', + ].join('|'), + ), forceKill: true, }), ], |