Merge branch 'tz-upgrade-nodemon' into 'master'

Upgrade nodemon and chokidar

See merge request gitlab-org/gitlab!33186

config/webpack.vendor.config.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,
     }),
   ],

package.json

@@ -194,7 +194,7 @@
     "markdownlint-cli": "0.18.0",
     "md5": "^2.2.1",
     "node-sass": "^4.12.0",
-    "nodemon": "^1.18.9",
+    "nodemon": "^2.0.4",
     "pixelmatch": "^4.0.2",
     "postcss": "^7.0.14",
     "prettier": "1.18.2",
@@ -212,8 +212,9 @@
     "bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.md#bootstrapvue"
   },
   "resolutions": {
-    "vue-jest/ts-jest": "24.0.0",
-    "monaco-editor": "0.18.1"
+    "chokidar": "^3.4.0",
+    "monaco-editor": "0.18.1",
+    "vue-jest/ts-jest": "24.0.0"
   },
   "engines": {
     "node": ">=10.13.0",