update collect assets name
This commit is contained in:
1 parent
4ee2bc259d
commit
5eca11fe3d
7 files changed
+13
-13
No files matched your search
@@ -81,7 +81,7 @@ toml_edit = "0.19.11"
|
|||||||
tauri-bundler = { version = "1.2", features = ["native-tls-vendored"] }
|
tauri-bundler = { version = "1.2", features = ["native-tls-vendored"] }
|
||||||
tauri-utils = "1.3"
|
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-autofmt = { workspace = true }
|
||||||
dioxus-check = { workspace = true }
|
dioxus-check = { workspace = true }
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ use crate::{
|
|||||||
error::{Error, Result},
|
error::{Error, Result},
|
||||||
tools::Tool,
|
tools::Tool,
|
||||||
};
|
};
|
||||||
use assets_cli_support::AssetManifestExt;
|
|
||||||
use cargo_metadata::{diagnostic::Diagnostic, Message};
|
use cargo_metadata::{diagnostic::Diagnostic, Message};
|
||||||
use indicatif::{ProgressBar, ProgressStyle};
|
use indicatif::{ProgressBar, ProgressStyle};
|
||||||
|
use manganis_cli_support::AssetManifestExt;
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use std::{
|
use std::{
|
||||||
fs::{copy, create_dir_all, File},
|
fs::{copy, create_dir_all, File},
|
||||||
@@ -769,7 +769,7 @@ pub(crate) struct WebAssetConfigDropGuard;
|
|||||||
impl WebAssetConfigDropGuard {
|
impl WebAssetConfigDropGuard {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
// Set up the collect asset config
|
// Set up the collect asset config
|
||||||
assets_cli_support::Config::default()
|
manganis_cli_support::Config::default()
|
||||||
.with_assets_serve_location("/")
|
.with_assets_serve_location("/")
|
||||||
.save();
|
.save();
|
||||||
Self {}
|
Self {}
|
||||||
@@ -779,6 +779,6 @@ impl WebAssetConfigDropGuard {
|
|||||||
impl Drop for WebAssetConfigDropGuard {
|
impl Drop for WebAssetConfigDropGuard {
|
||||||
fn drop(&mut self) {
|
fn drop(&mut self) {
|
||||||
// Reset the config
|
// Reset the config
|
||||||
assets_cli_support::Config::default().save();
|
manganis_cli_support::Config::default().save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -130,7 +130,7 @@ impl Bundle {
|
|||||||
|
|
||||||
// Add all assets from collect assets to the 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 = config.assets_serve_location().to_string();
|
||||||
let location = format!("./{}", location);
|
let location = format!("./{}", location);
|
||||||
println!("Adding assets from {} to bundle", location);
|
println!("Adding assets from {} to bundle", location);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use crate::{cfg::Platform, error::Result};
|
use crate::{cfg::Platform, error::Result};
|
||||||
use assets_cli_support::AssetManifest;
|
use manganis_cli_support::AssetManifest;
|
||||||
use assets_cli_support::AssetManifestExt;
|
use manganis_cli_support::AssetManifestExt;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::{
|
use std::{
|
||||||
collections::HashMap,
|
collections::HashMap,
|
||||||
|
|||||||
@@ -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]
|
[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
|
# 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"
|
rfd = "0.11.3"
|
||||||
|
|
||||||
[target.'cfg(target_os = "ios")'.dependencies]
|
[target.'cfg(target_os = "ios")'.dependencies]
|
||||||
|
|||||||
@@ -12,9 +12,9 @@ pub fn copy_assets() {
|
|||||||
)
|
)
|
||||||
))]
|
))]
|
||||||
{
|
{
|
||||||
use assets_cli_support::AssetManifest;
|
use manganis_cli_support::AssetManifest;
|
||||||
use assets_cli_support::AssetManifestExt;
|
use manganis_cli_support::AssetManifestExt;
|
||||||
use assets_cli_support::Config;
|
use manganis_cli_support::Config;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
let config = Config::current();
|
let config = Config::current();
|
||||||
let asset_location = config.assets_serve_location();
|
let asset_location = config.assets_serve_location();
|
||||||
|
|||||||
@@ -87,8 +87,8 @@ pub(super) fn desktop_handler(
|
|||||||
)
|
)
|
||||||
))]
|
))]
|
||||||
{
|
{
|
||||||
use assets_cli_support::AssetManifestExt;
|
use manganis_cli_support::AssetManifestExt;
|
||||||
let manifest = assets_cli_support::AssetManifest::load();
|
let manifest = manganis_cli_support::AssetManifest::load();
|
||||||
head += &manifest.head();
|
head += &manifest.head();
|
||||||
}
|
}
|
||||||
#[cfg(not(all(
|
#[cfg(not(all(
|
||||||
|
|||||||
Reference in new issue
Block a user