resolving conflicts

docs/src/SUMMARY.md

@@ -2,6 +2,7 @@
 
 - [Prerequisites](./prerequisites/index.md)
   - [npm (optional)](./prerequisites/npm.md)
+  - [Non-`rustup` setups](./prerequisites/non-rustup-setups.md)
 - [Commands](./commands/index.md)
   - [`build`](./commands/build.md)
   - [`test`](./commands/test.md)

docs/src/commands/build.md

@@ -32,12 +32,29 @@ wasm-pack build --out-dir out
 The above command will put your build artifacts in a directory called `out`, instead
 of the default `pkg`.
 
+## Generated file names
+
+Flag `--out-name` sets the prefix for output file names. If not provided, package name is used instead.
+
+Usage examples, assuming our crate is named `dom`:
+
+```
+wasm-pack build
+# will produce files
+# dom.d.ts  dom.js  dom_bg.d.ts  dom_bg.wasm  package.json  README.md
+
+wasm-pack build --out-name index
+# will produce files
+# index.d.ts  index.js  index_bg.d.ts  index_bg.wasm  package.json  README.md
+```
+
+
 ## Profile
 
 The `build` command accepts an optional profile argument: one of `--dev`,
 `--profiling`, or `--release`. If none is supplied, then `--release` is used.
 
-Th controls whether debug assertions are enabled, debug info is generated, and
+This controls whether debug assertions are enabled, debug info is generated, and
 which (if any) optimizations are enabled.
 
 | Profile       | Debug Assertions | Debug Info | Optimizations | Notes                                 |

docs/src/prerequisites/index.md

@@ -17,3 +17,5 @@ you're excited about that work- you should reach out to the maintainers and get
 involved!
 
 [npm]: prerequisites/npm.html
+
+Using a non-rustup setup? Learn how to configure it for wasm-pack [here](./non-rustup-setups.html).

docs/src/prerequisites/non-rustup-setups.md

@@ -0,0 +1,37 @@
+# Non-Rustup setups
+`wasm-pack` compiles your code using the `wasm32-unknown-unknown` target. `wasm-pack` will automatically add this target for Rustup setups if you don't already have it installed by doing `rustup target add wasm32-unknown-unknown`. However, if you're not using Rustup we won't be able to this automatically and you'll have to do this yourself.
+
+## Manually add wasm32-unknown-unknown
+*Disclaimer: This is not guaranteed to work for every setup. These instructions below are specific for setups that match the exact rustc release, which means that the downloaded wasm32 target can be incompatible.*
+
+To manually add the `wasm32-unknown-unknown` target you will need to download it from the rust-lang website and put the contents in the correct folder.
+
+All the targets for all the different `rustc` versions are not presented in a human way on a website (yet) for you to just select the one you want and download it, one reason for this is that Rustup handles all of this for you and the packaging of targets was mainly built for tools. However, the following steps will walk through how to do this.
+
+First, check what version of `rustc` you're using by running `rustc --version`. This should display something like: `rustc 1.33.0 (2aa4c46cf 2019-02-28)`. Then you need to download the correct wasm32 target for your rustc version. The rustc version is part of the url, which means for `rustc 1.33.0` the url will look like this: `https://static.rust-lang.org/dist/rust-std-1.33.0-wasm32-unknown-unknown.tar.gz`.
+
+Here's some examples of urls for different rustc versions:
+ * Nightly https://static.rust-lang.org/dist/rust-std-nightly-wasm32-unknown-unknown.tar.gz
+ * Specific date nightly (2019-03-10) https://static.rust-lang.org/dist/2019-03-10/rust-std-nightly-wasm32-unknown-unknown.tar.gz
+ * Beta https://static.rust-lang.org/dist/rust-std-beta-wasm32-unknown-unknown.tar.gz
+
+You should be able to download this either by doing `wget https://static.rust-lang.org/dist/rust-std-1.33.0-wasm32-unknown-unknown.tar.gz` or by just visiting the url in a web browser.
+
+After you have downloaded this tarball at a location of your choice, you should unpack it. This should result in a folder named `rust-std-1.33.0-wasm32-unknown-unknown` that contains some folders and files, but the interesting one is a folder called `rust-std-wasm32-unknown-unknown` which contains a `lib` and that should contain a `rustlib` folder and in that, a folder called `wasm32-unknown-unknown`. This is the folder we want to move.
+
+Here's how the structure should look like for rustc 1.33.0:
+```
+rust-std-1.33.0-wasm32-unknown-unknown
+├── components
+├── install.sh
+├── rust-installer-version
+└── rust-std-wasm32-unknown-unknown
+    ├── lib
+    │   └── rustlib
+    │       └── wasm32-unknown-unknown
+```
+
+To know where we should move this `wasm32-unknown-unknown` folder we need to run `rustc --print sysroot` which should print a path that looks something like this (this will vary on different operating systems): `/home/user/rust/rust-1.33.0-2019-02-28-2aa4c46cf`. That folder should contain a `lib` folder that contains a `rustlib` folder. We should move the `wasm32-unknown-unknown` to this folder.
+
+On unix-like operating systems we can do that with the following command:
+`mv rust-std-1.33.0-wasm32-unknown-unknown/rust-std-wasm32-unknown-unknown/lib/rustlib/wasm32-unknown-unknown /home/user/rust/rust-1.33.0-2019-02-28-2aa4c46cf/lib/rustlib/` and that should be it!

src/bindgen.rs

@@ -173,6 +173,7 @@ pub fn wasm_bindgen_build(
     data: &CrateData,
     bindgen: &Download,
     out_dir: &Path,
+    out_name: &Option<String>,
     disable_dts: bool,
     target: &Target,
     profile: BuildProfile,
@@ -210,6 +211,10 @@ pub fn wasm_bindgen_build(
         .arg(dts_arg)
         .arg(target_arg);
 
+    if let Some(value) = out_name {
+        cmd.arg("--out-name").arg(value);
+    }
+
     let profile = data.configured_profile(profile);
     if profile.wasm_bindgen_debug_js_glue() {
         cmd.arg("--debug");

src/build/mod.rs

@@ -4,13 +4,14 @@ use child;
 use command::build::BuildProfile;
 use emoji;
 use failure::{Error, ResultExt};
-use log::info;
+use std::path::Path;
 use manifest::Crate;
-use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::str;
 use PBAR;
 
+pub mod wasm_target;
+
 /// Ensure that `rustc` is present and that it is >= 1.30.0
 pub fn check_rustc_version() -> Result<String, Error> {
     let local_minor_version = rustc_minor_version();
@@ -66,80 +67,6 @@ fn wasm_pack_local_version() -> Option<String> {
     Some(output.to_string())
 }
 
-/// Get rustc's sysroot as a PathBuf
-fn get_rustc_sysroot() -> Result<PathBuf, Error> {
-    let command = Command::new("rustc")
-        .args(&["--print", "sysroot"])
-        .output()?;
-
-    if command.status.success() {
-        Ok(String::from_utf8(command.stdout)?.trim().into())
-    } else {
-        Err(format_err!(
-            "Getting rustc's sysroot wasn't successful. Got {}",
-            command.status
-        ))
-    }
-}
-
-/// Checks if the wasm32-unknown-unknown is present in rustc's sysroot.
-fn is_wasm32_target_in_sysroot(sysroot: &PathBuf) -> bool {
-    let wasm32_target = "wasm32-unknown-unknown";
-
-    let rustlib_path = sysroot.join("lib/rustlib");
-
-    info!("Looking for {} in {:?}", wasm32_target, rustlib_path);
-
-    if rustlib_path.join(wasm32_target).exists() {
-        info!("Found {} in {:?}", wasm32_target, rustlib_path);
-        true
-    } else {
-        info!("Failed to find {} in {:?}", wasm32_target, rustlib_path);
-        false
-    }
-}
-
-fn check_wasm32_target() -> Result<bool, Error> {
-    let sysroot = get_rustc_sysroot()?;
-
-    // If wasm32-unknown-unknown already exists we're ok.
-    if is_wasm32_target_in_sysroot(&sysroot) {
-        Ok(true)
-    // If it doesn't exist, then we need to check if we're using rustup.
-    } else {
-        // If sysroot contains .rustup, then we can assume we're using rustup
-        // and use rustup to add the wasm32-unknown-unknown target.
-        if sysroot.to_string_lossy().contains(".rustup") {
-            rustup_add_wasm_target().map(|()| true)
-        } else {
-            Ok(false)
-        }
-    }
-}
-
-/// Add wasm32-unknown-unknown using `rustup`.
-fn rustup_add_wasm_target() -> Result<(), Error> {
-    let mut cmd = Command::new("rustup");
-    cmd.arg("target").arg("add").arg("wasm32-unknown-unknown");
-    child::run(cmd, "rustup").context("Adding the wasm32-unknown-unknown target with rustup")?;
-
-    Ok(())
-}
-
-/// Ensure that `rustup` has the `wasm32-unknown-unknown` target installed for
-/// current toolchain
-pub fn check_for_wasm32_target() -> Result<(), Error> {
-    let msg = format!("{}Checking for the Wasm target...", emoji::TARGET);
-    PBAR.info(&msg);
-
-    // Check if wasm32 target is present, otherwise bail.
-    match check_wasm32_target() {
-        Ok(true) => Ok(()),
-        Ok(false) => bail!("wasm32-unknown-unknown target not found!"),
-        Err(err) => Err(err),
-    }
-}
-
 /// Run `cargo build` targetting `wasm32-unknown-unknown`.
 pub fn cargo_build_wasm(
     path: &Path,

src/build/wasm_target.rs

@@ -0,0 +1,141 @@
+//! Checking for the wasm32 target
+
+use child;
+use emoji;
+use failure::{Error, ResultExt};
+use log::info;
+use std::fmt;
+use std::path::PathBuf;
+use std::process::Command;
+use PBAR;
+
+struct Wasm32Check {
+    rustc_path: PathBuf,
+    sysroot: PathBuf,
+    found: bool,
+    is_rustup: bool,
+}
+
+impl fmt::Display for Wasm32Check {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let target = "wasm32-unknown-unknown";
+
+        if self.found {
+            let rustup_string = if self.is_rustup {
+                "It looks like Rustup is being used.".to_owned()
+            } else {
+                format!("It looks like Rustup is not being used. For non-Rustup setups, the {} target needs to be installed manually. See https://rustwasm.github.io/wasm-pack/book/prerequisites/index.html#target-wasm32-unknown-unknown on how to do this.", target)
+            };
+
+            writeln!(
+                f,
+                "{} target not found in sysroot: {:?}",
+                target, self.sysroot
+            )
+            .and_then(|_| {
+                writeln!(
+                    f,
+                    "\nUsed rustc from the following path: {:?}",
+                    self.rustc_path
+                )
+            })
+            .and_then(|_| writeln!(f, "{}", rustup_string))
+        } else {
+            write!(
+                f,
+                "sysroot: {:?}, rustc path: {:?}, was found: {}, isRustup: {}",
+                self.sysroot, self.rustc_path, self.found, self.is_rustup
+            )
+        }
+    }
+}
+
+/// Ensure that `rustup` has the `wasm32-unknown-unknown` target installed for
+/// current toolchain
+pub fn check_for_wasm32_target() -> Result<(), Error> {
+    let msg = format!("{}Checking for the Wasm target...", emoji::TARGET);
+    PBAR.info(&msg);
+
+    // Check if wasm32 target is present, otherwise bail.
+    match check_wasm32_target() {
+        Ok(ref wasm32_check) if wasm32_check.found => Ok(()),
+        Ok(wasm32_check) => bail!("{}", wasm32_check),
+        Err(err) => Err(err),
+    }
+}
+
+/// Get rustc's sysroot as a PathBuf
+fn get_rustc_sysroot() -> Result<PathBuf, Error> {
+    let command = Command::new("rustc")
+        .args(&["--print", "sysroot"])
+        .output()?;
+
+    if command.status.success() {
+        Ok(String::from_utf8(command.stdout)?.trim().into())
+    } else {
+        Err(format_err!(
+            "Getting rustc's sysroot wasn't successful. Got {}",
+            command.status
+        ))
+    }
+}
+
+/// Checks if the wasm32-unknown-unknown is present in rustc's sysroot.
+fn is_wasm32_target_in_sysroot(sysroot: &PathBuf) -> bool {
+    let wasm32_target = "wasm32-unknown-unknown";
+
+    let rustlib_path = sysroot.join("lib/rustlib");
+
+    info!("Looking for {} in {:?}", wasm32_target, rustlib_path);
+
+    if rustlib_path.join(wasm32_target).exists() {
+        info!("Found {} in {:?}", wasm32_target, rustlib_path);
+        true
+    } else {
+        info!("Failed to find {} in {:?}", wasm32_target, rustlib_path);
+        false
+    }
+}
+
+fn check_wasm32_target() -> Result<Wasm32Check, Error> {
+    let sysroot = get_rustc_sysroot()?;
+    let rustc_path = which::which("rustc")?;
+
+    // If wasm32-unknown-unknown already exists we're ok.
+    if is_wasm32_target_in_sysroot(&sysroot) {
+        Ok(Wasm32Check {
+            rustc_path,
+            sysroot,
+            found: true,
+            is_rustup: false,
+        })
+    // If it doesn't exist, then we need to check if we're using rustup.
+    } else {
+        // If sysroot contains .rustup, then we can assume we're using rustup
+        // and use rustup to add the wasm32-unknown-unknown target.
+        if sysroot.to_string_lossy().contains(".rustup") {
+            rustup_add_wasm_target().map(|()| Wasm32Check {
+                rustc_path,
+                sysroot,
+                found: true,
+                is_rustup: true,
+            })
+        } else {
+            Ok(Wasm32Check {
+                rustc_path,
+                sysroot,
+                found: false,
+                is_rustup: false,
+            })
+        }
+    }
+}
+
+/// Add wasm32-unknown-unknown using `rustup`.
+fn rustup_add_wasm_target() -> Result<(), Error> {
+    let mut cmd = Command::new("rustup");
+    cmd.arg("target").arg("add").arg("wasm32-unknown-unknown");
+    child::run(cmd, "rustup").context("Adding the wasm32-unknown-unknown target with rustup")?;
+
+    Ok(())
+}

src/command/build.rs

@@ -28,6 +28,7 @@ pub struct Build {
     pub profile: BuildProfile,
     pub mode: BuildMode,
     pub out_dir: PathBuf,
+    pub out_name: Option<String>,
     pub bindgen: Option<Download>,
     pub cache: Cache,
     pub extra_options: Vec<String>,
@@ -159,6 +160,10 @@ pub struct BuildOptions {
     /// Sets the output directory with a relative path.
     pub out_dir: String,
 
+    #[structopt(long = "out-name")]
+    /// Sets the output file names. Defaults to package name.
+    pub out_name: Option<String>,
+
     #[structopt(last = true)]
     /// List of extra options to pass to `cargo build`
     pub extra_options: Vec<String>,
@@ -177,6 +182,7 @@ impl Default for BuildOptions {
             release: false,
             profiling: false,
             out_dir: String::new(),
+            out_name: None,
             extra_options: Vec::new(),
         }
     }
@@ -188,7 +194,7 @@ impl Build {
     /// Construct a build command from the given options.
     pub fn try_from_opts(build_opts: BuildOptions) -> Result<Self, Error> {
         let crate_path = set_crate_path(build_opts.path)?;
-        let crate_data = manifest::CrateData::new(&crate_path)?;
+        let crate_data = manifest::CrateData::new(&crate_path, build_opts.out_name.clone())?;
         let out_dir = crate_path.join(PathBuf::from(build_opts.out_dir));
 
         let dev = build_opts.dev || build_opts.debug;
@@ -210,6 +216,7 @@ impl Build {
             profile,
             mode: build_opts.mode,
             out_dir,
+            out_name: build_opts.out_name,
             bindgen: None,
             cache: cache::get_wasm_pack_cache()?,
             extra_options: build_opts.extra_options,
@@ -305,7 +312,7 @@ impl Build {
 
     fn step_check_for_wasm_target(&mut self) -> Result<(), Error> {
         info!("Checking for wasm-target...");
-        build::check_for_wasm32_target()?;
+        build::wasm_target::check_for_wasm32_target()?;
         info!("Checking for wasm-target was successful.");
         Ok(())
     }
@@ -383,6 +390,7 @@ impl Build {
             &self.crate_data,
             self.bindgen.as_ref().unwrap(),
             &self.out_dir,
+            &self.out_name,
             self.disable_dts,
             &self.target,
             self.profile,

src/command/test.rs

@@ -120,7 +120,7 @@ impl Test {
         } = test_opts;
 
         let crate_path = set_crate_path(path)?;
-        let crate_data = manifest::CrateData::new(&crate_path)?;
+        let crate_data = manifest::CrateData::new(&crate_path, None)?;
         let any_browser = chrome || firefox || safari;
 
         if !node && !any_browser {
@@ -236,7 +236,7 @@ impl Test {
 
     fn step_check_for_wasm_target(&mut self) -> Result<(), Error> {
         info!("Adding wasm-target...");
-        build::check_for_wasm32_target()?;
+        build::wasm_target::check_for_wasm32_target()?;
         info!("Adding wasm-target was successful.");
         Ok(())
     }

src/main.rs

@@ -2,7 +2,6 @@ extern crate atty;
 extern crate env_logger;
 #[macro_use]
 extern crate failure;
-#[macro_use]
 extern crate human_panic;
 extern crate log;
 extern crate structopt;
@@ -10,6 +9,7 @@ extern crate wasm_pack;
 extern crate which;
 
 use std::env;
+use std::panic;
 use std::sync::mpsc;
 use std::thread;
 use structopt::StructOpt;
@@ -33,7 +33,9 @@ fn background_check_for_updates() -> mpsc::Receiver<(String, String)> {
 
 fn main() {
     env_logger::init();
-    setup_panic!();
+
+    setup_panic_hooks();
+
     if let Err(e) = run() {
         eprintln!("Error: {}", e);
         for cause in e.iter_causes() {
@@ -74,3 +76,29 @@ fn run() -> Result<(), failure::Error> {
 
     Ok(())
 }
+
+fn setup_panic_hooks() {
+    let meta = human_panic::Metadata {
+        version: env!("CARGO_PKG_VERSION").into(),
+        name: env!("CARGO_PKG_NAME").into(),
+        authors: env!("CARGO_PKG_AUTHORS").replace(":", ", ").into(),
+        homepage: env!("CARGO_PKG_HOMEPAGE").into(),
+    };
+
+    let default_hook = panic::take_hook();
+
+    match env::var("RUST_BACKTRACE") {
+        Err(_) => {
+            panic::set_hook(Box::new(move |info: &panic::PanicInfo| {
+                // First call the default hook that prints to standard error.
+                default_hook(info);
+
+                // Then call human_panic.
+                let file_path = human_panic::handle_dump(&meta, info);
+                human_panic::print_msg(file_path, &meta)
+                    .expect("human-panic: printing error message to console failed");
+            }));
+        }
+        Ok(_) => {}
+    }
+}

src/manifest/mod.rs

@@ -32,6 +32,7 @@ pub struct CrateData {
     data: Metadata,
     current_idx: usize,
     manifest: CargoManifest,
+    out_name: Option<String>,
 }
 
 #[doc(hidden)]
@@ -332,7 +333,7 @@ pub struct ManifestAndUnsedKeys {
 impl CrateData {
     /// Reads all metadata for the crate whose manifest is inside the directory
     /// specified by `path`.
-    pub fn new(crate_path: &Path) -> Result<CrateData, Error> {
+    pub fn new(crate_path: &Path, out_name: Option<String>) -> Result<CrateData, Error> {
         let manifest_path = crate_path.join("Cargo.toml");
         if !manifest_path.is_file() {
             bail!(
@@ -359,6 +360,7 @@ impl CrateData {
             data,
             manifest,
             current_idx,
+            out_name,
         });
 
         fn error_chain_to_failure(err: cargo_metadata::Error) -> Error {
@@ -464,6 +466,14 @@ impl CrateData {
         }
     }
 
+    /// Get the prefix for output file names
+    pub fn name_prefix(&self) -> String {
+        match &self.out_name {
+            Some(value) => value.clone(),
+            None => self.crate_name(),
+        }
+    }
+
     /// Get the license for the crate at the given path.
     pub fn crate_license(&self) -> &Option<String> {
         &self.manifest.package.license
@@ -514,14 +524,14 @@ impl CrateData {
         disable_dts: bool,
         out_dir: &Path,
     ) -> NpmData {
-        let crate_name = self.crate_name();
-        let wasm_file = format!("{}_bg.wasm", crate_name);
-        let js_file = format!("{}.js", crate_name);
+        let name_prefix = self.name_prefix();
+        let wasm_file = format!("{}_bg.wasm", name_prefix);
+        let js_file = format!("{}.js", name_prefix);
         let mut files = vec![wasm_file];
 
         files.push(js_file.clone());
         if include_commonjs_shim {
-            let js_bg_file = format!("{}_bg.js", crate_name);
+            let js_bg_file = format!("{}_bg.js", name_prefix);
             files.push(js_bg_file.to_string());
         }
 
@@ -532,7 +542,7 @@ impl CrateData {
         };
 
         let dts_file = if !disable_dts {
-            let file = format!("{}.d.ts", crate_name);
+            let file = format!("{}.d.ts", name_prefix);
             files.push(file.to_string());
             Some(file)
         } else {

tests/all/license.rs

@@ -12,7 +12,7 @@ fn it_copies_a_license_default_path() {
     let fixture = fixture::single_license();
     let out_dir = fixture.path.join("pkg");
     fs::create_dir(&out_dir).expect("should create pkg directory OK");
-    let crate_data = CrateData::new(&fixture.path);
+    let crate_data = CrateData::new(&fixture.path, None);
 
     assert!(license::copy_from_crate(&crate_data.unwrap(), &fixture.path, &out_dir).is_ok());
 
@@ -37,7 +37,7 @@ fn it_copies_a_license_provided_path() {
     let fixture = fixture::single_license();
     let out_dir = fixture.path.join("pkg");
     fs::create_dir(&out_dir).expect("should create pkg directory OK");
-    let crate_data = CrateData::new(&fixture.path);
+    let crate_data = CrateData::new(&fixture.path, None);
 
     assert!(license::copy_from_crate(&crate_data.unwrap(), &fixture.path, &out_dir).is_ok());
     let crate_license_path = fixture.path.join("LICENSE");
@@ -60,7 +60,7 @@ fn it_copies_all_licenses_default_path() {
     let fixture = fixture::dual_license();
     let out_dir = fixture.path.join("pkg");
     fs::create_dir(&out_dir).expect("should create pkg directory OK");
-    let crate_data = CrateData::new(&fixture.path);
+    let crate_data = CrateData::new(&fixture.path, None);
 
     assert!(license::copy_from_crate(&crate_data.unwrap(), &fixture.path, &out_dir).is_ok());
 
@@ -95,7 +95,7 @@ fn it_copies_all_licenses_provided_path() {
     let fixture = fixture::dual_license();
     let out_dir = fixture.path.join("pkg");
     fs::create_dir(&out_dir).expect("should create pkg directory OK");
-    let crate_data = CrateData::new(&fixture.path);
+    let crate_data = CrateData::new(&fixture.path, None);
 
     assert!(license::copy_from_crate(&crate_data.unwrap(), &fixture.path, &out_dir).is_ok());
 
@@ -131,7 +131,7 @@ fn it_copies_a_non_standard_license_provided_path() {
     let fixture = fixture::non_standard_license(license_file);
     let out_dir = fixture.path.join("pkg");
     fs::create_dir(&out_dir).expect("should create pkg directory OK");
-    let crate_data = CrateData::new(&fixture.path);
+    let crate_data = CrateData::new(&fixture.path, None);
 
     assert!(license::copy_from_crate(&crate_data.unwrap(), &fixture.path, &out_dir).is_ok());
 

tests/all/lockfile.rs

@@ -6,7 +6,7 @@ use wasm_pack::manifest::CrateData;
 fn it_gets_wasm_bindgen_version() {
     let fixture = fixture::js_hello_world();
     fixture.cargo_check();
-    let data = CrateData::new(&fixture.path).unwrap();
+    let data = CrateData::new(&fixture.path, None).unwrap();
     let lock = Lockfile::new(&data).unwrap();
     assert_eq!(lock.wasm_bindgen_version(), Some("0.2.37"),);
 }
@@ -15,7 +15,7 @@ fn it_gets_wasm_bindgen_version() {
 fn it_gets_wasm_bindgen_test_version() {
     let fixture = fixture::wbg_test_node();
     fixture.cargo_check();
-    let data = CrateData::new(&fixture.path).unwrap();
+    let data = CrateData::new(&fixture.path, None).unwrap();
     let lock = Lockfile::new(&data).unwrap();
     assert_eq!(lock.wasm_bindgen_test_version(), Some("0.2.37"),);
 }
@@ -60,7 +60,7 @@ fn it_gets_wasm_bindgen_version_in_crate_inside_workspace() {
             "#,
         );
     fixture.cargo_check();
-    let data = CrateData::new(&fixture.path.join("blah")).unwrap();
+    let data = CrateData::new(&fixture.path.join("blah"), None).unwrap();
     let lock = Lockfile::new(&data).unwrap();
     assert_eq!(lock.wasm_bindgen_version(), Some("0.2.37"),);
 }
@@ -128,7 +128,7 @@ fn it_gets_wasm_bindgen_version_from_dependencies() {
             "#,
         );
     fixture.cargo_check();
-    let data = CrateData::new(&fixture.path.join("parent")).unwrap();
+    let data = CrateData::new(&fixture.path.join("parent"), None).unwrap();
     let lock = Lockfile::new(&data).unwrap();
     assert_eq!(lock.wasm_bindgen_version(), Some("0.2.37"),);
 }

tests/all/manifest.rs

@@ -9,7 +9,7 @@ use wasm_pack::{self, license, manifest};
 #[test]
 fn it_gets_the_crate_name_default_path() {
     let path = &PathBuf::from(".");
-    let crate_data = manifest::CrateData::new(&path).unwrap();
+    let crate_data = manifest::CrateData::new(&path, None).unwrap();
     let name = crate_data.crate_name();
     assert_eq!(name, "wasm_pack");
 }
@@ -17,16 +17,32 @@ fn it_gets_the_crate_name_default_path() {
 #[test]
 fn it_gets_the_crate_name_provided_path() {
     let fixture = fixture::js_hello_world();
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     assert_eq!(crate_data.crate_name(), "js_hello_world");
 }
 
+#[test]
+fn it_gets_the_default_name_prefix() {
+    let path = &PathBuf::from(".");
+    let crate_data = manifest::CrateData::new(&path, None).unwrap();
+    let name = crate_data.name_prefix();
+    assert_eq!(name, "wasm_pack");
+}
+
+#[test]
+fn it_gets_the_name_prefix_passed_from_cli() {
+    let path = &PathBuf::from(".");
+    let crate_data = manifest::CrateData::new(&path, Some("index".to_owned())).unwrap();
+    let name = crate_data.name_prefix();
+    assert_eq!(name, "index");
+}
+
 #[test]
 fn it_checks_has_cdylib_default_path() {
     let fixture = fixture::no_cdylib();
     // Ensure that there is a `Cargo.lock`.
     fixture.cargo_check();
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     assert!(crate_data.check_crate_config().is_err());
 }
 
@@ -35,14 +51,14 @@ fn it_checks_has_cdylib_provided_path() {
     let fixture = fixture::js_hello_world();
     // Ensure that there is a `Cargo.lock`.
     fixture.cargo_check();
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     crate_data.check_crate_config().unwrap();
 }
 
 #[test]
 fn it_checks_has_cdylib_wrong_crate_type() {
     let fixture = fixture::bad_cargo_toml();
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     assert!(crate_data.check_crate_config().is_err());
 }
 
@@ -51,7 +67,7 @@ fn it_recognizes_a_map_during_depcheck() {
     let fixture = fixture::serde_feature();
     // Ensure that there is a `Cargo.lock`.
     fixture.cargo_check();
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     crate_data.check_crate_config().unwrap();
 }
 
@@ -59,7 +75,7 @@ fn it_recognizes_a_map_during_depcheck() {
 fn it_creates_a_package_json_default_path() {
     let fixture = fixture::js_hello_world();
     let out_dir = fixture.path.join("pkg");
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     wasm_pack::command::utils::create_pkg_dir(&out_dir).unwrap();
     assert!(crate_data
         .write_package_json(&out_dir, &None, false, &Target::Bundler)
@@ -94,7 +110,7 @@ fn it_creates_a_package_json_default_path() {
 fn it_creates_a_package_json_provided_path() {
     let fixture = fixture::js_hello_world();
     let out_dir = fixture.path.join("pkg");
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     wasm_pack::command::utils::create_pkg_dir(&out_dir).unwrap();
     assert!(crate_data
         .write_package_json(&out_dir, &None, false, &Target::Bundler)
@@ -122,7 +138,7 @@ fn it_creates_a_package_json_provided_path() {
 fn it_creates_a_package_json_provided_path_with_scope() {
     let fixture = fixture::js_hello_world();
     let out_dir = fixture.path.join("pkg");
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     wasm_pack::command::utils::create_pkg_dir(&out_dir).unwrap();
     assert!(crate_data
         .write_package_json(&out_dir, &Some("test".to_string()), false, &Target::Bundler,)
@@ -150,7 +166,7 @@ fn it_creates_a_package_json_provided_path_with_scope() {
 fn it_creates_a_pkg_json_with_correct_files_on_node() {
     let fixture = fixture::js_hello_world();
     let out_dir = fixture.path.join("pkg");
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     wasm_pack::command::utils::create_pkg_dir(&out_dir).unwrap();
     assert!(crate_data
         .write_package_json(&out_dir, &None, false, &Target::Nodejs)
@@ -185,7 +201,7 @@ fn it_creates_a_pkg_json_with_correct_files_on_node() {
 fn it_creates_a_pkg_json_with_correct_files_on_nomodules() {
     let fixture = fixture::js_hello_world();
     let out_dir = fixture.path.join("pkg");
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     wasm_pack::command::utils::create_pkg_dir(&out_dir).unwrap();
     assert!(crate_data
         .write_package_json(&out_dir, &None, false, &Target::NoModules)
@@ -215,11 +231,42 @@ fn it_creates_a_pkg_json_with_correct_files_on_nomodules() {
     assert_eq!(actual_files, expected_files);
 }
 
+#[test]
+fn it_creates_a_package_json_with_correct_files_when_out_name_is_provided() {
+    let fixture = fixture::js_hello_world();
+    let out_dir = fixture.path.join("pkg");
+    let crate_data = manifest::CrateData::new(&fixture.path, Some("index".to_owned())).unwrap();
+    wasm_pack::command::utils::create_pkg_dir(&out_dir).unwrap();
+    assert!(crate_data
+        .write_package_json(&out_dir, &None, false, &Target::Bundler)
+        .is_ok());
+    let package_json_path = &fixture.path.join("pkg").join("package.json");
+    fs::metadata(package_json_path).unwrap();
+    utils::manifest::read_package_json(&fixture.path, &out_dir).unwrap();
+    let pkg = utils::manifest::read_package_json(&fixture.path, &out_dir).unwrap();
+    assert_eq!(pkg.name, "js-hello-world");
+    assert_eq!(pkg.repository.ty, "git");
+    assert_eq!(
+        pkg.repository.url,
+        "https://github.com/rustwasm/wasm-pack.git"
+    );
+    assert_eq!(pkg.module, "index.js");
+    assert_eq!(pkg.types, "index.d.ts");
+    assert_eq!(pkg.side_effects, "false");
+
+    let actual_files: HashSet<String> = pkg.files.into_iter().collect();
+    let expected_files: HashSet<String> = ["index_bg.wasm", "index.d.ts", "index.js"]
+        .iter()
+        .map(|&s| String::from(s))
+        .collect();
+    assert_eq!(actual_files, expected_files);
+}
+
 #[test]
 fn it_creates_a_pkg_json_in_out_dir() {
     let fixture = fixture::js_hello_world();
     let out_dir = fixture.path.join("./custom/out");
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     wasm_pack::command::utils::create_pkg_dir(&out_dir).unwrap();
     assert!(crate_data
         .write_package_json(&out_dir, &None, false, &Target::Bundler)
@@ -234,7 +281,7 @@ fn it_creates_a_pkg_json_in_out_dir() {
 fn it_creates_a_package_json_with_correct_keys_when_types_are_skipped() {
     let fixture = fixture::js_hello_world();
     let out_dir = fixture.path.join("pkg");
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     wasm_pack::command::utils::create_pkg_dir(&out_dir).unwrap();
     assert!(crate_data
         .write_package_json(&out_dir, &None, true, &Target::Bundler)
@@ -262,7 +309,7 @@ fn it_creates_a_package_json_with_correct_keys_when_types_are_skipped() {
 #[test]
 fn it_errors_when_wasm_bindgen_is_not_declared() {
     let fixture = fixture::bad_cargo_toml();
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     assert!(crate_data.check_crate_config().is_err());
 }
 
@@ -294,7 +341,7 @@ fn it_sets_homepage_field_if_available_in_cargo_toml() {
     );
 
     let out_dir = fixture.path.join("pkg");
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
 
     wasm_pack::command::utils::create_pkg_dir(&out_dir).unwrap();
     crate_data
@@ -310,7 +357,7 @@ fn it_sets_homepage_field_if_available_in_cargo_toml() {
     // When 'homepage' is unavailable
     let fixture = fixture::js_hello_world();
     let out_dir = fixture.path.join("pkg");
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
 
     wasm_pack::command::utils::create_pkg_dir(&out_dir).unwrap();
     crate_data
@@ -326,7 +373,7 @@ fn it_does_not_error_when_wasm_bindgen_is_declared() {
     let fixture = fixture::js_hello_world();
     // Ensure that there is a `Cargo.lock`.
     fixture.cargo_check();
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
     crate_data.check_crate_config().unwrap();
 }
 
@@ -410,7 +457,7 @@ fn it_lists_license_files_in_files_field_of_package_json() {
     let fixture = fixture::dual_license();
     let out_dir = fixture.path.join("pkg");
 
-    let crate_data = manifest::CrateData::new(&fixture.path).unwrap();
+    let crate_data = manifest::CrateData::new(&fixture.path, None).unwrap();
 
     wasm_pack::command::utils::create_pkg_dir(&out_dir).unwrap();
     license::copy_from_crate(&crate_data, &fixture.path, &out_dir).unwrap();