Merge branch 'main' into ac/pm-17363/add-limit-item-deletion-property

bitwarden · Jan 29, 2025 · 82172b1 · 82172b1
2 parents 4592797 + 320a459
commit 82172b1
Show file tree

Hide file tree

Showing 207 changed files with 3,198 additions and 1,315 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -71,12 +71,8 @@
     },
     {
       "matchPackageNames": [
-        "@angular-eslint/eslint-plugin-template",
-        "@angular-eslint/eslint-plugin",
         "@angular-eslint/schematics",
-        "@angular-eslint/template-parser",
-        "@typescript-eslint/eslint-plugin",
-        "@typescript-eslint/parser",
+        "angular-eslint",
         "eslint-config-prettier",
         "eslint-import-resolver-typescript",
         "eslint-plugin-import",
@@ -86,7 +82,8 @@
         "eslint-plugin-tailwindcss",
         "eslint",
         "husky",
-        "lint-staged"
+        "lint-staged",
+        "typescript-eslint"
       ],
       "description": "Architecture owned dependencies",
       "commitMessagePrefix": "[deps] Architecture:",

diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -1,7 +1,8 @@
 import { dirname, join } from "path";
+
 import { StorybookConfig } from "@storybook/angular";
-import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
 import remarkGfm from "remark-gfm";
+import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
 
 const config: StorybookConfig = {
   stories: [
@@ -29,6 +30,8 @@ const config: StorybookConfig = {
     getAbsolutePath("@storybook/addon-designs"),
     getAbsolutePath("@storybook/addon-interactions"),
     {
+      // @storybook/addon-docs is part of @storybook/addon-essentials
+      // eslint-disable-next-line storybook/no-uninstalled-addons
       name: "@storybook/addon-docs",
       options: {
         mdxPluginOptions: {

diff --git a/.storybook/manager.js b/.storybook/manager.js
@@ -50,10 +50,14 @@ const darkTheme = create({
 });
 
 export const getPreferredColorScheme = () => {
-  if (!globalThis || !globalThis.matchMedia) return "light";
+  if (!globalThis || !globalThis.matchMedia) {
+    return "light";
+  }
 
   const isDarkThemePreferred = globalThis.matchMedia("(prefers-color-scheme: dark)").matches;
-  if (isDarkThemePreferred) return "dark";
+  if (isDarkThemePreferred) {
+    return "dark";
+  }
 
   return "light";
 };

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,5 +7,6 @@
     "**/_locales/*[^n]/messages.json": true
   },
   "rust-analyzer.linkedProjects": ["apps/desktop/desktop_native/Cargo.toml"],
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "eslint.useFlatConfig": true
 }
diff --git a/apps/browser/.eslintrc.json b/apps/browser/.eslintrc.json
diff --git a/apps/browser/src/autofill/content/components/.lit-storybook/main.ts b/apps/browser/src/autofill/content/components/.lit-storybook/main.ts
@@ -1,8 +1,8 @@
-import { dirname, join } from "path";
-import path from "path";
+import path, { dirname, join } from "path";
+
 import type { StorybookConfig } from "@storybook/web-components-webpack5";
-import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
 import remarkGfm from "remark-gfm";
+import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
 
 const getAbsolutePath = (value: string): string =>
   dirname(require.resolve(join(value, "package.json")));