From fc37f45a2e46467c78e958c588280556cd6f8099 Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Sun, 13 Sep 2026 15:44:31 -0700 Subject: [PATCH] deps: pin makepad-script to octoscript 9069cfa (synced with upstream work d476e52) Move the makepad-script git pin in crates/octoscript-core and crates/octoscript-capabilities (and the copy quoted in UPSTREAM.md) from 1fdce273bf888239079754a1834734635eaed34f to 9069cfaf87960f535f2440d736d223238b88c5b1, the merge of fork PR #2 that syncs the octoscript branch with upstream makepad `work` d476e5245 (25 upstream commits). Cargo.lock and fuzz/Cargo.lock follow via `cargo update -p makepad-script`; the 13 packages from that git source move together, nothing else in either lockfile changes. Verification: cargo check --workspace --all-targets: clean cargo test --workspace --no-fail-fast: 988 passed, 2 failed (the_field_vocabularies_match_the_toml_spec, the_source_catalog_matches_the_toml_spec: pre-existing catalog drift, identical to the baseline on main) Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_01JgSir4cQyaakzPju4h6smw --- Cargo.lock | 26 +++++++++++------------ UPSTREAM.md | 2 +- crates/octoscript-capabilities/Cargo.toml | 2 +- crates/octoscript-core/Cargo.toml | 2 +- fuzz/Cargo.lock | 26 +++++++++++------------ 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f485b3..984d512 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -376,7 +376,7 @@ dependencies = [ [[package]] name = "makepad-error-log" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-micro-serde", ] @@ -384,7 +384,7 @@ dependencies = [ [[package]] name = "makepad-html" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-live-id", ] @@ -392,7 +392,7 @@ dependencies = [ [[package]] name = "makepad-live-id" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-live-id-macros", ] @@ -400,7 +400,7 @@ dependencies = [ [[package]] name = "makepad-live-id-macros" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-micro-proc-macro", ] @@ -408,7 +408,7 @@ dependencies = [ [[package]] name = "makepad-math" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-micro-serde", ] @@ -416,12 +416,12 @@ dependencies = [ [[package]] name = "makepad-micro-proc-macro" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" [[package]] name = "makepad-micro-serde" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-live-id", "makepad-micro-serde-derive", @@ -430,7 +430,7 @@ dependencies = [ [[package]] name = "makepad-micro-serde-derive" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-micro-proc-macro", ] @@ -438,12 +438,12 @@ dependencies = [ [[package]] name = "makepad-regex" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" [[package]] name = "makepad-script" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-error-log", "makepad-html", @@ -458,7 +458,7 @@ dependencies = [ [[package]] name = "makepad-script-derive" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-micro-proc-macro", ] @@ -466,7 +466,7 @@ dependencies = [ [[package]] name = "makepad-stitch" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" [[package]] name = "memchr" @@ -868,7 +868,7 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "smallvec" version = "1.15.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" [[package]] name = "smallvec" diff --git a/UPSTREAM.md b/UPSTREAM.md index 31e7104..9bd8014 100644 --- a/UPSTREAM.md +++ b/UPSTREAM.md @@ -5,7 +5,7 @@ parser, derive crate, and their leaf dependencies come from the `octoscript` branch of the OctoSense fork of Makepad, consumed as a pinned git dependency: ```toml -makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "1fdce273bf888239079754a1834734635eaed34f" } +makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "9069cfaf87960f535f2440d736d223238b88c5b1" } ``` The pin appears in exactly two manifests, `crates/octoscript-core/Cargo.toml` diff --git a/crates/octoscript-capabilities/Cargo.toml b/crates/octoscript-capabilities/Cargo.toml index 8f86171..3eeae00 100644 --- a/crates/octoscript-capabilities/Cargo.toml +++ b/crates/octoscript-capabilities/Cargo.toml @@ -13,7 +13,7 @@ workspace = true blake3 = { version = "1.8.5", features = ["pure"] } getrandom = { version = "0.3.4", features = ["wasm_js"] } keyring = { version = "3.6.3", default-features = false, features = ["apple-native", "windows-native"], optional = true } -makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "1fdce273bf888239079754a1834734635eaed34f" } +makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "9069cfaf87960f535f2440d736d223238b88c5b1" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.150" octoscript-core = { path = "../octoscript-core" } diff --git a/crates/octoscript-core/Cargo.toml b/crates/octoscript-core/Cargo.toml index e0fbba9..539f90a 100644 --- a/crates/octoscript-core/Cargo.toml +++ b/crates/octoscript-core/Cargo.toml @@ -11,5 +11,5 @@ workspace = true [dependencies] octoscript-ui-l0 = { path = "../octoscript-ui-l0" } -makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "1fdce273bf888239079754a1834734635eaed34f" } +makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "9069cfaf87960f535f2440d736d223238b88c5b1" } serde_json = "1.0.150" diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index ace74f9..ae09f87 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -313,7 +313,7 @@ dependencies = [ [[package]] name = "makepad-error-log" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-micro-serde", ] @@ -321,7 +321,7 @@ dependencies = [ [[package]] name = "makepad-html" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-live-id", ] @@ -329,7 +329,7 @@ dependencies = [ [[package]] name = "makepad-live-id" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-live-id-macros", ] @@ -337,7 +337,7 @@ dependencies = [ [[package]] name = "makepad-live-id-macros" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-micro-proc-macro", ] @@ -345,7 +345,7 @@ dependencies = [ [[package]] name = "makepad-math" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-micro-serde", ] @@ -353,12 +353,12 @@ dependencies = [ [[package]] name = "makepad-micro-proc-macro" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" [[package]] name = "makepad-micro-serde" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-live-id", "makepad-micro-serde-derive", @@ -367,7 +367,7 @@ dependencies = [ [[package]] name = "makepad-micro-serde-derive" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-micro-proc-macro", ] @@ -375,12 +375,12 @@ dependencies = [ [[package]] name = "makepad-regex" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" [[package]] name = "makepad-script" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-error-log", "makepad-html", @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "makepad-script-derive" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" dependencies = [ "makepad-micro-proc-macro", ] @@ -403,7 +403,7 @@ dependencies = [ [[package]] name = "makepad-stitch" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" [[package]] name = "memchr" @@ -720,7 +720,7 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "smallvec" version = "1.15.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=1fdce273bf888239079754a1834734635eaed34f#1fdce273bf888239079754a1834734635eaed34f" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=9069cfaf87960f535f2440d736d223238b88c5b1#9069cfaf87960f535f2440d736d223238b88c5b1" [[package]] name = "subtle"