diff --git a/.eslintrc.js b/.eslintrc.js index e0350db2..b4b7e018 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -19,7 +19,6 @@ module.exports = { "plugin:react/recommended", // Uses the recommended rules from @eslint-plugin-react "plugin:@typescript-eslint/recommended", // Uses the recommended rules from @typescript-eslint/eslint-plugin "plugin:@typescript-eslint/recommended-requiring-type-checking", - "prettier/@typescript-eslint", // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier "plugin:prettier/recommended", // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array. ], rules: { diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 007e9cc5..a5b4a91d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: # We are using deprecated functionality. Downgrade Node so we still compile. - uses: actions/setup-node@v6 with: - node-version: 20 + node-version: 22 - name: Install run: | diff --git a/.nvmrc b/.nvmrc index 209e3ef4..2bd5a0a9 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20 +22 diff --git a/cypress/integration/docs.spec.ts b/cypress/integration/docs.spec.ts index 959a2521..4a7147ae 100644 --- a/cypress/integration/docs.spec.ts +++ b/cypress/integration/docs.spec.ts @@ -19,6 +19,7 @@ describe("Documentation Viewer", () => { cy.intercept("GET", "/toitdoc.json", json).as("getDocs"); }); cy.visit("/"); + // eslint-disable-next-line cy.wait("@getDocs"); }); @@ -70,6 +71,7 @@ describe("Documentation Viewer", () => { }); Cypress.config("defaultCommandTimeout", 30000); cy.visit("/"); + // eslint-disable-next-line cy.wait("@getDocs"); cy.get(".MuiCircularProgress-root").should("not.exist"); }); @@ -93,6 +95,7 @@ describe("Documentation Viewer", () => { cy.intercept("GET", "/toitdoc.json", json).as("getDocs"); }); cy.visit("/"); + // eslint-disable-next-line cy.wait("@getDocs"); });