Remove @types/cookie stub (#247)

* Remove @types/cookie stub * Remove @types/cookie from lockfile * Upgrade to [email protected] * Upgrade to [email protected] - https://github.com/Automattic/node-canvas/releases/tag/v3.0.0-rc2 - Automattic/node-canvas#2377 (comment) * Upgrade to [email protected] * Install pango and cairo * Change to pull_request trigger * Switch back to only `push` trigger Revert this for now: 3d62d34#diff-def01120c202f13a2f33e11a966318cd2b5f80b66a28ea61d68001c56fd53214R4
upleveled · Nov 7, 2024 · e1da646 · e1da646
1 parent af79e5e
commit e1da646
Show file tree

Hide file tree

Showing 3 changed files with 211 additions and 50 deletions.
diff --git a/...rkflows/lint-check-types-build-deploy.yml → .github/workflows/ci-cd.yml b/...rkflows/lint-check-types-build-deploy.yml → .github/workflows/ci-cd.yml
@@ -2,7 +2,7 @@ name: Lint, Check Types, Build, Deploy to Fly.io
 on: push
 
 jobs:
-  lint-and-check-types-and-build:
+  ci:
     name: Lint, Check Types, Build
     runs-on: ubuntu-latest
     env:
@@ -27,6 +27,9 @@ jobs:
         with:
           node-version: 'lts/*'
           cache: 'pnpm'
+      # https://github.com/Automattic/node-canvas/blob/a2e10e61413a0d158174a7a869c16aa13e5d3575/Readme.md?plain=1#L39
+      - name: Install canvas dependencies
+        run: sudo apt-get install libcairo2-dev libpango1.0-dev
       - name: Install dependencies
         run: pnpm install
       - run: pnpm migrate up
@@ -44,10 +47,10 @@ jobs:
           API_KEY: ${{ secrets.API_KEY }}
       - name: Run Stylelint
         run: pnpm stylelint '**/*.{css,scss,less,js,tsx}'
-  deploy:
+  cd:
     name: Deploy to Fly.io
     runs-on: ubuntu-latest
-    needs: lint-and-check-types-and-build
+    needs: ci
     if: github.ref == 'refs/heads/main'
     env:
       FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

diff --git a/package.json b/package.json
@@ -11,9 +11,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "@types/cookie": "1.0.0",
     "bcrypt": "5.1.1",
-    "canvas": "2.11.2",
+    "canvas": "3.0.0-rc2",
     "cookie": "1.0.1",
     "dompurify": "3.1.7",
     "dotenv-safe": "9.1.0",
@@ -47,5 +46,10 @@
     "stylelint-config-upleveled": "1.1.5",
     "typescript": "5.6.3"
   },
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]+sha512.cce0f9de9c5a7c95bef944169cc5dfe8741abfb145078c0d508b868056848a87c81e626246cb60967cbd7fd29a6c062ef73ff840d96b3c86c40ac92cf4a813ee",
+  "pnpm": {
+    "overrides": {
+      "node-addon-api": "7.1.0"
+    }
+  }
 }