From 0879226f74463c7c2f69e364b599aa7bd6ebab3f Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Tue, 15 Jan 2019 10:45:54 +0000 Subject: [PATCH] Merge pull request #1330 from sharelatex/as-fix-prettier-ignore Fix linting ignoring index.js files in modules GitOrigin-RevId: 8ac9fa8f8655553680678b206848d1a66718d821 --- services/web/.eslintignore | 2 +- services/web/.prettierignore | 2 +- services/web/Makefile | 3 +++ services/web/package.json | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/services/web/.eslintignore b/services/web/.eslintignore index a64164459c..4f0838e9a8 100644 --- a/services/web/.eslintignore +++ b/services/web/.eslintignore @@ -1,7 +1,7 @@ app/js modules/**/app/js modules/**/scripts -modules/**/index.js +modules/*/index.js public/js public/minjs modules/**/public/js diff --git a/services/web/.prettierignore b/services/web/.prettierignore index a64164459c..4f0838e9a8 100644 --- a/services/web/.prettierignore +++ b/services/web/.prettierignore @@ -1,7 +1,7 @@ app/js modules/**/app/js modules/**/scripts -modules/**/index.js +modules/*/index.js public/js public/minjs modules/**/public/js diff --git a/services/web/Makefile b/services/web/Makefile index 515108d1b8..bee18713a3 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -243,6 +243,9 @@ ci: format: npm -q run format +format_fix: + npm -q run format:fix + lint: npm -q run lint diff --git a/services/web/package.json b/services/web/package.json index 67200dbf8e..4eb94b9ed8 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -21,7 +21,8 @@ "webpack": "webpack-dev-server --config webpack.config.dev.js", "webpack:production": "webpack --config webpack.config.prod.js", "lint": "eslint -f unix .", - "format": "prettier-eslint '**/*.js' --list-different" + "format": "prettier-eslint '**/*.js' --list-different", + "format:fix": "prettier-eslint '**/*.js' --write" }, "dependencies": { "archiver": "0.9.0",