Bump yarn to v4.2.2

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 on: [push, pull_request]
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.CI_AWS_CLIENT_ID }}
-  AWS_DEFAULT_REGION: 'eu-west-1'
+  AWS_DEFAULT_REGION: "eu-west-1"
   AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_AWS_CLIENT_SECRET }}
   NDLA_AWS_ECR_REPO: ${{ secrets.NDLA_AWS_ECR_REPO }}
   CI_RELEASE_ROLE: ${{ secrets.CI_RELEASE_ROLE }}
@@ -16,35 +16,39 @@ env:
   GH_PR_SHA: ${{ github.event.pull_request.head.sha }}
 jobs:
   unit_tests:
-    name: 'Unit tests'
+    name: "Unit tests"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '20.13.1'
-      - name: 'Login to ECR repo'
-        run:
-          RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login)
+          node-version: "20.13.1"
+      - name: "Login to ECR repo"
+        run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login)
           AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId)
           AWS_SECRET_ACCESS_KEY=$(echo $RES | jq -r .Credentials.SecretAccessKey)
           AWS_SESSION_TOKEN=$(echo $RES | jq -r .Credentials.SessionToken)
           aws ecr get-login-password --region eu-central-1 | docker login --username AWS --password-stdin $NDLA_AWS_ECR_REPO
-      - name: 'Login to dockerhub'
+      - name: "Login to dockerhub"
         run: echo $DOCKER_HUB_PASSWORD | docker login --username $DOCKER_HUB_USERNAME --password-stdin
+      - name: "Enable yarn v4"
+        run: |
+          corepack enable
+          yarn set version 4.2.2
       - uses: actions/cache@v3
         with:
           path: |
             **/node_modules
             .eslintcache
+            .yarn/cache
             ~/.npm
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-      - name: 'Install'
-        run: yarn install --frozen-lockfile
-      - name: 'Check-all'
+      - name: "Install"
+        run: yarn install --immutable
+      - name: "Check-all"
         run: yarn check-all
-      - name: 'Build'
+      - name: "Build"
         run: yarn build
-      - name: 'Deploy vercel build'
+      - name: "Deploy vercel build"
         run: yarn ndla-scripts vercel-github
         continue-on-error: true

.gitignore

@@ -15,3 +15,4 @@ scripts/.cache/
 .vscode
 .env
 .vercel
+/.yarn/

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

Dockerfile

@@ -4,11 +4,14 @@ ENV HOME=/home/app
 ENV APP_PATH=$HOME/listing-frontend
 
 # Copy necessary files for installing dependencies
-COPY yarn.lock package.json $APP_PATH/
+COPY yarn.lock package.json .yarnrc.yml $APP_PATH/
+
+# Enable yarn
+RUN corepack enable
 
 # Run yarn before src copy to enable better layer caching
 WORKDIR $APP_PATH
-RUN mkdir -p $APP_PATH/build && yarn
+RUN mkdir -p $APP_PATH/build && yarn install --immutable
 
 # Copy necessary source files for server and client build
 COPY .babelrc postcss.config.js tsconfig.json $APP_PATH/

package.json

@@ -118,8 +118,8 @@
     "graphql": "^15.5.0",
     "helmet": "^4.2.0",
     "i18next": "^21.9.2",
-    "node-fetch": "^2.6.7",
     "lodash": "^4.17.21",
+    "node-fetch": "^2.6.7",
     "process": "^0.11.10",
     "query-string": "^6.10.1",
     "react": "^17.0.2",
@@ -140,5 +140,6 @@
   },
   "homepage": "https://github.com/NDLANO/listing-frontend",
   "author": "ndla@knowit.no",
-  "license": "GPL-3.0"
+  "license": "GPL-3.0",
+  "packageManager": "yarn@4.2.2"
 }

scripts/build.ts

@@ -6,7 +6,7 @@
  */
 
 import chalk from "chalk";
-import { rmSync } from "fs";
+import { rmSync, copyFile } from "fs";
 import { resolve } from "path";
 import webpack, { Stats, StatsCompilation, Configuration, StatsError } from "webpack";
 import getConfig from "../webpack/getConfig";
@@ -61,6 +61,9 @@ const main = async () => {
   rmSync(resolve("./build"), { recursive: true, force: true });
   await build(clientConfig, "client");
   await build(serverConfig, "server");
+  await copyFile(resolve("build/assets.json"), resolve("build/public/static/assets.json"), (err) => {
+    if (err) throw err;
+  });
 };
 
 const compile = (