diff --git a/apps/browser/.vscode/settings.json b/apps/browser/.vscode/settings.json new file mode 100644 index 0000000000..59b7b1b1e9 --- /dev/null +++ b/apps/browser/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "eslint.options": { + "ignorePath": "${workspaceFolder}/../../../.eslintIgnore" + }, + "prettier.ignorePath": "${workspaceFolder}/../../../.prettierignore" +} diff --git a/apps/cli/.vscode/settings.json b/apps/cli/.vscode/settings.json index 4570edf3bc..00cd3edad9 100644 --- a/apps/cli/.vscode/settings.json +++ b/apps/cli/.vscode/settings.json @@ -6,5 +6,9 @@ "webpack://?:*/*": "${workspaceFolder}/*", "webpack://@bitwarden/cli/*": "${workspaceFolder}/*" } - } + }, + "eslint.options": { + "ignorePath": "${workspaceFolder}/../../../.eslintIgnore" + }, + "prettier.ignorePath": "${workspaceFolder}/../../../.prettierignore" } diff --git a/apps/desktop/.vscode/settings.json b/apps/desktop/.vscode/settings.json new file mode 100644 index 0000000000..59b7b1b1e9 --- /dev/null +++ b/apps/desktop/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "eslint.options": { + "ignorePath": "${workspaceFolder}/../../../.eslintIgnore" + }, + "prettier.ignorePath": "${workspaceFolder}/../../../.prettierignore" +} diff --git a/apps/web/.vscode/settings.json b/apps/web/.vscode/settings.json new file mode 100644 index 0000000000..59b7b1b1e9 --- /dev/null +++ b/apps/web/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "eslint.options": { + "ignorePath": "${workspaceFolder}/../../../.eslintIgnore" + }, + "prettier.ignorePath": "${workspaceFolder}/../../../.prettierignore" +} diff --git a/bitwarden_license/bit-web/.vscode/settings.json b/bitwarden_license/bit-web/.vscode/settings.json new file mode 100644 index 0000000000..59b7b1b1e9 --- /dev/null +++ b/bitwarden_license/bit-web/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "eslint.options": { + "ignorePath": "${workspaceFolder}/../../../.eslintIgnore" + }, + "prettier.ignorePath": "${workspaceFolder}/../../../.prettierignore" +} diff --git a/bitwarden_license/bit-web/tsconfig.json b/bitwarden_license/bit-web/tsconfig.json index 2243c09fe0..7a282f96e3 100644 --- a/bitwarden_license/bit-web/tsconfig.json +++ b/bitwarden_license/bit-web/tsconfig.json @@ -1,27 +1,3 @@ { - "extends": "../../apps/web/jslib/shared/tsconfig", - "compilerOptions": { - "baseUrl": ".", - "paths": { - "tldjs": ["../../apps/web/jslib/common/src/misc/tldjs.noop"], - "jslib-common/*": ["../../apps/web/jslib/common/src/*"], - "jslib-angular/*": ["../../apps/web/jslib/angular/src/*"], - "@bitwarden/components": ["../../apps/web/jslib/components/src"], - "src/*": ["../../apps/web/src/*"] - } - }, - "angularCompilerOptions": { - "preserveWhitespaces": true - }, - "files": [ - "../../apps/web/src/app/polyfills.ts", - "../../apps/web/src/app/main.ts", - "src/app/main.ts" - ], - "include": [ - "../../apps/web/src/connectors/*.ts", - "../../apps/web/src/models/*.ts", - "../../apps/web/src/services/*.ts", - "../../apps/web/src/abstractions/*.ts" - ] + "extends": "../../apps/web/tsconfig" } diff --git a/clients.code-workspace b/clients.code-workspace index 3f5f7c69e3..76445da06a 100644 --- a/clients.code-workspace +++ b/clients.code-workspace @@ -1,34 +1,34 @@ { - "folders": [ - { - "name": "root", - "path": "." - }, - { - "name": "web vault", - "path": "apps/web" - }, - { - "name": "web vault (bit)", - "path": "bitwarden_license/bit-web" - }, - { - "name": "cli", - "path": "apps/cli" - }, - { - "name": "desktop", - "path": "apps/desktop" - }, - { - "name": "browser", - "path": "apps/browser" - }, - { - "name": "libs", - "path": "libs" - } - ], + "folders": [ + { + "name": "root", + "path": "." + }, + { + "name": "web vault", + "path": "apps/web" + }, + { + "name": "web vault (bit)", + "path": "bitwarden_license/bit-web" + }, + { + "name": "cli", + "path": "apps/cli" + }, + { + "name": "desktop", + "path": "apps/desktop" + }, + { + "name": "browser", + "path": "apps/browser" + }, + { + "name": "libs", + "path": "libs" + } + ], "settings": { "debug.javascript.terminalOptions": { "sourceMapPathOverrides": { @@ -37,6 +37,20 @@ "webpack://?:*/*": "${workspaceFolder}/*", "webpack://@bitwarden/cli/*": "${workspaceFolder}/apps/cli/*" } - } + }, + "jest.disabledWorkspaceFolders": [ + "root", + "web vault", + "web vault (bit)", + "desktop" + ], + "jest.jestCommandLine": "npx jest" +}, +"extensions": { + "recommendations": [ + "orta.vscode-jest", + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode" + ], } } diff --git a/libs/.vscode/settings.json b/libs/.vscode/settings.json new file mode 100644 index 0000000000..c0c6d6dd0b --- /dev/null +++ b/libs/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "eslint.options": { + "ignorePath": "${workspaceFolder}/../../.eslintIgnore" + }, + "prettier.ignorePath": "${workspaceFolder}/../../.prettierignore" +}