Skip to content
Merged
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
6 changes: 3 additions & 3 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'
- 'chore/refactor_cli_to_ts'
- 'update-tsx'

# 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: [ 'chore/migrate-electron-lib-ts', << pipeline.git.branch >> ]
- equal: [ 'update-tsx', << pipeline.git.branch >> ]
Copy link

Choose a reason for hiding this comment

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

Bug: CI Configuration Branch Name Mismatch

The CI configuration has inconsistent branch name updates. While macWorkflowFilters was updated to use update-tsx instead of chore/migrate-electron-lib-ts, the linuxArm64WorkflowFilters and windowsWorkflowFilters still reference chore/migrate-electron-lib-ts. This means the Linux ARM64 and Windows workflows won't trigger for the update-tsx branch, leading to inconsistent CI behavior across platforms.

Fix in Cursor Fix in Web

- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand Down Expand Up @@ -163,7 +163,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" != "chore/refactor_cli_to_ts" ]]; then
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "update-tsx" ]]; 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: 2 additions & 2 deletions cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"snap-shot-it": "7.9.10",
"spawn-mock": "1.0.0",
"strip-ansi": "6.0.1",
"tsx": "4.20.4",
"tsx": "4.20.5",
"typescript": "~5.9.2"
},
"files": [
Expand All @@ -120,7 +120,7 @@
"cypress": "bin/cypress"
},
"engines": {
"node": "^20.0.0 || ^22.0.0 || >=24.0.0"
"node": "^20.1.0 || ^22.0.0 || >=24.0.0"
},
"types": "types",
"exports": {
Expand Down
2 changes: 1 addition & 1 deletion packages/data-context/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"server-destroy": "1.0.1",
"simple-git": "^3.27.0",
"stringify-object": "^3.0.0",
"tsx": "4.20.4",
"tsx": "4.20.5",
"underscore.string": "^3.3.6",
"wonka": "^4.0.15"
},
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31004,10 +31004,10 @@ tsutils@^2.29.0:
dependencies:
tslib "^1.8.1"

[email protected].4:
version "4.20.4"
resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.20.4.tgz#3fcf255dbc8826bdde2820f1cff47e31075c1d30"
integrity sha512-yyxBKfORQ7LuRt/BQKBXrpcq59ZvSW0XxwfjAt3w2/8PmdxaFzijtMhTawprSHhpzeM5BgU2hXHG3lklIERZXg==
[email protected].5:
version "4.20.5"
resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.20.5.tgz#856c8b2f114c50a9f4ae108126967a167f240dc7"
integrity sha512-+wKjMNU9w/EaQayHXb7WA7ZaHY6hN8WgfvHNQ3t1PnU91/7O8TcTnIhCDYTZwnt8JsO9IBqZ30Ln1r7pPF52Aw==
Copy link

Choose a reason for hiding this comment

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

Bug: Node Compatibility Issue with tsx Upgrade

The PR's stated goal was to downgrade tsx to 4.19.3 for Node 20.0.0 compatibility. Instead, tsx is upgraded from 4.20.4 to 4.20.5, and the Node engine requirement is updated to drop support for Node 20.0.0. This contradicts the intended fix and removes Node 20.0.0 compatibility rather than resolving it.

Additional Locations (3)

Fix in Cursor Fix in Web

dependencies:
esbuild "~0.25.0"
get-tsconfig "^4.7.5"
Expand Down
Loading