-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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(cli): fix migration from globalShortcut to global-shortcut #9262
Open
i-c-b
wants to merge
10
commits into
tauri-apps:dev
Choose a base branch
from
i-c-b:patch-1
base: dev
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+75
−30
Open
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
2e76da2
fix(cli): migrate api/globalShortcut to plugin-global-shortcut
i-c-b 1977f87
Create fix-cli-migrate-global-shortcut.md
i-c-b d59f093
add `app` as core api module and fix globalShortcut package installation
i-c-b b58bf06
Update and rename fix-cli-migrate-global-shortcut.md to fix-cli-migra…
i-c-b 9fc68ff
ignore error for missing files in `tauri add`, continue to warning
i-c-b 5b7b8e2
ignore all core modules, fix cargo global-shortcut package name
i-c-b 10c43ad
fix capabilities when running `tauri migrate` multiple times
i-c-b 60ed670
Update fix-cli-multi-run-migrate-and-package-names.md
i-c-b 2398b3f
Rename fix-cli-migrate-global-shortcut-and-skip-app.md to fix-cli-mul…
i-c-b 5e92fd8
move permissions inside check for existing migrated ACL file
i-c-b File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
--- | ||
"tauri": patch:bug | ||
--- | ||
|
||
Fix multiple runs of migration and some package name changes. | ||
- Skip all core plugin migrations. | ||
- Don't exit when `tauri::Builder` is not found. | ||
- Skip overwriting existing migrated capabilities. | ||
- `globalShortcut` now migrates to `global-shortcut`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we also print the migrated capability json here? so the user can compare both files (or maybe write to
migrates.json.tmp
)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The established pattern so far has been to print any manual changes. Rather than a temporary file that the user is expected to act on, would it be better to check if
migrated.permissions
is empty and, if not, make another file without the*:default
s?