github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-29 07:13:39 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Upgrade nodemon to v2

GitOrigin-RevId: fbd734f84dd3842604332348bb1c9d6dabf3ccc5
This commit is contained in:
Alf Eaton 2021-01-06 09:58:57 +00:00 committed by Copybot
parent 5bc4ce09a7
commit a6278ed5df
3 changed files with 696 additions and 1346 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
services/web/Makefile
View file

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

2006
services/web/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
services/web/package.json
View file

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