Fix template path for cargo stylus new

stylus-tools/Cargo.toml

@@ -10,6 +10,12 @@ license.workspace = true
 repository.workspace = true
 version.workspace = true
 
+include = [
+    "src/**/*",
+    "precompiles/*.sol",
+    "templates/**",
+]
+
 [dependencies]
 alloy = { workspace = true, features = ["contract", "getrandom", "rpc-types", "signer-local", "sol-types"] }
 cargo-util-schemas.workspace = true

stylus-tools/src/core/project/init.rs

@@ -43,7 +43,7 @@ pub fn init_contract(path: impl AsRef<Path>) -> Result<(), InitError> {
 
     // Add files from template
     copy_from_template_if_dne!(
-        "../../templates/contract" -> path,
+        "templates/contract" -> path,
         "src/lib.rs",
         "src/main.rs",
         "rust-toolchain.toml",
@@ -67,8 +67,8 @@ pub fn init_workspace(path: impl AsRef<Path>) -> Result<(), InitError> {
 
     // Add files from template
     copy_from_template_if_dne!(
-        "../../templates/workspace" -> path,
-        "Cargo.toml",
+        "templates/workspace" -> path,
+        "Cargo.toml.tmpl",
         "rust-toolchain.toml",
         "Stylus.toml",
     );

stylus-tools/src/core/project/new.rs

@@ -22,7 +22,7 @@ pub fn new_contract(path: impl AsRef<Path>) -> Result<(), InitError> {
     // Remove the generated "src/lib.rs" and generate the new one
     fs::remove_file(path.join("src").join("lib.rs"))?;
     copy_from_template_if_dne!(
-        "../../templates/contract" -> path,
+        "templates/contract" -> path,
         "src/lib.rs",
     );
 

stylus-tools/src/macros.rs

@@ -4,9 +4,13 @@
 macro_rules! copy_from_template {
     ($tmpl:literal -> $root:ident, $($files:expr),* $(,)?) => {
         $(
+            let mut filename = $root.join($files);
+            if filename.extension() == Some(std::ffi::OsStr::new("tmpl")) {
+                filename = filename.file_stem().unwrap().into();
+            }
             std::fs::write(
-                $root.join($files),
-                include_str!(concat!($tmpl, "/", $files)),
+                filename,
+                include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/", $tmpl, "/", $files)),
             )?;
         )*
     };