Consolidate bun.lock files

jpenilla · jpenilla · commit 772845bfdd9a · 2025-06-02T22:32:46.000-07:00
diff --git a/.github/workflows/build-preview.yml b/.github/workflows/build-preview.yml
@@ -16,7 +16,7 @@ jobs:
                   ref: ${{ github.event.pull_request.head.ref }}
                   repository: ${{ github.event.pull_request.head.repo.full_name }}
             - uses: oven-sh/setup-bun@v2
-            - run: cd web && bun install
+            - run: bun install
             - run: cd web && bun run buildPreview
             - name: "upload build artifact"
               uses: "actions/upload-artifact@v4"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
       - name: Install frontend dependencies
-        run: cd web && bun install
+        run: bun install
       - name: Build frontend
         run: cd web && bun run build
       - name: "Deploy to Cloudflare Pages"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,8 +14,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - uses: oven-sh/setup-bun@v2
-      - run: cd web && bun install
+      - run: bun install
       - run: cd web && bun run lint
       - run: cd web && bun run check
-      - run: cd web-extension && bun install
       - run: cd web-extension && bun run lint
diff --git a/.gitignore b/.gitignore
@@ -13,5 +13,3 @@ db/
 .DS_Store
 
 node_modules
-# TODO: figure out proper monorepo setup, installing / fixes intellij not recognizing the project for now
-/bun.lock
diff --git a/bun.lock b/bun.lock
diff --git a/web-extension/bun.lock b/web-extension/bun.lock
diff --git a/web-extension/popup.html b/web-extension/popup.html
@@ -9,9 +9,7 @@
     </head>
     <body class="w-fit p-3 text-base">
         <div class="flex flex-col gap-1.5 text-nowrap">
-            <button id="open-button" type="button" class="rounded bg-blue-500 px-4 py-2 text-white hover:bg-blue-700">
-                Open with diffs.dev
-            </button>
+            <button id="open-button" type="button" class="rounded bg-blue-500 px-4 py-2 text-white hover:bg-blue-700">Open with diffs.dev</button>
             <button id="settings-button" type="button" class="rounded bg-blue-500 px-4 py-2 text-white hover:bg-blue-700">Extension Options</button>
         </div>
     </body>
