feat: replace yarn with pnpm

Refs: KK-1513

Author: tjgofore

.env

@@ -1,7 +1,6 @@
 VITE_ORIGIN=
 VITE_API_URI=
 VITE_CMS_URI=
-VITE_APPLICATION_NAME=$npm_package_name
 VITE_ELIGIBLE_CITIES=helsinki,helsingfors
 VITE_OIDC_AUTHORITY=
 VITE_OIDC_CLIENT_ID="kukkuu-ui-dev"
@@ -10,7 +9,6 @@ VITE_OIDC_SCOPE="openid profile kukkuu-ui-dev"
 VITE_OIDC_RETURN_TYPE="code"
 VITE_OIDC_SERVER_TYPE=KEYCLOAK
 VITE_OIDC_AUDIENCES=
-VITE_VERSION=$npm_package_version
 VITE_FEATURE_FLAG_SHOW_CORONAVIRUS_INFO=false
 VITE_ADMIN_TICKET_VALIDATION_URL=https://kukkuu-admin.test.hel.ninja/check-ticket-validity
 BROWSER_TESTS_ENV_URL=http://localhost:3000

.env.development

@@ -18,3 +18,4 @@ VITE_MATOMO_SRC_URL=https://webanalytics.digiaiiris.com/js/piwik.min.js
 VITE_MATOMO_TRACKER_URL=https://webanalytics.digiaiiris.com/js/tracker.php
 VITE_MATOMO_ENABLED=0
 VITE_IDLE_TIMEOUT_IN_MS=3600000
+VITE_CSP_REPORT_URI=

.env.test

@@ -1,7 +1,6 @@
 VITE_ORIGIN=http://localhost:3000
 VITE_CMS_URI=https://kukkuu.app-staging.hkih.hion.dev/graphql
 VITE_API_URI=http://localhost:8081/graphql
-VITE_APPLICATION_NAME=$npm_package_name
 VITE_ELIGIBLE_CITIES=helsinki,helsingfors
 VITE_OIDC_AUTHORITY=https://tunnistus.test.hel.ninja/auth/realms/helsinki-tunnistus/
 VITE_OIDC_AUTOMATIC_SILENT_RENEW_ENABLED=0
@@ -12,7 +11,6 @@ VITE_OIDC_SCOPE="openid profile kukkuu-ui-dev"
 VITE_OIDC_RETURN_TYPE="code"
 VITE_OIDC_SERVER_TYPE=TUNNISTAMO
 VITE_OIDC_AUDIENCES=
-VITE_VERSION=$npm_package_version
 VITE_FEATURE_FLAG_SHOW_CORONAVIRUS_INFO=false
 VITE_ADMIN_TICKET_VALIDATION_URL=https://kukkuu-admin.test.hel.ninja/check-ticket-validity
 BROWSER_TESTS_ENV_URL=http://localhost:3000

.github/workflows/ci.yml

@@ -2,14 +2,15 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
   workflow_dispatch:
 
 jobs:
   common:
-    uses: City-of-Helsinki/.github/.github/workflows/ci-node.yml@main
-    secrets: inherit
+    uses: City-of-Helsinki/.github/.github/workflows/ci-pnpm-node.yml@main
+    secrets:
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
     with:
-      node-version: 22
+      node-version: 24.x

.gitignore

@@ -21,9 +21,14 @@
 kukkuu-ui.iml
 
 npm-debug.log*
+.eslintcache
+
+# yarn – not used anymore
+yarn.lock
+.yarn/
+.yarnrc.yml
 yarn-debug.log*
 yarn-error.log*
-.eslintcache
 
 xeno
 

.husky/pre-commit

@@ -1,2 +1,2 @@
-yarn doctoc .
-yarn lint-staged --relative
+pnpm doctoc .
+pnpm lint-staged --relative

.nvmrc

@@ -1 +1 @@
-v22.13.1
+v24.15.0

.prod/nginx.conf.template

@@ -1,40 +1,28 @@
-# ===============================================
-FROM registry.access.redhat.com/ubi9/nodejs-22 AS appbase
-# ===============================================
-# install yarn
-USER root
-RUN curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo
-RUN yum -y install yarn
-
+# ============================================================
+# STAGE 1: Build the Static Assets
+# ============================================================
+FROM helsinki.azurecr.io/ubi9/nodejs-24-pnpm-builder-base AS appbase
 WORKDIR /app
 
-# Offical image has npm log verbosity as info. More info - https://github.com/nodejs/docker-node#verbosity
-ENV NPM_CONFIG_LOGLEVEL warn
-
-# set our node environment, either development or production
-# defaults to production, compose overrides this to development on build and run
-ARG NODE_ENV=production
-ENV NODE_ENV $NODE_ENV
-
-# Global npm deps in a non-root user directory
-ENV NPM_CONFIG_PREFIX=/app/.npm-global
-ENV PATH=$PATH:/app/.npm-global/bin
-
-# Yarn
-ENV YARN_VERSION 1.22.22
-RUN yarn policies set-version ${YARN_VERSION}
+# 1. Copy needed files for build
+COPY --chown=default:root package.json pnpm-lock.yaml pnpm-workspace.yaml tsconfig.json tsconfig.node.json ./
+COPY --chown=default:root ./public ./public
 
-# Copy package.json and package-lock.json/yarn.lock files
-COPY --chown=root:root package*.json *yarn* ./
+# 2. Run the install
+# corepack in the base image will automatically use the version of pnpm
+# defined in your package.json 'packageManager' field if present.
+RUN pnpm install --frozen-lockfile --ignore-scripts && pnpm store prune
 
-# Install npm depepndencies
-ENV PATH /app/node_modules/.bin:$PATH
+# 3. Copy remaining source files
+COPY --chown=default:root index.html vite.config.ts eslint.config.js .prettierrc.json .env* ./
+COPY --chown=default:root ./src ./src
 
-RUN yarn install --frozen-lockfile --ignore-scripts && yarn cache clean --force
 
-# =============================
+# ============================================================
+# STAGE 2: Development
+# ============================================================
 FROM appbase AS development
-# =============================
+WORKDIR /app
 
 # Set NODE_ENV to development in the development container
 ARG NODE_ENV=development
@@ -47,83 +35,76 @@ ENV NODE_ENV $NODE_ENV
 ARG CHOKIDAR_USEPOLLING=true
 ENV CHOKIDAR_USEPOLLING=${CHOKIDAR_USEPOLLING}
 
-# copy in our source code last, as it changes the most
-COPY --chown=root:root . .
+# Expose port and start development server
+EXPOSE 8080
+CMD pnpm exec vite --port 8080 --no-open --host
 
-# Bake package.json start command into the image
-CMD ["yarn", "start", "--no-open", "--host"]
 
-# ===================================
+# ============================================================
+# STAGE 3: Static builder for production
+# ============================================================
 FROM appbase AS staticbuilder
-# ===================================
 
+# Accept Vite build-time variables from CI/CD docker --build-arg values.
+ARG VITE_ENVIRONMENT
 ARG VITE_ORIGIN
-ARG VITE_ADMIN_TICKET_VALIDATION_URL
 ARG VITE_API_URI
 ARG VITE_CMS_URI
-ARG VITE_ENVIRONMENT
-ARG VITE_OIDC_SERVER_TYPE
-ARG VITE_OIDC_RETURN_TYPE
+ARG VITE_APPLICATION_NAME
+ARG VITE_VERSION
+ARG VITE_ELIGIBLE_CITIES
 ARG VITE_OIDC_AUTHORITY
 ARG VITE_OIDC_CLIENT_ID
 ARG VITE_OIDC_KUKKUU_API_CLIENT_ID
 ARG VITE_OIDC_SCOPE
+ARG VITE_OIDC_RETURN_TYPE
+ARG VITE_OIDC_SERVER_TYPE
+ARG VITE_OIDC_AUDIENCES
 ARG VITE_OIDC_AUTOMATIC_SILENT_RENEW_ENABLED
 ARG VITE_OIDC_SESSION_POLLING_INTERVAL_MS
-ARG VITE_OIDC_AUDIENCES
-ARG VITE_FEATURE_FLAG_SHOW_CORONAVIRUS_INFO
-ARG VITE_SENTRY_ENVIRONMENT
-ARG VITE_SENTRY_DSN
-ARG VITE_SENTRY_TRACES_SAMPLE_RATE
-ARG VITE_SENTRY_TRACE_PROPAGATION_TARGETS
-ARG VITE_SENTRY_REPLAYS_SESSION_SAMPLE_RATE
-ARG VITE_SENTRY_REPLAYS_ON_ERROR_SAMPLE_RATE
-ARG VITE_CSP_REPORT_URI
-ARG VITE_BUILDTIME
-ARG VITE_SENTRY_RELEASE
-ARG VITE_COMMITHASH
+ARG VITE_IDLE_TIMEOUT_IN_MS
 ARG VITE_HELSINKI_PROFILE_URL
 ARG VITE_MATOMO_URL_BASE
 ARG VITE_MATOMO_SITE_ID
 ARG VITE_MATOMO_SRC_URL
-ARG VITE_MATOMO_TRACKER_URL
 ARG VITE_MATOMO_ENABLED
-ARG VITE_IDLE_TIMEOUT_IN_MS
+ARG VITE_APOLLO_PERSISTED_CACHE_TIME_TO_LIVE_MS
 ARG VITE_ENROLMENT_CANCELLATION_TIME_LIMIT_HOURS
+ARG VITE_FEATURE_FLAG_SHOW_CORONAVIRUS_INFO
+ARG VITE_ADMIN_TICKET_VALIDATION_URL
+ARG VITE_SENTRY_DSN
+ARG VITE_SENTRY_ENVIRONMENT
+ARG VITE_SENTRY_RELEASE
+ARG VITE_SENTRY_TRACES_SAMPLE_RATE
+ARG VITE_SENTRY_TRACE_PROPAGATION_TARGETS
+ARG VITE_SENTRY_REPLAYS_SESSION_SAMPLE_RATE
+ARG VITE_SENTRY_REPLAYS_ON_ERROR_SAMPLE_RATE
 
-# Use template and inject the environment variables into .prod/nginx.conf
-ENV VITE_CSP_REPORT_URI=${VITE_CSP_REPORT_URI:-""}
-ENV VITE_BUILDTIME=${VITE_BUILDTIME:-""}
-ENV VITE_RELEASE=${VITE_SENTRY_RELEASE:-""}
-ENV VITE_COMMITHASH=${VITE_COMMITHASH:-""}
-COPY .prod/nginx.conf.template /tmp/.prod/nginx.conf.template
-RUN export APP_VERSION=$(yarn --silent app:version) && \
-  envsubst '${APP_VERSION},${VITE_BUILDTIME},${VITE_RELEASE},${VITE_COMMITHASH}' < \
-  "/tmp/.prod/nginx.conf.template" > \
-  "/tmp/.prod/nginx.conf"
-
-COPY . /app
-RUN yarn build
-
-# =============================
-FROM registry.access.redhat.com/ubi9/nginx-122 AS production
-# =============================
-# Add application sources to a directory that the assemble script expects them
-# and set permissions so that the container runs without root access
-USER root
-
-RUN chgrp -R 0 /usr/share/nginx/html && \
-  chmod -R g=u /usr/share/nginx/html
-
-# Copy static build
+# Perform the build
+ARG REACT_APP_SENTRY_RELEASE
+RUN pnpm build
+
+
+# ============================================================
+# STAGE 4: Production Runtime
+# ============================================================
+FROM helsinki.azurecr.io/ubi10/nginx-126-spa-standard AS production
+
+ARG REACT_APP_SENTRY_RELEASE
+ENV APP_RELEASE=${REACT_APP_SENTRY_RELEASE:-""}
+# 1. Copy the compiled assets
 COPY --from=staticbuilder /app/build /usr/share/nginx/html
-# Copy nginx config
-COPY --from=staticbuilder /tmp/.prod/nginx.conf  /etc/nginx/nginx.conf
 
-USER 1001
+# 2. Setup Runtime Env Injection
+# env.sh is provided by the base image
+WORKDIR /usr/share/nginx/html
+COPY .env .
 
-# Run script uses standard ways to run the application
-CMD ["/bin/bash", "-c", "nginx -g \"daemon off;\""]
+# 3. Inject Versioning for the /readiness endpoint from package.json using base image
+COPY package.json .
 
-EXPOSE 8080
+# - env.sh      (Inherited from base image at /usr/share/nginx/html/env.sh)
+# - USER 1001   (Inherited from base image)
+# - EXPOSE 8080 (Inherited from base image)
+# - ENTRYPOINT/CMD (Inherited from base image)