Skip to content

Commit

Permalink
fix(manifest:npm): s/es6/esmodules
Browse files Browse the repository at this point in the history
  • Loading branch information
ashleygwilliams committed Sep 18, 2018
1 parent f06f3cc commit 7f38eb9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions src/manifest/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::fs::File;
use std::io::prelude::*;
use std::path::Path;

use self::npm::{repository::Repository, CommonJSPackage, ES6Package, NpmPackage};
use self::npm::{repository::Repository, CommonJSPackage, ESModulesPackage, NpmPackage};
use console::style;
use emoji;
use error::Error;
Expand Down Expand Up @@ -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 wasm_file = format!("{}_bg.wasm", filename);
let js_file = format!("{}.js", filename);
Expand All @@ -168,7 +168,7 @@ impl CargoManifest {
None => {}
}

NpmPackage::ES6Package(ES6Package {
NpmPackage::ESModulesPackage(ESModulesPackage {
name: self.package.name,
collaborators: self.package.authors,
description: self.package.description,
Expand Down Expand Up @@ -211,7 +211,7 @@ pub fn write_package_json(
let npm_data = if target == "nodejs" {
crate_data.into_commonjs(scope, disable_dts)
} 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
Expand Down
2 changes: 1 addition & 1 deletion src/manifest/npm/es6.rs → src/manifest/npm/esmodules.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use manifest::npm::repository::Repository;

#[derive(Serialize)]
pub struct ES6Package {
pub struct ESModulesPackage {
pub name: String,
#[serde(skip_serializing_if = "Vec::is_empty")]
pub collaborators: Vec<String>,
Expand Down
6 changes: 3 additions & 3 deletions src/manifest/npm/mod.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
mod commonjs;
mod es6;
mod esmodules;
pub mod repository;

pub use self::commonjs::CommonJSPackage;
pub use self::es6::ES6Package;
pub use self::esmodules::ESModulesPackage;

#[derive(Serialize)]
pub enum NpmPackage {
CommonJSPackage(CommonJSPackage),
ES6Package(ES6Package),
ESModulesPackage(ESModulesPackage),
}

0 comments on commit 7f38eb9

Please sign in to comment.