From 59c47d278e1714edec089d962e2f2526bd3b3085 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 8 Jan 2025 20:28:29 -0600 Subject: [PATCH 1/8] chore: fix the dashboard grouping with inject document domain tests (#30842) * Update workflows.yml * Update package.json * fix nx * blank * blank * fix nx --- .circleci/workflows.yml | 2 +- yarn.lock | 69 +++++------------------------------------ 2 files changed, 8 insertions(+), 63 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index b359a6485157..ad38c17de72a 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -603,7 +603,7 @@ commands: if << parameters.inject-document-domain >> ; then YARN_CMD="cypress:run:inject-document-domain" - PARALLEL="" + PARALLEL="--parallel --group 5x-driver-inject-document-domain-<>" else YARN_CMD="cypress:run" PARALLEL="--parallel --group 5x-driver-<>" diff --git a/yarn.lock b/yarn.lock index c185fc32e585..527ec23f98fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22614,7 +22614,7 @@ mobx@6.13.5: resolved "https://registry.npmjs.org/mobx/-/mobx-6.13.5.tgz#957d9df88c7f8b4baa7c6f8bdcb6d68b432a6ed5" integrity sha512-/HTWzW2s8J1Gqt+WmUj5Y0mddZk+LInejADc79NJadrWla3rHzmRHki/mnEUH1AvOmbNTZ1BRbKxr8DSgfdjMA== -"mocha-7.0.1@npm:mocha@7.0.1": +"mocha-7.0.1@npm:mocha@7.0.1", mocha@7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== @@ -22731,36 +22731,6 @@ mocha@6.2.2: yargs-parser "13.1.1" yargs-unparser "1.6.0" -mocha@7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" - integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== - dependencies: - ansi-colors "3.2.3" - browser-stdout "1.3.1" - chokidar "3.3.0" - debug "3.2.6" - diff "3.5.0" - escape-string-regexp "1.0.5" - find-up "3.0.0" - glob "7.1.3" - growl "1.10.5" - he "1.2.0" - js-yaml "3.13.1" - log-symbols "2.2.0" - minimatch "3.0.4" - mkdirp "0.5.1" - ms "2.1.1" - node-environment-flags "1.0.6" - object.assign "4.1.0" - strip-json-comments "2.0.1" - supports-color "6.0.0" - which "1.3.1" - wide-align "1.1.3" - yargs "13.3.0" - yargs-parser "13.1.1" - yargs-unparser "1.6.0" - mocha@7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.0.tgz#c784f579ad0904d29229ad6cb1e2514e4db7d249" @@ -29307,7 +29277,7 @@ string-template@~0.2.1: resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -29333,15 +29303,6 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -29452,7 +29413,7 @@ stringify-object@^3.0.0, stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -29473,13 +29434,6 @@ strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -32514,7 +32468,7 @@ workerpool@6.2.0: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b" integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -32557,15 +32511,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" @@ -32843,9 +32788,9 @@ yaml@^1.10.0: integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== yaml@^2.0.0, yaml@^2.3.4, yaml@^2.4.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773" - integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg== + version "2.7.0" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.7.0.tgz#aef9bb617a64c937a9a748803786ad8d3ffe1e98" + integrity sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA== yargs-parser@13.1.1: version "13.1.1" From 4cb5774618ffdaa55b5cc1f56dc572170082c6c4 Mon Sep 17 00:00:00 2001 From: Matt Schile Date: Thu, 9 Jan 2025 10:32:14 -0700 Subject: [PATCH 2/8] chore: update the unsupported framework on link to point to the supported frameworks page (#30841) --- npm/angular/src/mount.ts | 2 +- npm/webpack-dev-server/src/devServer.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/angular/src/mount.ts b/npm/angular/src/mount.ts index 0774d02ecc51..982c3200adee 100644 --- a/npm/angular/src/mount.ts +++ b/npm/angular/src/mount.ts @@ -86,7 +86,7 @@ function cleanup () { } catch (e) { const notSupportedError = new Error(`Failed to teardown component. The version of Angular you are using may not be officially supported.`) - ;(notSupportedError as any).docsUrl = 'https://on.cypress.io/component-framework-configuration' + ;(notSupportedError as any).docsUrl = 'https://on.cypress.io/frameworks' throw notSupportedError } diff --git a/npm/webpack-dev-server/src/devServer.ts b/npm/webpack-dev-server/src/devServer.ts index 42502c4bf57b..b220b8ccb9a6 100644 --- a/npm/webpack-dev-server/src/devServer.ts +++ b/npm/webpack-dev-server/src/devServer.ts @@ -119,7 +119,7 @@ async function getPreset (devServerConfig: WebpackDevServerConfig): Promise Date: Thu, 9 Jan 2025 13:34:24 -0500 Subject: [PATCH 3/8] chore: remove 14 as binary branch (#30850) --- .circleci/workflows.yml | 2 +- scripts/binary/trigger-publish-binary-pipeline.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index ad38c17de72a..b69469b746be 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -54,7 +54,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters - equal: [ develop, << pipeline.git.branch >> ] # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - - equal: [ 'chore/update_vue_test_utils', << pipeline.git.branch >> ] + - equal: [ 'chore/update_binary_branch', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index 1b3924fe386b..a57cfa801d6b 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -10,7 +10,6 @@ const { getNextVersionForBinary } = require('../get-next-version') const { nextVersion } = await getNextVersionForBinary() const body = JSON.stringify({ - branch: 'release/14.0.0', parameters: { temp_dir: os.tmpdir(), sha: process.env.CIRCLE_SHA1, From 056696c909dbc73b5f1451e8894dd4f7d8aca491 Mon Sep 17 00:00:00 2001 From: Matt Schile Date: Thu, 9 Jan 2025 13:09:29 -0700 Subject: [PATCH 4/8] chore: update running browser button icon styling (#30851) --- packages/launchpad/src/setup/OpenBrowserList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/launchpad/src/setup/OpenBrowserList.vue b/packages/launchpad/src/setup/OpenBrowserList.vue index 1d663616f2dc..a6dbb81b9805 100644 --- a/packages/launchpad/src/setup/OpenBrowserList.vue +++ b/packages/launchpad/src/setup/OpenBrowserList.vue @@ -109,7 +109,7 @@ > {{ browserText.running }} From c1a7467d7caa5f5423c81aa311db6743e8bb5066 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Thu, 9 Jan 2025 15:23:10 -0500 Subject: [PATCH 5/8] chore: update welcome screen for Cypress 14 (#30845) --- .../data-context/src/data/coreDataShape.ts | 2 - .../src/sources/MigrationDataSource.ts | 31 ----- .../support/mock-graphql/stubgql-Query.ts | 10 -- packages/graphql/schemas/schema.graphql | 3 - .../src/schemaTypes/objectTypes/gql-Query.ts | 11 -- .../launchpad/cypress/e2e/migration.cy.ts | 122 ------------------ .../launchpad/cypress/e2e/slow-network.cy.ts | 7 - packages/launchpad/src/Main.vue | 16 +-- .../src/migration/MajorVersionWelcome.cy.tsx | 22 ++-- .../src/migration/MajorVersionWelcome.vue | 79 +++++------- 10 files changed, 46 insertions(+), 257 deletions(-) diff --git a/packages/data-context/src/data/coreDataShape.ts b/packages/data-context/src/data/coreDataShape.ts index 3e37c90a35ee..658ffced2aad 100644 --- a/packages/data-context/src/data/coreDataShape.ts +++ b/packages/data-context/src/data/coreDataShape.ts @@ -94,7 +94,6 @@ export interface WizardDataShape { export interface MigrationDataShape { // TODO: have the model of migration here step: MigrationStep - videoEmbedHtml: string | null legacyConfigForMigration?: LegacyCypressConfigJson | null filteredSteps: MigrationStep[] flags: { @@ -225,7 +224,6 @@ export function makeCoreData (modeOptions: Partial = {}): CoreDa }, migration: { step: 'renameAuto', - videoEmbedHtml: null, legacyConfigForMigration: null, filteredSteps: [...MIGRATION_STEPS], flags: { diff --git a/packages/data-context/src/sources/MigrationDataSource.ts b/packages/data-context/src/sources/MigrationDataSource.ts index a5c00f14b086..0d2d67790aa3 100644 --- a/packages/data-context/src/sources/MigrationDataSource.ts +++ b/packages/data-context/src/sources/MigrationDataSource.ts @@ -96,37 +96,6 @@ export class MigrationDataSource { return this.ctx.lifecycleManager.metaState.needsCypressJsonMigration && Boolean(legacyConfigFileExists) } - async getVideoEmbedHtml () { - if (this.ctx.coreData.migration.videoEmbedHtml) { - return this.ctx.coreData.migration.videoEmbedHtml - } - - const versionData = await this.ctx.versions.versionData() - const embedOnLink = `https://on.cypress.io/v13-video-embed/${versionData.current.version}` - - debug(`Getting videoEmbedHtml at link: ${embedOnLink}`) - - // Time out request if it takes longer than 3 seconds - const controller = new AbortController() - const timeoutId = setTimeout(() => controller.abort(), 3000) - - try { - const response = await this.ctx.util.fetch(embedOnLink, { method: 'GET', signal: controller.signal }) - const { videoHtml } = await response.json() - - this.ctx.update((d) => { - d.migration.videoEmbedHtml = videoHtml - }) - - return videoHtml - } catch { - // fail silently, no user-facing error is needed - return null - } finally { - clearTimeout(timeoutId) - } - } - async getComponentTestingMigrationStatus () { debug('getComponentTestingMigrationStatus: start') if (!this.legacyConfig || !this.ctx.currentProject) { diff --git a/packages/frontend-shared/cypress/support/mock-graphql/stubgql-Query.ts b/packages/frontend-shared/cypress/support/mock-graphql/stubgql-Query.ts index 8a2b9860bf48..14dabf0b80a0 100644 --- a/packages/frontend-shared/cypress/support/mock-graphql/stubgql-Query.ts +++ b/packages/frontend-shared/cypress/support/mock-graphql/stubgql-Query.ts @@ -43,14 +43,4 @@ export const stubQuery: MaybeResolver = { scaffoldedFiles () { return null }, - videoEmbedHtml () { - return `