diff --git a/RELEASE.md b/RELEASE.md index 34b7f30c1..0677f6e81 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -4,7 +4,6 @@ - Bump the minor version in `crates/radicle-tauri/tauri.conf.json`. - Update `CHANGELOG.md` — only include changes relevant to users. -- If a npm dependencies change happened, make sure to run `/scripts/update-flake`. - Create a version bump patch, push to CI, and request a review. - Wait for CI to pass and get peer approval. - Build the macOS app locally: `npm run tauri build`. diff --git a/flake.lock b/flake.lock index d49371ef3..b05fa4086 100644 --- a/flake.lock +++ b/flake.lock @@ -73,24 +73,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "heartwood": { "inputs": { "advisory-db": "advisory-db", @@ -114,25 +96,6 @@ "url": "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git" } }, - "nix-playwright-browsers": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1727577780, - "narHash": "sha256-yoBul0Y7WDdjqUiJgWTMBrrYnyC/5ObdEsuI5P7Xdgw=", - "owner": "voidus", - "repo": "nix-playwright-browsers", - "rev": "6e6ffee8c9e0961b24d8f0eb4df3cc13535b3055", - "type": "github" - }, - "original": { - "owner": "voidus", - "repo": "nix-playwright-browsers", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1722940684, @@ -151,27 +114,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1747209494, + "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "5d736263df906c5da72ab0f372427814de2f52f8", "type": "github" }, "original": { @@ -185,8 +132,7 @@ "inputs": { "flake-utils": "flake-utils", "heartwood": "heartwood", - "nix-playwright-browsers": "nix-playwright-browsers", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay_2" } }, @@ -260,21 +206,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index cac42cae3..6a10c0130 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,6 @@ heartwood = { url = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?ref=refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v1.1.0"; }; - nix-playwright-browsers.url = "github:voidus/nix-playwright-browsers"; }; outputs = { @@ -19,7 +18,6 @@ flake-utils, rust-overlay, heartwood, - nix-playwright-browsers, ... }: (flake-utils.lib.eachDefaultSystem (system: let @@ -27,7 +25,6 @@ inherit system; overlays = [ (import rust-overlay) - nix-playwright-browsers.overlays.${system}.default ]; }; in { @@ -75,7 +72,6 @@ webkitgtk_4_1, git, openssh, - playwright-browsers_v1_47_0, }: let rTc = rust-bin.fromRustupToolchainFile ./rust-toolchain; rustPlatform = makeRustPlatform { @@ -125,7 +121,7 @@ env = { HW_RELEASE = "nix-" + (heartwood.shortRev or "unknown-ref"); - PLAYWRIGHT_BROWSERS_PATH = playwright-browsers_v1_47_0; + PLAYWRIGHT_BROWSERS_PATH = pkgs.playwright-driver.browsers; PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS = true; RUST_SRC_PATH = "${rTc}/lib/rustlib/src/rust/library"; diff --git a/package-lock.json b/package-lock.json index df30d6f2e..2ad2c9401 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ }, "devDependencies": { "@eslint/js": "^9.26.0", - "@playwright/test": "=1.47.0", + "@playwright/test": "^1.52.0", "@radicle/gray-matter": "4.1.0", "@sveltejs/vite-plugin-svelte": "^5.0.3", "@tauri-apps/cli": "^2.5.0", @@ -809,48 +809,17 @@ } }, "node_modules/@playwright/test": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.47.0.tgz", - "integrity": "sha512-SgAdlSwYVpToI4e/IH19IHHWvoijAYH5hu2MWSXptRypLSnzj51PcGD+rsOXFayde4P9ZLi+loXVwArg6IUkCA==", - "dev": true, - "dependencies": { - "playwright": "1.47.0" - }, - "bin": { - "playwright": "cli.js" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@playwright/test/node_modules/playwright": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.0.tgz", - "integrity": "sha512-jOWiRq2pdNAX/mwLiwFYnPHpEZ4rM+fRSQpRHwEwZlP2PUANvL3+aJOF/bvISMhFD30rqMxUB4RJx9aQbfh4Ww==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.52.0.tgz", + "integrity": "sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.47.0" + "playwright": "1.52.0" }, "bin": { "playwright": "cli.js" }, - "engines": { - "node": ">=18" - }, - "optionalDependencies": { - "fsevents": "2.3.2" - } - }, - "node_modules/@playwright/test/node_modules/playwright-core": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.0.tgz", - "integrity": "sha512-1DyHT8OqkcfCkYUD9zzUTfg7EfTd+6a8MkD/NWOvjo0u/SCNd5YmY/lJwFvUZOxJbWNds+ei7ic2+R/cRz/PDg==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "playwright-core": "cli.js" - }, "engines": { "node": ">=18" } diff --git a/package.json b/package.json index 519067fcf..9f5685f7b 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ }, "devDependencies": { "@eslint/js": "^9.26.0", - "@playwright/test": "=1.47.0", + "@playwright/test": "^1.52.0", "@radicle/gray-matter": "4.1.0", "@sveltejs/vite-plugin-svelte": "^5.0.3", "@tauri-apps/cli": "^2.5.0",