From b3fca7334057df8abf7f7c51a3e2f5df8777a17f Mon Sep 17 00:00:00 2001 From: furedea <132188853+furedea@users.noreply.github.com> Date: Sun, 18 Oct 2026 22:36:17 +0900 Subject: [PATCH] build(pnpm): move to pnpm 11 Pin packageManager to pnpm@11.27.0 and move the devshell to nixpkgs-26.05-darwin, which ships the same pnpm as the machine. Rename nixfmt-rfc-style to nixfmt, as 26.05 warns on the old name. pnpm 11 no longer reads the "pnpm" field in package.json, so move overrides into pnpm-workspace.yaml and translate onlyBuiltDependencies into allowBuilds, which replaced it in pnpm 11. Refs furedea/dotfiles#221 Co-Authored-By: Claude Opus 5.5 --- flake.lock | 8 ++++---- flake.nix | 4 ++-- package.json | 25 +------------------------ pnpm-workspace.yaml | 21 +++++++++++++++++++++ 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index ff7cc2c..baa19e7 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1777014176, - "narHash": "sha256-OzisFv/K6SRIKNOUsR+9Xij/HnS+UqXWhrheEHPJJ3E=", + "lastModified": 1792285535, + "narHash": "sha256-2ziqQLBRfA3qKlOwHv3WcYHymPA4+tm0IQQkLI6a3L4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f05c8657c7016fb8cfec9ca06dac066cdeddb91", + "rev": "21691b79c41ba30a80b110523c943d8d45a0912b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-25.11-darwin", + "ref": "nixpkgs-26.05-darwin", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 7daa6ab..324eabe 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Development environment for furedea.com"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-25.11-darwin"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-26.05-darwin"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; }; @@ -20,7 +20,7 @@ # lefthook before 2.1.6 runs hooks under a pty, which agent sandboxes deny. nixpkgs-unstable.legacyPackages.${system}.lefthook ls-lint - nixfmt-rfc-style + nixfmt nodejs_22 pnpm statix diff --git a/package.json b/package.json index d2687ae..4663f28 100644 --- a/package.json +++ b/package.json @@ -50,28 +50,5 @@ "oxlint": "1.59.0", "vitest": "4.1.11" }, - "packageManager": "pnpm@10.33.0", - "pnpm": { - "overrides": { - "devalue": "5.9.3", - "dompurify": "3.4.16", - "esbuild": "0.28.2", - "fast-uri": "3.1.8", - "js-yaml": "4.3.2", - "katex": "0.18.2", - "nanoid": "3.3.20", - "postcss": "8.5.29", - "sharp": "0.35.5", - "smol-toml": "1.9.0", - "source-map-js": "1.2.2", - "svgo": "4.1.0", - "tinypool": "2.1.2", - "vite": "8.2.2", - "yaml": "2.8.3" - }, - "onlyBuiltDependencies": [ - "esbuild", - "sharp" - ] - } + "packageManager": "pnpm@11.27.0" } diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 1b46eea..68f2a24 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -3,6 +3,27 @@ packages: catalogs: {} +overrides: + devalue: "5.9.3" + dompurify: "3.4.16" + esbuild: "0.28.2" + fast-uri: "3.1.8" + js-yaml: "4.3.2" + katex: "0.18.2" + nanoid: "3.3.20" + postcss: "8.5.29" + sharp: "0.35.5" + smol-toml: "1.9.0" + source-map-js: "1.2.2" + svgo: "4.1.0" + tinypool: "2.1.2" + vite: "8.2.2" + yaml: "2.8.3" + +allowBuilds: + esbuild: true + sharp: true + auditConfig: ignoreCves: []