v0.3.3: support g-code flags, centralize common deps in workspace

Author: sameer

Cargo.lock

@@ -1,10 +1,17 @@
 [workspace]
-members = [
-    "lib",
-    "cli",
-    "web"
-]
-default-members = [
-    "cli"
-]
+members = ["lib", "cli", "web"]
+default-members = ["cli"]
 resolver = "2"
+
+[workspace.package]
+authors = ["Sameer Puri <[email protected]>"]
+edition = "2021"
+repository = "https://github.com/sameer/svg2gcode"
+license = "MIT"
+
+[workspace.dependencies]
+g-code = "0.5.0"
+log = "0"
+roxmltree = "0.19"
+serde_json = "1"
+svgtypes = "0.13"

Cargo.toml

@@ -1,26 +1,26 @@
 [package]
 name = "svg2gcode-cli"
-version = "0.0.15"
-authors = ["Sameer Puri <[email protected]>"]
-edition = "2021"
+version = "0.0.16"
 description = "Command line interface for svg2gcode"
-repository = "https://github.com/sameer/svg2gcode"
-license = "MIT"
+authors.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-svg2gcode = { version = "0.3.2", features = ["serde"] }
+svg2gcode = { path = "../lib", version = "0.3.2", features = ["serde"] }
 env_logger = { version = "0", default-features = false, features = [
     "atty",
     "termcolor",
     "humantime",
 ] }
-log = "0"
-g-code = "0.4.2"
+log.workspace = true
+g-code.workspace = true
 codespan-reporting = "0.11"
 structopt = "0.3"
-roxmltree = "0.19"
-svgtypes = "0.13"
-serde_json = "1"
+roxmltree.workspace = true
+serde_json.workspace = true
+svgtypes.workspace = true
 
 [[bin]]
 name = "svg2gcode"

cli/Cargo.toml

@@ -1,23 +1,23 @@
 [package]
 name = "svg2gcode"
-version = "0.3.2"
-authors = ["Sameer Puri <[email protected]>"]
-edition = "2021"
+version = "0.3.3"
 description = "Convert paths in SVG files to GCode for a pen plotter, laser engraver, or other machine."
-repository = "https://github.com/sameer/svg2gcode"
-license = "MIT"
+authors.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [features]
-serde = ["dep:serde", "dep:serde_repr"]
+serde = ["dep:serde", "dep:serde_repr", "g-code/serde"]
 
 [dependencies]
-g-code = { version = "0.4.1", features = ["serde"] }
+g-code.workspace = true
 lyon_geom = "1.0.5"
 euclid = "0.22"
-log = "0.4"
+log.workspace = true
 uom = "0.35"
-roxmltree = "0.19"
-svgtypes = "0.13"
+roxmltree.workspace = true
+svgtypes.workspace = true
 paste = "1.0"
 
 [dependencies.serde]
@@ -35,5 +35,5 @@ cairo-rs = { version = "0.18", default-features = false, features = [
     "svg",
     "v1_16",
 ] }
-serde_json = "1"
+serde_json.workspace = true
 pretty_assertions = "1.4.0"

lib/Cargo.toml

@@ -1,29 +1,29 @@
 [package]
 name = "svg2gcode-web"
-version = "0.0.16"
-authors = ["Sameer Puri <[email protected]>"]
-edition = "2021"
+version = "0.0.17"
 description = "Convert vector graphics to g-code for pen plotters, laser engravers, and other CNC machines"
-repository = "https://github.com/sameer/svg2gcode"
 homepage = "https://sameer.github.io/svg2gcode/"
-license = "MIT"
+authors.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
 wasm-bindgen = "0.2"
-svg2gcode = { version = "0.3.2", features = ["serde"] }
-roxmltree = "0.19"
-g-code = "0.4.2"
+svg2gcode = { path = "../lib", version = "0.3.2", features = ["serde"] }
+roxmltree.workspace = true
+g-code.workspace = true
 codespan-reporting = "0.11"
 codespan = "0.11"
 serde = "1"
 paste = "1"
-log = "0.4"
-svgtypes = "0.13"
-serde_json = "1"
+log.workspace = true
+svgtypes.workspace = true
+serde_json.workspace = true
 thiserror = "1.0"
 zip = { version = "0.6", default-features = false }
 
-yew = { version ="0.21", features = ["csr"] }
+yew = { version = "0.21", features = ["csr"] }
 yewdux = "0.10"
 web-sys = { version = "0.3", features = [] }
 wasm-logger = "0.2"

web/Cargo.toml

@@ -41,7 +41,7 @@ fn app() -> Html {
     let upgraded_settings_and_hydrated_form = use_state(|| false);
     if !*upgraded_settings_and_hydrated_form {
         app_dispatch.reduce_mut(|app| {
-            if let Err(_) = app.settings.try_upgrade() {
+            if app.settings.try_upgrade().is_err() {
                 unreachable!("No breaking upgrades yet!")
             }
             let hydrated_form_state = FormState::from(&app_store.settings);