fix(manifest:npm): s/es6/esmodules

master
Ashley Williams 7 years ago
parent f06f3cca0d
commit 7f38eb9b0c
  1. 8
      src/manifest/mod.rs
  2. 2
      src/manifest/npm/esmodules.rs
  3. 6
      src/manifest/npm/mod.rs

@ -7,7 +7,7 @@ use std::fs::File;
use std::io::prelude::*; use std::io::prelude::*;
use std::path::Path; use std::path::Path;
use self::npm::{repository::Repository, CommonJSPackage, ES6Package, NpmPackage}; use self::npm::{repository::Repository, CommonJSPackage, ESModulesPackage, NpmPackage};
use console::style; use console::style;
use emoji; use emoji;
use error::Error; use error::Error;
@ -145,7 +145,7 @@ impl CargoManifest {
}) })
} }
fn into_es6(mut self, scope: &Option<String>, disable_dts: bool) -> NpmPackage { fn into_esmodules(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_file = format!("{}.js", filename); let js_file = format!("{}.js", filename);
@ -168,7 +168,7 @@ impl CargoManifest {
None => {} None => {}
} }
NpmPackage::ES6Package(ES6Package { NpmPackage::ESModulesPackage(ESModulesPackage {
name: self.package.name, name: self.package.name,
collaborators: self.package.authors, collaborators: self.package.authors,
description: self.package.description, description: self.package.description,
@ -211,7 +211,7 @@ pub fn write_package_json(
let npm_data = if target == "nodejs" { let npm_data = if target == "nodejs" {
crate_data.into_commonjs(scope, disable_dts) crate_data.into_commonjs(scope, disable_dts)
} else { } else {
crate_data.into_es6(scope, disable_dts) crate_data.into_esmodules(scope, disable_dts)
}; };
//TODO: these checks won't work now, we should do this before we serialize //TODO: these checks won't work now, we should do this before we serialize

@ -1,7 +1,7 @@
use manifest::npm::repository::Repository; use manifest::npm::repository::Repository;
#[derive(Serialize)] #[derive(Serialize)]
pub struct ES6Package { pub struct ESModulesPackage {
pub name: String, pub name: String,
#[serde(skip_serializing_if = "Vec::is_empty")] #[serde(skip_serializing_if = "Vec::is_empty")]
pub collaborators: Vec<String>, pub collaborators: Vec<String>,

@ -1,12 +1,12 @@
mod commonjs; mod commonjs;
mod es6; mod esmodules;
pub mod repository; pub mod repository;
pub use self::commonjs::CommonJSPackage; pub use self::commonjs::CommonJSPackage;
pub use self::es6::ES6Package; pub use self::esmodules::ESModulesPackage;
#[derive(Serialize)] #[derive(Serialize)]
pub enum NpmPackage { pub enum NpmPackage {
CommonJSPackage(CommonJSPackage), CommonJSPackage(CommonJSPackage),
ES6Package(ES6Package), ESModulesPackage(ESModulesPackage),
} }

Loading…
Cancel
Save