Merge pull request #3486 from overleaf/ae-nodemon-2

Upgrade nodemon to v2

GitOrigin-RevId: fbd734f84dd3842604332348bb1c9d6dabf3ccc5

services/web/Makefile

@@ -162,7 +162,9 @@ WITH_NODE_MODULES_PATH = \
 	format_frontend \
 	format_misc \
 	format_styles \
-	format_test \
+	format_test_app_unit \
+	format_test_app_rest \
+	format_test_modules \
 	$(TEST_SUITES) \
 
 $(WITH_NODE_MODULES_PATH): export PATH=$(NODE_MODULES_PATH)
@@ -191,9 +193,23 @@ format_styles:
 		--list-different
 
 format: format_test
-format_test:
+format_test: format_test_app
+format_test_app: format_test_app_unit
+format_test_app_unit:
+	eslint \
+		'test/unit/**/*.js' \
+		--max-warnings=0
+
+format_test_app: format_test_app_rest
+format_test_app_rest:
 	eslint \
 		'test/**/*.js' \
+		--ignore-pattern 'test/unit/**/*.js' \
+		--max-warnings=0
+
+format_test: format_test_modules
+format_test_modules:
+	eslint \
 		'modules/*/test/**/*.js' \
 		--max-warnings=0
 
@@ -201,14 +217,14 @@ format: format_misc
 # migrations, scripts, webpack config, karma config
 format_misc:
 	eslint . \
-		--ignore app.js \
-		--ignore 'app/**/*.js' \
-		--ignore 'modules/*/app/**/*.js' \
-		--ignore 'modules/*/index.js' \
-		--ignore 'frontend/**/*.js' \
-		--ignore 'modules/*/frontend/**/*.js' \
-		--ignore 'test/**/*.js' \
-		--ignore 'modules/*/test/**/*.js' \
+		--ignore-pattern app.js \
+		--ignore-pattern 'app/**/*.js' \
+		--ignore-pattern 'modules/*/app/**/*.js' \
+		--ignore-pattern 'modules/*/index.js' \
+		--ignore-pattern 'frontend/**/*.js' \
+		--ignore-pattern 'modules/*/frontend/**/*.js' \
+		--ignore-pattern 'test/**/*.js' \
+		--ignore-pattern 'modules/*/test/**/*.js' \
 		--max-warnings=0
 
 format_in_docker:

services/web/package.json

@@ -216,7 +216,7 @@
     "mocha": "^6.2.2",
     "mock-fs": "^4.11.0",
     "node-fetch": "^2.6.1",
-    "nodemon": "^1.14.3",
+    "nodemon": "^2.0.6",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "postcss-loader": "^3.0.0",
     "prettier": "^1.19.1",