Skip to content

spike: include wp and wbip with the binary #31808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/cache-version.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Bump this version to force CI to re-create the cache from scratch.

5-21-2025
5-30-2025-wbip-with-binary
10 changes: 5 additions & 5 deletions .circleci/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ mainBuildFilters: &mainBuildFilters
- /^release\/\d+\.\d+\.\d+$/
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- 'update-v8-snapshot-cache-on-develop'
- 'feat/wbip_full_resolve_ts_config'
- 'spike/preprocessor-cli'

# usually we don't build Mac app - it takes a long time
# but sometimes we want to really confirm we are doing the right thing
Expand All @@ -49,7 +49,7 @@ macWorkflowFilters: &darwin-workflow-filters
- equal: [ develop, << pipeline.git.branch >> ]
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
- equal: [ 'feat/wbip_full_resolve_ts_config', << pipeline.git.branch >> ]
- equal: [ 'spike/preprocessor-cli', << pipeline.git.branch >> ]
- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand All @@ -60,7 +60,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
- equal: [ develop, << pipeline.git.branch >> ]
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
- equal: [ 'feat/wbip_full_resolve_ts_config', << pipeline.git.branch >> ]
- equal: [ 'spike/preprocessor-cli', << pipeline.git.branch >> ]
- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand All @@ -83,7 +83,7 @@ windowsWorkflowFilters: &windows-workflow-filters
- equal: [ develop, << pipeline.git.branch >> ]
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
- equal: [ 'feat/wbip_full_resolve_ts_config', << pipeline.git.branch >> ]
- equal: [ 'spike/preprocessor-cli', << pipeline.git.branch >> ]
- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand Down Expand Up @@ -157,7 +157,7 @@ commands:
name: Set environment variable to determine whether or not to persist artifacts
command: |
echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "feat/wbip_full_resolve_ts_config" ]]; then
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "spike/preprocessor-cli" ]]; then
export SHOULD_PERSIST_ARTIFACTS=true
fi' >> "$BASH_ENV"
# You must run `setup_should_persist_artifacts` command and be using bash before running this command
Expand Down
4 changes: 3 additions & 1 deletion cli/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ package.json
/react
/vue
/svelte
/mount-utils
/mount-utils
/webpack-preprocessor
/webpack-batteries-included-preprocessor
2 changes: 2 additions & 0 deletions cli/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ react*
mount-utils
angular
svelte
webpack-preprocessor
webpack-batteries-included-preprocessor
13 changes: 12 additions & 1 deletion cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
},
"dependencies": {
"@cypress/request": "^3.0.8",
"@cypress/webpack-batteries-included-preprocessor": "0.0.0-development",
"@cypress/webpack-preprocessor": "0.0.0-development",
"@cypress/xvfb": "^1.2.4",
"@types/sinonjs__fake-timers": "8.1.1",
"@types/sizzle": "^2.3.2",
Expand Down Expand Up @@ -114,7 +116,9 @@
"vue",
"react",
"angular",
"svelte"
"svelte",
"webpack-preprocessor",
"webpack-batteries-included-preprocessor"
],
"bin": {
"cypress": "bin/cypress"
Expand Down Expand Up @@ -156,6 +160,13 @@
"types": "./svelte/dist/index.d.ts",
"import": "./svelte/dist/cypress-svelte.esm-bundler.js",
"require": "./svelte/dist/cypress-svelte.cjs.js"
},
"./webpack-preprocessor": {
"types": "./webpack-preprocessor/dist",
"require": "./webpack-preprocessor/dist"
},
"./webpack-batteries-included-preprocessor": {
"require": "./webpack-batteries-included-preprocessor/undefined"
}
},
"workspaces": {
Expand Down
2 changes: 2 additions & 0 deletions cli/scripts/post-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ const npmModulesToCopy = [
'vue',
'angular',
'svelte',
'webpack-preprocessor',
'webpack-batteries-included-preprocessor',
]

npmModulesToCopy.forEach((folder) => {
Expand Down
1 change: 1 addition & 0 deletions npm/webpack-batteries-included-preprocessor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"description": "Cypress preprocessor for bundling JavaScript via webpack with dependencies included and support for various ES features, TypeScript, and CoffeeScript",
"private": false,
"scripts": {
"build": "node ../../scripts/sync-exported-npm-with-cli.js",
"lint": "eslint --ext .js,.json, .",
"test": "mocha test/**/*.spec.* --timeout 4000"
},
Expand Down
1 change: 1 addition & 0 deletions npm/webpack-preprocessor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"main": "dist",
"scripts": {
"build": "rimraf dist && tsc || echo 'built, with errors'",
"postbuild": "node ../../scripts/sync-exported-npm-with-cli.js",
"check-ts": "tsc --noEmit",
"lint": "eslint --ext .js,.jsx,.ts,.tsx,.json, .",
"secure": "nsp check",
Expand Down
Loading