diff --git a/Cargo.lock b/Cargo.lock index 935b2ae..14807e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5538,19 +5538,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -5575,9 +5576,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5585,9 +5586,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -5598,9 +5599,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" diff --git a/crates/teddybear-js/Cargo.toml b/crates/teddybear-js/Cargo.toml index 17aaf92..3c6dfd4 100644 --- a/crates/teddybear-js/Cargo.toml +++ b/crates/teddybear-js/Cargo.toml @@ -23,5 +23,5 @@ serde_json = { workspace = true } serde-wasm-bindgen = "0.6.1" js-sys = "0.3.68" -wasm-bindgen = "=0.2.92" +wasm-bindgen = "=0.2.93" wasm-bindgen-futures = "0.4.41" diff --git a/flake.lock b/flake.lock index 85fd84c..4da375f 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1724049063, - "narHash": "sha256-aTnh9Ar40OaT2MTULeJMR9EIrylKeKUYWP61QEZBu0Q=", + "lastModified": 1726036322, + "narHash": "sha256-9Hwl4lzB5yFah00OaXSMDPDubCy99wtLgsYxMVpMwlM=", "owner": "nix-community", "repo": "fenix", - "rev": "94c18bf5acb3966b07cc863bd00f4f959c0c5ec4", + "rev": "3e50a3c915882f07cb3f6c246f09febc4ad36c3e", "type": "github" }, "original": { @@ -89,11 +89,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1725983898, + "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1723915239, - "narHash": "sha256-x/RXN/ougJ1IEoBKrY0UijB530OfOfICK4KPa3Kj9Bk=", + "lastModified": 1725985110, + "narHash": "sha256-0HKj+JI6rtxaE6Kzcd6HyFNbEFJRsLy5DoNgVF1pyRM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "fa003262474185fd62168379500fe906b331824b", + "rev": "bcc708992104c2059f310fbc3ac00bfc377f9ea8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ca9d411..3931540 100644 --- a/flake.nix +++ b/flake.nix @@ -94,10 +94,6 @@ rustc = rustToolchain; }; - wasm-pack = pkgs.callPackage ./nix/wasm-pack.nix { - inherit rustPlatform; - }; - wasm-snip = pkgs.callPackage ./nix/wasm-snip.nix { inherit rustPlatform; }; @@ -165,7 +161,6 @@ wasmArgs wasmCargoArtifacts wasmSnipPatterns - wasm-pack wasm-snip ; }; diff --git a/nix/wasm-pack.nix b/nix/wasm-pack.nix deleted file mode 100644 index 24463f6..0000000 --- a/nix/wasm-pack.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - cmake, - fetchFromGitHub, - lib, - rustPlatform, - wasm-pack, -}: let - src = fetchFromGitHub { - owner = "rustwasm"; - repo = "wasm-pack"; - rev = "62ab39cf82ec4d358c1f08f348cd0dc44768f412"; - hash = "sha256-tShJXrz9HHZVweNjMKi2JuatsORicWdkJzvQmFvFCrw="; - }; -in - (wasm-pack.override {inherit rustPlatform;}).overrideAttrs (prev: { - inherit src; - - version = "0.13.0"; - - cargoDeps = prev.cargoDeps.overrideAttrs (lib.const { - inherit src; - - name = "${prev.pname}-vendor.tar.gz"; - outputHash = "sha256-7qPtB1I71DKr58wBk04fSdxOTMdBEeP287XvNR7vjJs="; - }); - })