split package into workspace

.github/workflows/publish.yaml

@@ -31,10 +31,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - run: cargo test && wasm-pack build -t web
+      - run: cargo test && wasm-pack build -t web demo_respo
 
       - run: yarn && yarn vite build --base=./
 
       - uses: katyo/publish-crates@v1
         with:
+          path: respo/
           registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}

.github/workflows/upload.yaml

@@ -33,7 +33,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - run: cargo test && wasm-pack build -t web
+      - run: cargo test && wasm-pack build -t web demo_respo
 
       - run: yarn && yarn vite build --base=./
 

Cargo.toml

@@ -1,48 +1,6 @@
-[package]
-name = "respo"
-version = "0.0.12-a4"
-edition = "2021"
-description = "a tiny virtual DOM library migrated from ClojureScript"
-license = "Apache-2.0"
-repository = "https://github.com/Respo/respo.rs"
-homepage = "http://respo-mvc.org"
-documentation = "https://docs.rs/crate/respo/"
-readme = "README.md"
+[workspace]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-js-sys = "0.3.57"
-wasm-bindgen = "0.2.80"
-console_error_panic_hook = "0.1.7"
-lazy_static = "1.4.0"
-serde = { version = "1.0.137", features = [ "derive" ] }
-serde_json = "1.0.81"
-uuid = { version = "1.1.1", features = [ "v4", "js" ] }
-cirru_parser = "0.1.22"
-rust-hsluv = "0.1.4"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies.web-sys]
-version = "0.3.57"
-features = [
-  "console",
-  'Document',
-  "HtmlHeadElement",
-  'Element',
-  'Window',
-  "HtmlElement",
-  "HtmlInputElement",
-  "MouseEvent",
-  "KeyboardEvent",
-  "InputEvent",
-  "Node",
-  "NodeList",
-  "Element",
-  "HtmlCollection",
-  "CssStyleDeclaration",
-  "FocusEvent",
-  "HtmlLabelElement",
+members = [
+  "respo",
+  "demo_respo",
 ]

demo_respo/Cargo.toml

@@ -0,0 +1,45 @@
+[package]
+name = "demo_respo"
+version = "0.0.1"
+edition = "2021"
+description = "Demo app for Respo"
+license = "Apache-2.0"
+repository = "https://github.com/Respo/respo.rs"
+homepage = "http://respo-mvc.org"
+documentation = "https://docs.rs/crate/respo/"
+readme = "README.md"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+respo = { path = "../respo/" }
+js-sys = "0.3.57"
+wasm-bindgen = "0.2.80"
+console_error_panic_hook = "0.1.7"
+serde = { version = "1.0.137", features = [ "derive" ] }
+uuid = { version = "1.1.1", features = [ "v4", "js" ] }
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies.web-sys]
+version = "0.3.57"
+features = [
+  "console",
+  'Document',
+  "HtmlHeadElement",
+  'Element',
+  'Window',
+  "HtmlElement",
+  "HtmlInputElement",
+  "MouseEvent",
+  "KeyboardEvent",
+  "InputEvent",
+  "Node",
+  "NodeList",
+  "Element",
+  "HtmlCollection",
+  "CssStyleDeclaration",
+  "FocusEvent",
+  "HtmlLabelElement",
+]

src/app.rs → demo_respo/src/app.rs

@@ -13,15 +13,15 @@ use std::{panic, vec};
 use wasm_bindgen::prelude::*;
 use web_sys::Node;
 
-use crate::respo::{div, util::query_select_node, StatesTree};
-use crate::ui::ui_global;
-use crate::{MemoCache, RespoApp, RespoNode, RespoStore, RespoStyle};
+use respo::ui::ui_global;
+use respo::{div, util::query_select_node, StatesTree};
+use respo::{MemoCache, RespoApp, RespoNode, RespoStore, RespoStyle};
 
 use self::counter::comp_counter;
-use self::panel::comp_panel;
 pub use self::store::ActionOp;
 use self::store::*;
 use self::todolist::comp_todolist;
+use panel::comp_panel;
 
 struct App {
   store: Rc<RefCell<Store>>,

src/app/counter.rs → demo_respo/src/app/counter.rs

@@ -2,11 +2,7 @@ use std::fmt::Debug;
 
 use serde::{Deserialize, Serialize};
 
-use crate::{
-  respo::{button, div, span, util, CssColor, RespoEvent, RespoNode, RespoStyle, StatesTree},
-  ui::ui_button,
-  DispatchFn,
-};
+use respo::{button, div, span, ui::ui_button, util, CssColor, DispatchFn, RespoEvent, RespoNode, RespoStyle, StatesTree};
 
 use super::store::ActionOp;
 

src/app/panel.rs → demo_respo/src/app/panel.rs

@@ -4,13 +4,12 @@ use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 use web_sys::console::log_1;
 
-use crate::{
-  app::store::ActionOp,
-  button,
-  respo::{div, input, span, util, RespoEvent, RespoNode, StatesTree},
-  space,
+use crate::app::store::ActionOp;
+
+use respo::{
+  button, div, input, space, span,
   ui::{ui_button, ui_input},
-  DispatchFn,
+  util, DispatchFn, RespoEvent, RespoNode, StatesTree,
 };
 
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]

src/app/store.rs → demo_respo/src/app/store.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{respo::StatesTree, util, MaybeState, RespoAction, RespoStore};
+use respo::{util, MaybeState, RespoAction, RespoStore, StatesTree};
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct Store {

src/app/task.rs → demo_respo/src/app/task.rs

@@ -2,13 +2,10 @@ use std::fmt::Debug;
 
 use serde::{Deserialize, Serialize};
 
-use crate::{
-  button, input,
-  respo::{div, span, CssColor, RespoNode, RespoStyle, StatesTree},
-  space, static_styles,
+use respo::{
+  button, div, input, space, span, static_styles,
   ui::{ui_button, ui_center, ui_input, ui_row_middle},
-  util::{self},
-  CssSize, DispatchFn, MemoCache, RespoEvent,
+  util, CssColor, CssSize, DispatchFn, MemoCache, RespoEvent, RespoNode, RespoStyle, StatesTree,
 };
 
 use super::store::*;
@@ -23,7 +20,7 @@ pub fn comp_task(
   states: &StatesTree,
   task: &Task,
 ) -> Result<RespoNode<ActionOp>, String> {
-  crate::util::log!("calling task function");
+  respo::util::log!("calling task function");
 
   let task_id = task.id.to_owned();
   let task_id2 = task_id.clone();

src/app/todolist.rs → demo_respo/src/app/todolist.rs

@@ -1,11 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{
-  button, memo1_call_by,
-  respo::{div, span, RespoNode, StatesTree},
-  ui::ui_button,
-  util, MemoCache, RespoIndexKey,
-};
+use respo::{button, div, memo1_call_by, span, ui::ui_button, util, MemoCache, RespoIndexKey, RespoNode, StatesTree};
 
 use super::{
   store::{ActionOp, Task},

demo_respo/src/lib.rs

@@ -0,0 +1,5 @@
+//! demo app for Respo
+
+mod app;
+
+pub use app::load_demo_app;

main.mjs

@@ -1,4 +1,4 @@
-import init, { loadDemoApp } from "./pkg/respo";
+import init, { loadDemoApp } from "./demo_respo/pkg/demo_respo";
 
 window.onload = () => {
   init().then(() => {

package.json

@@ -1,6 +1,6 @@
 {
   "scripts": {
-    "wasm": "cargo watch --why -w src/ -s 'wasm-pack build -t web --dev'"
+    "wasm": "cargo watch --why -w respo/src/ -w demo_respo/src/ -s 'wasm-pack build -t web --dev demo_respo'"
   },
   "devDependencies": {
     "vite": "^2.9.9"

respo/Cargo.toml

@@ -0,0 +1,46 @@
+[package]
+name = "respo"
+version = "0.0.12-a5"
+edition = "2021"
+description = "a tiny virtual DOM library migrated from ClojureScript"
+license = "Apache-2.0"
+repository = "https://github.com/Respo/respo.rs"
+homepage = "http://respo-mvc.org"
+documentation = "https://docs.rs/crate/respo/"
+readme = "README.md"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+js-sys = "0.3.57"
+wasm-bindgen = "0.2.80"
+lazy_static = "1.4.0"
+serde = { version = "1.0.137", features = [ "derive" ] }
+serde_json = "1.0.81"
+cirru_parser = "0.1.22"
+rust-hsluv = "0.1.4"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies.web-sys]
+version = "0.3.57"
+features = [
+  "console",
+  'Document',
+  "HtmlHeadElement",
+  'Element',
+  'Window',
+  "HtmlElement",
+  "HtmlInputElement",
+  "MouseEvent",
+  "KeyboardEvent",
+  "InputEvent",
+  "Node",
+  "NodeList",
+  "Element",
+  "HtmlCollection",
+  "CssStyleDeclaration",
+  "FocusEvent",
+  "HtmlLabelElement",
+]