diff --git a/.changes/rust-embed-revert.md b/.changes/rust-embed-revert.md new file mode 100644 index 0000000000..aaa6a3b1a8 --- /dev/null +++ b/.changes/rust-embed-revert.md @@ -0,0 +1,5 @@ +--- +"create-tauri-app": "patch" +--- + +Revert back to `rust-embed` 6.4. \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 3980cdaa4a..56f1f65ef2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -435,9 +435,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "rust-embed" -version = "6.5.0" +version = "6.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa80de5f776fa29ff3a2cca0870336fb293304c37737f303b6bc7ac0c00e754e" +checksum = "283ffe2f866869428c92e0d61c2f35dfb4355293cdfdc48f49e895c15f1333d1" dependencies = [ "include-flate", "rust-embed-impl", @@ -447,9 +447,9 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "6.4.0" +version = "6.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301d857909c92e96893b03e7a048510da1bd16b814ef18c4826e7829b6095fed" +checksum = "31ab23d42d71fb9be1b643fe6765d292c5e14d46912d13f3ae2815ca048ea04d" dependencies = [ "proc-macro2", "quote", @@ -461,9 +461,9 @@ dependencies = [ [[package]] name = "rust-embed-utils" -version = "7.4.0" +version = "7.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f52f7adca730960f96813a30bc943e43d0abe30c2e0ec3fd14632251dbd3f41" +checksum = "c1669d81dfabd1b5f8e2856b8bbe146c6192b0ba22162edc738ac0a5de18f054" dependencies = [ "sha2", "walkdir", diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index bad5525552..24b6677d98 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -20,4 +20,4 @@ path = "src/main.rs" anyhow = "1.0" dialoguer = "0.10.2" pico-args = "0.5.0" -rust-embed = { version = "6.5", features = [ "compression", "interpolate-folder-path" ] } +rust-embed = { version = "6.4", features = [ "compression", "interpolate-folder-path" ] } diff --git a/packages/cli/src/template.rs b/packages/cli/src/template.rs index 0430eefeed..7594eb9e10 100644 --- a/packages/cli/src/template.rs +++ b/packages/cli/src/template.rs @@ -120,11 +120,6 @@ impl<'a> Template { let manifest = Manifest::parse(&manifest_str)?; let write_file = |file: &str| -> anyhow::Result<()> { - let fragment_file = Fragments::get(file).unwrap(); - if fragment_file.metadata.is_dir() { - return Ok(()); - } - let manifest = manifest.clone(); // remove the first component, which is certainly the fragment directory they were in before getting embeded into the binary @@ -159,7 +154,7 @@ impl<'a> Template { _ => &file_name, }; - let mut data = fragment_file.data.to_vec(); + let mut data = Fragments::get(file).unwrap().data.to_vec(); // Only modify specific set of files if [ @@ -211,8 +206,8 @@ impl<'a> Template { path::PathBuf::from(e.to_string()) .components() .next() - .map(|c| c.as_os_str()) - .unwrap_or_default() + .unwrap() + .as_os_str() == "base" }) { write_file(&file)?; @@ -223,8 +218,8 @@ impl<'a> Template { path::PathBuf::from(e.to_string()) .components() .next() - .map(|c| c.as_os_str()) - .unwrap_or_default() + .unwrap() + .as_os_str() == path::PathBuf::from(format!("fragment-{}", self)) }) { write_file(&file)?;