Skip to content

Commit

Permalink
chore: update lerna to 8.1.8 from 6.6.2 (#30436)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
AtofStryker authored Oct 22, 2024
1 parent 0e28a81 commit eed699e
Show file tree
Hide file tree
Showing 44 changed files with 1,317 additions and 1,184 deletions.
26 changes: 13 additions & 13 deletions .circleci/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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: |
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -398,3 +398,6 @@ tooling/v8-snapshot/cache/prod-win32

# Cloud API validations
system-tests/lib/validations

.nx/cache
.nx/workspace-data
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
**/*

/.nx/cache
/.nx/workspace-data
5 changes: 2 additions & 3 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"system-tests",
"scripts"
],
"useWorkspaces": true,
"useNx": true,
"version": "0.0.0"
"version": "0.0.0",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
2 changes: 1 addition & 1 deletion npm/cypress-schematic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion npm/eslint-plugin-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,6 @@
"cypress",
"eslint",
"eslintplugin"
]
],
"nx": {}
}
2 changes: 1 addition & 1 deletion npm/grep/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion npm/mount-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion npm/puppeteer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,6 @@
"bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Fpuppeteer&template=1-bug-report.md&title=",
"publishConfig": {
"access": "public"
}
},
"nx": {}
}
2 changes: 1 addition & 1 deletion npm/react18/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion npm/svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions npm/webpack-batteries-included-preprocessor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -82,5 +82,6 @@
],
"publishConfig": {
"access": "public"
}
},
"nx": {}
}
2 changes: 1 addition & 1 deletion npm/webpack-preprocessor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@
}
}
}
}
}
25 changes: 8 additions & 17 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,24 @@
{
"tasksRunnerOptions": {
"default": {
"runner": "nx-cloud",
"options": {
"cacheableOperations": [
"lint",
"check-ts",
"build"
],
"accessToken": "ZmNlNjA0YzAtNTM1NS00MDIwLWFlMWItNWYxYzNiMjQ4N2VkfHJlYWQtb25seQ=="
}
}
},
"targetDefaults": {
"lint": {
"inputs": [
"default",
"{workspaceRoot}/.eslintrc.js"
]
],
"cache": true
},
"check-ts": {
"inputs": [
"default",
"sharedGlobals"
]
],
"cache": true
},
"build": {
"dependsOn": [
"^build"
]
],
"cache": true
},
"build-prod": {
"dependsOn": [
Expand All @@ -54,5 +44,6 @@
"!{projectRoot/cypress.config.{ts,js}",
"!{projectRoot/**/*.cy.ts"
]
}
},
"nxCloudAccessToken": "ZmNlNjA0YzAtNTM1NS00MDIwLWFlMWItNWYxYzNiMjQ4N2VkfHJlYWQtb25seQ=="
}
19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -90,7 +90,7 @@
"@graphql-tools/delegate": "8.2.1",
"@graphql-tools/utils": "8.2.3",
"@graphql-tools/wrap": "8.1.1",
"@nrwl/nx-cloud": "19.0.0",
"@npmcli/arborist": "8.0.0",
"@octokit/auth-app": "6.0.3",
"@octokit/core": "5.0.2",
"@percy/cli": "1.27.4",
Expand Down Expand Up @@ -170,7 +170,7 @@
"inquirer": "8.2.4",
"inquirer-confirm": "2.0.3",
"lazy-ass": "1.6.0",
"lerna": "6.6.2",
"lerna": "8.1.8",
"lint-staged": "11.1.2",
"listr2": "3.8.3",
"lodash": "^4.17.21",
Expand All @@ -180,6 +180,7 @@
"mocha-junit-reporter": "2.2.0",
"mocha-multi-reporters": "1.1.7",
"mock-fs": "5.2.0",
"npm-packlist": "9.0.0",
"p-defer": "^3.0.0",
"patch-package": "6.4.7",
"playwright-webkit": "1.24.2",
Expand Down
3 changes: 2 additions & 1 deletion packages/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@
"files": [
"src"
],
"types": "src/index.ts"
"types": "src/index.ts",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/driver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,6 @@
"nohoist": [
"*"
]
}
},
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@
],
"bin": {
"cypress-electron": "./bin/cypress-electron"
}
},
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/errors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,6 @@
"src",
"dist"
],
"types": "src/index.ts"
"types": "src/index.ts",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@
"dist",
"lib",
"theme"
]
],
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/https-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@
},
"files": [
"lib"
]
],
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"index.js",
"index.d.ts"
],
"license": "MIT"
"license": "MIT",
"nx": {}
}
2 changes: 1 addition & 1 deletion packages/launcher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading

5 comments on commit eed699e

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on eed699e Oct 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux x64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/13.15.1/linux-x64/develop-eed699eb6d86a1f2cf74284d14edecf47f32f0da/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on eed699e Oct 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux arm64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/13.15.1/linux-arm64/develop-eed699eb6d86a1f2cf74284d14edecf47f32f0da/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on eed699e Oct 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the win32 x64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/13.15.1/win32-x64/develop-eed699eb6d86a1f2cf74284d14edecf47f32f0da/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on eed699e Oct 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the darwin arm64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/13.15.1/darwin-arm64/develop-eed699eb6d86a1f2cf74284d14edecf47f32f0da/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on eed699e Oct 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the darwin x64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/13.15.1/darwin-x64/develop-eed699eb6d86a1f2cf74284d14edecf47f32f0da/cypress.tgz

Please sign in to comment.