Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
node-version: 24

- name: Install pnpm
uses: pnpm/action-setup@v4
uses: pnpm/action-setup@v6.1.0
with:
run_install: false

Expand All @@ -53,9 +53,9 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-v2-${{ hashFiles('**/pnpm-lock.yaml') }}
key: ${{ runner.os }}-pnpm-store-v3-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-v2-
${{ runner.os }}-pnpm-store-v3-

- name: Install dependencies
run: |
Expand All @@ -82,7 +82,7 @@ jobs:
node-version: 24

- name: Install pnpm
uses: pnpm/action-setup@v4
uses: pnpm/action-setup@v6.1.0
with:
run_install: false

Expand All @@ -96,9 +96,9 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-v2-${{ hashFiles('**/pnpm-lock.yaml') }}
key: ${{ runner.os }}-pnpm-store-v3-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-v2-
${{ runner.os }}-pnpm-store-v3-

- name: Install dependencies
run: |
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
node-version: 24

- name: Install pnpm
uses: pnpm/action-setup@v4
uses: pnpm/action-setup@v6.1.0
with:
run_install: false

Expand All @@ -147,9 +147,9 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-v2-${{ hashFiles('**/pnpm-lock.yaml') }}
key: ${{ runner.os }}-pnpm-store-v3-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-v2-
${{ runner.os }}-pnpm-store-v3-

- name: Install dependencies
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
node-version: 24

- name: Install pnpm
uses: pnpm/action-setup@v4
uses: pnpm/action-setup@v6.1.0
with:
run_install: false

Expand All @@ -39,9 +39,9 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-v2-${{ hashFiles('**/pnpm-lock.yaml') }}
key: ${{ runner.os }}-pnpm-store-v3-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-v2-
${{ runner.os }}-pnpm-store-v3-

- name: Install dependencies
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Ensure npm supports OIDC trusted publishing
run: npm install -g npm@latest && npm --version

- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v6.1.0
name: Install pnpm
id: pnpm-install
with:
Expand All @@ -67,9 +67,9 @@ jobs:
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-v2-${{ hashFiles('**/pnpm-lock.yaml') }}
key: ${{ runner.os }}-pnpm-store-v3-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-v2-
${{ runner.os }}-pnpm-store-v3-

- name: install packages
run: |
Expand Down
50 changes: 41 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
description = "Node 24 + pnpm 11 dev shell";
description = "Node 24 + pnpm 12 dev shell";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
Expand All @@ -11,15 +11,47 @@
let
pkgs = import nixpkgs { inherit system; };
nodejs = pkgs.nodejs_24;
# nixpkgs does not ship pnpm 11 yet; package the npm release the same way
# pkgs.pnpm does for older majors so the shell matches packageManager.
pnpm = pkgs.callPackage
"${pkgs.path}/pkgs/development/tools/pnpm/generic.nix"
{
inherit nodejs;
version = "11.18.0";
hash = "sha256-KcNcqNKih5iP3uPg824H2bk3g/VntXm3/Vt5ikVj3YE=";
# pnpm 12 is a native binary. The JavaScript tarball only installs that
# binary, and nixpkgs generic.nix still links bin/pnpm.cjs, so fetch the
# platform package. Hardlinks, not symlinks: the binary reads its own
# filename (pnpx and pnx mean dlx) and realpath collapses a symlink to pnpm.
pnpmVersion = "12.14.0";
pnpmSources = {
x86_64-linux = {
url = "https://registry.npmjs.org/@pnpm/exe.linux-x64/-/exe.linux-x64-${pnpmVersion}.tgz";
hash = "sha256-HemO0uliEROwiHsGMitGHvud9z2RP8HRUQObELcRekE=";
};
aarch64-linux = {
url = "https://registry.npmjs.org/@pnpm/exe.linux-arm64/-/exe.linux-arm64-${pnpmVersion}.tgz";
hash = "sha256-58okIk62JqAygo7FhMZ5A60vOJkRuEnQCe1woZ9w2NM=";
};
x86_64-darwin = {
url = "https://registry.npmjs.org/@pnpm/exe.darwin-x64/-/exe.darwin-x64-${pnpmVersion}.tgz";
hash = "sha256-T+WqbAujAT+K77HMI908VPcnKBS+SwJ1601qmNd2niY=";
};
aarch64-darwin = {
url = "https://registry.npmjs.org/@pnpm/exe.darwin-arm64/-/exe.darwin-arm64-${pnpmVersion}.tgz";
hash = "sha256-BhNpIMnMytT2FbsIDgVNmsCG/t/DJJe9h6iSt6RYb28=";
};
};
pnpmSrc = pnpmSources.${system} or (throw "no pnpm ${pnpmVersion} binary for ${system}");
pnpm = pkgs.stdenv.mkDerivation {
pname = "pnpm";
version = pnpmVersion;
src = pkgs.fetchurl pnpmSrc;
sourceRoot = "package";
nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.autoPatchelfHook ];
buildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.stdenv.cc.cc.lib ];
dontBuild = true;
installPhase = ''
runHook preInstall
install -Dm755 pnpm $out/bin/pnpm
ln $out/bin/pnpm $out/bin/pn
ln $out/bin/pnpm $out/bin/pnx
ln $out/bin/pnpm $out/bin/pnpx
runHook postInstall
'';
};
tools = with pkgs; [
git
nixfmt-classic
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"private": true,
"packageManager": "pnpm@11.18.0",
"packageManager": "pnpm@12.14.0",
"engines": {
"node": ">=24",
"pnpm": ">= 11.0.0"
"pnpm": ">= 12.0.0"
},
"scripts": {
"all": "pnpm -r",
Expand Down
1 change: 1 addition & 0 deletions patches/typescript.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
diff --git a/lib/typescript.js b/lib/typescript.js
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -159873,9 +159873,128 @@
Expand Down
Loading
Loading