Merge pull request #730 from freeCodeCamp/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.devcontainer/devcontainer.json

@@ -0,0 +1,25 @@
+{
+  "name": "freeCodeCampDC",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "devcontainer",
+  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+  "forwardPorts": [3000, 8000],
+  "portsAttributes": {
+    "3000": {
+      "label": "API",
+      "onAutoForward": "silent"
+    },
+    "8000": {
+      "label": "Client",
+      "onAutoForward": "notify"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  },
+  "onCreateCommand": "[ ! -f .env ] && cp sample.env .env || true",
+  "updateContentCommand": "pnpm install && pnpm seed",
+  "postAttachCommand": {
+    "instructions": "bash -c 'echo \"\n\n\n Start a new terminal and run \\`pnpm run develop\\` when you are ready.\n\n\n\"'"
+  }
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,49 @@
+services:
+  devcontainer:
+    depends_on:
+      - db
+      - setup
+    image: mcr.microsoft.com/devcontainers/typescript-node:22
+    volumes:
+      - ../..:/workspaces:cached
+    network_mode: service:db
+    command: sleep infinity
+
+  db:
+    image: mongo:8.0
+    container_name: mongodb
+    command: mongod --replSet rs0
+    restart: unless-stopped
+    hostname: mongodb
+    volumes:
+      - db-data:/data/db
+    healthcheck:
+      test: ['CMD', 'mongosh', '--eval', "db.adminCommand('ping')"]
+      interval: 2s
+      retries: 5
+
+  setup:
+    image: mongo:8.0
+    depends_on:
+      db:
+        condition: service_healthy
+    restart: on-failure
+    # This will try to initiate the replica set, until it succeeds twice (i.e. until the replica set is already initialized)
+    command: >
+      mongosh --host mongodb:27017 --eval '
+        var cfg = {
+          _id: "rs0",
+          members: [
+            { _id: 0, host: "mongodb:27017" }
+          ]
+        };
+        try {
+          rs.initiate(cfg);
+        } catch (err) {
+          if(err.codeName !== "AlreadyInitialized") throw err;
+        }
+      '
+
+volumes:
+  db-data:
+    driver: local

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,7 +5,7 @@ Checklist:
 - [ ] I have read and followed the [contribution guidelines](https://contribute.freecodecamp.org).
 - [ ] I have read and followed the [how to open a pull request guide](https://contribute.freecodecamp.org/how-to-open-a-pull-request/).
 - [ ] My pull request targets the `main` branch of freeCodeCamp.
-- [ ] I have tested these changes either locally on my machine, or Gitpod.
+- [ ] I have tested these changes either locally on my machine, or GitHub Codespaces.
 
 <!--If your pull request closes a GitHub issue, replace the XXXXX below with the issue number.-->
 

.github/labeler.yml

@@ -1,25 +1,26 @@
-'scope: docs':
-  - docs/**/*
-
 'scope: curriculum':
-  - curriculum/challenges/**/*
+  - changed-files:
+      - any-glob-to-any-file: curriculum/challenges/**/*
 
 'platform: learn':
-  - client/**/*
+  - changed-files:
+      - any-glob-to-any-file: client/**/*
 
 'platform: api':
-  - api-server/**/*
-  - api/**/*
+  - changed-files:
+      - any-glob-to-any-file: api/**/*
 
 'scope: tools/scripts':
-  - tools/**/*
-  - .github/**/*
-  - utils/**/*
-  - e2e/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - tools/**/*
+          - .github/**/*
+          - utils/**/*
+          - e2e/**/*
 
 'scope: i18n':
-  - any: ['curriculum/challenges/**/*', '!curriculum/challenges/english/**/*']
-  - docs/i18n/**/*
-  - client/i18n/**/*
-  - config/crowdin/**/*
-  - shared/config/i18n/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - client/i18n/**/*
+          - config/crowdin/**/*
+          - shared/config/i18n/**/*

.github/workflows/crowdin-download.client-ui.yml

@@ -14,11 +14,11 @@ env:
 jobs:
   i18n-download-client-ui-translations:
     name: Client
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           token: ${{ secrets.CROWDIN_CAMPERBOT_PAT }}
 

.github/workflows/crowdin-upload.client-ui.yml

@@ -14,11 +14,11 @@ env:
 jobs:
   i18n-upload-client-ui-files:
     name: Client
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Generate Crowdin Config
         uses: freecodecamp/crowdin-action@main

.github/workflows/crowdin-upload.curriculum.yml

@@ -14,11 +14,11 @@ env:
 jobs:
   i18n-upload-curriculum-files:
     name: Learn
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Generate Crowdin Config
         uses: freecodecamp/crowdin-action@main

.github/workflows/curriculum-i18n-submodule.yml

@@ -13,11 +13,11 @@ permissions:
 jobs:
   test-curriculum:
     name: Test Curriculum
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        node-version: [20]
+        node-version: [22]
         # Exclude the languages that we currently run in the full CI suite.
         locale:
           - 'chinese'
@@ -28,19 +28,21 @@ jobs:
           - 'swahili'
 
     steps:
-      - name: Checkout Source Files
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Checkout
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           submodules: 'recursive'
 
-      - name: Setup pnpm
-        uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d #v3.0.0
-
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
         with:
           node-version: ${{ matrix.node-version }}
-          cache: pnpm
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+        id: pnpm-install
+        with:
+          run_install: false
 
       - name: Set Environment variables
         run: |
@@ -65,4 +67,4 @@ jobs:
         env:
           CURRICULUM_LOCALE: ${{ matrix.locale }}
           CLIENT_LOCALE: ${{ matrix.locale }}
-        run: pnpm test:curriculum
+        run: pnpm test:curriculum:content