sync dev with upstream/dev#2
Merged
Merged
Conversation
* refactor: make error dialog take `&'static str` * Add comments
Bumps [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) from 5.53.11 to 5.55.7. - [Release notes](https://github.com/sveltejs/svelte/releases) - [Changelog](https://github.com/sveltejs/svelte/blob/main/packages/svelte/CHANGELOG.md) - [Commits](https://github.com/sveltejs/svelte/commits/svelte@5.55.7/packages/svelte) --- updated-dependencies: - dependency-name: svelte dependency-version: 5.55.7 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>
…elp_menu_for_nsapp` (tauri-apps#15386)
* fix: resources after empty directory not copied * typo * Add empty directory test
…uri-apps#15372)" (tauri-apps#15400) This reverts commit 32d8166.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* fix(bundler): clarify nsis config path errors * Address NSIS path context review * Fix NSIS test module order * Address NSIS review comments * Add more `fs_context`s --------- Co-authored-by: Tony <legendmastertony@gmail.com>
Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 5.0.5 to 5.0.6. - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](juliangruber/brace-expansion@v5.0.5...v5.0.6) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 5.0.6 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…s#15417) * chore(deps): bump ws from 8.18.0 to 8.20.1 (via audit fix) Bumps [ws](https://github.com/websockets/ws) from 8.18.0 to 8.20.1. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](websockets/ws@8.18.0...8.20.1) --- updated-dependencies: - dependency-name: ws dependency-version: 8.20.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Fix missing override in the commit --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tony <legendmastertony@gmail.com>
…DLLs (tauri-apps#15422) * fix(nsis): embed signed copies of stock plugins, not unsigned system DLLs * refactor(nsis): hoist !addplugindir above !include to stay ahead of plugin commands
* fix: check makensis exit code * Merge branch 'dev' of https://github.com/tauri-apps/tauri into check-makensis-exit-code
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Fast-forward sync of
devwithupstream/dev(origin/dev is a strict ancestor; 15 commits, no patches to carry forward on this branch).Notable upstream commits:
Note: this PR only updates the fork's
devtracking branch. The fltsci/fltsci consuming rev09a83563(onfix/refcell-panic) is on a different branch and is unaffected.