From 0a7412e1482c864d4bf0817eda9f5bd8114f1334 Mon Sep 17 00:00:00 2001 From: David Kasper Date: Fri, 19 May 2023 13:59:32 -0500 Subject: [PATCH 1/3] fix: correct typescript scaffold dependency (#26204) --- packages/scaffold-config/src/dependencies.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/scaffold-config/src/dependencies.ts b/packages/scaffold-config/src/dependencies.ts index 27ebd58d590b..0a92f994f7d1 100644 --- a/packages/scaffold-config/src/dependencies.ts +++ b/packages/scaffold-config/src/dependencies.ts @@ -49,7 +49,7 @@ export const WIZARD_DEPENDENCY_TYPESCRIPT = { package: 'typescript', installer: 'typescript', description: 'TypeScript is a language for application-scale JavaScript', - minVersion: '^=3.4.0 || ^=4.0.0' || '^=5.0.0', + minVersion: '^=3.4.0 || ^=4.0.0 || ^=5.0.0', } as const export const WIZARD_DEPENDENCY_REACT_SCRIPTS = { From 9b5881ef5dc2810d92cbf56321b0c0d6961acdd4 Mon Sep 17 00:00:00 2001 From: David Kasper Date: Fri, 19 May 2023 14:54:14 -0500 Subject: [PATCH 2/3] add changelog --- cli/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index e9bc9df20ae7..7c226c8d9833 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -13,6 +13,7 @@ _Released 05/23/2023 (PENDING)_ - Moved `types` condition to the front of `package.json#exports` since keys there are meant to be order-sensitive. Fixed in [#26630](https://github.com/cypress-io/cypress/pull/26630). - Fixed an issue where newly-installed dependencies would not be detected during Component Testing setup. Addresses [#26685](https://github.com/cypress-io/cypress/issues/26685). - Fixed a UI regression that was flashing an "empty" state inappropriately when loading the Debug page. Fixed in [#26761](https://github.com/cypress-io/cypress/pull/26761). +- Fixed Typescript detection in component testing setup. Fixed in [#26204](https://github.com/cypress-io/cypress/issues/26204). **Misc:** From e3c5f970d2bb107ab8488f330412ce3eb0609511 Mon Sep 17 00:00:00 2001 From: Dave Kasper Date: Mon, 22 May 2023 12:30:25 -0500 Subject: [PATCH 3/3] Update change log for PR comment Co-authored-by: Mike Plummer --- cli/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 7c226c8d9833..4e44e2161e41 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -13,7 +13,7 @@ _Released 05/23/2023 (PENDING)_ - Moved `types` condition to the front of `package.json#exports` since keys there are meant to be order-sensitive. Fixed in [#26630](https://github.com/cypress-io/cypress/pull/26630). - Fixed an issue where newly-installed dependencies would not be detected during Component Testing setup. Addresses [#26685](https://github.com/cypress-io/cypress/issues/26685). - Fixed a UI regression that was flashing an "empty" state inappropriately when loading the Debug page. Fixed in [#26761](https://github.com/cypress-io/cypress/pull/26761). -- Fixed Typescript detection in component testing setup. Fixed in [#26204](https://github.com/cypress-io/cypress/issues/26204). +- Fixed an issue in Component Testing setup where TypeScript version 5 was not properly detected. Fixes [#26204](https://github.com/cypress-io/cypress/issues/26204). **Misc:**