From 77c8f460164c7bc143a7657a3e7366c9fd49736b Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Thu, 6 Oct 2022 22:39:55 -0400 Subject: [PATCH 1/9] chore: allowed Cypress to bump to ^10.9.0 --- .github/dependabot.yml | 2 - packages/website/package.json | 2 +- yarn.lock | 82 ++++++++++++++++------------------- 3 files changed, 38 insertions(+), 48 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6f306092e368..d74dda07865e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,5 +13,3 @@ updates: schedule: interval: weekly day: monday - ignore: - - dependency-name: cypress diff --git a/packages/website/package.json b/packages/website/package.json index 6f573a0dbb10..dcc6adf5aed3 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -49,7 +49,7 @@ "@types/react-router-dom": "^5.3.3", "@typescript-eslint/eslint-plugin": "5.39.0", "copy-webpack-plugin": "^11.0.0", - "cypress": "8.3.0", + "cypress": "^10.9.0", "cypress-axe": "^0.14.0", "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-react": "^7.29.4", diff --git a/yarn.lock b/yarn.lock index 1d92b449d6a4..c2ea2fa1afa6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1580,7 +1580,7 @@ dependencies: "@cspotcode/source-map-consumer" "0.8.0" -"@cypress/request@^2.88.5": +"@cypress/request@^2.88.10": version "2.88.10" resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce" integrity sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg== @@ -4647,10 +4647,10 @@ "@types/mime" "^1" "@types/node" "*" -"@types/sinonjs__fake-timers@^6.0.2": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz#0ecc1b9259b76598ef01942f547904ce61a6a77d" - integrity sha512-IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A== +"@types/sinonjs__fake-timers@8.1.1": + version "8.1.1" + resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3" + integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g== "@types/sizzle@^2.3.2": version "2.3.3" @@ -5623,7 +5623,7 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -buffer@^5.5.0: +buffer@^5.5.0, buffer@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -5983,7 +5983,7 @@ cli-spinners@^2.5.0: resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a" integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw== -cli-table3@^0.6.2, cli-table3@~0.6.0: +cli-table3@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a" integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw== @@ -5992,6 +5992,15 @@ cli-table3@^0.6.2, cli-table3@~0.6.0: optionalDependencies: "@colors/colors" "1.5.0" +cli-table3@~0.6.1: + version "0.6.3" + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2" + integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg== + dependencies: + string-width "^4.2.0" + optionalDependencies: + "@colors/colors" "1.5.0" + cli-truncate@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" @@ -6741,30 +6750,31 @@ cypress-axe@^0.14.0: resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-0.14.0.tgz#5f5e70fb36b8cb3ba73a8ba01e9262ff1268d5e2" integrity sha512-7Rdjnko0MjggCmndc1wECAkvQBIhuy+DRtjF7bd5YPZRFvubfMNvrxfqD8PWQmxm7MZE0ffS4Xr43V6ZmvLopg== -cypress@8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.3.0.tgz#ba906d2170888073ad94b2be1b994a749bbb7c7d" - integrity sha512-zA5Rcq8AZIfRfPXU0CCcauofF+YpaU9HYbfqkunFTmFV0Kdlo14tNjH2E3++MkjXKFnv3/pXq+HgxWtw8CSe8Q== +cypress@^10.9.0: + version "10.9.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.9.0.tgz#273a61a6304766f9d6423e5ac8d4a9a11ed8b485" + integrity sha512-MjIWrRpc+bQM9U4kSSdATZWZ2hUqHGFEQTF7dfeZRa4MnalMtc88FIE49USWP2ZVtfy5WPBcgfBX+YorFqGElA== dependencies: - "@cypress/request" "^2.88.5" + "@cypress/request" "^2.88.10" "@cypress/xvfb" "^1.2.4" "@types/node" "^14.14.31" - "@types/sinonjs__fake-timers" "^6.0.2" + "@types/sinonjs__fake-timers" "8.1.1" "@types/sizzle" "^2.3.2" arch "^2.2.0" blob-util "^2.0.2" bluebird "^3.7.2" + buffer "^5.6.0" cachedir "^2.3.0" chalk "^4.1.0" check-more-types "^2.24.0" cli-cursor "^3.1.0" - cli-table3 "~0.6.0" + cli-table3 "~0.6.1" commander "^5.1.0" common-tags "^1.8.0" dayjs "^1.10.4" debug "^4.3.2" enquirer "^2.3.6" - eventemitter2 "^6.4.3" + eventemitter2 "6.4.7" execa "4.1.0" executable "^4.1.1" extract-zip "2.0.1" @@ -6777,15 +6787,15 @@ cypress@8.3.0: listr2 "^3.8.3" lodash "^4.17.21" log-symbols "^4.0.0" - minimist "^1.2.5" + minimist "^1.2.6" ospath "^1.2.2" pretty-bytes "^5.6.0" - ramda "~0.27.1" + proxy-from-env "1.0.0" request-progress "^3.0.0" + semver "^7.3.2" supports-color "^8.1.1" tmp "~0.2.1" untildify "^4.0.0" - url "^0.11.0" yauzl "^2.10.0" d@1, d@^1.0.1: @@ -7705,10 +7715,10 @@ event-emitter@^0.3.5: d "1" es5-ext "~0.10.14" -eventemitter2@^6.4.3: - version "6.4.5" - resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.5.tgz#97380f758ae24ac15df8353e0cc27f8b95644655" - integrity sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw== +eventemitter2@6.4.7: + version "6.4.7" + resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d" + integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg== eventemitter3@^4.0.0, eventemitter3@^4.0.4: version "4.0.7" @@ -12460,6 +12470,11 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" +proxy-from-env@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" + integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A== + psl@^1.1.28: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" @@ -12473,11 +12488,6 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= - punycode@^1.3.2: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" @@ -12517,11 +12527,6 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= - queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -12539,11 +12544,6 @@ quick-lru@^4.0.1: resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== -ramda@~0.27.1: - version "0.27.1" - resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9" - integrity sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw== - randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -14723,14 +14723,6 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= - dependencies: - punycode "1.3.2" - querystring "0.2.0" - use-composed-ref@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.1.0.tgz#9220e4e94a97b7b02d7d27eaeab0b37034438bbc" From 72389f582a49bae99f77b4fa70064ccdaf5c7f8f Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Fri, 7 Oct 2022 12:16:22 -0400 Subject: [PATCH 2/9] Switch config to cypress.config.ts --- packages/website/cypress.config.ts | 7 +++++++ packages/website/cypress.json | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 packages/website/cypress.config.ts delete mode 100644 packages/website/cypress.json diff --git a/packages/website/cypress.config.ts b/packages/website/cypress.config.ts new file mode 100644 index 000000000000..9986be2e5948 --- /dev/null +++ b/packages/website/cypress.config.ts @@ -0,0 +1,7 @@ +import { defineConfig } from 'cypress'; + +export default defineConfig({ + e2e: { + baseUrl: 'http://localhost:1234', + }, +}); diff --git a/packages/website/cypress.json b/packages/website/cypress.json deleted file mode 100644 index 904719148b0f..000000000000 --- a/packages/website/cypress.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "baseUrl": "http://localhost:3000", - "fixturesFolder": false, - "pageLoadTimeout": 600000 -} From 5816a635b99bf08983f484fa34c75a4c655c56d4 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Sun, 9 Oct 2022 23:32:31 -0400 Subject: [PATCH 3/9] Remove from renovate.json, and bump github-action --- .github/renovate.json | 1 - .github/workflows/ci.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index afa6e92523af..3ee88f6812b6 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,7 +1,6 @@ { "automerge": true, "enabledManagers": ["github-actions", "npm"], - "ignoreDeps": ["cypress"], "internalChecksFilter": "strict", "labels": ["dependencies"], "packageRules": [ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d47090d6344..f7d02f48fd4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -198,7 +198,7 @@ jobs: - env: DEBUG: '@cypress/github-action' name: Cypress run - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v4 with: project: ./packages/website start: yarn start From 80c441fef38843c4be5ae83ed066427c52b0d2cb Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 12 Oct 2022 21:00:27 -0400 Subject: [PATCH 4/9] Fix name of support/(index|e2e).js --- packages/website/cypress/support/{index.js => e2e.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/website/cypress/support/{index.js => e2e.js} (100%) diff --git a/packages/website/cypress/support/index.js b/packages/website/cypress/support/e2e.js similarity index 100% rename from packages/website/cypress/support/index.js rename to packages/website/cypress/support/e2e.js From eea5541473a218fb9f97dee2202bcfc22b1da52c Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 12 Oct 2022 21:16:01 -0400 Subject: [PATCH 5/9] Fix baseUrl, and linting --- packages/website/cypress.config.ts | 2 +- .../website/cypress/support/{commands.js => commands.ts} | 0 packages/website/cypress/support/{e2e.js => e2e.ts} | 0 packages/website/tsconfig.json | 7 ++++++- 4 files changed, 7 insertions(+), 2 deletions(-) rename packages/website/cypress/support/{commands.js => commands.ts} (100%) rename packages/website/cypress/support/{e2e.js => e2e.ts} (100%) diff --git a/packages/website/cypress.config.ts b/packages/website/cypress.config.ts index 9986be2e5948..5bed49b885ee 100644 --- a/packages/website/cypress.config.ts +++ b/packages/website/cypress.config.ts @@ -2,6 +2,6 @@ import { defineConfig } from 'cypress'; export default defineConfig({ e2e: { - baseUrl: 'http://localhost:1234', + baseUrl: 'http://localhost:3000', }, }); diff --git a/packages/website/cypress/support/commands.js b/packages/website/cypress/support/commands.ts similarity index 100% rename from packages/website/cypress/support/commands.js rename to packages/website/cypress/support/commands.ts diff --git a/packages/website/cypress/support/e2e.js b/packages/website/cypress/support/e2e.ts similarity index 100% rename from packages/website/cypress/support/e2e.js rename to packages/website/cypress/support/e2e.ts diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json index 429f1794b91d..ddecd7d2794f 100644 --- a/packages/website/tsconfig.json +++ b/packages/website/tsconfig.json @@ -14,9 +14,14 @@ "paths": { "@site/*": ["./*"] }, - "types": ["@docusaurus/module-type-aliases", "@docusaurus/theme-classic"] + "types": [ + "@docusaurus/module-type-aliases", + "@docusaurus/theme-classic", + "cypress" + ] }, "include": [ + "cypress/", "src/", "plugins/", "typings", From 380322b6b02f5fae170f6096d4b11ed2978edd02 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 12 Oct 2022 21:16:20 -0400 Subject: [PATCH 6/9] One more ESLint fix for the website --- packages/website/tsconfig.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json index ddecd7d2794f..8213f87db094 100644 --- a/packages/website/tsconfig.json +++ b/packages/website/tsconfig.json @@ -20,12 +20,5 @@ "cypress" ] }, - "include": [ - "cypress/", - "src/", - "plugins/", - "typings", - "./docusaurusConfig.ts", - "./rulesMeta.ts" - ] + "include": ["cypress/", "src/", "plugins/", "typings", "./*.ts"] } From baa1929c212866c6cdd6bdff5f626ce4b2ccb7f0 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 12 Oct 2022 21:30:25 -0400 Subject: [PATCH 7/9] Correct .cy.js path --- .../cypress/{integration/index.spec.js => e2e/index.cy.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/website/cypress/{integration/index.spec.js => e2e/index.cy.js} (100%) diff --git a/packages/website/cypress/integration/index.spec.js b/packages/website/cypress/e2e/index.cy.js similarity index 100% rename from packages/website/cypress/integration/index.spec.js rename to packages/website/cypress/e2e/index.cy.js From e3e77c885a638d071b67da46a7eb3e94dcc0c9d8 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 12 Oct 2022 21:51:42 -0400 Subject: [PATCH 8/9] wait-on --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7d02f48fd4f..5bdb2071512d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -202,6 +202,7 @@ jobs: with: project: ./packages/website start: yarn start + wait-on: 'http://localhost:3000' - uses: actions/upload-artifact@v3 with: From 8125ec2af6999e36206bed61634745f1e4d929ab Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 12 Oct 2022 22:03:02 -0400 Subject: [PATCH 9/9] Try Accept-Encoding --- packages/website/cypress/e2e/index.cy.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/website/cypress/e2e/index.cy.js b/packages/website/cypress/e2e/index.cy.js index 250878da7951..ba1c16e971bc 100644 --- a/packages/website/cypress/e2e/index.cy.js +++ b/packages/website/cypress/e2e/index.cy.js @@ -2,7 +2,11 @@ import { checkAccessibility } from '../utils'; describe('Index', () => { it('has no accessibility issues detected by aXe', () => { - cy.visit('/'); + cy.visit('/', { + headers: { + 'Accept-Encoding': 'gzip, deflate, br', + }, + }); cy.injectAxe(); // 1. Check accessibility in default, light mode