Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tauri-apps/tauri
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: tauri-build-v1.5.0
Choose a base ref
...
head repository: tauri-apps/tauri
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: tauri-build-v1.5.1
Choose a head ref
24 contributors
Loading
Showing with 4,722 additions and 4,089 deletions.
  1. +2 −12 .github/workflows/covector-version-or-publish-v1.yml
  2. +2 −12 .github/workflows/covector-version-or-publish.yml
  3. +3 −0 .github/workflows/lint-js.yml
  4. +0 −4 .github/workflows/publish-cli-js.yml
  5. +2 −2 .github/workflows/test-cli-rs.yml
  6. +20 −4 .github/workflows/test-core.yml
  7. +1 −1 .husky/pre-commit
  8. +5 −0 .prettierrc
  9. +0 −9 .prettierrc.js
  10. +7 −0 core/tauri-build/CHANGELOG.md
  11. +4 −4 core/tauri-build/Cargo.toml
  12. +6 −0 core/tauri-codegen/CHANGELOG.md
  13. +4 −4 core/tauri-codegen/Cargo.toml
  14. +13 −0 core/tauri-macros/CHANGELOG.md
  15. +5 −4 core/tauri-macros/Cargo.toml
  16. +58 −5 core/tauri-macros/src/command/wrapper.rs
  17. +18 −0 core/tauri-runtime-wry/CHANGELOG.md
  18. +8 −5 core/tauri-runtime-wry/Cargo.toml
  19. +20 −43 core/tauri-runtime-wry/src/clipboard.rs
  20. +2 −1 core/tauri-runtime-wry/src/global_shortcut.rs
  21. +155 −71 core/tauri-runtime-wry/src/lib.rs
  22. +6 −0 core/tauri-runtime/CHANGELOG.md
  23. +2 −2 core/tauri-runtime/Cargo.toml
  24. +3 −0 core/tauri-runtime/src/lib.rs
  25. +6 −0 core/tauri-runtime/src/menu.rs
  26. +12 −0 core/tauri-utils/CHANGELOG.md
  27. +8 −15 core/tauri-utils/Cargo.toml
  28. +7 −0 core/tauri-utils/src/assets.rs
  29. +1 −1 core/tauri-utils/src/config.rs
  30. +5 −70 core/tauri-utils/src/platform.rs
  31. +47 −0 core/tauri/CHANGELOG.md
  32. +22 −8 core/tauri/Cargo.toml
  33. +1 −8 core/tauri/scripts/bundle.global.js
  34. +5 −3 core/tauri/scripts/toggle-devtools.js
  35. +1 −1 core/tauri/src/api/mod.rs
  36. +53 −44 core/tauri/src/api/notification.rs
  37. +19 −21 core/tauri/src/app.rs
  38. +4 −0 core/tauri/src/command.rs
  39. +2 −0 core/tauri/src/endpoints/dialog.rs
  40. +1 −0 core/tauri/src/endpoints/file_system.rs
  41. +34 −5 core/tauri/src/hooks.rs
  42. +17 −0 core/tauri/src/lib.rs
  43. +30 −5 core/tauri/src/manager.rs
  44. +44 −19 core/tauri/src/plugin.rs
  45. +0 −1 core/tauri/src/state.rs
  46. +85 −34 core/tauri/src/test/mod.rs
  47. +184 −85 core/tauri/src/updater/core.rs
  48. +30 −1 core/tauri/src/window.rs
  49. +1 −1 core/tests/app-updater/tauri.conf.json
  50. +32 −3 core/tests/app-updater/tests/update.rs
  51. +237 −29 examples/api/src-tauri/Cargo.lock
  52. +3 −2 package.json
  53. +6 −3 renovate.json
  54. +51 −0 tooling/api/.eslintrc
  55. +0 −56 tooling/api/.eslintrc.cjs
  56. +0 −5 tooling/api/.prettierrc.cjs
  57. +40 −2 tooling/api/CHANGELOG.md
  58. +37 −29 tooling/api/package.json
  59. +101 −0 tooling/api/rollup.config.ts
  60. +0 −44 tooling/api/scripts/after-build.cjs
  61. +2 −2 tooling/api/src/dialog.ts
  62. +36 −2 tooling/api/src/mocks.ts
  63. +8 −1 tooling/api/src/notification.ts
  64. +3 −5 tooling/api/tsconfig.json
  65. +0 −34 tooling/api/tsup.config.ts
  66. +432 −807 tooling/api/yarn.lock
  67. +62 −0 tooling/bundler/CHANGELOG.md
  68. +10 −10 tooling/bundler/Cargo.toml
  69. +19 −17 tooling/bundler/src/bundle/common.rs
  70. +12 −2 tooling/bundler/src/bundle/linux/debian.rs
  71. +6 −2 tooling/bundler/src/bundle/macos/app.rs
  72. +38 −16 tooling/bundler/src/bundle/macos/sign.rs
  73. +4 −32 tooling/bundler/src/bundle/windows/msi/wix.rs
  74. +77 −40 tooling/bundler/src/bundle/windows/nsis.rs
  75. +23 −16 tooling/bundler/src/bundle/windows/templates/installer.nsi
  76. +18 −18 tooling/bundler/src/bundle/windows/templates/nsis-languages/French.nsh
  77. +27 −0 tooling/bundler/src/bundle/windows/templates/nsis-languages/German.nsh
  78. +71 −9 tooling/bundler/src/bundle/windows/util.rs
  79. +77 −0 tooling/cli/CHANGELOG.md
  80. +944 −827 tooling/cli/Cargo.lock
  81. +23 −22 tooling/cli/Cargo.toml
  82. +2 −2 tooling/cli/ENVIRONMENT_VARIABLES.md
  83. +3 −3 tooling/cli/metadata.json
  84. +80 −0 tooling/cli/node/CHANGELOG.md
  85. +4 −4 tooling/cli/node/Cargo.toml
  86. +2 −2 tooling/cli/node/package.json
  87. +1 −1 tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml
  88. +820 −984 tooling/cli/node/yarn.lock
  89. +4 −4 tooling/cli/src/build.rs
  90. +3 −1 tooling/cli/src/dev.rs
  91. +16 −0 tooling/cli/src/helpers/updater_signature.rs
  92. +6 −14 tooling/cli/src/helpers/web_dev_server.rs
  93. +13 −35 tooling/cli/src/info/app.rs
  94. +53 −125 tooling/cli/src/info/env_nodejs.rs
  95. +50 −100 tooling/cli/src/info/env_rust.rs
  96. +50 −83 tooling/cli/src/info/env_system.rs
  97. +116 −34 tooling/cli/src/info/mod.rs
  98. +35 −45 tooling/cli/src/info/packages_nodejs.rs
  99. +46 −84 tooling/cli/src/info/packages_rust.rs
  100. +4 −4 tooling/cli/src/init.rs
  101. +29 −2 tooling/cli/src/interface/rust.rs
  102. +2 −6 tooling/cli/src/interface/rust/desktop.rs
  103. +19 −16 tooling/cli/src/lib.rs
14 changes: 2 additions & 12 deletions .github/workflows/covector-version-or-publish-v1.yml
View file
Original file line number Diff line number Diff line change
@@ -115,17 +115,6 @@ jobs:
repository: tauri-apps/tauri-docs
event-type: update-docs

- name: Get `@tauri-apps/cli` release id
id: cliReleaseId
if: |
steps.covector.outputs.successfulPublish == 'true' &&
contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli')
run: |
echo '${{ steps.covector.outputs }}' > output.json
id=$(jq '.["-tauri-apps-cli-releaseId"]' < output.json)
rm output.json
echo "cliReleaseId=$id" >> "$GITHUB_OUTPUT"
- name: Trigger `@tauri-apps/cli` publishing workflow
if: |
steps.covector.outputs.successfulPublish == 'true' &&
@@ -135,7 +124,8 @@ jobs:
token: ${{ secrets.ORG_TAURI_BOT_PAT }}
repository: tauri-apps/tauri
event-type: publish-js-cli
client-payload: '{"releaseId": "${{ steps.cliReleaseId.outputs.cliReleaseId }}" }'
client-payload: >-
{"releaseId": "${{ steps.covector.outputs['-tauri-apps-cli-releaseId'] }}" }
- name: Trigger `tauri-cli` publishing workflow
if: |
14 changes: 2 additions & 12 deletions .github/workflows/covector-version-or-publish.yml
View file
Original file line number Diff line number Diff line change
@@ -115,17 +115,6 @@ jobs:
repository: tauri-apps/tauri-docs
event-type: update-docs

- name: Get `@tauri-apps/cli` release id
id: cliReleaseId
if: |
steps.covector.outputs.successfulPublish == 'true' &&
contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli')
run: |
echo '${{ toJSON(steps.covector.outputs) }}' > output.json
id=$(jq '.["-tauri-apps-cli-releaseId"]' < output.json)
rm output.json
echo "cliReleaseId=$id" >> "$GITHUB_OUTPUT"
- name: Trigger `@tauri-apps/cli` publishing workflow
if: |
steps.covector.outputs.successfulPublish == 'true' &&
@@ -135,7 +124,8 @@ jobs:
token: ${{ secrets.ORG_TAURI_BOT_PAT }}
repository: tauri-apps/tauri
event-type: publish-js-cli
client-payload: '{"releaseId": "${{ steps.cliReleaseId.outputs.cliReleaseId }}" }'
client-payload: >-
{"releaseId": "${{ steps.covector.outputs['-tauri-apps-cli-releaseId'] }}" }
- name: Trigger `tauri-cli` publishing workflow
if: |
3 changes: 3 additions & 0 deletions .github/workflows/lint-js.yml
View file
Original file line number Diff line number Diff line change
@@ -49,6 +49,9 @@ jobs:
- name: install deps via yarn
working-directory: ./tooling/api/
run: yarn
- name: run ts:check
working-directory: ./tooling/api/
run: yarn ts:check
- name: run lint
working-directory: ./tooling/api/
run: yarn lint
4 changes: 0 additions & 4 deletions .github/workflows/publish-cli-js.yml
View file
Original file line number Diff line number Diff line change
@@ -297,14 +297,10 @@ jobs:
- name: List packages
run: ls -R .
shell: bash
- name: Install system dependencies
run: |
apk add openssl-dev musl-dev glib-dev cairo-dev pkgconfig gdk-pixbuf-dev webkit2gtk-dev curl gtk+3.0-dev
- name: Setup and run tests
run: |
yarn tauri --help
ls -la
# TODO: fix this test: https://github.com/tauri-apps/tauri/runs/5145729140?check_suite_focus=true#step:9:704
#- name: Setup and run tests
# run: |
# rustup install stable
4 changes: 2 additions & 2 deletions .github/workflows/test-cli-rs.yml
View file
Original file line number Diff line number Diff line change
@@ -50,8 +50,8 @@ jobs:
with:
workspaces: tooling/cli

- name: build CLI
- name: test CLI
uses: actions-rs/cargo@v1
with:
command: build
command: test
args: --manifest-path ./tooling/cli/Cargo.toml
24 changes: 20 additions & 4 deletions .github/workflows/test-core.yml
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ jobs:
key: api-all
}
- {
args: --features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart,test,
args: --features tracing,compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart,test,
key: all
}

@@ -85,28 +85,44 @@ jobs:
- name: Downgrade crates with MSRV conflict
# The --precise flag can only be used once per invocation.
run: |
cargo update -p system-deps:6.2.0 --precise 6.1.1
cargo update -p toml:0.7.8 --precise 0.7.3
cargo update -p toml_edit --precise 0.19.8
cargo update -p toml_edit:0.19.15 --precise 0.19.8
cargo update -p embed-resource --precise 2.3.0
cargo update -p toml_datetime --precise 0.6.1
cargo update -p serde_spanned --precise 0.6.1
cargo update -p winnow --precise 0.4.1
cargo update -p plist --precise 1.5.1
cargo update -p time --precise 0.3.15
cargo update -p ignore --precise 0.4.18
cargo update -p raw-window-handle --precise 0.5.0
cargo update -p cargo_toml:0.15.3 --precise 0.15.2
cargo update -p zbus --precise 3.13.0
cargo update -p zbus_names --precise 2.5.0
cargo update -p is-terminal --precise 0.4.7
cargo update -p colored --precise 2.0.2
cargo update -p tempfile --precise 3.6.0
cargo update -p serde_with:3.3.0 --precise 3.0.0
cargo update -p serde_with:3.4.0 --precise 3.0.0
cargo update -p tokio --precise 1.29.0
cargo update -p flate2 --precise 1.0.26
cargo update -p h2 --precise 0.3.20
cargo update -p reqwest --precise 0.11.18
cargo update -p cfg-expr:0.15.5 --precise 0.15.4
cargo update -p memchr --precise 2.6.2
cargo update -p async-executor --precise 1.5.1
cargo update -p proptest --precise 1.2.0
cargo update -p regex --precise 1.9.6
cargo update -p bstr --precise 1.6.2
cargo update -p backtrace --precise 0.3.68
cargo update -p blocking --precise 1.4.1
cargo update -p ignore --precise 0.4.18
cargo update -p regex --precise 1.9.6
cargo update -p globset --precise 0.4.13
cargo update -p crossbeam-channel --precise 0.5.8
cargo update -p crossbeam-utils --precise 0.8.16
cargo update -p image --precise 0.24.4
cargo update -p async-process --precise 1.7.0
cargo update -p is-terminal --precise 0.4.7
cargo update -p tar --precise 0.4.39
- name: test
run: cargo test --target ${{ matrix.platform.target }} ${{ matrix.features.args }}
2 changes: 1 addition & 1 deletion .husky/pre-commit
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ if [ -z "$(git diff --name-only tooling/api)" ]; then
else
cd tooling/api
yarn format
yarn lint-fix
yarn lint:fix
cd ../..
fi

5 changes: 5 additions & 0 deletions .prettierrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"singleQuote": true,
"semi": false,
"trailingComma": "none"
}
9 changes: 0 additions & 9 deletions .prettierrc.js
View file

This file was deleted.

7 changes: 7 additions & 0 deletions core/tauri-build/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## \[1.5.1]

### Dependencies

- Upgraded to `tauri-utils@1.5.2`
- Upgraded to `tauri-codegen@1.4.2`

## \[1.5.0]

### What's Changed
8 changes: 4 additions & 4 deletions core/tauri-build/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri-build"
version = "1.5.0"
version = "1.5.1"
authors = [ "Tauri Programme within The Commons Conservancy" ]
categories = [ "gui", "web-programming" ]
license = "Apache-2.0 OR MIT"
@@ -19,13 +19,13 @@ rustdoc-args = [ "--cfg", "doc_cfg" ]
[dependencies]
anyhow = "1"
quote = { version = "1", optional = true }
tauri-codegen = { version = "1.4.1", path = "../tauri-codegen", optional = true }
tauri-utils = { version = "1.5.0", path = "../tauri-utils", features = [ "build", "resources" ] }
tauri-codegen = { version = "1.4.2", path = "../tauri-codegen", optional = true }
tauri-utils = { version = "1.5.2", path = "../tauri-utils", features = [ "build", "resources" ] }
cargo_toml = "0.15"
serde = "1"
serde_json = "1"
heck = "0.4"
json-patch = "1.0"
json-patch = "1.2"
tauri-winres = "0.1"
semver = "1"
walkdir = "2"
6 changes: 6 additions & 0 deletions core/tauri-codegen/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## \[1.4.2]

### Dependencies

- Upgraded to `tauri-utils@1.5.2`

## \[1.4.1]

### Dependencies
8 changes: 4 additions & 4 deletions core/tauri-codegen/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri-codegen"
version = "1.4.1"
version = "1.4.2"
authors = [ "Tauri Programme within The Commons Conservancy" ]
categories = [ "gui", "web-programming" ]
license = "Apache-2.0 OR MIT"
@@ -19,16 +19,16 @@ proc-macro2 = "1"
quote = "1"
serde = { version = "1", features = [ "derive" ] }
serde_json = "1"
tauri-utils = { version = "1.5.0", path = "../tauri-utils", features = [ "build" ] }
tauri-utils = { version = "1.5.2", path = "../tauri-utils", features = [ "build" ] }
thiserror = "1"
walkdir = "2"
brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] }
regex = { version = "1.7.1", optional = true }
regex = { version = "1", optional = true }
uuid = { version = "1", features = [ "v4" ] }
semver = "1"
ico = "0.3"
png = "0.17"
json-patch = "1.0"
json-patch = "1.2"

[target."cfg(target_os = \"macos\")".dependencies]
plist = "1"
13 changes: 13 additions & 0 deletions core/tauri-macros/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## \[1.4.3]

### Dependencies

- Upgraded to `tauri-utils@1.5.2`
- Upgraded to `tauri-codegen@1.4.2`

## \[1.4.2]

### Enhancements

- [`5e05236b`](https://www.github.com/tauri-apps/tauri/commit/5e05236b4987346697c7caae0567d3c50714c198)([#8289](https://www.github.com/tauri-apps/tauri/pull/8289)) Added tracing for window startup, plugins, `Window::eval`, events, IPC, updater and custom protocol request handlers behind the `tracing` feature flag.

## \[1.4.1]

### Dependencies
9 changes: 5 additions & 4 deletions core/tauri-macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri-macros"
version = "1.4.1"
version = "1.4.3"
authors = [ "Tauri Programme within The Commons Conservancy" ]
categories = [ "gui", "os", "filesystem", "web-programming" ]
license = "Apache-2.0 OR MIT"
@@ -16,12 +16,12 @@ readme = "README.md"
proc-macro = true

[dependencies]
proc-macro2 = "1"
proc-macro2 = { version = "1", features = [ "span-locations" ] }
quote = "1"
syn = { version = "1", features = [ "full" ] }
heck = "0.4"
tauri-codegen = { version = "1.4.1", default-features = false, path = "../tauri-codegen" }
tauri-utils = { version = "1.5.0", path = "../tauri-utils" }
tauri-codegen = { version = "1.4.2", default-features = false, path = "../tauri-codegen" }
tauri-utils = { version = "1.5.2", path = "../tauri-utils" }

[features]
custom-protocol = [ ]
@@ -30,3 +30,4 @@ isolation = [ "tauri-codegen/isolation" ]
shell-scope = [ "tauri-codegen/shell-scope" ]
config-json5 = [ "tauri-codegen/config-json5", "tauri-utils/config-json5" ]
config-toml = [ "tauri-codegen/config-toml", "tauri-utils/config-toml" ]
tracing = [ ]
Loading