Merge pull request #197 from Brooooooklyn/master

fix(mainfest): missing _bg.js file in package.json
master
ashley williams 7 years ago committed by GitHub
commit a7324f7528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      src/manifest.rs
  2. 5
      tests/manifest/main.rs

@ -71,6 +71,7 @@ impl CargoManifest {
fn into_npm(mut self, scope: &Option<String>, disable_dts: bool) -> NpmPackage { fn into_npm(mut self, scope: &Option<String>, disable_dts: bool) -> NpmPackage {
let filename = self.package.name.replace("-", "_"); let filename = self.package.name.replace("-", "_");
let wasm_file = format!("{}_bg.wasm", filename); let wasm_file = format!("{}_bg.wasm", filename);
let js_bg_file = format!("{}_bg.js", filename);
let js_file = format!("{}.js", filename); let js_file = format!("{}.js", filename);
let dts_file = if disable_dts == true { let dts_file = if disable_dts == true {
None None
@ -81,7 +82,7 @@ impl CargoManifest {
if let Some(s) = scope { if let Some(s) = scope {
self.package.name = format!("@{}/{}", s, self.package.name); self.package.name = format!("@{}/{}", s, self.package.name);
} }
let mut files = vec![wasm_file]; let mut files = vec![wasm_file, js_bg_file];
match dts_file { match dts_file {
Some(ref dts_file) => { Some(ref dts_file) => {

@ -59,7 +59,10 @@ fn it_creates_a_package_json_default_path() {
pkg.repository.url, pkg.repository.url,
"https://github.com/ashleygwilliams/wasm-pack.git" "https://github.com/ashleygwilliams/wasm-pack.git"
); );
assert_eq!(pkg.files, ["wasm_pack_bg.wasm", "wasm_pack.d.ts"]); assert_eq!(
pkg.files,
["wasm_pack_bg.wasm", "wasm_pack_bg.js", "wasm_pack.d.ts"]
);
assert_eq!(pkg.main, "wasm_pack.js"); assert_eq!(pkg.main, "wasm_pack.js");
let types = pkg.types.unwrap_or_default(); let types = pkg.types.unwrap_or_default();
assert_eq!(types, "wasm_pack.d.ts"); assert_eq!(types, "wasm_pack.d.ts");

Loading…
Cancel
Save