aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/sonar-docs/build.gradle3
-rw-r--r--server/sonar-vsts/package.json5
-rw-r--r--server/sonar-web/package.json5
-rw-r--r--server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js5
4 files changed, 9 insertions, 9 deletions
diff --git a/server/sonar-docs/build.gradle b/server/sonar-docs/build.gradle
index 73b8598d188..088b00bb269 100644
--- a/server/sonar-docs/build.gradle
+++ b/server/sonar-docs/build.gradle
@@ -18,9 +18,10 @@ yarn_run {
args = ['build']
}
-task yarn_validate() {
+task yarn_validate_ci() {
}
+
task "yarn_lint-report"() {
}
diff --git a/server/sonar-vsts/package.json b/server/sonar-vsts/package.json
index 1675be0ffa2..e5ec1196ec4 100644
--- a/server/sonar-vsts/package.json
+++ b/server/sonar-vsts/package.json
@@ -72,11 +72,12 @@
"build": "node scripts/build.js",
"test": "jest --passWithNoTests",
"format": "prettier --write --list-different 'src/main/js/!(libs)/**/*.{js,ts,tsx,css}'",
+ "format-check": "prettier --list-different 'src/main/js/!(libs)/**/*.{js,ts,tsx,css}'",
"lint": "eslint --ext js,ts,tsx --quiet src/main/js",
"lint-report": "eslint --ext js,ts,tsx -f json -o eslint-report.json src/main/js",
"ts-check": "tsc --noEmit",
- "prettier-check": "prettier --list-different 'src/main/js/!(libs)/**/*.{js,ts,tsx,css}'",
- "validate": "yarn lint && yarn ts-check && yarn prettier-check && yarn test"
+ "validate": "yarn lint && yarn ts-check && yarn format-check && yarn test",
+ "validate-ci": "yarn lint-report && yarn ts-check && yarn format-check && yarn test"
},
"engines": {
"node": ">=6"
diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json
index 1ff33ce42da..f8bcb27794b 100644
--- a/server/sonar-web/package.json
+++ b/server/sonar-web/package.json
@@ -128,14 +128,15 @@
"scripts": {
"start": "node scripts/start.js",
"build": "node scripts/build.js",
- "build-fast": "node scripts/build.js --fast",
"test": "jest",
"format": "prettier --write --list-different 'src/main/js/**/*.{js,ts,tsx,css}'",
+ "format-check": "yarn prettier --list-different 'src/main/js/**/*.{js,ts,tsx,css}'",
"lint": "eslint --ext js,ts,tsx --quiet src/main/js",
"lint-report": "eslint --ext js,ts,tsx -f json -o eslint-report.json src/main/js",
"flow-check": "flow check src/main/js",
"ts-check": "tsc --noEmit",
- "validate": "yarn lint && yarn flow-check && yarn ts-check && yarn test",
+ "validate": "yarn lint && yarn flow-check && yarn ts-check && yarn format-check && yarn test",
+ "validate-ci": "yarn lint-report && yarn flow-check && yarn ts-check && yarn format-check && yarn test",
"precommit": "yarn ts-check && lint-staged && yarn flow-check"
},
"engines": {
diff --git a/server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js b/server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js
index f20e9e91c90..a8123a69c84 100644
--- a/server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js
+++ b/server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js
@@ -19,10 +19,7 @@
*/
import * as api from '../../../../api/settings';
import { parseError } from '../../../../helpers/request';
-import {
- addGlobalErrorMessage,
- closeAllGlobalMessages
-} from '../../../../store/globalMessages';
+import { addGlobalErrorMessage, closeAllGlobalMessages } from '../../../../store/globalMessages';
export const UPDATE_ENCRYPTION = 'UPDATE_ENCRYPTION';