Skip to content

fix(cli): preserve null when merging patches - #13120

Merged
lucasfernog merged 3 commits into
tauri-apps:devfrom
Legend-Master:merge-patches-perserve-null
Apr 1, 2025
Merged

fix(cli): preserve null when merging patches#13120
lucasfernog merged 3 commits into
tauri-apps:devfrom
Legend-Master:merge-patches-perserve-null

Conversation

@Legend-Master

Copy link
Copy Markdown
Contributor

@Legend-Master
Legend-Master requested a review from a team as a code owner April 1, 2025 12:30
@github-actions

github-actions Bot commented Apr 1, 2025

Copy link
Copy Markdown
Contributor

Package Changes Through bc6bfaa

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 commented Apr 1, 2025

Copy link
Copy Markdown
Contributor Author

@anatawa12 Do you think this matches your expectation?

cargo tauri build --config '{ "app": { "withGlobalTauri": null } }' --config '{ "app": { "windows": null } }'
[crates\tauri-cli\src\helpers\config.rs:172:5] merge_config = Object {
    "app": Object {
        "withGlobalTauri": Null,
        "windows": Null,
    },
}

@anatawa12

Copy link
Copy Markdown
Contributor

@anatawa12 Do you think this match your expectation?

cargo run --package tauri-cli -- build --config '{ "app": { "withGlobalTauri": null } }' --config '{ "app": { "windows": null } }'

[crates\tauri-cli\src\helpers\config.rs:172:5] merge_config = Object {

"app": Object {
    "withGlobalTauri": Null,
    "windows": Null,
},

}

Yes. it matches with my expectation. Thank you for quick fix.

@lucasfernog
lucasfernog merged commit aa6b4d4 into tauri-apps:dev Apr 1, 2025
@Legend-Master
Legend-Master deleted the merge-patches-perserve-null branch April 1, 2025 17:05
kandrelczyk pushed a commit to kandrelczyk/tauri that referenced this pull request Apr 7, 2025
* fix(cli): preserve null when merging patches

* add test

* remove commented out code

---------

Co-authored-by: Lucas Nogueira <lucas@tauri.app>
kandrelczyk pushed a commit to kandrelczyk/tauri that referenced this pull request Apr 7, 2025
* fix(cli): preserve null when merging patches

* add test

* remove commented out code

---------

Co-authored-by: Lucas Nogueira <lucas@tauri.app>
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.

3 participants