Skip to content

Commit eed699e

Browse files
AtofStrykerAtofStryker
authored
chore: update lerna to 8.1.8 from 6.6.2 (#30436)
* fix sync script with updateds npm-packlist * chore: update lerna from 6.6.2 to 8.1.8 and ran lerna repair * 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] * fix indentation in comments * remove console.log reference to print current package directory in sync exported npm with cli script
1 parent 0e28a81 commit eed699e

File tree

44 files changed

+1317
-1184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1317
-1184
lines changed

‎.circleci/workflows.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,7 @@ jobs:
15551555
name: Run v8 integration tests
15561556
command: |
15571557
source ./scripts/ensure-node.sh
1558-
yarn test-integration --scope "'@tooling/{packherd,v8-snapshot,electron-mksnapshot}'"
1558+
yarn test-integration --scope=@tooling/{packherd,v8-snapshot,electron-mksnapshot}
15591559
- verify-mocha-results:
15601560
expectedResultCount: 3
15611561
- when:
@@ -1567,7 +1567,7 @@ jobs:
15671567
name: Run v8 integration tests
15681568
command: |
15691569
source ./scripts/ensure-node.sh
1570-
yarn test-integration --scope "'@tooling/packherd'"
1570+
yarn test-integration --scope=@tooling/packherd
15711571
- verify-mocha-results:
15721572
expectedResultCount: 1
15731573
- store_test_results:
@@ -1691,7 +1691,7 @@ jobs:
16911691
parallelism: 1
16921692
steps:
16931693
- restore_cached_workspace
1694-
- run: yarn test-unit --scope @packages/server
1694+
- run: yarn test-unit --scope=@packages/server
16951695
- verify-mocha-results:
16961696
expectedResultCount: 1
16971697
- store_test_results:
@@ -1737,7 +1737,7 @@ jobs:
17371737
parallelism: 1
17381738
steps:
17391739
- restore_cached_workspace
1740-
- run: yarn test-integration --scope @packages/server
1740+
- run: yarn test-integration --scope=@packages/server
17411741
- verify-mocha-results:
17421742
expectedResultCount: 1
17431743
- store_test_results:
@@ -2085,7 +2085,7 @@ jobs:
20852085
- restore_cached_workspace
20862086
- run:
20872087
name: Build
2088-
command: yarn lerna run build --scope @cypress/webpack-preprocessor
2088+
command: yarn lerna run build --scope=@cypress/webpack-preprocessor
20892089
- run:
20902090
name: Run tests
20912091
command: yarn workspace @cypress/webpack-preprocessor test
@@ -2130,7 +2130,7 @@ jobs:
21302130
- restore_cached_workspace
21312131
- run:
21322132
name: Build
2133-
command: yarn lerna run build --scope @cypress/vue
2133+
command: yarn lerna run build --scope=@cypress/vue
21342134
- store_test_results:
21352135
path: npm/vue/test_results
21362136
- store_artifacts:
@@ -2143,7 +2143,7 @@ jobs:
21432143
- restore_cached_workspace
21442144
- run:
21452145
name: Build
2146-
command: yarn lerna run build --scope @cypress/angular
2146+
command: yarn lerna run build --scope=@cypress/angular
21472147
- store-npm-logs
21482148

21492149
npm-angular-signals:
@@ -2152,7 +2152,7 @@ jobs:
21522152
- restore_cached_workspace
21532153
- run:
21542154
name: Build
2155-
command: yarn lerna run build --scope @cypress/angular-signals
2155+
command: yarn lerna run build --scope=@cypress/angular-signals
21562156
- store-npm-logs
21572157

21582158
npm-puppeteer-unit-tests:
@@ -2161,7 +2161,7 @@ jobs:
21612161
- restore_cached_workspace
21622162
- run:
21632163
name: Build
2164-
command: yarn lerna run build --scope @cypress/puppeteer
2164+
command: yarn lerna run build --scope=@cypress/puppeteer
21652165
- run:
21662166
name: Run tests
21672167
command: yarn test
@@ -2193,7 +2193,7 @@ jobs:
21932193
- restore_cached_workspace
21942194
- run:
21952195
name: Build
2196-
command: yarn lerna run build --scope @cypress/react
2196+
command: yarn lerna run build --scope=@cypress/react
21972197
- run:
21982198
name: Run tests
21992199
command: yarn test
@@ -2210,7 +2210,7 @@ jobs:
22102210
- restore_cached_workspace
22112211
- run:
22122212
name: Build
2213-
command: yarn lerna run build --scope @cypress/vite-plugin-cypress-esm
2213+
command: yarn lerna run build --scope=@cypress/vite-plugin-cypress-esm
22142214
- run:
22152215
name: Run tests
22162216
command: yarn test
@@ -2227,7 +2227,7 @@ jobs:
22272227
- restore_cached_workspace
22282228
- run:
22292229
name: Build
2230-
command: yarn lerna run build --scope @cypress/mount-utils
2230+
command: yarn lerna run build --scope=@cypress/mount-utils
22312231
- store-npm-logs
22322232

22332233
npm-grep:
@@ -2259,7 +2259,7 @@ jobs:
22592259
- run:
22602260
name: Build + Install
22612261
command: |
2262-
yarn lerna run build --scope @cypress/schematic
2262+
yarn lerna run build --scope=@cypress/schematic
22632263
- run:
22642264
name: Run unit tests
22652265
command: |

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,3 +398,6 @@ tooling/v8-snapshot/cache/prod-win32
398398

399399
# Cloud API validations
400400
system-tests/lib/validations
401+
402+
.nx/cache
403+
.nx/workspace-data

‎.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
**/*
2+
3+
/.nx/cache
4+
/.nx/workspace-data

‎lerna.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"system-tests",
99
"scripts"
1010
],
11-
"useWorkspaces": true,
12-
"useNx": true,
13-
"version": "0.0.0"
11+
"version": "0.0.0",
12+
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
1413
}

‎npm/cypress-schematic/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@types/node": "^18.17.5",
2626
"chai": "4.2.0",
2727
"mocha": "3.5.3",
28-
"typescript": "^5.4.5"
28+
"typescript": "~5.4.5"
2929
},
3030
"peerDependencies": {
3131
"@angular/cli": ">=14",

‎npm/eslint-plugin-dev/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,6 @@
5252
"cypress",
5353
"eslint",
5454
"eslintplugin"
55-
]
55+
],
56+
"nx": {}
5657
}

‎npm/grep/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"devDependencies": {
1717
"cypress-each": "^1.11.0",
1818
"cypress-expect": "^2.5.3",
19-
"typescript": "^5.4.5"
19+
"typescript": "~5.4.5"
2020
},
2121
"peerDependencies": {
2222
"cypress": ">=10"

‎npm/mount-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"rollup": "3.7.3",
1818
"rollup-plugin-dts": "5.0.0",
1919
"rollup-plugin-typescript2": "^0.29.0",
20-
"typescript": "^5.4.5"
20+
"typescript": "~5.4.5"
2121
},
2222
"files": [
2323
"dist"

‎npm/puppeteer/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,6 @@
5050
"bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Fpuppeteer&template=1-bug-report.md&title=",
5151
"publishConfig": {
5252
"access": "public"
53-
}
53+
},
54+
"nx": {}
5455
}

‎npm/react18/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"react-dom": "^16",
2323
"rollup": "3.7.3",
2424
"rollup-plugin-typescript2": "^0.29.0",
25-
"typescript": "^5.4.5"
25+
"typescript": "~5.4.5"
2626
},
2727
"peerDependencies": {
2828
"@types/react": "^18",

‎npm/svelte/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"devDependencies": {
1414
"@cypress/mount-utils": "0.0.0-development",
1515
"svelte": "^3.49.0",
16-
"typescript": "^5.4.5"
16+
"typescript": "~5.4.5"
1717
},
1818
"peerDependencies": {
1919
"cypress": ">=10.6.0",

‎npm/webpack-batteries-included-preprocessor/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"mock-require": "3.0.3",
5959
"react": "^16.13.1",
6060
"sinon": "18.0.0",
61-
"typescript": "^5.4.5"
61+
"typescript": "~5.4.5"
6262
},
6363
"peerDependencies": {
6464
"@cypress/webpack-preprocessor": "^5.4.4"
@@ -82,5 +82,6 @@
8282
],
8383
"publishConfig": {
8484
"access": "public"
85-
}
85+
},
86+
"nx": {}
8687
}

‎npm/webpack-preprocessor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@
8484
}
8585
}
8686
}
87-
}
87+
}

‎nx.json

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,24 @@
11
{
2-
"tasksRunnerOptions": {
3-
"default": {
4-
"runner": "nx-cloud",
5-
"options": {
6-
"cacheableOperations": [
7-
"lint",
8-
"check-ts",
9-
"build"
10-
],
11-
"accessToken": "ZmNlNjA0YzAtNTM1NS00MDIwLWFlMWItNWYxYzNiMjQ4N2VkfHJlYWQtb25seQ=="
12-
}
13-
}
14-
},
152
"targetDefaults": {
163
"lint": {
174
"inputs": [
185
"default",
196
"{workspaceRoot}/.eslintrc.js"
20-
]
7+
],
8+
"cache": true
219
},
2210
"check-ts": {
2311
"inputs": [
2412
"default",
2513
"sharedGlobals"
26-
]
14+
],
15+
"cache": true
2716
},
2817
"build": {
2918
"dependsOn": [
3019
"^build"
31-
]
20+
],
21+
"cache": true
3222
},
3323
"build-prod": {
3424
"dependsOn": [
@@ -54,5 +44,6 @@
5444
"!{projectRoot/cypress.config.{ts,js}",
5545
"!{projectRoot/**/*.cy.ts"
5646
]
57-
}
47+
},
48+
"nxCloudAccessToken": "ZmNlNjA0YzAtNTM1NS00MDIwLWFlMWItNWYxYzNiMjQ4N2VkfHJlYWQtb25seQ=="
5849
}

‎package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@
5454
"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",
5555
"stop-only-all": "yarn stop-only --folder packages",
5656
"pretest": "yarn ensure-deps",
57-
"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}'\"",
58-
"test-debug": "lerna exec yarn test-debug --ignore \"'@packages/{driver,root,static,web-config}'\"",
59-
"test-integration": "lerna exec yarn test-integration --ignore \"'@packages/{driver,root,static,web-config}'\"",
57+
"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}",
58+
"test-debug": "lerna exec yarn test-debug --ignore=@packages/{driver,root,static,web-config}",
59+
"test-integration": "lerna exec yarn test-integration --ignore=@packages/{driver,root,static,web-config}",
6060
"test-mocha": "mocha --reporter spec scripts/spec.js",
61-
"test-npm-package-release-script": "npx lerna exec --scope \"@cypress/*\" -- npx --no-install semantic-release --dry-run",
61+
"test-npm-package-release-script": "npx lerna exec --scope=@cypress/* -- npx --no-install semantic-release --dry-run",
6262
"test-scripts": "mocha -r packages/ts/register --reporter spec 'scripts/unit/**/*spec.js'",
6363
"test-scripts-watch": "yarn test-scripts --watch --watch-extensions 'ts,js'",
6464
"test-system": "yarn workspace @tooling/system-tests test",
6565
"pretest-unit": "yarn ensure-deps",
66-
"test-unit": "lerna exec yarn test-unit --ignore \"'{@packages/{driver,root,static,web-config,net-stubbing,rewriter},@cypress/{webpack-dev-server,eslint-plugin-dev}}'\"",
66+
"test-unit": "lerna exec yarn test-unit --ignore={@packages/{driver,root,static,web-config,net-stubbing,rewriter},@cypress/{webpack-dev-server,eslint-plugin-dev}}",
6767
"pretest-watch": "yarn ensure-deps",
68-
"test-watch": "lerna exec yarn test-watch --ignore \"'@packages/{driver,root,static,web-config}'\"",
69-
"type-check": "yarn lerna exec yarn type-check --scope @tooling/system-tests && node scripts/type_check",
68+
"test-watch": "lerna exec yarn test-watch --ignore=@packages/{driver,root,static,web-config}",
69+
"type-check": "yarn lerna exec yarn type-check --scope=@tooling/system-tests && node scripts/type_check",
7070
"verify:mocha:results": "node ./scripts/verify-mocha-results",
7171
"watch": "yarn gulp watch"
7272
},
@@ -90,7 +90,7 @@
9090
"@graphql-tools/delegate": "8.2.1",
9191
"@graphql-tools/utils": "8.2.3",
9292
"@graphql-tools/wrap": "8.1.1",
93-
"@nrwl/nx-cloud": "19.0.0",
93+
"@npmcli/arborist": "8.0.0",
9494
"@octokit/auth-app": "6.0.3",
9595
"@octokit/core": "5.0.2",
9696
"@percy/cli": "1.27.4",
@@ -170,7 +170,7 @@
170170
"inquirer": "8.2.4",
171171
"inquirer-confirm": "2.0.3",
172172
"lazy-ass": "1.6.0",
173-
"lerna": "6.6.2",
173+
"lerna": "8.1.8",
174174
"lint-staged": "11.1.2",
175175
"listr2": "3.8.3",
176176
"lodash": "^4.17.21",
@@ -180,6 +180,7 @@
180180
"mocha-junit-reporter": "2.2.0",
181181
"mocha-multi-reporters": "1.1.7",
182182
"mock-fs": "5.2.0",
183+
"npm-packlist": "9.0.0",
183184
"p-defer": "^3.0.0",
184185
"patch-package": "6.4.7",
185186
"playwright-webkit": "1.24.2",

‎packages/config/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@
4444
"files": [
4545
"src"
4646
],
47-
"types": "src/index.ts"
47+
"types": "src/index.ts",
48+
"nx": {}
4849
}

‎packages/driver/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,6 @@
9191
"nohoist": [
9292
"*"
9393
]
94-
}
94+
},
95+
"nx": {}
9596
}

‎packages/electron/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,6 @@
3434
],
3535
"bin": {
3636
"cypress-electron": "./bin/cypress-electron"
37-
}
37+
},
38+
"nx": {}
3839
}

‎packages/errors/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,6 @@
4343
"src",
4444
"dist"
4545
],
46-
"types": "src/index.ts"
46+
"types": "src/index.ts",
47+
"nx": {}
4748
}

‎packages/extension/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@
4141
"dist",
4242
"lib",
4343
"theme"
44-
]
44+
],
45+
"nx": {}
4546
}

‎packages/https-proxy/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@
3939
},
4040
"files": [
4141
"lib"
42-
]
42+
],
43+
"nx": {}
4344
}

‎packages/icons/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
"index.js",
2525
"index.d.ts"
2626
],
27-
"license": "MIT"
27+
"license": "MIT",
28+
"nx": {}
2829
}

‎packages/launcher/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"mock-fs": "5.2.0",
3434
"sinon": "^10.0.0",
3535
"sinon-chai": "3.4.0",
36-
"typescript": "^5.4.5"
36+
"typescript": "~5.4.5"
3737
},
3838
"files": [
3939
"index.js",

0 commit comments

Comments
 (0)