Merge pull request #680 from rustwasm/rhysd-fix-side-effects

#649 without the test update commit
master
ashley williams 6 years ago committed by GitHub
commit 9a2722d411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/manifest/mod.rs
  2. 2
      src/manifest/npm/esmodules.rs
  3. 4
      tests/all/manifest.rs
  4. 8
      tests/all/utils/manifest.rs

@ -637,7 +637,7 @@ impl CrateData {
module: data.main,
homepage: data.homepage,
types: data.dts_file,
side_effects: "false".to_string(),
side_effects: false,
})
}
@ -666,7 +666,7 @@ impl CrateData {
module: data.main,
homepage: data.homepage,
types: data.dts_file,
side_effects: "false".to_string(),
side_effects: false,
})
}

@ -20,5 +20,5 @@ pub struct ESModulesPackage {
#[serde(skip_serializing_if = "Option::is_none")]
pub types: Option<String>,
#[serde(rename = "sideEffects")]
pub side_effects: String,
pub side_effects: bool,
}

@ -93,7 +93,7 @@ fn it_creates_a_package_json_default_path() {
);
assert_eq!(pkg.module, "js_hello_world.js");
assert_eq!(pkg.types, "js_hello_world.d.ts");
assert_eq!(pkg.side_effects, "false");
assert_eq!(pkg.side_effects, false);
let actual_files: HashSet<String> = pkg.files.into_iter().collect();
let expected_files: HashSet<String> = [
@ -253,7 +253,7 @@ fn it_creates_a_package_json_with_correct_files_when_out_name_is_provided() {
);
assert_eq!(pkg.module, "index.js");
assert_eq!(pkg.types, "index.d.ts");
assert_eq!(pkg.side_effects, "false");
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"]

@ -21,8 +21,8 @@ pub struct NpmPackage {
pub browser: String,
#[serde(default = "default_none")]
pub types: String,
#[serde(default = "default_none", rename = "sideEffects")]
pub side_effects: String,
#[serde(default = "default_false", rename = "sideEffects")]
pub side_effects: bool,
pub homepage: Option<String>,
}
@ -30,6 +30,10 @@ fn default_none() -> String {
"".to_string()
}
fn default_false() -> bool {
false
}
#[derive(Deserialize)]
pub struct Repository {
#[serde(rename = "type")]

Loading…
Cancel
Save