Skip to content

Commit 0960881

Browse files
committed
Add --skip-build flag for init command
this flag skip: adding target compiling to wasm installing wasm-bindgen running wasm-bindgen
1 parent 1d946d6 commit 0960881

File tree

8 files changed

+252
-146
lines changed

8 files changed

+252
-146
lines changed

src/bindgen.rs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
use console::style;
21
use emoji;
32
use error::Error;
3+
use progressbar::Step;
44
use std::process::Command;
55
use PBAR;
66

7-
pub fn cargo_install_wasm_bindgen() -> Result<(), Error> {
8-
let step = format!(
9-
"{} {}Installing WASM-bindgen...",
10-
style("[6/7]").bold().dim(),
11-
emoji::DOWN_ARROW
12-
);
13-
let pb = PBAR.message(&step);
7+
pub fn cargo_install_wasm_bindgen(step: &Step) -> Result<(), Error> {
8+
let msg = format!("{}Installing WASM-bindgen...", emoji::DOWN_ARROW);
9+
let pb = PBAR.step(step, &msg);
1410
let output = Command::new("cargo")
1511
.arg("install")
1612
.arg("wasm-bindgen-cli")
@@ -33,14 +29,11 @@ pub fn wasm_bindgen_build(
3329
path: &str,
3430
name: &str,
3531
disable_dts: bool,
36-
target: String,
32+
target: &str,
33+
step: &Step,
3734
) -> Result<(), Error> {
38-
let step = format!(
39-
"{} {}Running WASM-bindgen...",
40-
style("[7/7]").bold().dim(),
41-
emoji::RUNNER
42-
);
43-
let pb = PBAR.message(&step);
35+
let msg = format!("{}Running WASM-bindgen...", emoji::RUNNER);
36+
let pb = PBAR.step(step, &msg);
4437
let binary_name = name.replace("-", "_");
4538
let wasm_path = format!("target/wasm32-unknown-unknown/release/{}.wasm", binary_name);
4639

@@ -50,7 +43,7 @@ pub fn wasm_bindgen_build(
5043
"--no-typescript"
5144
};
5245

53-
let target_arg = match target.as_str() {
46+
let target_arg = match target {
5447
"nodejs" => "--nodejs",
5548
_ => "--browser",
5649
};

src/build.rs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
use console::style;
21
use emoji;
32
use error::Error;
3+
use progressbar::Step;
44
use std::process::Command;
55
use PBAR;
66

7-
pub fn rustup_add_wasm_target() -> Result<(), Error> {
8-
let step = format!(
9-
"{} {}Adding WASM target...",
10-
style("[1/7]").bold().dim(),
11-
emoji::TARGET
12-
);
13-
let pb = PBAR.message(&step);
7+
pub fn rustup_add_wasm_target(step: &Step) -> Result<(), Error> {
8+
let msg = format!("{}Adding WASM target...", emoji::TARGET);
9+
let pb = PBAR.step(step, &msg);
1410
let output = Command::new("rustup")
1511
.arg("target")
1612
.arg("add")
@@ -25,13 +21,9 @@ pub fn rustup_add_wasm_target() -> Result<(), Error> {
2521
}
2622
}
2723

28-
pub fn cargo_build_wasm(path: &str) -> Result<(), Error> {
29-
let step = format!(
30-
"{} {}Compiling to WASM...",
31-
style("[2/7]").bold().dim(),
32-
emoji::CYCLONE
33-
);
34-
let pb = PBAR.message(&step);
24+
pub fn cargo_build_wasm(path: &str, step: &Step) -> Result<(), Error> {
25+
let msg = format!("{}Compiling to WASM...", emoji::CYCLONE);
26+
let pb = PBAR.step(step, &msg);
3527
let output = Command::new("cargo")
3628
.current_dir(path)
3729
.arg("build")

0 commit comments

Comments
 (0)