Skip to content

fix(cli): merge config based on the first one#13117

Merged
Legend-Master merged 2 commits into
tauri-apps:devfrom
Legend-Master:merge-config-based-on-first
Apr 1, 2025
Merged

fix(cli): merge config based on the first one#13117
Legend-Master merged 2 commits into
tauri-apps:devfrom
Legend-Master:merge-config-based-on-first

Conversation

@Legend-Master
Copy link
Copy Markdown
Contributor

Fix #13114

Fix the behavior change from #12970

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 1, 2025

Package Changes Through 357912c

There are 6 changes which include @tauri-apps/api with patch, tauri-bundler with patch, tauri-cli with minor, tauri with minor, tauri-utils with minor, @tauri-apps/cli with minor

Planned Package Versions

The following package releases are the planned based on the context of changes in this pull request.

package current next
@tauri-apps/api 2.4.0 2.4.1
tauri-utils 2.3.0 2.4.0
tauri-bundler 2.3.0 2.3.1
tauri-runtime 2.5.0 2.5.1
tauri-runtime-wry 2.5.0 2.5.1
tauri-codegen 2.1.0 2.1.1
tauri-macros 2.1.0 2.1.1
tauri-plugin 2.1.0 2.1.1
tauri-build 2.1.0 2.1.1
tauri 2.4.0 2.5.0
@tauri-apps/cli 2.4.0 2.5.0
tauri-cli 2.4.0 2.5.0

Add another change file through the GitHub UI by following this link.


Read about change files or the docs at github.com/jbolda/covector

@Legend-Master Legend-Master marked this pull request as ready for review April 1, 2025 05:18
@Legend-Master Legend-Master requested a review from a team as a code owner April 1, 2025 05:18
@Legend-Master Legend-Master merged commit 794af77 into tauri-apps:dev Apr 1, 2025
@Legend-Master Legend-Master deleted the merge-config-based-on-first branch April 1, 2025 09:18
@anatawa12
Copy link
Copy Markdown
Contributor

anatawa12 commented Apr 1, 2025

New behavior in this PR looks unable to remove key with second / later -c option which is inconvenient and inconsistent I think.

When we divide -c '{"version":"1.0.2-beta.0", "bundle":{"windows":{"certificateThumbprint": null}}}' to -c '{"bundle":{"windows":{"certificateThumbprint": null}}}' -c '{"version":"1.0.2-beta.0"}' works but to -c '{"version":"1.0.2-beta.0"}' -c '{"bundle":{"windows":{"certificateThumbprint": null}}}' does not work as expected, which is unexpected to me.

Is there any reason to merge -c options into one then merge, instead of merge to original config one by one?

@Legend-Master
Copy link
Copy Markdown
Contributor Author

We need to store it in the TAURI_CONFIG environment variable and pass it to codegen and tauri-build, that's why it's merged together first I think

I don't know if changing it to a vector of merge configs would be breaking or not, or we could change the way we pre-merge the configs? Like instead of removing the value, we preserve them as null

kandrelczyk pushed a commit to kandrelczyk/tauri that referenced this pull request Apr 7, 2025
* fix(cli): merge config based on the first one

* Add change file
kandrelczyk pushed a commit to kandrelczyk/tauri that referenced this pull request Apr 7, 2025
* fix(cli): merge config based on the first one

* Add change file
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[bug] Setting config value to null with -c does not work since tauri cli 2.4.0

3 participants