From 7f38eb9b0c5ea474828360774a4615346362f267 Mon Sep 17 00:00:00 2001
From: Ashley Williams <ashley666ashley@gmail.com>
Date: Tue, 18 Sep 2018 17:48:30 -0400
Subject: [PATCH] fix(manifest:npm): s/es6/esmodules

---
 src/manifest/mod.rs                       | 8 ++++----
 src/manifest/npm/{es6.rs => esmodules.rs} | 2 +-
 src/manifest/npm/mod.rs                   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename src/manifest/npm/{es6.rs => esmodules.rs} (95%)

diff --git a/src/manifest/mod.rs b/src/manifest/mod.rs
index 9c0c30e5..aa48850e 100644
--- a/src/manifest/mod.rs
+++ b/src/manifest/mod.rs
@@ -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;
@@ -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);
@@ -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,
@@ -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
diff --git a/src/manifest/npm/es6.rs b/src/manifest/npm/esmodules.rs
similarity index 95%
rename from src/manifest/npm/es6.rs
rename to src/manifest/npm/esmodules.rs
index 9c25c405..e1625433 100644
--- a/src/manifest/npm/es6.rs
+++ b/src/manifest/npm/esmodules.rs
@@ -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>,
diff --git a/src/manifest/npm/mod.rs b/src/manifest/npm/mod.rs
index 2f26cd0e..ea2800a0 100644
--- a/src/manifest/npm/mod.rs
+++ b/src/manifest/npm/mod.rs
@@ -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),
 }