diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index fee52a4f0..bca4e07bd 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -81,7 +81,7 @@ toml_edit = "0.19.11" tauri-bundler = { version = "1.2", features = ["native-tls-vendored"] } tauri-utils = "1.3" -assets-cli-support = { git = "https://github.com/DioxusLabs/collect-assets", features = ["webp", "html"] } +manganis-cli-support= { git = "https://github.com/DioxusLabs/collect-assets", features = ["webp", "html"] } dioxus-autofmt = { workspace = true } dioxus-check = { workspace = true } diff --git a/packages/cli/src/builder.rs b/packages/cli/src/builder.rs index ceeecb50b..371a1291f 100644 --- a/packages/cli/src/builder.rs +++ b/packages/cli/src/builder.rs @@ -3,9 +3,9 @@ use crate::{ error::{Error, Result}, tools::Tool, }; -use assets_cli_support::AssetManifestExt; use cargo_metadata::{diagnostic::Diagnostic, Message}; use indicatif::{ProgressBar, ProgressStyle}; +use manganis_cli_support::AssetManifestExt; use serde::Serialize; use std::{ fs::{copy, create_dir_all, File}, @@ -769,7 +769,7 @@ pub(crate) struct WebAssetConfigDropGuard; impl WebAssetConfigDropGuard { pub fn new() -> Self { // Set up the collect asset config - assets_cli_support::Config::default() + manganis_cli_support::Config::default() .with_assets_serve_location("/") .save(); Self {} @@ -779,6 +779,6 @@ impl WebAssetConfigDropGuard { impl Drop for WebAssetConfigDropGuard { fn drop(&mut self) { // Reset the config - assets_cli_support::Config::default().save(); + manganis_cli_support::Config::default().save(); } } diff --git a/packages/cli/src/cli/bundle.rs b/packages/cli/src/cli/bundle.rs index 42c5e6ab6..49979362c 100644 --- a/packages/cli/src/cli/bundle.rs +++ b/packages/cli/src/cli/bundle.rs @@ -130,7 +130,7 @@ impl Bundle { // Add all assets from collect assets to the bundle { - let config = assets_cli_support::Config::current(); + let config = manganis_cli_support::Config::current(); let location = config.assets_serve_location().to_string(); let location = format!("./{}", location); println!("Adding assets from {} to bundle", location); diff --git a/packages/cli/src/config.rs b/packages/cli/src/config.rs index b5345a8a4..34a6caa2a 100644 --- a/packages/cli/src/config.rs +++ b/packages/cli/src/config.rs @@ -1,6 +1,6 @@ use crate::{cfg::Platform, error::Result}; -use assets_cli_support::AssetManifest; -use assets_cli_support::AssetManifestExt; +use manganis_cli_support::AssetManifest; +use manganis_cli_support::AssetManifestExt; use serde::{Deserialize, Serialize}; use std::{ collections::HashMap, diff --git a/packages/desktop/Cargo.toml b/packages/desktop/Cargo.toml index b9c36fb3e..a981e8b1e 100644 --- a/packages/desktop/Cargo.toml +++ b/packages/desktop/Cargo.toml @@ -40,7 +40,7 @@ async-trait = "0.1.68" [target.'cfg(any(target_os = "windows",target_os = "macos",target_os = "linux",target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies] # This is only for debug mode, and it appears mobile does not support some packages this uses -assets-cli-support = { git = "https://github.com/DioxusLabs/collect-assets", features = ["webp", "html"] } +manganis-cli-support = { git = "https://github.com/DioxusLabs/collect-assets", features = ["webp", "html"] } rfd = "0.11.3" [target.'cfg(target_os = "ios")'.dependencies] diff --git a/packages/desktop/src/collect_assets.rs b/packages/desktop/src/collect_assets.rs index 5a36a191a..d0e18d9a8 100644 --- a/packages/desktop/src/collect_assets.rs +++ b/packages/desktop/src/collect_assets.rs @@ -12,9 +12,9 @@ pub fn copy_assets() { ) ))] { - use assets_cli_support::AssetManifest; - use assets_cli_support::AssetManifestExt; - use assets_cli_support::Config; + use manganis_cli_support::AssetManifest; + use manganis_cli_support::AssetManifestExt; + use manganis_cli_support::Config; use std::path::PathBuf; let config = Config::current(); let asset_location = config.assets_serve_location(); diff --git a/packages/desktop/src/protocol.rs b/packages/desktop/src/protocol.rs index 810cb96c6..7a9e0b8e7 100644 --- a/packages/desktop/src/protocol.rs +++ b/packages/desktop/src/protocol.rs @@ -87,8 +87,8 @@ pub(super) fn desktop_handler( ) ))] { - use assets_cli_support::AssetManifestExt; - let manifest = assets_cli_support::AssetManifest::load(); + use manganis_cli_support::AssetManifestExt; + let manifest = manganis_cli_support::AssetManifest::load(); head += &manifest.head(); } #[cfg(not(all(