feat(projecttype): default to webpack

src/commands/generate.rs

@@ -17,7 +17,7 @@ pub fn generate(
 
     let args = ["generate", "--git", template, "--name", name, "--force"];
 
-    let pt = pt.unwrap_or(project_type(template));
+    let pt = pt.unwrap_or_else(|| project_type(template));
     let command = command(name, binary_path, &args, &pt);
     let command_name = format!("{:?}", command);
 
@@ -51,5 +51,5 @@ fn project_type(template: &str) -> ProjectType {
     if template.contains("rust") {
         return ProjectType::Rust;
     }
-    ProjectType::JavaScript
+    ProjectType::default()
 }

src/commands/publish/package.rs

@@ -14,15 +14,13 @@ impl Package {
             failure::bail!(
                 "The `main` key in your `package.json` file is required; please specified the entrypoint of your Worker.",
             )
+        } else if !Path::new(&self.main).exists() {
+            failure::bail!(
+                "The entrypoint of your Worker ({}) could not be found.",
+                self.main
+            )
         } else {
-            if !Path::new(&self.main).exists() {
-                failure::bail!(
-                    "The entrypoint of your Worker ({}) could not be found.",
-                    self.main
-                )
-            } else {
-                Ok(self.main.clone())
-            }
+            Ok(self.main.clone())
         }
     }
 }

src/main.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::redundant_closure)]
+
 use std::env;
 use std::str::FromStr;
 

src/settings/project.rs

@@ -27,6 +27,12 @@ pub enum ProjectType {
     Webpack,
 }
 
+impl Default for ProjectType {
+    fn default() -> Self {
+        ProjectType::Webpack
+    }
+}
+
 impl fmt::Display for ProjectType {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let printable = match *self {

src/wranglerjs/mod.rs

@@ -230,13 +230,11 @@ fn create_metadata(bundle: &Bundle) -> String {
         )
         .to_string()
     } else {
-        format!(
-            r#"
+        r#"
                 {{
                     "body_part": "script"
                 }}
             "#
-        )
         .to_string()
     }
 }