fix tauri::utils usage in codegen

core/tauri-codegen/src/context.rs

@@ -371,7 +371,7 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
       .expect("failed to write Info.plist");
 
     let info_plist_path = out_path.display().to_string();
-    quote!(::tauri_utils::embed_plist::embed_info_plist!(#info_plist_path);)
+    quote!(::tauri::utils::embed_plist::embed_info_plist!(#info_plist_path);)
   } else {
     TokenStream::new()
   };
@@ -414,7 +414,7 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
         assets: ::std::sync::Arc::new(#assets),
         schema: #schema.into(),
         key: #key.into(),
-        crypto_keys: std::boxed::Box::new(::tauri_utils::pattern::isolation::Keys::new().expect("unable to generate cryptographically secure keys for Tauri \"Isolation\" Pattern")),
+        crypto_keys: std::boxed::Box::new(::tauri::utils::pattern::isolation::Keys::new().expect("unable to generate cryptographically secure keys for Tauri \"Isolation\" Pattern")),
       })
     }
   };

core/tauri-codegen/src/embedded_assets.rs

@@ -434,7 +434,7 @@ impl ToTokens for EmbeddedAssets {
     // we expect phf related items to be in path when generating the path code
     tokens.append_all(quote! {{
         #[allow(unused_imports)]
-        use ::tauri_utils::assets::{CspHash, EmbeddedAssets, phf, phf::phf_map};
+        use ::tauri::utils::assets::{CspHash, EmbeddedAssets, phf, phf::phf_map};
         EmbeddedAssets::new(phf_map! { #assets }, &[#global_hashes], phf_map! { #html_hashes })
     }});
   }

core/tauri-utils/src/config.rs

@@ -2979,7 +2979,7 @@ mod build {
   macro_rules! literal_struct {
     ($tokens:ident, $struct:ident, $($field:ident),+) => {
       $tokens.append_all(quote! {
-        ::tauri_utils::config::$struct {
+        ::tauri::utils::config::$struct {
           $($field: #$field),+
         }
       });
@@ -2988,7 +2988,7 @@ mod build {
 
   impl ToTokens for WindowUrl {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::config::WindowUrl };
+      let prefix = quote! { ::tauri::utils::config::WindowUrl };
 
       tokens.append_all(match self {
         Self::App(path) => {
@@ -3005,7 +3005,7 @@ mod build {
 
   impl ToTokens for crate::Theme {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::Theme };
+      let prefix = quote! { ::tauri::utils::Theme };
 
       tokens.append_all(match self {
         Self::Light => quote! { #prefix::Light },
@@ -3016,7 +3016,7 @@ mod build {
 
   impl ToTokens for crate::TitleBarStyle {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::TitleBarStyle };
+      let prefix = quote! { ::tauri::utils::TitleBarStyle };
 
       tokens.append_all(match self {
         Self::Visible => quote! { #prefix::Visible },
@@ -3100,7 +3100,7 @@ mod build {
 
   impl ToTokens for PatternKind {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::config::PatternKind };
+      let prefix = quote! { ::tauri::utils::config::PatternKind };
 
       tokens.append_all(match self {
         Self::Brownfield => quote! { #prefix::Brownfield },
@@ -3117,7 +3117,7 @@ mod build {
 
   impl ToTokens for WebviewInstallMode {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::config::WebviewInstallMode };
+      let prefix = quote! { ::tauri::utils::config::WebviewInstallMode };
 
       tokens.append_all(match self {
         Self::Skip => quote! { #prefix::Skip },
@@ -3148,7 +3148,7 @@ mod build {
       } else {
         self.webview_install_mode.clone()
       };
-      tokens.append_all(quote! { ::tauri_utils::config::WindowsConfig {
+      tokens.append_all(quote! { ::tauri::utils::config::WindowsConfig {
         webview_install_mode: #webview_install_mode,
         ..Default::default()
       }})
@@ -3201,7 +3201,7 @@ mod build {
 
   impl ToTokens for AppUrl {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::config::AppUrl };
+      let prefix = quote! { ::tauri::utils::config::AppUrl };
 
       tokens.append_all(match self {
         Self::Url(url) => {
@@ -3243,7 +3243,7 @@ mod build {
 
   impl ToTokens for WindowsUpdateInstallMode {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::config::WindowsUpdateInstallMode };
+      let prefix = quote! { ::tauri::utils::config::WindowsUpdateInstallMode };
 
       tokens.append_all(match self {
         Self::BasicUi => quote! { #prefix::BasicUi },
@@ -3272,7 +3272,7 @@ mod build {
           .map(|list| {
             vec_lit(list, |url| {
               let url = url.0.as_str();
-              quote! { ::tauri_utils::config::UpdaterEndpoint(#url.parse().unwrap()) }
+              quote! { ::tauri::utils::config::UpdaterEndpoint(#url.parse().unwrap()) }
             })
           })
           .as_ref(),
@@ -3285,7 +3285,7 @@ mod build {
 
   impl ToTokens for CspDirectiveSources {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::config::CspDirectiveSources };
+      let prefix = quote! { ::tauri::utils::config::CspDirectiveSources };
 
       tokens.append_all(match self {
         Self::Inline(sources) => {
@@ -3302,7 +3302,7 @@ mod build {
 
   impl ToTokens for Csp {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::config::Csp };
+      let prefix = quote! { ::tauri::utils::config::Csp };
 
       tokens.append_all(match self {
         Self::Policy(policy) => {
@@ -3324,7 +3324,7 @@ mod build {
 
   impl ToTokens for DisabledCspModificationKind {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::config::DisabledCspModificationKind };
+      let prefix = quote! { ::tauri::utils::config::DisabledCspModificationKind };
 
       tokens.append_all(match self {
         Self::Flag(flag) => {
@@ -3398,7 +3398,7 @@ mod build {
 
   impl ToTokens for FsAllowlistScope {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::config::FsAllowlistScope };
+      let prefix = quote! { ::tauri::utils::config::FsAllowlistScope };
 
       tokens.append_all(match self {
         Self::AllowedPaths(allow) => {
@@ -3418,7 +3418,7 @@ mod build {
     fn to_tokens(&self, tokens: &mut TokenStream) {
       let scope = &self.scope;
       tokens.append_all(
-        quote! { ::tauri_utils::config::FsAllowlistConfig { scope: #scope, ..Default::default() } },
+        quote! { ::tauri::utils::config::FsAllowlistConfig { scope: #scope, ..Default::default() } },
       )
     }
   }
@@ -3426,21 +3426,21 @@ mod build {
   impl ToTokens for ProtocolAllowlistConfig {
     fn to_tokens(&self, tokens: &mut TokenStream) {
       let asset_scope = &self.asset_scope;
-      tokens.append_all(quote! { ::tauri_utils::config::ProtocolAllowlistConfig { asset_scope: #asset_scope, ..Default::default() } })
+      tokens.append_all(quote! { ::tauri::utils::config::ProtocolAllowlistConfig { asset_scope: #asset_scope, ..Default::default() } })
     }
   }
 
   impl ToTokens for HttpAllowlistScope {
     fn to_tokens(&self, tokens: &mut TokenStream) {
       let allowed_urls = vec_lit(&self.0, url_lit);
-      tokens.append_all(quote! { ::tauri_utils::config::HttpAllowlistScope(#allowed_urls) })
+      tokens.append_all(quote! { ::tauri::utils::config::HttpAllowlistScope(#allowed_urls) })
     }
   }
 
   impl ToTokens for HttpAllowlistConfig {
     fn to_tokens(&self, tokens: &mut TokenStream) {
       let scope = &self.scope;
-      tokens.append_all(quote! { ::tauri_utils::config::HttpAllowlistConfig { scope: #scope, ..Default::default() } })
+      tokens.append_all(quote! { ::tauri::utils::config::HttpAllowlistConfig { scope: #scope, ..Default::default() } })
     }
   }
 
@@ -3457,7 +3457,7 @@ mod build {
 
   impl ToTokens for ShellAllowedArgs {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::config::ShellAllowedArgs };
+      let prefix = quote! { ::tauri::utils::config::ShellAllowedArgs };
 
       tokens.append_all(match self {
         Self::Flag(flag) => quote!(#prefix::Flag(#flag)),
@@ -3471,7 +3471,7 @@ mod build {
 
   impl ToTokens for ShellAllowedArg {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::config::ShellAllowedArg };
+      let prefix = quote! { ::tauri::utils::config::ShellAllowedArg };
 
       tokens.append_all(match self {
         Self::Fixed(fixed) => {
@@ -3488,7 +3488,7 @@ mod build {
 
   impl ToTokens for ShellAllowlistOpen {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-      let prefix = quote! { ::tauri_utils::config::ShellAllowlistOpen };
+      let prefix = quote! { ::tauri::utils::config::ShellAllowlistOpen };
 
       tokens.append_all(match self {
         Self::Flag(flag) => quote!(#prefix::Flag(#flag)),
@@ -3500,14 +3500,14 @@ mod build {
   impl ToTokens for ShellAllowlistScope {
     fn to_tokens(&self, tokens: &mut TokenStream) {
       let allowed_commands = vec_lit(&self.0, identity);
-      tokens.append_all(quote! { ::tauri_utils::config::ShellAllowlistScope(#allowed_commands) })
+      tokens.append_all(quote! { ::tauri::utils::config::ShellAllowlistScope(#allowed_commands) })
     }
   }
 
   impl ToTokens for ShellAllowlistConfig {
     fn to_tokens(&self, tokens: &mut TokenStream) {
       let scope = &self.scope;
-      tokens.append_all(quote! { ::tauri_utils::config::ShellAllowlistConfig { scope: #scope, ..Default::default() } })
+      tokens.append_all(quote! { ::tauri::utils::config::ShellAllowlistConfig { scope: #scope, ..Default::default() } })
     }
   }
 
@@ -3518,7 +3518,7 @@ mod build {
       let http = &self.http;
       let shell = &self.shell;
       tokens.append_all(
-        quote! { ::tauri_utils::config::AllowlistConfig { fs: #fs, protocol: #protocol, http: #http, shell: #shell, ..Default::default() } },
+        quote! { ::tauri::utils::config::AllowlistConfig { fs: #fs, protocol: #protocol, http: #http, shell: #shell, ..Default::default() } },
       )
     }
   }
@@ -3557,7 +3557,7 @@ mod build {
         str_lit,
         json_value_lit,
       );
-      tokens.append_all(quote! { ::tauri_utils::config::PluginConfig(#config) })
+      tokens.append_all(quote! { ::tauri::utils::config::PluginConfig(#config) })
     }
   }
 

examples/api/src-tauri/Cargo.lock

@@ -670,7 +670,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.15",
+ "syn 2.0.17",
 ]
 
 [[package]]
@@ -687,7 +687,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.17",
 ]
 
 [[package]]
@@ -711,7 +711,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.15",
+ "syn 2.0.17",
 ]
 
 [[package]]
@@ -722,7 +722,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.17",
 ]
 
 [[package]]
@@ -994,7 +994,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.17",
 ]
 
 [[package]]
@@ -1583,9 +1583,9 @@ dependencies = [
 
 [[package]]
 name = "infer"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3"
+checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc"
 dependencies = [
  "cfb",
 ]
@@ -1895,12 +1895,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "minisign-verify"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -2083,17 +2077,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
-[[package]]
-name = "os_info"
-version = "3.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e"
-dependencies = [
- "log",
- "serde",
- "winapi",
-]
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -2322,6 +2305,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
+[[package]]
+name = "prettyplease"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b69d39aab54d069e7f2fe8cb970493e7834601ca2d8c65fd7bbd183578080d1"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.17",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "1.3.1"
@@ -2364,9 +2357,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
 dependencies = [
  "unicode-ident",
 ]
@@ -2382,9 +2375,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
  "proc-macro2",
 ]
@@ -2687,7 +2680,7 @@ checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.17",
 ]
 
 [[package]]
@@ -2709,7 +2702,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.17",
 ]
 
 [[package]]
@@ -2758,7 +2751,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.17",
 ]
 
 [[package]]
@@ -2955,9 +2948,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "45b6ddbb36c5b969c182aec3c4a0bce7df3fbad4b77114706a49aacc80567388"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3059,7 +3052,6 @@ name = "tauri"
 version = "2.0.0-alpha.8"
 dependencies = [
  "anyhow",
- "base64 0.21.0",
  "bytes",
  "cocoa",
  "dirs-next",
@@ -3078,10 +3070,8 @@ dependencies = [
  "jni",
  "libc",
  "log",
- "minisign-verify",
  "objc",
  "once_cell",
- "os_info",
  "percent-encoding",
  "png",
  "rand 0.8.5",
@@ -3102,14 +3092,12 @@ dependencies = [
  "tauri-utils",
  "tempfile",
  "thiserror",
- "time",
  "tokio",
  "url",
  "uuid",
  "webkit2gtk",
  "webview2-com",
  "windows 0.44.0",
- "zip",
 ]
 
 [[package]]
@@ -3121,11 +3109,13 @@ dependencies = [
  "filetime",
  "heck",
  "json-patch",
+ "prettyplease",
  "quote",
  "semver",
  "serde",
  "serde_json",
  "swift-rs",
+ "syn 2.0.17",
  "tauri-codegen",
  "tauri-utils",
  "tauri-winres",
@@ -3258,15 +3248,18 @@ dependencies = [
  "aes-gcm",
  "brotli",
  "ctor",
+ "embed_plist",
  "getrandom 0.2.9",
  "glob",
  "heck",
  "html5ever",
- "infer 0.12.0",
+ "ico 0.2.0",
+ "infer 0.13.0",
  "json-patch",
  "kuchiki",
  "memchr",
  "phf 0.10.1",
+ "png",
  "proc-macro2",
  "quote",
  "semver",
@@ -3346,7 +3339,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.17",
 ]
 
 [[package]]
@@ -3506,7 +3499,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.17",
 ]
 
 [[package]]
@@ -4252,14 +4245,3 @@ checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
 dependencies = [
  "libc",
 ]
-
-[[package]]
-name = "zip"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125"
-dependencies = [
- "byteorder",
- "crc32fast",
- "crossbeam-utils",
-]