[PM-7646][PM-5506] Revert IPC changes (#10946)

* Revert "Remove unnecessary plist keys in desktop_proxy (#10933)" This reverts commit 4dbb036. * Revert "Fix TestFlight errors caused by desktop_proxy (#10928)" This reverts commit 40cb4b5. * Revert "[PM-5506] Enable electron fuses (#10073)" This reverts commit 78c5e9c. * Revert "[PM-7846] Implement a rust based native messaging proxy and IPC system (#9894)" This reverts commit 55874b7.
bitwarden · Sep 9, 2024 · ed4d481 · ed4d481
1 parent 2827d33
commit ed4d481
Show file tree

Hide file tree

Showing 33 changed files with 346 additions and 1,363 deletions.
diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
@@ -174,21 +174,20 @@ jobs:
         with:
           path: |
             apps/desktop/desktop_native/napi/*.node
-            apps/desktop/desktop_native/dist/*
             ${{ env.RUNNER_TEMP }}/.cargo/registry
             ${{ env.RUNNER_TEMP }}/.cargo/git
           key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
 
       - name: Build Native Module
         if: steps.cache.outputs.cache-hit != 'true'
-        working-directory: apps/desktop/desktop_native
+        working-directory: apps/desktop/desktop_native/napi
         env:
           PKG_CONFIG_ALLOW_CROSS: true
           PKG_CONFIG_ALL_STATIC: true
           TARGET: musl
         run: |
           rustup target add x86_64-unknown-linux-musl
-          node build.js cross-platform
+          npm run build:cross-platform
 
       - name: Build application
         run: npm run dist:lin
@@ -302,15 +301,13 @@ jobs:
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         id: cache
         with:
-          path: |
-            apps/desktop/desktop_native/napi/*.node
-            apps/desktop/desktop_native/dist/*
+          path: apps/desktop/desktop_native/napi/*.node
           key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
 
       - name: Build Native Module
         if: steps.cache.outputs.cache-hit != 'true'
-        working-directory: apps/desktop/desktop_native
-        run: node build.js cross-platform
+        working-directory: apps/desktop/desktop_native/napi
+        run: npm run build:cross-platform
 
       - name: Build & Sign (dev)
         env:
@@ -587,15 +584,13 @@ jobs:
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         id: cache
         with:
-          path: |
-            apps/desktop/desktop_native/napi/*.node
-            apps/desktop/desktop_native/dist/*
+          path: apps/desktop/desktop_native/napi/*.node
           key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
 
       - name: Build Native Module
         if: steps.cache.outputs.cache-hit != 'true'
-        working-directory: apps/desktop/desktop_native
-        run: node build.js cross-platform
+        working-directory: apps/desktop/desktop_native/napi
+        run: npm run build:cross-platform
 
       - name: Build application (dev)
         run: npm run build
@@ -753,15 +748,13 @@ jobs:
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         id: cache
         with:
-          path: |
-            apps/desktop/desktop_native/napi/*.node
-            apps/desktop/desktop_native/dist/*
+          path: apps/desktop/desktop_native/napi/*.node
           key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
 
       - name: Build Native Module
         if: steps.cache.outputs.cache-hit != 'true'
-        working-directory: apps/desktop/desktop_native
-        run: node build.js cross-platform
+        working-directory: apps/desktop/desktop_native/napi
+        run: npm run build:cross-platform
 
       - name: Build
         if: steps.build-cache.outputs.cache-hit != 'true'
@@ -972,15 +965,13 @@ jobs:
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         id: cache
         with:
-          path: |
-            apps/desktop/desktop_native/napi/*.node
-            apps/desktop/desktop_native/dist/*
+          path: apps/desktop/desktop_native/napi/*.node
           key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
 
       - name: Build Native Module
         if: steps.cache.outputs.cache-hit != 'true'
-        working-directory: apps/desktop/desktop_native
-        run: node build.js cross-platform
+        working-directory: apps/desktop/desktop_native/napi
+        run: npm run build:cross-platform
 
       - name: Build
         if: steps.build-cache.outputs.cache-hit != 'true'
@@ -1177,15 +1168,13 @@ jobs:
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         id: cache
         with:
-          path: |
-            apps/desktop/desktop_native/napi/*.node
-            apps/desktop/desktop_native/dist/*
+          path: apps/desktop/desktop_native/napi/*.node
           key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
 
       - name: Build Native Module
         if: steps.cache.outputs.cache-hit != 'true'
-        working-directory: apps/desktop/desktop_native
-        run: node build.js cross-platform
+        working-directory: apps/desktop/desktop_native/napi
+        run: npm run build:cross-platform
 
       - name: Build
         if: steps.build-cache.outputs.cache-hit != 'true'

diff --git a/apps/desktop/desktop_native/.gitignore b/apps/desktop/desktop_native/.gitignore
@@ -4,4 +4,3 @@ index.node
 **/.DS_Store
 npm-debug.log*
 *.node
-dist