Do not install wasm-pack for webpack projects

src/commands/build/mod.rs

@@ -3,9 +3,10 @@ pub mod wranglerjs;
 mod watch;
 pub use watch::watch_and_build;
 
+use crate::commands;
+use crate::install::install;
 use crate::settings::target::{Target, TargetType};
 use crate::terminal::message;
-use crate::{commands, install};
 
 use std::path::PathBuf;
 use std::process::Command;
@@ -18,7 +19,7 @@ pub fn build(target: &Target) -> Result<(), failure::Error> {
         }
         TargetType::Rust => {
             let tool_name = "wasm-pack";
-            let binary_path = install::install(tool_name, "rustwasm")?.binary(tool_name)?;
+            let binary_path = install(tool_name, "rustwasm")?.binary(tool_name)?;
             let args = ["build", "--target", "no-modules"];
 
             let command = command(&args, &binary_path);

src/commands/build/watch/mod.rs

@@ -3,10 +3,11 @@ use ignore::overrides::OverrideBuilder;
 use ignore::WalkBuilder;
 pub use watcher::wait_for_changes;
 
+use crate::commands;
 use crate::commands::build::{command, wranglerjs};
+use crate::install::install;
 use crate::settings::target::{Target, TargetType};
 use crate::terminal::message;
-use crate::{commands, install};
 
 use notify::{self, RecursiveMode, Watcher};
 use std::sync::mpsc;
@@ -52,7 +53,7 @@ pub fn watch_and_build(
         }
         TargetType::Rust => {
             let tool_name = "wasm-pack";
-            let binary_path = install::install(tool_name, "rustwasm")?.binary(tool_name)?;
+            let binary_path = install(tool_name, "rustwasm")?.binary(tool_name)?;
             let args = ["build", "--target", "no-modules"];
 
             thread::spawn(move || {

src/commands/build/wranglerjs/mod.rs

@@ -7,6 +7,7 @@ use crate::commands::generate::run_generate;
 
 use crate::commands::publish::package::Package;
 use crate::install;
+use crate::install::{install, install_artifact};
 use crate::util;
 pub use bundle::Bundle;
 use fs2::FileExt;
@@ -17,6 +18,8 @@ use rand::{thread_rng, Rng};
 use std::env;
 use std::fs;
 use std::fs::File;
+use std::io;
+use std::io::prelude::*;
 use std::iter;
 use std::path::{Path, PathBuf};
 use std::process::Command;
@@ -154,14 +157,9 @@ fn setup_build(target: &Target) -> Result<(Command, PathBuf, Bundle), failure::E
 
     let node = which::which("node").unwrap();
     let mut command = Command::new(node);
-    let wranglerjs_path = install().expect("could not install wranglerjs");
+    let wranglerjs_path = install_wranglerjs().expect("could not install wranglerjs");
     command.arg(wranglerjs_path);
 
-    // export WASM_PACK_PATH for use by wasm-pack-plugin
-    // https://github.com/wasm-tool/wasm-pack-plugin/blob/caca20df84782223f002735a8a2e99b2291f957c/plugin.js#L13
-    let wasm_pack_path = install::install("wasm-pack", "rustwasm")?.binary("wasm-pack")?;
-    command.env("WASM_PACK_PATH", wasm_pack_path);
-
     // create a temp file for IPC with the wranglerjs process
     let mut temp_file = env::temp_dir();
     temp_file.push(format!(".wranglerjs_output{}", random_chars(5)));
@@ -198,6 +196,17 @@ fn setup_build(target: &Target) -> Result<(Command, PathBuf, Bundle), failure::E
     // if webpack_config is not configured in the manifest
     // we infer the entry based on {package.json} and pass it to {wranglerjs}
     if let Some(webpack_config_path) = custom_webpack_config_path {
+        let mut webpack_file = File::open(&webpack_config_path)?;
+        let mut webpack_buffer = String::new();
+        webpack_file.read_to_string(&mut webpack_buffer)?;
+        if webpack_buffer.contains("wasm-pack-plugin") {
+            // export WASM_PACK_PATH for use by wasm-pack-plugin
+            // https://github.com/wasm-tool/wasm-pack-plugin/blob/caca20df84782223f002735a8a2e99b2291f957c/plugin.js#L13
+            let tool_name = "wasm-pack";
+            let author = "rustwasm";
+            let wasm_pack_path = install(tool_name, author)?.binary(tool_name)?;
+            command.env("WASM_PACK_PATH", wasm_pack_path);
+        }
         build_with_custom_webpack(&mut command, &webpack_config_path);
     } else {
         build_with_default_webpack(&mut command, &build_dir)?;
@@ -310,16 +319,17 @@ fn get_source_dir() -> PathBuf {
 }
 
 // Install {wranglerjs} from our GitHub releases
-fn install() -> Result<PathBuf, failure::Error> {
+fn install_wranglerjs() -> Result<PathBuf, failure::Error> {
     let wranglerjs_path = if install::target::DEBUG {
         let source_path = get_source_dir();
         let wranglerjs_path = source_path.join("wranglerjs");
         info!("wranglerjs at: {:?}", wranglerjs_path);
         wranglerjs_path
     } else {
         let tool_name = "wranglerjs";
+        let author = "cloudflare";
         let version = env!("CARGO_PKG_VERSION");
-        let wranglerjs_path = install::install_artifact(tool_name, "cloudflare", version)?;
+        let wranglerjs_path = install_artifact(tool_name, author, version)?;
         info!("wranglerjs downloaded at: {:?}", wranglerjs_path.path());
         wranglerjs_path.path()
     };

src/commands/generate/mod.rs

@@ -1,9 +1,10 @@
 use std::path::PathBuf;
 use std::process::Command;
 
+use crate::commands;
 use crate::commands::validate_worker_name;
+use crate::install::install;
 use crate::settings::target::{Manifest, Site, TargetType};
-use crate::{commands, install};
 
 pub fn generate(
     name: &str,
@@ -28,7 +29,7 @@ pub fn generate(
 
 pub fn run_generate(name: &str, template: &str) -> Result<(), failure::Error> {
     let tool_name = "cargo-generate";
-    let binary_path = install::install(tool_name, "ashleygwilliams")?.binary(tool_name)?;
+    let binary_path = install(tool_name, "ashleygwilliams")?.binary(tool_name)?;
 
     let args = ["generate", "--git", template, "--name", name, "--force"];