From 1f76aa38f42747d7148ccfab18ec3fae5e44ca52 Mon Sep 17 00:00:00 2001
From: Fabricio Silva <hi@fabricio.dev>
Date: Sun, 21 May 2023 16:05:53 +0100
Subject: [PATCH] build(web): use pnpm from corepack (#935)

* feat(web): use pnpm packageManager on package.json

* build(web): add frozen-lockfile to Makefile

* build(docker): use the same node version as Docker image

* build(docker): enable corepack

* build(makefile): use --dir instead of cd for pnpm
---
 .github/workflows/release.yml | 16 ++++++++++------
 Dockerfile                    |  4 ++--
 Makefile                      |  4 ++--
 web/package.json              |  3 ++-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 973e1bc..30f3dc9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,15 +23,19 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8
-
       - name: Set up Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
-          cache: 'pnpm'
+          node-version: '18.7.0'
+
+      - name: Set up corepack
+        run: corepack enable
+
+      # It can not be done before enable corepack
+      - name: Set up cache
+        uses: actions/setup-node@v3
+        with:
+          cache: pnpm
           cache-dependency-path: web/pnpm-lock.yaml
 
       - name: Fetch web dependencies
diff --git a/Dockerfile b/Dockerfile
index cbabdbd..9809803 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,8 @@
 FROM node:18.7.0-alpine3.16 AS web-builder
 COPY . ./
 WORKDIR /web
-RUN npm install -g pnpm && \
-pnpm install --frozen-lockfile && \
+RUN corepack enable &&
+pnpm install --frozen-lockfile &&
 pnpm run build
 
 # build app
diff --git a/Makefile b/Makefile
index 489c790..7105de2 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ BINDIR = bin
 all: clean build
 
 deps:
-	cd web && pnpm install
+	pnpm --dir web install --frozen-lockfile
 	go mod download
 
 test:
@@ -30,7 +30,7 @@ build/ctl:
 	go build -ldflags $(GOFLAGS) -o bin/autobrrctl cmd/autobrrctl/main.go
 
 build/web:
-	cd web && pnpm run build
+	pnpm --dir web run build
 
 build/docker:
 	docker build -t autobrr:dev -f Dockerfile . --build-arg GIT_TAG=$(GIT_TAG) --build-arg GIT_COMMIT=$(GIT_COMMIT)
diff --git a/web/package.json b/web/package.json
index 0cae6c9..c0fc3c9 100644
--- a/web/package.json
+++ b/web/package.json
@@ -77,5 +77,6 @@
     "tailwindcss": "^3.1.3",
     "typescript": "^4.7.3",
     "vite": "^4.2.1"
-  }
+  },
+  "packageManager": "pnpm@8.5.1"
 }