[PM-1512] Upgrade prettier (#5028)

* Upgrade prettier * Lock prettier version
2025-12-12 22:33:35 +00:00 · 2023-03-21 11:28:15 +01:00
parent 9c60b2b54a
commit ff4293b7bd
107 changed files with 294 additions and 223 deletions
--- a/apps/browser/src/alarms/alarm-state.ts
+++ b/apps/browser/src/alarms/alarm-state.ts
@@ -2,7 +2,7 @@ import { clearClipboardAlarmName } from "../autofill/clipboard";
 import { BrowserApi } from "../browser/browserApi";

 export const alarmKeys = [clearClipboardAlarmName] as const;
-export type AlarmKeys = typeof alarmKeys[number];
+export type AlarmKeys = (typeof alarmKeys)[number];

 type AlarmState = { [T in AlarmKeys]: number | undefined };

--- a/apps/cli/src/commands/completion.command.ts
+++ b/apps/cli/src/commands/completion.command.ts
@@ -20,7 +20,7 @@ const validShells = ["zsh"];

 export class CompletionCommand {
  async run(options: program.OptionValues) {
-    const shell: typeof validShells[number] = options.shell;
+    const shell: (typeof validShells)[number] = options.shell;

    if (!shell) {
      return Response.badRequest("`shell` option was not provided.");
--- a/apps/web/src/app/organizations/members/people.component.html
+++ b/apps/web/src/app/organizations/members/people.component.html
@@ -53,7 +53,9 @@
  <ng-container
    *ngIf="
      !loading &&
-      (isPaging() ? pagedUsers : (users | search: searchText:'name':'email':'id')) as searchedUsers
+      (isPaging()
+        ? pagedUsers
+        : (users | search : searchText : 'name' : 'email' : 'id')) as searchedUsers
    "
  >
    <p *ngIf="!searchedUsers.length">{{ "noMembersInList" | i18n }}</p>
--- a/apps/web/src/app/settings/organization-plans.component.html
+++ b/apps/web/src/app/settings/organization-plans.component.html
@@ -210,7 +210,8 @@
        <ng-container *ngIf="selectablePlan.isAnnual">
          {{ "annually" | i18n }}
          <small *ngIf="selectablePlan.basePrice">
-            {{ "basePrice" | i18n }}: {{ selectablePlan.basePrice / 12 | currency: "$" }} &times; 12
+            {{ "basePrice" | i18n }}: {{ selectablePlan.basePrice / 12 | currency : "$" }} &times;
+            12
            {{ "monthAbbr" | i18n }}
            =
            <ng-container *ngIf="acceptingSponsorship; else notAcceptingSponsorship">
--- a/apps/web/src/app/settings/premium.component.html
+++ b/apps/web/src/app/settings/premium.component.html
@@ -45,7 +45,9 @@
    </li>
  </ul>
  <p class="text-lg" [ngClass]="{ 'mb-0': !selfHosted }">
-    {{ "premiumPriceWithFamilyPlan" | i18n: (premiumPrice | currency: "$"):familyPlanMaxUserCount }}
+    {{
+      "premiumPriceWithFamilyPlan" | i18n : (premiumPrice | currency : "$") : familyPlanMaxUserCount
+    }}
    <a routerLink="/create-organization" [queryParams]="{ plan: 'families' }">{{
      "bitwardenFamiliesPlan" | i18n
    }}</a>
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model.ts
@@ -5,7 +5,7 @@ export const All = "all";
 // TODO: Remove `All` when moving to vertical navigation.
 const itemTypes = ["favorites", "login", "card", "identity", "note", "trash", All] as const;

-export type RoutedVaultFilterItemType = typeof itemTypes[number];
+export type RoutedVaultFilterItemType = (typeof itemTypes)[number];

 export function isRoutedVaultFilterItemType(value: unknown): value is RoutedVaultFilterItemType {
  return itemTypes.includes(value as any);
--- a/apps/web/src/scss/variables.scss
+++ b/apps/web/src/scss/variables.scss
@@ -350,4 +350,4 @@ $themes: (

@function themed($key) {
  @return map-get($theme-map, $key);
-} ;
+}
--- a/bitwarden_license/bit-web/src/app/providers/manage/people.component.html
+++ b/bitwarden_license/bit-web/src/app/providers/manage/people.component.html
@@ -100,7 +100,9 @@
 <ng-container
  *ngIf="
    !loading &&
-    (isPaging() ? pagedUsers : (users | search: searchText:'name':'email':'id')) as searchedUsers
+    (isPaging()
+      ? pagedUsers
+      : (users | search : searchText : 'name' : 'email' : 'id')) as searchedUsers
  "
 >
  <p *ngIf="!searchedUsers.length">{{ "noUsersInList" | i18n }}</p>
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.html
@@ -10,7 +10,9 @@
    <bit-callout type="info" [title]="'accessTokenCallOutTitle' | i18n">
      {{ "downloadAccessToken" | i18n }}<br />
      {{ "expiresOnAccessToken" | i18n }}
-      {{ data.expirationDate === null ? ("never" | i18n) : (data.expirationDate | date: "medium") }}
+      {{
+        data.expirationDate === null ? ("never" | i18n) : (data.expirationDate | date : "medium")
+      }}
    </bit-callout>

    <bit-form-field class="tw-mb-0">
--- a/libs/common/src/enums/importOptions.ts
+++ b/libs/common/src/enums/importOptions.ts
@@ -72,5 +72,5 @@ export const regularImportOptions = [
 ] as const;

 export type ImportType =
-  | typeof featuredImportOptions[number]["id"]
-  | typeof regularImportOptions[number]["id"];
+  | (typeof featuredImportOptions)[number]["id"]
+  | (typeof regularImportOptions)[number]["id"];
--- a/libs/components/src/variables.scss
+++ b/libs/components/src/variables.scss
@@ -354,4 +354,4 @@ $themes: (

@function themed($key) {
  @return map-get($theme-map, $key);
-} ;
+}
--- a/package-lock.json
+++ b/package-lock.json
@@ -155,8 +155,8 @@
        "pkg": "5.8.0",
        "postcss": "^8.4.14",
        "postcss-loader": "^7.0.1",
-        "prettier": "^2.7.1",
-        "prettier-plugin-tailwindcss": "^0.1.13",
+        "prettier": "2.8.4",
+        "prettier-plugin-tailwindcss": "^0.2.5",
        "process": "^0.11.10",
        "regedit": "^3.0.3",
        "rimraf": "^3.0.2",
@@ -35933,9 +35933,9 @@
      }
    },
    "node_modules/prettier": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
+      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
      "dev": true,
      "bin": {
        "prettier": "bin-prettier.js"
@@ -35948,15 +35948,77 @@
      }
    },
    "node_modules/prettier-plugin-tailwindcss": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.13.tgz",
-      "integrity": "sha512-/EKQURUrxLu66CMUg4+1LwGdxnz8of7IDvrSLqEtDqhLH61SAlNNUSr90UTvZaemujgl3OH/VHg+fyGltrNixw==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.5.tgz",
+      "integrity": "sha512-vZ/iKieyCx0WTxHbkf5E1rBlv/ybFk8WTT4hL5W2jlVxum2Zbe0jMUpuQdDrpa4z2vnPiJ5KIWCqL/kd16fKYg==",
      "dev": true,
      "engines": {
        "node": ">=12.17.0"
      },
      "peerDependencies": {
-        "prettier": ">=2.2.0"
+        "@ianvs/prettier-plugin-sort-imports": "*",
+        "@prettier/plugin-php": "*",
+        "@prettier/plugin-pug": "*",
+        "@shopify/prettier-plugin-liquid": "*",
+        "@shufo/prettier-plugin-blade": "*",
+        "@trivago/prettier-plugin-sort-imports": "*",
+        "prettier": ">=2.2.0",
+        "prettier-plugin-astro": "*",
+        "prettier-plugin-css-order": "*",
+        "prettier-plugin-import-sort": "*",
+        "prettier-plugin-jsdoc": "*",
+        "prettier-plugin-organize-attributes": "*",
+        "prettier-plugin-organize-imports": "*",
+        "prettier-plugin-style-order": "*",
+        "prettier-plugin-svelte": "*",
+        "prettier-plugin-twig-melody": "*"
+      },
+      "peerDependenciesMeta": {
+        "@ianvs/prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "@prettier/plugin-php": {
+          "optional": true
+        },
+        "@prettier/plugin-pug": {
+          "optional": true
+        },
+        "@shopify/prettier-plugin-liquid": {
+          "optional": true
+        },
+        "@shufo/prettier-plugin-blade": {
+          "optional": true
+        },
+        "@trivago/prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "prettier-plugin-astro": {
+          "optional": true
+        },
+        "prettier-plugin-css-order": {
+          "optional": true
+        },
+        "prettier-plugin-import-sort": {
+          "optional": true
+        },
+        "prettier-plugin-jsdoc": {
+          "optional": true
+        },
+        "prettier-plugin-organize-attributes": {
+          "optional": true
+        },
+        "prettier-plugin-organize-imports": {
+          "optional": true
+        },
+        "prettier-plugin-style-order": {
+          "optional": true
+        },
+        "prettier-plugin-svelte": {
+          "optional": true
+        },
+        "prettier-plugin-twig-melody": {
+          "optional": true
+        }
      }
    },
    "node_modules/pretty-bytes": {
@@ -71231,15 +71293,15 @@
      "dev": true
    },
    "prettier": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
+      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
      "dev": true
    },
    "prettier-plugin-tailwindcss": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.13.tgz",
-      "integrity": "sha512-/EKQURUrxLu66CMUg4+1LwGdxnz8of7IDvrSLqEtDqhLH61SAlNNUSr90UTvZaemujgl3OH/VHg+fyGltrNixw==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.5.tgz",
+      "integrity": "sha512-vZ/iKieyCx0WTxHbkf5E1rBlv/ybFk8WTT4hL5W2jlVxum2Zbe0jMUpuQdDrpa4z2vnPiJ5KIWCqL/kd16fKYg==",
      "dev": true,
      "requires": {}
    },
--- a/package.json
+++ b/package.json
@@ -119,8 +119,8 @@
    "pkg": "5.8.0",
    "postcss": "^8.4.14",
    "postcss-loader": "^7.0.1",
-    "prettier": "^2.7.1",
-    "prettier-plugin-tailwindcss": "^0.1.13",
+    "prettier": "2.8.4",
+    "prettier-plugin-tailwindcss": "^0.2.5",
    "process": "^0.11.10",
    "regedit": "^3.0.3",
    "rimraf": "^3.0.2",