From 8e9a104bd0157770efb8c0d0f0b6f9ca739c55c1 Mon Sep 17 00:00:00 2001 From: Jonathan Prusik Date: Wed, 17 Jan 2024 16:02:44 -0500 Subject: [PATCH] [deps] Autofill: Update prettier to v3.2.2 (#7565) * [deps] Autofill: Update prettier to v3.2.2 * prettier fixes --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .../collection-dialog.component.ts | 5 +-- clients.code-workspace | 36 +++++++++---------- .../password-login.strategy.ts | 6 ++-- libs/common/src/state-migrations/migrator.ts | 22 ++++++------ package-lock.json | 8 ++--- package.json | 2 +- 6 files changed, 42 insertions(+), 37 deletions(-) diff --git a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts index ef05dc8888..1224b322ff 100644 --- a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts +++ b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts @@ -212,8 +212,9 @@ export class CollectionDialogComponent implements OnInit, OnDestroy { } else { this.nestOptions = collections; const parent = collections.find((c) => c.id === this.params.parentCollectionId); - const currentOrgUserId = users.data.find((u) => u.userId === this.organization?.userId) - ?.id; + const currentOrgUserId = users.data.find( + (u) => u.userId === this.organization?.userId, + )?.id; const initialSelection: AccessItemValue[] = currentOrgUserId !== undefined && flexibleCollections ? [ diff --git a/clients.code-workspace b/clients.code-workspace index f834ca4c58..baf15db003 100644 --- a/clients.code-workspace +++ b/clients.code-workspace @@ -2,47 +2,47 @@ "folders": [ { "name": "root", - "path": "." + "path": ".", }, { "name": "web vault", - "path": "apps/web" + "path": "apps/web", }, { "name": "web vault (bit)", - "path": "bitwarden_license/bit-web" + "path": "bitwarden_license/bit-web", }, { "name": "cli", - "path": "apps/cli" + "path": "apps/cli", }, { "name": "desktop", - "path": "apps/desktop" + "path": "apps/desktop", }, { "name": "browser", - "path": "apps/browser" + "path": "apps/browser", }, { "name": "libs", - "path": "libs" - } + "path": "libs", + }, ], "settings": { "eslint.options": { "overrideConfig": { "parserOptions": { - "project": ["${workspaceFolder}/tsconfig.eslint.json"] - } - } + "project": ["${workspaceFolder}/tsconfig.eslint.json"], + }, + }, }, "debug.javascript.terminalOptions": { "sourceMapPathOverrides": { "webpack:///./~/*": "${workspaceFolder:root}/node_modules/*", "webpack://?:*/*": "${workspaceFolder}/*", - "webpack://@bitwarden/cli/*": "${workspaceFolder}/*" - } + "webpack://@bitwarden/cli/*": "${workspaceFolder}/*", + }, }, "jest.disabledWorkspaceFolders": [ "browser", @@ -51,19 +51,19 @@ "libs", "web vault", "web vault (bit)", - "desktop" + "desktop", ], "jest.jestCommandLine": "npx jest", "angular.enable-strict-mode-prompt": false, "typescript.preferences.importModuleSpecifier": "project-relative", - "javascript.preferences.importModuleSpecifier": "project-relative" + "javascript.preferences.importModuleSpecifier": "project-relative", }, "extensions": { "recommendations": [ "orta.vscode-jest", "dbaeumer.vscode-eslint", "esbenp.prettier-vscode", - "Angular.ng-template" - ] - } + "Angular.ng-template", + ], + }, } diff --git a/libs/common/src/auth/login-strategies/password-login.strategy.ts b/libs/common/src/auth/login-strategies/password-login.strategy.ts index a9d15ddc33..d3f0a0be03 100644 --- a/libs/common/src/auth/login-strategies/password-login.strategy.ts +++ b/libs/common/src/auth/login-strategies/password-login.strategy.ts @@ -183,8 +183,10 @@ export class PasswordLoginStrategy extends LoginStrategy { { masterPassword, email }: PasswordLoginCredentials, options: MasterPasswordPolicyOptions, ): boolean { - const passwordStrength = this.passwordStrengthService.getPasswordStrength(masterPassword, email) - ?.score; + const passwordStrength = this.passwordStrengthService.getPasswordStrength( + masterPassword, + email, + )?.score; return this.policyService.evaluateMasterPassword(passwordStrength, masterPassword, options); } diff --git a/libs/common/src/state-migrations/migrator.ts b/libs/common/src/state-migrations/migrator.ts index 3d1b633c62..7bfc5684b2 100644 --- a/libs/common/src/state-migrations/migrator.ts +++ b/libs/common/src/state-migrations/migrator.ts @@ -4,16 +4,18 @@ import { MigrationHelper } from "./migration-helper"; export const IRREVERSIBLE = new Error("Irreversible migration"); -export type VersionFrom = T extends Migrator - ? TFrom extends NonNegativeInteger - ? TFrom - : never - : never; -export type VersionTo = T extends Migrator - ? TTo extends NonNegativeInteger - ? TTo - : never - : never; +export type VersionFrom = + T extends Migrator + ? TFrom extends NonNegativeInteger + ? TFrom + : never + : never; +export type VersionTo = + T extends Migrator + ? TTo extends NonNegativeInteger + ? TTo + : never + : never; export type Direction = "up" | "down"; export abstract class Migrator { diff --git a/package-lock.json b/package-lock.json index f726d2d83a..53e59de736 100644 --- a/package-lock.json +++ b/package-lock.json @@ -161,7 +161,7 @@ "pkg": "5.8.1", "postcss": "8.4.32", "postcss-loader": "7.3.3", - "prettier": "3.1.1", + "prettier": "3.2.2", "prettier-plugin-tailwindcss": "0.5.11", "process": "0.11.10", "react": "18.2.0", @@ -32642,9 +32642,9 @@ } }, "node_modules/prettier": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", - "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.2.tgz", + "integrity": "sha512-HTByuKZzw7utPiDO523Tt2pLtEyK7OibUD9suEJQrPUCYQqrHr74GGX6VidMrovbf/I50mPqr8j/II6oBAuc5A==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" diff --git a/package.json b/package.json index 835712f7c5..12f92fdc37 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "pkg": "5.8.1", "postcss": "8.4.32", "postcss-loader": "7.3.3", - "prettier": "3.1.1", + "prettier": "3.2.2", "prettier-plugin-tailwindcss": "0.5.11", "process": "0.11.10", "react": "18.2.0",