소스 검색

Merge branch 'dev' into feat/emitter-listener

Amr Bashir 1 년 전
부모
커밋
4bfd5099fa
39개의 변경된 파일1098개의 추가작업 그리고 204개의 파일을 삭제
  1. 7 0
      .changes/event-reopen.md
  2. 5 0
      .changes/fix-draw-tracing.md
  3. 5 0
      .changes/fix-incompatible-ipc-field-postmessage.md
  4. 5 0
      .changes/pre.json
  5. 3 2
      .github/workflows/supply-chain.yml
  6. 2 1
      .github/workflows/test-core.yml
  7. 10 10
      Cargo.lock
  8. 7 0
      core/tauri-build/CHANGELOG.md
  9. 3 3
      core/tauri-build/Cargo.toml
  10. 6 0
      core/tauri-codegen/CHANGELOG.md
  11. 2 2
      core/tauri-codegen/Cargo.toml
  12. 7 0
      core/tauri-macros/CHANGELOG.md
  13. 3 3
      core/tauri-macros/Cargo.toml
  14. 6 0
      core/tauri-plugin/CHANGELOG.md
  15. 2 2
      core/tauri-plugin/Cargo.toml
  16. 15 0
      core/tauri-runtime-wry/CHANGELOG.md
  17. 4 4
      core/tauri-runtime-wry/Cargo.toml
  18. 17 12
      core/tauri-runtime-wry/src/lib.rs
  19. 14 0
      core/tauri-runtime/CHANGELOG.md
  20. 2 2
      core/tauri-runtime/Cargo.toml
  21. 6 0
      core/tauri-runtime/src/lib.rs
  22. 6 0
      core/tauri-utils/CHANGELOG.md
  23. 1 1
      core/tauri-utils/Cargo.toml
  24. 22 0
      core/tauri/CHANGELOG.md
  25. 7 7
      core/tauri/Cargo.toml
  26. 14 0
      core/tauri/src/app.rs
  27. 1 1
      core/tauri/src/ipc/protocol.rs
  28. 1 1
      examples/parent-window/index.html
  29. 281 5
      supply-chain/audits.toml
  30. 0 120
      supply-chain/config.toml
  31. 600 13
      supply-chain/imports.lock
  32. 6 0
      tooling/bundler/CHANGELOG.md
  33. 2 2
      tooling/bundler/Cargo.toml
  34. 7 0
      tooling/cli/CHANGELOG.md
  35. 5 5
      tooling/cli/Cargo.lock
  36. 3 3
      tooling/cli/Cargo.toml
  37. 4 4
      tooling/cli/metadata-v2.json
  38. 6 0
      tooling/cli/node/CHANGELOG.md
  39. 1 1
      tooling/cli/node/package.json

+ 7 - 0
.changes/event-reopen.md

@@ -0,0 +1,7 @@
+---
+'tauri': 'minor:feat'
+'tauri-runtime': 'minor:feat'
+'tauri-runtime-wry': 'minor:feat'
+---
+
+Add `RunEvent::Reopen` for handle click on dock icon on macOS.

+ 5 - 0
.changes/fix-draw-tracing.md

@@ -0,0 +1,5 @@
+---
+"tauri-runtime-wry": patch:bug
+---
+
+Fixes redraw tracing span not closing.

+ 5 - 0
.changes/fix-incompatible-ipc-field-postmessage.md

@@ -0,0 +1,5 @@
+---
+"tauri": patch:bug
+---
+
+Fix IPC tracing format incompatible between the custom protocol and the postMessage implementations.

+ 5 - 0
.changes/pre.json

@@ -90,6 +90,7 @@
     ".changes/enhance-event-emit.md",
     ".changes/enhance-ipc-url-check.md",
     ".changes/enhance-resource-dir-resolution.md",
+    ".changes/event-reopen.md",
     ".changes/expose-image-constructor.md",
     ".changes/expose-js-image.md",
     ".changes/fix-acl-webview-check.md",
@@ -102,6 +103,7 @@
     ".changes/fix-codegen-rerun-if-changed.md",
     ".changes/fix-config-arg.md",
     ".changes/fix-fs-scope-check-symlink.md",
+    ".changes/fix-incompatible-ipc-field-postmessage.md",
     ".changes/fix-inner-size.md",
     ".changes/fix-invoke-devtools-by-hotkey.md",
     ".changes/fix-ios-dev-logs.md",
@@ -112,6 +114,7 @@
     ".changes/fix-mobile-cmd-case.md",
     ".changes/fix-mobile-process-spawn.md",
     ".changes/fix-process-ipc-message-fn.md",
+    ".changes/fix-proxy-url-totokens-impl.md",
     ".changes/fix-remote-domain-url.md",
     ".changes/fix-reparent.md",
     ".changes/fix-rewrite-schema.md",
@@ -201,6 +204,8 @@
     ".changes/update-acl-paths-cli.md",
     ".changes/update-app-template-capabilities-conf.md",
     ".changes/update-plugin-template.md",
+    ".changes/url-result-runtime.md",
+    ".changes/url-result.md",
     ".changes/utils-bundle-target-all.md",
     ".changes/utils-bundle-type-all.md",
     ".changes/utils-debug-eprintln.md",

+ 3 - 2
.github/workflows/supply-chain.yml

@@ -37,8 +37,9 @@ jobs:
       - name: Ensure that the tool cache is populated with the cargo-vet binary
         run: cargo install --root ${{ runner.tool_cache }}/cargo-vet --version ${{ env.CARGO_VET_VERSION }} cargo-vet
 
-      - name: Invoke cargo-vet
-        run: cargo vet --locked
+# Enable this again to break the workflow once we have a reasonable amount of suggestions to get to a clean base line
+#      - name: Invoke cargo-vet
+#        run: cargo vet --locked
 
       - name: Provide audit suggestions
         run: cargo vet --locked suggestions

+ 2 - 1
.github/workflows/test-core.yml

@@ -93,8 +93,9 @@ jobs:
 
       - name: test (using cross)
         if: ${{ matrix.platform.cross }}
+        # update or remove the rev once we update the MSRV from 1.70.0
         run: |
-          cargo install cross --git https://github.com/cross-rs/cross --locked
+          cargo install cross --git https://github.com/cross-rs/cross --rev 20c73df79c9aaf78a2ad2e9fe8ae981668a729dc --locked
           cross ${{ matrix.platform.command }} --target ${{ matrix.platform.target }} ${{ matrix.features.args }}
 
       - name: test (using cargo)

+ 10 - 10
Cargo.lock

@@ -3471,9 +3471,9 @@ dependencies = [
 
 [[package]]
 name = "tao"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92bcf8885e147b56d6e26751263b45876284f32ca404703f6d3b8f80d16ff4dd"
+checksum = "12a8121bd5721ebbbe0889f8286d5824673beeb04071519b68916fbed04f3093"
 dependencies = [
  "bitflags 2.5.0",
  "cocoa",
@@ -3527,7 +3527,7 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "tauri"
-version = "2.0.0-beta.18"
+version = "2.0.0-beta.19"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3585,7 +3585,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -3607,7 +3607,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 dependencies = [
  "base64 0.22.0",
  "brotli",
@@ -3644,7 +3644,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -3656,7 +3656,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 dependencies = [
  "anyhow",
  "glob",
@@ -3671,7 +3671,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.0.0-beta.15"
+version = "2.0.0-beta.16"
 dependencies = [
  "dpi",
  "gtk",
@@ -3688,7 +3688,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.0.0-beta.15"
+version = "2.0.0-beta.16"
 dependencies = [
  "cocoa",
  "gtk",
@@ -3711,7 +3711,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 dependencies = [
  "aes-gcm",
  "brotli",

+ 7 - 0
core/tauri-build/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+- Upgraded to `tauri-codegen@2.0.0-beta.15`
+
 ## \[2.0.0-beta.14]
 
 ### Dependencies

+ 3 - 3
core/tauri-build/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-build"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "build time code to pair with https://crates.io/crates/tauri"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -28,8 +28,8 @@ rustdoc-args = [ "--cfg", "docsrs" ]
 [dependencies]
 anyhow = "1"
 quote = { version = "1", optional = true }
-tauri-codegen = { version = "2.0.0-beta.14", path = "../tauri-codegen", optional = true }
-tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils", features = [ "build", "resources" ] }
+tauri-codegen = { version = "2.0.0-beta.15", path = "../tauri-codegen", optional = true }
+tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils", features = [ "build", "resources" ] }
 cargo_toml = "0.17"
 serde = "1"
 serde_json = "1"

+ 6 - 0
core/tauri-codegen/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+
 ## \[2.0.0-beta.14]
 
 ### Dependencies

+ 2 - 2
core/tauri-codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-codegen"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -20,7 +20,7 @@ quote = "1"
 syn = "2"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
-tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils", features = [ "build" ] }
+tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils", features = [ "build" ] }
 thiserror = "1"
 walkdir = "2"
 brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] }

+ 7 - 0
core/tauri-macros/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+- Upgraded to `tauri-codegen@2.0.0-beta.15`
+
 ## \[2.0.0-beta.14]
 
 ### Dependencies

+ 3 - 3
core/tauri-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-macros"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "Macros for the tauri crate."
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -20,8 +20,8 @@ proc-macro2 = { version = "1", features = [ "span-locations" ] }
 quote = "1"
 syn = { version = "2", features = [ "full" ] }
 heck = "0.5"
-tauri-codegen = { version = "2.0.0-beta.14", default-features = false, path = "../tauri-codegen" }
-tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
+tauri-codegen = { version = "2.0.0-beta.15", default-features = false, path = "../tauri-codegen" }
+tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils" }
 
 [features]
 custom-protocol = [ ]

+ 6 - 0
core/tauri-plugin/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+
 ## \[2.0.0-beta.14]
 
 ### Enhancements

+ 2 - 2
core/tauri-plugin/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "Build script and runtime Tauri plugin definitions"
 authors = { workspace = true }
 homepage = { workspace = true }
@@ -30,7 +30,7 @@ runtime = [ ]
 [dependencies]
 anyhow = { version = "1", optional = true }
 serde = { version = "1", optional = true }
-tauri-utils = { version = "2.0.0-beta.14", default-features = false, features = [ "build" ], path = "../tauri-utils" }
+tauri-utils = { version = "2.0.0-beta.15", default-features = false, features = [ "build" ], path = "../tauri-utils" }
 serde_json = { version = "1", optional = true }
 glob = { version = "0.3", optional = true }
 toml = { version = "0.8", optional = true }

+ 15 - 0
core/tauri-runtime-wry/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## \[2.0.0-beta.16]
+
+### New Features
+
+- [`78839b6d2`](https://www.github.com/tauri-apps/tauri/commit/78839b6d2f1005a5e6e1a54b0305136bae0c3a7c)([#4865](https://www.github.com/tauri-apps/tauri/pull/4865)) Add `RunEvent::Reopen` for handle click on dock icon on macOS.
+
+### What's Changed
+
+- [`783ef0f2d`](https://www.github.com/tauri-apps/tauri/commit/783ef0f2d331f520fa827c3112f36c0b519b9292)([#9647](https://www.github.com/tauri-apps/tauri/pull/9647)) Changed `WebviewDispatch::url` getter to return a result.
+
+### Dependencies
+
+- Upgraded to `tauri-runtime@2.0.0-beta.16`
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+
 ## \[2.0.0-beta.15]
 
 ### Dependencies

+ 4 - 4
core/tauri-runtime-wry/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-runtime-wry"
-version = "2.0.0-beta.15"
+version = "2.0.0-beta.16"
 description = "Wry bindings to the Tauri runtime"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -14,9 +14,9 @@ rust-version = { workspace = true }
 
 [dependencies]
 wry = { version = "0.39.3", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] }
-tao = { version = "0.27", default-features = false, features = [ "rwh_06" ] }
-tauri-runtime = { version = "2.0.0-beta.15", path = "../tauri-runtime" }
-tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
+tao = { version = "0.28", default-features = false, features = [ "rwh_06" ] }
+tauri-runtime = { version = "2.0.0-beta.16", path = "../tauri-runtime" }
+tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils" }
 raw-window-handle = "0.6"
 http = "1.1"
 url = "2"

+ 17 - 12
core/tauri-runtime-wry/src/lib.rs

@@ -345,14 +345,11 @@ pub struct ActiveTraceSpanStore(Rc<RefCell<Vec<ActiveTracingSpan>>>);
 
 #[cfg(feature = "tracing")]
 impl ActiveTraceSpanStore {
-  pub fn remove_window_draw(&self, window_id: TaoWindowId) {
-    let mut store = self.0.borrow_mut();
-    if let Some(index) = store
-      .iter()
-      .position(|t| matches!(t, ActiveTracingSpan::WindowDraw { id, span: _ } if id == &window_id))
-    {
-      store.remove(index);
-    }
+  pub fn remove_window_draw(&self) {
+    self
+      .0
+      .borrow_mut()
+      .retain(|t| !matches!(t, ActiveTracingSpan::WindowDraw { id: _, span: _ }));
   }
 }
 
@@ -3242,9 +3239,8 @@ fn handle_event_loop<T: UserEvent>(
       callback(RunEvent::Exit);
     }
 
-    #[cfg(any(feature = "tracing", windows))]
+    #[cfg(windows)]
     Event::RedrawRequested(id) => {
-      #[cfg(windows)]
       if let Some(window_id) = window_id_map.get(&id) {
         let mut windows_ref = windows.0.borrow_mut();
         if let Some(window) = windows_ref.get_mut(&window_id) {
@@ -3257,9 +3253,11 @@ fn handle_event_loop<T: UserEvent>(
           }
         }
       }
+    }
 
-      #[cfg(feature = "tracing")]
-      active_tracing_spans.remove_window_draw(id);
+    #[cfg(feature = "tracing")]
+    Event::RedrawEventsCleared => {
+      active_tracing_spans.remove_window_draw();
     }
 
     Event::UserEvent(Message::Webview(
@@ -3441,6 +3439,13 @@ fn handle_event_loop<T: UserEvent>(
     Event::Opened { urls } => {
       callback(RunEvent::Opened { urls });
     }
+    #[cfg(target_os = "macos")]
+    Event::Reopen {
+      has_visible_windows,
+      ..
+    } => callback(RunEvent::Reopen {
+      has_visible_windows,
+    }),
     _ => (),
   }
 }

+ 14 - 0
core/tauri-runtime/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## \[2.0.0-beta.16]
+
+### New Features
+
+- [`78839b6d2`](https://www.github.com/tauri-apps/tauri/commit/78839b6d2f1005a5e6e1a54b0305136bae0c3a7c)([#4865](https://www.github.com/tauri-apps/tauri/pull/4865)) Add `RunEvent::Reopen` for handle click on dock icon on macOS.
+
+### What's Changed
+
+- [`783ef0f2d`](https://www.github.com/tauri-apps/tauri/commit/783ef0f2d331f520fa827c3112f36c0b519b9292)([#9647](https://www.github.com/tauri-apps/tauri/pull/9647)) Changed `WebviewDispatch::url` getter to return a result.
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+
 ## \[2.0.0-beta.15]
 
 ### Dependencies

+ 2 - 2
core/tauri-runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-runtime"
-version = "2.0.0-beta.15"
+version = "2.0.0-beta.16"
 description = "Runtime for Tauri applications"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -29,7 +29,7 @@ targets = [
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 thiserror = "1.0"
-tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
+tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils" }
 http = "1.1"
 raw-window-handle = "0.6"
 url = { version = "2" }

+ 6 - 0
core/tauri-runtime/src/lib.rs

@@ -235,6 +235,12 @@ pub enum RunEvent<T: UserEvent> {
   /// Emitted when the user wants to open the specified resource with the app.
   #[cfg(any(target_os = "macos", target_os = "ios"))]
   Opened { urls: Vec<url::Url> },
+  /// Emitted when the NSApplicationDelegate's applicationShouldHandleReopen gets called
+  #[cfg(target_os = "macos")]
+  Reopen {
+    /// Indicates whether the NSApplication object found any visible windows in your application.
+    has_visible_windows: bool,
+  },
   /// A custom event defined by the user.
   UserEvent(T),
 }

+ 6 - 0
core/tauri-utils/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Bug Fixes
+
+- [`a5205f179`](https://www.github.com/tauri-apps/tauri/commit/a5205f179e577cce5c05b710b597da8f4e1d0780)([#9691](https://www.github.com/tauri-apps/tauri/pull/9691)) Fixes the ToTokens implementation of the window configuration `proxy_url` field.
+
 ## \[2.0.0-beta.14]
 
 ### Bug Fixes

+ 1 - 1
core/tauri-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-utils"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "Utilities for Tauri"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"

+ 22 - 0
core/tauri/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## \[2.0.0-beta.19]
+
+### New Features
+
+- [`78839b6d2`](https://www.github.com/tauri-apps/tauri/commit/78839b6d2f1005a5e6e1a54b0305136bae0c3a7c)([#4865](https://www.github.com/tauri-apps/tauri/pull/4865)) Add `RunEvent::Reopen` for handle click on dock icon on macOS.
+
+### Bug Fixes
+
+- [`fedca7386`](https://www.github.com/tauri-apps/tauri/commit/fedca7386079fe639c629d6084cc13031150baf6)([#9720](https://www.github.com/tauri-apps/tauri/pull/9720)) Fix IPC tracing format incompatible between the custom protocol and the postMessage implementations.
+
+### Dependencies
+
+- Upgraded to `tauri-runtime@2.0.0-beta.16`
+- Upgraded to `tauri-runtime-wry@2.0.0-beta.16`
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+- Upgraded to `tauri-macros@2.0.0-beta.15`
+- Upgraded to `tauri-build@2.0.0-beta.15`
+
+### Breaking Changes
+
+- [`783ef0f2d`](https://www.github.com/tauri-apps/tauri/commit/783ef0f2d331f520fa827c3112f36c0b519b9292)([#9647](https://www.github.com/tauri-apps/tauri/pull/9647)) Changed `WebviewWindow::url` and `Webview::url` getter to return a result.
+
 ## \[2.0.0-beta.18]
 
 ### New Features

+ 7 - 7
core/tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri"
-version = "2.0.0-beta.18"
+version = "2.0.0-beta.19"
 description = "Make tiny, secure apps for all desktop platforms with Tauri"
 exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -51,10 +51,10 @@ uuid = { version = "1", features = [ "v4" ], optional = true }
 url = "2"
 anyhow = "1.0"
 thiserror = "1.0"
-tauri-runtime = { version = "2.0.0-beta.15", path = "../tauri-runtime" }
-tauri-macros = { version = "2.0.0-beta.14", path = "../tauri-macros" }
-tauri-utils = { version = "2.0.0-beta.14", features = [ "resources" ], path = "../tauri-utils" }
-tauri-runtime-wry = { version = "2.0.0-beta.15", path = "../tauri-runtime-wry", optional = true }
+tauri-runtime = { version = "2.0.0-beta.16", path = "../tauri-runtime" }
+tauri-macros = { version = "2.0.0-beta.15", path = "../tauri-macros" }
+tauri-utils = { version = "2.0.0-beta.15", features = [ "resources" ], path = "../tauri-utils" }
+tauri-runtime-wry = { version = "2.0.0-beta.16", path = "../tauri-runtime-wry", optional = true }
 getrandom = "0.2"
 serde_repr = "0.1"
 state = "0.6"
@@ -110,8 +110,8 @@ swift-rs = "1.0.6"
 
 [build-dependencies]
 heck = "0.5"
-tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-beta.14" }
-tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.14", features = [ "build" ] }
+tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-beta.15" }
+tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.15", features = [ "build" ] }
 
 [dev-dependencies]
 proptest = "1.4.0"

+ 14 - 0
core/tauri/src/app.rs

@@ -240,6 +240,14 @@ pub enum RunEvent {
   #[cfg(all(desktop, feature = "tray-icon"))]
   #[cfg_attr(docsrs, doc(cfg(all(desktop, feature = "tray-icon"))))]
   TrayIconEvent(crate::tray::TrayIconEvent),
+  /// Emitted when the NSApplicationDelegate's applicationShouldHandleReopen gets called
+  #[non_exhaustive]
+  #[cfg(target_os = "macos")]
+  #[cfg_attr(docsrs, doc(cfg(target_os = "macos")))]
+  Reopen {
+    /// Indicates whether the NSApplication object found any visible windows in your application.
+    has_visible_windows: bool,
+  },
 }
 
 impl From<EventLoopMessage> for RunEvent {
@@ -1992,6 +2000,12 @@ fn on_event_loop_event<R: Runtime>(
     }
     #[cfg(any(target_os = "macos", target_os = "ios"))]
     RuntimeRunEvent::Opened { urls } => RunEvent::Opened { urls },
+    #[cfg(target_os = "macos")]
+    RuntimeRunEvent::Reopen {
+      has_visible_windows,
+    } => RunEvent::Reopen {
+      has_visible_windows,
+    },
     _ => unimplemented!(),
   };
 

+ 1 - 1
core/tauri/src/ipc/protocol.rs

@@ -167,7 +167,7 @@ fn handle_ipc_message<R: Runtime>(request: Request<String>, manager: &AppManager
       "ipc::request",
       kind = "post-message",
       uri = request.uri().to_string(),
-      body = request.body()
+      request = request.body()
     )
     .entered();
 

+ 1 - 1
examples/parent-window/index.html

@@ -14,7 +14,7 @@
     <div id="response"></div>
 
     <script>
-      const WebviewWindow = window.__TAURI__.webview.WebviewWindow
+      const { WebviewWindow } = window.__TAURI_.webviewWindow
       const thisTauriWindow = window.__TAURI__.window.getCurrent()
       const windowLabel = thisTauriWindow.label
       const windowLabelContainer = document.getElementById('window-label')

+ 281 - 5
supply-chain/audits.toml

@@ -3,6 +3,24 @@
 
 [audits]
 
+[[trusted.aead]]
+criteria = "safe-to-deploy"
+user-id = 267 # Tony Arcieri (tarcieri)
+start = "2020-06-05"
+end = "2025-05-08"
+
+[[trusted.aes]]
+criteria = "safe-to-deploy"
+user-id = 267 # Tony Arcieri (tarcieri)
+start = "2020-06-05"
+end = "2025-05-08"
+
+[[trusted.aes-gcm]]
+criteria = "safe-to-deploy"
+user-id = 267 # Tony Arcieri (tarcieri)
+start = "2019-08-16"
+end = "2025-05-08"
+
 [[trusted.aho-corasick]]
 criteria = "safe-to-deploy"
 user-id = 189 # Andrew Gallant (BurntSushi)
@@ -15,6 +33,12 @@ user-id = 3618 # David Tolnay (dtolnay)
 start = "2019-10-05"
 end = "2025-03-06"
 
+[[trusted.autocfg]]
+criteria = "safe-to-deploy"
+user-id = 539 # Josh Stone (cuviper)
+start = "2019-05-22"
+end = "2025-05-08"
+
 [[trusted.backtrace]]
 criteria = "safe-to-deploy"
 user-id = 2915 # Amanieu d'Antras (Amanieu)
@@ -51,6 +75,30 @@ user-id = 2915 # Amanieu d'Antras (Amanieu)
 start = "2024-02-20"
 end = "2025-03-06"
 
+[[trusted.cipher]]
+criteria = "safe-to-deploy"
+user-id = 267 # Tony Arcieri (tarcieri)
+start = "2020-10-15"
+end = "2025-05-08"
+
+[[trusted.cpufeatures]]
+criteria = "safe-to-deploy"
+user-id = 267 # Tony Arcieri (tarcieri)
+start = "2021-04-26"
+end = "2025-05-08"
+
+[[trusted.ctr]]
+criteria = "safe-to-deploy"
+user-id = 267 # Tony Arcieri (tarcieri)
+start = "2020-06-06"
+end = "2025-05-08"
+
+[[trusted.digest]]
+criteria = "safe-to-deploy"
+user-id = 267 # Tony Arcieri (tarcieri)
+start = "2020-06-10"
+end = "2025-05-08"
+
 [[trusted.dtoa]]
 criteria = "safe-to-deploy"
 user-id = 3618 # David Tolnay (dtolnay)
@@ -69,6 +117,12 @@ user-id = 1 # Alex Crichton (alexcrichton)
 start = "2019-03-14"
 end = "2025-03-06"
 
+[[trusted.ghash]]
+criteria = "safe-to-deploy"
+user-id = 267 # Tony Arcieri (tarcieri)
+start = "2019-09-19"
+end = "2025-05-08"
+
 [[trusted.h2]]
 criteria = "safe-to-deploy"
 user-id = 359 # Sean McArthur (seanmonstar)
@@ -93,6 +147,12 @@ user-id = 359 # Sean McArthur (seanmonstar)
 start = "2019-10-01"
 end = "2025-03-06"
 
+[[trusted.http-body-util]]
+criteria = "safe-to-deploy"
+user-id = 359 # Sean McArthur (seanmonstar)
+start = "2022-10-25"
+end = "2025-05-08"
+
 [[trusted.httparse]]
 criteria = "safe-to-deploy"
 user-id = 359 # Sean McArthur (seanmonstar)
@@ -111,6 +171,12 @@ user-id = 359 # Sean McArthur (seanmonstar)
 start = "2019-03-19"
 end = "2025-03-06"
 
+[[trusted.hyper-util]]
+criteria = "safe-to-deploy"
+user-id = 359 # Sean McArthur (seanmonstar)
+start = "2022-01-15"
+end = "2025-05-08"
+
 [[trusted.indexmap]]
 criteria = "safe-to-deploy"
 user-id = 539 # Josh Stone (cuviper)
@@ -123,18 +189,48 @@ user-id = 3618 # David Tolnay (dtolnay)
 start = "2019-05-02"
 end = "2025-03-06"
 
+[[trusted.javascriptcore-rs]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-10-04"
+end = "2025-05-08"
+
+[[trusted.javascriptcore-rs-sys]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-10-04"
+end = "2025-05-08"
+
 [[trusted.js-sys]]
 criteria = "safe-to-deploy"
 user-id = 1 # Alex Crichton (alexcrichton)
 start = "2019-03-04"
 end = "2025-03-06"
 
+[[trusted.libappindicator]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-10-11"
+end = "2025-05-08"
+
+[[trusted.libappindicator-sys]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-10-11"
+end = "2025-05-08"
+
 [[trusted.libc]]
 criteria = "safe-to-deploy"
 user-id = 2915 # Amanieu d'Antras (Amanieu)
 start = "2021-01-27"
 end = "2025-03-06"
 
+[[trusted.libc]]
+criteria = "safe-to-deploy"
+user-id = 51017 # Yuki Okushi (JohnTitor)
+start = "2020-03-17"
+end = "2025-05-08"
+
 [[trusted.libm]]
 criteria = "safe-to-deploy"
 user-id = 2915 # Amanieu d'Antras (Amanieu)
@@ -177,6 +273,18 @@ user-id = 10 # Carl Lerche (carllerche)
 start = "2019-05-15"
 end = "2025-03-06"
 
+[[trusted.muda]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2022-12-06"
+end = "2025-05-08"
+
+[[trusted.new_debug_unreachable]]
+criteria = "safe-to-deploy"
+user-id = 2017 # Matt Brubeck (mbrubeck)
+start = "2019-02-26"
+end = "2025-05-08"
+
 [[trusted.num_cpus]]
 criteria = "safe-to-deploy"
 user-id = 359 # Sean McArthur (seanmonstar)
@@ -201,35 +309,47 @@ user-id = 2915 # Amanieu d'Antras (Amanieu)
 start = "2019-05-04"
 end = "2025-03-06"
 
+[[trusted.paste]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-03-19"
+end = "2025-05-08"
+
 [[trusted.phf]]
 criteria = "safe-to-deploy"
 user-id = 51017 # Yuki Okushi (JohnTitor)
 start = "2021-06-17"
-end = "2025-03-06"
+end = "2025-05-08"
 
 [[trusted.phf_codegen]]
 criteria = "safe-to-deploy"
 user-id = 51017 # Yuki Okushi (JohnTitor)
 start = "2021-06-17"
-end = "2025-03-06"
+end = "2025-05-08"
 
 [[trusted.phf_generator]]
 criteria = "safe-to-deploy"
 user-id = 51017 # Yuki Okushi (JohnTitor)
 start = "2021-06-17"
-end = "2025-03-06"
+end = "2025-05-08"
 
 [[trusted.phf_macros]]
 criteria = "safe-to-deploy"
 user-id = 51017 # Yuki Okushi (JohnTitor)
 start = "2021-06-17"
-end = "2025-03-06"
+end = "2025-05-08"
 
 [[trusted.phf_shared]]
 criteria = "safe-to-deploy"
 user-id = 51017 # Yuki Okushi (JohnTitor)
 start = "2021-06-17"
-end = "2025-03-06"
+end = "2025-05-08"
+
+[[trusted.polyval]]
+criteria = "safe-to-deploy"
+user-id = 267 # Tony Arcieri (tarcieri)
+start = "2019-08-13"
+end = "2025-05-08"
 
 [[trusted.proc-macro-hack]]
 criteria = "safe-to-deploy"
@@ -273,12 +393,24 @@ user-id = 359 # Sean McArthur (seanmonstar)
 start = "2019-03-04"
 end = "2025-03-06"
 
+[[trusted.rustc-demangle]]
+criteria = "safe-to-deploy"
+user-id = 1 # Alex Crichton (alexcrichton)
+start = "2019-04-12"
+end = "2025-05-08"
+
 [[trusted.rustix]]
 criteria = "safe-to-deploy"
 user-id = 6825 # Dan Gohman (sunfishcode)
 start = "2021-10-29"
 end = "2025-03-06"
 
+[[trusted.rustversion]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-07-08"
+end = "2025-05-08"
+
 [[trusted.ryu]]
 criteria = "safe-to-deploy"
 user-id = 3618 # David Tolnay (dtolnay)
@@ -315,6 +447,12 @@ user-id = 3618 # David Tolnay (dtolnay)
 start = "2019-03-01"
 end = "2025-03-06"
 
+[[trusted.serde_derive]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-03-01"
+end = "2025-05-08"
+
 [[trusted.serde_derive_internals]]
 criteria = "safe-to-deploy"
 user-id = 3618 # David Tolnay (dtolnay)
@@ -339,6 +477,24 @@ user-id = 6743 # Ed Page (epage)
 start = "2023-01-20"
 end = "2025-03-06"
 
+[[trusted.serialize-to-javascript]]
+criteria = "safe-to-deploy"
+user-id = 28029 # chip (chippers)
+start = "2022-02-08"
+end = "2025-05-08"
+
+[[trusted.serialize-to-javascript-impl]]
+criteria = "safe-to-deploy"
+user-id = 28029 # chip (chippers)
+start = "2022-02-08"
+end = "2025-05-08"
+
+[[trusted.sha2]]
+criteria = "safe-to-deploy"
+user-id = 267 # Tony Arcieri (tarcieri)
+start = "2020-05-24"
+end = "2025-05-08"
+
 [[trusted.slab]]
 criteria = "safe-to-deploy"
 user-id = 6741 # Alice Ryhl (Darksonn)
@@ -363,12 +519,78 @@ user-id = 3618 # David Tolnay (dtolnay)
 start = "2019-03-01"
 end = "2025-03-06"
 
+[[trusted.tao]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-04-30"
+end = "2025-05-08"
+
+[[trusted.tao-macros]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2023-01-11"
+end = "2025-05-08"
+
 [[trusted.target-lexicon]]
 criteria = "safe-to-deploy"
 user-id = 6825 # Dan Gohman (sunfishcode)
 start = "2019-03-06"
 end = "2025-03-06"
 
+[[trusted.tauri]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2020-07-20"
+end = "2025-05-08"
+
+[[trusted.tauri-build]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-04-14"
+end = "2025-05-08"
+
+[[trusted.tauri-codegen]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-04-14"
+end = "2025-05-08"
+
+[[trusted.tauri-macros]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-04-14"
+end = "2025-05-08"
+
+[[trusted.tauri-plugin]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2024-02-03"
+end = "2025-05-08"
+
+[[trusted.tauri-runtime]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-05-10"
+end = "2025-05-08"
+
+[[trusted.tauri-runtime-wry]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-05-10"
+end = "2025-05-08"
+
+[[trusted.tauri-utils]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-04-14"
+end = "2025-05-08"
+
+[[trusted.tauri-winres]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2023-01-19"
+end = "2025-05-08"
+
 [[trusted.thiserror]]
 criteria = "safe-to-deploy"
 user-id = 3618 # David Tolnay (dtolnay)
@@ -429,6 +651,24 @@ user-id = 6743 # Ed Page (epage)
 start = "2021-09-13"
 end = "2025-03-06"
 
+[[trusted.tower]]
+criteria = "safe-to-deploy"
+user-id = 10 # Carl Lerche (carllerche)
+start = "2019-04-27"
+end = "2025-05-08"
+
+[[trusted.tower-layer]]
+criteria = "safe-to-deploy"
+user-id = 10 # Carl Lerche (carllerche)
+start = "2019-04-27"
+end = "2025-05-08"
+
+[[trusted.tray-icon]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2022-12-01"
+end = "2025-05-08"
+
 [[trusted.ucd-trie]]
 criteria = "safe-to-deploy"
 user-id = 189 # Andrew Gallant (BurntSushi)
@@ -495,12 +735,30 @@ user-id = 1 # Alex Crichton (alexcrichton)
 start = "2019-03-04"
 end = "2025-03-06"
 
+[[trusted.webkit2gtk]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-10-05"
+end = "2025-05-08"
+
+[[trusted.webkit2gtk-sys]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-10-05"
+end = "2025-05-08"
+
 [[trusted.winapi-util]]
 criteria = "safe-to-deploy"
 user-id = 189 # Andrew Gallant (BurntSushi)
 start = "2020-01-11"
 end = "2025-03-06"
 
+[[trusted.window-vibrancy]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2022-03-05"
+end = "2025-05-08"
+
 [[trusted.windows]]
 criteria = "safe-to-deploy"
 user-id = 64539 # Kenny Kerr (kennykerr)
@@ -567,6 +825,12 @@ user-id = 64539 # Kenny Kerr (kennykerr)
 start = "2021-10-28"
 end = "2025-03-06"
 
+[[trusted.windows_i686_gnullvm]]
+criteria = "safe-to-deploy"
+user-id = 64539 # Kenny Kerr (kennykerr)
+start = "2024-04-02"
+end = "2025-05-08"
+
 [[trusted.windows_i686_msvc]]
 criteria = "safe-to-deploy"
 user-id = 64539 # Kenny Kerr (kennykerr)
@@ -596,3 +860,15 @@ criteria = "safe-to-deploy"
 user-id = 6743 # Ed Page (epage)
 start = "2023-02-22"
 end = "2025-03-06"
+
+[[trusted.wry]]
+criteria = "safe-to-deploy"
+user-id = 95389 # tauri (tauri-bot)
+start = "2021-03-11"
+end = "2025-05-08"
+
+[[trusted.zeroize]]
+criteria = "safe-to-deploy"
+user-id = 267 # Tony Arcieri (tarcieri)
+start = "2021-11-05"
+end = "2025-05-08"

+ 0 - 120
supply-chain/config.toml

@@ -50,18 +50,6 @@ audit-as-crates-io = true
 version = "0.21.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.aead]]
-version = "0.5.2"
-criteria = "safe-to-deploy"
-
-[[exemptions.aes]]
-version = "0.8.4"
-criteria = "safe-to-deploy"
-
-[[exemptions.aes-gcm]]
-version = "0.10.3"
-criteria = "safe-to-deploy"
-
 [[exemptions.alloc-no-stdlib]]
 version = "2.0.4"
 criteria = "safe-to-deploy"
@@ -150,10 +138,6 @@ criteria = "safe-to-deploy"
 version = "0.4.34"
 criteria = "safe-to-deploy"
 
-[[exemptions.cipher]]
-version = "0.4.4"
-criteria = "safe-to-deploy"
-
 [[exemptions.cocoa]]
 version = "0.25.0"
 criteria = "safe-to-deploy"
@@ -178,10 +162,6 @@ criteria = "safe-to-deploy"
 version = "0.1.3"
 criteria = "safe-to-deploy"
 
-[[exemptions.cpufeatures]]
-version = "0.2.12"
-criteria = "safe-to-deploy"
-
 [[exemptions.crc32fast]]
 version = "1.4.0"
 criteria = "safe-to-deploy"
@@ -226,10 +206,6 @@ criteria = "safe-to-deploy"
 version = "0.3.11"
 criteria = "safe-to-deploy"
 
-[[exemptions.digest]]
-version = "0.10.7"
-criteria = "safe-to-deploy"
-
 [[exemptions.dirs-next]]
 version = "2.0.0"
 criteria = "safe-to-deploy"
@@ -466,14 +442,6 @@ criteria = "safe-to-deploy"
 version = "2.9.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.javascriptcore-rs]]
-version = "1.1.2"
-criteria = "safe-to-deploy"
-
-[[exemptions.javascriptcore-rs-sys]]
-version = "1.1.1"
-criteria = "safe-to-deploy"
-
 [[exemptions.jni-sys]]
 version = "0.3.0"
 criteria = "safe-to-deploy"
@@ -494,14 +462,6 @@ criteria = "safe-to-deploy"
 version = "0.8.2"
 criteria = "safe-to-deploy"
 
-[[exemptions.libappindicator]]
-version = "0.9.0"
-criteria = "safe-to-deploy"
-
-[[exemptions.libappindicator-sys]]
-version = "0.9.0"
-criteria = "safe-to-deploy"
-
 [[exemptions.libloading]]
 version = "0.7.4"
 criteria = "safe-to-deploy"
@@ -546,10 +506,6 @@ criteria = "safe-to-deploy"
 version = "0.8.11"
 criteria = "safe-to-deploy"
 
-[[exemptions.muda]]
-version = "0.11.5"
-criteria = "safe-to-deploy"
-
 [[exemptions.ndk]]
 version = "0.7.0"
 criteria = "safe-to-deploy"
@@ -650,10 +606,6 @@ criteria = "safe-to-deploy"
 version = "0.17.13"
 criteria = "safe-to-deploy"
 
-[[exemptions.polyval]]
-version = "0.6.1"
-criteria = "safe-to-deploy"
-
 [[exemptions.powerfmt]]
 version = "0.2.0"
 criteria = "safe-to-deploy"
@@ -778,14 +730,6 @@ criteria = "safe-to-deploy"
 version = "3.6.1"
 criteria = "safe-to-deploy"
 
-[[exemptions.serialize-to-javascript]]
-version = "0.1.1"
-criteria = "safe-to-deploy"
-
-[[exemptions.serialize-to-javascript-impl]]
-version = "0.1.1"
-criteria = "safe-to-deploy"
-
 [[exemptions.sha2]]
 version = "0.10.8"
 criteria = "safe-to-deploy"
@@ -858,50 +802,6 @@ criteria = "safe-to-deploy"
 version = "6.2.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.tao]]
-version = "0.26.1"
-criteria = "safe-to-deploy"
-
-[[exemptions.tao-macros]]
-version = "0.1.2"
-criteria = "safe-to-deploy"
-
-[[exemptions.tauri]]
-version = "2.0.0-beta.8"
-criteria = "safe-to-deploy"
-
-[[exemptions.tauri-build]]
-version = "2.0.0-beta.6"
-criteria = "safe-to-deploy"
-
-[[exemptions.tauri-codegen]]
-version = "2.0.0-beta.6"
-criteria = "safe-to-deploy"
-
-[[exemptions.tauri-macros]]
-version = "2.0.0-beta.6"
-criteria = "safe-to-deploy"
-
-[[exemptions.tauri-plugin]]
-version = "2.0.0-beta.6"
-criteria = "safe-to-deploy"
-
-[[exemptions.tauri-runtime]]
-version = "2.0.0-beta.6"
-criteria = "safe-to-deploy"
-
-[[exemptions.tauri-runtime-wry]]
-version = "2.0.0-beta.6"
-criteria = "safe-to-deploy"
-
-[[exemptions.tauri-utils]]
-version = "2.0.0-beta.6"
-criteria = "safe-to-deploy"
-
-[[exemptions.tauri-winres]]
-version = "0.1.1"
-criteria = "safe-to-deploy"
-
 [[exemptions.tempfile]]
 version = "3.10.1"
 criteria = "safe-to-deploy"
@@ -950,10 +850,6 @@ criteria = "safe-to-deploy"
 version = "0.2.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.tray-icon]]
-version = "0.11.3"
-criteria = "safe-to-deploy"
-
 [[exemptions.treediff]]
 version = "4.0.3"
 criteria = "safe-to-deploy"
@@ -1010,14 +906,6 @@ criteria = "safe-to-deploy"
 version = "0.31.1"
 criteria = "safe-to-deploy"
 
-[[exemptions.webkit2gtk]]
-version = "2.0.1"
-criteria = "safe-to-deploy"
-
-[[exemptions.webkit2gtk-sys]]
-version = "2.0.1"
-criteria = "safe-to-deploy"
-
 [[exemptions.webpki-roots]]
 version = "0.25.4"
 criteria = "safe-to-deploy"
@@ -1046,10 +934,6 @@ criteria = "safe-to-deploy"
 version = "0.4.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.window-vibrancy]]
-version = "0.5.0"
-criteria = "safe-to-deploy"
-
 [[exemptions.winreg]]
 version = "0.50.0"
 criteria = "safe-to-deploy"
@@ -1058,10 +942,6 @@ criteria = "safe-to-deploy"
 version = "0.51.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.wry]]
-version = "0.37.0"
-criteria = "safe-to-deploy"
-
 [[exemptions.x11]]
 version = "2.21.0"
 criteria = "safe-to-deploy"

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 600 - 13
supply-chain/imports.lock


+ 6 - 0
tooling/bundler/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.1-beta.13]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+
 ## \[2.0.1-beta.12]
 
 ### Dependencies

+ 2 - 2
tooling/bundler/Cargo.toml

@@ -2,7 +2,7 @@ workspace = { }
 
 [package]
 name = "tauri-bundler"
-version = "2.0.1-beta.12"
+version = "2.0.1-beta.13"
 authors = [
   "George Burton <burtonageo@gmail.com>",
   "Tauri Programme within The Commons Conservancy"
@@ -17,7 +17,7 @@ rust-version = "1.70"
 exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ]
 
 [dependencies]
-tauri-utils = { version = "2.0.0-beta.14", path = "../../core/tauri-utils", features = [ "resources" ] }
+tauri-utils = { version = "2.0.0-beta.15", path = "../../core/tauri-utils", features = [ "resources" ] }
 image = "0.24.9"
 flate2 = "1.0"
 anyhow = "1.0"

+ 7 - 0
tooling/cli/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-beta.17]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+- Upgraded to `tauri-bundler@2.0.1-beta.13`
+
 ## \[2.0.0-beta.16]
 
 ### Bug Fixes

+ 5 - 5
tooling/cli/Cargo.lock

@@ -4853,7 +4853,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-bundler"
-version = "2.0.1-beta.12"
+version = "2.0.1-beta.13"
 dependencies = [
  "anyhow",
  "ar",
@@ -4881,7 +4881,7 @@ dependencies = [
  "strsim 0.11.0",
  "tar",
  "tauri-icns",
- "tauri-utils 2.0.0-beta.14",
+ "tauri-utils 2.0.0-beta.15",
  "tempfile",
  "thiserror",
  "time",
@@ -4895,7 +4895,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-cli"
-version = "2.0.0-beta.16"
+version = "2.0.0-beta.17"
 dependencies = [
  "anyhow",
  "axum",
@@ -4946,7 +4946,7 @@ dependencies = [
  "tauri-bundler",
  "tauri-icns",
  "tauri-utils 1.5.4",
- "tauri-utils 2.0.0-beta.14",
+ "tauri-utils 2.0.0-beta.15",
  "thiserror",
  "tokio",
  "toml 0.8.10",
@@ -5012,7 +5012,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 dependencies = [
  "aes-gcm",
  "ctor",

+ 3 - 3
tooling/cli/Cargo.toml

@@ -3,7 +3,7 @@ members = [ "node" ]
 
 [package]
 name = "tauri-cli"
-version = "2.0.0-beta.16"
+version = "2.0.0-beta.17"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 edition = "2021"
 rust-version = "1.70"
@@ -49,7 +49,7 @@ sublime_fuzzy = "0.7"
 clap_complete = "4"
 clap = { version = "4.5", features = [ "derive", "env" ] }
 anyhow = "1.0"
-tauri-bundler = { version = "2.0.1-beta.12", default-features = false, path = "../bundler" }
+tauri-bundler = { version = "2.0.1-beta.13", default-features = false, path = "../bundler" }
 colored = "2.1"
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = { version = "1.0", features = [ "preserve_order" ] }
@@ -59,7 +59,7 @@ shared_child = "1.0"
 duct = "0.13"
 toml_edit = { version = "0.22", features = [ "serde" ] }
 json-patch = "1.2"
-tauri-utils = { version = "2.0.0-beta.14", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] }
+tauri-utils = { version = "2.0.0-beta.15", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] }
 tauri-utils-v1 = { version = "1", package = "tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] }
 toml = "0.8"
 jsonschema = "0.17"

+ 4 - 4
tooling/cli/metadata-v2.json

@@ -1,9 +1,9 @@
 {
   "cli.js": {
-    "version": "2.0.0-beta.16",
+    "version": "2.0.0-beta.17",
     "node": ">= 10.0.0"
   },
-  "tauri": "2.0.0-beta.18",
-  "tauri-build": "2.0.0-beta.14",
-  "tauri-plugin": "2.0.0-beta.14"
+  "tauri": "2.0.0-beta.19",
+  "tauri-build": "2.0.0-beta.15",
+  "tauri-plugin": "2.0.0-beta.15"
 }

+ 6 - 0
tooling/cli/node/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.17]
+
+### Dependencies
+
+- Upgraded to `tauri-cli@2.0.0-beta.17`
+
 ## \[2.0.0-beta.16]
 
 ### Bug Fixes

+ 1 - 1
tooling/cli/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/cli",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.0-beta.17",
   "description": "Command line interface for building Tauri apps",
   "funding": {
     "type": "opencollective",

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.