chore: upgrade to yarn 4 (#1441)

* chore: upgrade to yarn 4

* fix: use correct cache dir command

* chore: organize pipeline

* chore: use setup-node instead of handrolling it

* fix: dependency conflicts and docker setup

.dockerignore

@@ -2,3 +2,4 @@ node_modules
 build
 .env
 .env.example
+.yarn

.github/actions/install-yarn/action.yml

@@ -0,0 +1,19 @@
+name: Yarn Install
+description: Installs and caches yarn dependencies
+
+runs:
+  using: "composite"
+  steps:
+    - name: 'Enable corepack'
+      shell: bash
+      run: corepack enable
+
+    - uses: actions/setup-node@v4
+      with:
+        cache: yarn
+        node-version: 21
+
+    # This step should prefer the cached dependencies and restore node_modules
+    - name: Install dependencies
+      shell: bash
+      run: yarn --immutable

.github/actions/yarn-action/action.yml

@@ -0,0 +1,16 @@
+name: Reusable Yarn Action
+description: Runs a given yarn command after installing all dependencies including caching
+
+inputs:
+  command:
+    description: 'The command to run (excluding the yarn prefix)'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - uses: ./.github/actions/install-yarn
+
+    - name: Run command in root folder
+      shell: bash
+      run: yarn ${{ inputs.command }}

.github/workflows/build.yml

@@ -20,20 +20,9 @@ jobs:
       YTF_GRAPHQL_ENDPOINT: https://staging.yestheory.family/_yesbot-schema
     steps:
       - uses: actions/checkout@v3
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - name: Cache node modules
-        uses: actions/cache@v2
+      - uses: ./.github/actions/yarn-action
+        name: 'Install and codegen'
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - name: install and compile
-        run: |
-          yarn install --frozen-lockfile
-          yarn graphql-codegen
-          yarn tsc --noEmit
+          command: 'graphql-codegen'
+      - name: 'Check types'
+        run: yarn tsc --noEmit

.github/workflows/deploy.yml

@@ -14,9 +14,6 @@ on:
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [ 16.20 ]
     permissions:
       contents: read
       packages: write

.github/workflows/linting.yml

@@ -18,19 +18,7 @@ jobs:
         node-version: [ 16.20 ]
     steps:
       - uses: actions/checkout@v3
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - name: Cache node modules
-        uses: actions/cache@v2
+      - uses: ./.github/actions/yarn-action
+        name: 'Install and lint'
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - name: install and lint
-        run: |
-          yarn install --frozen-lockfile
-          yarn run lint
+          command: lint

.github/workflows/test.yml

@@ -18,19 +18,7 @@ jobs:
         node-version: [ 16.20 ]
     steps:
       - uses: actions/checkout@v3
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - name: Cache node modules
-        uses: actions/cache@v2
+      - uses: ./.github/actions/yarn-action
+        name: 'Install and test'
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - name: install and testing
-        run: |
-          yarn install --frozen-lockfile
-          yarn run test
+          command: test

.gitignore

@@ -20,3 +20,5 @@ src/**/*.generated.ts
 
 # One off scripts that are not relevant to the repository.
 src/scripts/
+
+.yarn/

.yarnrc.yml

@@ -0,0 +1,2 @@
+nodeLinker: node-modules
+enableGlobalCache: false

Dockerfile

@@ -1,14 +1,16 @@
-FROM node:21.7.3-alpine AS deps
-RUN apk add --no-cache libc6-compat
+FROM node:21.7.3-alpine AS base
+RUN apk add --no-cache libc6-compat && \
+    corepack enable
+
+FROM base as deps
 
 WORKDIR /usr/src/app
-COPY package.json yarn.lock ./
+COPY package.json yarn.lock .yarnrc.yml ./
 COPY prisma/schema.prisma ./prisma/schema.prisma
 
 RUN yarn install --frozen-lockfile
 
-FROM node:21.7.3-alpine AS builder
-RUN apk add --no-cache libc6-compat
+FROM base as builder
 WORKDIR /usr/src/app
 
 COPY --from=deps /usr/src/app/node_modules ./node_modules
@@ -18,15 +20,14 @@ ARG YTF_GRAPHQL_SCHEMA_ENDPOINT
 
 RUN yarn prisma generate && yarn graphql-codegen && yarn run tsc
 
-FROM node:21.7.3-alpine
-RUN apk add --no-cache libc6-compat
-# Create app directory
+FROM base
 WORKDIR /usr/src/app
 
 COPY --from=builder /usr/src/app/node_modules ./node_modules
 COPY --from=builder /usr/src/app/prisma ./prisma
 COPY --from=builder /usr/src/app/package.json ./package.json
 COPY --from=builder /usr/src/app/yarn.lock ./yarn.lock
+COPY --from=builder /usr/src/app/.yarnrc.yml ./.yarnrc.yml
 COPY --from=builder /usr/src/app/build ./build
 COPY /deployment/docker-entrypoint.sh ./docker-entrypoint.sh
 

package.json

@@ -38,6 +38,7 @@
     "node-cron": "3.0.3",
     "path": "0.12.7",
     "reflect-metadata": "0.2.2",
+    "type-fest": "^4",
     "uuid": "10.0.0",
     "vitest-mock-extended": "2.0.2",
     "winston": "3.15.0"
@@ -61,5 +62,5 @@
     "typescript": "5.6.2",
     "vitest": "2.1.2"
   },
-  "packageManager": "yarn@1.22.22"
+  "packageManager": "yarn@4.5.0+sha512.837566d24eec14ec0f5f1411adb544e892b3454255e61fdef8fd05f3429480102806bac7446bc9daff3896b01ae4b62d00096c7e989f1596f2af10b927532f39"
 }