diff --git a/.gitignore b/.gitignore index 640216e..72bc027 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ - +target/ **/target **/*.rs.bk **/pkg diff --git a/src/bindgen.rs b/src/bindgen.rs index c41f4ee..3def230 100644 --- a/src/bindgen.rs +++ b/src/bindgen.rs @@ -1,7 +1,7 @@ -use std::process::Command; use console::style; use emoji; use progressbar; +use std::process::Command; pub fn cargo_install_wasm_bindgen() { let step = format!( diff --git a/src/build.rs b/src/build.rs index 527a8c7..f3ed8a5 100644 --- a/src/build.rs +++ b/src/build.rs @@ -1,7 +1,7 @@ -use std::process::Command; use console::style; use emoji; use progressbar; +use std::process::Command; pub fn rustup_add_wasm_target() { let step = format!( diff --git a/src/lib.rs b/src/lib.rs index 05b78ba..748b4d3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,17 +6,17 @@ extern crate serde_derive; extern crate serde_json; extern crate toml; -pub mod build; pub mod bindgen; -pub mod readme; +pub mod build; +pub mod emoji; pub mod manifest; pub mod progressbar; -pub mod emoji; +pub mod readme; use std::fs; -use failure::Error; use console::style; +use failure::Error; pub fn create_pkg_dir(path: &str) -> Result<(), Error> { let step = format!( diff --git a/src/manifest.rs b/src/manifest.rs index da5308d..e86e316 100644 --- a/src/manifest.rs +++ b/src/manifest.rs @@ -2,11 +2,11 @@ use std::fs::File; use std::io::prelude::*; use console::style; +use emoji; use failure::Error; +use progressbar; use serde_json; use toml; -use emoji; -use progressbar; #[derive(Deserialize)] struct CargoManifest { @@ -16,6 +16,7 @@ struct CargoManifest { #[derive(Deserialize)] struct CargoPackage { name: String, + authors: Vec, description: String, version: String, license: String, @@ -25,6 +26,7 @@ struct CargoPackage { #[derive(Serialize)] struct NpmPackage { name: String, + collaborators: Vec, description: String, version: String, license: String, @@ -58,6 +60,7 @@ impl CargoManifest { } NpmPackage { name: self.package.name, + collaborators: self.package.authors, description: self.package.description, version: self.package.version, license: self.package.license, @@ -82,7 +85,7 @@ pub fn write_package_json(path: &str, scope: Option) -> Result<(), Error let mut pkg_file = File::create(pkg_file_path)?; let crate_data = read_cargo_toml(path)?; let npm_data = crate_data.into_npm(scope); - let npm_json = serde_json::to_string(&npm_data)?; + let npm_json = serde_json::to_string_pretty(&npm_data)?; pkg_file.write_all(npm_json.as_bytes())?; pb.finish(); Ok(()) diff --git a/src/readme.rs b/src/readme.rs index 20f5c45..6bde0dd 100644 --- a/src/readme.rs +++ b/src/readme.rs @@ -1,10 +1,10 @@ -use std::fs; -use failure::Error; use console::style; +use failure::Error; use indicatif::MultiProgress; +use std::fs; -use progressbar; use emoji; +use progressbar; pub fn copy_from_crate(path: &str) -> Result<(), Error> { let m = MultiProgress::new();