chore: Pnpm (#447)

Author: lasseklovstad

.env.example

@@ -4,7 +4,7 @@ AUTH0_AUDIENCE=https://gataersamla.no
 AUTH0_CALLBACK=https://gataersamla.no/callback
 AUTH0_CLIENT_SECRET=xxx
 AUTH0_COOKIE_SECRET=123
-APP_DATABASE_URL=postgres://postgres:password@localhost:5433/postgres
+APP_DATABASE_URL=sqlite.db
 
 DEFAULT_CONTINGENT_SIZE= 600
 CONTINGENT_BANK= 000.0123.1230.123

.github/workflows/deploy.yml

@@ -16,16 +16,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4  
+        uses: actions/checkout@v5
       - name: 👀 Read app name
         uses: SebRollen/[email protected]
         id: app_name
         with:
-          file: 'fly.toml'
-          field: 'app'    
+          file: "fly.toml"
+          field: "app"
       - name: 🎈 Setup Fly
         uses: superfly/flyctl-actions/setup-flyctl@master
       - name: 🚀 Deploy Production
         run: flyctl deploy --remote-only --build-arg COMMIT_SHA=${{ github.sha }}
         env:
-          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}   
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

.github/workflows/e2e.yml

@@ -1,70 +1,76 @@
-name: 'pr'
+name: "pr"
 
 on:
   push:
     branches:
-      - '**'
-      - '!main'
+      - "**"
+      - "!main"
   workflow_dispatch:
 
-
 jobs:
   lint-fe:
     name: Lint Frontend
     runs-on: "ubuntu-latest"
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
         with:
-          ref: ${{ github.ref }}
-
-      - name: Setup node
-        uses: actions/setup-node@v4
+          package_json_file: "package.json"
+          run_install: false
+      - name: Setup Node
+        uses: actions/setup-node@v6
         with:
-          node-version: 22
-
-      - name: Download deps
-        uses: bahmutov/npm-install@v1
-
-      - name: Run linting checks
-        run: |
-          npm run typecheck && npm run lint:ci
+          node-version-file: "package.json"
+          cache: "pnpm"
+          cache-dependency-path: "pnpm-lock.yaml"
+      - run: pnpm i --frozen-lockfile
+      - run: pnpm typecheck
+      - run: pnpm lint:ci
   knip:
     name: Knip Frontend
     runs-on: "ubuntu-latest"
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup node
-        uses: actions/setup-node@v4
+      - uses: actions/checkout@v5
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
         with:
-          node-version: 22
-
-      - name: Download deps
-        uses: bahmutov/npm-install@v1
+          package_json_file: "package.json"
+          run_install: false
+      - name: Setup Node
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: "package.json"
+          cache: "pnpm"
+          cache-dependency-path: "pnpm-lock.yaml"
+      - run: pnpm i --frozen-lockfile
+      - run: pnpm typecheck
+      - run: pnpm knip
 
-      - name: Run frontend tests
-        run: |
-          npm run typecheck && npm run knip          
   integration:
     name: Integration tests
     runs-on: "ubuntu-latest"
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup node
-        uses: actions/setup-node@v4
+      - uses: actions/checkout@v5
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
         with:
-          node-version: 22
-
-      - name: Download deps
-        uses: bahmutov/npm-install@v1
+          package_json_file: "package.json"
+          run_install: false
+      - name: Setup Node
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: "package.json"
+          cache: "pnpm"
+          cache-dependency-path: "pnpm-lock.yaml"
+      - run: pnpm i --frozen-lockfile
 
       - name: Run frontend tests
         run: |
-          npm run test:ci   
+          pnpm test:ci
 
   playwright:
     runs-on: ubuntu-latest
@@ -81,28 +87,30 @@ jobs:
       MAKE_FIRST_USER_ADMIN: true
 
     steps:
-      - name: Cloning repo
-        uses: actions/checkout@v4
-
-      - name: Setup node
-        uses: actions/setup-node@v4
+      - uses: actions/checkout@v5
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
         with:
-          node-version: 22
-
-      - name: Download deps
-        uses: bahmutov/npm-install@v1
+          package_json_file: "package.json"
+          run_install: false
+      - name: Setup Node
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: "package.json"
+          cache: "pnpm"
+          cache-dependency-path: "pnpm-lock.yaml"
+      - run: pnpm i --frozen-lockfile
 
       - name: Build frontend
-        run: |
-          npm run build
+        run: pnpm build
 
       - name: Run migrations
         run: |
-            npm run db:migrate
+          pnpm db:migrate
 
       - name: Install playwright
         run: |
-          npx playwright install --with-deps chromium
+          pnpm exec playwright install --with-deps chromium
 
       - name: Run E2E tests
         env:
@@ -118,7 +126,7 @@ jobs:
           # DEBUG: pw:webserver
           # DEBUG: pw:api
         run: |
-          npx playwright test
+          pnpm exec playwright test
 
       - name: Upload test results
         if: always()

.gitignore

@@ -15,6 +15,7 @@ playwright-report
 playwright/.cache/
 *StorageState.json
 sqlite*.db
+sqlite*.db-journal
 /data
 /db-backups
 .react-router/

.vscode/settings.json

@@ -0,0 +1,12 @@
+{
+	"eslint.useFlatConfig": true,
+	"typescript.tsdk": "node_modules/typescript/lib",
+	"editor.quickSuggestions": {
+		"strings": "on"
+	},
+	"eslint.enable": true,
+	"eslint.format.enable": true,
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": "explicit"
+	}
+}

Dockerfile

@@ -1,6 +1,7 @@
-FROM node:22.16-alpine3.20 as base
+FROM node:24-bookworm-slim AS base
 
 LABEL fly_launch_runtime="Remix"
+RUN npm install -g pnpm
 
 # Remix app lives here
 WORKDIR /app
@@ -10,30 +11,28 @@ ENV NODE_ENV=production
 ENV APP_DATABASE_URL=/data/sqlite.db
 ENV IMAGE_DIR=/data/images
 
+FROM base AS production-deps
+WORKDIR /app
+ADD package.json pnpm-lock.yaml ./
+RUN pnpm i --prod --frozen-lockfile
+
 
 # Throw-away build stage to reduce size of final image
 FROM base as build
-
-# Install node modules
-COPY --link package-lock.json package.json ./
-RUN npm ci --include=dev
-
+ADD package.json pnpm-lock.yaml ./
+RUN pnpm i --frozen-lockfile
 # Copy application code
 COPY --link . .
-
 # Build application
-RUN npm run build
-
-# Remove development dependencies
-RUN npm prune --omit=dev
+RUN pnpm build
 
 
 # Final stage for app image
 FROM base
 
 # Copy built application
 COPY --from=build /app/build /app/build
-COPY --from=build /app/node_modules /app/node_modules
+COPY --from=production-deps /app/node_modules /app/node_modules
 COPY --from=build /app/package.json /app/package.json
 COPY --from=build /app/server.mjs /app/server.mjs
 COPY --from=build /app/migrations /app/migrations

app/.server/db/gataEvent.ts

@@ -23,11 +23,9 @@ import { RoleName } from "~/utils/roleUtils";
 import type { User } from "./user";
 
 export const insertEvent = async (event: Omit<typeof gataEvent.$inferInsert, "createdBy"> & { createdBy: string }) => {
-   return await db.transaction(async (tx) => {
-      const [{ eventId }] = await tx.insert(gataEvent).values(event).returning({ eventId: gataEvent.id });
-      await tx.insert(eventOrganizer).values({ userId: event.createdBy, eventId });
-      return eventId;
-   });
+   const [{ eventId }] = await db.insert(gataEvent).values(event).returning({ eventId: gataEvent.id });
+   await db.insert(eventOrganizer).values({ userId: event.createdBy, eventId });
+   return eventId;
 };
 
 export const getUpCommingEvents = async (loggedInUserId: string) => {
@@ -142,11 +140,9 @@ type InsertPollVote = {
 };
 
 export const insertPollVote = async ({ userId, pollId, options }: InsertPollVote) => {
-   await db.transaction(async (tx) => {
-      await tx.delete(pollVote).where(and(eq(pollVote.userId, userId), eq(pollVote.pollId, pollId)));
-      if (!options.length) return;
-      await tx.insert(pollVote).values(options.map((pollOptionId) => ({ pollId, pollOptionId, userId })));
-   });
+   await db.delete(pollVote).where(and(eq(pollVote.userId, userId), eq(pollVote.pollId, pollId)));
+   if (!options.length) return;
+   await db.insert(pollVote).values(options.map((pollOptionId) => ({ pollId, pollOptionId, userId })));
 };
 
 export const updatePoll = async (pollId: number, values: Partial<typeof poll.$inferInsert>) => {
@@ -158,29 +154,23 @@ export const deletePoll = async (pollId: number) => {
 };
 
 export const insertNewPoll = async (eventId: number, pollValues: typeof poll.$inferInsert, options: string[]) => {
-   await db.transaction(async (tx) => {
-      const [{ pollId }] = await tx.insert(poll).values(pollValues).returning({ pollId: poll.id });
-      await tx.insert(eventPolls).values({ pollId, eventId });
-      await tx.insert(pollOption).values(options.map((textOption) => ({ textOption, pollId })));
-   });
+   const [{ pollId }] = await db.insert(poll).values(pollValues).returning({ pollId: poll.id });
+   await db.insert(eventPolls).values({ pollId, eventId });
+   await db.insert(pollOption).values(options.map((textOption) => ({ textOption, pollId })));
 };
 
 export const insertPollOptions = async (pollId: number, options: string[]) => {
    await db.insert(pollOption).values(options.map((textOption) => ({ textOption, pollId })));
 };
 
 export const updateOrganizers = async (eventId: number, organizers: string[]) => {
-   await db.transaction(async (tx) => {
-      await tx.delete(eventOrganizer).where(eq(eventOrganizer.eventId, eventId));
-      await tx.insert(eventOrganizer).values(organizers.map((userId) => ({ userId, eventId })));
-   });
+   await db.delete(eventOrganizer).where(eq(eventOrganizer.eventId, eventId));
+   await db.insert(eventOrganizer).values(organizers.map((userId) => ({ userId, eventId })));
 };
 
 export const insertCloudinaryImage = async (eventId: number, values: typeof cloudinaryImage.$inferInsert) => {
-   return await db.transaction(async (tx) => {
-      await tx.insert(cloudinaryImage).values(values);
-      await tx.insert(eventCloudinaryImages).values({ eventId, cloudId: values.cloudId });
-   });
+   await db.insert(cloudinaryImage).values(values);
+   await db.insert(eventCloudinaryImages).values({ eventId, cloudId: values.cloudId });
 };
 
 export const getEventCloudinaryImages = async (eventId: number) => {
@@ -265,25 +255,18 @@ export const getEventMessages = async (eventId: number) => {
 };
 
 export const insertEventMessage = async (eventId: number, userId: string, message: string) => {
-   return await db.transaction(async (tx) => {
-      const [{ messageId }] = await tx
-         .insert(messages)
-         .values({ userId, message })
-         .returning({ messageId: messages.id });
-      await tx.insert(eventMessages).values({ messageId, eventId });
-      return messageId;
-   });
+   const [{ messageId }] = await db.insert(messages).values({ userId, message }).returning({ messageId: messages.id });
+   await db.insert(eventMessages).values({ messageId, eventId });
+   return messageId;
 };
 
 export const insertEventMessageReply = async (userId: string, messageId: number, reply: string) => {
-   return await db.transaction(async (tx) => {
-      const [{ replyId }] = await tx
-         .insert(messages)
-         .values({ userId, message: reply })
-         .returning({ replyId: messages.id });
-      await tx.insert(messageReplies).values({ messageId, replyId });
-      return replyId;
-   });
+   const [{ replyId }] = await db
+      .insert(messages)
+      .values({ userId, message: reply })
+      .returning({ replyId: messages.id });
+   await db.insert(messageReplies).values({ messageId, replyId });
+   return replyId;
 };
 
 export const insertMessageLike = async (userId: string, messageId: number, type: string) => {