updating

.eslintignore

@@ -5,4 +5,7 @@ api-server/src/public/**
 api-server/lib/**
 config/i18n.js
 config/certification-settings.js
+config/donation-settings.js
+config/superblock-order.js
 web/**
+docs/**/*.md

.eslintrc.json

@@ -38,7 +38,16 @@
     "import/order": "error",
     "import/no-cycle": [2, { "maxDepth": 2 }],
     "react/prop-types": "off",
-    "no-only-tests/no-only-tests": "error"
+    "no-only-tests/no-only-tests": "error",
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": [
+      "warn",
+      {
+        "argsIgnorePattern": "^_",
+        "varsIgnorePattern": "^_",
+        "caughtErrorsIgnorePattern": "^_"
+      }
+    ]
   },
   "overrides": [
     {
@@ -51,7 +60,8 @@
           "./tools/ui-components/tsconfig.json",
           "./utils/tsconfig.json",
           "./web/tsconfig.json",
-          "./curriculum-server/tsconfig.json"
+          "./curriculum-server/tsconfig.json",
+          "./cypress/tsconfig.json"
         ]
       },
       "extends": [

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,10 +2,10 @@ Checklist:
 
 <!-- Please follow this checklist and put an x in each of the boxes, like this: [x]. It will ensure that our team takes your pull request seriously. -->
 
-- [] I have read [freeCodeCamp's contribution guidelines](https://contribute.freecodecamp.org).
-- [] My pull request has a descriptive title (not a vague title like `Update index.md`)
-- [] My pull request targets the `main` branch of freeCodeCamp.
-- [] I have tested these changes either locally on my machine, or GitPod.
+- [ ] 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.
 
 <!--If your pull request closes a GitHub issue, replace the XXXXX below with the issue number.-->
 

.github/labeler.yml

@@ -9,6 +9,7 @@
 
 'platform: api':
   - api-server/**/*
+  - api/**/*
 
 'scope: tools/scripts':
   - cypress/**/*
@@ -22,4 +23,3 @@
   - client/i18n/**/*
   - config/crowdin/**/*
   - config/i18n/**/*
-  - tools/crowdin/**/*

.github/workflows/codeql-analysis.yml

@@ -1,13 +1,15 @@
 name: CI - Run CodeQL Analysis
 on:
   push:
-    branches: [main]
     paths-ignore:
       - 'docs/**'
+    branches:
+      - 'main'
   pull_request:
-    branches: [main]
     paths-ignore:
       - 'docs/**'
+    branches:
+      - 'main'
 
 permissions:
   contents: read
@@ -30,10 +32,10 @@ jobs:
         language: ['javascript']
     steps:
       - name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
       - name: Setup CodeQL
-        uses: github/codeql-action/init@aacfdb2143271bef44adf6400251bdce32a5dd9a # tag=v1
+        uses: github/codeql-action/init@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2
         with:
           languages: ${{ matrix.language }}
       - name: Perform Analysis
-        uses: github/codeql-action/analyze@aacfdb2143271bef44adf6400251bdce32a5dd9a # tag=v1
+        uses: github/codeql-action/analyze@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2

.github/workflows/codesee-diagram.yml

@@ -9,76 +9,15 @@ on:
       - 'docs/**'
     types: [opened, synchronize, reopened]
 
+permissions: read-all
+
 jobs:
-  test_map_action:
+  codesee:
     runs-on: ubuntu-20.04
     if: ${{ github.actor != 'renovate[bot]' && github.actor != 'camperbot' }}
     continue-on-error: true
-    name: Run CodeSee Map Analysis
+    name: Analyze the repo with CodeSee
     steps:
-      - name: checkout
-        id: checkout
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
-        with:
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
-          fetch-depth: 0
-
-      # codesee-detect-languages has an output with id languages.
-      - name: Detect Languages
-        id: detect-languages
-        uses: Codesee-io/codesee-detect-languages-action@latest
-
-      - name: Configure JDK 16
-        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
-        if: ${{ fromJSON(steps.detect-languages.outputs.languages).java }}
-        with:
-          java-version: '16'
-          distribution: 'zulu'
-
-      # CodeSee Maps Go support uses a static binary so there's no setup step required.
-
-      - name: Configure Node.js 16
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # tag=v3
-        if: ${{ fromJSON(steps.detect-languages.outputs.languages).javascript }}
-        with:
-          node-version: '16'
-
-      - name: Configure Python 3.x
-        uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # tag=v4
-        if: ${{ fromJSON(steps.detect-languages.outputs.languages).python }}
-        with:
-          python-version: '3.x'
-          architecture: 'x64'
-
-      - name: Configure Ruby '3.x'
-        uses: ruby/setup-ruby@v1
-        if: ${{ fromJSON(steps.detect-languages.outputs.languages).ruby }}
-        with:
-          ruby-version: '3.0'
-
-      # CodeSee Maps Rust support uses a static binary so there's no setup step required.
-
-      - name: Generate Map
-        id: generate-map
-        uses: Codesee-io/codesee-map-action@latest
-        with:
-          step: map
-          github_ref: ${{ github.ref }}
-          languages: ${{ steps.detect-languages.outputs.languages }}
-
-      - name: Upload Map
-        id: upload-map
-        uses: Codesee-io/codesee-map-action@latest
-        with:
-          step: mapUpload
-          api_token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}
-          github_ref: ${{ github.ref }}
-
-      - name: Insights
-        id: insights
-        uses: Codesee-io/codesee-map-action@latest
+      - uses: Codesee-io/codesee-action@1d109bb07bbd63a6fc3d01b40d28a4c8f0925bf5 # tag=v2
         with:
-          step: insights
-          api_token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}
-          github_ref: ${{ github.ref }}
+          codesee-token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}

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

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
           token: ${{ secrets.CROWDIN_CAMPERBOT_PAT }}
 

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

@@ -17,12 +17,12 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
       fail-fast: true
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
           token: ${{ secrets.CROWDIN_CAMPERBOT_PAT }}
 
@@ -278,10 +278,9 @@ jobs:
       # All languages should go ABOVE this. #
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # tag=v3
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: 'npm'
 
       - name: Set Environment variables
         run: |

.github/workflows/crowdin-download.docs.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
           token: ${{ secrets.CROWDIN_CAMPERBOT_PAT }}
 

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

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Generate Crowdin Config
         uses: freecodecamp/crowdin-action@main

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

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Generate Crowdin Config
         uses: freecodecamp/crowdin-action@main

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

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Generate Crowdin Config
         uses: freecodecamp/crowdin-action@main

.github/workflows/e2e-mobile.yml

@@ -4,40 +4,45 @@ on:
   # push:
   #   paths-ignore:
   #     - 'docs/**'
-  #   branches-ignore:
-  #     - 'renovate/**'
+  #   branches:
+  #     - 'main'
   # pull_request:
   #   paths-ignore:
   #     - 'docs/**'
+  #   branches:
+  #     - 'main'
+  #     - 'next-**'
 
 jobs:
   mobile-test:
     name: Test curriculum for mobile app
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        node-version: [18.x]
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Checkout mobile
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
           repository: freeCodeCamp/mobile
           path: mobile
 
-      - name: Use Node.js 16.x
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # tag=v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
         with:
-          node-version: 16.x
-          cache: 'npm'
+          node-version: ${{ matrix.node-version }}
 
-      - name: Setup Flutter 3.0.x
+      - name: Setup Flutter 3.3.x
         uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # tag=v2
         with:
-          flutter-version: '3.0.x'
+          flutter-version: '3.3.x'
           channel: 'stable'
           cache: true
-          cache-key: flutter-3.0.x
+          cache-key: flutter-3.3.x
           cache-path: ${{ runner.tool_cache }}/flutter
 
       - name: Set freeCodeCamp Environment Variables
@@ -58,16 +63,15 @@ jobs:
           flutter test test/widget_test.dart
 
       - name: Cypress run
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         with:
           record: ${{ env.CYPRESS_RECORD_KEY != 0 }}
           start: npx serve
           wait-on: http://localhost:3000
           wait-on-timeout: 1200
           config: retries=1,screenshotOnRunFailure=false,video=false,baseUrl=http://localhost:3000/mobile/mobile-app/generated-tests/
           browser: chrome
-          headless: true
-          spec: cypress/integration/mobile-learn/test-challenges.js
+          spec: cypress/e2e/mobile-learn/test-challenges.js
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/e2e-third-party.yml

@@ -5,17 +5,20 @@ name: CI - E2E - 3rd party donation tests
 on:
   push:
     branches:
-      - 'prod-*'
+      - 'prod-**'
     paths-ignore:
       - 'docs/**'
 
 jobs:
   do-everything:
     name: Build & Test
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        node-version: [18.x]
     services:
       mongodb:
-        image: mongo:4
+        image: mongo:4.4
         ports:
           - 27017:27017
       # We need mailhog to catch any emails the api tries to send.
@@ -26,19 +29,18 @@ jobs:
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Checkout client-config
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
           repository: freeCodeCamp/client-config
           path: client-config
 
-      - name: Use Node.js 16.x
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # tag=v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
         with:
-          node-version: 16.x
-          cache: 'npm'
+          node-version: ${{ matrix.node-version }}
 
       - name: Set freeCodeCamp Environment Variables
         run: |
@@ -66,5 +68,5 @@ jobs:
           wait-on-timeout: 1200
           config: baseUrl=http://localhost:8000
           browser: chrome
-          headless: true
-          spec: cypress/e2e/third-party/*.js
+
+          spec: cypress/e2e/third-party/*.{js,ts}