Skip to content

Commit

Permalink
fix: path deps
Browse files Browse the repository at this point in the history
  • Loading branch information
mrchantey committed Jan 13, 2025
1 parent c4543f7 commit 45ab3d1
Show file tree
Hide file tree
Showing 14 changed files with 96 additions and 127 deletions.
39 changes: 18 additions & 21 deletions Cargo.lock

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

39 changes: 21 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,44 @@
resolver = "2" # Important! wgpu/Bevy needs this!
members = [
"crates/sweet_core",
"crates/sweet_rsx",
"crates/sweet_rsx/macros",
"crates/sweet_rsx",
"crates/sweet_site",
"crates/sweet_test",
"crates/sweet_test/macros",
"crates/sweet_test",
"crates/sweet-cli",
]

[workspace.package]
version = "0.3.0-rc.1"
edition = "2021"
license = "MIT OR Apache-2.0"
readme = "README.md"
authors = ["Peter Hayman <[email protected]>"]
readme = "README.md"
description = "Delightful Rust testing"
documentation = "https://mrchantey.github.io/forky/docs"
repository = "https://github.com/mrchantey/sweet"
categories = [
"compilers",
"development-tools",
"development-tools::testing",
"wasm",
"web-programming",
]
keywords = ["full-stack", "browser", "web", "test", "e2e"]

[workspace.dependencies]
sweet = { path = "", version = "0.3.0-rc.1" }
# dont specify version to allow it to be included as a dev dependency but ignored by cargo publish
sweet = { path = "" }
sweet_core = { path = "crates/sweet_core", version = "0.3.0-rc.1" }
sweet_test = { path = "crates/sweet_test", version = "0.3.0-rc.1" }
sweet_test_macros = { path = "crates/sweet_test/macros", version = "0.3.0-rc.1" }
sweet_rsx = { path = "crates/sweet_rsx", version = "0.3.0-rc.1" }
sweet_rsx_macros = { path = "crates/sweet_rsx/macros", version = "0.3.0-rc.1" }
# forky = { version = "0.2.0-rc.2", path = "../forky/crates/forky" }
forky = { git = "https://github.com/mrchantey/forky" }
# forky = { version = "0.2.1-rc.1", git = "https://github.com/mrchantey/forky" }
# forky = { path = "../forky" }
# forky = { version = "0.2.0-rc.7" }
forky = { version = "0.2.1-rc.1" }


#💡 utility
Expand Down Expand Up @@ -134,20 +143,14 @@ features = [
name = "sweet"
version.workspace = true
edition.workspace = true
authors.workspace = true
license.workspace = true
authors.workspace = true
readme.workspace = true
description.workspace = true
documentation.workspace = true
repository.workspace = true
readme = "README.md"
description = "Rust web dev is sweet as!"
documentation = "https://mrchantey.github.io/forky/docs/sweet"
categories = ["development-tools::testing"]
keywords = [ # 5 at most
"test",
"unit",
"e2e",
"browser",
"webdriver",
]
categories.workspace = true
keywords.workspace = true

[features]
rsx = ["dep:sweet_rsx"]
Expand Down
24 changes: 5 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div align="center">

<p>
<strong>Declarative full-stack test framework.</strong>
<strong>full-stack rust</strong>
</p>

<p>
Expand All @@ -13,27 +13,13 @@
</p>

<h3>
<a href="https://mrchantey.github.io/sweet/docs">Book</a>
<span> | </span>
<!-- <a href="https://mrchantey.github.io/sweet/docs">Book</a> -->
<!-- <span> | </span> -->
<a href="https://docs.rs/sweet">API Docs</a>
<span> | </span>
<a href="https://mrchantey.github.io/forky/docs/other/contributing.html">Contributing</a>
<!-- <span> | </span> -->
<!-- <a href="https://mrchantey.github.io/forky/docs/other/contributing.html">Contributing</a> -->
</h3>

<sub>made with ❤️‍🔥 by mrchantey</a></sub>
</div>

## Usage

```rs
#[sweet::test]
fn true_is_true() -> Result<()> {
expect(true).to_be_true()
}
```

## TODO
- make the crate rustier like [cargo-pretty-test](https://github.com/josecelano/cargo-pretty-test)



22 changes: 11 additions & 11 deletions crates/sweet-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
[package]
name = "sweet-cli"
version = { workspace = true }
edition = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
readme = "README.md"
description = "CLI for the Sweet test framework"
documentation = "https://mrchantey.github.io/forky/docs/sweet/cli"
categories = ["development-tools::testing"]
keywords = ["cli", "test", "e2e", "browser", "webdriver"]
version.workspace = true
edition.workspace = true
license.workspace = true
authors.workspace = true
readme.workspace = true
description.workspace = true
documentation.workspace = true
repository.workspace = true
categories.workspace = true
keywords.workspace = true

[[bin]]
name = "sweet"
path = "src/main.rs"

[dependencies]
anyhow.workspace = true
sweet = { workspace = true, features = ["test"] }
sweet_test.workspace = true

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
forky = { workspace = true, features = ["fs"] }
Expand Down
28 changes: 0 additions & 28 deletions crates/sweet-cli/README.md

This file was deleted.

2 changes: 1 addition & 1 deletion crates/sweet-cli/src/test_runners/test_wasm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub struct TestWasm {
// we wont actuallly use this because the args will
// be passed to deno, but it provides --help messages
#[command(flatten)]
runner_args: sweet::prelude::TestRunnerConfig,
runner_args: sweet_test::prelude::TestRunnerConfig,
}


Expand Down
3 changes: 3 additions & 0 deletions crates/sweet_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ version.workspace = true
edition.workspace = true
license.workspace = true
authors.workspace = true
readme.workspace = true
description.workspace = true
documentation.workspace = true
repository.workspace = true
categories.workspace = true
keywords.workspace = true


[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/sweet_core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

pub mod error;
// nice and handy for commonly used tasks
pub use error::*;
// pub use error::*;

pub mod utils;
pub use utils::log::*;
Expand Down
3 changes: 3 additions & 0 deletions crates/sweet_rsx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ version.workspace = true
edition.workspace = true
license.workspace = true
authors.workspace = true
readme.workspace = true
description.workspace = true
documentation.workspace = true
repository.workspace = true
categories.workspace = true
keywords.workspace = true


[dependencies]
Expand Down
12 changes: 8 additions & 4 deletions crates/sweet_rsx/macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,22 @@ version.workspace = true
edition.workspace = true
license.workspace = true
authors.workspace = true
readme.workspace = true
description.workspace = true
documentation.workspace = true
repository.workspace = true
categories.workspace = true
keywords.workspace = true


[lib]
proc-macro = true

[dependencies]
syn = { workspace = true }
quote = { workspace = true }
proc-macro2 = { workspace = true }
anyhow = { workspace = true }
syn.workspace = true
quote.workspace = true
proc-macro2.workspace = true
anyhow.workspace = true

rstml = { version = "0.12", features = ["rawtext-stable-hack"] }
proc-macro2-diagnostics = "0.10"
3 changes: 3 additions & 0 deletions crates/sweet_site/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ version.workspace = true
edition.workspace = true
license.workspace = true
authors.workspace = true
readme.workspace = true
description.workspace = true
documentation.workspace = true
repository.workspace = true
categories.workspace = true
keywords.workspace = true


[dependencies]
Expand Down
Loading

0 comments on commit 45ab3d1

Please sign in to comment.