Skip to content

Commit

Permalink
Merge pull request #736 from Sharktheone/v8-cyclic
Browse files Browse the repository at this point in the history
move interop test to fix cyclic dependency
  • Loading branch information
jaytaph authored Dec 27, 2024
2 parents d1a4139 + 8d699e9 commit 76faf72
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 21 deletions.
9 changes: 1 addition & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion crates/gosub_v8/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@ gosub_webexecutor = { path = "../gosub_webexecutor" }
thiserror = "2.0.9"
v8 = "130.0.1"
anyhow = "1.0.94"
serde_json = "1.0.134"
serde_json = "1.0.134"


[dev-dependencies]
gosub_webinterop = { path = "../gosub_webinterop" }
2 changes: 2 additions & 0 deletions crates/gosub_v8/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#[cfg(test)]
mod tests;
mod v8;

pub use v8::*;
Expand Down
1 change: 1 addition & 0 deletions crates/gosub_v8/src/tests.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mod interop;
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::cell::RefCell;
use std::rc::Rc;

use crate::V8Engine;
use gosub_shared::types::Result;
use gosub_v8::V8Engine;
use gosub_webexecutor::js::{
Args, IntoJSValue, IntoRustValue, JSContext, JSFunction, JSFunctionCallBack, JSFunctionCallBackVariadic,
JSFunctionVariadic, JSGetterCallback, JSInterop, JSObject, JSRuntime, JSSetterCallback, JSValue, VariadicArgs,
Expand Down
11 changes: 1 addition & 10 deletions crates/gosub_webexecutor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,5 @@ license = "MIT"

[dependencies]
gosub_shared = { path = "../gosub_shared" }
colored = "2.2.0"
derive_more = { version = "1", features = ["from", "display"] }
lazy_static = "1.5"
thiserror = "2.0.9"
anyhow = "1.0.94"
paste = "1.0.15"

[dev-dependencies]
serde_json = "1.0.134"
gosub_v8 = { path = "../gosub_v8" }
gosub_webinterop = { path = "../gosub_webinterop" }
paste = "1.0.15"
1 change: 0 additions & 1 deletion crates/gosub_webinterop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ license = "MIT"
syn = { version = "2.0.91", features = ["full", "extra-traits"] }
quote = { version = "1.0.37", features = [] }
proc-macro2 = "1.0.92"
serde = { version = "1.0.216", features = ["derive"] }
lazy_static = "1.5.0"


Expand Down

0 comments on commit 76faf72

Please sign in to comment.