diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bf2b3bc91..06804598c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,48 +2,48 @@ // https://github.com/microsoft/vscode-dev-containers/blob/main/containers/javascript-node-postgres/.devcontainer/devcontainer.json { - "name": "Node.js & PostgreSQL", - "dockerComposeFile": "docker-compose.yml", - "service": "app", - "workspaceFolder": "/workspace", - "features": { - "ghcr.io/devcontainers/features/common-utils:2": { - "installZsh": "true", - "username": "node", - "upgradePackages": "true" - }, - "ghcr.io/devcontainers/features/node:1": { - "version": "none" - }, - "ghcr.io/devcontainers/features/git:1": { - "version": "latest", - "ppa": "false" - } - }, + "name": "Node.js & PostgreSQL", + "dockerComposeFile": "docker-compose.yml", + "service": "app", + "workspaceFolder": "/workspace", + "features": { + "ghcr.io/devcontainers/features/common-utils:2": { + "installZsh": "true", + "username": "node", + "upgradePackages": "true" + }, + "ghcr.io/devcontainers/features/node:1": { + "version": "none" + }, + "ghcr.io/devcontainers/features/git:1": { + "version": "latest", + "ppa": "false" + } + }, - // Configure tool-specific properties. - "customizations": { - // Configure properties specific to VS Code. - "vscode": { - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode", - "ms-vsliveshare.vsliveshare" - ] - } - }, + // Configure tool-specific properties. + "customizations": { + // Configure properties specific to VS Code. + "vscode": { + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode", + "ms-vsliveshare.vsliveshare" + ] + } + }, - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // This can be used to network with other containers or with the host. - "forwardPorts": [3001, 3002, 5432, 5555], + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // This can be used to network with other containers or with the host. + "forwardPorts": [3001, 3002, 5432, 5555], - // Use 'postCreateCommand' to run commands after the container is created. - // "postCreateCommand": "yarn install", + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "yarn install", - // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "node", + // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "node", - "postCreateCommand": "./.devcontainer/postCreateCommand.sh", - "postAttachCommand": "./codespace-instructions.sh" + "postCreateCommand": "./.devcontainer/postCreateCommand.sh", + "postAttachCommand": "./codespace-instructions.sh" } diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 6b7d3c5e2..000000000 --- a/.eslintignore +++ /dev/null @@ -1,3 +0,0 @@ -# Comment out the line below to run Prettier against the files in the final build -dist/ -package-lock.json diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index dc141a9ae..000000000 --- a/.eslintrc.js +++ /dev/null @@ -1,28 +0,0 @@ -module.exports = { - env: { - node: true, - browser: true, - commonjs: true, - es6: true - }, - overrides: [ - { - files: ['*.js', '*.jsx'] - } - ], - extends: [ - 'eslint:recommended', - 'next/core-web-vitals', - 'plugin:cypress/recommended', - 'plugin:jest/recommended', - 'prettier' - ], - globals: { - Atomics: 'readonly', - SharedArrayBuffer: 'readonly' - }, - parserOptions: { - ecmaVersion: 2020 - }, - rules: {} -}; diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7118539e1..576e73a45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,16 +9,16 @@ jobs: strategy: matrix: - node-version: [16.14.2] + node-version: [24] steps: - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Setup node - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3 + uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6 with: - node-version: 16.13.x + node-version: ${{ matrix.node-version }} cache: npm - name: Install modules @@ -27,5 +27,8 @@ jobs: - name: Run lint run: npm run lint:code + - name: Run build + run: npm run build + - name: Run tests run: npm run test diff --git a/.gitignore b/.gitignore index 2585d646c..45e9b9ea8 100644 --- a/.gitignore +++ b/.gitignore @@ -140,4 +140,7 @@ yarn-error.log* .vscode # Generated challenge map (built at runtime) -data/challengeMap.json \ No newline at end of file +data/challengeMap.json + +# Docker local overrides +docker-compose.override.yml \ No newline at end of file diff --git a/.husky/pre-commit b/.husky/pre-commit index 36af21989..2312dc587 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - npx lint-staged diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 000000000..a45fd52cc --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +24 diff --git a/README.md b/README.md index e43b7a663..ca1a61db4 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ For FCC Proper integration, install the application locally and use Auth0 for au **Important:** Auth0 callback URLs must exactly match your application URL including the port number. After changing ports, you must update your Auth0 application settings. -**Note: If you have FCC Proper and FCC Classroom set up locally and want to use the same Auth0 application for both, follow [this guide](https://youtu.be/38OwBwQEQz4).** +**Note: If you have FCC Proper and FCC Classroom set up locally and want to use the same Auth0 application for both, follow [this guide](https://youtu.be/38OwBwQEQz4).** ##### Creating an Auth0 Application diff --git a/__tests__/components/__snapshots__/modal.test.jsx.snap b/__tests__/components/__snapshots__/modal.test.jsx.snap index 93d5bf2f4..43a6cdab4 100644 --- a/__tests__/components/__snapshots__/modal.test.jsx.snap +++ b/__tests__/components/__snapshots__/modal.test.jsx.snap @@ -2,11 +2,6 @@ exports[`Modal Component renders header correctly 1`] = `
Welcome
-Welcome
+