diff --git a/Cargo.lock b/Cargo.lock index c146e24..8174ec3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -416,7 +416,7 @@ dependencies = [ [[package]] name = "comline-codegen-typescript" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-typescript?rev=c484b764b4341d8a8529eb52613e4ce2fb6c35d5#c484b764b4341d8a8529eb52613e4ce2fb6c35d5" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=77cd29126cebaf71e2d11efd2729029a3a70b9f0#77cd29126cebaf71e2d11efd2729029a3a70b9f0" dependencies = [ "comline-codegen", "comline-core", diff --git a/Cargo.toml b/Cargo.toml index 80cff59..0506c04 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,16 +30,14 @@ toml = "0.8" # `comline-core`'s wasm32 consumers (the playground editor, the language # server); the CLI is the one consumer that actually runs `comline build`. comline-core = { git = "https://github.com/ComlineProject/core", rev = "016e38603152444f9b51fddfd46b1e6b1d73f1d8", features = ["deps"] } -# All three pinned to revs that agree on one `comline-codegen` - bumped -# together: generation#40's branch-tip commit (GenRequest.external_std - -# comline-rust/comline-typescript's own codegen crates consume -# `comline-codegen`'s types, so this pins the exact same generation rev -# they do, since Cargo only unifies a git dependency across byte-identical -# revs), then comline-rust#30 and comline-typescript#25 (both branch-tip, -# pending those PRs' merge). +# All three pinned to revs that agree on one `comline-codegen`, and bumped +# together: comline-rust and comline-typescript's codegen crates consume +# `comline-codegen`'s types, so the rev below must be byte-identical to the +# one *they* pin - Cargo only unifies a git dependency across identical rev +# strings, and two copies of `GenRequest` are two incompatible types. comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "69a3e37ae788a91c5f72dd047d6196aa4c95fdef" } comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "5b1ba2b099cc295c6768935623f4c084f134e6b8", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "c484b764b4341d8a8529eb52613e4ce2fb6c35d5", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "77cd29126cebaf71e2d11efd2729029a3a70b9f0", optional = true } [features] # Which language generators are compiled in. Drop one to shed its whole