Skip to content

Commit

Permalink
Revert "chore: simplify build script (#27547)"
Browse files Browse the repository at this point in the history
This reverts commit 0a86ec6.
  • Loading branch information
astone123 committed Aug 17, 2023
1 parent 84a468c commit 1af13a2
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
23 changes: 14 additions & 9 deletions .circleci/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1189,6 +1189,10 @@ commands:
command: |
source ./scripts/ensure-node.sh
yarn build --scope cypress
- run:
name: Copy Re-exported NPM Packages
command: node ./scripts/post-build.js
working_directory: cli
- run:
command: ls -la types
working_directory: cli/build
Expand Down Expand Up @@ -1523,7 +1527,7 @@ jobs:
- run: yarn test-scripts
# make sure packages with TypeScript can be transpiled to JS
- run: yarn lerna run build-prod --stream --concurrency 4
- run: yarn build --concurrency 4
- run: yarn lerna run build --stream --concurrency 4
# run unit tests from each individual package
- run: yarn test
# run type checking for each individual package
Expand Down Expand Up @@ -1906,7 +1910,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn 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 @@ -1951,7 +1955,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn build --scope @cypress/vue
command: yarn lerna run build --scope @cypress/vue
- store_test_results:
path: npm/vue/test_results
- store_artifacts:
Expand All @@ -1964,7 +1968,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn build --scope @cypress/angular
command: yarn lerna run build --scope @cypress/angular
- store-npm-logs

npm-react:
Expand All @@ -1973,7 +1977,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn build --scope @cypress/react
command: yarn lerna run build --scope @cypress/react
- run:
name: Run tests
command: yarn test
Expand All @@ -1990,7 +1994,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn 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 @@ -2007,7 +2011,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn build --scope @cypress/mount-utils
command: yarn lerna run build --scope @cypress/mount-utils
- store-npm-logs

npm-grep:
Expand All @@ -2029,7 +2033,7 @@ jobs:
resource_class: small
steps:
- restore_cached_workspace
- run: yarn build --scope create-cypress-tests
- run: yarn workspace create-cypress-tests build

npm-eslint-plugin-dev:
<<: *defaults
Expand All @@ -2046,7 +2050,8 @@ jobs:
- run:
name: Build + Install
command: |
yarn build --scope @cypress/schematic
yarn lerna run build --scope @cypress/schematic
working_directory: npm/cypress-schematic
- run:
name: Run unit tests
command: |
Expand Down
6 changes: 1 addition & 5 deletions cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"clean": "node ./scripts/clean.js",
"prebuild": "yarn postinstall && node ./scripts/start-build.js",
"build": "node ./scripts/build.js",
"postbuild": "node ./scripts/post-build.js",
"dtslint": "dtslint types",
"postinstall": "patch-package && node ./scripts/post-install.js",
"size": "t=\"cypress-v0.0.0.tgz\"; yarn pack --filename \"${t}\"; wc -c \"${t}\"; tar tvf \"${t}\"; rm \"${t}\";",
Expand Down Expand Up @@ -186,9 +185,6 @@
"{projectRoot}/build"
]
}
},
"implicitDependencies": [
"@cypress/*"
]
}
}
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"binary-zip": "node ./scripts/binary.js zip",
"binary-package": "cross-env NODE_OPTIONS=--max_old_space_size=8192 node ./scripts/binary.js package",
"check-binary-on-cdn": "node ./scripts/binary.js checkIfBinaryExistsOnCdn",
"build": "lerna run build --stream",
"build": "yarn build-npm-modules && lerna run build --stream --no-bail --ignore create-cypress-tests --ignore cypress --ignore \"'@packages/{runner}'\" --ignore \"'@cypress/{angular,react,react18,vue,vue2,mount-utils,svelte}'\" && node ./cli/scripts/post-build.js && lerna run build --stream --scope create-cypress-tests",
"build-npm-modules": "lerna run build --scope cypress --scope @cypress/mount-utils --scope @cypress/react && lerna run build --scope \"'@cypress/{angular,react18,vue,vue2,svelte}'\"",
"build-prod": "lerna run build-prod-ui --stream && lerna run build-prod --stream --ignore create-cypress-tests && node ./cli/scripts/post-build.js && lerna run build-prod --stream --scope create-cypress-tests --scope",
"build-v8-snapshot-dev": "node --max-old-space-size=8192 tooling/v8-snapshot/scripts/setup-v8-snapshot-in-cypress.js --env=dev",
"build-v8-snapshot-prod": "node --max-old-space-size=8192 tooling/v8-snapshot/scripts/setup-v8-snapshot-in-cypress.js",
Expand Down

0 comments on commit 1af13a2

Please sign in to comment.