Restructure using a cargo workspace

gaucho-labs · Mar 11, 2024 · 048d82b · 048d82b
1 parent dcddac2
commit 048d82b
Show file tree

Hide file tree

Showing 42 changed files with 1,576 additions and 482 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,31 +1,10 @@
-[package]
-name = "leptos_hotkeys"
-version = "0.1.6"
-edition = "2021"
-description = "A library that declaratively pairs keybindings with callbacks for Leptos applications."
-license = "MIT"
-repository = "http://github.com/friendlymatthew/leptos-hotkeys"
-readme = "README.md"
-authors = [
-    "Matthew Kim <[email protected]>",
-    "Robert Junkins <[email protected]>",
-]
-keywords = ["leptos", "hotkeys", "wasm"]
-
-
-[dependencies]
-leptos = { version = "0.6.5", features = ["nightly"] }
-wasm-bindgen = { version = "0.2.89", optional = true }
-log = "0.4.20"
-cfg-if = { version = "1.0.0", features = [] }
-web-sys = { version = "0.3.66", optional = true }
-
-[lib]
-name = "leptos_hotkeys"
-path = "src/lib.rs"
-
-[features]
-hydrate = ["dep:web-sys", "dep:wasm-bindgen"]
-csr = ["dep:web-sys", "dep:wasm-bindgen"]
-debug = []
-ssr = []
+[workspace]
+members = ["leptos_hotkeys", "examples/demo", "examples/ssr-demo"]
+resolver = "2"
+
+[profile.wasm-release]
+inherits = "release"
+opt-level = "z"
+lto = true
+codegen-units = 1
+panic = "abort"
diff --git a/workspace/demo/.gitignore → examples/demo/.gitignore b/workspace/demo/.gitignore → examples/demo/.gitignore
diff --git a/workspace/demo/Cargo.lock → examples/demo/Cargo.lock b/workspace/demo/Cargo.lock → examples/demo/Cargo.lock
diff --git a/examples/demo/Cargo.toml b/examples/demo/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "demo"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+leptos = { version = "0.6", features = ["csr", "nightly"] }
+console_error_panic_hook = "0.1"
+console_log = "1"
+copy_dir = "0.1"
+leptos_meta = "0.6"
+leptos_router = { version = "0.6", features = ["csr"] }
+log = "0.4"
+leptos_theme = "0.1"
+leptos_hotkeys = { path = "../../leptos_hotkeys", features = ["csr"] }
diff --git a/examples/demo/README.md b/examples/demo/README.md
@@ -0,0 +1,5 @@
+# leptos-hotkeys CSR demo
+
+```sh
+trunk serve --open
+```
diff --git a/workspace/demo/dist/demo-edcae59c146cb5aa.js → examples/demo/dist/demo-58c21fa1bd9b4c2f.js b/workspace/demo/dist/demo-edcae59c146cb5aa.js → examples/demo/dist/demo-58c21fa1bd9b4c2f.js
diff --git a/examples/demo/dist/demo-58c21fa1bd9b4c2f_bg.wasm b/examples/demo/dist/demo-58c21fa1bd9b4c2f_bg.wasm
diff --git a/workspace/demo/dist/index.html → examples/demo/dist/index.html b/workspace/demo/dist/index.html → examples/demo/dist/index.html
@@ -2,7 +2,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>demo</title>
-    <script type="module">import init from '/demo-edcae59c146cb5aa.js';init('/demo-edcae59c146cb5aa_bg.wasm');</script>
+    <script type="module">import init from '/demo-58c21fa1bd9b4c2f.js';init('/demo-58c21fa1bd9b4c2f_bg.wasm');</script>
 
 
     <link rel="stylesheet" href="/output-ca0a674fcde1a78.css">
@@ -56,8 +56,8 @@
         }
     </style>
 
-<link rel="preload" href="/demo-edcae59c146cb5aa_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
-<link rel="modulepreload" href="/demo-edcae59c146cb5aa.js"></head>
+<link rel="preload" href="/demo-58c21fa1bd9b4c2f_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
+<link rel="modulepreload" href="/demo-58c21fa1bd9b4c2f.js"></head>
 <body>
 
 

diff --git a/...pace/demo/dist/output-ca0a674fcde1a78.css → ...ples/demo/dist/output-ca0a674fcde1a78.css b/...pace/demo/dist/output-ca0a674fcde1a78.css → ...ples/demo/dist/output-ca0a674fcde1a78.css
diff --git a/workspace/demo/dist/vercel.json → examples/demo/dist/vercel.json b/workspace/demo/dist/vercel.json → examples/demo/dist/vercel.json
diff --git a/workspace/demo/index.html → examples/demo/index.html b/workspace/demo/index.html → examples/demo/index.html
diff --git a/workspace/demo/input.css → examples/demo/input.css b/workspace/demo/input.css → examples/demo/input.css
diff --git a/workspace/demo/rust-toolchain.toml → examples/demo/rust-toolchain.toml b/workspace/demo/rust-toolchain.toml → examples/demo/rust-toolchain.toml
@@ -1,3 +1,2 @@
-
 [toolchain]
 channel = "nightly"
diff --git a/workspace/demo/src/app.rs → examples/demo/src/app.rs b/workspace/demo/src/app.rs → examples/demo/src/app.rs
diff --git a/workspace/demo/src/main.rs → examples/demo/src/main.rs b/workspace/demo/src/main.rs → examples/demo/src/main.rs
diff --git a/workspace/demo/style/output.css → examples/demo/style/output.css b/workspace/demo/style/output.css → examples/demo/style/output.css
diff --git a/workspace/demo/tailwind.config.js → examples/demo/tailwind.config.js b/workspace/demo/tailwind.config.js → examples/demo/tailwind.config.js
diff --git a/workspace/demo/vercel.json → examples/demo/vercel.json b/workspace/demo/vercel.json → examples/demo/vercel.json
diff --git a/workspace/ssr-demo/.gitignore → examples/ssr-demo/.gitignore b/workspace/ssr-demo/.gitignore → examples/ssr-demo/.gitignore
diff --git a/workspace/ssr-demo/Cargo.lock → examples/ssr-demo/Cargo.lock b/workspace/ssr-demo/Cargo.lock → examples/ssr-demo/Cargo.lock
diff --git a/workspace/ssr-demo/Cargo.toml → examples/ssr-demo/Cargo.toml b/workspace/ssr-demo/Cargo.toml → examples/ssr-demo/Cargo.toml
@@ -16,11 +16,14 @@ leptos_router = { version = "0.6", features = ["nightly"] }
 tokio = { version = "1", features = ["rt-multi-thread"], optional = true }
 tower = { version = "0.4", optional = true }
 tower-http = { version = "0.5", features = ["fs"], optional = true }
-wasm-bindgen = "=0.2.89"
+wasm-bindgen = "=0.2.92"
 thiserror = "1"
 tracing = { version = "0.1", optional = true }
 http = "1"
-leptos_hotkeys = { path = "../..", features = ["hydrate", "debug"] }
+leptos_hotkeys = { path = "../../leptos_hotkeys", features = [
+    "hydrate",
+    "debug"
+] }
 
 [features]
 hydrate = [
@@ -41,74 +44,48 @@ ssr = [
     "dep:tracing",
 ]
 
-# Defines a size-optimized profile for the WASM bundle in release mode
-[profile.wasm-release]
-inherits = "release"
-opt-level = 'z'
-lto = true
-codegen-units = 1
-panic = "abort"
-
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name
 output-name = "ssr-demo"
-
 # The site root folder is where cargo-leptos generate all output. WARNING: all content of this folder will be erased on a rebuild. Use it in your server setup.
 site-root = "target/site"
-
 # The site-root relative folder where all compiled output (JS, WASM and CSS) is written
 # Defaults to pkg
 site-pkg-dir = "pkg"
-
 # [Optional] The source CSS file. If it ends with .sass or .scss then it will be compiled by dart-sass into CSS. The CSS is optimized by Lightning CSS before being written to <site-root>/<site-pkg>/app.css
 style-file = "style/main.scss"
 # Assets source dir. All files found here will be copied and synchronized to site-root.
 # The assets-dir cannot have a sub directory with the same name/path as site-pkg-dir.
 #
 # Optional. Env: LEPTOS_ASSETS_DIR.
 assets-dir = "public"
-
 # The IP and port (ex: 127.0.0.1:3000) where the server serves the content. Use it in your server setup.
 site-addr = "127.0.0.1:3000"
-
 # The port to use for automatic reload monitoring
 reload-port = 3001
-
 # [Optional] Command to use when running end2end tests. It will run in the end2end dir.
 #   [Windows] for non-WSL use "npx.cmd playwright test"
 #   This binary name can be checked in Powershell with Get-Command npx
 end2end-cmd = "npx playwright test"
 end2end-dir = "end2end"
-
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
-watch = false
-
-# The environment Leptos will run in, usually either "DEV" or "PROD"
-env = "DEV"
-
 # The features to use when compiling the bin target
 #
 # Optional. Can be over-ridden with the command line parameter --bin-features
 bin-features = ["ssr"]
-
 # If the --no-default-features flag should be used when compiling the bin target
 #
 # Optional. Defaults to false.
 bin-default-features = false
-
 # The features to use when compiling the lib target
 #
 # Optional. Can be over-ridden with the command line parameter --lib-features
 lib-features = ["hydrate"]
-
 # If the --no-default-features flag should be used when compiling the lib target
 #
 # Optional. Defaults to false.
 lib-default-features = false
-
 # The profile to use for the lib target when compiling for release
 #
 # Optional. Defaults to "release".

diff --git a/examples/ssr-demo/README.md b/examples/ssr-demo/README.md
@@ -0,0 +1,6 @@
+# leptos-hotkeys SSR demo
+
+```sh
+cargo install cargo-leptos
+cargo leptos watch
+```
diff --git a/workspace/ssr-demo/public/favicon.ico → examples/ssr-demo/public/favicon.ico b/workspace/ssr-demo/public/favicon.ico → examples/ssr-demo/public/favicon.ico
diff --git a/workspace/ssr-demo/src/app.rs → examples/ssr-demo/src/app.rs b/workspace/ssr-demo/src/app.rs → examples/ssr-demo/src/app.rs
diff --git a/workspace/ssr-demo/src/error_template.rs → examples/ssr-demo/src/error_template.rs b/workspace/ssr-demo/src/error_template.rs → examples/ssr-demo/src/error_template.rs
diff --git a/workspace/ssr-demo/src/fileserv.rs → examples/ssr-demo/src/fileserv.rs b/workspace/ssr-demo/src/fileserv.rs → examples/ssr-demo/src/fileserv.rs
diff --git a/workspace/ssr-demo/src/lib.rs → examples/ssr-demo/src/lib.rs b/workspace/ssr-demo/src/lib.rs → examples/ssr-demo/src/lib.rs
diff --git a/workspace/ssr-demo/src/main.rs → examples/ssr-demo/src/main.rs b/workspace/ssr-demo/src/main.rs → examples/ssr-demo/src/main.rs
diff --git a/workspace/ssr-demo/style/main.scss → examples/ssr-demo/style/main.scss b/workspace/ssr-demo/style/main.scss → examples/ssr-demo/style/main.scss
diff --git a/leptos_hotkeys/Cargo.toml b/leptos_hotkeys/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "leptos_hotkeys"
+version = "0.1.6"
+edition = "2021"
+description = "A library that declaratively pairs keybindings with callbacks for Leptos applications."
+license = "MIT"
+repository = "http://github.com/friendlymatthew/leptos-hotkeys"
+readme = "README.md"
+authors = [
+    "Matthew Kim <[email protected]>",
+    "Robert Junkins <[email protected]>",
+]
+keywords = ["leptos", "hotkeys", "wasm"]
+
+[dependencies]
+leptos = { version = "0.6.5", features = ["nightly"] }
+wasm-bindgen = { version = "0.2.92", optional = true }
+log = "0.4.20"
+cfg-if = { version = "1.0.0", features = [] }
+web-sys = { version = "0.3.66", optional = true }
+
+[lib]
+name = "leptos_hotkeys"
+path = "src/lib.rs"
+
+[features]
+hydrate = ["dep:web-sys", "dep:wasm-bindgen"]
+csr = ["dep:web-sys", "dep:wasm-bindgen"]
+debug = []
+ssr = []
diff --git a/src/hotkeys_provider.rs → leptos_hotkeys/src/hotkeys_provider.rs b/src/hotkeys_provider.rs → leptos_hotkeys/src/hotkeys_provider.rs
diff --git a/src/lib.rs → leptos_hotkeys/src/lib.rs b/src/lib.rs → leptos_hotkeys/src/lib.rs
diff --git a/src/macros.rs → leptos_hotkeys/src/macros.rs b/src/macros.rs → leptos_hotkeys/src/macros.rs
diff --git a/src/prelude.rs → leptos_hotkeys/src/prelude.rs b/src/prelude.rs → leptos_hotkeys/src/prelude.rs
diff --git a/src/types.rs → leptos_hotkeys/src/types.rs b/src/types.rs → leptos_hotkeys/src/types.rs
diff --git a/src/use_hotkeys.rs → leptos_hotkeys/src/use_hotkeys.rs b/src/use_hotkeys.rs → leptos_hotkeys/src/use_hotkeys.rs
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,2 @@
-
 [toolchain]
 channel = "nightly"
-
diff --git a/workspace/demo/Cargo.toml b/workspace/demo/Cargo.toml
diff --git a/workspace/demo/README.md b/workspace/demo/README.md
diff --git a/workspace/demo/dist/demo-edcae59c146cb5aa_bg.wasm b/workspace/demo/dist/demo-edcae59c146cb5aa_bg.wasm
diff --git a/workspace/ssr-demo/rust-toolchain.toml b/workspace/ssr-demo/rust-toolchain.toml