From 142dc59a7a820b5a5ce7bb62b81ce6fc625ed3b4 Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Tue, 9 Apr 2024 22:50:02 +0100 Subject: [PATCH] feat: update pnpm to 8 and node to 20 --- .github/workflows/client.yml | 4 ++-- .github/workflows/common.yml | 2 +- .github/workflows/database-seeds.yml | 4 ++-- .github/workflows/server.yml | 4 ++-- Dockerfile.bootstrap | 4 ++-- Dockerfile.bot | 4 ++-- Dockerfile.client | 4 ++-- Dockerfile.ghbot | 4 ++-- Dockerfile.seeds | 4 ++-- Dockerfile.server | 4 ++-- bot/package.json | 2 +- client/package.json | 6 +++--- github-bot/package.json | 2 +- package.json | 13 ++----------- server/package.json | 6 +++--- sieglinde/package.json | 4 ++-- 16 files changed, 31 insertions(+), 40 deletions(-) diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml index bc95ea5d8..daaca4ca6 100644 --- a/.github/workflows/client.yml +++ b/.github/workflows/client.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 cache: pnpm - name: Install dependencies @@ -55,7 +55,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 cache: pnpm - name: Enable SSH Key diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 3847b45de..edbdefdc8 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 cache: pnpm - name: Install dependencies diff --git a/.github/workflows/database-seeds.yml b/.github/workflows/database-seeds.yml index a2e7dfe17..b65aa03c2 100644 --- a/.github/workflows/database-seeds.yml +++ b/.github/workflows/database-seeds.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 cache: pnpm - name: Install dependencies @@ -56,4 +56,4 @@ jobs: - name: Deploy updates run: ssh ci@"$TACHI_HOST" /home/ci/tachi-devops/scripts/deploy_seeds.sh env: - TACHI_HOST: ${{secrets.TACHI_HOST}} \ No newline at end of file + TACHI_HOST: ${{secrets.TACHI_HOST}} diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index d8064a928..7c234a829 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 cache: pnpm - name: Install dependencies @@ -110,4 +110,4 @@ jobs: - name: Deploy updates run: ssh ci@"$TACHI_HOST" /home/ci/tachi-devops/scripts/deploy_server.sh env: - TACHI_HOST: ${{secrets.TACHI_HOST}} \ No newline at end of file + TACHI_HOST: ${{secrets.TACHI_HOST}} diff --git a/Dockerfile.bootstrap b/Dockerfile.bootstrap index e8b471b63..fda324acc 100644 --- a/Dockerfile.bootstrap +++ b/Dockerfile.bootstrap @@ -6,9 +6,9 @@ # I really do not care. # Want it better? Do it yourself. -FROM node:16 as base +FROM node:20 as base -RUN npm install --silent -g pnpm@7.20.0 +RUN npm install --silent -g pnpm@8.15.6 WORKDIR /app diff --git a/Dockerfile.bot b/Dockerfile.bot index 81587ce25..4008d8cb4 100644 --- a/Dockerfile.bot +++ b/Dockerfile.bot @@ -1,5 +1,5 @@ -FROM node:16-alpine as base -RUN npm install --silent -g pnpm@7.20.0 +FROM node:20-alpine as base +RUN npm install --silent -g pnpm@8.15.6 FROM base AS build WORKDIR /app diff --git a/Dockerfile.client b/Dockerfile.client index 494d1e009..63f844c1e 100644 --- a/Dockerfile.client +++ b/Dockerfile.client @@ -1,6 +1,6 @@ -FROM node:16-alpine as base +FROM node:20-alpine as base -RUN npm install --silent -g pnpm@7.20.0 +RUN npm install --silent -g pnpm@8.15.6 FROM base AS build WORKDIR /app diff --git a/Dockerfile.ghbot b/Dockerfile.ghbot index b55a7b427..3da119c90 100644 --- a/Dockerfile.ghbot +++ b/Dockerfile.ghbot @@ -1,5 +1,5 @@ -FROM node:16-alpine as base -RUN npm install --silent -g pnpm@7.20.0 +FROM node:20-alpine as base +RUN npm install --silent -g pnpm@8.15.6 FROM base AS build WORKDIR /app diff --git a/Dockerfile.seeds b/Dockerfile.seeds index 07cd7b917..e3aa6fea9 100644 --- a/Dockerfile.seeds +++ b/Dockerfile.seeds @@ -1,7 +1,7 @@ # no alpine here as we want bash + general nice-to-haves -FROM node:16 as base +FROM node:20 as base -RUN npm install --silent -g pnpm@7.20.0 +RUN npm install --silent -g pnpm@8.15.6 FROM base AS build WORKDIR /app diff --git a/Dockerfile.server b/Dockerfile.server index 1c2031656..b526c50be 100644 --- a/Dockerfile.server +++ b/Dockerfile.server @@ -3,11 +3,11 @@ # does need to boot. You should consider using docker-compose for this. # base image -FROM node:16-alpine as base +FROM node:20-alpine as base ARG COMMIT_HASH ENV COMMIT_HASH=${COMMIT_HASH} -RUN npm install --silent -g pnpm@7.20.0 +RUN npm install --silent -g pnpm@8.15.6 RUN apk add --no-cache git curl # install dependencies diff --git a/bot/package.json b/bot/package.json index c3d2a1aff..09a0a3b88 100644 --- a/bot/package.json +++ b/bot/package.json @@ -47,6 +47,6 @@ }, "engines": { "node": "16", - "pnpm": "7" + "pnpm": "8" } } \ No newline at end of file diff --git a/client/package.json b/client/package.json index 6d1ec8c9c..cfb07597e 100644 --- a/client/package.json +++ b/client/package.json @@ -90,7 +90,7 @@ "vite": "^3.0.7" }, "engines": { - "node": "16", - "pnpm": "7" + "node": "20", + "pnpm": "8" } -} +} \ No newline at end of file diff --git a/github-bot/package.json b/github-bot/package.json index 07e0707df..d78b224c7 100644 --- a/github-bot/package.json +++ b/github-bot/package.json @@ -23,6 +23,6 @@ }, "engines": { "node": "16", - "pnpm": "7" + "pnpm": "8" } } \ No newline at end of file diff --git a/package.json b/package.json index 836dd3254..8b85d82d4 100644 --- a/package.json +++ b/package.json @@ -6,31 +6,22 @@ "scripts": { "start": "docker compose -f docker-compose-dev.yml up --build -d", "stop": "docker compose -f docker-compose-dev.yml down", - - "logs-server": "docker logs tachi-server -f", "logs-client": "docker logs tachi-client -f", "logs-seeds": "docker logs tachi-seeds -f", - "test-server": "docker compose -f docker-compose-dev.yml exec tachi-server pnpm test", "test-seeds": "docker compose -f docker-compose-dev.yml exec tachi-seeds pnpm --filter ./scripts test", - "enter-seeds": "docker compose -f docker-compose-dev.yml exec tachi-seeds bash", "sort-seeds": "docker compose -f docker-compose-dev.yml exec tachi-seeds node scripts/deterministic-collection-sort.js", "view-seeds": "xdg-open http://127.0.0.1:3000/utils/seeds", "load-seeds": "docker compose -f docker-compose-dev.yml exec tachi-server pnpm sync-database-local", - "validate-db": "docker compose -f docker-compose-dev.yml exec tachi-server pnpm validate-database", - "start-docs": "cd docs/ && mkdocs serve", - "raw-start-server": "pnpm --filter ./server start", "raw-start-client": "pnpm --filter ./client start", "raw-start-dbs": "redis-server --daemonize yes; sudo systemctl start mongodb.service", - "^^ DEV STUFF IS HERE ^^": "comment", "vv PROD STUFF YOU WON'T TOUCH vv": "comment", - "build": "pnpm -r build", "sync-database": "pnpm --filter ./server sync-database", "start-score-import-worker": "pnpm --filter ./server runscoreworker" @@ -77,7 +68,7 @@ } }, "engines": { - "node": "16", - "pnpm": "7" + "node": "20", + "pnpm": "8" } } \ No newline at end of file diff --git a/server/package.json b/server/package.json index 3dd985e6a..72d76cc41 100644 --- a/server/package.json +++ b/server/package.json @@ -119,7 +119,7 @@ ] }, "engines": { - "node": "16", - "pnpm": "7" + "node": "20", + "pnpm": "8" } -} +} \ No newline at end of file diff --git a/sieglinde/package.json b/sieglinde/package.json index 7730db5f5..5c17792c4 100644 --- a/sieglinde/package.json +++ b/sieglinde/package.json @@ -21,7 +21,7 @@ "winston": "3.5.1" }, "engines": { - "node": "16", - "pnpm": "7" + "node": "20", + "pnpm": "8" } } \ No newline at end of file