diff --git a/.editorconfig b/.editorconfig index b50253df1f..5f5b128623 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,7 +18,7 @@ trim_trailing_whitespace = true indent_size = 4 [package.json] -indent_size = 2 +indent_size = 4 [*.tsx.snap] trim_trailing_whitespace = false diff --git a/.prettierignore b/.prettierignore index 0cca8fb6aa..418329cf28 100644 --- a/.prettierignore +++ b/.prettierignore @@ -37,5 +37,10 @@ package-lock.json # Downloaded and already minified res/jitsi_external_api.min.js + # This file is also machine-generated /playwright/e2e/crypto/test_indexeddb_cryptostore_dump/dump.json +/playwright/test-results/ +/playwright/html-report/ +/playwright/logs/ +/playwright/snapshots/ diff --git a/jest.config.ts b/jest.config.ts index 9cc320d6ea..4f75eb04db 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -44,6 +44,8 @@ const config: Config = { // getSessionLock is piped into a different JS context via stringification, and the coverage functionality is // not available in that contest. So, turn off coverage instrumentation for it. "!/src/utils/SessionLock.ts", + // Coverage chokes on type definition files + "!/src/**/*.d.ts", ], coverageReporters: ["text-summary", "lcov"], testResultsProcessor: "@casualbot/jest-sonar-reporter", diff --git a/playwright/.gitignore b/playwright/.gitignore index 0d50077f5a..78bb2e0277 100644 --- a/playwright/.gitignore +++ b/playwright/.gitignore @@ -4,3 +4,5 @@ # Only commit snapshots from Linux /snapshots/**/*.png !/snapshots/**/*-linux.png +# This file is machine-generated +/e2e/crypto/test_indexeddb_cryptostore_dump/dump.json diff --git a/sonar-project.properties b/sonar-project.properties index 925cffcacd..2d87d32efc 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -11,5 +11,13 @@ sonar.exclusions=__mocks__,docs,element.io,nginx sonar.cpd.exclusions=src/i18n/strings/*.json sonar.typescript.tsconfigPath=./tsconfig.json sonar.javascript.lcov.reportPaths=coverage/lcov.info -sonar.coverage.exclusions=test/**/*,playwright/**/*,res/**/*,src/vector/modernizr.js,src/components/views/dialogs/devtools/**/*,src/utils/SessionLock.ts +sonar.coverage.exclusions=\ + test/**/*,\ + playwright/**/*,\ + res/**/*,\ + scripts/**/*,\ + src/vector/modernizr.js,\ + src/components/views/dialogs/devtools/**/*,\ + src/utils/SessionLock.ts,\ + src/**/*.d.ts sonar.testExecutionReportPaths=coverage/jest-sonar-report.xml