diff --git a/Cargo.lock b/Cargo.lock index 0edc8aa1..6e0f1eb8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -629,6 +629,8 @@ dependencies = [ [[package]] name = "bevy" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e938630e9f472b1899c78ef84aa907081b23bad8333140e2295c620485b6ee7" dependencies = [ "bevy_internal 0.14.0", ] @@ -688,6 +690,8 @@ dependencies = [ [[package]] name = "bevy_a11y" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e613f0e7d5a92637e59744f7185e374c9a59654ecc6d7575adcec9581db1363" dependencies = [ "accesskit 0.14.0", "bevy_app 0.14.0", @@ -698,6 +702,8 @@ dependencies = [ [[package]] name = "bevy_animation" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23aa4141df149b743e69c90244261c6372bafb70d9f115885de48a75fc28fd9b" dependencies = [ "bevy_app 0.14.0", "bevy_asset 0.14.0", @@ -742,6 +748,8 @@ dependencies = [ [[package]] name = "bevy_app" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f548e9dab7d10c5f99e3b504c758c4bf87aa67df9bcb9cc8b317a0271770e72" dependencies = [ "bevy_derive 0.14.0", "bevy_ecs 0.14.0", @@ -790,6 +798,8 @@ dependencies = [ [[package]] name = "bevy_asset" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d198e4c3419215de2ad981d4e734bbfab46469b7575e3b7150c912b9ec5175" dependencies = [ "async-broadcast", "async-fs", @@ -832,6 +842,8 @@ dependencies = [ [[package]] name = "bevy_asset_macros" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11b2cbeba287a4b44e116c33dbaf37dce80a9d84477b2bb35ff459999d6c9e1b" dependencies = [ "bevy_macro_utils 0.14.0", "proc-macro2", @@ -842,6 +854,8 @@ dependencies = [ [[package]] name = "bevy_audio" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e41ecf15d0aae31bdb6d2b5cc590f966451e9736ddfee634c8f1ca5af1ac4342" dependencies = [ "bevy_app 0.14.0", "bevy_asset 0.14.0", @@ -859,6 +873,8 @@ dependencies = [ [[package]] name = "bevy_color" version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a933306f5c7dc9568209180f482b28b5f40d2f8d5b361bc1b270c0a588752c0" dependencies = [ "bevy_math 0.14.0", "bevy_reflect 0.14.0", @@ -887,6 +903,8 @@ dependencies = [ [[package]] name = "bevy_core" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ddeed5ebf2fa75a4d4f32e2da9c60f11037e36252695059a151c6685cd3d72b" dependencies = [ "bevy_app 0.14.0", "bevy_ecs 0.14.0", @@ -921,6 +939,8 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b978220b5edc98f2c5cbbd14c118c74b3ec7216e5416d3c187c1097279b009b" dependencies = [ "bevy_app 0.14.0", "bevy_asset 0.14.0", @@ -955,6 +975,8 @@ dependencies = [ [[package]] name = "bevy_derive" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8a8173bad3ed53fa158806b1beda147263337d6ef71a093780dd141b74386b1" dependencies = [ "bevy_macro_utils 0.14.0", "quote", @@ -980,6 +1002,8 @@ dependencies = [ [[package]] name = "bevy_diagnostic" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7f82011fd70048be282526a99756d54bf00e874edafa9664ba0dc247678f03" dependencies = [ "bevy_app 0.14.0", "bevy_core 0.14.0", @@ -1014,6 +1038,8 @@ dependencies = [ [[package]] name = "bevy_ecs" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c77fdc3a7230eff2fcebe4bd17c155bd238c660a0089d0f98c39ba0d461b923" dependencies = [ "arrayvec", "bevy_ecs_macros 0.14.0", @@ -1045,6 +1071,8 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272b511958525306cd141726d3ca59740f79fc0707c439b55a007bcc3497308" dependencies = [ "bevy_macro_utils 0.14.0", "proc-macro2", @@ -1079,6 +1107,8 @@ dependencies = [ [[package]] name = "bevy_encase_derive" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0452d8254c8bfae4bff6caca2a8be3b0c1b2e1a72b93e9b9f6a21c8dff807e0" dependencies = [ "bevy_macro_utils 0.14.0", "encase_derive_impl 0.8.0", @@ -1087,6 +1117,8 @@ dependencies = [ [[package]] name = "bevy_gilrs" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbad8e59470c3d5cf25aa8c48462c4cf6f0c6314538c68ab2f5cf393146f0fc2" dependencies = [ "bevy_app 0.14.0", "bevy_ecs 0.14.0", @@ -1121,6 +1153,8 @@ dependencies = [ [[package]] name = "bevy_gizmos" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbb0556f0c6e45f4a17aef9c708c06ebf15ae1bed4533d7eddb493409f9f025" dependencies = [ "bevy_app 0.14.0", "bevy_asset 0.14.0", @@ -1154,6 +1188,8 @@ dependencies = [ [[package]] name = "bevy_gizmos_macros" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ef351a4b6498c197d1317c62f46ba84b69fbde3dbeb57beb2e744bbe5b7c3e0" dependencies = [ "bevy_macro_utils 0.14.0", "proc-macro2", @@ -1164,6 +1200,8 @@ dependencies = [ [[package]] name = "bevy_gltf" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd7abeaf3f28afd1f8999c2169aa17b40a37ad11253cf7dd05017024b65adc6" dependencies = [ "base64 0.22.0", "bevy_animation", @@ -1207,6 +1245,8 @@ dependencies = [ [[package]] name = "bevy_hierarchy" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "802eca6f341d19ade790ccfaba7044be4d823b708087eb5ac4c1f74e4ea0916a" dependencies = [ "bevy_app 0.14.0", "bevy_core 0.14.0", @@ -1234,6 +1274,8 @@ dependencies = [ [[package]] name = "bevy_input" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d050f1433f48ca23f1ea078734ebff119a3f76eb7d221725ab0f1fd9f81230b" dependencies = [ "bevy_app 0.14.0", "bevy_ecs 0.14.0", @@ -1278,6 +1320,8 @@ dependencies = [ [[package]] name = "bevy_internal" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ddd2b23e44d3a1f8ae547cbee5b6661f8135cc456c5de206e8648789944e7a1" dependencies = [ "bevy_a11y 0.14.0", "bevy_animation", @@ -1333,6 +1377,8 @@ dependencies = [ [[package]] name = "bevy_log" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab641fd0de254915ab746165a07677465b2d89b72f5b49367d73b9197548a35" dependencies = [ "android_log-sys", "bevy_app 0.14.0", @@ -1359,6 +1405,8 @@ dependencies = [ [[package]] name = "bevy_macro_utils" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ad860d35d74b35d4d6ae7f656d163b6f475aa2e64fc293ee86ac901977ddb7" dependencies = [ "proc-macro2", "quote", @@ -1379,6 +1427,8 @@ dependencies = [ [[package]] name = "bevy_math" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bd6ce2174d3237d30e0ab5b2508480cc7593ca4d96ffb3a3095f9fc6bbc34c" dependencies = [ "bevy_reflect 0.14.0", "glam 0.27.0", @@ -1399,6 +1449,8 @@ dependencies = [ [[package]] name = "bevy_mikktspace" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7ce4266293629a2d10459cc112dffe3b3e9229a4f2b8a4d20061b8dd53316d0" dependencies = [ "glam 0.27.0", ] @@ -1446,6 +1498,8 @@ dependencies = [ [[package]] name = "bevy_pbr" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3effe8ff28899f14d250d0649ca9868dbe68b389d0f2b7af086759b8e16c6e3d" dependencies = [ "bevy_app 0.14.0", "bevy_asset 0.14.0", @@ -1477,6 +1531,8 @@ checksum = "8050e2869fe341db6874203b5a01ff12673807a2c7c80cb829f6c7bea6997268" [[package]] name = "bevy_ptr" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c115c97a5c8a263bd0aa7001b999772c744ac5ba797d07c86f25734ce381ea69" [[package]] name = "bevy_rapier3d" @@ -1512,6 +1568,8 @@ dependencies = [ [[package]] name = "bevy_reflect" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406ea0fce267169c2320c7302d97d09f605105686346762562c5f65960b5ca2f" dependencies = [ "bevy_ptr 0.14.0", "bevy_reflect_derive 0.14.0", @@ -1543,6 +1601,8 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0427fdb4425fc72cc96d45e550df83ace6347f0503840de116c76a40843ba751" dependencies = [ "bevy_macro_utils 0.14.0", "proc-macro2", @@ -1597,6 +1657,8 @@ dependencies = [ [[package]] name = "bevy_render" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c48acf1ff4267c231def4cbf573248d42ac60c9952108822d505019460bf36d" dependencies = [ "async-channel", "bevy_app 0.14.0", @@ -1655,6 +1717,8 @@ dependencies = [ [[package]] name = "bevy_render_macros" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ddf4a96d71519c8eca3d74dabcb89a9c0d50ab5d9230638cb004145f46e9ed" dependencies = [ "bevy_macro_utils 0.14.0", "proc-macro2", @@ -1685,6 +1749,8 @@ dependencies = [ [[package]] name = "bevy_scene" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7a9f0388612a116f02ab6187aeab66e52c9e91abbc21f919b8b50230c4d83e7" dependencies = [ "bevy_app 0.14.0", "bevy_asset 0.14.0", @@ -1703,6 +1769,8 @@ dependencies = [ [[package]] name = "bevy_sprite" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d837e33ed27b9f2e5212eca4bdd5655a9ee64c52914112e6189c043cb25dd1ec" dependencies = [ "bevy_app 0.14.0", "bevy_asset 0.14.0", @@ -1727,6 +1795,8 @@ dependencies = [ [[package]] name = "bevy_state" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0959984092d56885fd3b320ea84fb816821bad6bfa3040b9d4ee850d3273233d" dependencies = [ "bevy_app 0.14.0", "bevy_ecs 0.14.0", @@ -1739,6 +1809,8 @@ dependencies = [ [[package]] name = "bevy_state_macros" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887a98bfa268258377cd073f5bb839518d3a1cd6b96ed81418145485b69378e6" dependencies = [ "bevy_macro_utils 0.14.0", "proc-macro2", @@ -1763,6 +1835,8 @@ dependencies = [ [[package]] name = "bevy_tasks" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8bfb8d484bdb1e9bec3789c75202adc5e608c4244347152e50fb31668a54f9" dependencies = [ "async-channel", "async-executor", @@ -1774,6 +1848,8 @@ dependencies = [ [[package]] name = "bevy_text" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "454fd29b7828244356b2e0ce782e6d0a6f26b47f521456accde3a7191b121727" dependencies = [ "ab_glyph", "bevy_app 0.14.0", @@ -1809,6 +1885,8 @@ dependencies = [ [[package]] name = "bevy_time" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6c3d3d14ee8b0dbe4819fd516cc75509b61946134d78e0ee89ad3d1835ffe6c" dependencies = [ "bevy_app 0.14.0", "bevy_ecs 0.14.0", @@ -1835,6 +1913,8 @@ dependencies = [ [[package]] name = "bevy_transform" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97e8aa6b16be573277c6ceda30aebf1d78af7c6ede19b448dcb052fb8601d815" dependencies = [ "bevy_app 0.14.0", "bevy_ecs 0.14.0", @@ -1847,6 +1927,8 @@ dependencies = [ [[package]] name = "bevy_ui" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d9f864c646f3742ff77f67bcd89a13a7ab024b68ca2f1bfbab8245bcb1c06c" dependencies = [ "bevy_a11y 0.14.0", "bevy_app 0.14.0", @@ -1894,6 +1976,8 @@ dependencies = [ [[package]] name = "bevy_utils" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fab364910e8f5839578aba9cfda00a8388e9ebe352ceb8491a742ce6af9ec6e" dependencies = [ "ahash", "bevy_utils_proc_macros 0.14.0", @@ -1918,6 +2002,8 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad9db261ab33a046e1f54b35f885a44f21fcc80aa2bc9050319466b88fe58fe3" dependencies = [ "proc-macro2", "quote", @@ -1944,6 +2030,8 @@ dependencies = [ [[package]] name = "bevy_window" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9ea5777f933bf7ecaeb3af1a30845720ec730e007972ca7d4aba2d3512abe24" dependencies = [ "bevy_a11y 0.14.0", "bevy_app 0.14.0", @@ -1983,6 +2071,8 @@ dependencies = [ [[package]] name = "bevy_winit" version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c2213bbf14debe819ec8ad4913f233c596002d087bc6f1f20d533e2ebaf8c6" dependencies = [ "accesskit_winit 0.20.4", "approx", @@ -3416,8 +3506,8 @@ dependencies = [ "anyhow", "bevy 0.14.0", "extend", - "forky_core", - "forky_web", + "forky_core 0.1.50", + "forky_web 0.1.50", "js-sys", "rand", "sweet", @@ -3435,8 +3525,8 @@ dependencies = [ "cssparser", "extend", "fantoccini", - "forky_core", - "forky_fs", + "forky_core 0.1.50", + "forky_fs 0.1.50", "futures", "glob", "hyper", @@ -3462,6 +3552,20 @@ dependencies = [ "rand", ] +[[package]] +name = "forky_core" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78533dd4e9f701fc67fe241c97fec26db0c94248fa476f8ff560520de9d221e9" +dependencies = [ + "anyhow", + "extend", + "getrandom", + "log", + "num-traits", + "rand", +] + [[package]] name = "forky_core_test" version = "0.1.50" @@ -3469,7 +3573,7 @@ dependencies = [ "anyhow", "console_error_panic_hook", "extend", - "forky_core", + "forky_core 0.1.50", "getrandom", "js-sys", "num-traits", @@ -3502,7 +3606,28 @@ dependencies = [ "clap", "crossterm", "extend", - "forky_core", + "forky_core 0.1.50", + "futures", + "gag", + "glob", + "hex", + "notify", + "notify-debouncer-full", + "sha2", + "tokio", +] + +[[package]] +name = "forky_fs" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bed9ba4133a47858fba8459fdf9eb76dd72d58fa60060a279968432402a76c7" +dependencies = [ + "anyhow", + "clap", + "crossterm", + "extend", + "forky_core 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "gag", "glob", @@ -3517,7 +3642,7 @@ dependencies = [ name = "forky_fs_test" version = "0.1.50" dependencies = [ - "forky_fs", + "forky_fs 0.1.50", "sweet", ] @@ -3533,8 +3658,8 @@ dependencies = [ "bytemuck", "extend", "forky_bevy", - "forky_core", - "forky_web", + "forky_core 0.1.50", + "forky_web 0.1.50", "petgraph", "strum", "strum_macros", @@ -3549,8 +3674,8 @@ dependencies = [ "anyhow", "console_error_panic_hook", "extend", - "forky_core", - "forky_web_macros", + "forky_core 0.1.50", + "forky_web_macros 0.1.50", "js-sys", "leptos", "log", @@ -3561,9 +3686,42 @@ dependencies = [ "web-sys", ] +[[package]] +name = "forky_web" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a8b5591339fac357f67239c943c2fb7bc8d5e451bc949a22087cd57ec9ab3a0" +dependencies = [ + "anyhow", + "console_error_panic_hook", + "extend", + "forky_core 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", + "forky_web_macros 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys", + "leptos", + "log", + "serde", + "serde_json", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "forky_web_macros" +version = "0.1.50" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "forky_web_macros" version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dada39ec18e57fc150192d2dede9eaa5ecdc9ea7bf5716ad8c84cb14ba54ca98" dependencies = [ "anyhow", "proc-macro2", @@ -3578,8 +3736,8 @@ dependencies = [ "anyhow", "console_error_panic_hook", "extend", - "forky_core", - "forky_web", + "forky_core 0.1.50", + "forky_web 0.1.50", "js-sys", "leptos", "log", @@ -6801,6 +6959,8 @@ checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" [[package]] name = "sweet" version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf12d7c32a8036879bb4a407d38bf69eb06dfba5d1e6c218effdd95fa2862e6" dependencies = [ "anyhow", "backtrace", @@ -6810,11 +6970,10 @@ dependencies = [ "console_log", "crossterm", "extend", - "fantoccini", "flume", - "forky_core", - "forky_fs", - "forky_web", + "forky_core 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", + "forky_fs 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", + "forky_web 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "gag", "getrandom", @@ -6835,37 +6994,11 @@ dependencies = [ "web-sys", ] -[[package]] -name = "sweet-cli" -version = "0.1.50" -dependencies = [ - "anyhow", - "axum", - "axum-server", - "clap", - "colorize", - "cssparser", - "extend", - "fantoccini", - "forky_cli", - "forky_core", - "forky_fs", - "futures", - "glob", - "hyper", - "rayon", - "serde", - "serde_json", - "sweet", - "tokio", - "tower", - "tower-http", - "tower-livereload", -] - [[package]] name = "sweet_macros" version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f7559d75d8665e21f95d5c4a9e8ffd721f82ef17867d947ed6ff24f2d935c4e" dependencies = [ "anyhow", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 3fdf1315..7de31220 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,22 +4,19 @@ resolver = "2" # Important! wgpu/Bevy needs this! members = [ # "crates/*" - "crates/forky/forky", - # "crates/forky/forky_ai", - "crates/forky/forky_bevy", - "crates/forky/forky_cli", - "crates/forky/forky_core", - "crates/forky/forky_core/test", - "crates/forky/forky_esp", - "crates/forky/forky_fs", - "crates/forky/forky_fs/test", - "crates/forky/forky_play", - "crates/forky/forky_web", - "crates/forky/forky_web/test", - "crates/forky/forky_web/macros", - "crates/sweet", - "crates/sweet/macros", - "crates/sweet/cli", + "crates/forky", + # "crates/forky_ai", + "crates/forky_bevy", + "crates/forky_cli", + "crates/forky_core", + "crates/forky_core/test", + "crates/forky_esp", + "crates/forky_fs", + "crates/forky_fs/test", + "crates/forky_play", + "crates/forky_web", + "crates/forky_web/test", + "crates/forky_web/macros", ] [workspace.package] @@ -32,26 +29,18 @@ description = "Rust Utilities" documentation = "https://mrchantey.github.io/forky/docs" repository = "https://github.com/mrchantey/forky" -[workspace.dependencies.bevy] -# bevy = "0.14" -path = "../../work-ref/bevy" -# git = "https://github.com/mrchantey/bevy" -# branch = "add-reflect-attributes" - [workspace.dependencies] ### internal ### -forky = { path = "./crates/forky/forky", version = "0.1.50" } -# forky_ai = { path = "./crates/forky/forky_ai", version = "0.1.43" } -forky_bevy = { path = "./crates/forky/forky_bevy", version = "0.1.50" } -forky_cli = { path = "./crates/forky/forky_cli", version = "0.1.50" } -forky_core = { path = "./crates/forky/forky_core", version = "0.1.50" } -forky_fs = { path = "./crates/forky/forky_fs", version = "0.1.50" } -forky_esp = { path = "./crates/forky/forky_esp", version = "0.1.50" } -forky_play = { path = "./crates/forky/forky_play", version = "0.1.50" } -forky_web = { path = "./crates/forky/forky_web", version = "0.1.50" } -forky_web_macros = { path = "./crates/forky/forky_web/macros", version = "0.1.50" } -sweet = { path = "./crates/sweet", version = "0.1.50" } -sweet_macros = { path = "./crates/sweet/macros", version = "0.1.50" } +forky = { path = "./crates/forky", version = "0.1.50" } +# forky_ai = { path = "./crates/forky_ai", version = "0.1.43" } +forky_bevy = { path = "./crates/forky_bevy", version = "0.1.50" } +forky_cli = { path = "./crates/forky_cli", version = "0.1.50" } +forky_core = { path = "./crates/forky_core", version = "0.1.50" } +forky_fs = { path = "./crates/forky_fs", version = "0.1.50" } +forky_esp = { path = "./crates/forky_esp", version = "0.1.50" } +forky_play = { path = "./crates/forky_play", version = "0.1.50" } +forky_web = { path = "./crates/forky_web", version = "0.1.50" } +forky_web_macros = { path = "./crates/forky_web/macros", version = "0.1.50" } ### game ### # two requirements for back to release: @@ -60,6 +49,8 @@ sweet_macros = { path = "./crates/sweet/macros", version = "0.1.50" } # bevy = { path = "../bevy", default-features = false } # bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "f516de456be2b65572de1af6956d52157663b9cc", default-features = false } +sweet = { version = "0.1.50", features = ["bevy"] } +bevy = "0.14" bevy-inspector-egui = "0.23.4" bevy_mod_debugdump = "0.10.0" bevy_rapier3d = { version = "0.25.0", features = ["debug-render-3d"] } diff --git a/README.md b/README.md index c854e974..d3785c4f 100644 --- a/README.md +++ b/README.md @@ -25,5 +25,4 @@ ## Contents -- [Forky CLI](./crates/forky/forky_cli/README.md) -- [Sweet](./crates/sweet/README.md) \ No newline at end of file +- [Forky CLI](./crates/forky_cli/README.md) \ No newline at end of file diff --git a/crates/forky/forky/Cargo.toml b/crates/forky/Cargo.toml similarity index 100% rename from crates/forky/forky/Cargo.toml rename to crates/forky/Cargo.toml diff --git a/crates/forky/forky/src/lib.rs b/crates/forky/src/lib.rs similarity index 100% rename from crates/forky/forky/src/lib.rs rename to crates/forky/src/lib.rs diff --git a/crates/forky/forky_ai/Cargo.toml b/crates/forky_ai/Cargo.toml similarity index 100% rename from crates/forky/forky_ai/Cargo.toml rename to crates/forky_ai/Cargo.toml diff --git a/crates/forky/forky_ai/examples/chat.rs b/crates/forky_ai/examples/chat.rs similarity index 100% rename from crates/forky/forky_ai/examples/chat.rs rename to crates/forky_ai/examples/chat.rs diff --git a/crates/forky/forky_ai/src/chat/chat_gpt.rs b/crates/forky_ai/src/chat/chat_gpt.rs similarity index 100% rename from crates/forky/forky_ai/src/chat/chat_gpt.rs rename to crates/forky_ai/src/chat/chat_gpt.rs diff --git a/crates/forky/forky_ai/src/chat/hello_world.rs b/crates/forky_ai/src/chat/hello_world.rs similarity index 100% rename from crates/forky/forky_ai/src/chat/hello_world.rs rename to crates/forky_ai/src/chat/hello_world.rs diff --git a/crates/forky/forky_ai/src/chat/llm.rs b/crates/forky_ai/src/chat/llm.rs similarity index 100% rename from crates/forky/forky_ai/src/chat/llm.rs rename to crates/forky_ai/src/chat/llm.rs diff --git a/crates/forky/forky_ai/src/chat/mod.rs b/crates/forky_ai/src/chat/mod.rs similarity index 100% rename from crates/forky/forky_ai/src/chat/mod.rs rename to crates/forky_ai/src/chat/mod.rs diff --git a/crates/forky/forky_ai/src/lib.rs b/crates/forky_ai/src/lib.rs similarity index 100% rename from crates/forky/forky_ai/src/lib.rs rename to crates/forky_ai/src/lib.rs diff --git a/crates/forky/forky_ai/test/chat/mod.rs b/crates/forky_ai/test/chat/mod.rs similarity index 100% rename from crates/forky/forky_ai/test/chat/mod.rs rename to crates/forky_ai/test/chat/mod.rs diff --git a/crates/forky/forky_ai/test/mod.rs b/crates/forky_ai/test/mod.rs similarity index 100% rename from crates/forky/forky_ai/test/mod.rs rename to crates/forky_ai/test/mod.rs diff --git a/crates/forky/forky_ai/test/sweet.rs b/crates/forky_ai/test/sweet.rs similarity index 100% rename from crates/forky/forky_ai/test/sweet.rs rename to crates/forky_ai/test/sweet.rs diff --git a/crates/forky/forky_bevy/Cargo.toml b/crates/forky_bevy/Cargo.toml similarity index 100% rename from crates/forky/forky_bevy/Cargo.toml rename to crates/forky_bevy/Cargo.toml diff --git a/crates/forky/forky_bevy/src/extensions/app.rs b/crates/forky_bevy/src/extensions/app.rs similarity index 100% rename from crates/forky/forky_bevy/src/extensions/app.rs rename to crates/forky_bevy/src/extensions/app.rs diff --git a/crates/forky/forky_bevy/src/extensions/app_res.rs b/crates/forky_bevy/src/extensions/app_res.rs similarity index 100% rename from crates/forky/forky_bevy/src/extensions/app_res.rs rename to crates/forky_bevy/src/extensions/app_res.rs diff --git a/crates/forky/forky_bevy/src/extensions/global_transform.rs b/crates/forky_bevy/src/extensions/global_transform.rs similarity index 100% rename from crates/forky/forky_bevy/src/extensions/global_transform.rs rename to crates/forky_bevy/src/extensions/global_transform.rs diff --git a/crates/forky/forky_bevy/src/extensions/map.rs b/crates/forky_bevy/src/extensions/map.rs similarity index 100% rename from crates/forky/forky_bevy/src/extensions/map.rs rename to crates/forky_bevy/src/extensions/map.rs diff --git a/crates/forky/forky_bevy/src/extensions/mod.rs b/crates/forky_bevy/src/extensions/mod.rs similarity index 100% rename from crates/forky/forky_bevy/src/extensions/mod.rs rename to crates/forky_bevy/src/extensions/mod.rs diff --git a/crates/forky/forky_bevy/src/extensions/pose.rs b/crates/forky_bevy/src/extensions/pose.rs similarity index 100% rename from crates/forky/forky_bevy/src/extensions/pose.rs rename to crates/forky_bevy/src/extensions/pose.rs diff --git a/crates/forky/forky_bevy/src/extensions/quat.rs b/crates/forky_bevy/src/extensions/quat.rs similarity index 100% rename from crates/forky/forky_bevy/src/extensions/quat.rs rename to crates/forky_bevy/src/extensions/quat.rs diff --git a/crates/forky/forky_bevy/src/extensions/transform_x.rs b/crates/forky_bevy/src/extensions/transform_x.rs similarity index 100% rename from crates/forky/forky_bevy/src/extensions/transform_x.rs rename to crates/forky_bevy/src/extensions/transform_x.rs diff --git a/crates/forky/forky_bevy/src/extensions/vec.rs b/crates/forky_bevy/src/extensions/vec.rs similarity index 100% rename from crates/forky/forky_bevy/src/extensions/vec.rs rename to crates/forky_bevy/src/extensions/vec.rs diff --git a/crates/forky/forky_bevy/src/lib.rs b/crates/forky_bevy/src/lib.rs similarity index 100% rename from crates/forky/forky_bevy/src/lib.rs rename to crates/forky_bevy/src/lib.rs diff --git a/crates/forky/forky_bevy/src/systems/exit_system.rs b/crates/forky_bevy/src/systems/exit_system.rs similarity index 100% rename from crates/forky/forky_bevy/src/systems/exit_system.rs rename to crates/forky_bevy/src/systems/exit_system.rs diff --git a/crates/forky/forky_bevy/src/systems/mod.rs b/crates/forky_bevy/src/systems/mod.rs similarity index 100% rename from crates/forky/forky_bevy/src/systems/mod.rs rename to crates/forky_bevy/src/systems/mod.rs diff --git a/crates/forky/forky_bevy/test/extensions/app.rs b/crates/forky_bevy/test/extensions/app.rs similarity index 100% rename from crates/forky/forky_bevy/test/extensions/app.rs rename to crates/forky_bevy/test/extensions/app.rs diff --git a/crates/forky/forky_bevy/test/extensions/mod.rs b/crates/forky_bevy/test/extensions/mod.rs similarity index 100% rename from crates/forky/forky_bevy/test/extensions/mod.rs rename to crates/forky_bevy/test/extensions/mod.rs diff --git a/crates/forky/forky_bevy/test/extensions/quat.rs b/crates/forky_bevy/test/extensions/quat.rs similarity index 100% rename from crates/forky/forky_bevy/test/extensions/quat.rs rename to crates/forky_bevy/test/extensions/quat.rs diff --git a/crates/forky/forky_bevy/test/extensions/vec.rs b/crates/forky_bevy/test/extensions/vec.rs similarity index 100% rename from crates/forky/forky_bevy/test/extensions/vec.rs rename to crates/forky_bevy/test/extensions/vec.rs diff --git a/crates/forky/forky_bevy/test/mod.rs b/crates/forky_bevy/test/mod.rs similarity index 100% rename from crates/forky/forky_bevy/test/mod.rs rename to crates/forky_bevy/test/mod.rs diff --git a/crates/forky/forky_bevy/test/sweet.rs b/crates/forky_bevy/test/sweet.rs similarity index 100% rename from crates/forky/forky_bevy/test/sweet.rs rename to crates/forky_bevy/test/sweet.rs diff --git a/crates/forky/forky_cli/Cargo.toml b/crates/forky_cli/Cargo.toml similarity index 100% rename from crates/forky/forky_cli/Cargo.toml rename to crates/forky_cli/Cargo.toml diff --git a/crates/forky/forky_cli/README.md b/crates/forky_cli/README.md similarity index 100% rename from crates/forky/forky_cli/README.md rename to crates/forky_cli/README.md diff --git a/crates/forky/forky_cli/examples/cli.rs b/crates/forky_cli/examples/cli.rs similarity index 100% rename from crates/forky/forky_cli/examples/cli.rs rename to crates/forky_cli/examples/cli.rs diff --git a/crates/forky/forky_cli/examples/swap_mouse.rs b/crates/forky_cli/examples/swap_mouse.rs similarity index 100% rename from crates/forky/forky_cli/examples/swap_mouse.rs rename to crates/forky_cli/examples/swap_mouse.rs diff --git a/crates/forky/forky_cli/src/auto_mod/command.rs b/crates/forky_cli/src/auto_mod/command.rs similarity index 100% rename from crates/forky/forky_cli/src/auto_mod/command.rs rename to crates/forky_cli/src/auto_mod/command.rs diff --git a/crates/forky/forky_cli/src/auto_mod/mod.rs b/crates/forky_cli/src/auto_mod/mod.rs similarity index 100% rename from crates/forky/forky_cli/src/auto_mod/mod.rs rename to crates/forky_cli/src/auto_mod/mod.rs diff --git a/crates/forky/forky_cli/src/auto_mod/run.rs b/crates/forky_cli/src/auto_mod/run.rs similarity index 100% rename from crates/forky/forky_cli/src/auto_mod/run.rs rename to crates/forky_cli/src/auto_mod/run.rs diff --git a/crates/forky/forky_cli/src/common/auto_fs.rs b/crates/forky_cli/src/common/auto_fs.rs similarity index 100% rename from crates/forky/forky_cli/src/common/auto_fs.rs rename to crates/forky_cli/src/common/auto_fs.rs diff --git a/crates/forky/forky_cli/src/common/forky_cli.rs b/crates/forky_cli/src/common/forky_cli.rs similarity index 100% rename from crates/forky/forky_cli/src/common/forky_cli.rs rename to crates/forky_cli/src/common/forky_cli.rs diff --git a/crates/forky/forky_cli/src/common/mod.rs b/crates/forky_cli/src/common/mod.rs similarity index 100% rename from crates/forky/forky_cli/src/common/mod.rs rename to crates/forky_cli/src/common/mod.rs diff --git a/crates/forky/forky_cli/src/index.css b/crates/forky_cli/src/index.css similarity index 100% rename from crates/forky/forky_cli/src/index.css rename to crates/forky_cli/src/index.css diff --git a/crates/forky/forky_cli/src/lib.rs b/crates/forky_cli/src/lib.rs similarity index 100% rename from crates/forky/forky_cli/src/lib.rs rename to crates/forky_cli/src/lib.rs diff --git a/crates/forky/forky_cli/src/main.rs b/crates/forky_cli/src/main.rs similarity index 100% rename from crates/forky/forky_cli/src/main.rs rename to crates/forky_cli/src/main.rs diff --git a/crates/forky/forky_cli/src/server/address.rs b/crates/forky_cli/src/server/address.rs similarity index 100% rename from crates/forky/forky_cli/src/server/address.rs rename to crates/forky_cli/src/server/address.rs diff --git a/crates/forky/forky_cli/src/server/command.rs b/crates/forky_cli/src/server/command.rs similarity index 100% rename from crates/forky/forky_cli/src/server/command.rs rename to crates/forky_cli/src/server/command.rs diff --git a/crates/forky/forky_cli/src/server/mod.rs b/crates/forky_cli/src/server/mod.rs similarity index 100% rename from crates/forky/forky_cli/src/server/mod.rs rename to crates/forky_cli/src/server/mod.rs diff --git a/crates/forky/forky_cli/src/server/proxy.rs b/crates/forky_cli/src/server/proxy.rs similarity index 100% rename from crates/forky/forky_cli/src/server/proxy.rs rename to crates/forky_cli/src/server/proxy.rs diff --git a/crates/forky/forky_cli/src/server/self_signed_certs___/cert.pem b/crates/forky_cli/src/server/self_signed_certs___/cert.pem similarity index 100% rename from crates/forky/forky_cli/src/server/self_signed_certs___/cert.pem rename to crates/forky_cli/src/server/self_signed_certs___/cert.pem diff --git a/crates/forky/forky_cli/src/server/self_signed_certs___/key.pem b/crates/forky_cli/src/server/self_signed_certs___/key.pem similarity index 100% rename from crates/forky/forky_cli/src/server/self_signed_certs___/key.pem rename to crates/forky_cli/src/server/self_signed_certs___/key.pem diff --git a/crates/forky/forky_cli/src/server/server.rs b/crates/forky_cli/src/server/server.rs similarity index 100% rename from crates/forky/forky_cli/src/server/server.rs rename to crates/forky_cli/src/server/server.rs diff --git a/crates/forky/forky_cli/src/server/tls.rs b/crates/forky_cli/src/server/tls.rs similarity index 100% rename from crates/forky/forky_cli/src/server/tls.rs rename to crates/forky_cli/src/server/tls.rs diff --git a/crates/forky/forky_cli/src/style/cli_all.rs b/crates/forky_cli/src/style/cli_all.rs similarity index 100% rename from crates/forky/forky_cli/src/style/cli_all.rs rename to crates/forky_cli/src/style/cli_all.rs diff --git a/crates/forky/forky_cli/src/style/command.rs b/crates/forky_cli/src/style/command.rs similarity index 100% rename from crates/forky/forky_cli/src/style/command.rs rename to crates/forky_cli/src/style/command.rs diff --git a/crates/forky/forky_cli/src/style/command_all.rs b/crates/forky_cli/src/style/command_all.rs similarity index 100% rename from crates/forky/forky_cli/src/style/command_all.rs rename to crates/forky_cli/src/style/command_all.rs diff --git a/crates/forky/forky_cli/src/style/command_file.rs b/crates/forky_cli/src/style/command_file.rs similarity index 100% rename from crates/forky/forky_cli/src/style/command_file.rs rename to crates/forky_cli/src/style/command_file.rs diff --git a/crates/forky/forky_cli/src/style/index_files.rs b/crates/forky_cli/src/style/index_files.rs similarity index 100% rename from crates/forky/forky_cli/src/style/index_files.rs rename to crates/forky_cli/src/style/index_files.rs diff --git a/crates/forky/forky_cli/src/style/lightning.rs b/crates/forky_cli/src/style/lightning.rs similarity index 100% rename from crates/forky/forky_cli/src/style/lightning.rs rename to crates/forky_cli/src/style/lightning.rs diff --git a/crates/forky/forky_cli/src/style/mod.rs b/crates/forky_cli/src/style/mod.rs similarity index 100% rename from crates/forky/forky_cli/src/style/mod.rs rename to crates/forky_cli/src/style/mod.rs diff --git a/crates/forky/forky_cli/src/style/type_files.rs b/crates/forky_cli/src/style/type_files.rs similarity index 100% rename from crates/forky/forky_cli/src/style/type_files.rs rename to crates/forky_cli/src/style/type_files.rs diff --git a/crates/forky/forky_cli/src/watch/command.rs b/crates/forky_cli/src/watch/command.rs similarity index 100% rename from crates/forky/forky_cli/src/watch/command.rs rename to crates/forky_cli/src/watch/command.rs diff --git a/crates/forky/forky_cli/src/watch/mod.rs b/crates/forky_cli/src/watch/mod.rs similarity index 100% rename from crates/forky/forky_cli/src/watch/mod.rs rename to crates/forky_cli/src/watch/mod.rs diff --git a/crates/forky/forky_cli/src/watch/run.rs b/crates/forky_cli/src/watch/run.rs similarity index 100% rename from crates/forky/forky_cli/src/watch/run.rs rename to crates/forky_cli/src/watch/run.rs diff --git a/crates/forky/forky_cli/test/files/auto_mod.rs b/crates/forky_cli/test/files/auto_mod.rs similarity index 100% rename from crates/forky/forky_cli/test/files/auto_mod.rs rename to crates/forky_cli/test/files/auto_mod.rs diff --git a/crates/forky/forky_cli/test/files/mod.rs b/crates/forky_cli/test/files/mod.rs similarity index 100% rename from crates/forky/forky_cli/test/files/mod.rs rename to crates/forky_cli/test/files/mod.rs diff --git a/crates/forky/forky_cli/test/files/test_dir/__test_sub_dir/_test_use.rs b/crates/forky_cli/test/files/test_dir/__test_sub_dir/_test_use.rs similarity index 100% rename from crates/forky/forky_cli/test/files/test_dir/__test_sub_dir/_test_use.rs rename to crates/forky_cli/test/files/test_dir/__test_sub_dir/_test_use.rs diff --git a/crates/forky/forky_cli/test/files/test_dir/__test_sub_dir/mod.rs b/crates/forky_cli/test/files/test_dir/__test_sub_dir/mod.rs similarity index 100% rename from crates/forky/forky_cli/test/files/test_dir/__test_sub_dir/mod.rs rename to crates/forky_cli/test/files/test_dir/__test_sub_dir/mod.rs diff --git a/crates/forky/forky_cli/test/files/test_dir/__test_sub_dir/test_mod.rs b/crates/forky_cli/test/files/test_dir/__test_sub_dir/test_mod.rs similarity index 100% rename from crates/forky/forky_cli/test/files/test_dir/__test_sub_dir/test_mod.rs rename to crates/forky_cli/test/files/test_dir/__test_sub_dir/test_mod.rs diff --git a/crates/forky/forky_cli/test/files/test_dir/_test_use.rs b/crates/forky_cli/test/files/test_dir/_test_use.rs similarity index 100% rename from crates/forky/forky_cli/test/files/test_dir/_test_use.rs rename to crates/forky_cli/test/files/test_dir/_test_use.rs diff --git a/crates/forky/forky_cli/test/files/test_dir/mod.rs b/crates/forky_cli/test/files/test_dir/mod.rs similarity index 100% rename from crates/forky/forky_cli/test/files/test_dir/mod.rs rename to crates/forky_cli/test/files/test_dir/mod.rs diff --git a/crates/forky/forky_cli/test/files/test_dir/test_mod.rs b/crates/forky_cli/test/files/test_dir/test_mod.rs similarity index 100% rename from crates/forky/forky_cli/test/files/test_dir/test_mod.rs rename to crates/forky_cli/test/files/test_dir/test_mod.rs diff --git a/crates/forky/forky_cli/test/mod.rs b/crates/forky_cli/test/mod.rs similarity index 100% rename from crates/forky/forky_cli/test/mod.rs rename to crates/forky_cli/test/mod.rs diff --git a/crates/forky/forky_cli/test/sweet.rs b/crates/forky_cli/test/sweet.rs similarity index 100% rename from crates/forky/forky_cli/test/sweet.rs rename to crates/forky_cli/test/sweet.rs diff --git a/crates/forky/forky_core/Cargo.toml b/crates/forky_core/Cargo.toml similarity index 100% rename from crates/forky/forky_core/Cargo.toml rename to crates/forky_core/Cargo.toml diff --git a/crates/forky/forky_core/examples/main.rs b/crates/forky_core/examples/main.rs similarity index 100% rename from crates/forky/forky_core/examples/main.rs rename to crates/forky_core/examples/main.rs diff --git a/crates/forky/forky_core/src/extensions/duration.rs b/crates/forky_core/src/extensions/duration.rs similarity index 100% rename from crates/forky/forky_core/src/extensions/duration.rs rename to crates/forky_core/src/extensions/duration.rs diff --git a/crates/forky/forky_core/src/extensions/mod.rs b/crates/forky_core/src/extensions/mod.rs similarity index 100% rename from crates/forky/forky_core/src/extensions/mod.rs rename to crates/forky_core/src/extensions/mod.rs diff --git a/crates/forky/forky_core/src/extensions/num_x.rs b/crates/forky_core/src/extensions/num_x.rs similarity index 100% rename from crates/forky/forky_core/src/extensions/num_x.rs rename to crates/forky_core/src/extensions/num_x.rs diff --git a/crates/forky/forky_core/src/extensions/option.rs b/crates/forky_core/src/extensions/option.rs similarity index 100% rename from crates/forky/forky_core/src/extensions/option.rs rename to crates/forky_core/src/extensions/option.rs diff --git a/crates/forky/forky_core/src/extensions/path.rs b/crates/forky_core/src/extensions/path.rs similarity index 100% rename from crates/forky/forky_core/src/extensions/path.rs rename to crates/forky_core/src/extensions/path.rs diff --git a/crates/forky/forky_core/src/extensions/path_buf.rs b/crates/forky_core/src/extensions/path_buf.rs similarity index 100% rename from crates/forky/forky_core/src/extensions/path_buf.rs rename to crates/forky_core/src/extensions/path_buf.rs diff --git a/crates/forky/forky_core/src/extensions/result_x.rs b/crates/forky_core/src/extensions/result_x.rs similarity index 100% rename from crates/forky/forky_core/src/extensions/result_x.rs rename to crates/forky_core/src/extensions/result_x.rs diff --git a/crates/forky/forky_core/src/extensions/str_x.rs b/crates/forky_core/src/extensions/str_x.rs similarity index 100% rename from crates/forky/forky_core/src/extensions/str_x.rs rename to crates/forky_core/src/extensions/str_x.rs diff --git a/crates/forky/forky_core/src/extensions/string.rs b/crates/forky_core/src/extensions/string.rs similarity index 100% rename from crates/forky/forky_core/src/extensions/string.rs rename to crates/forky_core/src/extensions/string.rs diff --git a/crates/forky/forky_core/src/extensions/vec.rs b/crates/forky_core/src/extensions/vec.rs similarity index 100% rename from crates/forky/forky_core/src/extensions/vec.rs rename to crates/forky_core/src/extensions/vec.rs diff --git a/crates/forky/forky_core/src/forky_event/forky_event.rs b/crates/forky_core/src/forky_event/forky_event.rs similarity index 100% rename from crates/forky/forky_core/src/forky_event/forky_event.rs rename to crates/forky_core/src/forky_event/forky_event.rs diff --git a/crates/forky/forky_core/src/forky_event/mod.rs b/crates/forky_core/src/forky_event/mod.rs similarity index 100% rename from crates/forky/forky_core/src/forky_event/mod.rs rename to crates/forky_core/src/forky_event/mod.rs diff --git a/crates/forky/forky_core/src/graph/mod.rs b/crates/forky_core/src/graph/mod.rs similarity index 100% rename from crates/forky/forky_core/src/graph/mod.rs rename to crates/forky_core/src/graph/mod.rs diff --git a/crates/forky/forky_core/src/graph/node.rs b/crates/forky_core/src/graph/node.rs similarity index 100% rename from crates/forky/forky_core/src/graph/node.rs rename to crates/forky_core/src/graph/node.rs diff --git a/crates/forky/forky_core/src/lib.rs b/crates/forky_core/src/lib.rs similarity index 100% rename from crates/forky/forky_core/src/lib.rs rename to crates/forky_core/src/lib.rs diff --git a/crates/forky/forky_core/src/macros/macros.rs b/crates/forky_core/src/macros/macros.rs similarity index 100% rename from crates/forky/forky_core/src/macros/macros.rs rename to crates/forky_core/src/macros/macros.rs diff --git a/crates/forky/forky_core/src/macros/mod.rs b/crates/forky_core/src/macros/mod.rs similarity index 100% rename from crates/forky/forky_core/src/macros/mod.rs rename to crates/forky_core/src/macros/mod.rs diff --git a/crates/forky/forky_core/src/math/constants.rs b/crates/forky_core/src/math/constants.rs similarity index 100% rename from crates/forky/forky_core/src/math/constants.rs rename to crates/forky_core/src/math/constants.rs diff --git a/crates/forky/forky_core/src/math/funcs.rs b/crates/forky_core/src/math/funcs.rs similarity index 100% rename from crates/forky/forky_core/src/math/funcs.rs rename to crates/forky_core/src/math/funcs.rs diff --git a/crates/forky/forky_core/src/math/mod.rs b/crates/forky_core/src/math/mod.rs similarity index 100% rename from crates/forky/forky_core/src/math/mod.rs rename to crates/forky_core/src/math/mod.rs diff --git a/crates/forky/forky_core/src/math_f64/constants.rs b/crates/forky_core/src/math_f64/constants.rs similarity index 100% rename from crates/forky/forky_core/src/math_f64/constants.rs rename to crates/forky_core/src/math_f64/constants.rs diff --git a/crates/forky/forky_core/src/math_f64/funcs.rs b/crates/forky_core/src/math_f64/funcs.rs similarity index 100% rename from crates/forky/forky_core/src/math_f64/funcs.rs rename to crates/forky_core/src/math_f64/funcs.rs diff --git a/crates/forky/forky_core/src/math_f64/mod.rs b/crates/forky_core/src/math_f64/mod.rs similarity index 100% rename from crates/forky/forky_core/src/math_f64/mod.rs rename to crates/forky_core/src/math_f64/mod.rs diff --git a/crates/forky/forky_core/src/net/mod.rs b/crates/forky_core/src/net/mod.rs similarity index 100% rename from crates/forky/forky_core/src/net/mod.rs rename to crates/forky_core/src/net/mod.rs diff --git a/crates/forky/forky_core/src/net/url.rs b/crates/forky_core/src/net/url.rs similarity index 100% rename from crates/forky/forky_core/src/net/url.rs rename to crates/forky_core/src/net/url.rs diff --git a/crates/forky/forky_core/src/style/mod.rs b/crates/forky_core/src/style/mod.rs similarity index 100% rename from crates/forky/forky_core/src/style/mod.rs rename to crates/forky_core/src/style/mod.rs diff --git a/crates/forky/forky_core/src/utility/mod.rs b/crates/forky_core/src/utility/mod.rs similarity index 100% rename from crates/forky/forky_core/src/utility/mod.rs rename to crates/forky_core/src/utility/mod.rs diff --git a/crates/forky/forky_core/src/utility/random.rs b/crates/forky_core/src/utility/random.rs similarity index 100% rename from crates/forky/forky_core/src/utility/random.rs rename to crates/forky_core/src/utility/random.rs diff --git a/crates/forky/forky_core/src/utility/time.rs b/crates/forky_core/src/utility/time.rs similarity index 100% rename from crates/forky/forky_core/src/utility/time.rs rename to crates/forky_core/src/utility/time.rs diff --git a/crates/forky/forky_core/src/utils/async_utils.rs b/crates/forky_core/src/utils/async_utils.rs similarity index 100% rename from crates/forky/forky_core/src/utils/async_utils.rs rename to crates/forky_core/src/utils/async_utils.rs diff --git a/crates/forky/forky_core/src/utils/drop_utils.rs b/crates/forky_core/src/utils/drop_utils.rs similarity index 100% rename from crates/forky/forky_core/src/utils/drop_utils.rs rename to crates/forky_core/src/utils/drop_utils.rs diff --git a/crates/forky/forky_core/src/utils/mod.rs b/crates/forky_core/src/utils/mod.rs similarity index 100% rename from crates/forky/forky_core/src/utils/mod.rs rename to crates/forky_core/src/utils/mod.rs diff --git a/crates/forky/forky_core/test/Cargo.toml b/crates/forky_core/test/Cargo.toml similarity index 100% rename from crates/forky/forky_core/test/Cargo.toml rename to crates/forky_core/test/Cargo.toml diff --git a/crates/forky/forky_core/test/extensions/mod.rs b/crates/forky_core/test/extensions/mod.rs similarity index 100% rename from crates/forky/forky_core/test/extensions/mod.rs rename to crates/forky_core/test/extensions/mod.rs diff --git a/crates/forky/forky_core/test/extensions/num_x.rs b/crates/forky_core/test/extensions/num_x.rs similarity index 100% rename from crates/forky/forky_core/test/extensions/num_x.rs rename to crates/forky_core/test/extensions/num_x.rs diff --git a/crates/forky/forky_core/test/extensions/path.rs b/crates/forky_core/test/extensions/path.rs similarity index 100% rename from crates/forky/forky_core/test/extensions/path.rs rename to crates/forky_core/test/extensions/path.rs diff --git a/crates/forky/forky_core/test/extensions/str_x.rs b/crates/forky_core/test/extensions/str_x.rs similarity index 100% rename from crates/forky/forky_core/test/extensions/str_x.rs rename to crates/forky_core/test/extensions/str_x.rs diff --git a/crates/forky/forky_core/test/extensions/vec.rs b/crates/forky_core/test/extensions/vec.rs similarity index 100% rename from crates/forky/forky_core/test/extensions/vec.rs rename to crates/forky_core/test/extensions/vec.rs diff --git a/crates/forky/forky_core/test/forky_event/forky_event.rs b/crates/forky_core/test/forky_event/forky_event.rs similarity index 100% rename from crates/forky/forky_core/test/forky_event/forky_event.rs rename to crates/forky_core/test/forky_event/forky_event.rs diff --git a/crates/forky/forky_core/test/forky_event/mod.rs b/crates/forky_core/test/forky_event/mod.rs similarity index 100% rename from crates/forky/forky_core/test/forky_event/mod.rs rename to crates/forky_core/test/forky_event/mod.rs diff --git a/crates/forky/forky_core/test/graph/graph.rs b/crates/forky_core/test/graph/graph.rs similarity index 100% rename from crates/forky/forky_core/test/graph/graph.rs rename to crates/forky_core/test/graph/graph.rs diff --git a/crates/forky/forky_core/test/graph/mod.rs b/crates/forky_core/test/graph/mod.rs similarity index 100% rename from crates/forky/forky_core/test/graph/mod.rs rename to crates/forky_core/test/graph/mod.rs diff --git a/crates/forky/forky_core/test/math/constants.rs b/crates/forky_core/test/math/constants.rs similarity index 100% rename from crates/forky/forky_core/test/math/constants.rs rename to crates/forky_core/test/math/constants.rs diff --git a/crates/forky/forky_core/test/math/mod.rs b/crates/forky_core/test/math/mod.rs similarity index 100% rename from crates/forky/forky_core/test/math/mod.rs rename to crates/forky_core/test/math/mod.rs diff --git a/crates/forky/forky_core/test/misc/macros.rs b/crates/forky_core/test/misc/macros.rs similarity index 100% rename from crates/forky/forky_core/test/misc/macros.rs rename to crates/forky_core/test/misc/macros.rs diff --git a/crates/forky/forky_core/test/misc/mod.rs b/crates/forky_core/test/misc/mod.rs similarity index 100% rename from crates/forky/forky_core/test/misc/mod.rs rename to crates/forky_core/test/misc/mod.rs diff --git a/crates/forky/forky_core/test/mod.rs b/crates/forky_core/test/mod.rs similarity index 100% rename from crates/forky/forky_core/test/mod.rs rename to crates/forky_core/test/mod.rs diff --git a/crates/forky/forky_core/test/pointers/mod.rs b/crates/forky_core/test/pointers/mod.rs similarity index 100% rename from crates/forky/forky_core/test/pointers/mod.rs rename to crates/forky_core/test/pointers/mod.rs diff --git a/crates/forky/forky_core/test/pointers/threads.rs b/crates/forky_core/test/pointers/threads.rs similarity index 100% rename from crates/forky/forky_core/test/pointers/threads.rs rename to crates/forky_core/test/pointers/threads.rs diff --git a/crates/forky/forky_core/test/sweet.rs b/crates/forky_core/test/sweet.rs similarity index 100% rename from crates/forky/forky_core/test/sweet.rs rename to crates/forky_core/test/sweet.rs diff --git a/crates/forky/forky_esp/Cargo.toml b/crates/forky_esp/Cargo.toml similarity index 100% rename from crates/forky/forky_esp/Cargo.toml rename to crates/forky_esp/Cargo.toml diff --git a/crates/forky/forky_esp/src/__extensions/mod.rs b/crates/forky_esp/src/__extensions/mod.rs similarity index 100% rename from crates/forky/forky_esp/src/__extensions/mod.rs rename to crates/forky_esp/src/__extensions/mod.rs diff --git a/crates/forky/forky_esp/src/__extensions/rgb.rs b/crates/forky_esp/src/__extensions/rgb.rs similarity index 100% rename from crates/forky/forky_esp/src/__extensions/rgb.rs rename to crates/forky_esp/src/__extensions/rgb.rs diff --git a/crates/forky/forky_esp/src/_core/_esp_device.rs b/crates/forky_esp/src/_core/_esp_device.rs similarity index 100% rename from crates/forky/forky_esp/src/_core/_esp_device.rs rename to crates/forky_esp/src/_core/_esp_device.rs diff --git a/crates/forky/forky_esp/src/_core/_led_controller_rgb.rs b/crates/forky_esp/src/_core/_led_controller_rgb.rs similarity index 100% rename from crates/forky/forky_esp/src/_core/_led_controller_rgb.rs rename to crates/forky_esp/src/_core/_led_controller_rgb.rs diff --git a/crates/forky/forky_esp/src/_core/_led_controller_rgbw.rs b/crates/forky_esp/src/_core/_led_controller_rgbw.rs similarity index 100% rename from crates/forky/forky_esp/src/_core/_led_controller_rgbw.rs rename to crates/forky_esp/src/_core/_led_controller_rgbw.rs diff --git a/crates/forky/forky_esp/src/_core/_logger.rs b/crates/forky_esp/src/_core/_logger.rs similarity index 100% rename from crates/forky/forky_esp/src/_core/_logger.rs rename to crates/forky_esp/src/_core/_logger.rs diff --git a/crates/forky/forky_esp/src/_core/_smart_leds_adapter_rgbw.rs b/crates/forky_esp/src/_core/_smart_leds_adapter_rgbw.rs similarity index 100% rename from crates/forky/forky_esp/src/_core/_smart_leds_adapter_rgbw.rs rename to crates/forky_esp/src/_core/_smart_leds_adapter_rgbw.rs diff --git a/crates/forky/forky_esp/src/_core/_timer.rs b/crates/forky_esp/src/_core/_timer.rs similarity index 100% rename from crates/forky/forky_esp/src/_core/_timer.rs rename to crates/forky_esp/src/_core/_timer.rs diff --git a/crates/forky/forky_esp/src/_core/mod.rs b/crates/forky_esp/src/_core/mod.rs similarity index 100% rename from crates/forky/forky_esp/src/_core/mod.rs rename to crates/forky_esp/src/_core/mod.rs diff --git a/crates/forky/forky_esp/src/entry/device.rs b/crates/forky_esp/src/entry/device.rs similarity index 100% rename from crates/forky/forky_esp/src/entry/device.rs rename to crates/forky_esp/src/entry/device.rs diff --git a/crates/forky/forky_esp/src/entry/hello_led.rs b/crates/forky_esp/src/entry/hello_led.rs similarity index 100% rename from crates/forky/forky_esp/src/entry/hello_led.rs rename to crates/forky_esp/src/entry/hello_led.rs diff --git a/crates/forky/forky_esp/src/entry/hello_led_strip.rs b/crates/forky_esp/src/entry/hello_led_strip.rs similarity index 100% rename from crates/forky/forky_esp/src/entry/hello_led_strip.rs rename to crates/forky_esp/src/entry/hello_led_strip.rs diff --git a/crates/forky/forky_esp/src/entry/hello_world.rs b/crates/forky_esp/src/entry/hello_world.rs similarity index 100% rename from crates/forky/forky_esp/src/entry/hello_world.rs rename to crates/forky_esp/src/entry/hello_world.rs diff --git a/crates/forky/forky_esp/src/entry/main.rs b/crates/forky_esp/src/entry/main.rs similarity index 100% rename from crates/forky/forky_esp/src/entry/main.rs rename to crates/forky_esp/src/entry/main.rs diff --git a/crates/forky/forky_esp/src/entry/mod.rs b/crates/forky_esp/src/entry/mod.rs similarity index 100% rename from crates/forky/forky_esp/src/entry/mod.rs rename to crates/forky_esp/src/entry/mod.rs diff --git a/crates/forky/forky_esp/src/lib.rs b/crates/forky_esp/src/lib.rs similarity index 100% rename from crates/forky/forky_esp/src/lib.rs rename to crates/forky_esp/src/lib.rs diff --git a/crates/forky/forky_fs/Cargo.toml b/crates/forky_fs/Cargo.toml similarity index 100% rename from crates/forky/forky_fs/Cargo.toml rename to crates/forky_fs/Cargo.toml diff --git a/crates/forky/forky_fs/src/cli/fs_watcher.rs b/crates/forky_fs/src/cli/fs_watcher.rs similarity index 100% rename from crates/forky/forky_fs/src/cli/fs_watcher.rs rename to crates/forky_fs/src/cli/fs_watcher.rs diff --git a/crates/forky/forky_fs/src/cli/mod.rs b/crates/forky_fs/src/cli/mod.rs similarity index 100% rename from crates/forky/forky_fs/src/cli/mod.rs rename to crates/forky_fs/src/cli/mod.rs diff --git a/crates/forky/forky_fs/src/cli/subcommand.rs b/crates/forky_fs/src/cli/subcommand.rs similarity index 100% rename from crates/forky/forky_fs/src/cli/subcommand.rs rename to crates/forky_fs/src/cli/subcommand.rs diff --git a/crates/forky/forky_fs/src/lib.rs b/crates/forky_fs/src/lib.rs similarity index 100% rename from crates/forky/forky_fs/src/lib.rs rename to crates/forky_fs/src/lib.rs diff --git a/crates/forky/forky_fs/src/utility/async_utils.rs b/crates/forky_fs/src/utility/async_utils.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/async_utils.rs rename to crates/forky_fs/src/utility/async_utils.rs diff --git a/crates/forky/forky_fs/src/utility/cli_args/misc.rs b/crates/forky_fs/src/utility/cli_args/misc.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/cli_args/misc.rs rename to crates/forky_fs/src/utility/cli_args/misc.rs diff --git a/crates/forky/forky_fs/src/utility/cli_args/mod.rs b/crates/forky_fs/src/utility/cli_args/mod.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/cli_args/mod.rs rename to crates/forky_fs/src/utility/cli_args/mod.rs diff --git a/crates/forky/forky_fs/src/utility/fs/dir.rs b/crates/forky_fs/src/utility/fs/dir.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/fs/dir.rs rename to crates/forky_fs/src/utility/fs/dir.rs diff --git a/crates/forky/forky_fs/src/utility/fs/file.rs b/crates/forky_fs/src/utility/fs/file.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/fs/file.rs rename to crates/forky_fs/src/utility/fs/file.rs diff --git a/crates/forky/forky_fs/src/utility/fs/macros.rs b/crates/forky_fs/src/utility/fs/macros.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/fs/macros.rs rename to crates/forky_fs/src/utility/fs/macros.rs diff --git a/crates/forky/forky_fs/src/utility/fs/misc.rs b/crates/forky_fs/src/utility/fs/misc.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/fs/misc.rs rename to crates/forky_fs/src/utility/fs/misc.rs diff --git a/crates/forky/forky_fs/src/utility/fs/mod.rs b/crates/forky_fs/src/utility/fs/mod.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/fs/mod.rs rename to crates/forky_fs/src/utility/fs/mod.rs diff --git a/crates/forky/forky_fs/src/utility/mod.rs b/crates/forky_fs/src/utility/mod.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/mod.rs rename to crates/forky_fs/src/utility/mod.rs diff --git a/crates/forky/forky_fs/src/utility/process/child_x.rs b/crates/forky_fs/src/utility/process/child_x.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/process/child_x.rs rename to crates/forky_fs/src/utility/process/child_x.rs diff --git a/crates/forky/forky_fs/src/utility/process/command.rs b/crates/forky_fs/src/utility/process/command.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/process/command.rs rename to crates/forky_fs/src/utility/process/command.rs diff --git a/crates/forky/forky_fs/src/utility/process/mod.rs b/crates/forky_fs/src/utility/process/mod.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/process/mod.rs rename to crates/forky_fs/src/utility/process/mod.rs diff --git a/crates/forky/forky_fs/src/utility/terminal/misc.rs b/crates/forky_fs/src/utility/terminal/misc.rs similarity index 92% rename from crates/forky/forky_fs/src/utility/terminal/misc.rs rename to crates/forky_fs/src/utility/terminal/misc.rs index 4320adde..e49787b8 100644 --- a/crates/forky/forky_fs/src/utility/terminal/misc.rs +++ b/crates/forky_fs/src/utility/terminal/misc.rs @@ -6,7 +6,7 @@ use std::io::Write; pub fn clear() { clear_terminal().unwrap(); } pub fn print_forky() { - println!("\nšŸ¤˜ sweet as! šŸ¤˜\n"); + println!("\nšŸ¦€ running forky! šŸ¦€\n"); } pub fn show_cursor() { diff --git a/crates/forky/forky_fs/src/utility/terminal/mod.rs b/crates/forky_fs/src/utility/terminal/mod.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/terminal/mod.rs rename to crates/forky_fs/src/utility/terminal/mod.rs diff --git a/crates/forky/forky_fs/src/utility/terminal/redirect_io.rs b/crates/forky_fs/src/utility/terminal/redirect_io.rs similarity index 100% rename from crates/forky/forky_fs/src/utility/terminal/redirect_io.rs rename to crates/forky_fs/src/utility/terminal/redirect_io.rs diff --git a/crates/forky/forky_fs/test/Cargo.toml b/crates/forky_fs/test/Cargo.toml similarity index 100% rename from crates/forky/forky_fs/test/Cargo.toml rename to crates/forky_fs/test/Cargo.toml diff --git a/crates/forky/forky_fs/test/mod.rs b/crates/forky_fs/test/mod.rs similarity index 100% rename from crates/forky/forky_fs/test/mod.rs rename to crates/forky_fs/test/mod.rs diff --git a/crates/forky/forky_fs/test/sweet.rs b/crates/forky_fs/test/sweet.rs similarity index 100% rename from crates/forky/forky_fs/test/sweet.rs rename to crates/forky_fs/test/sweet.rs diff --git a/crates/forky/forky_fs/test/utility/mod.rs b/crates/forky_fs/test/utility/mod.rs similarity index 100% rename from crates/forky/forky_fs/test/utility/mod.rs rename to crates/forky_fs/test/utility/mod.rs diff --git a/crates/forky/forky_fs/test/utility/project_root.rs b/crates/forky_fs/test/utility/project_root.rs similarity index 100% rename from crates/forky/forky_fs/test/utility/project_root.rs rename to crates/forky_fs/test/utility/project_root.rs diff --git a/crates/forky/forky_play/Cargo.toml b/crates/forky_play/Cargo.toml similarity index 100% rename from crates/forky/forky_play/Cargo.toml rename to crates/forky_play/Cargo.toml diff --git a/crates/forky/forky_play/assets/branding/icon.png b/crates/forky_play/assets/branding/icon.png similarity index 100% rename from crates/forky/forky_play/assets/branding/icon.png rename to crates/forky_play/assets/branding/icon.png diff --git a/crates/forky/forky_play/assets/branding/icon.svg b/crates/forky_play/assets/branding/icon.svg similarity index 100% rename from crates/forky/forky_play/assets/branding/icon.svg rename to crates/forky_play/assets/branding/icon.svg diff --git a/crates/forky/forky_play/assets/fonts/FiraMono-LICENSE b/crates/forky_play/assets/fonts/FiraMono-LICENSE similarity index 100% rename from crates/forky/forky_play/assets/fonts/FiraMono-LICENSE rename to crates/forky_play/assets/fonts/FiraMono-LICENSE diff --git a/crates/forky/forky_play/assets/fonts/FiraMono-Medium.ttf b/crates/forky_play/assets/fonts/FiraMono-Medium.ttf similarity index 100% rename from crates/forky/forky_play/assets/fonts/FiraMono-Medium.ttf rename to crates/forky_play/assets/fonts/FiraMono-Medium.ttf diff --git a/crates/forky/forky_play/assets/fonts/FiraSans-Bold.ttf b/crates/forky_play/assets/fonts/FiraSans-Bold.ttf similarity index 100% rename from crates/forky/forky_play/assets/fonts/FiraSans-Bold.ttf rename to crates/forky_play/assets/fonts/FiraSans-Bold.ttf diff --git a/crates/forky/forky_play/assets/shaders/custom_material.wgsl b/crates/forky_play/assets/shaders/custom_material.wgsl similarity index 100% rename from crates/forky/forky_play/assets/shaders/custom_material.wgsl rename to crates/forky_play/assets/shaders/custom_material.wgsl diff --git a/crates/forky/forky_play/assets/shaders/noise.wgsl b/crates/forky_play/assets/shaders/noise.wgsl similarity index 100% rename from crates/forky/forky_play/assets/shaders/noise.wgsl rename to crates/forky_play/assets/shaders/noise.wgsl diff --git a/crates/forky/forky_play/assets/shaders/sdf2.wgsl b/crates/forky_play/assets/shaders/sdf2.wgsl similarity index 100% rename from crates/forky/forky_play/assets/shaders/sdf2.wgsl rename to crates/forky_play/assets/shaders/sdf2.wgsl diff --git a/crates/forky/forky_play/assets/shaders/sdf3.wgsl b/crates/forky_play/assets/shaders/sdf3.wgsl similarity index 100% rename from crates/forky/forky_play/assets/shaders/sdf3.wgsl rename to crates/forky_play/assets/shaders/sdf3.wgsl diff --git a/crates/forky/forky_play/assets/shaders/simple.wgsl b/crates/forky_play/assets/shaders/simple.wgsl similarity index 100% rename from crates/forky/forky_play/assets/shaders/simple.wgsl rename to crates/forky_play/assets/shaders/simple.wgsl diff --git a/crates/forky/forky_play/assets/shaders/unlit.wgsl b/crates/forky_play/assets/shaders/unlit.wgsl similarity index 100% rename from crates/forky/forky_play/assets/shaders/unlit.wgsl rename to crates/forky_play/assets/shaders/unlit.wgsl diff --git a/crates/forky/forky_play/assets/shaders/unlit_texture.wgsl b/crates/forky_play/assets/shaders/unlit_texture.wgsl similarity index 100% rename from crates/forky/forky_play/assets/shaders/unlit_texture.wgsl rename to crates/forky_play/assets/shaders/unlit_texture.wgsl diff --git a/crates/forky/forky_play/assets/shaders/utility.wgsl b/crates/forky_play/assets/shaders/utility.wgsl similarity index 100% rename from crates/forky/forky_play/assets/shaders/utility.wgsl rename to crates/forky_play/assets/shaders/utility.wgsl diff --git a/crates/forky/forky_play/assets/shaders/uv.wgsl b/crates/forky_play/assets/shaders/uv.wgsl similarity index 100% rename from crates/forky/forky_play/assets/shaders/uv.wgsl rename to crates/forky_play/assets/shaders/uv.wgsl diff --git a/crates/forky/forky_play/docs/Splines.md b/crates/forky_play/docs/Splines.md similarity index 100% rename from crates/forky/forky_play/docs/Splines.md rename to crates/forky_play/docs/Splines.md diff --git a/crates/forky/forky_play/docs/Tools.md b/crates/forky_play/docs/Tools.md similarity index 100% rename from crates/forky/forky_play/docs/Tools.md rename to crates/forky_play/docs/Tools.md diff --git a/crates/forky/forky_play/examples/bevy_graph.rs b/crates/forky_play/examples/bevy_graph.rs similarity index 100% rename from crates/forky/forky_play/examples/bevy_graph.rs rename to crates/forky_play/examples/bevy_graph.rs diff --git a/crates/forky/forky_play/examples/gamai_graph.rs b/crates/forky_play/examples/gamai_graph.rs similarity index 100% rename from crates/forky/forky_play/examples/gamai_graph.rs rename to crates/forky_play/examples/gamai_graph.rs diff --git a/crates/forky/forky_play/examples/maze.rs b/crates/forky_play/examples/maze.rs similarity index 100% rename from crates/forky/forky_play/examples/maze.rs rename to crates/forky_play/examples/maze.rs diff --git a/crates/forky/forky_play/examples/maze_joint.rs b/crates/forky_play/examples/maze_joint.rs similarity index 100% rename from crates/forky/forky_play/examples/maze_joint.rs rename to crates/forky_play/examples/maze_joint.rs diff --git a/crates/forky/forky_play/examples/maze_terminal.rs b/crates/forky_play/examples/maze_terminal.rs similarity index 100% rename from crates/forky/forky_play/examples/maze_terminal.rs rename to crates/forky_play/examples/maze_terminal.rs diff --git a/crates/forky/forky_play/examples/mithril.rs b/crates/forky_play/examples/mithril.rs similarity index 100% rename from crates/forky/forky_play/examples/mithril.rs rename to crates/forky_play/examples/mithril.rs diff --git a/crates/forky/forky_play/examples/node_set_graph.rs b/crates/forky_play/examples/node_set_graph.rs similarity index 100% rename from crates/forky/forky_play/examples/node_set_graph.rs rename to crates/forky_play/examples/node_set_graph.rs diff --git a/crates/forky/forky_play/examples/rotate_cube.rs b/crates/forky_play/examples/rotate_cube.rs similarity index 100% rename from crates/forky/forky_play/examples/rotate_cube.rs rename to crates/forky_play/examples/rotate_cube.rs diff --git a/crates/forky/forky_play/examples/shader.rs b/crates/forky_play/examples/shader.rs similarity index 100% rename from crates/forky/forky_play/examples/shader.rs rename to crates/forky_play/examples/shader.rs diff --git a/crates/forky/forky_play/examples/shader_unlit.rs b/crates/forky_play/examples/shader_unlit.rs similarity index 100% rename from crates/forky/forky_play/examples/shader_unlit.rs rename to crates/forky_play/examples/shader_unlit.rs diff --git a/crates/forky/forky_play/examples/shader_uv.rs b/crates/forky_play/examples/shader_uv.rs similarity index 100% rename from crates/forky/forky_play/examples/shader_uv.rs rename to crates/forky_play/examples/shader_uv.rs diff --git a/crates/forky/forky_play/examples/spline_catmull_rom.rs b/crates/forky_play/examples/spline_catmull_rom.rs similarity index 100% rename from crates/forky/forky_play/examples/spline_catmull_rom.rs rename to crates/forky_play/examples/spline_catmull_rom.rs diff --git a/crates/forky/forky_play/examples/spline_editor.rs b/crates/forky_play/examples/spline_editor.rs similarity index 100% rename from crates/forky/forky_play/examples/spline_editor.rs rename to crates/forky_play/examples/spline_editor.rs diff --git a/crates/forky/forky_play/examples/spline_mesh.rs b/crates/forky_play/examples/spline_mesh.rs similarity index 100% rename from crates/forky/forky_play/examples/spline_mesh.rs rename to crates/forky_play/examples/spline_mesh.rs diff --git a/crates/forky/forky_play/src/animation/mod.rs b/crates/forky_play/src/animation/mod.rs similarity index 100% rename from crates/forky/forky_play/src/animation/mod.rs rename to crates/forky_play/src/animation/mod.rs diff --git a/crates/forky/forky_play/src/animation/pose_lerp.rs b/crates/forky_play/src/animation/pose_lerp.rs similarity index 100% rename from crates/forky/forky_play/src/animation/pose_lerp.rs rename to crates/forky_play/src/animation/pose_lerp.rs diff --git a/crates/forky/forky_play/src/base/camera.rs b/crates/forky_play/src/base/camera.rs similarity index 100% rename from crates/forky/forky_play/src/base/camera.rs rename to crates/forky_play/src/base/camera.rs diff --git a/crates/forky/forky_play/src/base/debug.rs b/crates/forky_play/src/base/debug.rs similarity index 100% rename from crates/forky/forky_play/src/base/debug.rs rename to crates/forky_play/src/base/debug.rs diff --git a/crates/forky/forky_play/src/base/mod.rs b/crates/forky_play/src/base/mod.rs similarity index 100% rename from crates/forky/forky_play/src/base/mod.rs rename to crates/forky_play/src/base/mod.rs diff --git a/crates/forky/forky_play/src/base/plugin.rs b/crates/forky_play/src/base/plugin.rs similarity index 100% rename from crates/forky/forky_play/src/base/plugin.rs rename to crates/forky_play/src/base/plugin.rs diff --git a/crates/forky/forky_play/src/base/scene.rs b/crates/forky_play/src/base/scene.rs similarity index 100% rename from crates/forky/forky_play/src/base/scene.rs rename to crates/forky_play/src/base/scene.rs diff --git a/crates/forky/forky_play/src/bevy_app_utils/mod.rs b/crates/forky_play/src/bevy_app_utils/mod.rs similarity index 100% rename from crates/forky/forky_play/src/bevy_app_utils/mod.rs rename to crates/forky_play/src/bevy_app_utils/mod.rs diff --git a/crates/forky/forky_play/src/camera/camera_view_toggle.rs b/crates/forky_play/src/camera/camera_view_toggle.rs similarity index 100% rename from crates/forky/forky_play/src/camera/camera_view_toggle.rs rename to crates/forky_play/src/camera/camera_view_toggle.rs diff --git a/crates/forky/forky_play/src/camera/fly_camera_bundle.rs b/crates/forky_play/src/camera/fly_camera_bundle.rs similarity index 100% rename from crates/forky/forky_play/src/camera/fly_camera_bundle.rs rename to crates/forky_play/src/camera/fly_camera_bundle.rs diff --git a/crates/forky/forky_play/src/camera/fps_camera_bundle.rs b/crates/forky_play/src/camera/fps_camera_bundle.rs similarity index 100% rename from crates/forky/forky_play/src/camera/fps_camera_bundle.rs rename to crates/forky_play/src/camera/fps_camera_bundle.rs diff --git a/crates/forky/forky_play/src/camera/mod.rs b/crates/forky_play/src/camera/mod.rs similarity index 100% rename from crates/forky/forky_play/src/camera/mod.rs rename to crates/forky_play/src/camera/mod.rs diff --git a/crates/forky/forky_play/src/camera/orbit_camera_bundle.rs b/crates/forky_play/src/camera/orbit_camera_bundle.rs similarity index 100% rename from crates/forky/forky_play/src/camera/orbit_camera_bundle.rs rename to crates/forky_play/src/camera/orbit_camera_bundle.rs diff --git a/crates/forky/forky_play/src/camera/orbit_camera_controller.rs b/crates/forky_play/src/camera/orbit_camera_controller.rs similarity index 100% rename from crates/forky/forky_play/src/camera/orbit_camera_controller.rs rename to crates/forky_play/src/camera/orbit_camera_controller.rs diff --git a/crates/forky/forky_play/src/camera/orbit_keyboard_controller.rs b/crates/forky_play/src/camera/orbit_keyboard_controller.rs similarity index 100% rename from crates/forky/forky_play/src/camera/orbit_keyboard_controller.rs rename to crates/forky_play/src/camera/orbit_keyboard_controller.rs diff --git a/crates/forky/forky_play/src/camera/plugin.rs b/crates/forky_play/src/camera/plugin.rs similarity index 100% rename from crates/forky/forky_play/src/camera/plugin.rs rename to crates/forky_play/src/camera/plugin.rs diff --git a/crates/forky/forky_play/src/common/id_hashmap.rs b/crates/forky_play/src/common/id_hashmap.rs similarity index 100% rename from crates/forky/forky_play/src/common/id_hashmap.rs rename to crates/forky_play/src/common/id_hashmap.rs diff --git a/crates/forky/forky_play/src/common/mod.rs b/crates/forky_play/src/common/mod.rs similarity index 100% rename from crates/forky/forky_play/src/common/mod.rs rename to crates/forky_play/src/common/mod.rs diff --git a/crates/forky/forky_play/src/common/tag_components.rs b/crates/forky_play/src/common/tag_components.rs similarity index 100% rename from crates/forky/forky_play/src/common/tag_components.rs rename to crates/forky_play/src/common/tag_components.rs diff --git a/crates/forky/forky_play/src/debug/gizmos.rs b/crates/forky_play/src/debug/gizmos.rs similarity index 100% rename from crates/forky/forky_play/src/debug/gizmos.rs rename to crates/forky_play/src/debug/gizmos.rs diff --git a/crates/forky/forky_play/src/debug/grid.rs b/crates/forky_play/src/debug/grid.rs similarity index 100% rename from crates/forky/forky_play/src/debug/grid.rs rename to crates/forky_play/src/debug/grid.rs diff --git a/crates/forky/forky_play/src/debug/mod.rs b/crates/forky_play/src/debug/mod.rs similarity index 100% rename from crates/forky/forky_play/src/debug/mod.rs rename to crates/forky_play/src/debug/mod.rs diff --git a/crates/forky/forky_play/src/extensions/bundle.rs b/crates/forky_play/src/extensions/bundle.rs similarity index 100% rename from crates/forky/forky_play/src/extensions/bundle.rs rename to crates/forky_play/src/extensions/bundle.rs diff --git a/crates/forky/forky_play/src/extensions/color.rs b/crates/forky_play/src/extensions/color.rs similarity index 100% rename from crates/forky/forky_play/src/extensions/color.rs rename to crates/forky_play/src/extensions/color.rs diff --git a/crates/forky/forky_play/src/extensions/material.rs b/crates/forky_play/src/extensions/material.rs similarity index 100% rename from crates/forky/forky_play/src/extensions/material.rs rename to crates/forky_play/src/extensions/material.rs diff --git a/crates/forky/forky_play/src/extensions/mod.rs b/crates/forky_play/src/extensions/mod.rs similarity index 100% rename from crates/forky/forky_play/src/extensions/mod.rs rename to crates/forky_play/src/extensions/mod.rs diff --git a/crates/forky/forky_play/src/extensions/physics.rs b/crates/forky_play/src/extensions/physics.rs similarity index 100% rename from crates/forky/forky_play/src/extensions/physics.rs rename to crates/forky_play/src/extensions/physics.rs diff --git a/crates/forky/forky_play/src/geometry__/bezier/cubic.rs b/crates/forky_play/src/geometry__/bezier/cubic.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/bezier/cubic.rs rename to crates/forky_play/src/geometry__/bezier/cubic.rs diff --git a/crates/forky/forky_play/src/geometry__/bezier/linear.rs b/crates/forky_play/src/geometry__/bezier/linear.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/bezier/linear.rs rename to crates/forky_play/src/geometry__/bezier/linear.rs diff --git a/crates/forky/forky_play/src/geometry__/bezier/mod.rs b/crates/forky_play/src/geometry__/bezier/mod.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/bezier/mod.rs rename to crates/forky_play/src/geometry__/bezier/mod.rs diff --git a/crates/forky/forky_play/src/geometry__/bezier/quadratic.rs b/crates/forky_play/src/geometry__/bezier/quadratic.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/bezier/quadratic.rs rename to crates/forky_play/src/geometry__/bezier/quadratic.rs diff --git a/crates/forky/forky_play/src/geometry__/bezier2/cubic.rs b/crates/forky_play/src/geometry__/bezier2/cubic.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/bezier2/cubic.rs rename to crates/forky_play/src/geometry__/bezier2/cubic.rs diff --git a/crates/forky/forky_play/src/geometry__/bezier2/linear.rs b/crates/forky_play/src/geometry__/bezier2/linear.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/bezier2/linear.rs rename to crates/forky_play/src/geometry__/bezier2/linear.rs diff --git a/crates/forky/forky_play/src/geometry__/bezier2/mod.rs b/crates/forky_play/src/geometry__/bezier2/mod.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/bezier2/mod.rs rename to crates/forky_play/src/geometry__/bezier2/mod.rs diff --git a/crates/forky/forky_play/src/geometry__/bezier2/quadratic.rs b/crates/forky_play/src/geometry__/bezier2/quadratic.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/bezier2/quadratic.rs rename to crates/forky_play/src/geometry__/bezier2/quadratic.rs diff --git a/crates/forky/forky_play/src/geometry__/bezier3/cubic.rs b/crates/forky_play/src/geometry__/bezier3/cubic.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/bezier3/cubic.rs rename to crates/forky_play/src/geometry__/bezier3/cubic.rs diff --git a/crates/forky/forky_play/src/geometry__/bezier3/linear.rs b/crates/forky_play/src/geometry__/bezier3/linear.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/bezier3/linear.rs rename to crates/forky_play/src/geometry__/bezier3/linear.rs diff --git a/crates/forky/forky_play/src/geometry__/bezier3/mod.rs b/crates/forky_play/src/geometry__/bezier3/mod.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/bezier3/mod.rs rename to crates/forky_play/src/geometry__/bezier3/mod.rs diff --git a/crates/forky/forky_play/src/geometry__/bezier3/quadratic.rs b/crates/forky_play/src/geometry__/bezier3/quadratic.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/bezier3/quadratic.rs rename to crates/forky_play/src/geometry__/bezier3/quadratic.rs diff --git a/crates/forky/forky_play/src/geometry__/mod.rs b/crates/forky_play/src/geometry__/mod.rs similarity index 100% rename from crates/forky/forky_play/src/geometry__/mod.rs rename to crates/forky_play/src/geometry__/mod.rs diff --git a/crates/forky/forky_play/src/input/keyboard_controller.rs b/crates/forky_play/src/input/keyboard_controller.rs similarity index 100% rename from crates/forky/forky_play/src/input/keyboard_controller.rs rename to crates/forky_play/src/input/keyboard_controller.rs diff --git a/crates/forky/forky_play/src/input/mod.rs b/crates/forky_play/src/input/mod.rs similarity index 100% rename from crates/forky/forky_play/src/input/mod.rs rename to crates/forky_play/src/input/mod.rs diff --git a/crates/forky/forky_play/src/input/mouse_controller.rs b/crates/forky_play/src/input/mouse_controller.rs similarity index 100% rename from crates/forky/forky_play/src/input/mouse_controller.rs rename to crates/forky_play/src/input/mouse_controller.rs diff --git a/crates/forky/forky_play/src/input/plugin.rs b/crates/forky_play/src/input/plugin.rs similarity index 100% rename from crates/forky/forky_play/src/input/plugin.rs rename to crates/forky_play/src/input/plugin.rs diff --git a/crates/forky/forky_play/src/input/transform_controller.rs b/crates/forky_play/src/input/transform_controller.rs similarity index 100% rename from crates/forky/forky_play/src/input/transform_controller.rs rename to crates/forky_play/src/input/transform_controller.rs diff --git a/crates/forky/forky_play/src/lib.rs b/crates/forky_play/src/lib.rs similarity index 100% rename from crates/forky/forky_play/src/lib.rs rename to crates/forky_play/src/lib.rs diff --git a/crates/forky/forky_play/src/materials/forky_material_plugin.rs b/crates/forky_play/src/materials/forky_material_plugin.rs similarity index 100% rename from crates/forky/forky_play/src/materials/forky_material_plugin.rs rename to crates/forky_play/src/materials/forky_material_plugin.rs diff --git a/crates/forky/forky_play/src/materials/forky_shader.rs b/crates/forky_play/src/materials/forky_shader.rs similarity index 100% rename from crates/forky/forky_play/src/materials/forky_shader.rs rename to crates/forky_play/src/materials/forky_shader.rs diff --git a/crates/forky/forky_play/src/materials/inline_shaders.rs b/crates/forky_play/src/materials/inline_shaders.rs similarity index 100% rename from crates/forky/forky_play/src/materials/inline_shaders.rs rename to crates/forky_play/src/materials/inline_shaders.rs diff --git a/crates/forky/forky_play/src/materials/mod.rs b/crates/forky_play/src/materials/mod.rs similarity index 100% rename from crates/forky/forky_play/src/materials/mod.rs rename to crates/forky_play/src/materials/mod.rs diff --git a/crates/forky/forky_play/src/materials/render_bundle.rs b/crates/forky_play/src/materials/render_bundle.rs similarity index 100% rename from crates/forky/forky_play/src/materials/render_bundle.rs rename to crates/forky_play/src/materials/render_bundle.rs diff --git a/crates/forky/forky_play/src/materials/unlit_material.rs b/crates/forky_play/src/materials/unlit_material.rs similarity index 100% rename from crates/forky/forky_play/src/materials/unlit_material.rs rename to crates/forky_play/src/materials/unlit_material.rs diff --git a/crates/forky/forky_play/src/materials/unlit_texture_material.rs b/crates/forky_play/src/materials/unlit_texture_material.rs similarity index 100% rename from crates/forky/forky_play/src/materials/unlit_texture_material.rs rename to crates/forky_play/src/materials/unlit_texture_material.rs diff --git a/crates/forky/forky_play/src/materials/uv_material.rs b/crates/forky_play/src/materials/uv_material.rs similarity index 100% rename from crates/forky/forky_play/src/materials/uv_material.rs rename to crates/forky_play/src/materials/uv_material.rs diff --git a/crates/forky/forky_play/src/maze/__spawners/ball.rs b/crates/forky_play/src/maze/__spawners/ball.rs similarity index 100% rename from crates/forky/forky_play/src/maze/__spawners/ball.rs rename to crates/forky_play/src/maze/__spawners/ball.rs diff --git a/crates/forky/forky_play/src/maze/__spawners/board.rs b/crates/forky_play/src/maze/__spawners/board.rs similarity index 100% rename from crates/forky/forky_play/src/maze/__spawners/board.rs rename to crates/forky_play/src/maze/__spawners/board.rs diff --git a/crates/forky/forky_play/src/maze/__spawners/floor.rs b/crates/forky_play/src/maze/__spawners/floor.rs similarity index 100% rename from crates/forky/forky_play/src/maze/__spawners/floor.rs rename to crates/forky_play/src/maze/__spawners/floor.rs diff --git a/crates/forky/forky_play/src/maze/__spawners/maze_3d.rs b/crates/forky_play/src/maze/__spawners/maze_3d.rs similarity index 100% rename from crates/forky/forky_play/src/maze/__spawners/maze_3d.rs rename to crates/forky_play/src/maze/__spawners/maze_3d.rs diff --git a/crates/forky/forky_play/src/maze/__spawners/maze_wall.rs b/crates/forky_play/src/maze/__spawners/maze_wall.rs similarity index 100% rename from crates/forky/forky_play/src/maze/__spawners/maze_wall.rs rename to crates/forky_play/src/maze/__spawners/maze_wall.rs diff --git a/crates/forky/forky_play/src/maze/__spawners/mesh_shape.rs b/crates/forky_play/src/maze/__spawners/mesh_shape.rs similarity index 100% rename from crates/forky/forky_play/src/maze/__spawners/mesh_shape.rs rename to crates/forky_play/src/maze/__spawners/mesh_shape.rs diff --git a/crates/forky/forky_play/src/maze/__spawners/mod.rs b/crates/forky_play/src/maze/__spawners/mod.rs similarity index 100% rename from crates/forky/forky_play/src/maze/__spawners/mod.rs rename to crates/forky_play/src/maze/__spawners/mod.rs diff --git a/crates/forky/forky_play/src/maze/__spawners/ui.rs b/crates/forky_play/src/maze/__spawners/ui.rs similarity index 100% rename from crates/forky/forky_play/src/maze/__spawners/ui.rs rename to crates/forky_play/src/maze/__spawners/ui.rs diff --git a/crates/forky/forky_play/src/maze/_solvers/depth_first_backtrack.rs b/crates/forky_play/src/maze/_solvers/depth_first_backtrack.rs similarity index 100% rename from crates/forky/forky_play/src/maze/_solvers/depth_first_backtrack.rs rename to crates/forky_play/src/maze/_solvers/depth_first_backtrack.rs diff --git a/crates/forky/forky_play/src/maze/_solvers/mod.rs b/crates/forky_play/src/maze/_solvers/mod.rs similarity index 100% rename from crates/forky/forky_play/src/maze/_solvers/mod.rs rename to crates/forky_play/src/maze/_solvers/mod.rs diff --git a/crates/forky/forky_play/src/maze/_utility/char_shape/misc.rs b/crates/forky_play/src/maze/_utility/char_shape/misc.rs similarity index 100% rename from crates/forky/forky_play/src/maze/_utility/char_shape/misc.rs rename to crates/forky_play/src/maze/_utility/char_shape/misc.rs diff --git a/crates/forky/forky_play/src/maze/_utility/char_shape/mod.rs b/crates/forky_play/src/maze/_utility/char_shape/mod.rs similarity index 100% rename from crates/forky/forky_play/src/maze/_utility/char_shape/mod.rs rename to crates/forky_play/src/maze/_utility/char_shape/mod.rs diff --git a/crates/forky/forky_play/src/maze/_utility/maze.rs b/crates/forky_play/src/maze/_utility/maze.rs similarity index 100% rename from crates/forky/forky_play/src/maze/_utility/maze.rs rename to crates/forky_play/src/maze/_utility/maze.rs diff --git a/crates/forky/forky_play/src/maze/_utility/mod.rs b/crates/forky_play/src/maze/_utility/mod.rs similarity index 100% rename from crates/forky/forky_play/src/maze/_utility/mod.rs rename to crates/forky_play/src/maze/_utility/mod.rs diff --git a/crates/forky/forky_play/src/maze/_utility/u8_shape/misc.rs b/crates/forky_play/src/maze/_utility/u8_shape/misc.rs similarity index 100% rename from crates/forky/forky_play/src/maze/_utility/u8_shape/misc.rs rename to crates/forky_play/src/maze/_utility/u8_shape/misc.rs diff --git a/crates/forky/forky_play/src/maze/_utility/u8_shape/mod.rs b/crates/forky_play/src/maze/_utility/u8_shape/mod.rs similarity index 100% rename from crates/forky/forky_play/src/maze/_utility/u8_shape/mod.rs rename to crates/forky_play/src/maze/_utility/u8_shape/mod.rs diff --git a/crates/forky/forky_play/src/maze/board_joint/_force.rs b/crates/forky_play/src/maze/board_joint/_force.rs similarity index 100% rename from crates/forky/forky_play/src/maze/board_joint/_force.rs rename to crates/forky_play/src/maze/board_joint/_force.rs diff --git a/crates/forky/forky_play/src/maze/board_joint/force_controller.rs b/crates/forky_play/src/maze/board_joint/force_controller.rs similarity index 100% rename from crates/forky/forky_play/src/maze/board_joint/force_controller.rs rename to crates/forky_play/src/maze/board_joint/force_controller.rs diff --git a/crates/forky/forky_play/src/maze/board_joint/force_spawn.rs b/crates/forky_play/src/maze/board_joint/force_spawn.rs similarity index 100% rename from crates/forky/forky_play/src/maze/board_joint/force_spawn.rs rename to crates/forky_play/src/maze/board_joint/force_spawn.rs diff --git a/crates/forky/forky_play/src/maze/board_joint/mod.rs b/crates/forky_play/src/maze/board_joint/mod.rs similarity index 100% rename from crates/forky/forky_play/src/maze/board_joint/mod.rs rename to crates/forky_play/src/maze/board_joint/mod.rs diff --git a/crates/forky/forky_play/src/maze/board_joint/motor_controller.rs b/crates/forky_play/src/maze/board_joint/motor_controller.rs similarity index 100% rename from crates/forky/forky_play/src/maze/board_joint/motor_controller.rs rename to crates/forky_play/src/maze/board_joint/motor_controller.rs diff --git a/crates/forky/forky_play/src/maze/board_joint/motor_spawn.rs b/crates/forky_play/src/maze/board_joint/motor_spawn.rs similarity index 100% rename from crates/forky/forky_play/src/maze/board_joint/motor_spawn.rs rename to crates/forky_play/src/maze/board_joint/motor_spawn.rs diff --git a/crates/forky/forky_play/src/maze/board_joint/structs.rs b/crates/forky_play/src/maze/board_joint/structs.rs similarity index 100% rename from crates/forky/forky_play/src/maze/board_joint/structs.rs rename to crates/forky_play/src/maze/board_joint/structs.rs diff --git a/crates/forky/forky_play/src/maze/mod.rs b/crates/forky_play/src/maze/mod.rs similarity index 100% rename from crates/forky/forky_play/src/maze/mod.rs rename to crates/forky_play/src/maze/mod.rs diff --git a/crates/forky/forky_play/src/maze/plugin.rs b/crates/forky_play/src/maze/plugin.rs similarity index 100% rename from crates/forky/forky_play/src/maze/plugin.rs rename to crates/forky_play/src/maze/plugin.rs diff --git a/crates/forky/forky_play/src/maze/rect_maze/mod.rs b/crates/forky_play/src/maze/rect_maze/mod.rs similarity index 100% rename from crates/forky/forky_play/src/maze/rect_maze/mod.rs rename to crates/forky_play/src/maze/rect_maze/mod.rs diff --git a/crates/forky/forky_play/src/maze/rect_maze/rect_maze.rs b/crates/forky_play/src/maze/rect_maze/rect_maze.rs similarity index 100% rename from crates/forky/forky_play/src/maze/rect_maze/rect_maze.rs rename to crates/forky_play/src/maze/rect_maze/rect_maze.rs diff --git a/crates/forky/forky_play/src/maze/rect_maze/rect_maze_spatial.rs b/crates/forky_play/src/maze/rect_maze/rect_maze_spatial.rs similarity index 100% rename from crates/forky/forky_play/src/maze/rect_maze/rect_maze_spatial.rs rename to crates/forky_play/src/maze/rect_maze/rect_maze_spatial.rs diff --git a/crates/forky/forky_play/src/maze/systems/camera.rs b/crates/forky_play/src/maze/systems/camera.rs similarity index 100% rename from crates/forky/forky_play/src/maze/systems/camera.rs rename to crates/forky_play/src/maze/systems/camera.rs diff --git a/crates/forky/forky_play/src/maze/systems/game.rs b/crates/forky_play/src/maze/systems/game.rs similarity index 100% rename from crates/forky/forky_play/src/maze/systems/game.rs rename to crates/forky_play/src/maze/systems/game.rs diff --git a/crates/forky/forky_play/src/maze/systems/mod.rs b/crates/forky_play/src/maze/systems/mod.rs similarity index 100% rename from crates/forky/forky_play/src/maze/systems/mod.rs rename to crates/forky_play/src/maze/systems/mod.rs diff --git a/crates/forky/forky_play/src/maze/systems/reset.rs b/crates/forky_play/src/maze/systems/reset.rs similarity index 100% rename from crates/forky/forky_play/src/maze/systems/reset.rs rename to crates/forky_play/src/maze/systems/reset.rs diff --git a/crates/forky/forky_play/src/maze/types.rs b/crates/forky_play/src/maze/types.rs similarity index 100% rename from crates/forky/forky_play/src/maze/types.rs rename to crates/forky_play/src/maze/types.rs diff --git a/crates/forky/forky_play/src/mesh_utils/kaleid.rs b/crates/forky_play/src/mesh_utils/kaleid.rs similarity index 100% rename from crates/forky/forky_play/src/mesh_utils/kaleid.rs rename to crates/forky_play/src/mesh_utils/kaleid.rs diff --git a/crates/forky/forky_play/src/mesh_utils/mesh_factory.rs b/crates/forky_play/src/mesh_utils/mesh_factory.rs similarity index 100% rename from crates/forky/forky_play/src/mesh_utils/mesh_factory.rs rename to crates/forky_play/src/mesh_utils/mesh_factory.rs diff --git a/crates/forky/forky_play/src/mesh_utils/mod.rs b/crates/forky_play/src/mesh_utils/mod.rs similarity index 100% rename from crates/forky/forky_play/src/mesh_utils/mod.rs rename to crates/forky_play/src/mesh_utils/mod.rs diff --git a/crates/forky/forky_play/src/mithril/cart_settings.rs b/crates/forky_play/src/mithril/cart_settings.rs similarity index 100% rename from crates/forky/forky_play/src/mithril/cart_settings.rs rename to crates/forky_play/src/mithril/cart_settings.rs diff --git a/crates/forky/forky_play/src/mithril/graph_settings.rs b/crates/forky_play/src/mithril/graph_settings.rs similarity index 100% rename from crates/forky/forky_play/src/mithril/graph_settings.rs rename to crates/forky_play/src/mithril/graph_settings.rs diff --git a/crates/forky/forky_play/src/mithril/mod.rs b/crates/forky_play/src/mithril/mod.rs similarity index 100% rename from crates/forky/forky_play/src/mithril/mod.rs rename to crates/forky_play/src/mithril/mod.rs diff --git a/crates/forky/forky_play/src/mithril/plugin.rs b/crates/forky_play/src/mithril/plugin.rs similarity index 100% rename from crates/forky/forky_play/src/mithril/plugin.rs rename to crates/forky_play/src/mithril/plugin.rs diff --git a/crates/forky/forky_play/src/mithril/spawn_carts.rs b/crates/forky_play/src/mithril/spawn_carts.rs similarity index 100% rename from crates/forky/forky_play/src/mithril/spawn_carts.rs rename to crates/forky_play/src/mithril/spawn_carts.rs diff --git a/crates/forky/forky_play/src/mithril/spawn_graph.rs b/crates/forky_play/src/mithril/spawn_graph.rs similarity index 100% rename from crates/forky/forky_play/src/mithril/spawn_graph.rs rename to crates/forky_play/src/mithril/spawn_graph.rs diff --git a/crates/forky/forky_play/src/physics/euler_physics.rs b/crates/forky_play/src/physics/euler_physics.rs similarity index 100% rename from crates/forky/forky_play/src/physics/euler_physics.rs rename to crates/forky_play/src/physics/euler_physics.rs diff --git a/crates/forky/forky_play/src/physics/kinematic_body.rs b/crates/forky_play/src/physics/kinematic_body.rs similarity index 100% rename from crates/forky/forky_play/src/physics/kinematic_body.rs rename to crates/forky_play/src/physics/kinematic_body.rs diff --git a/crates/forky/forky_play/src/physics/mod.rs b/crates/forky_play/src/physics/mod.rs similarity index 100% rename from crates/forky/forky_play/src/physics/mod.rs rename to crates/forky_play/src/physics/mod.rs diff --git a/crates/forky/forky_play/src/physics/plugin.rs b/crates/forky_play/src/physics/plugin.rs similarity index 100% rename from crates/forky/forky_play/src/physics/plugin.rs rename to crates/forky_play/src/physics/plugin.rs diff --git a/crates/forky/forky_play/src/physics/slerp_joint.rs b/crates/forky_play/src/physics/slerp_joint.rs similarity index 100% rename from crates/forky/forky_play/src/physics/slerp_joint.rs rename to crates/forky_play/src/physics/slerp_joint.rs diff --git a/crates/forky/forky_play/src/physics/steer.rs b/crates/forky_play/src/physics/steer.rs similarity index 100% rename from crates/forky/forky_play/src/physics/steer.rs rename to crates/forky_play/src/physics/steer.rs diff --git a/crates/forky/forky_play/src/plugins/custom_default_plugin.rs b/crates/forky_play/src/plugins/custom_default_plugin.rs similarity index 100% rename from crates/forky/forky_play/src/plugins/custom_default_plugin.rs rename to crates/forky_play/src/plugins/custom_default_plugin.rs diff --git a/crates/forky/forky_play/src/plugins/forky_debug_plugin.rs b/crates/forky_play/src/plugins/forky_debug_plugin.rs similarity index 100% rename from crates/forky/forky_play/src/plugins/forky_debug_plugin.rs rename to crates/forky_play/src/plugins/forky_debug_plugin.rs diff --git a/crates/forky/forky_play/src/plugins/forky_full_plugin.rs b/crates/forky_play/src/plugins/forky_full_plugin.rs similarity index 100% rename from crates/forky/forky_play/src/plugins/forky_full_plugin.rs rename to crates/forky_play/src/plugins/forky_full_plugin.rs diff --git a/crates/forky/forky_play/src/plugins/mod.rs b/crates/forky_play/src/plugins/mod.rs similarity index 100% rename from crates/forky/forky_play/src/plugins/mod.rs rename to crates/forky_play/src/plugins/mod.rs diff --git a/crates/forky/forky_play/src/plugins/rotate_cube_plugin.rs b/crates/forky_play/src/plugins/rotate_cube_plugin.rs similarity index 100% rename from crates/forky/forky_play/src/plugins/rotate_cube_plugin.rs rename to crates/forky_play/src/plugins/rotate_cube_plugin.rs diff --git a/crates/forky/forky_play/src/spline/_solvers/catmull_rom.rs b/crates/forky_play/src/spline/_solvers/catmull_rom.rs similarity index 100% rename from crates/forky/forky_play/src/spline/_solvers/catmull_rom.rs rename to crates/forky_play/src/spline/_solvers/catmull_rom.rs diff --git a/crates/forky/forky_play/src/spline/_solvers/mod.rs b/crates/forky_play/src/spline/_solvers/mod.rs similarity index 100% rename from crates/forky/forky_play/src/spline/_solvers/mod.rs rename to crates/forky_play/src/spline/_solvers/mod.rs diff --git a/crates/forky/forky_play/src/spline/_spline/cubic_spline.rs b/crates/forky_play/src/spline/_spline/cubic_spline.rs similarity index 100% rename from crates/forky/forky_play/src/spline/_spline/cubic_spline.rs rename to crates/forky_play/src/spline/_spline/cubic_spline.rs diff --git a/crates/forky/forky_play/src/spline/_spline/linear_spline.rs b/crates/forky_play/src/spline/_spline/linear_spline.rs similarity index 100% rename from crates/forky/forky_play/src/spline/_spline/linear_spline.rs rename to crates/forky_play/src/spline/_spline/linear_spline.rs diff --git a/crates/forky/forky_play/src/spline/_spline/mod.rs b/crates/forky_play/src/spline/_spline/mod.rs similarity index 100% rename from crates/forky/forky_play/src/spline/_spline/mod.rs rename to crates/forky_play/src/spline/_spline/mod.rs diff --git a/crates/forky/forky_play/src/spline/_spline/quadratic_spline.rs b/crates/forky_play/src/spline/_spline/quadratic_spline.rs similarity index 100% rename from crates/forky/forky_play/src/spline/_spline/quadratic_spline.rs rename to crates/forky_play/src/spline/_spline/quadratic_spline.rs diff --git a/crates/forky/forky_play/src/spline/_spline/spline.rs b/crates/forky_play/src/spline/_spline/spline.rs similarity index 100% rename from crates/forky/forky_play/src/spline/_spline/spline.rs rename to crates/forky_play/src/spline/_spline/spline.rs diff --git a/crates/forky/forky_play/src/spline/_spline/spline_points.rs b/crates/forky_play/src/spline/_spline/spline_points.rs similarity index 100% rename from crates/forky/forky_play/src/spline/_spline/spline_points.rs rename to crates/forky_play/src/spline/_spline/spline_points.rs diff --git a/crates/forky/forky_play/src/spline/_spline/spline_type.rs b/crates/forky_play/src/spline/_spline/spline_type.rs similarity index 100% rename from crates/forky/forky_play/src/spline/_spline/spline_type.rs rename to crates/forky_play/src/spline/_spline/spline_type.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/_systems/apply_catmull_rom.rs b/crates/forky_play/src/spline/ecs_graph/_systems/apply_catmull_rom.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/_systems/apply_catmull_rom.rs rename to crates/forky_play/src/spline/ecs_graph/_systems/apply_catmull_rom.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/_systems/mod.rs b/crates/forky_play/src/spline/ecs_graph/_systems/mod.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/_systems/mod.rs rename to crates/forky_play/src/spline/ecs_graph/_systems/mod.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/_systems/on_edge_modified.rs b/crates/forky_play/src/spline/ecs_graph/_systems/on_edge_modified.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/_systems/on_edge_modified.rs rename to crates/forky_play/src/spline/ecs_graph/_systems/on_edge_modified.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/_systems/on_handle_moved.rs b/crates/forky_play/src/spline/ecs_graph/_systems/on_handle_moved.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/_systems/on_handle_moved.rs rename to crates/forky_play/src/spline/ecs_graph/_systems/on_handle_moved.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/_systems/on_node_moved.rs b/crates/forky_play/src/spline/ecs_graph/_systems/on_node_moved.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/_systems/on_node_moved.rs rename to crates/forky_play/src/spline/ecs_graph/_systems/on_node_moved.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/ecs_spline_edge.rs b/crates/forky_play/src/spline/ecs_graph/ecs_spline_edge.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/ecs_spline_edge.rs rename to crates/forky_play/src/spline/ecs_graph/ecs_spline_edge.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/ecs_spline_graph.rs b/crates/forky_play/src/spline/ecs_graph/ecs_spline_graph.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/ecs_spline_graph.rs rename to crates/forky_play/src/spline/ecs_graph/ecs_spline_graph.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/ecs_spline_graph_lookup.rs b/crates/forky_play/src/spline/ecs_graph/ecs_spline_graph_lookup.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/ecs_spline_graph_lookup.rs rename to crates/forky_play/src/spline/ecs_graph/ecs_spline_graph_lookup.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/ecs_spline_graph_plugin.rs b/crates/forky_play/src/spline/ecs_graph/ecs_spline_graph_plugin.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/ecs_spline_graph_plugin.rs rename to crates/forky_play/src/spline/ecs_graph/ecs_spline_graph_plugin.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/ecs_spline_handle.rs b/crates/forky_play/src/spline/ecs_graph/ecs_spline_handle.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/ecs_spline_handle.rs rename to crates/forky_play/src/spline/ecs_graph/ecs_spline_handle.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/ecs_spline_node.rs b/crates/forky_play/src/spline/ecs_graph/ecs_spline_node.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/ecs_spline_node.rs rename to crates/forky_play/src/spline/ecs_graph/ecs_spline_node.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/mod.rs b/crates/forky_play/src/spline/ecs_graph/mod.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/mod.rs rename to crates/forky_play/src/spline/ecs_graph/mod.rs diff --git a/crates/forky/forky_play/src/spline/ecs_graph/spawners.rs b/crates/forky_play/src/spline/ecs_graph/spawners.rs similarity index 100% rename from crates/forky/forky_play/src/spline/ecs_graph/spawners.rs rename to crates/forky_play/src/spline/ecs_graph/spawners.rs diff --git a/crates/forky/forky_play/src/spline/graph/mod.rs b/crates/forky_play/src/spline/graph/mod.rs similarity index 100% rename from crates/forky/forky_play/src/spline/graph/mod.rs rename to crates/forky_play/src/spline/graph/mod.rs diff --git a/crates/forky/forky_play/src/spline/graph/on_node_moved.rs b/crates/forky_play/src/spline/graph/on_node_moved.rs similarity index 100% rename from crates/forky/forky_play/src/spline/graph/on_node_moved.rs rename to crates/forky_play/src/spline/graph/on_node_moved.rs diff --git a/crates/forky/forky_play/src/spline/graph/spline_edge.rs b/crates/forky_play/src/spline/graph/spline_edge.rs similarity index 100% rename from crates/forky/forky_play/src/spline/graph/spline_edge.rs rename to crates/forky_play/src/spline/graph/spline_edge.rs diff --git a/crates/forky/forky_play/src/spline/graph/spline_graph.rs b/crates/forky_play/src/spline/graph/spline_graph.rs similarity index 100% rename from crates/forky/forky_play/src/spline/graph/spline_graph.rs rename to crates/forky_play/src/spline/graph/spline_graph.rs diff --git a/crates/forky/forky_play/src/spline/graph/spline_graph_lookup.rs b/crates/forky_play/src/spline/graph/spline_graph_lookup.rs similarity index 100% rename from crates/forky/forky_play/src/spline/graph/spline_graph_lookup.rs rename to crates/forky_play/src/spline/graph/spline_graph_lookup.rs diff --git a/crates/forky/forky_play/src/spline/graph/spline_graph_plugin.rs b/crates/forky_play/src/spline/graph/spline_graph_plugin.rs similarity index 100% rename from crates/forky/forky_play/src/spline/graph/spline_graph_plugin.rs rename to crates/forky_play/src/spline/graph/spline_graph_plugin.rs diff --git a/crates/forky/forky_play/src/spline/graph/spline_node.rs b/crates/forky_play/src/spline/graph/spline_node.rs similarity index 100% rename from crates/forky/forky_play/src/spline/graph/spline_node.rs rename to crates/forky_play/src/spline/graph/spline_node.rs diff --git a/crates/forky/forky_play/src/spline/graph/spline_node_positional.rs b/crates/forky_play/src/spline/graph/spline_node_positional.rs similarity index 100% rename from crates/forky/forky_play/src/spline/graph/spline_node_positional.rs rename to crates/forky_play/src/spline/graph/spline_node_positional.rs diff --git a/crates/forky/forky_play/src/spline/mesh/create_spline_mesh.rs b/crates/forky_play/src/spline/mesh/create_spline_mesh.rs similarity index 100% rename from crates/forky/forky_play/src/spline/mesh/create_spline_mesh.rs rename to crates/forky_play/src/spline/mesh/create_spline_mesh.rs diff --git a/crates/forky/forky_play/src/spline/mesh/edge_loop.rs b/crates/forky_play/src/spline/mesh/edge_loop.rs similarity index 100% rename from crates/forky/forky_play/src/spline/mesh/edge_loop.rs rename to crates/forky_play/src/spline/mesh/edge_loop.rs diff --git a/crates/forky/forky_play/src/spline/mesh/mod.rs b/crates/forky_play/src/spline/mesh/mod.rs similarity index 100% rename from crates/forky/forky_play/src/spline/mesh/mod.rs rename to crates/forky_play/src/spline/mesh/mod.rs diff --git a/crates/forky/forky_play/src/spline/mesh/normals.rs b/crates/forky_play/src/spline/mesh/normals.rs similarity index 100% rename from crates/forky/forky_play/src/spline/mesh/normals.rs rename to crates/forky_play/src/spline/mesh/normals.rs diff --git a/crates/forky/forky_play/src/spline/mesh/triangles.rs b/crates/forky_play/src/spline/mesh/triangles.rs similarity index 100% rename from crates/forky/forky_play/src/spline/mesh/triangles.rs rename to crates/forky_play/src/spline/mesh/triangles.rs diff --git a/crates/forky/forky_play/src/spline/mesh/uvs.rs b/crates/forky_play/src/spline/mesh/uvs.rs similarity index 100% rename from crates/forky/forky_play/src/spline/mesh/uvs.rs rename to crates/forky_play/src/spline/mesh/uvs.rs diff --git a/crates/forky/forky_play/src/spline/mesh/vertices.rs b/crates/forky_play/src/spline/mesh/vertices.rs similarity index 100% rename from crates/forky/forky_play/src/spline/mesh/vertices.rs rename to crates/forky_play/src/spline/mesh/vertices.rs diff --git a/crates/forky/forky_play/src/spline/mod.rs b/crates/forky_play/src/spline/mod.rs similarity index 100% rename from crates/forky/forky_play/src/spline/mod.rs rename to crates/forky_play/src/spline/mod.rs diff --git a/crates/forky/forky_play/src/spline/physics/components.rs b/crates/forky_play/src/spline/physics/components.rs similarity index 100% rename from crates/forky/forky_play/src/spline/physics/components.rs rename to crates/forky_play/src/spline/physics/components.rs diff --git a/crates/forky/forky_play/src/spline/physics/mod.rs b/crates/forky_play/src/spline/physics/mod.rs similarity index 100% rename from crates/forky/forky_play/src/spline/physics/mod.rs rename to crates/forky_play/src/spline/physics/mod.rs diff --git a/crates/forky/forky_play/src/spline/physics/plugin.rs b/crates/forky_play/src/spline/physics/plugin.rs similarity index 100% rename from crates/forky/forky_play/src/spline/physics/plugin.rs rename to crates/forky_play/src/spline/physics/plugin.rs diff --git a/crates/forky/forky_play/src/spline/physics/spline_physics_bundle.rs b/crates/forky_play/src/spline/physics/spline_physics_bundle.rs similarity index 100% rename from crates/forky/forky_play/src/spline/physics/spline_physics_bundle.rs rename to crates/forky_play/src/spline/physics/spline_physics_bundle.rs diff --git a/crates/forky/forky_play/src/spline/physics/systems.rs b/crates/forky_play/src/spline/physics/systems.rs similarity index 100% rename from crates/forky/forky_play/src/spline/physics/systems.rs rename to crates/forky_play/src/spline/physics/systems.rs diff --git a/crates/forky/forky_play/src/spline/physics/update_current_edge.rs b/crates/forky_play/src/spline/physics/update_current_edge.rs similarity index 100% rename from crates/forky/forky_play/src/spline/physics/update_current_edge.rs rename to crates/forky_play/src/spline/physics/update_current_edge.rs diff --git a/crates/forky/forky_play/src/spline/spline_plugin.rs b/crates/forky_play/src/spline/spline_plugin.rs similarity index 100% rename from crates/forky/forky_play/src/spline/spline_plugin.rs rename to crates/forky_play/src/spline/spline_plugin.rs diff --git a/crates/forky/forky_play/src/spline/tool/create_spline_node.rs b/crates/forky_play/src/spline/tool/create_spline_node.rs similarity index 100% rename from crates/forky/forky_play/src/spline/tool/create_spline_node.rs rename to crates/forky_play/src/spline/tool/create_spline_node.rs diff --git a/crates/forky/forky_play/src/spline/tool/link_spline_nodes.rs b/crates/forky_play/src/spline/tool/link_spline_nodes.rs similarity index 100% rename from crates/forky/forky_play/src/spline/tool/link_spline_nodes.rs rename to crates/forky_play/src/spline/tool/link_spline_nodes.rs diff --git a/crates/forky/forky_play/src/spline/tool/mod.rs b/crates/forky_play/src/spline/tool/mod.rs similarity index 100% rename from crates/forky/forky_play/src/spline/tool/mod.rs rename to crates/forky_play/src/spline/tool/mod.rs diff --git a/crates/forky/forky_play/src/spline/tool/spline_tool_plugin.rs b/crates/forky_play/src/spline/tool/spline_tool_plugin.rs similarity index 100% rename from crates/forky/forky_play/src/spline/tool/spline_tool_plugin.rs rename to crates/forky_play/src/spline/tool/spline_tool_plugin.rs diff --git a/crates/forky/forky_play/src/spline/utils/debug_utils.rs b/crates/forky_play/src/spline/utils/debug_utils.rs similarity index 100% rename from crates/forky/forky_play/src/spline/utils/debug_utils.rs rename to crates/forky_play/src/spline/utils/debug_utils.rs diff --git a/crates/forky/forky_play/src/spline/utils/mod.rs b/crates/forky_play/src/spline/utils/mod.rs similarity index 100% rename from crates/forky/forky_play/src/spline/utils/mod.rs rename to crates/forky_play/src/spline/utils/mod.rs diff --git a/crates/forky/forky_play/src/spline/utils/spawn_utils.rs b/crates/forky_play/src/spline/utils/spawn_utils.rs similarity index 100% rename from crates/forky/forky_play/src/spline/utils/spawn_utils.rs rename to crates/forky_play/src/spline/utils/spawn_utils.rs diff --git a/crates/forky/forky_play/src/tool/_prepare_systems/cast_camera_ray.rs b/crates/forky_play/src/tool/_prepare_systems/cast_camera_ray.rs similarity index 100% rename from crates/forky/forky_play/src/tool/_prepare_systems/cast_camera_ray.rs rename to crates/forky_play/src/tool/_prepare_systems/cast_camera_ray.rs diff --git a/crates/forky/forky_play/src/tool/_prepare_systems/highlight.rs b/crates/forky_play/src/tool/_prepare_systems/highlight.rs similarity index 100% rename from crates/forky/forky_play/src/tool/_prepare_systems/highlight.rs rename to crates/forky_play/src/tool/_prepare_systems/highlight.rs diff --git a/crates/forky/forky_play/src/tool/_prepare_systems/mod.rs b/crates/forky_play/src/tool/_prepare_systems/mod.rs similarity index 100% rename from crates/forky/forky_play/src/tool/_prepare_systems/mod.rs rename to crates/forky_play/src/tool/_prepare_systems/mod.rs diff --git a/crates/forky/forky_play/src/tool/_prepare_systems/select.rs b/crates/forky_play/src/tool/_prepare_systems/select.rs similarity index 100% rename from crates/forky/forky_play/src/tool/_prepare_systems/select.rs rename to crates/forky_play/src/tool/_prepare_systems/select.rs diff --git a/crates/forky/forky_play/src/tool/_prepare_systems/set_interactable_colors.rs b/crates/forky_play/src/tool/_prepare_systems/set_interactable_colors.rs similarity index 100% rename from crates/forky/forky_play/src/tool/_prepare_systems/set_interactable_colors.rs rename to crates/forky_play/src/tool/_prepare_systems/set_interactable_colors.rs diff --git a/crates/forky/forky_play/src/tool/_tool_systems/append_interactable_mesh.rs b/crates/forky_play/src/tool/_tool_systems/append_interactable_mesh.rs similarity index 100% rename from crates/forky/forky_play/src/tool/_tool_systems/append_interactable_mesh.rs rename to crates/forky_play/src/tool/_tool_systems/append_interactable_mesh.rs diff --git a/crates/forky/forky_play/src/tool/_tool_systems/mod.rs b/crates/forky_play/src/tool/_tool_systems/mod.rs similarity index 100% rename from crates/forky/forky_play/src/tool/_tool_systems/mod.rs rename to crates/forky_play/src/tool/_tool_systems/mod.rs diff --git a/crates/forky/forky_play/src/tool/_tool_systems/move_selected_interactables.rs b/crates/forky_play/src/tool/_tool_systems/move_selected_interactables.rs similarity index 100% rename from crates/forky/forky_play/src/tool/_tool_systems/move_selected_interactables.rs rename to crates/forky_play/src/tool/_tool_systems/move_selected_interactables.rs diff --git a/crates/forky/forky_play/src/tool/camera_ray.rs b/crates/forky_play/src/tool/camera_ray.rs similarity index 100% rename from crates/forky/forky_play/src/tool/camera_ray.rs rename to crates/forky_play/src/tool/camera_ray.rs diff --git a/crates/forky/forky_play/src/tool/mod.rs b/crates/forky_play/src/tool/mod.rs similarity index 100% rename from crates/forky/forky_play/src/tool/mod.rs rename to crates/forky_play/src/tool/mod.rs diff --git a/crates/forky/forky_play/src/tool/resources.rs b/crates/forky_play/src/tool/resources.rs similarity index 100% rename from crates/forky/forky_play/src/tool/resources.rs rename to crates/forky_play/src/tool/resources.rs diff --git a/crates/forky/forky_play/src/tool/tool_plugin.rs b/crates/forky_play/src/tool/tool_plugin.rs similarity index 100% rename from crates/forky/forky_play/src/tool/tool_plugin.rs rename to crates/forky_play/src/tool/tool_plugin.rs diff --git a/crates/forky/forky_play/src/utility/keycode.rs b/crates/forky_play/src/utility/keycode.rs similarity index 100% rename from crates/forky/forky_play/src/utility/keycode.rs rename to crates/forky_play/src/utility/keycode.rs diff --git a/crates/forky/forky_play/src/utility/mod.rs b/crates/forky_play/src/utility/mod.rs similarity index 100% rename from crates/forky/forky_play/src/utility/mod.rs rename to crates/forky_play/src/utility/mod.rs diff --git a/crates/forky/forky_play/src/utility/svg_graph.rs b/crates/forky_play/src/utility/svg_graph.rs similarity index 100% rename from crates/forky/forky_play/src/utility/svg_graph.rs rename to crates/forky_play/src/utility/svg_graph.rs diff --git a/crates/forky/forky_play/src/utility/systems.rs b/crates/forky_play/src/utility/systems.rs similarity index 100% rename from crates/forky/forky_play/src/utility/systems.rs rename to crates/forky_play/src/utility/systems.rs diff --git a/crates/forky/forky_play/test/extensions/app.rs b/crates/forky_play/test/extensions/app.rs similarity index 100% rename from crates/forky/forky_play/test/extensions/app.rs rename to crates/forky_play/test/extensions/app.rs diff --git a/crates/forky/forky_play/test/extensions/mod.rs b/crates/forky_play/test/extensions/mod.rs similarity index 100% rename from crates/forky/forky_play/test/extensions/mod.rs rename to crates/forky_play/test/extensions/mod.rs diff --git a/crates/forky/forky_play/test/extensions/quat.rs b/crates/forky_play/test/extensions/quat.rs similarity index 100% rename from crates/forky/forky_play/test/extensions/quat.rs rename to crates/forky_play/test/extensions/quat.rs diff --git a/crates/forky/forky_play/test/geometry/bezier.rs b/crates/forky_play/test/geometry/bezier.rs similarity index 100% rename from crates/forky/forky_play/test/geometry/bezier.rs rename to crates/forky_play/test/geometry/bezier.rs diff --git a/crates/forky/forky_play/test/geometry/bezier_render.rs b/crates/forky_play/test/geometry/bezier_render.rs similarity index 100% rename from crates/forky/forky_play/test/geometry/bezier_render.rs rename to crates/forky_play/test/geometry/bezier_render.rs diff --git a/crates/forky/forky_play/test/geometry/mod.rs b/crates/forky_play/test/geometry/mod.rs similarity index 100% rename from crates/forky/forky_play/test/geometry/mod.rs rename to crates/forky_play/test/geometry/mod.rs diff --git a/crates/forky/forky_play/test/maze/ball.rs b/crates/forky_play/test/maze/ball.rs similarity index 100% rename from crates/forky/forky_play/test/maze/ball.rs rename to crates/forky_play/test/maze/ball.rs diff --git a/crates/forky/forky_play/test/maze/depth_first_backtrace.rs b/crates/forky_play/test/maze/depth_first_backtrace.rs similarity index 100% rename from crates/forky/forky_play/test/maze/depth_first_backtrace.rs rename to crates/forky_play/test/maze/depth_first_backtrace.rs diff --git a/crates/forky/forky_play/test/maze/maze_walls.rs b/crates/forky_play/test/maze/maze_walls.rs similarity index 100% rename from crates/forky/forky_play/test/maze/maze_walls.rs rename to crates/forky_play/test/maze/maze_walls.rs diff --git a/crates/forky/forky_play/test/maze/mod.rs b/crates/forky_play/test/maze/mod.rs similarity index 100% rename from crates/forky/forky_play/test/maze/mod.rs rename to crates/forky_play/test/maze/mod.rs diff --git a/crates/forky/forky_play/test/maze/plugin.rs b/crates/forky_play/test/maze/plugin.rs similarity index 100% rename from crates/forky/forky_play/test/maze/plugin.rs rename to crates/forky_play/test/maze/plugin.rs diff --git a/crates/forky/forky_play/test/maze/rect_maze.rs b/crates/forky_play/test/maze/rect_maze.rs similarity index 100% rename from crates/forky/forky_play/test/maze/rect_maze.rs rename to crates/forky_play/test/maze/rect_maze.rs diff --git a/crates/forky/forky_play/test/misc/boid.rs b/crates/forky_play/test/misc/boid.rs similarity index 100% rename from crates/forky/forky_play/test/misc/boid.rs rename to crates/forky_play/test/misc/boid.rs diff --git a/crates/forky/forky_play/test/misc/ecs.rs b/crates/forky_play/test/misc/ecs.rs similarity index 100% rename from crates/forky/forky_play/test/misc/ecs.rs rename to crates/forky_play/test/misc/ecs.rs diff --git a/crates/forky/forky_play/test/misc/graphics.rs b/crates/forky_play/test/misc/graphics.rs similarity index 100% rename from crates/forky/forky_play/test/misc/graphics.rs rename to crates/forky_play/test/misc/graphics.rs diff --git a/crates/forky/forky_play/test/misc/kaleid.rs b/crates/forky_play/test/misc/kaleid.rs similarity index 100% rename from crates/forky/forky_play/test/misc/kaleid.rs rename to crates/forky_play/test/misc/kaleid.rs diff --git a/crates/forky/forky_play/test/misc/mod.rs b/crates/forky_play/test/misc/mod.rs similarity index 100% rename from crates/forky/forky_play/test/misc/mod.rs rename to crates/forky_play/test/misc/mod.rs diff --git a/crates/forky/forky_play/test/misc/physics.rs b/crates/forky_play/test/misc/physics.rs similarity index 100% rename from crates/forky/forky_play/test/misc/physics.rs rename to crates/forky_play/test/misc/physics.rs diff --git a/crates/forky/forky_play/test/misc/utility.rs b/crates/forky_play/test/misc/utility.rs similarity index 100% rename from crates/forky/forky_play/test/misc/utility.rs rename to crates/forky_play/test/misc/utility.rs diff --git a/crates/forky/forky_play/test/mod.rs b/crates/forky_play/test/mod.rs similarity index 100% rename from crates/forky/forky_play/test/mod.rs rename to crates/forky_play/test/mod.rs diff --git a/crates/forky/forky_play/test/physics/euler_physics.rs b/crates/forky_play/test/physics/euler_physics.rs similarity index 100% rename from crates/forky/forky_play/test/physics/euler_physics.rs rename to crates/forky_play/test/physics/euler_physics.rs diff --git a/crates/forky/forky_play/test/physics/mod.rs b/crates/forky_play/test/physics/mod.rs similarity index 100% rename from crates/forky/forky_play/test/physics/mod.rs rename to crates/forky_play/test/physics/mod.rs diff --git a/crates/forky/forky_play/test/physics/revolute_joint.rs b/crates/forky_play/test/physics/revolute_joint.rs similarity index 100% rename from crates/forky/forky_play/test/physics/revolute_joint.rs rename to crates/forky_play/test/physics/revolute_joint.rs diff --git a/crates/forky/forky_play/test/physics/slerp_joint.rs b/crates/forky_play/test/physics/slerp_joint.rs similarity index 100% rename from crates/forky/forky_play/test/physics/slerp_joint.rs rename to crates/forky_play/test/physics/slerp_joint.rs diff --git a/crates/forky/forky_play/test/spline/catmull_rom.rs b/crates/forky_play/test/spline/catmull_rom.rs similarity index 100% rename from crates/forky/forky_play/test/spline/catmull_rom.rs rename to crates/forky_play/test/spline/catmull_rom.rs diff --git a/crates/forky/forky_play/test/spline/ecs_spline_graph.rs b/crates/forky_play/test/spline/ecs_spline_graph.rs similarity index 100% rename from crates/forky/forky_play/test/spline/ecs_spline_graph.rs rename to crates/forky_play/test/spline/ecs_spline_graph.rs diff --git a/crates/forky/forky_play/test/spline/graph.rs b/crates/forky_play/test/spline/graph.rs similarity index 100% rename from crates/forky/forky_play/test/spline/graph.rs rename to crates/forky_play/test/spline/graph.rs diff --git a/crates/forky/forky_play/test/spline/mod.rs b/crates/forky_play/test/spline/mod.rs similarity index 100% rename from crates/forky/forky_play/test/spline/mod.rs rename to crates/forky_play/test/spline/mod.rs diff --git a/crates/forky/forky_play/test/spline/spline.rs b/crates/forky_play/test/spline/spline.rs similarity index 100% rename from crates/forky/forky_play/test/spline/spline.rs rename to crates/forky_play/test/spline/spline.rs diff --git a/crates/forky/forky_play/test/spline/spline_graph.rs b/crates/forky_play/test/spline/spline_graph.rs similarity index 100% rename from crates/forky/forky_play/test/spline/spline_graph.rs rename to crates/forky_play/test/spline/spline_graph.rs diff --git a/crates/forky/forky_play/test/spline/spline_mesh.rs b/crates/forky_play/test/spline/spline_mesh.rs similarity index 100% rename from crates/forky/forky_play/test/spline/spline_mesh.rs rename to crates/forky_play/test/spline/spline_mesh.rs diff --git a/crates/forky/forky_play/test/spline/spline_mesh_render.rs b/crates/forky_play/test/spline/spline_mesh_render.rs similarity index 100% rename from crates/forky/forky_play/test/spline/spline_mesh_render.rs rename to crates/forky_play/test/spline/spline_mesh_render.rs diff --git a/crates/forky/forky_play/test/spline/spline_physics.rs b/crates/forky_play/test/spline/spline_physics.rs similarity index 100% rename from crates/forky/forky_play/test/spline/spline_physics.rs rename to crates/forky_play/test/spline/spline_physics.rs diff --git a/crates/forky/forky_play/test/spline/spline_physics_render.rs b/crates/forky_play/test/spline/spline_physics_render.rs similarity index 100% rename from crates/forky/forky_play/test/spline/spline_physics_render.rs rename to crates/forky_play/test/spline/spline_physics_render.rs diff --git a/crates/forky/forky_play/test/sweet.rs b/crates/forky_play/test/sweet.rs similarity index 100% rename from crates/forky/forky_play/test/sweet.rs rename to crates/forky_play/test/sweet.rs diff --git a/crates/forky/forky_web/Cargo.toml b/crates/forky_web/Cargo.toml similarity index 100% rename from crates/forky/forky_web/Cargo.toml rename to crates/forky_web/Cargo.toml diff --git a/crates/forky/forky_web/examples/builds.rs b/crates/forky_web/examples/builds.rs similarity index 100% rename from crates/forky/forky_web/examples/builds.rs rename to crates/forky_web/examples/builds.rs diff --git a/crates/forky/forky_web/examples/leptos.rs b/crates/forky_web/examples/leptos.rs similarity index 100% rename from crates/forky/forky_web/examples/leptos.rs rename to crates/forky_web/examples/leptos.rs diff --git a/crates/forky/forky_web/examples/macros.rs b/crates/forky_web/examples/macros.rs similarity index 100% rename from crates/forky/forky_web/examples/macros.rs rename to crates/forky_web/examples/macros.rs diff --git a/crates/forky/forky_web/macros/Cargo.toml b/crates/forky_web/macros/Cargo.toml similarity index 100% rename from crates/forky/forky_web/macros/Cargo.toml rename to crates/forky_web/macros/Cargo.toml diff --git a/crates/forky/forky_web/macros/src/lib.rs b/crates/forky_web/macros/src/lib.rs similarity index 100% rename from crates/forky/forky_web/macros/src/lib.rs rename to crates/forky_web/macros/src/lib.rs diff --git a/crates/forky/forky_web/macros/src/macros/default_attrs_get.rs b/crates/forky_web/macros/src/macros/default_attrs_get.rs similarity index 100% rename from crates/forky/forky_web/macros/src/macros/default_attrs_get.rs rename to crates/forky_web/macros/src/macros/default_attrs_get.rs diff --git a/crates/forky/forky_web/macros/src/macros/default_attrs_set.rs b/crates/forky_web/macros/src/macros/default_attrs_set.rs similarity index 100% rename from crates/forky/forky_web/macros/src/macros/default_attrs_set.rs rename to crates/forky_web/macros/src/macros/default_attrs_set.rs diff --git a/crates/forky/forky_web/macros/src/macros/mod.rs b/crates/forky_web/macros/src/macros/mod.rs similarity index 100% rename from crates/forky/forky_web/macros/src/macros/mod.rs rename to crates/forky_web/macros/src/macros/mod.rs diff --git a/crates/forky/forky_web/src/dom_utils/animation_frame.rs b/crates/forky_web/src/dom_utils/animation_frame.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/animation_frame.rs rename to crates/forky_web/src/dom_utils/animation_frame.rs diff --git a/crates/forky/forky_web/src/dom_utils/context_menu.rs b/crates/forky_web/src/dom_utils/context_menu.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/context_menu.rs rename to crates/forky_web/src/dom_utils/context_menu.rs diff --git a/crates/forky/forky_web/src/dom_utils/document_interaction_listener.rs b/crates/forky_web/src/dom_utils/document_interaction_listener.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/document_interaction_listener.rs rename to crates/forky_web/src/dom_utils/document_interaction_listener.rs diff --git a/crates/forky/forky_web/src/dom_utils/file.rs b/crates/forky_web/src/dom_utils/file.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/file.rs rename to crates/forky_web/src/dom_utils/file.rs diff --git a/crates/forky/forky_web/src/dom_utils/forky_style_g.rs b/crates/forky_web/src/dom_utils/forky_style_g.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/forky_style_g.rs rename to crates/forky_web/src/dom_utils/forky_style_g.rs diff --git a/crates/forky/forky_web/src/dom_utils/future_timeout.rs b/crates/forky_web/src/dom_utils/future_timeout.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/future_timeout.rs rename to crates/forky_web/src/dom_utils/future_timeout.rs diff --git a/crates/forky/forky_web/src/dom_utils/history.rs b/crates/forky_web/src/dom_utils/history.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/history.rs rename to crates/forky_web/src/dom_utils/history.rs diff --git a/crates/forky/forky_web/src/dom_utils/html_event_listener.rs b/crates/forky_web/src/dom_utils/html_event_listener.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/html_event_listener.rs rename to crates/forky_web/src/dom_utils/html_event_listener.rs diff --git a/crates/forky/forky_web/src/dom_utils/html_event_waiter.rs b/crates/forky_web/src/dom_utils/html_event_waiter.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/html_event_waiter.rs rename to crates/forky_web/src/dom_utils/html_event_waiter.rs diff --git a/crates/forky/forky_web/src/dom_utils/interval.rs b/crates/forky_web/src/dom_utils/interval.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/interval.rs rename to crates/forky_web/src/dom_utils/interval.rs diff --git a/crates/forky/forky_web/src/dom_utils/lifecycle.rs b/crates/forky_web/src/dom_utils/lifecycle.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/lifecycle.rs rename to crates/forky_web/src/dom_utils/lifecycle.rs diff --git a/crates/forky/forky_web/src/dom_utils/location.rs b/crates/forky_web/src/dom_utils/location.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/location.rs rename to crates/forky_web/src/dom_utils/location.rs diff --git a/crates/forky/forky_web/src/dom_utils/loop_utils.rs b/crates/forky_web/src/dom_utils/loop_utils.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/loop_utils.rs rename to crates/forky_web/src/dom_utils/loop_utils.rs diff --git a/crates/forky/forky_web/src/dom_utils/mod.rs b/crates/forky_web/src/dom_utils/mod.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/mod.rs rename to crates/forky_web/src/dom_utils/mod.rs diff --git a/crates/forky/forky_web/src/dom_utils/poll.rs b/crates/forky_web/src/dom_utils/poll.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/poll.rs rename to crates/forky_web/src/dom_utils/poll.rs diff --git a/crates/forky/forky_web/src/dom_utils/resize_listener.rs b/crates/forky_web/src/dom_utils/resize_listener.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/resize_listener.rs rename to crates/forky_web/src/dom_utils/resize_listener.rs diff --git a/crates/forky/forky_web/src/dom_utils/search_params.rs b/crates/forky_web/src/dom_utils/search_params.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/search_params.rs rename to crates/forky_web/src/dom_utils/search_params.rs diff --git a/crates/forky/forky_web/src/dom_utils/utils.rs b/crates/forky_web/src/dom_utils/utils.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils/utils.rs rename to crates/forky_web/src/dom_utils/utils.rs diff --git a/crates/forky/forky_web/src/dom_utils_leptos/bevy_canvas.rs b/crates/forky_web/src/dom_utils_leptos/bevy_canvas.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils_leptos/bevy_canvas.rs rename to crates/forky_web/src/dom_utils_leptos/bevy_canvas.rs diff --git a/crates/forky/forky_web/src/dom_utils_leptos/html_element_ext.rs b/crates/forky_web/src/dom_utils_leptos/html_element_ext.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils_leptos/html_element_ext.rs rename to crates/forky_web/src/dom_utils_leptos/html_element_ext.rs diff --git a/crates/forky/forky_web/src/dom_utils_leptos/mod.rs b/crates/forky_web/src/dom_utils_leptos/mod.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils_leptos/mod.rs rename to crates/forky_web/src/dom_utils_leptos/mod.rs diff --git a/crates/forky/forky_web/src/dom_utils_leptos/mount.rs b/crates/forky_web/src/dom_utils_leptos/mount.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils_leptos/mount.rs rename to crates/forky_web/src/dom_utils_leptos/mount.rs diff --git a/crates/forky/forky_web/src/dom_utils_leptos/resizable_canvas.rs b/crates/forky_web/src/dom_utils_leptos/resizable_canvas.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils_leptos/resizable_canvas.rs rename to crates/forky_web/src/dom_utils_leptos/resizable_canvas.rs diff --git a/crates/forky/forky_web/src/dom_utils_leptos/signals.rs b/crates/forky_web/src/dom_utils_leptos/signals.rs similarity index 100% rename from crates/forky/forky_web/src/dom_utils_leptos/signals.rs rename to crates/forky_web/src/dom_utils_leptos/signals.rs diff --git a/crates/forky/forky_web/src/extensions/array.rs b/crates/forky_web/src/extensions/array.rs similarity index 100% rename from crates/forky/forky_web/src/extensions/array.rs rename to crates/forky_web/src/extensions/array.rs diff --git a/crates/forky/forky_web/src/extensions/closure.rs b/crates/forky_web/src/extensions/closure.rs similarity index 100% rename from crates/forky/forky_web/src/extensions/closure.rs rename to crates/forky_web/src/extensions/closure.rs diff --git a/crates/forky/forky_web/src/extensions/document.rs b/crates/forky_web/src/extensions/document.rs similarity index 100% rename from crates/forky/forky_web/src/extensions/document.rs rename to crates/forky_web/src/extensions/document.rs diff --git a/crates/forky/forky_web/src/extensions/element.rs b/crates/forky_web/src/extensions/element.rs similarity index 100% rename from crates/forky/forky_web/src/extensions/element.rs rename to crates/forky_web/src/extensions/element.rs diff --git a/crates/forky/forky_web/src/extensions/iframe.rs b/crates/forky_web/src/extensions/iframe.rs similarity index 100% rename from crates/forky/forky_web/src/extensions/iframe.rs rename to crates/forky_web/src/extensions/iframe.rs diff --git a/crates/forky/forky_web/src/extensions/mod.rs b/crates/forky_web/src/extensions/mod.rs similarity index 100% rename from crates/forky/forky_web/src/extensions/mod.rs rename to crates/forky_web/src/extensions/mod.rs diff --git a/crates/forky/forky_web/src/extensions/response.rs b/crates/forky_web/src/extensions/response.rs similarity index 100% rename from crates/forky/forky_web/src/extensions/response.rs rename to crates/forky_web/src/extensions/response.rs diff --git a/crates/forky/forky_web/src/extensions/result.rs b/crates/forky_web/src/extensions/result.rs similarity index 100% rename from crates/forky/forky_web/src/extensions/result.rs rename to crates/forky_web/src/extensions/result.rs diff --git a/crates/forky/forky_web/src/lib.rs b/crates/forky_web/src/lib.rs similarity index 100% rename from crates/forky/forky_web/src/lib.rs rename to crates/forky_web/src/lib.rs diff --git a/crates/forky/forky_web/src/logging/log_buffer.rs b/crates/forky_web/src/logging/log_buffer.rs similarity index 100% rename from crates/forky/forky_web/src/logging/log_buffer.rs rename to crates/forky_web/src/logging/log_buffer.rs diff --git a/crates/forky/forky_web/src/logging/log_filter.rs b/crates/forky_web/src/logging/log_filter.rs similarity index 100% rename from crates/forky/forky_web/src/logging/log_filter.rs rename to crates/forky_web/src/logging/log_filter.rs diff --git a/crates/forky/forky_web/src/logging/mod.rs b/crates/forky_web/src/logging/mod.rs similarity index 100% rename from crates/forky/forky_web/src/logging/mod.rs rename to crates/forky_web/src/logging/mod.rs diff --git a/crates/forky/forky_web/src/logging/replace_func.rs b/crates/forky_web/src/logging/replace_func.rs similarity index 100% rename from crates/forky/forky_web/src/logging/replace_func.rs rename to crates/forky_web/src/logging/replace_func.rs diff --git a/crates/forky/forky_web/src/logging/set_panic_hook.rs b/crates/forky_web/src/logging/set_panic_hook.rs similarity index 100% rename from crates/forky/forky_web/src/logging/set_panic_hook.rs rename to crates/forky_web/src/logging/set_panic_hook.rs diff --git a/crates/forky/forky_web/src/net/fetch.rs b/crates/forky_web/src/net/fetch.rs similarity index 100% rename from crates/forky/forky_web/src/net/fetch.rs rename to crates/forky_web/src/net/fetch.rs diff --git a/crates/forky/forky_web/src/net/mod.rs b/crates/forky_web/src/net/mod.rs similarity index 100% rename from crates/forky/forky_web/src/net/mod.rs rename to crates/forky_web/src/net/mod.rs diff --git a/crates/forky/forky_web/src/style/index.css b/crates/forky_web/src/style/index.css similarity index 100% rename from crates/forky/forky_web/src/style/index.css rename to crates/forky_web/src/style/index.css diff --git a/crates/forky/forky_web/src/style/mod.rs b/crates/forky_web/src/style/mod.rs similarity index 100% rename from crates/forky/forky_web/src/style/mod.rs rename to crates/forky_web/src/style/mod.rs diff --git a/crates/forky/forky_web/src/ui/mod.rs b/crates/forky_web/src/ui/mod.rs similarity index 100% rename from crates/forky/forky_web/src/ui/mod.rs rename to crates/forky_web/src/ui/mod.rs diff --git a/crates/forky/forky_web/src/ui/not_found.rs b/crates/forky_web/src/ui/not_found.rs similarity index 100% rename from crates/forky/forky_web/src/ui/not_found.rs rename to crates/forky_web/src/ui/not_found.rs diff --git a/crates/forky/forky_web/src/ui/ui_style_g.rs b/crates/forky_web/src/ui/ui_style_g.rs similarity index 100% rename from crates/forky/forky_web/src/ui/ui_style_g.rs rename to crates/forky_web/src/ui/ui_style_g.rs diff --git a/crates/forky/forky_web/test/Cargo.toml b/crates/forky_web/test/Cargo.toml similarity index 100% rename from crates/forky/forky_web/test/Cargo.toml rename to crates/forky_web/test/Cargo.toml diff --git a/crates/forky/forky_web/test/mod.rs b/crates/forky_web/test/mod.rs similarity index 100% rename from crates/forky/forky_web/test/mod.rs rename to crates/forky_web/test/mod.rs diff --git a/crates/forky/forky_web/test/net/fetch.rs b/crates/forky_web/test/net/fetch.rs similarity index 100% rename from crates/forky/forky_web/test/net/fetch.rs rename to crates/forky_web/test/net/fetch.rs diff --git a/crates/forky/forky_web/test/net/future_timeout.rs b/crates/forky_web/test/net/future_timeout.rs similarity index 100% rename from crates/forky/forky_web/test/net/future_timeout.rs rename to crates/forky_web/test/net/future_timeout.rs diff --git a/crates/forky/forky_web/test/net/html_event_waiter.rs b/crates/forky_web/test/net/html_event_waiter.rs similarity index 100% rename from crates/forky/forky_web/test/net/html_event_waiter.rs rename to crates/forky_web/test/net/html_event_waiter.rs diff --git a/crates/forky/forky_web/test/net/mod.rs b/crates/forky_web/test/net/mod.rs similarity index 100% rename from crates/forky/forky_web/test/net/mod.rs rename to crates/forky_web/test/net/mod.rs diff --git a/crates/forky/forky_web/test/sweet_wasm.rs b/crates/forky_web/test/sweet_wasm.rs similarity index 100% rename from crates/forky/forky_web/test/sweet_wasm.rs rename to crates/forky_web/test/sweet_wasm.rs diff --git a/crates/forky/forky_web/test/ui/document.rs b/crates/forky_web/test/ui/document.rs similarity index 100% rename from crates/forky/forky_web/test/ui/document.rs rename to crates/forky_web/test/ui/document.rs diff --git a/crates/forky/forky_web/test/ui/mod.rs b/crates/forky_web/test/ui/mod.rs similarity index 100% rename from crates/forky/forky_web/test/ui/mod.rs rename to crates/forky_web/test/ui/mod.rs diff --git a/crates/forky/forky_xr/Cargo.toml b/crates/forky_xr/Cargo.toml similarity index 100% rename from crates/forky/forky_xr/Cargo.toml rename to crates/forky_xr/Cargo.toml diff --git a/crates/forky/forky_xr/src/lib.rs b/crates/forky_xr/src/lib.rs similarity index 100% rename from crates/forky/forky_xr/src/lib.rs rename to crates/forky_xr/src/lib.rs diff --git a/crates/forky/forky_xr/test/mod.rs b/crates/forky_xr/test/mod.rs similarity index 100% rename from crates/forky/forky_xr/test/mod.rs rename to crates/forky_xr/test/mod.rs diff --git a/crates/sweet/Cargo.toml b/crates/sweet/Cargo.toml deleted file mode 100644 index ca9c6c7e..00000000 --- a/crates/sweet/Cargo.toml +++ /dev/null @@ -1,84 +0,0 @@ -[package] -name = "sweet" -version = { workspace = true } -edition = { workspace = true } -authors = { workspace = true } -license = { workspace = true } -repository = { workspace = true } -readme = "README.md" -description = "A very pretty test runner for rust" -documentation = "https://mrchantey.github.io/forky/docs/sweet" -categories = ["development-tools::testing"] -keywords = [ # 5 at most - "test", - "unit", - "e2e", - "browser", - "webdriver", -] - -[features] -bevy = ["dep:bevy"] - -[dependencies] -### internal ### -forky_core = { workspace = true } -sweet_macros = { workspace = true } - -### misc ### -anyhow = { workspace = true } -getrandom = { workspace = true } -inventory = { workspace = true } -extend = { workspace = true } -flume = { workspace = true } - -### console ### -log = { workspace = true } -pretty_env_logger = { workspace = true } -colorize = { workspace = true } -backtrace = { workspace = true } - -### parse ### -serde = { workspace = true } -serde_json = { workspace = true } -glob = { workspace = true } - -### async ### -rayon = { workspace = true } -futures = { workspace = true } - -### bevy ### -bevy = { workspace = true, optional = true } - -[target.'cfg(target_arch = "wasm32")'.dependencies] -console_log = { workspace = true } -forky_web = { workspace = true } -js-sys = { workspace = true } -wasm-bindgen = { workspace = true } -wasm-bindgen-futures = { workspace = true } -web-sys = { workspace = true } -leptos = { workspace = true } -leptos_router = { workspace = true } - -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] -tokio = { workspace = true } -clap = { workspace = true } -forky_fs = { workspace = true } -crossterm = { workspace = true } -gag = { workspace = true } - -[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -forky_fs = { workspace = true } -fantoccini = { workspace = true } - - -[[example]] -name = "test_sweet" -path = "test/sweet.rs" -required-features = ["bevy"] - -[[example]] -name = "test_sweet_wasm" -path = "test/sweet_wasm.rs" -# cant currently cicd windows wasm bevy -# required-features = ["bevy"] diff --git a/crates/sweet/README.md b/crates/sweet/README.md deleted file mode 100644 index 058e4bea..00000000 --- a/crates/sweet/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# Sweet - -
- -

- Declarative full-stack test framework. -

- -

- Crates.io version - Download - docs.rs docs -

- -

- Book - | - API Docs - | - Contributing -

- - made with ā¤ļøā€šŸ”„ by mrchantey -
- -## 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) \ No newline at end of file diff --git a/crates/sweet/cli/Cargo.toml b/crates/sweet/cli/Cargo.toml deleted file mode 100644 index 7defb9db..00000000 --- a/crates/sweet/cli/Cargo.toml +++ /dev/null @@ -1,61 +0,0 @@ -[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", -] - -[[bin]] -name = "sweet" -path = "src/main.rs" - -# [dependencies] -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] # specify os for rust analyzer -anyhow = { workspace = true } -extend = { workspace = true } - -## async -futures = { workspace = true } -rayon = { workspace = true } -tokio = { workspace = true } - -## forky -forky_core = { workspace = true } -forky_fs = { workspace = true } -forky_cli = { workspace = true } -## fs -glob = { workspace = true } -## cli -clap = { workspace = true } -colorize = { workspace = true } -## style -cssparser = { workspace = true } - -## serve -axum = { workspace = true } -axum-server = { workspace = true } -hyper = { workspace = true } -tower = { workspace = true } -tower-http = { workspace = true } -tower-livereload = { workspace = true } - -## sweet -fantoccini = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -sweet = { workspace = true } - -# [dev-dependencies] -# sweet = { workspace = true } diff --git a/crates/sweet/cli/README.md b/crates/sweet/cli/README.md deleted file mode 100644 index afc2a7b4..00000000 --- a/crates/sweet/cli/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# Sweet CLI - -
- -

- Cli for the sweet test framework. -

- -

- Crates.io version - Download - docs.rs docs -

- -

- Book - | - Contributing -

- - made with ā¤ļøā€šŸ”„ by mrchantey -
- -## Usage - -``` -sweet --example my_example -``` \ No newline at end of file diff --git a/crates/sweet/cli/examples/cli.rs b/crates/sweet/cli/examples/cli.rs deleted file mode 100644 index 1ead74c2..00000000 --- a/crates/sweet/cli/examples/cli.rs +++ /dev/null @@ -1,4 +0,0 @@ -use forky_fs::*; -use ::sweet_cli::*; - -fn main() -> anyhow::Result<()> { SweetCommand.run_with_cli_args() } diff --git a/crates/sweet/cli/src/lib.rs b/crates/sweet/cli/src/lib.rs deleted file mode 100644 index c042355d..00000000 --- a/crates/sweet/cli/src/lib.rs +++ /dev/null @@ -1,3 +0,0 @@ -#![feature(async_closure,let_chains)] -pub mod sweet_cli; -pub use sweet_cli::*; diff --git a/crates/sweet/cli/src/main.rs b/crates/sweet/cli/src/main.rs deleted file mode 100644 index 1ead74c2..00000000 --- a/crates/sweet/cli/src/main.rs +++ /dev/null @@ -1,4 +0,0 @@ -use forky_fs::*; -use ::sweet_cli::*; - -fn main() -> anyhow::Result<()> { SweetCommand.run_with_cli_args() } diff --git a/crates/sweet/cli/src/sweet_cli/build_wasm.rs b/crates/sweet/cli/src/sweet_cli/build_wasm.rs deleted file mode 100644 index 67db9640..00000000 --- a/crates/sweet/cli/src/sweet_cli/build_wasm.rs +++ /dev/null @@ -1,120 +0,0 @@ -use super::*; -use anyhow::Result; -use anyhow::bail; -use colorize::*; -use forky_fs::fs::copy_recursive; -use forky_fs::fs::hash_file_to_string; -use forky_fs::process::spawn_command; -use forky_fs::process::ChildExt; -use forky_fs::process::ChildProcessStatus; -use std::path::Path; -use std::process::Child; - -impl SweetCli{ - pub fn build_wasm(&self,should_kill:impl Fn()->bool + Clone) -> Result<()> { - self.copy_static()?; - - match self.cargo_run() - .expect("\nCargo run failed\n") - .wait_killable(should_kill.clone()) { - Ok(ChildProcessStatus::ExitSuccess(_)) => {} - other => { - bail!("sweet cli: cargo run failed: {:?}", other); - } - } - - match self.wasm_bingen() - .expect("\nWasm bindgen failed, try running `cargo install -f wasm-bindgen-cli`\n") - .wait_killable(should_kill.clone()) { - Ok(ChildProcessStatus::ExitSuccess(_)) => {} - other => { - bail!("sweet cli: wasm bindgen failed: {:?}", other); - } - } - self.print_success(); - Ok(()) - } - - - fn print_success(&self) { - let success = "Build succeeded".b_green().bold(); - println!("\n{success}\nServer running at {}\n", self.server.address.to_string_pretty()); - } - - #[rustfmt::skip] - fn cargo_run(&self) -> Result { - - let mut cmd = vec![ - "cargo", "build", - "--target", "wasm32-unknown-unknown", - ]; - - if let Some(package) = &self.package { - cmd.extend(vec!["-p", package]); - }; - if let Some(args) = &self.cargo_args { - cmd.push(args); - }; - - cmd.extend(vec!["--example", &self.example]); - - spawn_command(&cmd) - } - - #[rustfmt::skip] - fn wasm_bingen(&self) -> Result { - let is_release = if let Some(args) = &self.cargo_args { - args.contains("--release") - } else { - false - }; - let mode = if is_release { "release" } else { "debug" }; - let example = &self.example; - let file = format!("target/wasm32-unknown-unknown/{mode}/examples/{example}.wasm"); - let hash = hash_file_to_string(&file)?; - let out_file = format!("sweet-{hash}"); - self.replace_html_hash(&out_file)?; - let cmd = vec![ - "wasm-bindgen", &file, - "--no-typescript", - "--target", "web", - "--out-dir", &self.server.dir, - "--out-name", &out_file, - ]; - spawn_command(&cmd) - } - - fn copy_static(&self) -> Result<()> { - let dst = Path::new(&self.server.dir); - println!("creating target dir {:?}", dst); - // its ok if this fails, doesnt exist yet - std::fs::remove_dir_all(&dst).ok(); - std::fs::create_dir_all(&dst)?; - - if let Some(static_dir) = &self.static_dir { - println!("copying static files from {:?}", static_dir); - copy_recursive(static_dir, dst)?; - } - - // this will overwrite the static index.html if it exists - std::fs::write( - dst.join("index.html"), - include_bytes!("html___/index.html"), - )?; - std::fs::write( - dst.join("sweet-style.css"), - include_bytes!("html___/sweet-style.css"), - )?; - - - Ok(()) - } - - fn replace_html_hash(&self, name: &str) -> Result<()> { - let file = Path::new(&self.server.dir).join("index.html"); - let html = std::fs::read_to_string(&file)?; - let html = html.replace("__BINDGEN_FILE__", name); - std::fs::write(&file, &html)?; - Ok(()) - } -} \ No newline at end of file diff --git a/crates/sweet/cli/src/sweet_cli/command.rs b/crates/sweet/cli/src/sweet_cli/command.rs deleted file mode 100644 index bd3c08a9..00000000 --- a/crates/sweet/cli/src/sweet_cli/command.rs +++ /dev/null @@ -1,115 +0,0 @@ -use super::*; -use clap::Arg; -use clap::ArgAction; -use clap::Command; -use forky_fs::Subcommand; - -pub struct SweetCommand; - -const ABOUT: &str = "build, serve & run tests in-browser"; - -impl Subcommand for SweetCommand { - fn name(&self) -> &'static str { "sweet" } - fn about(&self) -> &'static str { ABOUT } - fn append_command(&self, command: Command) -> Command { - command - .arg( - Arg::new("match") - .help( - "filter suites by path glob, ie `my_test` or `/e2e/`", - ) - .required(false) - .action(ArgAction::Append), - ) - .arg( - Arg::new("example") - .help("pass the --example flag to cargo run") - .required(true) - .short('e') - // .default_value("test") - .long("example"), - ) - .arg( - Arg::new("package") - .help("pass the --package flag to cargo run") - .required(false) - .short('p') - .long("package"), - ) - .arg( - Arg::new("cargo") - .help("any additional args for cargo run") - .required(false) - .long("cargo"), - ) - .arg( - Arg::new("bindgen") - .help("any additional args for wasm-bindgen") - .required(false) - .long("bindgen"), - ) - .arg( - Arg::new("secure") - .required(false) - .help("run the dev server with https") - .long("secure") - .action(ArgAction::SetTrue), - ) - .arg( - Arg::new("static") - .required(false) - .help("directory for static files (ie .css) used by component tests") - .long("static") - .action(ArgAction::Set), - ) - .arg( - Arg::new("watch") - .required(false) - .help("live reload file changes") - .short('w') - .long("watch") - .action(ArgAction::SetTrue), - ) - .arg( - Arg::new("headed") - .required(false) - .help("run the tests with a visible browser window") - .long("headed") - .action(ArgAction::SetTrue), - ) - .arg( - Arg::new("interactive") - .required(false) - .help("run the server continuously for viewing in your browser") - .short('i') - .long("interactive") - .action(ArgAction::SetTrue), - ) - } - fn run(&self, args: &clap::ArgMatches) -> anyhow::Result<()> { - let mut cli = SweetCli::default(); - cli.matches = args - .get_many::("match") - .unwrap_or_default() - .map(|s| s.clone()) - .collect::>(); - - cli.example = args.get_one::("example").cloned().unwrap(); - cli.bindgen_args = args.get_one::("bindgen").cloned(); - cli.cargo_args = args.get_one::("cargo").cloned(); - cli.package = args.get_one::("package").cloned(); - cli.static_dir = args.get_one::("static").cloned(); - cli.server.address.secure = args.get_flag("secure"); - cli.watch = args.get_flag("watch"); - - cli.run_tests_mode = if args.get_flag("interactive") { - None - } else if args.get_flag("headed") { - Some(RunTestsMode::Headed) - } else { - Some(RunTestsMode::Headless) - }; - - cli.run() - } -} diff --git a/crates/sweet/cli/src/sweet_cli/html___/index.html b/crates/sweet/cli/src/sweet_cli/html___/index.html deleted file mode 100644 index 6e5c0997..00000000 --- a/crates/sweet/cli/src/sweet_cli/html___/index.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/crates/sweet/cli/src/sweet_cli/html___/sweet-style.css b/crates/sweet/cli/src/sweet_cli/html___/sweet-style.css deleted file mode 100644 index 82cf805e..00000000 --- a/crates/sweet/cli/src/sweet_cli/html___/sweet-style.css +++ /dev/null @@ -1 +0,0 @@ -body{width:100%;min-width:100vw;height:100%;min-height:100vh;margin:0;font-family:Roboto,sans-serif;overflow:hidden}canvas{background-color:#00008b;width:100%;height:100%}.flex-col{flex-direction:column;width:100%;height:100%;display:flex}.flex-row{flex-direction:row;width:100%;height:100%;display:flex}.center-parent{flex-direction:column;justify-content:center;align-items:center;width:100%;height:100%;display:flex}.button-like{cursor:pointer;padding:.3em}.button-like:hover{background-color:#444}.hidden{display:none}:root{--surface:#eee;--on-surface:#222}@media (prefers-color-scheme:dark){:root{--surface:#222;--on-surface:#eee}}.sweet-suite{font-weight:700;text-decoration:none}.sweet-contents{color:#eee;background-color:#333;width:20em;min-width:20em;max-width:20em;padding:1em}.sweet-root{flex-direction:row;width:100%;height:100%;display:flex}.iframe-container{color:var(--on-surface);background-color:var(--surface);width:100%;height:100%}iframe{background:0 0;width:100%;height:100%}a{color:inherit} \ No newline at end of file diff --git a/crates/sweet/cli/src/sweet_cli/mod.rs b/crates/sweet/cli/src/sweet_cli/mod.rs deleted file mode 100644 index 5aa74099..00000000 --- a/crates/sweet/cli/src/sweet_cli/mod.rs +++ /dev/null @@ -1,15 +0,0 @@ -pub mod build_wasm; -#[allow(unused_imports)] -pub use self::build_wasm::*; -pub mod command; -#[allow(unused_imports)] -pub use self::command::*; -pub mod run; -#[allow(unused_imports)] -pub use self::run::*; -pub mod run_tests; -#[allow(unused_imports)] -pub use self::run_tests::*; -pub mod sweet_cli; -#[allow(unused_imports)] -pub use self::sweet_cli::*; diff --git a/crates/sweet/cli/src/sweet_cli/run.rs b/crates/sweet/cli/src/sweet_cli/run.rs deleted file mode 100644 index 5b638430..00000000 --- a/crates/sweet/cli/src/sweet_cli/run.rs +++ /dev/null @@ -1,128 +0,0 @@ -use super::*; -use anyhow::anyhow; -use anyhow::Error; -use anyhow::Result; -use forky_fs::terminal; -use forky_fs::FsWatcher; -use std::sync::Arc; -use std::sync::Mutex; -use std::thread::JoinHandle; -use std::time::Duration; -use tower_livereload::LiveReloadLayer; -// use tower_livereload::Reloader; - -pub type AnyhowJoinHandle = JoinHandle>; - -impl SweetCli { - #[tokio::main] - pub async fn run(&self) -> Result<()> { - if self.run_tests_mode.is_some() && !self.watch { - self.run_once().await - } else { - // run in watch mode OR interactive - self.run_forever().await - } - } - - async fn run_once(&self) -> Result<()> { - terminal::print_forky(); - let server = self.server.clone(); - let _server = std::thread::spawn(move || -> Result<()> { - server.serve_with_options(None) - }); - let should_kill = || false; - self.build_wasm(should_kill)?; - let result = self.run_tests(should_kill).await?.unwrap(); - if result.did_fail() { - Err(anyhow!("Tests failed")) - } else { - Ok(()) - } - } - - async fn run_forever(&self) -> Result<()> { - terminal::clear(); - terminal::print_forky(); - let server = self.server.clone(); - let livereload = LiveReloadLayer::new(); - let reload = livereload.reloader(); - let _server_handle = std::thread::spawn(move || -> Result<()> { - println!( - "Starting server at {}\n", - server.address.to_string_pretty() - ); - server.serve_with_reload(livereload) - }); - // let _static_handle = self.watch_static_forever(reload.clone()); - - - let kill = Arc::new(Mutex::new(())); - let kill2 = kill.clone(); - let should_kill = move || -> bool { kill2.try_lock().is_ok() }; - - loop { - let change_listener = self.get_change_listener(kill.clone()); - - if let Err(err) = self.build_wasm(should_kill.clone()) { - eprintln!("sweet cli - wasm-bingden command failed: {:?}", err); - } else { - reload.reload(); - if self.run_tests_mode.is_some() { - let _ = self.run_tests(should_kill.clone()).await?; - } - } - //only joins in watch mode, otherwise block forever - change_listener.join().unwrap()?; - } - } - - // fn watch_static_forever( - // &self, - // reload: Reloader, - // ) -> JoinHandle> { - // let watch_str = format!("{}/**", &self.server.dir); - // println!("\nwatching server dir: {}\n", &watch_str); - // std::thread::spawn(move || -> Result<()> { - // FsWatcher::default() - // .with_run_on_start(false) - // .with_quiet(true) - // // .with_watch(&watch_str) - // .watch(|_| { - // std::thread::sleep(Duration::from_millis(100)); - // reload.reload(); - // println!("Server dir change detected, reloading"); - // Ok(()) - // }) - // }) - // } - - fn get_change_listener(&self, kill: Arc>) -> AnyhowJoinHandle { - let kill2 = kill.clone(); - let listener = if self.watch { - std::thread::spawn(move || -> Result<()> { - let kill_lock = kill2.lock().unwrap(); - FsWatcher::default() - .with_watch("**/*.rs") - // .with_watch(&format!("{}/**", &self.server.dir)) - .with_ignore("**/target/**") - .block()?; - drop(kill_lock); - Ok(()) - }) - } else { - // otherwise lock mutex and loop forever - std::thread::spawn(move || -> Result<()> { - let _kill_lock = kill2.lock().unwrap(); - loop { - //TODO use condvar - std::thread::sleep(Duration::from_secs(1)) - } - }) - }; - //wait for lock - while kill.try_lock().is_ok() { - std::thread::sleep(Duration::from_millis(100)) - } - listener - } -} diff --git a/crates/sweet/cli/src/sweet_cli/run_tests.rs b/crates/sweet/cli/src/sweet_cli/run_tests.rs deleted file mode 100644 index d09ad031..00000000 --- a/crates/sweet/cli/src/sweet_cli/run_tests.rs +++ /dev/null @@ -1,121 +0,0 @@ -use super::*; -use anyhow::Result; -use fantoccini::Client; -use fantoccini::ClientBuilder; -use forky_core::OptionTExt; -use forky_fs::retry_async; -use serde::de::DeserializeOwned; -use std::process::Command; -use std::time::Duration; -use std::time::Instant; -use sweet::test_runner::TestRunnerResult; -use sweet::test_suite::SuiteResult; - - -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum RunTestsMode { - Headless, - Headed, -} - -const WEBDRIVER_PORT: u16 = 7780; -const WEBDRIVER_CONNECT_TIMEOUT: Duration = Duration::from_secs(5); - - -async fn get_client(mode: RunTestsMode) -> Result { - let client = retry_async( - async || -> Result { - let cap = if mode == RunTestsMode::Headed { - fantoccini::wd::Capabilities::default() - } else { - serde_json::from_str( - r#"{"browserName":"chrome","goog:chromeOptions":{"args":["--headless"]}}"#, - ) - .unwrap() - }; - let client = ClientBuilder::native() - .capabilities(cap) - .connect(&format!("http://localhost:{WEBDRIVER_PORT}")) - .await?; - Ok(client) - }, - WEBDRIVER_CONNECT_TIMEOUT, - ) - .await - .expect("Error - could not connect to chromedriver\n"); - Ok(client) -} - -impl SweetCli { - pub async fn run_tests( - &self, - should_kill: impl Fn() -> bool, - ) -> Result> { - let mode = self.run_tests_mode.unwrap_or(RunTestsMode::Headless); - - - let mut chromedriver = Command::new("chromedriver") - .args(["--silent", &format!("--port={WEBDRIVER_PORT}")]) - .spawn() - .expect( - "\nError - failed to run chromedriver, is it installed and on path?\n", - ); - - let matches = self - .matches - .iter() - .map(|m| format!("m={}", m)) - .collect::>() - .join("&"); - - let address = format!("{}?silent=true&{matches}", self.server.address); - - let client = get_client(mode).await?; - - client.goto(&address).await?; - - let start_time = Instant::now(); - let mut printed_suites = 0; - - let result = loop { - if should_kill() { - break None; - } - if let Ok(results) = try_get_global::>( - &client, - "_sweet_result_suite", - ) - .await - { - while results.len() > printed_suites { - println!("{}", results[printed_suites].end_str()); - printed_suites += 1; - } - } - if let Ok(result) = try_get_global::( - &client, - "_sweet_result_total", - ) - .await - { - println!("{}", result.end_str(start_time.elapsed())); - break Some(result); - } - std::thread::sleep(Duration::from_millis(10)); - }; - client.close().await?; - chromedriver.kill()?; - Ok(result) - } -} - -async fn try_get_global( - c: &Client, - prop_name: &str, -) -> Result { - let func_body = format!("return window.{}", prop_name); - let value = c.execute(&func_body, Vec::new()).await?; - let value = value.as_str().ok()?; - let value = serde_json::from_str::(value)?; - Ok(value) -} diff --git a/crates/sweet/cli/src/sweet_cli/sweet_cli.rs b/crates/sweet/cli/src/sweet_cli/sweet_cli.rs deleted file mode 100644 index 7ebd2a94..00000000 --- a/crates/sweet/cli/src/sweet_cli/sweet_cli.rs +++ /dev/null @@ -1,58 +0,0 @@ -use super::*; -use forky_cli::server::*; -use std::fmt::Display; - -#[derive(Debug, Clone)] -pub struct SweetCli { - pub bindgen_args: Option, - pub cargo_args: Option, - pub example: String, - pub matches: Vec, - pub package: Option, - pub run_tests_mode: Option, - pub server: Server, - pub static_dir: Option, - pub watch: bool, -} - - -impl SweetCli { - pub fn should_run_once(&self) -> bool { - self.run_tests_mode.is_some() && !self.watch - } - pub fn set_package(&mut self, package: String) -> &mut Self { - self.package = Some(package); - self - } -} - -impl Default for SweetCli { - fn default() -> Self { - Self { - bindgen_args: None, - cargo_args: None, - example: "sweet".to_string(), - matches: Vec::new(), - package: None, - run_tests_mode: None, - server: Server { - quiet: true, - proxy: true, - dir: "target/sweet".to_string(), - ..Server::default() - }, - static_dir: None, - watch: true, - } - } -} - -impl Display for SweetCli { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - if let Some(package) = &self.package { - //TODO - write!(f, "package: {package}")?; - } - Ok(()) - } -} diff --git a/crates/sweet/examples/fantoccini.rs b/crates/sweet/examples/fantoccini.rs deleted file mode 100644 index a246a597..00000000 --- a/crates/sweet/examples/fantoccini.rs +++ /dev/null @@ -1,35 +0,0 @@ -#![feature(async_closure)] -use anyhow::Result; -use fantoccini::ClientBuilder; -use forky_fs::retry_async; -use std::process::Command; -use std::time::Duration; - -#[tokio::main] -async fn main() -> Result<()> { - let mut chromedriver = - Command::new("chromedriver").args(["--port=9515"]).spawn()?; - let client = retry_async( - async || { - let cap = serde_json::from_str( - r#"{"browserName":"chrome","goog:chromeOptions":{"args":["--headless"]}}"#, - ) - .unwrap(); - - ClientBuilder::native() - .capabilities(cap) - .connect("http://localhost:9515") - .await - }, - Duration::from_secs(1), - ) - .await?; - - client.goto("http://example.com").await?; - let url = client.current_url().await?; - assert!(url.as_ref().contains("example.com")); - - client.close().await?; - chromedriver.kill()?; - Ok(()) -} diff --git a/crates/sweet/examples/macro.rs b/crates/sweet/examples/macro.rs deleted file mode 100644 index 19db1467..00000000 --- a/crates/sweet/examples/macro.rs +++ /dev/null @@ -1,9 +0,0 @@ -pub use sweet::*; - -async fn foo() {} - -sweet! { - it{} - it{foo().await;} - it non_send{foo().await;} -} diff --git a/crates/sweet/examples/macro_attribute.rs b/crates/sweet/examples/macro_attribute.rs deleted file mode 100644 index d6223cdb..00000000 --- a/crates/sweet/examples/macro_attribute.rs +++ /dev/null @@ -1,16 +0,0 @@ -pub use sweet::*; - -#[sweet_test] -fn assert_test() { assert!(true) } -#[sweet_test] -fn result_test() -> anyhow::Result<()> { - expect(true).to_be_true()?; - Ok(()) -} -#[sweet_test] -async fn async_assert_test() { assert!(true) } -#[sweet_test] -async fn async_result_test() -> anyhow::Result<()> { - expect(true).to_be_true()?; - Ok(()) -} diff --git a/crates/sweet/macros/Cargo.toml b/crates/sweet/macros/Cargo.toml deleted file mode 100644 index 343ef092..00000000 --- a/crates/sweet/macros/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -name = "sweet_macros" -version = { workspace = true } -edition = { workspace = true } -authors = { workspace = true } -documentation = { workspace = true } -license = { workspace = true } -readme = "README.md" -description = "macro crate for sweet" -repository = { workspace = true } - -[lib] -proc-macro = true - -[dependencies] -syn = { workspace = true } -quote = { workspace = true } -proc-macro2 = { workspace = true } -anyhow = { workspace = true } \ No newline at end of file diff --git a/crates/sweet/macros/README.md b/crates/sweet/macros/README.md deleted file mode 100644 index f4a8c5c7..00000000 --- a/crates/sweet/macros/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Forky Test - -This is a proc macro crate, please see [sweet](https://crates.io/crates/sweet) for the public crate. \ No newline at end of file diff --git a/crates/sweet/macros/src/lib.rs b/crates/sweet/macros/src/lib.rs deleted file mode 100644 index 58d25198..00000000 --- a/crates/sweet/macros/src/lib.rs +++ /dev/null @@ -1,57 +0,0 @@ -mod macros; -use macros::*; -use proc_macro::TokenStream; -use syn::parse_macro_input; - -/// Mark a function to be ran by the sweet test runner. -/// -/// # Accepted Signatures -/// ```rust -/// -/// #[sweet_test] -/// fn empty() {} -/// -/// #[sweet_test] -/// fn returns_result() -> sweet::Result<()> {} -/// -/// #[sweet_test] -/// async fn is_async() {} -/// -/// ``` -/// -/// -/// # Attributes -/// - `#[sweet_test(skip)]`: Skips the test -/// - `#[sweet_test(only)]`: Skips all other tests in file -/// - `#[sweet_test(e2e)]`: Runs in-browser wasm tests in a seperate process as an iframe -/// - `#[sweet_test(non_send)]`: Always runs the test in the main thread which is required in crates like `bevy` and `fantoccini`. -/// -#[proc_macro_attribute] -pub fn sweet_test(attr: TokenStream, input: TokenStream) -> TokenStream { - TestCaseAttr::parse(attr, input) - .unwrap_or_else(syn::Error::into_compile_error) - .into() -} - - -/// Macro for declaring several tests with less boilerplate. -/// -/// # Example -/// -/// ```rust -/// -/// sweet!{ -/// it "has less boilerplate" { -/// expect(true).to_be_true()?; -/// } -/// test "is an alias for it"{} -/// it skip "wont run"{} -/// it only "will exclude non-onlys in this suite"{} -/// it e2e "(in-browser) runs in the parent process"{} -/// } -/// -/// ``` -#[proc_macro] -pub fn sweet(input: TokenStream) -> TokenStream { - parse_macro_input!(input as SuiteFunc).out -} \ No newline at end of file diff --git a/crates/sweet/macros/src/macros/build_output.rs b/crates/sweet/macros/src/macros/build_output.rs deleted file mode 100644 index 09d80825..00000000 --- a/crates/sweet/macros/src/macros/build_output.rs +++ /dev/null @@ -1,15 +0,0 @@ -use super::*; -use proc_macro2::TokenStream; -use quote::quote; - - -pub fn parse_test_case(func: &TokenStream, flags: &TestCaseFlags) -> TokenStream { - let native = parse_test_case_native(func, flags); - let wasm = parse_test_case_wasm(func, flags); - quote!( - // use sweet::*; //try not to pollute macro? - use sweet::exports::*; - #native - #wasm - ) -} \ No newline at end of file diff --git a/crates/sweet/macros/src/macros/build_output_native.rs b/crates/sweet/macros/src/macros/build_output_native.rs deleted file mode 100644 index 3ad2e05a..00000000 --- a/crates/sweet/macros/src/macros/build_output_native.rs +++ /dev/null @@ -1,59 +0,0 @@ -use super::*; -use proc_macro2::TokenStream; -use quote::quote; - -pub fn parse_test_case_native( - func: &TokenStream, - flags: &TestCaseFlags, -) -> TokenStream { - let config = flags.to_config(); - let func = parse_func_native(func, flags); - // let id = flags.id; - let name = flags.name.clone(); - - quote!( - #[cfg(not(target_arch = "wasm32"))] - inventory::submit!(sweet::native::TestCaseNative { - name: #name, - func: #func, - file: file!(), - config: #config - }); - ) -} - -fn parse_func_native(func: &TokenStream, flags: &TestCaseFlags) -> TokenStream { - let contains_await = contains_await(func); - if contains_await { - if flags.non_send { - quote!(sweet::native::TestCaseNativeFunc::Series(||{ - Box::pin(async { - #func - Ok(()) - }) - })) - } else { - quote!(sweet::native::TestCaseNativeFunc::Parallel(||{ - Box::pin(async { - #func - Ok(()) - }) - })) - } - } else { - quote!(sweet::native::TestCaseNativeFunc::Sync(||{ - #func - Ok(()) - })) - } - - // quote!( - // // #[cfg(not(target_arch = "wasm32"))] - // || { - // Box::pin(async { - // #func - // Ok(()) - // }) - // } - // ) -} diff --git a/crates/sweet/macros/src/macros/build_output_wasm.rs b/crates/sweet/macros/src/macros/build_output_wasm.rs deleted file mode 100644 index 85340fd7..00000000 --- a/crates/sweet/macros/src/macros/build_output_wasm.rs +++ /dev/null @@ -1,58 +0,0 @@ -use super::*; -use proc_macro2::Ident; -// use proc_macro2::Span; -use proc_macro2::TokenStream; -use quote::quote; - -pub fn parse_test_case_wasm( - func: &TokenStream, - flags: &TestCaseFlags, -) -> TokenStream { - let config = flags.to_config(); - let func = parse_func_wasm(func); - let id = flags.id; - let name = flags.name.clone(); - let wasm_export_name = format!("_sweet_{id}"); - let wasm_export_name = Ident::new(&wasm_export_name, name.span()); - - quote!( - #[cfg(target_arch = "wasm32")] - #[wasm_bindgen] - pub fn #wasm_export_name() -> JsValue { - - let config = serde_json::to_string(&#config).unwrap(); - let func: Closure Promise> = Closure::new(#func); - let func = func.into_js_value(); - - sweet::wasm::build_test_case( - &#id.into(), - &#name.into(), - &file!().into(), - &func, - &config.into(), - ) - } - ) -} - -fn parse_func_wasm(func: &TokenStream) -> TokenStream { - quote! { - #[cfg(target_arch = "wasm32")] - {|| -> Promise { - use core::result::Result::{Ok,Err}; - async fn func_async ()->Result<()>{ - #func - Ok(()) - }; - async fn func_to_js()->Result{ - match func_async().await{ - Ok(_)=> Ok(JsValue::NULL), - Err(e)=> Err(e.to_string().into()) - } - } - - future_to_promise(func_to_js()) - } - } - } -} diff --git a/crates/sweet/macros/src/macros/mod.rs b/crates/sweet/macros/src/macros/mod.rs deleted file mode 100644 index e0604144..00000000 --- a/crates/sweet/macros/src/macros/mod.rs +++ /dev/null @@ -1,21 +0,0 @@ -pub mod build_output; -#[allow(unused_imports)] -pub use self::build_output::*; -pub mod build_output_native; -#[allow(unused_imports)] -pub use self::build_output_native::*; -pub mod build_output_wasm; -#[allow(unused_imports)] -pub use self::build_output_wasm::*; -pub mod parse_utils; -#[allow(unused_imports)] -pub use self::parse_utils::*; -pub mod suite_func; -#[allow(unused_imports)] -pub use self::suite_func::*; -pub mod test_case_attr; -#[allow(unused_imports)] -pub use self::test_case_attr::*; -pub mod test_case_flags; -#[allow(unused_imports)] -pub use self::test_case_flags::*; diff --git a/crates/sweet/macros/src/macros/parse_utils.rs b/crates/sweet/macros/src/macros/parse_utils.rs deleted file mode 100644 index a4f2eeb7..00000000 --- a/crates/sweet/macros/src/macros/parse_utils.rs +++ /dev/null @@ -1,86 +0,0 @@ -use proc_macro2::TokenStream; -// use proc_macro2::Literal; -use proc_macro2::TokenTree; -use std::iter::Peekable; -use syn::parse::Parse; -use syn::parse::ParseStream; -use syn::parse::Result; - -pub fn into_peekable( - stream: ParseStream, -) -> Result>> { - let stream = proc_macro2::TokenStream::parse(&stream)?; - Ok(stream.into_iter().peekable()) -} - -pub fn contains_await(stream: &TokenStream) -> bool { - for token in stream.clone().into_iter() { - if let TokenTree::Ident(ident) = token { - if ident.to_string() == "await" { - return true; - } - } - } - false -} - -// pub fn parse_name(iter: &mut Peekable) -> Literal -// where -// I: Iterator, -// { -// let mut name = Literal::string("undefined"); -// if let Some(t) = iter.peek() { -// if let TokenTree::Literal(_lit) = t { -// name = _lit.clone(); -// let _ = iter.next().unwrap(); -// } -// }; -// name -// } -pub fn _try_remove_comma(iter: &mut Peekable) -> bool -where - I: Iterator, -{ - if let Some(t) = iter.peek() { - if let TokenTree::Punct(_punc) = t { - let _ = iter.next().unwrap(); - return true; - } - }; - false -} - -// pub fn parse_error(span: Span, msg: &str) -> TokenStream { -// Error::new(span, msg).to_compile_error() -// } - -// pub fn parse_group(func: &Ident, iter: &mut I) -> TokenStream -// where -// I: Iterator, -// { -// if let Some(t) = iter.next() { -// if let TokenTree::Group(l) = t { -// l.stream() -// } else { -// Error::new(func.span(), "unexpected identifier").to_compile_error() -// } -// } else { -// Error::new(func.span(), "unexpected token").to_compile_error() -// } -// } - -// pub fn append_token_stream(out: &mut Vec, stream: TokenStream) { -// let stream: proc_macro2::TokenStream = stream.into(); -// for item in stream.into_iter() { -// out.push(item); -// } -// } - -// pub fn make_error(span:Span,) - -// pub fn throw(span: Span, msg: &str, vec: &mut Vec) { -// let s = syn::Error::new(span, msg).to_compile_error(); -// for i in s { -// vec.push(i); -// } -// } diff --git a/crates/sweet/macros/src/macros/suite_func.rs b/crates/sweet/macros/src/macros/suite_func.rs deleted file mode 100644 index e2cc7fae..00000000 --- a/crates/sweet/macros/src/macros/suite_func.rs +++ /dev/null @@ -1,71 +0,0 @@ -use super::*; -// use proc_macro2::Span; -use proc_macro2::TokenStream; -use proc_macro2::TokenTree; -use quote::TokenStreamExt; -use std::iter::Peekable; -use syn::parse::Parse; -use syn::parse::ParseStream; -use syn::parse::Result; - - -pub struct SuiteFunc { - pub out: proc_macro::TokenStream, -} - -impl Parse for SuiteFunc { - fn parse(stream: ParseStream) -> syn::parse::Result { - let mut iter = into_peekable(stream)?; - let mut stream = TokenStream::new(); - while let Some(t) = iter.next() { - let t = parse_next(t, &mut iter)?; - stream.append_all(t); - } - let out = stream.into(); - - Ok(Self { out }) - } -} - -fn parse_next( - tree: TokenTree, - iter: &mut Peekable>, -) -> Result { - match tree { - TokenTree::Ident(ident) => { - let i_str = ident.to_string(); - match i_str.as_str() { - "test" | "it" => { - let case_flags = TestCaseFlags::parse(iter)?; - if let Some(func) = iter.next() { - match func { - TokenTree::Group(func) => { - Ok(parse_test_case(&func.stream(), &case_flags)) - } - other => Err(syn::Error::new( - ident.span(), - &format!("Expected block, found {:?}", other), - )), - } - } else { - Err(syn::Error::new(ident.span(), "Expected block")) - } - } - "before" => { - todo!(); - } - "after" => { - todo!(); - } - _ => Err(syn::Error::new( - ident.span(), - &format!("Expected \"test\" or \"it\", found ${:?}", ident), - )), - } - } - _ => Err(syn::Error::new( - tree.span(), - &format!("Expected \"test\" or \"it\", found ${:?}", tree), - )), - } -} diff --git a/crates/sweet/macros/src/macros/test_case_attr.rs b/crates/sweet/macros/src/macros/test_case_attr.rs deleted file mode 100644 index f3ee731c..00000000 --- a/crates/sweet/macros/src/macros/test_case_attr.rs +++ /dev/null @@ -1,49 +0,0 @@ -// use super::*; -use super::parse_test_case; -use super::TestCaseFlags; -use proc_macro2::Literal; -use proc_macro2::TokenStream; -use quote::quote; -use syn::ItemFn; -use syn::ReturnType; - -pub struct TestCaseAttr { - // pub out: TokenStream, -} - -impl TestCaseAttr { - pub fn parse( - attr: proc_macro::TokenStream, - input: proc_macro::TokenStream, - ) -> syn::Result { - let func = syn::parse::(input)?; - - // panic!("Not implemented, maybe never will"); - let func_out = func.clone(); - let ident = func.sig.ident; - let attr: TokenStream = attr.into(); - let mut attr = attr.into_iter().peekable(); - - let mut flags = TestCaseFlags::parse(&mut attr)?; - let name = ident.to_string().replace("_", " "); - flags.name = Literal::string(&name); - - let is_async = func.sig.asyncness.is_some(); - let is_result = func.sig.output != ReturnType::Default; - - let wrapped = match (is_async, is_result) { - (true, true) => quote! {#ident().await?;}, - (true, false) => quote! {#ident().await;}, - (false, true) => quote! {#ident()?;}, - (false, false) => quote! {#ident();}, - }; - - let submit = parse_test_case(&wrapped, &flags); - let out = quote! { - #func_out - #submit - } - .into(); - Ok(out) - } -} diff --git a/crates/sweet/macros/src/macros/test_case_flags.rs b/crates/sweet/macros/src/macros/test_case_flags.rs deleted file mode 100644 index d516b35b..00000000 --- a/crates/sweet/macros/src/macros/test_case_flags.rs +++ /dev/null @@ -1,101 +0,0 @@ -use proc_macro2::Literal; -use proc_macro2::TokenTree; -use quote::quote; -use std::iter::Peekable; -use std::sync::atomic::AtomicUsize; -use std::sync::atomic::Ordering; - - -static CNT: AtomicUsize = AtomicUsize::new(0); - - -#[derive(Debug, Clone)] -pub struct TestCaseFlags { - pub id: usize, - pub name: Literal, - pub skip: bool, - pub only: bool, - pub e2e: bool, - pub non_send: bool, -} - -impl Default for TestCaseFlags { - fn default() -> Self { - Self { - id: CNT.fetch_add(1, Ordering::SeqCst), - name: Literal::string("anonymous"), - skip: false, - only: false, - e2e: false, - non_send: false, - } - } -} - -impl TestCaseFlags { - pub fn to_config(&self) -> proc_macro2::TokenStream { - let skip = self.skip; - let only = self.only; - let context = if self.e2e { - quote!(sweet::test_case::TestRunEnvironment::EndToEnd) - } else { - quote!(sweet::test_case::TestRunEnvironment::Unit) - }; - - quote! {sweet::test_case::TestCaseConfig{ - skip:#skip, - only:#only, - context:#context, - } - } - } - - // TODO this should be handled by syn::Attribute parser - pub fn parse(iter: &mut Peekable) -> syn::parse::Result - where - I: Iterator, - { - let mut flags = TestCaseFlags::default(); - - while let Some(t) = iter.peek() { - match t { - TokenTree::Literal(lit) => { - flags.name = lit.clone(); - // let _ = iter.next().unwrap(); - } - TokenTree::Ident(ident) => { - let i_str = ident.to_string(); - match i_str.as_str() { - "skip" => { - flags.skip = true; - // let _ = iter.next().unwrap(); - } - "only" => { - flags.only = true; - // let _ = iter.next().unwrap(); - } - "e2e" => { - flags.e2e = true; - // let _ = iter.next().unwrap(); - } - "non_send" => { - flags.non_send = true; - } - other => { - return Err(syn::parse::Error::new( - ident.span(), - format!( - "Invalid test flag: {:?}\n Valid flags are: skip, only, e2e, non_send", - other), - )); - } - } - } - TokenTree::Punct(_) => {} - _ => break, - } - let _ = iter.next().unwrap(); - } - Ok(flags) - } -} diff --git a/crates/sweet/src/bevy_matchers/core_app_x.rs b/crates/sweet/src/bevy_matchers/core_app_x.rs deleted file mode 100644 index 5b97af71..00000000 --- a/crates/sweet/src/bevy_matchers/core_app_x.rs +++ /dev/null @@ -1,30 +0,0 @@ -use bevy::prelude::*; -use extend::ext; -use std::time::Duration; - - -#[ext(name=CoreAppExtSweet)] -/// Ease-of-use extensions for `bevy::App` -pub impl App { - /// Insert a [Time] resource - /// - fn insert_time(&mut self) -> &mut Self { - self.insert_resource::