From 97334ba3adb4ddf42830e2538bffd2223ac9498a Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Tue, 16 Sep 2025 14:28:14 -0400 Subject: [PATCH 1/8] chore: update issue templates (#32507) * chores: update issue templates * empty commit --- .github/ISSUE_TEMPLATE/1-bug-report.yml | 18 +------- .../{4-feature.yml => 2-feature.yml} | 4 +- .github/ISSUE_TEMPLATE/3-install-issue.yml | 2 +- ...{2-memory-issue.yml => 4-memory-issue.yml} | 2 +- .github/ISSUE_TEMPLATE/5-cy-prompt-issue.yml | 45 +++++++++++++++++++ .github/ISSUE_TEMPLATE/5-flaky-test.yml | 44 ------------------ .github/ISSUE_TEMPLATE/config.yml | 2 +- 7 files changed, 51 insertions(+), 66 deletions(-) rename .github/ISSUE_TEMPLATE/{4-feature.yml => 2-feature.yml} (88%) rename .github/ISSUE_TEMPLATE/{2-memory-issue.yml => 4-memory-issue.yml} (97%) create mode 100644 .github/ISSUE_TEMPLATE/5-cy-prompt-issue.yml delete mode 100644 .github/ISSUE_TEMPLATE/5-flaky-test.yml diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml index b80e0dfd27..9d5d736a77 100644 --- a/.github/ISSUE_TEMPLATE/1-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/1-bug-report.yml @@ -6,7 +6,7 @@ body: value: | ## If you are a customer of Cypress Cloud please utilize our [Support Portal](https://www.cypress.io/support/) for our fastest support! - ### Have a question? 👉 [Ask in chat](https://on.cypress.io/discord) or [start a new discussion](https://github.com/cypress-io/cypress/discussions). + ### Have a question? 👉 [Ask in chat](https://on.cypress.io/chat) or [start a new discussion](https://github.com/cypress-io/cypress/discussions). Issues in the Cypress repo are reserved for bugs and feature requests only. Questions on how to use Cypress will be closed. - type: textarea id: current-behavior @@ -38,22 +38,6 @@ body: placeholder: ex. 10.3.1 validations: required: true - - type: input - id: node-version - attributes: - label: Node version - description: What version of node.js are you using to run Cypress? - placeholder: ex. v22.14.0 - validations: - required: true - - type: input - id: os - attributes: - label: Operating System - description: What operating system is Cypress running on when you are encountering your problem? The more specific the better. ie macOS 12.4 or Windows 10.0.19044.1889 - placeholder: ex. macOS 12.4 - validations: - required: true - type: textarea id: debug-logs attributes: diff --git a/.github/ISSUE_TEMPLATE/4-feature.yml b/.github/ISSUE_TEMPLATE/2-feature.yml similarity index 88% rename from .github/ISSUE_TEMPLATE/4-feature.yml rename to .github/ISSUE_TEMPLATE/2-feature.yml index f69e48523d..4394a4af39 100644 --- a/.github/ISSUE_TEMPLATE/4-feature.yml +++ b/.github/ISSUE_TEMPLATE/2-feature.yml @@ -1,4 +1,4 @@ -name: "✨ Feature" +name: "❇️ Feature Request" description: Suggest a feature or enhancement to improve Cypress. body: - type: markdown @@ -6,7 +6,7 @@ body: value: | ## If you are a customer of Cypress Cloud please utilize our [Support Portal](https://www.cypress.io/support/) for our fastest support! - ### Have a question? 👉 [Ask in chat](https://on.cypress.io/discord) or [start a new discussion](https://github.com/cypress-io/cypress/discussions). + ### Have a question? 👉 [Ask in chat](https://on.cypress.io/chat) or [start a new discussion](https://github.com/cypress-io/cypress/discussions). - type: textarea id: feature attributes: diff --git a/.github/ISSUE_TEMPLATE/3-install-issue.yml b/.github/ISSUE_TEMPLATE/3-install-issue.yml index c20ad79237..52da434d4d 100644 --- a/.github/ISSUE_TEMPLATE/3-install-issue.yml +++ b/.github/ISSUE_TEMPLATE/3-install-issue.yml @@ -7,7 +7,7 @@ body: value: | ## If you are a customer of Cypress Cloud please utilize our [Support Portal](https://www.cypress.io/support/) for our fastest support! - ### Have a question? 👉 [Ask in chat](https://on.cypress.io/discord) or [start a new discussion](https://github.com/cypress-io/cypress/discussions). + ### Have a question? 👉 [Ask in chat](https://on.cypress.io/chat) or [start a new discussion](https://github.com/cypress-io/cypress/discussions). If you're behind a corporate proxy, make sure to [configure it properly](https://on.cypress.io/proxy-configuration) before install. - type: textarea diff --git a/.github/ISSUE_TEMPLATE/2-memory-issue.yml b/.github/ISSUE_TEMPLATE/4-memory-issue.yml similarity index 97% rename from .github/ISSUE_TEMPLATE/2-memory-issue.yml rename to .github/ISSUE_TEMPLATE/4-memory-issue.yml index 89983fb9ec..27ba2b0751 100644 --- a/.github/ISSUE_TEMPLATE/2-memory-issue.yml +++ b/.github/ISSUE_TEMPLATE/4-memory-issue.yml @@ -4,7 +4,7 @@ body: - type: markdown attributes: value: | - Have a question? 👉 [Ask in chat](https://on.cypress.io/discord) or [start a new discussion](https://github.com/cypress-io/cypress/discussions). + Have a question? 👉 [Ask in chat](https://on.cypress.io/chat) or [start a new discussion](https://github.com/cypress-io/cypress/discussions). Prior to logging a memory issue, please make sure you are running the latest version of Cypress and have enabled [`experimentalMemoryManagement`](https://on.cypress.io/experiments) for Chromium-based browsers (introduced in Cypress 12.4.0). diff --git a/.github/ISSUE_TEMPLATE/5-cy-prompt-issue.yml b/.github/ISSUE_TEMPLATE/5-cy-prompt-issue.yml new file mode 100644 index 0000000000..29b14f4ecd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/5-cy-prompt-issue.yml @@ -0,0 +1,45 @@ +name: "✨ cy.prompt Issue" +description: Report unexpected behavior with cy.prompt. +body: + - type: markdown + attributes: + value: | + ## If you are a customer of Cypress Cloud please utilize our [Support Portal](https://www.cypress.io/support/) for our fastest support! + + ### Have a question? 👉 [Ask in chat](https://on.cypress.io/chat) or [start a new discussion](https://github.com/cypress-io/cypress/discussions). + - type: textarea + id: current-behavior + attributes: + label: Current behavior + description: Please provide a description including screenshots, stack traces, etc. [Troubleshooting tips](https://on.cypress.io/troubleshooting). + placeholder: Currently... + validations: + required: true + - type: textarea + id: prompt-code + attributes: + label: cy.prompt code + description: Please provide the arguments you passed to cy.prompt. + validations: + required: true + - type: input + id: projectId + attributes: + label: Project ID + description: What is the project ID of the project you were running cy.prompt in? + placeholder: ex. ypt4pf + validations: + required: true + - type: input + id: version + attributes: + label: Cypress Version + description: What version of Cypress are you running? Run `cypress version` to see your current version. If possible, please update Cypress to the latest version first. + placeholder: ex. 15.2.0 + validations: + required: true + - type: textarea + id: other + attributes: + label: Other + placeholder: Any other details? diff --git a/.github/ISSUE_TEMPLATE/5-flaky-test.yml b/.github/ISSUE_TEMPLATE/5-flaky-test.yml deleted file mode 100644 index da406ba810..0000000000 --- a/.github/ISSUE_TEMPLATE/5-flaky-test.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: "❄️ Flaky test in `cypress-io/cypress` repository" -title: "Flaky test: " -labels: ["topic: flake ❄️", "stage: fire watch"] -description: Report a flaky test in the Cypress open-source repository. -body: - - type: markdown - attributes: - value: | - Have a question? 👉 [Ask in chat](https://on.cypress.io/discord) or [start a new discussion](https://github.com/cypress-io/cypress/discussions). - - type: textarea - id: dashboard - attributes: - label: Link to Cypress Cloud or CircleCI failure - description: Please include a link to the failure in Cypress Cloud or in CircleCI. - validations: - required: true - - type: textarea - id: github-link - attributes: - label: Link to failing test in GitHub - description: Provide the GitHub link to the failing test with the line number. - validations: - required: true - - type: textarea - id: analysis - attributes: - label: Analysis - description: If you can, provide a quick analysis of why this test is flaky. - placeholder: ex. The test appears to be flaky because... - validations: - required: true - - type: input - id: version - attributes: - label: Cypress Version - description: Provide the version of Cypress where the flake is occurring. - placeholder: ex. 10.4.0 - validations: - required: true - - type: textarea - id: other - attributes: - label: Other - placeholder: Any other details? diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index f244b53e14..756d2fac33 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,7 +4,7 @@ contact_links: url: https://github.com/cypress-io/cypress/discussions about: This issue tracker is not for support questions. Please refer to our Discussions. - name: 💬 Chat - url: https://on.cypress.io/discord + url: https://on.cypress.io/chat about: Want to discuss Cypress with others? Check out our chat. - name: 📃 Documentation Issue url: https://github.com/cypress-io/cypress-documentation/issues/new From ca9a5239b0eed4832b1846882ee86464b243f816 Mon Sep 17 00:00:00 2001 From: Adam Alston Date: Tue, 16 Sep 2025 14:50:33 -0400 Subject: [PATCH 2/8] chore(wait): add types and fix issues flagged by types (#32332) * chore(wait): add types and fix issues flagged by types * refactor: create shallow copy of aliases --------- Co-authored-by: Bill Glesias --- .../driver/cypress/e2e/commands/waiting.cy.js | 2 +- packages/driver/src/cy/aliases.ts | 5 +- packages/driver/src/cy/commands/waiting.ts | 128 +++++++++++------- packages/driver/src/cypress/state.ts | 3 +- packages/driver/types/cypress/log.d.ts | 3 +- 5 files changed, 85 insertions(+), 56 deletions(-) diff --git a/packages/driver/cypress/e2e/commands/waiting.cy.js b/packages/driver/cypress/e2e/commands/waiting.cy.js index d38c6f62eb..42fd792900 100644 --- a/packages/driver/cypress/e2e/commands/waiting.cy.js +++ b/packages/driver/cypress/e2e/commands/waiting.cy.js @@ -47,7 +47,7 @@ describe('src/cy/commands/waiting', () => { cy .wait(50) .then(() => { - expect(timeout).to.be.calledWith(50, true, 'wait') + expect(timeout).to.be.calledWith(50, true) }) }) }) diff --git a/packages/driver/src/cy/aliases.ts b/packages/driver/src/cy/aliases.ts index ab88f6ec5f..b221a7becd 100644 --- a/packages/driver/src/cy/aliases.ts +++ b/packages/driver/src/cy/aliases.ts @@ -2,6 +2,7 @@ import _ from 'lodash' import type { $Cy } from '../cypress/cy' import $errUtils from '../cypress/error_utils' +import type { SubjectChain } from '../cypress/state' export const aliasRe = /^@.+/ @@ -12,13 +13,13 @@ const requestXhrRe = /\.request$/ const reserved = ['test', 'runnable', 'timeout', 'slow', 'skip', 'inspect'] -export const aliasDisplayName = (name) => { +export const aliasDisplayName = (name: string) => { return name.replace(aliasDisplayRe, '') } // eslint-disable-next-line @cypress/dev/arrow-body-multiline-braces export const create = (cy: $Cy) => ({ - addAlias (ctx, aliasObj) { + addAlias (ctx: Mocha.Context, aliasObj: { alias: string, subjectChain: SubjectChain }) { const { alias } = aliasObj const aliases = cy.state('aliases') || {} diff --git a/packages/driver/src/cy/commands/waiting.ts b/packages/driver/src/cy/commands/waiting.ts index b1314b66bd..b248437d85 100644 --- a/packages/driver/src/cy/commands/waiting.ts +++ b/packages/driver/src/cy/commands/waiting.ts @@ -4,12 +4,27 @@ import { waitForRoute } from '../net-stubbing/wait-for-route' import { isDynamicAliasingPossible } from '../net-stubbing/aliasing' import ordinal from 'ordinal' -import $errUtils from '../../cypress/error_utils' +import $errUtils, { type CypressError, type InternalCypressError } from '../../cypress/error_utils' +import type { $Cy } from '../../cypress/cy' +import type { StateFunc } from '../../cypress/state' +import type { Log } from '../../cypress/log' -const getNumRequests = (state, alias) => { - const requests = state('aliasRequests') || {} +type waitOptions = { + _log?: Cypress.Log + _runnableTimeout?: number + error?: CypressError | InternalCypressError + isCrossOriginSpecBridge?: boolean + log: boolean + requestTimeout?: number + responseTimeout?: number + timeout: number + type?: 'request' | 'response' +} - requests[alias] = requests[alias] || 0 +const getNumRequests = (state: StateFunc, alias: string) => { + const requests = state('aliasRequests') ?? {} + + requests[alias] = requests[alias] ?? 0 const index = requests[alias] @@ -17,23 +32,17 @@ const getNumRequests = (state, alias) => { state('aliasRequests', requests) - return [index, ordinal(requests[alias])] + return [index, ordinal(requests[alias])] as const } -const throwErr = (arg) => { +const throwErr = (arg: string) => { $errUtils.throwErrByPath('wait.invalid_1st_arg', { args: { arg } }) } -type Alias = { - name: string - cardinal: number - ordinal: number -} - -export default (Commands, Cypress, cy, state) => { - const waitNumber = (subject, ms, options) => { +export default (Commands: Cypress.Commands, Cypress: Cypress.Cypress, cy: $Cy, state: StateFunc) => { + const waitNumber = (subject: unknown, ms: number, options: waitOptions) => { // increase the timeout by the delta - cy.timeout(ms, true, 'wait') + cy.timeout(ms, true) options._log = Cypress.log({ hidden: options.log === false, @@ -51,7 +60,7 @@ export default (Commands, Cypress, cy, state) => { .return(subject) } - const waitString = (subject, str, options) => { + const waitString = async (str: string | string[], options: waitOptions) => { // if this came from the spec bridge, we need to set a few additional properties to ensure the log displays correctly // otherwise, these props will be pulled from the current command which will be cy.origin on the primary const log = options._log = Cypress.log({ @@ -69,7 +78,13 @@ export default (Commands, Cypress, cy, state) => { }) } - const checkForXhr = async function (alias, type, index, num, options) { + const checkForXhr = async function ( + alias: string, + type: 'request'|'response', + index: number, + num: string, + options: waitOptions, + ) { options.error = $errUtils.errByPath('wait.timed_out', { timeout: options.timeout, alias, @@ -98,15 +113,16 @@ export default (Commands, Cypress, cy, state) => { return xhr } - const args: [any, any, any, any, any] = [alias, type, index, num, options] - return cy.retry(() => { - return checkForXhr.apply(window, args) - }, options) + return checkForXhr.apply(window, [alias, type, index, num, options]) + }, + // TODO: What should `_log`'s type be? + // @ts-expect-error - Incompatible types. + options) } - const waitForXhr = function (str, options) { - let specifier + const waitForXhr = async function (str: string, options: Omit) { + let specifier: string | null | undefined // we always want to strip everything after the last '.' // since we support alias property 'request' @@ -126,7 +142,7 @@ export default (Commands, Cypress, cy, state) => { } } - let aliasObj + let aliasObj: { alias: string, command?: unknown } try { aliasObj = cy.getAlias(str, 'wait', log) @@ -161,8 +177,8 @@ export default (Commands, Cypress, cy, state) => { // build up an array of referencesAlias // because wait can reference an array of aliases if (log) { - const referencesAlias = log.get('referencesAlias') || [] - const aliases: Array = [].concat(referencesAlias) + const referencesAlias = log.get('referencesAlias') ?? [] + const aliases = [...referencesAlias] if (str) { aliases.push({ @@ -182,13 +198,13 @@ export default (Commands, Cypress, cy, state) => { return commandsThatCreateNetworkIntercepts.includes(commandName) } - const findInterceptAlias = (alias) => { - const routes = cy.state('routes') || {} + const findInterceptAlias = (alias: string) => { + const routes = cy.state('routes') ?? {} return _.find(_.values(routes), { alias }) } - const isInterceptAlias = (alias) => Boolean(findInterceptAlias(alias)) + const isInterceptAlias = (alias: string) => Boolean(findInterceptAlias(alias)) if (command && !isNetworkInterceptCommand(command)) { if (!isInterceptAlias(alias)) { @@ -203,11 +219,15 @@ export default (Commands, Cypress, cy, state) => { // but slice out the error since we may set // the error related to a previous xhr const { timeout } = options + // TODO: If `options.requestTimeout` and `options.responseTimeout` are + // `0`, is this code going to work the way it was intended to? const requestTimeout = options.requestTimeout || timeout const responseTimeout = options.responseTimeout || timeout const waitForRequest = () => { options = _.omit(options, '_runnableTimeout') + // TODO: If `requestTimeout` is `0`, is this code going to work the way + // it was intended to? options.timeout = requestTimeout || Cypress.config('requestTimeout') if (log) { @@ -219,6 +239,8 @@ export default (Commands, Cypress, cy, state) => { const waitForResponse = () => { options = _.omit(options, '_runnableTimeout') + // TODO: If `responseTimeout` is `0`, is this code going to work the way + // it was intended to? options.timeout = responseTimeout || Cypress.config('responseTimeout') if (log) { @@ -237,8 +259,7 @@ export default (Commands, Cypress, cy, state) => { return waitForRequest().then(waitForResponse) } - return Promise - .map([].concat(str), (str) => { + return Promise.map(([] as string[]).concat(str), (str) => { // we may get back an xhr value instead // of a promise, so we have to wrap this // in another promise :-( @@ -285,18 +306,24 @@ export default (Commands, Cypress, cy, state) => { }) } - Cypress.primaryOriginCommunicator.on('wait:for:xhr', ({ args: [str, options] }, { origin }) => { - options.isCrossOriginSpecBridge = true - waitString(null, str, options).then((responses) => { - Cypress.primaryOriginCommunicator.toSpecBridge(origin, 'wait:for:xhr:end', responses) - }).catch((err) => { - options._log?.error(err) - err.hasSpecBridgeError = true - Cypress.primaryOriginCommunicator.toSpecBridge(origin, 'wait:for:xhr:end', err) - }) - }) + Cypress.primaryOriginCommunicator.on( + 'wait:for:xhr', + ( + { args: [str, options] }: { args: [string | string[], waitOptions] }, + { origin }, + ) => { + options.isCrossOriginSpecBridge = true + waitString(str, options).then((responses) => { + Cypress.primaryOriginCommunicator.toSpecBridge(origin, 'wait:for:xhr:end', responses) + }).catch((err) => { + options._log?.error(err) + err.hasSpecBridgeError = true + Cypress.primaryOriginCommunicator.toSpecBridge(origin, 'wait:for:xhr:end', err) + }) + }, + ) - const delegateToPrimaryOrigin = ([_subject, str, options]) => { + const delegateToPrimaryOrigin = (str: string | string[], options: waitOptions) => { return new Promise((resolve, reject) => { Cypress.specBridgeCommunicator.once('wait:for:xhr:end', (responsesOrErr) => { // determine if this is an error by checking if there is a spec bridge error @@ -304,7 +331,7 @@ export default (Commands, Cypress, cy, state) => { delete responsesOrErr.hasSpecBridgeError if (options.log) { // skip this 'wait' log since it was already added through the primary - Cypress.state('onBeforeLog', (log) => { + Cypress.state('onBeforeLog', (log: Log) => { if (log.get('name') === 'wait') { // unbind this function so we don't impact any other logs cy.state('onBeforeLog', null) @@ -328,7 +355,7 @@ export default (Commands, Cypress, cy, state) => { } Commands.addAll({ prevSubject: 'optional' }, { - wait (subject, msOrAlias, options: { log?: boolean } = {}) { + wait (subject: unknown, msOrAlias: number | string | string[], options: waitOptions) { // check to ensure options is an object // if its a string the user most likely is trying // to wait on multiple aliases and forget to make this @@ -342,19 +369,18 @@ export default (Commands, Cypress, cy, state) => { } options = _.defaults({}, options, { log: true }) - const args: any = [subject, msOrAlias, options] try { - if (_.isFinite(msOrAlias)) { - return waitNumber.apply(window, args) + if (typeof msOrAlias === 'number' && _.isFinite(msOrAlias)) { + return waitNumber.apply(window, [subject, msOrAlias, options]) } if (_.isString(msOrAlias) || (_.isArray(msOrAlias) && !_.isEmpty(msOrAlias))) { if (Cypress.isCrossOriginSpecBridge) { - return delegateToPrimaryOrigin(args) + return delegateToPrimaryOrigin(msOrAlias, options) } - return waitString.apply(window, args) + return waitString.apply(window, [msOrAlias, options]) } // figure out why this error failed @@ -370,7 +396,7 @@ export default (Commands, Cypress, cy, state) => { throwErr(msOrAlias.toString()) } - let arg + let arg: string try { arg = JSON.stringify(msOrAlias) @@ -379,7 +405,7 @@ export default (Commands, Cypress, cy, state) => { } return throwErr(arg) - } catch (err: any) { + } catch (err) { if (err.name === 'CypressError') { throw err } else { diff --git a/packages/driver/src/cypress/state.ts b/packages/driver/src/cypress/state.ts index ccda98d84c..73e599b30b 100644 --- a/packages/driver/src/cypress/state.ts +++ b/packages/driver/src/cypress/state.ts @@ -33,7 +33,7 @@ export interface StateFunc { (k: 'isStable', v?: boolean): boolean (k: 'whenStable', v?: null | (() => Promise)): () => Promise (k: 'current', v?: $Command): $Command - (k: 'canceld', v?: boolean): boolean + (k: 'canceled', v?: boolean): boolean (k: 'error', v?: Error): Error (k: 'assertUsed', v?: boolean): boolean (k: 'currentAssertionUserInvocationStack', v?: string): string @@ -54,6 +54,7 @@ export interface StateFunc { (k: 'promise', v?: Bluebird): Bluebird (k: 'reject', v?: (err: any) => any): (err: any) => any (k: 'cancel', v?: () => void): () => void + (k: 'aliasRequests', v?: Record): Record (k: string, v?: any): any state: StateFunc reset: () => Record diff --git a/packages/driver/types/cypress/log.d.ts b/packages/driver/types/cypress/log.d.ts index 2a793a3b70..583c14f6f5 100644 --- a/packages/driver/types/cypress/log.d.ts +++ b/packages/driver/types/cypress/log.d.ts @@ -8,7 +8,7 @@ declare namespace Cypress { _hasInitiallyLogged: boolean get(attr: K): InternalLogConfig[K] get(): InternalLogConfig - set(key: K, value: LogConfig[K]): InternalLog + set(key: K, value: LogConfig[K]): InternalLog set(options: Partial) groupEnd(): void } @@ -144,5 +144,6 @@ declare namespace Cypress { visible?: boolean // the timestamp of when the command started wallClockStartedAt?: string + options?: unknown } } From 0d7e4b24960bcd8c927613921d92c4050898bb9e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 15:29:51 -0400 Subject: [PATCH 3/8] chore(deps): update dependency vite-5 to v5.4.20 [security] (#32458) * chore(deps): update dependency vite-5 to ^5.4.20 [security] * chore(deps): update dependency vite-5 to v7 [security] * chore(deps): update dependency vite-5 to v7 [security] --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jennifer Shehane --- npm/vite-dev-server/package.json | 2 +- yarn.lock | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/npm/vite-dev-server/package.json b/npm/vite-dev-server/package.json index 6d67b3e1ef..074eb14a12 100644 --- a/npm/vite-dev-server/package.json +++ b/npm/vite-dev-server/package.json @@ -22,7 +22,7 @@ "devDependencies": { "cross-env": "7.0.3", "dedent": "^0.7.0", - "vite-5": "npm:vite@^5.4.19", + "vite-5": "npm:vite@^5.4.20", "vite-6": "npm:vite@^6.3.6", "vite-7": "npm:vite@^7.1.5", "vite-plugin-inspect": "0.8.4", diff --git a/yarn.lock b/yarn.lock index 3cf70f5047..7e9b927c9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -31960,14 +31960,17 @@ vinyl@^3.0.0: replace-ext "^2.0.0" teex "^1.0.1" -"vite-5@npm:vite@^5.4.19": - version "5.4.19" - resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.19.tgz#20efd060410044b3ed555049418a5e7d1998f959" - integrity sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA== +"vite-5@npm:vite@^5.4.20": + version "5.4.20" + resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.20.tgz#3267a5e03f21212f44edfd72758138e8fcecd76a" + integrity sha512-j3lYzGC3P+B5Yfy/pfKNgVEg4+UtcIJcVRt2cDjIOmhLourAqPqf8P7acgxeiSgUB7E3p2P8/3gNIgDLpwzs4g== dependencies: - esbuild "^0.21.3" - postcss "^8.4.43" - rollup "^4.20.0" + esbuild "^0.25.0" + fdir "^6.5.0" + picomatch "^4.0.3" + postcss "^8.5.6" + rollup "^4.43.0" + tinyglobby "^0.2.15" optionalDependencies: fsevents "~2.3.3" From c0c1f2e22a53c000b911ae525841c8df38d12df4 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 16 Sep 2025 17:36:46 -0500 Subject: [PATCH 4/8] chore: fix contributor pr workflow with ipv6 tests - take 2 (#32509) * Revert "chore: fix contributor pr workflow with ipv6 tests (#32500)" This reverts commit ef566b28ae292d5cf9e8041f326b0147b348a5a3. * chore: fix contributor pr workflow with ipv6 tests --- .circleci/workflows.yml | 60 +++++++------------ .../network/test/integration/connect_spec.ts | 6 -- packages/network/test/unit/agent_spec.ts | 6 -- 3 files changed, 21 insertions(+), 51 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 65f575bd50..acf8b21e40 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -1775,9 +1775,6 @@ jobs: <<: *defaults parameters: <<: *defaultsParameters - is_contributor_pr: - type: boolean - default: false resource_class: type: string default: medium @@ -1800,46 +1797,31 @@ jobs: condition: equal: [ *windows-executor, << parameters.executor >> ] steps: - - unless: - condition: << parameters.is_contributor_pr >> - steps: - - run: - name: Enable IPv6 in Docker - command: | - cat \<<'EOF' | sudo tee /etc/docker/daemon.json - { - "ipv6": true, - "fixed-cidr-v6": "2001:db8:1::/64" - } - EOF - cat \<<'EOF' | sudo tee /etc/hosts - 127.0.0.1 localhost - ::1 localhost - EOF - sudo service docker restart + - run: + name: Enable IPv6 in Docker + command: | + cat \<<'EOF' | sudo tee /etc/docker/daemon.json + { + "ipv6": true, + "fixed-cidr-v6": "2001:db8:1::/64" + } + EOF + cat \<<'EOF' | sudo tee /etc/hosts + 127.0.0.1 localhost + ::1 localhost + EOF + sudo service docker restart - run: name: Test scripts command: | source ./scripts/ensure-node.sh yarn test-scripts - - when: - condition: - not: << parameters.is_contributor_pr >> - steps: - - run: - name: Test each individual package - command: | - source ./scripts/ensure-node.sh - # this is needed since we are have to be running as root to test some packages - sudo -E env "PATH=$PATH" yarn test - - when: - condition: << parameters.is_contributor_pr >> - steps: - - run: - name: Test each individual package - command: | - source ./scripts/ensure-node.sh - CIRCLE_IPV6_DISABLED=1 yarn test + - run: + name: Test each individual package + command: | + source ./scripts/ensure-node.sh + # this is needed since we are have to be running as root to test some packages + sudo -E env "PATH=$PATH" yarn test - run: name: Test types command: | @@ -3359,7 +3341,7 @@ linux-x64-contributor-workflow: &linux-x64-contributor-workflow requires: - contributor-pr - unit-tests: - is_contributor_pr: true + executor: linux-x64 requires: - build - verify-release-readiness: diff --git a/packages/network/test/integration/connect_spec.ts b/packages/network/test/integration/connect_spec.ts index f18c2d5d43..9f2429d88b 100644 --- a/packages/network/test/integration/connect_spec.ts +++ b/packages/network/test/integration/connect_spec.ts @@ -43,12 +43,6 @@ describe('lib/connect', function () { // Error: listen EADDRNOTAVAIL ::1 // NOTE: add an ipv6 lo if to the docker container it('resolves localhost on ::1 immediately', function () { - // If we are on CI and IPV6 is explicitly disabled (like in the contributor PR workflow) - // then we skip this test - if (process.env.CIRCLE_IPV6_DISABLED) { - this.skip() - } - this.timeout(50) const server = net.createServer(_.partialRight(_.invoke, 'close')) diff --git a/packages/network/test/unit/agent_spec.ts b/packages/network/test/unit/agent_spec.ts index a2fad53814..9bea7cf0e2 100644 --- a/packages/network/test/unit/agent_spec.ts +++ b/packages/network/test/unit/agent_spec.ts @@ -1071,12 +1071,6 @@ describe('lib/agent', function () { }) it('caches host + port', async function () { - // If we are on CI and IPV6 is explicitly disabled (like in the contributor PR workflow) - // then we skip this test - if (process.env.CIRCLE_IPV6_DISABLED) { - this.skip() - } - const familyCache = {} await Promise.all([ From 3e610c76aff22439ad73dc66d52a7b9491eb231e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Sep 2025 09:37:03 -0400 Subject: [PATCH 5/8] chore: updating v8 snapshot cache (#32518) Co-authored-by: cypress-bot[bot] <+cypress-bot[bot]@users.noreply.github.com> --- tooling/v8-snapshot/cache/win32/snapshot-meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json index 2991bfbb18..f1b78c0c70 100644 --- a/tooling/v8-snapshot/cache/win32/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/win32/snapshot-meta.json @@ -4197,5 +4197,5 @@ "./tooling/v8-snapshot/cache/win32/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "4d2bee32767a43e0e2823ef1df4618462eb6ff121426a3e56d21d68f2b118e9d" + "deferredHash": "802b92458281f760616ab01826f195e3c36b4895bd94020820bc0b84bf99b2cc" } \ No newline at end of file From 30ffa36e8e4f8e5e842cf081bcde6491bc835e88 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Sep 2025 09:37:16 -0400 Subject: [PATCH 6/8] chore: updating v8 snapshot cache (#32517) Co-authored-by: cypress-bot[bot] <+cypress-bot[bot]@users.noreply.github.com> --- tooling/v8-snapshot/cache/linux/snapshot-meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json index fb4476557d..ac8ea1892f 100644 --- a/tooling/v8-snapshot/cache/linux/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/linux/snapshot-meta.json @@ -4197,5 +4197,5 @@ "./tooling/v8-snapshot/cache/linux/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "cc30c3bc97786e2ad1f617b089eed373268f7058102dfb2f55b5593943215f29" + "deferredHash": "7364fffbf5d93ef27eb5dd4e2a3317a65d1376aec579798641dfbfd1c91a9c8e" } \ No newline at end of file From f75e11b7f058be6d0d18c33d420d595f84fbb4f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Sep 2025 09:37:31 -0400 Subject: [PATCH 7/8] chore: updating v8 snapshot cache (#32516) Co-authored-by: cypress-bot[bot] <+cypress-bot[bot]@users.noreply.github.com> --- tooling/v8-snapshot/cache/darwin/snapshot-meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index 3e4c8e8822..b68b95e803 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -4198,5 +4198,5 @@ "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "cc30c3bc97786e2ad1f617b089eed373268f7058102dfb2f55b5593943215f29" + "deferredHash": "7364fffbf5d93ef27eb5dd4e2a3317a65d1376aec579798641dfbfd1c91a9c8e" } \ No newline at end of file From ddc5fc22d2911b58bce3be2a759d6d35694e2271 Mon Sep 17 00:00:00 2001 From: Muaz Othman Date: Wed, 17 Sep 2025 08:38:48 -0500 Subject: [PATCH 8/8] chore: update Snyk scan configuration and upgrade Next.js in the tests (#32514) * chore: update Snyk scan configuration and upgrade Next.js to version 14.2.25 - Added organization flag to Snyk SCA scan in the workflow configuration. - Upgraded Next.js dependency from version 14.2.17 to 14.2.25 in multiple package.json and yarn.lock files. * chore(security): relock some packages to address high vulnerabilities --- .github/workflows/snyk_sca_scan.yaml | 2 +- .../next-14-tsconfig-tailwind/package.json | 4 +- .../next-14-tsconfig-tailwind/yarn.lock | 130 ++++++++++-------- system-tests/projects/next-14/package.json | 4 +- system-tests/projects/next-14/yarn.lock | 108 +++++++-------- yarn.lock | 24 ++-- 6 files changed, 143 insertions(+), 129 deletions(-) diff --git a/.github/workflows/snyk_sca_scan.yaml b/.github/workflows/snyk_sca_scan.yaml index e2575cf7ee..dd0492d24a 100644 --- a/.github/workflows/snyk_sca_scan.yaml +++ b/.github/workflows/snyk_sca_scan.yaml @@ -41,6 +41,6 @@ jobs: - name: Perform SCA Scan continue-on-error: false run: | - snyk test --all-projects --strict-out-of-sync=false --detection-depth=6 --exclude=.nx,system-tests,tooling,docker,Dockerfile --severity-threshold=critical + snyk test --all-projects --strict-out-of-sync=false --detection-depth=6 --exclude=.nx,system-tests,tooling,docker,Dockerfile --severity-threshold=critical --org=cypress-opensource env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} diff --git a/system-tests/projects/next-14-tsconfig-tailwind/package.json b/system-tests/projects/next-14-tsconfig-tailwind/package.json index 64185f8831..b02fbf4437 100644 --- a/system-tests/projects/next-14-tsconfig-tailwind/package.json +++ b/system-tests/projects/next-14-tsconfig-tailwind/package.json @@ -8,7 +8,7 @@ "start": "next start" }, "dependencies": { - "next": "14.2.17", + "next": "14.2.25", "react": "18.3.1", "react-dom": "18.3.1" }, @@ -18,4 +18,4 @@ "tailwindcss": "3.4.14", "typescript": "5.6.3" } -} +} \ No newline at end of file diff --git a/system-tests/projects/next-14-tsconfig-tailwind/yarn.lock b/system-tests/projects/next-14-tsconfig-tailwind/yarn.lock index 07cf7075d8..989e795af5 100644 --- a/system-tests/projects/next-14-tsconfig-tailwind/yarn.lock +++ b/system-tests/projects/next-14-tsconfig-tailwind/yarn.lock @@ -51,55 +51,55 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@next/env@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/env/-/env-14.2.17.tgz#bcb2c84fca50a38ec5b492d1029b8f41b0900594" - integrity sha512-MCgO7VHxXo8sYR/0z+sk9fGyJJU636JyRmkjc7ZJY8Hurl8df35qG5hoAh5KMs75FLjhlEo9bb2LGe89Y/scDA== +"@next/env@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.25.tgz#936d10b967e103e49a4bcea1e97292d5605278dd" + integrity sha512-JnzQ2cExDeG7FxJwqAksZ3aqVJrHjFwZQAEJ9gQZSoEhIow7SNoKZzju/AwQ+PLIR4NY8V0rhcVozx/2izDO0w== -"@next/swc-darwin-arm64@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.17.tgz#f1e38727eb94cf198f63fddcb19002bd4cc971dc" - integrity sha512-WiOf5nElPknrhRMTipXYTJcUz7+8IAjOYw3vXzj3BYRcVY0hRHKWgTgQ5439EvzQyHEko77XK+yN9x9OJ0oOog== +"@next/swc-darwin-arm64@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.25.tgz#7bcccfda0c0ff045c45fbe34c491b7368e373e3d" + integrity sha512-09clWInF1YRd6le00vt750s3m7SEYNehz9C4PUcSu3bAdCTpjIV4aTYQZ25Ehrr83VR1rZeqtKUPWSI7GfuKZQ== -"@next/swc-darwin-x64@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.17.tgz#e29a17ef28d97c347c7d021f391e13b6c8e4c813" - integrity sha512-29y425wYnL17cvtxrDQWC3CkXe/oRrdt8ie61S03VrpwpPRI0XsnTvtKO06XCisK4alaMnZlf8riwZIbJTaSHQ== +"@next/swc-darwin-x64@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.25.tgz#b489e209d7b405260b73f69a38186ed150fb7a08" + integrity sha512-V+iYM/QR+aYeJl3/FWWU/7Ix4b07ovsQ5IbkwgUK29pTHmq+5UxeDr7/dphvtXEq5pLB/PucfcBNh9KZ8vWbug== -"@next/swc-linux-arm64-gnu@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.17.tgz#10e99c7aa60cc33f8b7633e045f74be9a43e7b0c" - integrity sha512-SSHLZls3ZwNEHsc+d0ynKS+7Af0Nr8+KTUBAy9pm6xz9SHkJ/TeuEg6W3cbbcMSh6j4ITvrjv3Oi8n27VR+IPw== +"@next/swc-linux-arm64-gnu@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.25.tgz#ba064fabfdce0190d9859493d8232fffa84ef2e2" + integrity sha512-LFnV2899PJZAIEHQ4IMmZIgL0FBieh5keMnriMY1cK7ompR+JUd24xeTtKkcaw8QmxmEdhoE5Mu9dPSuDBgtTg== -"@next/swc-linux-arm64-musl@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.17.tgz#9a5bb809d3c6aef96c409959aedae28b4e5db53d" - integrity sha512-VFge37us5LNPatB4F7iYeuGs9Dprqe4ZkW7lOEJM91r+Wf8EIdViWHLpIwfdDXinvCdLl6b4VyLpEBwpkctJHA== +"@next/swc-linux-arm64-musl@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.25.tgz#bf0018267e4e0fbfa1524750321f8cae855144a3" + integrity sha512-QC5y5PPTmtqFExcKWKYgUNkHeHE/z3lUsu83di488nyP0ZzQ3Yse2G6TCxz6nNsQwgAx1BehAJTZez+UQxzLfw== -"@next/swc-linux-x64-gnu@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.17.tgz#64e0ce01870e6dc45ae48f676d7cce82aedcdc62" - integrity sha512-aaQlpxUVb9RZ41adlTYVQ3xvYEfBPUC8+6rDgmQ/0l7SvK8S1YNJzPmDPX6a4t0jLtIoNk7j+nroS/pB4nx7vQ== +"@next/swc-linux-x64-gnu@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.25.tgz#64f5a6016a7148297ee80542e0fd788418a32472" + integrity sha512-y6/ML4b9eQ2D/56wqatTJN5/JR8/xdObU2Fb1RBidnrr450HLCKr6IJZbPqbv7NXmje61UyxjF5kvSajvjye5w== -"@next/swc-linux-x64-musl@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.17.tgz#93114164b6ccfc533908193ab9065f0c3970abc3" - integrity sha512-HSyEiFaEY3ay5iATDqEup5WAfrhMATNJm8dYx3ZxL+e9eKv10XKZCwtZByDoLST7CyBmyDz+OFJL1wigyXeaoA== +"@next/swc-linux-x64-musl@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.25.tgz#58dc636d7c55828478159546f7b95ab1e902301c" + integrity sha512-sPX0TSXHGUOZFvv96GoBXpB3w4emMqKeMgemrSxI7A6l55VBJp/RKYLwZIB9JxSqYPApqiREaIIap+wWq0RU8w== -"@next/swc-win32-arm64-msvc@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.17.tgz#4b99dea02178c112e5c33c742f9ff2a49b3b2939" - integrity sha512-h5qM9Btqv87eYH8ArrnLoAHLyi79oPTP2vlGNSg4CDvUiXgi7l0+5KuEGp5pJoMhjuv9ChRdm7mRlUUACeBt4w== +"@next/swc-win32-arm64-msvc@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.25.tgz#93562d447c799bded1e89c1a62d5195a2a8c6c0d" + integrity sha512-ReO9S5hkA1DU2cFCsGoOEp7WJkhFzNbU/3VUF6XxNGUCQChyug6hZdYL/istQgfT/GWE6PNIg9cm784OI4ddxQ== -"@next/swc-win32-ia32-msvc@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.17.tgz#f1c23955405a259b6d45c65f918575b01bcf0106" - integrity sha512-BD/G++GKSLexQjdyoEUgyo5nClU7er5rK0sE+HlEqnldJSm96CIr/+YOTT063LVTT/dUOeQsNgp5DXr86/K7/A== +"@next/swc-win32-ia32-msvc@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.25.tgz#ad85a33466be1f41d083211ea21adc0d2c6e6554" + integrity sha512-DZ/gc0o9neuCDyD5IumyTGHVun2dCox5TfPQI/BJTYwpSNYM3CZDI4i6TOdjeq1JMo+Ug4kPSMuZdwsycwFbAw== -"@next/swc-win32-x64-msvc@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.17.tgz#44f5a4fcd8df1396a8d4326510ca2d92fb809cb3" - integrity sha512-vkQfN1+4V4KqDibkW2q0sJ6CxQuXq5l2ma3z0BRcfIqkAMZiiW67T9yCpwqJKP68QghBtPEFjPAlaqe38O6frw== +"@next/swc-win32-x64-msvc@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.25.tgz#3969c66609e683ec63a6a9f320a855f7be686a08" + integrity sha512-KSznmS6eFjQ9RJ1nEc66kJvtGIL1iZMYmGEXsZPh2YtnLtqrgdVvKXJY2ScjjoFnG6nGLyPFR0UiEvDwVah4Tw== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -536,12 +536,12 @@ nanoid@^3.3.6, nanoid@^3.3.7: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== -next@14.2.17: - version "14.2.17" - resolved "https://registry.npmjs.org/next/-/next-14.2.17.tgz#77a38b11be983ddbbf6c7d1cea3c7e913e8a5445" - integrity sha512-hNo/Zy701DDO3nzKkPmsLRlDfNCtb1OJxFUvjGEl04u7SFa3zwC6hqsOUzMajcaEOEV8ey1GjvByvrg0Qr5AiQ== +next@14.2.25: + version "14.2.25" + resolved "https://registry.yarnpkg.com/next/-/next-14.2.25.tgz#0657551fde6a97f697cf9870e9ccbdaa465c6008" + integrity sha512-N5M7xMc4wSb4IkPvEV5X2BRRXUmhVHNyaXwEM86+voXthSZz8ZiRyQW4p9mwAoAPIm6OzuVZtn7idgEJeAJN3Q== dependencies: - "@next/env" "14.2.17" + "@next/env" "14.2.25" "@swc/helpers" "0.5.5" busboy "1.6.0" caniuse-lite "^1.0.30001579" @@ -549,15 +549,15 @@ next@14.2.17: postcss "8.4.31" styled-jsx "5.1.1" optionalDependencies: - "@next/swc-darwin-arm64" "14.2.17" - "@next/swc-darwin-x64" "14.2.17" - "@next/swc-linux-arm64-gnu" "14.2.17" - "@next/swc-linux-arm64-musl" "14.2.17" - "@next/swc-linux-x64-gnu" "14.2.17" - "@next/swc-linux-x64-musl" "14.2.17" - "@next/swc-win32-arm64-msvc" "14.2.17" - "@next/swc-win32-ia32-msvc" "14.2.17" - "@next/swc-win32-x64-msvc" "14.2.17" + "@next/swc-darwin-arm64" "14.2.25" + "@next/swc-darwin-x64" "14.2.25" + "@next/swc-linux-arm64-gnu" "14.2.25" + "@next/swc-linux-arm64-musl" "14.2.25" + "@next/swc-linux-x64-gnu" "14.2.25" + "@next/swc-linux-x64-musl" "14.2.25" + "@next/swc-win32-arm64-msvc" "14.2.25" + "@next/swc-win32-ia32-msvc" "14.2.25" + "@next/swc-win32-x64-msvc" "14.2.25" normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" @@ -768,8 +768,16 @@ streamsearch@^1.1.0: resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764" integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0: - name string-width-cjs +"string-width-cjs@npm:string-width@^4.2.0": + 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@^4.1.0: 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== @@ -787,8 +795,14 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: - name strip-ansi-cjs +"strip-ansi-cjs@npm: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@^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== diff --git a/system-tests/projects/next-14/package.json b/system-tests/projects/next-14/package.json index ee3b3d615d..dee44ced08 100644 --- a/system-tests/projects/next-14/package.json +++ b/system-tests/projects/next-14/package.json @@ -8,9 +8,9 @@ "start": "next start" }, "dependencies": { - "next": "14.2.17", + "next": "14.2.25", "react": "18.3.1", "react-dom": "18.3.1" }, "projectFixtureDirectory": "next" -} +} \ No newline at end of file diff --git a/system-tests/projects/next-14/yarn.lock b/system-tests/projects/next-14/yarn.lock index dcfcfe5cf7..7fc29acc9b 100644 --- a/system-tests/projects/next-14/yarn.lock +++ b/system-tests/projects/next-14/yarn.lock @@ -2,55 +2,55 @@ # yarn lockfile v1 -"@next/env@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/env/-/env-14.2.17.tgz#bcb2c84fca50a38ec5b492d1029b8f41b0900594" - integrity sha512-MCgO7VHxXo8sYR/0z+sk9fGyJJU636JyRmkjc7ZJY8Hurl8df35qG5hoAh5KMs75FLjhlEo9bb2LGe89Y/scDA== +"@next/env@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.25.tgz#936d10b967e103e49a4bcea1e97292d5605278dd" + integrity sha512-JnzQ2cExDeG7FxJwqAksZ3aqVJrHjFwZQAEJ9gQZSoEhIow7SNoKZzju/AwQ+PLIR4NY8V0rhcVozx/2izDO0w== -"@next/swc-darwin-arm64@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.17.tgz#f1e38727eb94cf198f63fddcb19002bd4cc971dc" - integrity sha512-WiOf5nElPknrhRMTipXYTJcUz7+8IAjOYw3vXzj3BYRcVY0hRHKWgTgQ5439EvzQyHEko77XK+yN9x9OJ0oOog== +"@next/swc-darwin-arm64@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.25.tgz#7bcccfda0c0ff045c45fbe34c491b7368e373e3d" + integrity sha512-09clWInF1YRd6le00vt750s3m7SEYNehz9C4PUcSu3bAdCTpjIV4aTYQZ25Ehrr83VR1rZeqtKUPWSI7GfuKZQ== -"@next/swc-darwin-x64@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.17.tgz#e29a17ef28d97c347c7d021f391e13b6c8e4c813" - integrity sha512-29y425wYnL17cvtxrDQWC3CkXe/oRrdt8ie61S03VrpwpPRI0XsnTvtKO06XCisK4alaMnZlf8riwZIbJTaSHQ== +"@next/swc-darwin-x64@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.25.tgz#b489e209d7b405260b73f69a38186ed150fb7a08" + integrity sha512-V+iYM/QR+aYeJl3/FWWU/7Ix4b07ovsQ5IbkwgUK29pTHmq+5UxeDr7/dphvtXEq5pLB/PucfcBNh9KZ8vWbug== -"@next/swc-linux-arm64-gnu@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.17.tgz#10e99c7aa60cc33f8b7633e045f74be9a43e7b0c" - integrity sha512-SSHLZls3ZwNEHsc+d0ynKS+7Af0Nr8+KTUBAy9pm6xz9SHkJ/TeuEg6W3cbbcMSh6j4ITvrjv3Oi8n27VR+IPw== +"@next/swc-linux-arm64-gnu@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.25.tgz#ba064fabfdce0190d9859493d8232fffa84ef2e2" + integrity sha512-LFnV2899PJZAIEHQ4IMmZIgL0FBieh5keMnriMY1cK7ompR+JUd24xeTtKkcaw8QmxmEdhoE5Mu9dPSuDBgtTg== -"@next/swc-linux-arm64-musl@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.17.tgz#9a5bb809d3c6aef96c409959aedae28b4e5db53d" - integrity sha512-VFge37us5LNPatB4F7iYeuGs9Dprqe4ZkW7lOEJM91r+Wf8EIdViWHLpIwfdDXinvCdLl6b4VyLpEBwpkctJHA== +"@next/swc-linux-arm64-musl@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.25.tgz#bf0018267e4e0fbfa1524750321f8cae855144a3" + integrity sha512-QC5y5PPTmtqFExcKWKYgUNkHeHE/z3lUsu83di488nyP0ZzQ3Yse2G6TCxz6nNsQwgAx1BehAJTZez+UQxzLfw== -"@next/swc-linux-x64-gnu@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.17.tgz#64e0ce01870e6dc45ae48f676d7cce82aedcdc62" - integrity sha512-aaQlpxUVb9RZ41adlTYVQ3xvYEfBPUC8+6rDgmQ/0l7SvK8S1YNJzPmDPX6a4t0jLtIoNk7j+nroS/pB4nx7vQ== +"@next/swc-linux-x64-gnu@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.25.tgz#64f5a6016a7148297ee80542e0fd788418a32472" + integrity sha512-y6/ML4b9eQ2D/56wqatTJN5/JR8/xdObU2Fb1RBidnrr450HLCKr6IJZbPqbv7NXmje61UyxjF5kvSajvjye5w== -"@next/swc-linux-x64-musl@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.17.tgz#93114164b6ccfc533908193ab9065f0c3970abc3" - integrity sha512-HSyEiFaEY3ay5iATDqEup5WAfrhMATNJm8dYx3ZxL+e9eKv10XKZCwtZByDoLST7CyBmyDz+OFJL1wigyXeaoA== +"@next/swc-linux-x64-musl@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.25.tgz#58dc636d7c55828478159546f7b95ab1e902301c" + integrity sha512-sPX0TSXHGUOZFvv96GoBXpB3w4emMqKeMgemrSxI7A6l55VBJp/RKYLwZIB9JxSqYPApqiREaIIap+wWq0RU8w== -"@next/swc-win32-arm64-msvc@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.17.tgz#4b99dea02178c112e5c33c742f9ff2a49b3b2939" - integrity sha512-h5qM9Btqv87eYH8ArrnLoAHLyi79oPTP2vlGNSg4CDvUiXgi7l0+5KuEGp5pJoMhjuv9ChRdm7mRlUUACeBt4w== +"@next/swc-win32-arm64-msvc@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.25.tgz#93562d447c799bded1e89c1a62d5195a2a8c6c0d" + integrity sha512-ReO9S5hkA1DU2cFCsGoOEp7WJkhFzNbU/3VUF6XxNGUCQChyug6hZdYL/istQgfT/GWE6PNIg9cm784OI4ddxQ== -"@next/swc-win32-ia32-msvc@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.17.tgz#f1c23955405a259b6d45c65f918575b01bcf0106" - integrity sha512-BD/G++GKSLexQjdyoEUgyo5nClU7er5rK0sE+HlEqnldJSm96CIr/+YOTT063LVTT/dUOeQsNgp5DXr86/K7/A== +"@next/swc-win32-ia32-msvc@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.25.tgz#ad85a33466be1f41d083211ea21adc0d2c6e6554" + integrity sha512-DZ/gc0o9neuCDyD5IumyTGHVun2dCox5TfPQI/BJTYwpSNYM3CZDI4i6TOdjeq1JMo+Ug4kPSMuZdwsycwFbAw== -"@next/swc-win32-x64-msvc@14.2.17": - version "14.2.17" - resolved "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.17.tgz#44f5a4fcd8df1396a8d4326510ca2d92fb809cb3" - integrity sha512-vkQfN1+4V4KqDibkW2q0sJ6CxQuXq5l2ma3z0BRcfIqkAMZiiW67T9yCpwqJKP68QghBtPEFjPAlaqe38O6frw== +"@next/swc-win32-x64-msvc@14.2.25": + version "14.2.25" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.25.tgz#3969c66609e683ec63a6a9f320a855f7be686a08" + integrity sha512-KSznmS6eFjQ9RJ1nEc66kJvtGIL1iZMYmGEXsZPh2YtnLtqrgdVvKXJY2ScjjoFnG6nGLyPFR0UiEvDwVah4Tw== "@swc/counter@^0.1.3": version "0.1.3" @@ -104,12 +104,12 @@ nanoid@^3.3.6: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== -next@14.2.17: - version "14.2.17" - resolved "https://registry.npmjs.org/next/-/next-14.2.17.tgz#77a38b11be983ddbbf6c7d1cea3c7e913e8a5445" - integrity sha512-hNo/Zy701DDO3nzKkPmsLRlDfNCtb1OJxFUvjGEl04u7SFa3zwC6hqsOUzMajcaEOEV8ey1GjvByvrg0Qr5AiQ== +next@14.2.25: + version "14.2.25" + resolved "https://registry.yarnpkg.com/next/-/next-14.2.25.tgz#0657551fde6a97f697cf9870e9ccbdaa465c6008" + integrity sha512-N5M7xMc4wSb4IkPvEV5X2BRRXUmhVHNyaXwEM86+voXthSZz8ZiRyQW4p9mwAoAPIm6OzuVZtn7idgEJeAJN3Q== dependencies: - "@next/env" "14.2.17" + "@next/env" "14.2.25" "@swc/helpers" "0.5.5" busboy "1.6.0" caniuse-lite "^1.0.30001579" @@ -117,15 +117,15 @@ next@14.2.17: postcss "8.4.31" styled-jsx "5.1.1" optionalDependencies: - "@next/swc-darwin-arm64" "14.2.17" - "@next/swc-darwin-x64" "14.2.17" - "@next/swc-linux-arm64-gnu" "14.2.17" - "@next/swc-linux-arm64-musl" "14.2.17" - "@next/swc-linux-x64-gnu" "14.2.17" - "@next/swc-linux-x64-musl" "14.2.17" - "@next/swc-win32-arm64-msvc" "14.2.17" - "@next/swc-win32-ia32-msvc" "14.2.17" - "@next/swc-win32-x64-msvc" "14.2.17" + "@next/swc-darwin-arm64" "14.2.25" + "@next/swc-darwin-x64" "14.2.25" + "@next/swc-linux-arm64-gnu" "14.2.25" + "@next/swc-linux-arm64-musl" "14.2.25" + "@next/swc-linux-x64-gnu" "14.2.25" + "@next/swc-linux-x64-musl" "14.2.25" + "@next/swc-win32-arm64-msvc" "14.2.25" + "@next/swc-win32-ia32-msvc" "14.2.25" + "@next/swc-win32-x64-msvc" "14.2.25" picocolors@^1.0.0: version "1.0.1" diff --git a/yarn.lock b/yarn.lock index 7e9b927c9a..270039019f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13600,9 +13600,9 @@ cross-spawn@^5.0.1: which "^1.2.9" cross-spawn@^6.0.0, cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + version "6.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57" + integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw== dependencies: nice-try "^1.0.4" path-key "^2.0.1" @@ -19449,9 +19449,9 @@ ip-regex@^5.0.0: integrity sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw== ip@^1.1.8: - version "1.1.8" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48" - integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg== + version "1.1.9" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396" + integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ== ipaddr.js@1.9.1: version "1.9.1" @@ -28599,9 +28599,9 @@ simple-concat@^1.0.0: integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== simple-get@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" - integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz#cc7ba77cfbe761036fbfce3d021af25fc5584d55" + integrity sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA== dependencies: decompress-response "^4.2.0" once "^1.3.1" @@ -31332,9 +31332,9 @@ undici-types@~6.21.0: integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ== undici@^6.20.1: - version "6.21.0" - resolved "https://registry.npmjs.org/undici/-/undici-6.21.0.tgz#4b3d3afaef984e07b48e7620c34ed8a285ed4cd4" - integrity sha512-BUgJXc752Kou3oOIuU1i+yZZypyZRqNPW0vqoMPl8VaoalSfeR0D8/t4iAS3yirs79SSMTxTag+ZC86uswv+Cw== + version "6.21.3" + resolved "https://registry.yarnpkg.com/undici/-/undici-6.21.3.tgz#185752ad92c3d0efe7a7d1f6854a50f83b552d7a" + integrity sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw== unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0"