From 52700fff21e8d9df1778599f8cf341a695684d7f Mon Sep 17 00:00:00 2001 From: Rasensprenger Date: Thu, 27 Aug 2026 22:01:12 +0300 Subject: [PATCH 1/4] Update dependency jscpd to v5.0.15 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72e0b12..0b55635 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ }, "devDependencies": { "@types/node": "^26.0.1", - "jscpd": "5.0.14", + "jscpd": "5.0.15", "typescript": "^7.0.0" }, "dependencies": { From 22d13742aea2f37c13716da1dbc575fd426075c9 Mon Sep 17 00:00:00 2001 From: Alois Date: Thu, 27 Aug 2026 21:10:37 +0200 Subject: [PATCH 2/4] feat(qol): remove dup --- flake.nix | 67 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/flake.nix b/flake.nix index 7951305..0a40973 100644 --- a/flake.nix +++ b/flake.nix @@ -5,26 +5,30 @@ rust-overlay.url = "github:oxalica/rust-overlay"; }; - outputs = { - self, - nixpkgs, - rust-overlay, - }: let - systems = [ - "aarch64-darwin" - "aarch64-linux" - "x86_64-darwin" - "x86_64-linux" - ]; - eachSystem = f: - nixpkgs.lib.foldl' nixpkgs.lib.recursiveUpdate {} ( - map (system: nixpkgs.lib.mapAttrs (_: value: {${system} = value;}) (f system)) systems - ); - in + outputs = + { + self, + nixpkgs, + rust-overlay, + }: + let + systems = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + ]; + eachSystem = + f: + nixpkgs.lib.foldl' nixpkgs.lib.recursiveUpdate { } ( + map (system: nixpkgs.lib.mapAttrs (_: value: { ${system} = value; }) (f system)) systems + ); + in eachSystem ( - system: let - overlays = [rust-overlay.overlays.default]; - pkgs = import nixpkgs {inherit system overlays;}; + system: + let + overlays = [ rust-overlay.overlays.default ]; + pkgs = import nixpkgs { inherit system overlays; }; rustToolchain = pkgs.rust-bin.stable.latest.default.override { extensions = [ @@ -32,12 +36,12 @@ "clippy" "rustfmt" ]; - targets = ["wasm32-unknown-unknown"]; + targets = [ "wasm32-unknown-unknown" ]; }; clippyCheck = pkgs.writeShellApplication { name = "mtp-clippy"; - runtimeInputs = [rustToolchain]; + runtimeInputs = [ rustToolchain ]; text = '' export MTP_TYPE_MAPS="''${MTP_TYPE_MAPS:-$PWD/example/type-maps.yaml}" cargo clippy --workspace --exclude mtp-wasm --all-targets --all-features -- -D warnings -W unreachable-pub @@ -46,7 +50,7 @@ macheteCheck = pkgs.writeShellApplication { name = "mtp-machete"; - runtimeInputs = [pkgs.cargo-machete]; + runtimeInputs = [ pkgs.cargo-machete ]; text = '' cargo machete "$@" ''; @@ -54,7 +58,15 @@ buildAll = pkgs.writeShellApplication { name = "mtp-build-all"; - runtimeInputs = [rustToolchain pkgs.cargo-deny pkgs.wasm-pack pkgs.pnpm pkgs.coreutils clippyCheck macheteCheck]; + runtimeInputs = [ + rustToolchain + pkgs.cargo-deny + pkgs.wasm-pack + pkgs.pnpm + pkgs.coreutils + clippyCheck + macheteCheck + ]; text = '' export MTP_TYPE_MAPS="''${MTP_TYPE_MAPS:-$PWD/example/type-maps.yaml}" @@ -66,7 +78,6 @@ cargo check --manifest-path example/Cargo.toml --workspace --all-targets --all-features mtp-clippy mtp-machete - pnpm run dup pnpm run build RUSTFLAGS="--cfg web_sys_unstable_apis" wasm-pack test --node wasm pnpm run test:e2e @@ -79,13 +90,17 @@ healthCheck = pkgs.writeShellApplication { name = "mtp-health"; - runtimeInputs = [clippyCheck macheteCheck]; + runtimeInputs = [ + clippyCheck + macheteCheck + ]; text = '' mtp-clippy mtp-machete ''; }; - in { + in + { devShells = { default = pkgs.mkShell { name = "mtp-dev"; From 8d94bc54987640996f676b6a496c4f57502e6aaa Mon Sep 17 00:00:00 2001 From: Alois Date: Thu, 27 Aug 2026 21:55:36 +0200 Subject: [PATCH 3/4] feat(qol): add direnv --- .envrc | 1 + .gitignore | 1 + 2 files changed, 2 insertions(+) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index 6dff05e..f600624 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ dist/ *.tgz wasm/pkg/ web_client/ +.direnv From 635b1df12a1a86eec7867d770ba79002d20a89a6 Mon Sep 17 00:00:00 2001 From: Rasensprenger Date: Thu, 27 Aug 2026 23:01:10 +0300 Subject: [PATCH 4/4] Update dependency jscpd to v5.0.15 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72e0b12..0b55635 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ }, "devDependencies": { "@types/node": "^26.0.1", - "jscpd": "5.0.14", + "jscpd": "5.0.15", "typescript": "^7.0.0" }, "dependencies": {