Skip to content
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

fix: parse json5 capability files when config-json5 is enabled #11658

Merged
merged 2 commits into from
Nov 12, 2024

Conversation

Legend-Master
Copy link
Contributor

Fix #11637

@Legend-Master Legend-Master requested a review from a team as a code owner November 12, 2024 07:59
Copy link
Contributor

github-actions bot commented Nov 12, 2024

Package Changes Through ea3dc0c

There are 4 changes which include tauri-cli with patch, @tauri-apps/cli with patch, tauri with patch, tauri-utils with patch

Planned Package Versions

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

package current next
tauri-utils 2.1.0 2.1.1
tauri-bundler 2.1.0 2.1.1
tauri-runtime 2.2.0 2.2.1
tauri-runtime-wry 2.2.0 2.2.1
tauri-codegen 2.0.3 2.0.4
tauri-macros 2.0.3 2.0.4
tauri-plugin 2.0.3 2.0.4
tauri-build 2.0.3 2.0.4
tauri 2.1.1 2.1.2
@tauri-apps/cli 2.1.0 2.1.1
tauri-cli 2.1.0 2.1.1

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
Copy link
Contributor Author

Legend-Master commented Nov 12, 2024

Toml support should technically be enabled by config-toml feature, but it seems like we're using it for the permission and config files regardless the feature flag, changing it now is a breaking change so left that untouched

Also from the docs, it seems like we have stated that we only support toml for permission files while from the code, it seems like we actually support both json and toml?

image

@amrbashir amrbashir changed the title fix: json5 capability files don't work fix: parse json5 capability files when config-json5 is enabled Nov 12, 2024
@amrbashir amrbashir merged commit 4693521 into tauri-apps:dev Nov 12, 2024
24 checks passed
@Legend-Master Legend-Master deleted the json5-capability-files branch November 12, 2024 14:47
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] follow offical document create Window Customization occur error?
2 participants