Skip to content

Commit 7ef0935

Browse files
luca-della-vedovaluca-della-vedova
authored
Don't export run_js to the library (#249)
Signed-off-by: Luca Della Vedova <[email protected]>
1 parent 2402c98 commit 7ef0935

File tree

9 files changed

+41
-23
lines changed

9 files changed

+41
-23
lines changed

‎.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
target
2-
web/librmf_site_editor.d.ts
3-
web/librmf_site_editor.js
4-
web/librmf_site_editor_bg.wasm
5-
web/librmf_site_editor_bg_optimized.wasm
6-
web/librmf_site_editor_bg.wasm.d.ts
2+
web/librmf_site_editor_web.d.ts
3+
web/librmf_site_editor_web.js
4+
web/librmf_site_editor_web_bg.wasm
5+
web/librmf_site_editor_web_bg_optimized.wasm
6+
web/librmf_site_editor_web_bg.wasm.d.ts
77
/test_output/

‎Cargo.lock

Lines changed: 9 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[workspace]
22
members = [
33
"rmf_site_editor",
4+
"rmf_site_editor_web",
45
"rmf_site_format",
56
]
67

‎rmf_site_editor/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ smallvec = "*"
2727
serde = { version = "1.0", features = ["derive"] }
2828
serde_yaml = "0.8.23"
2929
serde_json = "1.0"
30-
wasm-bindgen = "=0.2.93"
3130
futures-lite = "1.12.0"
3231
bevy = { version = "0.12", features = ["pnm", "jpeg", "tga"] }
3332
dirs = "5.0"
@@ -56,5 +55,4 @@ clap = { version = "4.0.10", features = ["color", "derive", "help", "usage", "su
5655
bevy_impulse = { git = "https://github.com/open-rmf/bevy_impulse", branch = "main" }
5756

5857
[target.'cfg(target_arch = "wasm32")'.dependencies]
59-
console_error_panic_hook = "0.1.7"
6058
bevy_impulse = { git = "https://github.com/open-rmf/bevy_impulse", branch = "main", features = ["single_threaded_async"]}

‎rmf_site_editor/src/lib.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ use bevy_egui::EguiPlugin;
33
#[cfg(not(target_arch = "wasm32"))]
44
use clap::Parser;
55
use main_menu::MainMenuPlugin;
6-
#[cfg(target_arch = "wasm32")]
7-
use wasm_bindgen::prelude::*;
86

97
pub mod aabb;
108
pub mod animate;
@@ -95,14 +93,6 @@ impl AppState {
9593
}
9694
}
9795

98-
#[cfg(target_arch = "wasm32")]
99-
#[wasm_bindgen]
100-
pub fn run_js() {
101-
extern crate console_error_panic_hook;
102-
std::panic::set_hook(Box::new(console_error_panic_hook::hook));
103-
run(vec!["web".to_owned()]);
104-
}
105-
10696
pub fn run(command_line_args: Vec<String>) {
10797
let mut app = App::new();
10898
let mut _headless_export = None;

‎rmf_site_editor_web/Cargo.toml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[package]
2+
name = "rmf_site_editor_web"
3+
version = "0.0.1"
4+
edition = "2021"
5+
6+
[lib]
7+
crate-type = ["cdylib", "rlib"]
8+
name = "librmf_site_editor_web"
9+
10+
[dependencies]
11+
wasm-bindgen = "=0.2.93"
12+
rmf_site_editor = { path = "../rmf_site_editor" }
13+
console_error_panic_hook = "0.1.7"

‎rmf_site_editor_web/src/lib.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
use librmf_site_editor::run;
2+
use wasm_bindgen::prelude::*;
3+
4+
#[wasm_bindgen]
5+
pub fn run_js() {
6+
extern crate console_error_panic_hook;
7+
std::panic::set_hook(Box::new(console_error_panic_hook::hook));
8+
run(vec![]);
9+
}

‎scripts/build-web.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ set -o errexit
44
export CARGO_PROFILE_RELEASE_LTO=true
55
export CARGO_PROFILE_RELEASE_OPT_LEVEL=z
66
cargo build --target wasm32-unknown-unknown --release
7-
RUST_BACKTRACE=full wasm-bindgen --target web --out-dir web target/wasm32-unknown-unknown/release/librmf_site_editor.wasm
7+
RUST_BACKTRACE=full wasm-bindgen --target web --out-dir web target/wasm32-unknown-unknown/release/librmf_site_editor_web.wasm
88
cd web
9-
wasm-opt -Oz -o librmf_site_editor_bg_optimized.wasm librmf_site_editor_bg.wasm
9+
wasm-opt -Oz -o librmf_site_editor_web_bg_optimized.wasm librmf_site_editor_web_bg.wasm

‎web/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<body>
1919
<canvas id="rmf_site_editor_canvas">
2020
<script type="module">
21-
import init from "./librmf_site_editor.js";
21+
import init from "./librmf_site_editor_web.js";
2222
document.addEventListener('contextmenu', function(evt) { evt.preventDefault(); });
23-
init("./librmf_site_editor_bg_optimized.wasm").then(function (wasm) {
23+
init("./librmf_site_editor_web_bg_optimized.wasm").then(function (wasm) {
2424
wasm.run_js();
2525
});
2626
</script>

0 commit comments

Comments
 (0)