diff --git a/.github/workflows/cypress-canary.yml b/.github/workflows/cypress-canary.yml index 6ba293aefc..77a86496aa 100644 --- a/.github/workflows/cypress-canary.yml +++ b/.github/workflows/cypress-canary.yml @@ -7,7 +7,7 @@ on: - main paths: - 'demos/canary/**/*.{js,jsx,ts,tsx}' - - 'cypress/integration/canary/**/*.{ts,js}' + - 'cypress/e2e/canary/**/*.{ts,js}' - 'src/**/*.{ts,js}' jobs: cypress: @@ -56,15 +56,15 @@ jobs: - name: Cypress run if: ${{ steps.deploy.outputs.origin-url }} id: cypress - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v5 with: browser: chrome headless: true record: true parallel: true - config-file: cypress/config/canary.json + config-file: cypress/config/canary.config.ts group: 'Next Runtime - Demo Canary' - spec: cypress/integration/canary/* + spec: cypress/e2e/canary/* env: DEBUG: '@cypress/github-action' CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }} diff --git a/.github/workflows/cypress-demo-nx.yml b/.github/workflows/cypress-demo-nx.yml index 48c498f94d..1ff83f7dc1 100644 --- a/.github/workflows/cypress-demo-nx.yml +++ b/.github/workflows/cypress-demo-nx.yml @@ -7,7 +7,7 @@ on: - main paths: - 'demos/nx-next-monorepo-demo/**/*.{js,jsx,ts,tsx}' - - 'cypress/integration/nx/**/*.{ts,js}' + - 'cypress/e2e/nx/**/*.{ts,js}' - 'src/**/*.{ts,js}' jobs: cypress: @@ -56,15 +56,15 @@ jobs: - name: Cypress run if: ${{ steps.deploy.outputs.origin-url }} id: cypress - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v5 with: browser: chrome headless: true record: true parallel: true - config-file: cypress/config/nx-demo.json + config-file: cypress/config/nx-demo.config.ts group: 'Next Runtime - Demo NX' - spec: cypress/integration/nx/* + spec: cypress/e2e/nx/* env: DEBUG: '@cypress/github-action' CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }} diff --git a/.github/workflows/cypress-demo-static.yml b/.github/workflows/cypress-demo-static.yml index 586920b514..23545a8ead 100644 --- a/.github/workflows/cypress-demo-static.yml +++ b/.github/workflows/cypress-demo-static.yml @@ -7,7 +7,7 @@ on: - main paths: - 'demos/static-root/**/*.{js,jsx,ts,tsx}' - - 'cypress/integration/static/**/*.{ts,js}' + - 'cypress/e2e/static/**/*.{ts,js}' - 'src/**/*.{ts,js}' jobs: cypress: @@ -56,15 +56,15 @@ jobs: - name: Cypress run if: ${{ steps.deploy.outputs.origin-url }} id: cypress - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v5 with: browser: chrome headless: true record: true parallel: true - config-file: cypress/config/static-root.json + config-file: cypress/config/static-root.config.ts group: 'Next Runtime - Demo Static' - spec: cypress/integration/static-root/* + spec: cypress/e2e/static-root/* env: DEBUG: '@cypress/github-action' CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }} diff --git a/.github/workflows/cypress-demo.yml b/.github/workflows/cypress-demo.yml index 41666d0b72..2f481fba01 100644 --- a/.github/workflows/cypress-demo.yml +++ b/.github/workflows/cypress-demo.yml @@ -7,7 +7,7 @@ on: - main paths: - 'demos/default/**/*.{js,jsx,ts,tsx}' - - 'cypress/integration/default/**/*.{ts,js}' + - 'cypress/e2e/default/**/*.{ts,js}' - 'src/**/*.{ts,js}' jobs: cypress: @@ -56,15 +56,15 @@ jobs: - name: Cypress run if: ${{ steps.deploy.outputs.origin-url }} id: cypress - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v5 with: browser: chrome headless: true record: true parallel: true - config-file: cypress/config/ci.json + config-file: cypress/config/ci.config.ts group: 'Next Runtime - Demo' - spec: cypress/integration/default/* + spec: cypress/e2e/default/* env: DEBUG: '@cypress/github-action' CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }} diff --git a/.github/workflows/cypress-middleware.yml b/.github/workflows/cypress-middleware.yml index eb4611dbd9..4ac13ee1c6 100644 --- a/.github/workflows/cypress-middleware.yml +++ b/.github/workflows/cypress-middleware.yml @@ -7,7 +7,7 @@ on: - main paths: - 'demos/middleware/**/*.{js,jsx,ts,tsx}' - - 'cypress/integration/middleware/**/*.{ts,js}' + - 'cypress/e2e/middleware/**/*.{ts,js}' - 'src/**/*.{ts,js}' jobs: cypress: @@ -56,15 +56,15 @@ jobs: - name: Cypress run if: ${{ steps.deploy.outputs.origin-url }} id: cypress - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v5 with: browser: chrome headless: true record: true parallel: true - config-file: cypress/config/middleware.json + config-file: cypress/config/middleware.config.ts group: 'Next Runtime - Middleware' - spec: cypress/integration/middleware/* + spec: cypress/e2e/middleware/* env: DEBUG: '@cypress/github-action' CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }} diff --git a/cypress/config/all.config.ts b/cypress/config/all.config.ts new file mode 100644 index 0000000000..bc0b2ad48d --- /dev/null +++ b/cypress/config/all.config.ts @@ -0,0 +1,8 @@ +import { defineConfig } from 'cypress' + +export default defineConfig({ + video: false, + e2e: { + baseUrl: 'http://localhost:3000', + }, +}) diff --git a/cypress/config/all.json b/cypress/config/all.json deleted file mode 100644 index e3093e146e..0000000000 --- a/cypress/config/all.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "video": false, - "baseUrl": "http://localhost:3000" -} \ No newline at end of file diff --git a/cypress/config/canary.config.ts b/cypress/config/canary.config.ts new file mode 100644 index 0000000000..cd6725a6fb --- /dev/null +++ b/cypress/config/canary.config.ts @@ -0,0 +1,10 @@ +import { defineConfig } from 'cypress' + +export default defineConfig({ + e2e: { + baseUrl: 'http://localhost:3000', + // integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder + "specPattern": "cypress/e2e/canary", + "projectId": "5zbkdv" + }, +}) diff --git a/cypress/config/canary.json b/cypress/config/canary.json deleted file mode 100644 index b19a833549..0000000000 --- a/cypress/config/canary.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "baseUrl": "http://localhost:3000", - "integrationFolder": "cypress/integration/canary", - "projectId": "5zbkdv" -} diff --git a/cypress/config/ci.config.ts b/cypress/config/ci.config.ts new file mode 100644 index 0000000000..b33eb47f99 --- /dev/null +++ b/cypress/config/ci.config.ts @@ -0,0 +1,10 @@ +import { defineConfig } from 'cypress' + +export default defineConfig({ + e2e: { + baseUrl: 'http://localhost:3000', + // integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder + "specPattern": "cypress/e2e/default", + "projectId": "66va58" + }, +}) \ No newline at end of file diff --git a/cypress/config/ci.json b/cypress/config/ci.json deleted file mode 100644 index 7d2ef0c958..0000000000 --- a/cypress/config/ci.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "baseUrl": "http://localhost:3000", - "integrationFolder": "cypress/integration/default", - "projectId": "66va58" -} \ No newline at end of file diff --git a/cypress/config/middleware.config.ts b/cypress/config/middleware.config.ts new file mode 100644 index 0000000000..2bb67bf689 --- /dev/null +++ b/cypress/config/middleware.config.ts @@ -0,0 +1,10 @@ +import { defineConfig } from 'cypress' + +export default defineConfig({ + e2e: { + baseUrl: 'http://localhost:8888', + // integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder + "specPattern": "cypress/e2e/middleware", + "projectId": "yn8qwi" + }, +}) diff --git a/cypress/config/middleware.json b/cypress/config/middleware.json deleted file mode 100644 index c81506ae4b..0000000000 --- a/cypress/config/middleware.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "baseUrl": "http://localhost:8888", - "integrationFolder": "cypress/integration/middleware", - "projectId": "yn8qwi" -} diff --git a/cypress/config/nx-demo.config.ts b/cypress/config/nx-demo.config.ts new file mode 100644 index 0000000000..6f56e5bebe --- /dev/null +++ b/cypress/config/nx-demo.config.ts @@ -0,0 +1,10 @@ +import { defineConfig } from 'cypress' + +export default defineConfig({ + e2e: { + baseUrl: 'http://localhost:4200', + // integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder + "specPattern": "cypress/e2e/nx", + "projectId": "ijcdpo" + }, +}) diff --git a/cypress/config/nx-demo.json b/cypress/config/nx-demo.json deleted file mode 100644 index 61105cf2d8..0000000000 --- a/cypress/config/nx-demo.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "baseUrl": "http://localhost:4200", - "integrationFolder": "cypress/integration/nx", - "projectId": "ijcdpo" -} \ No newline at end of file diff --git a/cypress/config/static-root.config.ts b/cypress/config/static-root.config.ts new file mode 100644 index 0000000000..038d38c619 --- /dev/null +++ b/cypress/config/static-root.config.ts @@ -0,0 +1,11 @@ +import { defineConfig } from 'cypress' + +export default defineConfig({ + e2e: { + baseUrl: 'http://localhost:3000', + // integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder + "specPattern": "cypress/e2e/static-root", + "projectId": "3tvrbe" + }, +}) + diff --git a/cypress/config/static-root.json b/cypress/config/static-root.json deleted file mode 100644 index a1fdbfc88a..0000000000 --- a/cypress/config/static-root.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "baseUrl": "http://localhost:3000", - "integrationFolder": "cypress/integration/static-root", - "projectId": "3tvrbe" -} diff --git a/cypress/integration/canary/images.spec.ts b/cypress/e2e/canary/images.cy.ts similarity index 100% rename from cypress/integration/canary/images.spec.ts rename to cypress/e2e/canary/images.cy.ts diff --git a/cypress/integration/default/api.spec.ts b/cypress/e2e/default/api.cy.ts similarity index 100% rename from cypress/integration/default/api.spec.ts rename to cypress/e2e/default/api.cy.ts diff --git a/cypress/integration/default/appdir.spec.ts b/cypress/e2e/default/appdir.cy.ts similarity index 100% rename from cypress/integration/default/appdir.spec.ts rename to cypress/e2e/default/appdir.cy.ts diff --git a/cypress/integration/default/css.spec.ts b/cypress/e2e/default/css.cy.ts similarity index 100% rename from cypress/integration/default/css.spec.ts rename to cypress/e2e/default/css.cy.ts diff --git a/cypress/integration/default/custom-errors.spec.ts b/cypress/e2e/default/custom-errors.cy.ts similarity index 100% rename from cypress/integration/default/custom-errors.spec.ts rename to cypress/e2e/default/custom-errors.cy.ts diff --git a/cypress/integration/default/default.spec.ts b/cypress/e2e/default/default.cy.ts similarity index 100% rename from cypress/integration/default/default.spec.ts rename to cypress/e2e/default/default.cy.ts diff --git a/cypress/integration/default/dynamic-routes.spec.ts b/cypress/e2e/default/dynamic-routes.cy.ts similarity index 100% rename from cypress/integration/default/dynamic-routes.spec.ts rename to cypress/e2e/default/dynamic-routes.cy.ts diff --git a/cypress/integration/default/env.spec.ts b/cypress/e2e/default/env.cy.ts similarity index 100% rename from cypress/integration/default/env.spec.ts rename to cypress/e2e/default/env.cy.ts diff --git a/cypress/integration/default/i18n.spec.ts b/cypress/e2e/default/i18n.cy.ts similarity index 100% rename from cypress/integration/default/i18n.spec.ts rename to cypress/e2e/default/i18n.cy.ts diff --git a/cypress/integration/default/images.spec.ts b/cypress/e2e/default/images.cy.ts similarity index 100% rename from cypress/integration/default/images.spec.ts rename to cypress/e2e/default/images.cy.ts diff --git a/cypress/integration/default/layouts.spec.ts b/cypress/e2e/default/layouts.cy.ts similarity index 100% rename from cypress/integration/default/layouts.spec.ts rename to cypress/e2e/default/layouts.cy.ts diff --git a/cypress/integration/default/preview.spec.ts b/cypress/e2e/default/preview.cy.ts similarity index 100% rename from cypress/integration/default/preview.spec.ts rename to cypress/e2e/default/preview.cy.ts diff --git a/cypress/integration/default/revalidate.spec.ts b/cypress/e2e/default/revalidate.cy.ts similarity index 100% rename from cypress/integration/default/revalidate.spec.ts rename to cypress/e2e/default/revalidate.cy.ts diff --git a/cypress/integration/default/rewrites-redirects.spec.ts b/cypress/e2e/default/rewrites-redirects.cy.ts similarity index 100% rename from cypress/integration/default/rewrites-redirects.spec.ts rename to cypress/e2e/default/rewrites-redirects.cy.ts diff --git a/cypress/integration/default/script.spec.ts b/cypress/e2e/default/script.cy.ts similarity index 100% rename from cypress/integration/default/script.spec.ts rename to cypress/e2e/default/script.cy.ts diff --git a/cypress/integration/default/test.spec.ts b/cypress/e2e/default/test.cy.ts similarity index 100% rename from cypress/integration/default/test.spec.ts rename to cypress/e2e/default/test.cy.ts diff --git a/cypress/integration/default/trailing-slash.spec.ts b/cypress/e2e/default/trailing-slash.cy.ts similarity index 100% rename from cypress/integration/default/trailing-slash.spec.ts rename to cypress/e2e/default/trailing-slash.cy.ts diff --git a/cypress/integration/default/wasm.spec.ts b/cypress/e2e/default/wasm.cy.ts similarity index 100% rename from cypress/integration/default/wasm.spec.ts rename to cypress/e2e/default/wasm.cy.ts diff --git a/cypress/integration/middleware/enhanced.spec.ts b/cypress/e2e/middleware/enhanced.cy.ts similarity index 100% rename from cypress/integration/middleware/enhanced.spec.ts rename to cypress/e2e/middleware/enhanced.cy.ts diff --git a/cypress/integration/middleware/standard.spec.ts b/cypress/e2e/middleware/standard.cy.ts similarity index 100% rename from cypress/integration/middleware/standard.spec.ts rename to cypress/e2e/middleware/standard.cy.ts diff --git a/cypress/integration/nx/general.spec.ts b/cypress/e2e/nx/general.cy.ts similarity index 100% rename from cypress/integration/nx/general.spec.ts rename to cypress/e2e/nx/general.cy.ts diff --git a/cypress/integration/static-root/i18n.spec.ts b/cypress/e2e/static-root/i18n.cy.ts similarity index 100% rename from cypress/integration/static-root/i18n.spec.ts rename to cypress/e2e/static-root/i18n.cy.ts diff --git a/cypress/integration/static-root/rewrites-redirects.spec.ts b/cypress/e2e/static-root/rewrites-redirects.cy.ts similarity index 100% rename from cypress/integration/static-root/rewrites-redirects.spec.ts rename to cypress/e2e/static-root/rewrites-redirects.cy.ts diff --git a/cypress/support/index.js b/cypress/support/e2e.js similarity index 100% rename from cypress/support/index.js rename to cypress/support/e2e.js diff --git a/demos/nx-next-monorepo-demo/package-lock.json b/demos/nx-next-monorepo-demo/package-lock.json index 89cfaf47e8..b53c4bc397 100644 --- a/demos/nx-next-monorepo-demo/package-lock.json +++ b/demos/nx-next-monorepo-demo/package-lock.json @@ -35,7 +35,7 @@ "@typescript-eslint/eslint-plugin": "^5.36.1", "@typescript-eslint/parser": "^5.36.1", "babel-jest": "28.1.3", - "cypress": "^10.7.0", + "cypress": "^12.10.0", "eslint": "~8.15.0", "eslint-config-next": "12.3.4", "eslint-config-prettier": "8.8.0", @@ -5751,9 +5751,9 @@ "license": "MIT" }, "node_modules/cypress": { - "version": "10.11.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.11.0.tgz", - "integrity": "sha512-lsaE7dprw5DoXM00skni6W5ElVVLGAdRUUdZjX2dYsGjbY/QnpzWZ95Zom1mkGg0hAaO/QVTZoFVS7Jgr/GUPA==", + "version": "12.10.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.10.0.tgz", + "integrity": "sha512-Y0wPc221xKKW1/4iAFCphkrG2jNR4MjOne3iGn4mcuCaE7Y5EtXL83N8BzRsAht7GYfWVjJ/UeTqEdDKHz39HQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -5771,10 +5771,10 @@ "check-more-types": "^2.24.0", "cli-cursor": "^3.1.0", "cli-table3": "~0.6.1", - "commander": "^5.1.0", + "commander": "^6.2.1", "common-tags": "^1.8.0", "dayjs": "^1.10.4", - "debug": "^4.3.2", + "debug": "^4.3.4", "enquirer": "^2.3.6", "eventemitter2": "6.4.7", "execa": "4.1.0", @@ -5789,7 +5789,7 @@ "listr2": "^3.8.3", "lodash": "^4.17.21", "log-symbols": "^4.0.0", - "minimist": "^1.2.6", + "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", "proxy-from-env": "1.0.0", @@ -5804,7 +5804,7 @@ "cypress": "bin/cypress" }, "engines": { - "node": ">=12.0.0" + "node": "^14.0.0 || ^16.0.0 || >=18.0.0" } }, "node_modules/cypress/node_modules/@types/node": { @@ -5820,9 +5820,9 @@ "dev": true }, "node_modules/cypress/node_modules/commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", "dev": true, "engines": { "node": ">= 6" @@ -10189,8 +10189,12 @@ } }, "node_modules/minimist": { - "version": "1.2.6", - "license": "MIT" + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/mkdirp": { "version": "0.5.6", @@ -17017,9 +17021,9 @@ "dev": true }, "cypress": { - "version": "10.11.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.11.0.tgz", - "integrity": "sha512-lsaE7dprw5DoXM00skni6W5ElVVLGAdRUUdZjX2dYsGjbY/QnpzWZ95Zom1mkGg0hAaO/QVTZoFVS7Jgr/GUPA==", + "version": "12.10.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.10.0.tgz", + "integrity": "sha512-Y0wPc221xKKW1/4iAFCphkrG2jNR4MjOne3iGn4mcuCaE7Y5EtXL83N8BzRsAht7GYfWVjJ/UeTqEdDKHz39HQ==", "dev": true, "requires": { "@cypress/request": "^2.88.10", @@ -17036,10 +17040,10 @@ "check-more-types": "^2.24.0", "cli-cursor": "^3.1.0", "cli-table3": "~0.6.1", - "commander": "^5.1.0", + "commander": "^6.2.1", "common-tags": "^1.8.0", "dayjs": "^1.10.4", - "debug": "^4.3.2", + "debug": "^4.3.4", "enquirer": "^2.3.6", "eventemitter2": "6.4.7", "execa": "4.1.0", @@ -17054,7 +17058,7 @@ "listr2": "^3.8.3", "lodash": "^4.17.21", "log-symbols": "^4.0.0", - "minimist": "^1.2.6", + "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", "proxy-from-env": "1.0.0", @@ -17079,9 +17083,9 @@ "dev": true }, "commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", "dev": true }, "execa": { @@ -20042,7 +20046,9 @@ } }, "minimist": { - "version": "1.2.6" + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" }, "mkdirp": { "version": "0.5.6", diff --git a/demos/nx-next-monorepo-demo/package.json b/demos/nx-next-monorepo-demo/package.json index 84e6d0c08a..4114c91d5e 100644 --- a/demos/nx-next-monorepo-demo/package.json +++ b/demos/nx-next-monorepo-demo/package.json @@ -35,7 +35,7 @@ "@typescript-eslint/eslint-plugin": "^5.36.1", "@typescript-eslint/parser": "^5.36.1", "babel-jest": "28.1.3", - "cypress": "^10.7.0", + "cypress": "^12.10.0", "eslint": "~8.15.0", "eslint-config-next": "12.3.4", "eslint-config-prettier": "8.8.0", diff --git a/package-lock.json b/package-lock.json index c13ee351b7..ca78f14983 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "@delucis/if-env": "^1.1.2", "@netlify/build": "^29.10.0", "@netlify/eslint-config-node": "^7.0.1", - "@testing-library/cypress": "^8.0.1", + "@testing-library/cypress": "^9.0.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^27.0.2", "@types/mocha": "^9.0.0", @@ -40,7 +40,7 @@ "chance": "^1.1.8", "cheerio": "^1.0.0-rc.12", "cpy": "^8.1.2", - "cypress": "^9.0.0", + "cypress": "^12.10.0", "escape-string-regexp": "^2.0.0", "eslint-config-next": "^12.0.0", "eslint-plugin-promise": "^6.0.0", @@ -5812,9 +5812,9 @@ } }, "node_modules/@testing-library/cypress": { - "version": "8.0.7", - "resolved": "https://registry.npmjs.org/@testing-library/cypress/-/cypress-8.0.7.tgz", - "integrity": "sha512-3HTV725rOS+YHve/gD9coZp/UcPK5xhr4H0GMnq/ni6USdtzVtSOG9WBFtd8rYnrXk8rrGD+0toRFYouJNIG0Q==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@testing-library/cypress/-/cypress-9.0.0.tgz", + "integrity": "sha512-c1XiCGeHGGTWn0LAU12sFUfoX3qfId5gcSE2yHode+vsyHDWraxDPALjVnHd4/Fa3j4KBcc5k++Ccy6A9qnkMA==", "dev": true, "dependencies": { "@babel/runtime": "^7.14.6", @@ -5825,7 +5825,7 @@ "npm": ">=6" }, "peerDependencies": { - "cypress": "^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0" + "cypress": "^12.0.0" } }, "node_modules/@testing-library/dom": { @@ -6133,9 +6133,9 @@ "dev": true }, "node_modules/@types/sinonjs__fake-timers": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz", - "integrity": "sha512-IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz", + "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==", "dev": true }, "node_modules/@types/sizzle": { @@ -8786,9 +8786,9 @@ } }, "node_modules/commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", "dev": true, "engines": { "node": ">= 6" @@ -9786,31 +9786,32 @@ "link": true }, "node_modules/cypress": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.0.0.tgz", - "integrity": "sha512-/93SWBZTw7BjFZ+I9S8SqkFYZx7VhedDjTtRBmXO0VzTeDbmxgK/snMJm/VFjrqk/caWbI+XY4Qr80myDMQvYg==", + "version": "12.10.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.10.0.tgz", + "integrity": "sha512-Y0wPc221xKKW1/4iAFCphkrG2jNR4MjOne3iGn4mcuCaE7Y5EtXL83N8BzRsAht7GYfWVjJ/UeTqEdDKHz39HQ==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "^2.88.7", + "@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", - "commander": "^5.1.0", + "cli-table3": "~0.6.1", + "commander": "^6.2.1", "common-tags": "^1.8.0", "dayjs": "^1.10.4", - "debug": "^4.3.2", + "debug": "^4.3.4", "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", @@ -9823,22 +9824,22 @@ "listr2": "^3.8.3", "lodash": "^4.17.21", "log-symbols": "^4.0.0", - "minimist": "^1.2.5", + "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", "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" }, "bin": { "cypress": "bin/cypress" }, "engines": { - "node": ">=12.0.0" + "node": "^14.0.0 || ^16.0.0 || >=18.0.0" } }, "node_modules/cypress/node_modules/@types/node": { @@ -9933,6 +9934,21 @@ "node": ">=8.12.0" } }, + "node_modules/cypress/node_modules/semver": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", + "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/cypress/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -18019,9 +18035,9 @@ } }, "node_modules/minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -28309,9 +28325,9 @@ } }, "@testing-library/cypress": { - "version": "8.0.7", - "resolved": "https://registry.npmjs.org/@testing-library/cypress/-/cypress-8.0.7.tgz", - "integrity": "sha512-3HTV725rOS+YHve/gD9coZp/UcPK5xhr4H0GMnq/ni6USdtzVtSOG9WBFtd8rYnrXk8rrGD+0toRFYouJNIG0Q==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@testing-library/cypress/-/cypress-9.0.0.tgz", + "integrity": "sha512-c1XiCGeHGGTWn0LAU12sFUfoX3qfId5gcSE2yHode+vsyHDWraxDPALjVnHd4/Fa3j4KBcc5k++Ccy6A9qnkMA==", "dev": true, "requires": { "@babel/runtime": "^7.14.6", @@ -28617,9 +28633,9 @@ "dev": true }, "@types/sinonjs__fake-timers": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz", - "integrity": "sha512-IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz", + "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==", "dev": true }, "@types/sizzle": { @@ -30618,9 +30634,9 @@ } }, "commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", "dev": true }, "common-log-format": { @@ -31416,30 +31432,31 @@ } }, "cypress": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.0.0.tgz", - "integrity": "sha512-/93SWBZTw7BjFZ+I9S8SqkFYZx7VhedDjTtRBmXO0VzTeDbmxgK/snMJm/VFjrqk/caWbI+XY4Qr80myDMQvYg==", + "version": "12.10.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.10.0.tgz", + "integrity": "sha512-Y0wPc221xKKW1/4iAFCphkrG2jNR4MjOne3iGn4mcuCaE7Y5EtXL83N8BzRsAht7GYfWVjJ/UeTqEdDKHz39HQ==", "dev": true, "requires": { - "@cypress/request": "^2.88.7", + "@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", - "commander": "^5.1.0", + "cli-table3": "~0.6.1", + "commander": "^6.2.1", "common-tags": "^1.8.0", "dayjs": "^1.10.4", - "debug": "^4.3.2", + "debug": "^4.3.4", "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", @@ -31452,15 +31469,15 @@ "listr2": "^3.8.3", "lodash": "^4.17.21", "log-symbols": "^4.0.0", - "minimist": "^1.2.5", + "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", "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" }, "dependencies": { @@ -31529,6 +31546,15 @@ "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", "dev": true }, + "semver": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", + "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, "supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -37654,9 +37680,9 @@ } }, "minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" }, "minimist-options": { "version": "4.1.0", diff --git a/package.json b/package.json index a131e23fe6..22ed3dc26e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Run Next.js seamlessly on Netlify", "scripts": { "build:demo": "cd demos/default && npm run build", - "cy:open": "cypress open --config-file cypress/config/all.json", + "cy:open": "cypress open --config-file=cypress/config/all.config.ts --browser chrome --e2e", "dev:demo": "next dev demos/default", "format": "run-s format:check-fix:*", "format:ci": "run-s format:check:*", @@ -54,7 +54,7 @@ "@delucis/if-env": "^1.1.2", "@netlify/build": "^29.10.0", "@netlify/eslint-config-node": "^7.0.1", - "@testing-library/cypress": "^8.0.1", + "@testing-library/cypress": "^9.0.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^27.0.2", "@types/mocha": "^9.0.0", @@ -64,7 +64,7 @@ "chance": "^1.1.8", "cheerio": "^1.0.0-rc.12", "cpy": "^8.1.2", - "cypress": "^9.0.0", + "cypress": "^12.10.0", "escape-string-regexp": "^2.0.0", "eslint-config-next": "^12.0.0", "eslint-plugin-promise": "^6.0.0",