Merge branch 'master' into refactor-binary-installation

src/bindgen.rs

@@ -4,6 +4,7 @@ use binary_install::{
     install_binaries_from_targz_at_url,
     path::{bin_path, local_bin_path},
 };
+use cargo_metadata;
 use child;
 use emoji;
 use error::Error;
@@ -130,10 +131,17 @@ pub fn wasm_bindgen_build(
     let out_dir = out_dir.to_str().unwrap();
 
     if let Some(wasm_bindgen_path) = wasm_bindgen_path(log, path) {
-        let wasm_path = format!(
-            "target/wasm32-unknown-unknown/{}/{}.wasm",
-            release_or_debug, binary_name
-        );
+        let manifest = path.join("Cargo.toml");
+        let target_path = cargo_metadata::metadata(Some(&manifest))
+            .unwrap()
+            .target_directory;
+        let mut wasm_path = PathBuf::from(&target_path)
+            .join("wasm32-unknown-unknown")
+            .join(release_or_debug)
+            .join(binary_name);
+        wasm_path.set_extension("wasm");
+        let wasm_path = wasm_path.display().to_string();
+
         let dts_arg = if disable_dts {
             "--no-typescript"
         } else {

tests/all/build.rs

@@ -20,3 +20,18 @@ fn build_in_non_crate_directory_doesnt_panic() {
     let err_msg = result.unwrap_err().to_string();
     assert!(err_msg.contains("missing a `Cargo.toml`"));
 }
+
+#[test]
+fn it_should_build_js_hello_world_example() {
+    let fixture = utils::fixture::js_hello_world();
+    fixture.install_local_wasm_bindgen();
+    let cli = Cli::from_iter_safe(vec![
+        "wasm-pack",
+        "build",
+        &fixture.path.display().to_string(),
+    ])
+    .unwrap();
+    let logger = logger::new(&cli.cmd, cli.verbosity).unwrap();
+    command::run_wasm_pack(cli.cmd, &logger)
+        .expect("running wasm-pack in a js-hello-world directory should succeed.");
+}

tests/all/readme.rs

@@ -32,7 +32,7 @@ fn it_copies_a_readme_default_path() {
 }
 
 #[test]
-fn it_creates_a_package_json_provided_path() {
+fn it_copies_a_readme_provided_path() {
     let fixture = fixture::js_hello_world();
     let out_dir = fixture.path.join("pkg");
     fs::create_dir(&out_dir).expect("should create pkg directory OK");