From 77b715e2f4d6812c9bc43e3ea8298c3395bc24e3 Mon Sep 17 00:00:00 2001 From: AtofStryker Date: Mon, 21 Oct 2024 14:02:15 -0400 Subject: [PATCH] chore: pin typescript to ~5.4.5 to avoid importsNotUsedAsValues that was removed in 5.5 and edit workflows and scripts to correctly scope learna packages on v8 snapshot tests [run ci] --- .circleci/workflows.yml | 26 ++++---- npm/cypress-schematic/package.json | 2 +- npm/grep/package.json | 2 +- npm/mount-utils/package.json | 2 +- npm/react18/package.json | 2 +- npm/svelte/package.json | 2 +- .../package.json | 2 +- package.json | 14 ++-- packages/launcher/package.json | 2 +- packages/network/package.json | 2 +- packages/proxy/package.json | 2 +- packages/types/package.json | 2 +- yarn.lock | 65 ++----------------- 13 files changed, 35 insertions(+), 90 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 7cc7af7935e1..c4a07af7dc61 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -1555,7 +1555,7 @@ jobs: name: Run v8 integration tests command: | source ./scripts/ensure-node.sh - yarn test-integration --scope "'@tooling/{packherd,v8-snapshot,electron-mksnapshot}'" + yarn test-integration --scope=@tooling/{packherd,v8-snapshot,electron-mksnapshot} - verify-mocha-results: expectedResultCount: 3 - when: @@ -1567,7 +1567,7 @@ jobs: name: Run v8 integration tests command: | source ./scripts/ensure-node.sh - yarn test-integration --scope "'@tooling/packherd'" + yarn test-integration --scope=@tooling/packherd - verify-mocha-results: expectedResultCount: 1 - store_test_results: @@ -1691,7 +1691,7 @@ jobs: parallelism: 1 steps: - restore_cached_workspace - - run: yarn test-unit --scope @packages/server + - run: yarn test-unit --scope=@packages/server - verify-mocha-results: expectedResultCount: 1 - store_test_results: @@ -1737,7 +1737,7 @@ jobs: parallelism: 1 steps: - restore_cached_workspace - - run: yarn test-integration --scope @packages/server + - run: yarn test-integration --scope=@packages/server - verify-mocha-results: expectedResultCount: 1 - store_test_results: @@ -2085,7 +2085,7 @@ jobs: - restore_cached_workspace - run: name: Build - command: yarn lerna run build --scope @cypress/webpack-preprocessor + command: yarn lerna run build --scope=@cypress/webpack-preprocessor - run: name: Run tests command: yarn workspace @cypress/webpack-preprocessor test @@ -2130,7 +2130,7 @@ jobs: - restore_cached_workspace - run: name: Build - command: yarn lerna run build --scope @cypress/vue + command: yarn lerna run build --scope=@cypress/vue - store_test_results: path: npm/vue/test_results - store_artifacts: @@ -2143,7 +2143,7 @@ jobs: - restore_cached_workspace - run: name: Build - command: yarn lerna run build --scope @cypress/angular + command: yarn lerna run build --scope=@cypress/angular - store-npm-logs npm-angular-signals: @@ -2152,7 +2152,7 @@ jobs: - restore_cached_workspace - run: name: Build - command: yarn lerna run build --scope @cypress/angular-signals + command: yarn lerna run build --scope=@cypress/angular-signals - store-npm-logs npm-puppeteer-unit-tests: @@ -2161,7 +2161,7 @@ jobs: - restore_cached_workspace - run: name: Build - command: yarn lerna run build --scope @cypress/puppeteer + command: yarn lerna run build --scope=@cypress/puppeteer - run: name: Run tests command: yarn test @@ -2193,7 +2193,7 @@ jobs: - restore_cached_workspace - run: name: Build - command: yarn lerna run build --scope @cypress/react + command: yarn lerna run build --scope=@cypress/react - run: name: Run tests command: yarn test @@ -2210,7 +2210,7 @@ jobs: - restore_cached_workspace - run: name: Build - command: yarn lerna run build --scope @cypress/vite-plugin-cypress-esm + command: yarn lerna run build --scope=@cypress/vite-plugin-cypress-esm - run: name: Run tests command: yarn test @@ -2227,7 +2227,7 @@ jobs: - restore_cached_workspace - run: name: Build - command: yarn lerna run build --scope @cypress/mount-utils + command: yarn lerna run build --scope=@cypress/mount-utils - store-npm-logs npm-grep: @@ -2259,7 +2259,7 @@ jobs: - run: name: Build + Install command: | - yarn lerna run build --scope @cypress/schematic + yarn lerna run build --scope=@cypress/schematic - run: name: Run unit tests command: | diff --git a/npm/cypress-schematic/package.json b/npm/cypress-schematic/package.json index 30bf1ceee0e1..43214a662e39 100644 --- a/npm/cypress-schematic/package.json +++ b/npm/cypress-schematic/package.json @@ -25,7 +25,7 @@ "@types/node": "^18.17.5", "chai": "4.2.0", "mocha": "3.5.3", - "typescript": "^5.4.5" + "typescript": "~5.4.5" }, "peerDependencies": { "@angular/cli": ">=14", diff --git a/npm/grep/package.json b/npm/grep/package.json index d753ff3c2fc9..7cb5f8ae95b6 100644 --- a/npm/grep/package.json +++ b/npm/grep/package.json @@ -16,7 +16,7 @@ "devDependencies": { "cypress-each": "^1.11.0", "cypress-expect": "^2.5.3", - "typescript": "^5.4.5" + "typescript": "~5.4.5" }, "peerDependencies": { "cypress": ">=10" diff --git a/npm/mount-utils/package.json b/npm/mount-utils/package.json index dbfa2a1f84cd..1b85db99c915 100644 --- a/npm/mount-utils/package.json +++ b/npm/mount-utils/package.json @@ -17,7 +17,7 @@ "rollup": "3.7.3", "rollup-plugin-dts": "5.0.0", "rollup-plugin-typescript2": "^0.29.0", - "typescript": "^5.4.5" + "typescript": "~5.4.5" }, "files": [ "dist" diff --git a/npm/react18/package.json b/npm/react18/package.json index c0caddf07149..302f8eecbabd 100644 --- a/npm/react18/package.json +++ b/npm/react18/package.json @@ -22,7 +22,7 @@ "react-dom": "^16", "rollup": "3.7.3", "rollup-plugin-typescript2": "^0.29.0", - "typescript": "^5.4.5" + "typescript": "~5.4.5" }, "peerDependencies": { "@types/react": "^18", diff --git a/npm/svelte/package.json b/npm/svelte/package.json index ecb00fcb13d3..6497ecb1377a 100644 --- a/npm/svelte/package.json +++ b/npm/svelte/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@cypress/mount-utils": "0.0.0-development", "svelte": "^3.49.0", - "typescript": "^5.4.5" + "typescript": "~5.4.5" }, "peerDependencies": { "cypress": ">=10.6.0", diff --git a/npm/webpack-batteries-included-preprocessor/package.json b/npm/webpack-batteries-included-preprocessor/package.json index daa31c017415..278b6743726c 100644 --- a/npm/webpack-batteries-included-preprocessor/package.json +++ b/npm/webpack-batteries-included-preprocessor/package.json @@ -58,7 +58,7 @@ "mock-require": "3.0.3", "react": "^16.13.1", "sinon": "18.0.0", - "typescript": "^5.4.5" + "typescript": "~5.4.5" }, "peerDependencies": { "@cypress/webpack-preprocessor": "^5.4.4" diff --git a/package.json b/package.json index dd438dd0c621..de739788bb54 100644 --- a/package.json +++ b/package.json @@ -54,19 +54,19 @@ "stop-only": "npx stop-only --skip .cy,.publish,.projects,node_modules,dist,dist-test,fixtures,lib,bower_components,src,__snapshots__ --exclude cypress-tests.ts,*only.cy.js", "stop-only-all": "yarn stop-only --folder packages", "pretest": "yarn ensure-deps", - "test": "yarn lerna exec yarn test --scope cypress --scope \"'@packages/{config,data-context,electron,errors,extension,https-proxy,launcher,net-stubbing,network,packherd-require,proxy,rewriter,scaffold-config,socket,v8-snapshot-require,telemetry}'\" --scope \"'@tooling/{electron-mksnapshot,v8-snapshot}'\"", - "test-debug": "lerna exec yarn test-debug --ignore \"'@packages/{driver,root,static,web-config}'\"", - "test-integration": "lerna exec yarn test-integration --ignore \"'@packages/{driver,root,static,web-config}'\"", + "test": "yarn lerna exec yarn test --scope=cypress --scope=@packages/{config,data-context,electron,errors,extension,https-proxy,launcher,net-stubbing,network,packherd-require,proxy,rewriter,scaffold-config,socket,v8-snapshot-require,telemetry} --scope=@tooling/{electron-mksnapshot,v8-snapshot}", + "test-debug": "lerna exec yarn test-debug --ignore=@packages/{driver,root,static,web-config}", + "test-integration": "lerna exec yarn test-integration --ignore=@packages/{driver,root,static,web-config}", "test-mocha": "mocha --reporter spec scripts/spec.js", - "test-npm-package-release-script": "npx lerna exec --scope \"@cypress/*\" -- npx --no-install semantic-release --dry-run", + "test-npm-package-release-script": "npx lerna exec --scope=@cypress/* -- npx --no-install semantic-release --dry-run", "test-scripts": "mocha -r packages/ts/register --reporter spec 'scripts/unit/**/*spec.js'", "test-scripts-watch": "yarn test-scripts --watch --watch-extensions 'ts,js'", "test-system": "yarn workspace @tooling/system-tests test", "pretest-unit": "yarn ensure-deps", - "test-unit": "lerna exec yarn test-unit --ignore \"'{@packages/{driver,root,static,web-config,net-stubbing,rewriter},@cypress/{webpack-dev-server,eslint-plugin-dev}}'\"", + "test-unit": "lerna exec yarn test-unit --ignore={@packages/{driver,root,static,web-config,net-stubbing,rewriter},@cypress/{webpack-dev-server,eslint-plugin-dev}}", "pretest-watch": "yarn ensure-deps", - "test-watch": "lerna exec yarn test-watch --ignore \"'@packages/{driver,root,static,web-config}'\"", - "type-check": "yarn lerna exec yarn type-check --scope @tooling/system-tests && node scripts/type_check", + "test-watch": "lerna exec yarn test-watch --ignore=@packages/{driver,root,static,web-config}", + "type-check": "yarn lerna exec yarn type-check --scope=@tooling/system-tests && node scripts/type_check", "verify:mocha:results": "node ./scripts/verify-mocha-results", "watch": "yarn gulp watch" }, diff --git a/packages/launcher/package.json b/packages/launcher/package.json index f56f722e0613..28be4853c393 100644 --- a/packages/launcher/package.json +++ b/packages/launcher/package.json @@ -33,7 +33,7 @@ "mock-fs": "5.2.0", "sinon": "^10.0.0", "sinon-chai": "3.4.0", - "typescript": "^5.4.5" + "typescript": "~5.4.5" }, "files": [ "index.js", diff --git a/packages/network/package.json b/packages/network/package.json index ac3e710e6e39..fbd77129734b 100644 --- a/packages/network/package.json +++ b/packages/network/package.json @@ -37,7 +37,7 @@ "mocha": "6.2.2", "sinon": "7.3.1", "sinon-chai": "3.3.0", - "typescript": "^5.4.5" + "typescript": "~5.4.5" }, "files": [ "lib" diff --git a/packages/proxy/package.json b/packages/proxy/package.json index 719c9b5cb809..b3a1e029f13f 100644 --- a/packages/proxy/package.json +++ b/packages/proxy/package.json @@ -39,7 +39,7 @@ "devtools-protocol": "0.0.1346313", "express": "4.19.2", "supertest": "6.0.1", - "typescript": "^5.4.5" + "typescript": "~5.4.5" }, "files": [ "lib" diff --git a/packages/types/package.json b/packages/types/package.json index c806dcc8889d..16bb9790ec50 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -14,7 +14,7 @@ "devDependencies": { "@types/node": "18.17.5", "devtools-protocol": "0.0.1346313", - "typescript": "^5.4.5" + "typescript": "~5.4.5" }, "files": [ "src/*" diff --git a/yarn.lock b/yarn.lock index 8f12f9012ff2..9efa5429d38e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22331,7 +22331,7 @@ mobx@5.15.4: resolved "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz#9da1a84e97ba624622f4e55a0bf3300fb931c2ab" integrity sha512-xRFJxSU2Im3nrGCdjSuOTFmxVDGeqOHL+TyADCGbT0k4HHqGmx5u2yaHNryvoORpI4DfbzjJ5jPmuv+d7sioFw== -"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== @@ -22448,36 +22448,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" @@ -29247,7 +29217,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== @@ -29273,15 +29243,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" @@ -29383,7 +29344,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== @@ -29404,13 +29365,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" @@ -30848,7 +30802,7 @@ typescript@5.4.5, typescript@~5.4.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== -"typescript@>=3 < 6", typescript@^5.4.5: +"typescript@>=3 < 6": version "5.6.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b" integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw== @@ -32401,7 +32355,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== @@ -32444,15 +32398,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"