Merge branch 'main' into shooter_modal

claustra01 · Aug 10, 2024 · 31a4070 · 31a4070
2 parents 6c07ff0 + 325caba
commit 31a4070
Show file tree

Hide file tree

Showing 6 changed files with 1,976 additions and 1,535 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,25 +9,37 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9
       - run: |
-          npm install
-          npm run check:ci
+          pnpm install
+          pnpm check:ci
 
   spell:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9
       - run: |
-          npm install
-          npm run spell
+          pnpm install
+          pnpm spell
 
   build:
     needs: [check, spell]
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9
       - run: |
-          npm install
-          npm run build
+          pnpm install
+          pnpm build
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -11,9 +11,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9
       - run: |
-          npm install
-          npm run build
+          pnpm install
+          pnpm build
       
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -17,9 +17,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9
       - run: |
-          npm install
-          npm run build
+          pnpm install
+          pnpm build
       
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
@@ -101,9 +105,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install and Build
-        run: |
-          npm install
-          npm run build
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+      - run: |
+          pnpm install
+          pnpm build
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3

diff --git a/package.json b/package.json
@@ -13,6 +13,7 @@
     "spell": "cspell ./src"
   },
   "dependencies": {
+    "@react-three/cannon": "^6.6.0",
     "@react-three/fiber": "^8.16.8",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",