Merge branch 'main' into autofill/pm-19255

.github/workflows/build-web.yml

@@ -133,12 +133,34 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
+      - name: Get Latest Server Version
+        id: latest-server-version
+        uses: bitwarden/gh-actions/get-release-version@main
+        with:
+          repository: bitwarden/server
+          trim: false
+
+      - name: Set Server Ref
+        id: set-server-ref
+        run: |
+          SERVER_REF="${{ steps.latest-server-version.outputs.version }}"
+          echo "Latest server release version: $SERVER_REF"
+          if [[ "$GITHUB_REF" == "refs/heads/main" ]]; then
+            SERVER_REF="$GITHUB_REF"
+          elif [[ "$GITHUB_REF" == "refs/heads/rc" ]]; then
+            SERVER_REF="$GITHUB_REF"
+          elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
+            SERVER_REF="refs/heads/main"
+          fi
+          echo "Server ref: $SERVER_REF"
+          echo "server_ref=$SERVER_REF" >> $GITHUB_OUTPUT
+
       - name: Check out Server repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: server
           repository: bitwarden/server
-          ref: ${{ github.event.pull_request.head.sha && 'main' || github.ref }}
+          ref: ${{ steps.set-server-ref.outputs.server_ref }}
 
       - name: Check Branch to Publish
         env:
@@ -160,7 +182,7 @@ jobs:
           VERSION=$( jq -r ".version" package.json)
           jq --arg version "$VERSION+${GITHUB_SHA:0:7}" '.version = $version' package.json > package.json.tmp
           mv package.json.tmp package.json
-      
+
       ########## Set up Docker ##########
       - name: Set up Docker
         uses: docker/setup-docker-action@b60f85385d03ac8acfca6d9996982511d8620a19 # v4.3.0
@@ -304,7 +326,7 @@ jobs:
       - name: Log out of Docker
         run: docker logout $_AZ_REGISTRY
 
-  
+
   crowdin-push:
     name: Crowdin Push
     if: github.event_name != 'pull_request_target' && github.ref == 'refs/heads/main'

apps/desktop/desktop_native/Cargo.lock

@@ -2110,18 +2110,18 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.8"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.8"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3022,9 +3022,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 
 [[package]]
 name = "uds_windows"

apps/desktop/desktop_native/Cargo.toml

@@ -35,7 +35,7 @@ napi-build = "=2.1.4"
 napi-derive = "=2.16.13"
 oo7 = "=0.3.3"
 oslog = "=0.2.0"
-pin-project = "=1.1.8"
+pin-project = "=1.1.10"
 pkcs8 =  "=0.10.2" 
 rand = "=0.8.5"
 rsa = "=0.9.8"
@@ -54,7 +54,7 @@ thiserror = "=1.0.69"
 tokio = "=1.43.1"
 tokio-stream = "=0.1.15"
 tokio-util = "=0.7.13"
-typenum = "=1.17.0"
+typenum = "=1.18.0"
 uniffi =  "=0.28.3"
 widestring = "=1.1.0"
 windows = "=0.61.1"

package.json

@@ -44,7 +44,7 @@
     "@babel/preset-env": "7.24.8",
     "@compodoc/compodoc": "1.1.26",
     "@electron/notarize": "2.5.0",
-    "@electron/rebuild": "3.7.1",
+    "@electron/rebuild": "3.7.2",
     "@lit-labs/signals": "0.1.2",
     "@ngtools/webpack": "18.2.12",
     "@storybook/addon-a11y": "8.5.2",
@@ -100,12 +100,12 @@
     "electron-store": "8.2.0",
     "electron-updater": "6.3.9",
     "eslint": "8.57.1",
-    "eslint-config-prettier": "10.0.1",
-    "eslint-import-resolver-typescript": "3.7.0",
+    "eslint-config-prettier": "10.1.2",
+    "eslint-import-resolver-typescript": "3.10.1",
     "eslint-plugin-import": "2.31.0",
     "eslint-plugin-rxjs": "5.0.3",
     "eslint-plugin-rxjs-angular": "2.0.1",
-    "eslint-plugin-storybook": "0.11.2",
+    "eslint-plugin-storybook": "0.12.0",
     "eslint-plugin-tailwindcss": "3.18.0",
     "html-loader": "5.1.0",
     "html-webpack-injector": "1.1.4",
@@ -116,7 +116,7 @@
     "jest-mock-extended": "3.0.7",
     "jest-preset-angular": "14.1.1",
     "json5": "2.2.3",
-    "lint-staged": "15.4.1",
+    "lint-staged": "15.5.1",
     "mini-css-extract-plugin": "2.9.2",
     "nx": "20.8.0",
     "postcss": "8.5.1",
@@ -136,7 +136,7 @@
     "tsconfig-paths-webpack-plugin": "4.2.0",
     "type-fest": "2.19.0",
     "typescript": "5.4.2",
-    "typescript-eslint": "8.20.0",
+    "typescript-eslint": "8.30.1",
     "typescript-strict-plugin": "2.4.4",
     "url": "0.11.4",
     "util": "0.12.5",