Merge pull request #129 from arkedge/prepare-package-wasm-crates

Prepare package wasm crates
arkedge · Apr 19, 2024 · c844a32 · c844a32
2 parents 7bf96f9 + e0b71e3
commit c844a32
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/devtools-frontend/Cargo.toml b/devtools-frontend/Cargo.toml
@@ -8,4 +8,4 @@ repository = "https://github.com/arkedge/gaia"
 
 [dependencies]
 rust-embed = { version = "8.0.0", features = ["interpolate-folder-path", "debug-embed"] }
-wasm-opslang = { path = "crates/wasm-opslang" }
+opslang-wasm = { path = "crates/opslang-wasm", version = "0.7.0-beta.3" }
diff --git a/devtools-frontend/build.rs b/devtools-frontend/build.rs
@@ -33,10 +33,10 @@ fn main() {
     // parepare crate dir
     let crate_root_dir = out_dir.join("crate_root");
 
-    // copy wasm-opslang dist
+    // copy opslang-wasm dist
     {
-        let opslang_pkg_dir = env::var("DEP_WASM_OPSLANG_OUT_DIR").unwrap();
-        let opslang_dist_dir = crate_root_dir.join("wasm-opslang").join("pkg");
+        let opslang_pkg_dir = env::var("DEP_OPSLANG_WASM_OUT_DIR").unwrap();
+        let opslang_dist_dir = crate_root_dir.join("opslang-wasm").join("pkg");
 
         copy_devtools_dir(opslang_pkg_dir, opslang_dist_dir).unwrap();
     }

diff --git a/devtools-frontend/crates/Cargo.lock b/devtools-frontend/crates/Cargo.lock
diff --git a/devtools-frontend/crates/Cargo.toml b/devtools-frontend/crates/Cargo.toml
@@ -2,9 +2,14 @@
 resolver = "2"
 
 members = [
-    "wasm-opslang",
+    "opslang-wasm",
 ]
 
+[workspace.package]
+version = "0.7.0-beta.3"
+description = "A command and control system for C2A-based satellites"
+repository = "https://github.com/arkedge/gaia"
+
 # profile config should be set in workspace root
 [profile.release]
 # Tell `rustc` to optimize for small code size.

diff --git a/...s-frontend/crates/wasm-opslang/.gitignore → ...s-frontend/crates/opslang-wasm/.gitignore b/...s-frontend/crates/wasm-opslang/.gitignore → ...s-frontend/crates/opslang-wasm/.gitignore
diff --git a/...s-frontend/crates/wasm-opslang/Cargo.toml → ...s-frontend/crates/opslang-wasm/Cargo.toml b/...s-frontend/crates/wasm-opslang/Cargo.toml → ...s-frontend/crates/opslang-wasm/Cargo.toml
@@ -1,9 +1,11 @@
 [package]
-name = "wasm-opslang"
-version = "0.1.0"
+name = "opslang-wasm"
+version.workspace = true
+description.workspace = true
+repository.workspace = true
 edition = "2021"
 
-links = "wasm-opslang"
+links = "opslang-wasm"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/...ols-frontend/crates/wasm-opslang/build.rs → ...ols-frontend/crates/opslang-wasm/build.rs b/...ols-frontend/crates/wasm-opslang/build.rs → ...ols-frontend/crates/opslang-wasm/build.rs
diff --git a/...-frontend/crates/wasm-opslang/js/union.js → ...-frontend/crates/opslang-wasm/js/union.js b/...-frontend/crates/wasm-opslang/js/union.js → ...-frontend/crates/opslang-wasm/js/union.js
diff --git a/...crates/wasm-opslang/src/free_variables.rs → ...crates/opslang-wasm/src/free_variables.rs b/...crates/wasm-opslang/src/free_variables.rs → ...crates/opslang-wasm/src/free_variables.rs
diff --git a/...s-frontend/crates/wasm-opslang/src/lib.rs → ...s-frontend/crates/opslang-wasm/src/lib.rs b/...s-frontend/crates/wasm-opslang/src/lib.rs → ...s-frontend/crates/opslang-wasm/src/lib.rs
diff --git a/...nd/crates/wasm-opslang/src/union_value.rs → ...nd/crates/opslang-wasm/src/union_value.rs b/...nd/crates/wasm-opslang/src/union_value.rs → ...nd/crates/opslang-wasm/src/union_value.rs
diff --git a/...-frontend/crates/wasm-opslang/src/util.rs → ...-frontend/crates/opslang-wasm/src/util.rs b/...-frontend/crates/wasm-opslang/src/util.rs → ...-frontend/crates/opslang-wasm/src/util.rs
diff --git a/...frontend/crates/wasm-opslang/src/value.rs → ...frontend/crates/opslang-wasm/src/value.rs b/...frontend/crates/wasm-opslang/src/value.rs → ...frontend/crates/opslang-wasm/src/value.rs
diff --git a/...frontend/crates/wasm-opslang/tests/web.rs → ...frontend/crates/opslang-wasm/tests/web.rs b/...frontend/crates/wasm-opslang/tests/web.rs → ...frontend/crates/opslang-wasm/tests/web.rs
diff --git a/devtools-frontend/package.json b/devtools-frontend/package.json
@@ -10,7 +10,7 @@
     "crate:build": "cd crates && wasm-pack build --weak-refs --target web --release",
     "crate:dev": "cd crates && cargo watch -s 'wasm-pack build --weak-refs --target web --dev' -C",
     "crate": "pnpm run crate:${MODE:-build}",
-    "crates:wasm-opslang": "pnpm run crate wasm-opslang",
+    "crates:opslang-wasm": "pnpm run crate opslang-wasm",
     "dev:crates": "MODE=dev run-p crates:*",
     "dev:vite": "vite --host",
     "dev": "run-p dev:*",

diff --git a/devtools-frontend/src/components/CommandView.tsx b/devtools-frontend/src/components/CommandView.tsx
@@ -10,7 +10,7 @@ import {
 import { Tco, TcoParam, TmivField } from "../proto/tco_tmiv";
 import { useClient } from "./Layout";
 import { GrpcClientService } from "../worker";
-import initOpslang, * as opslang from "@crate/wasm-opslang/pkg";
+import initOpslang, * as opslang from "@crate/opslang-wasm/pkg";
 
 type ParameterValue =
   | { type: "bytes"; bytes: Uint8Array; bigint: bigint }