-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Minify wasm-run, refactored cli opts
- Loading branch information
Showing
26 changed files
with
547 additions
and
2,463 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| Cargo.lock | ||
| /target | ||
| .vscode | ||
| /build | ||
| /demo_build | ||
| /examples/build | ||
| .vscode | ||
| /node_modules | ||
| /package-lock.json | ||
| /target | ||
| Cargo.lock |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| use std::path::PathBuf; | ||
|
|
||
| use crate::commons::models::IndexModel; | ||
|
|
||
| use super::{ | ||
| build_opts::BuildOpts, | ||
| cargo_build::run_cargo_build, | ||
| cargo_workspace::{get_workspace, Workspace}, | ||
| wasm_opt::run_wasm_opt, | ||
| wasm_path::WasmPath, | ||
| check_env::check_env, | ||
| find_target::{find_package_rlib_in_target, find_wasm_in_target}, | ||
| }; | ||
|
|
||
| pub fn run(opts: BuildOpts) -> Result<(), i32> { | ||
| let ws = get_workspace().expect("Can't read workspace"); | ||
|
|
||
| run_with_ws(opts, &ws) | ||
| } | ||
|
|
||
| pub fn run_with_ws(opts: BuildOpts, ws: &Workspace) -> Result<(), i32> { | ||
| let package_name = match opts.inner.package_name.as_deref() { | ||
| Some(name) => name.to_string(), | ||
| None => match ws.infer_package_name() { | ||
| Some(name) => { | ||
| log::info!("Inferred package name = {}", name); | ||
| name | ||
| } | ||
| None => { | ||
| log::error!( | ||
| "Can't find vertigo project in {} (no cdylib member)", | ||
| ws.get_root_dir() | ||
| ); | ||
| return Err(-1); | ||
| } | ||
| }, | ||
| }; | ||
|
|
||
| check_env()?; | ||
|
|
||
| let dest_dir = WasmPath::new(PathBuf::from(&opts.common.dest_dir)); | ||
|
|
||
| // Clean destination | ||
|
|
||
| dest_dir.remove_dir_all(); | ||
| dest_dir.create_dir_all(); | ||
|
|
||
| // Delete rlibs to re-generate static files | ||
|
|
||
| find_package_rlib_in_target(&package_name).remove_file(); | ||
|
|
||
| // Run build | ||
|
|
||
| let target_path = match run_cargo_build(&package_name, &opts.inner.public_path, ws) { | ||
| Ok(path) => path, | ||
| Err(_) => return Err(-2), | ||
| }; | ||
|
|
||
| // Get wasm_run.js and index.template.html from vertigo build | ||
|
|
||
| let vertigo_statics_dir = target_path.join("static"); | ||
|
|
||
| let run_script_content = std::fs::read(vertigo_statics_dir.join("wasm_run.js")) | ||
| .expect("No wasm_run in statics directory"); | ||
|
|
||
| let run_script_hash_name = opts | ||
| .new_path_in_static_make(&["wasm_run.js"]) | ||
| .save_with_hash(&run_script_content); | ||
|
|
||
| if opts.inner.wasm_run_source_map { | ||
| let run_script_sourcemap_content = std::fs::read_to_string(vertigo_statics_dir.join("wasm_run.js.map")) | ||
| .expect("No wasm_run sourcemap in statics directory") | ||
| // Replace original script filename in sourcemap with the hashed one | ||
| .replace("wasm_run.js", &run_script_hash_name); | ||
|
|
||
| opts | ||
| .new_path_in_static_make(&["wasm_run.js.map"]) | ||
| .save(&run_script_sourcemap_content.into_bytes()); | ||
| } | ||
|
|
||
| // Copy .wasm to destination | ||
|
|
||
| let wasm_path_target = find_wasm_in_target(&package_name); | ||
| let wasm_path = opts.new_path_in_static_from(&wasm_path_target); | ||
|
|
||
| // Optimize .wasm | ||
|
|
||
| let wasm_path_hash = | ||
| if !opts.inner.disable_wasm_opt && run_wasm_opt(&wasm_path_target, &wasm_path) { | ||
| // optimized | ||
| let wasm_path_hash = wasm_path.save_with_hash(wasm_path.read().as_slice()); | ||
| wasm_path.remove_file(); | ||
| wasm_path_hash | ||
| } else { | ||
| // copy without optimization | ||
| let wasm_content = wasm_path_target.read(); | ||
| wasm_path.save_with_hash(wasm_content.as_slice()) | ||
| }; | ||
|
|
||
| // Generate index.json in destination | ||
|
|
||
| let index = IndexModel { | ||
| run_js: opts.public_path_to(run_script_hash_name), | ||
| wasm: opts.public_path_to(wasm_path_hash), | ||
| }; | ||
|
|
||
| let index_content = serde_json::to_string_pretty(&index).unwrap(); | ||
| opts.new_path_in_static_make(&["index.json"]) | ||
| .save(index_content.as_bytes()); | ||
|
|
||
| // Copy statics generated by dom macro invocations | ||
|
|
||
| if let Ok(dir) = std::fs::read_dir(vertigo_statics_dir.join("included")) { | ||
| dir.for_each(|entry| { | ||
| if let Ok(entry) = entry { | ||
| let src_file_path = WasmPath::new(entry.path()); | ||
| let content = src_file_path.read(); | ||
| let dest_file_path = opts.new_path_in_static_from(&src_file_path); | ||
| dest_file_path.save(&content); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| Ok(()) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,117 +1,12 @@ | ||
| pub mod build_opts; | ||
| mod build_opts; | ||
| mod build_run; | ||
| mod cargo_build; | ||
| mod check_env; | ||
| mod find_target; | ||
| mod wasm_opt; | ||
| //TODO: To be eventually moved to separate 'commons' lib | ||
| mod cargo_workspace; | ||
| mod wasm_path; | ||
|
|
||
| use std::path::PathBuf; | ||
| use wasm_path::WasmPath; | ||
|
|
||
| use crate::commons::models::IndexModel; | ||
| pub use build_opts::BuildOpts; | ||
|
|
||
| pub use build_opts::{BuildOpts, BuildOptsInner}; | ||
| pub use build_run::{run, run_with_ws}; | ||
| pub use cargo_workspace::{get_workspace, Workspace}; | ||
|
|
||
| pub fn run(opts: BuildOpts) -> Result<(), i32> { | ||
| let ws = get_workspace().expect("Can't read workspace"); | ||
|
|
||
| run_with_ws(opts, &ws) | ||
| } | ||
|
|
||
| pub fn run_with_ws(opts: BuildOpts, ws: &Workspace) -> Result<(), i32> { | ||
| let package_name = match opts.package_name.as_deref() { | ||
| Some(name) => name.to_string(), | ||
| None => match ws.infer_package_name() { | ||
| Some(name) => { | ||
| log::info!("Inferred package name = {}", name); | ||
| name | ||
| } | ||
| None => { | ||
| log::error!( | ||
| "Can't find vertigo project in {} (no cdylib member)", | ||
| ws.get_root_dir() | ||
| ); | ||
| return Err(-1); | ||
| } | ||
| }, | ||
| }; | ||
|
|
||
| check_env::check_env()?; | ||
|
|
||
| let dest_dir = WasmPath::new(PathBuf::from(&opts.dest_dir)); | ||
|
|
||
| // Clean destination | ||
|
|
||
| dest_dir.remove_dir_all(); | ||
| dest_dir.create_dir_all(); | ||
|
|
||
| // Delete rlibs to re-generate static files | ||
|
|
||
| find_target::find_package_rlib_in_target(&package_name).remove_file(); | ||
|
|
||
| // Run build | ||
|
|
||
| let target_path = match cargo_build::run_cargo_build(&package_name, &opts.public_path, ws) { | ||
| Ok(path) => path, | ||
| Err(_) => return Err(-2), | ||
| }; | ||
|
|
||
| // Get wasm_run.js and index.template.html from vertigo build | ||
|
|
||
| let vertigo_statics_dir = target_path.join("static"); | ||
|
|
||
| let run_script_content = std::fs::read(vertigo_statics_dir.join("wasm_run.js")) | ||
| .expect("No wasm_run in statics directory"); | ||
|
|
||
| let run_script_hash_name = opts | ||
| .new_path_in_static_make(&["wasm_run.js"]) | ||
| .save_with_hash(&run_script_content); | ||
|
|
||
| // Copy .wasm to destination | ||
|
|
||
| let wasm_path_target = find_target::find_wasm_in_target(&package_name); | ||
| let wasm_path = opts.new_path_in_static_from(&wasm_path_target); | ||
|
|
||
| // Optimize .wasm | ||
|
|
||
| let wasm_path_hash = | ||
| if !opts.disable_wasm_opt && wasm_opt::run_wasm_opt(&wasm_path_target, &wasm_path) { | ||
| // optimized | ||
| let wasm_path_hash = wasm_path.save_with_hash(wasm_path.read().as_slice()); | ||
| wasm_path.remove_file(); | ||
| wasm_path_hash | ||
| } else { | ||
| // copy without optimization | ||
| let wasm_content = wasm_path_target.read(); | ||
| wasm_path.save_with_hash(wasm_content.as_slice()) | ||
| }; | ||
|
|
||
| // Generate index.json in destination | ||
|
|
||
| let index = IndexModel { | ||
| run_js: opts.public_path_to(run_script_hash_name), | ||
| wasm: opts.public_path_to(wasm_path_hash), | ||
| }; | ||
|
|
||
| let index_content = serde_json::to_string_pretty(&index).unwrap(); | ||
| opts.new_path_in_static_make(&["index.json"]) | ||
| .save(index_content.as_bytes()); | ||
|
|
||
| // Copy statics generated by dom macro invocations | ||
|
|
||
| if let Ok(dir) = std::fs::read_dir(vertigo_statics_dir.join("included")) { | ||
| dir.for_each(|entry| { | ||
| if let Ok(entry) = entry { | ||
| let src_file_path = WasmPath::new(entry.path()); | ||
| let content = src_file_path.read(); | ||
| let dest_file_path = opts.new_path_in_static_from(&src_file_path); | ||
| dest_file_path.save(&content); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| Ok(()) | ||
| } |
Oops, something went wrong.