Skip to content

Commit 34fc5b1

Browse files
chore(nix): upgrade turbo to 2.7.6 and improve flake configuration
1 parent 69d2f6a commit 34fc5b1

3 files changed

Lines changed: 47 additions & 36 deletions

File tree

flake.nix

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
# pnpm build # Build the project
1717
# pnpm test # Run tests
1818
# pnpm vsix # Create VS Code extension
19+
# eslint <file> # Lint files (eslint and eslint_d available)
20+
# pnpm lint # Run linting via pnpm scripts
1921
#
2022
# Maintenance:
2123
# nix run .#update-deps # Update flake.lock and pnpmDeps hash
@@ -50,6 +52,8 @@
5052
lib = pkgs.lib;
5153

5254
nodejs = pkgs.nodejs_20;
55+
# Use pnpm_9 if available, otherwise fall back to pnpm
56+
# pnpm 10.26.1 is available and newer than required 10.8.1, so we'll use that
5357
pnpm = pkgs.pnpm;
5458

5559
ignoredPaths = [
@@ -109,9 +113,12 @@
109113
echo ""
110114
echo "📦 pnpm install - Install dependencies"
111115
echo "🔧 pnpm build - Build the project"
112-
echo "📋 pnpm test - Run tests"
116+
echo "📋 pnpm test - Run tests (from root)"
113117
echo "📦 pnpm vsix - Create VS Code extension"
114118
echo ""
119+
echo "💡 Tip: For webview-ui tests, run from webview-ui directory:"
120+
echo " cd webview-ui && pnpm test <test-file>"
121+
echo ""
115122
echo "For VS Code debugging: Press F5"
116123
echo ""
117124
'';
@@ -155,10 +162,14 @@
155162
python3
156163
pkg-config
157164
gnumake
158-
turbo
165+
# turbo is installed via pnpm as a devDependency (version 2.7.6 in package.json)
166+
# We don't include system turbo to avoid version conflicts
167+
# Users should run 'pnpm install' first to get the correct turbo version
159168
ripgrep
160169
jp2a
161170
nodePackages.typescript-language-server
171+
nodePackages.eslint
172+
nodePackages.eslint_d
162173
nil
163174
]
164175
++ lib.optionals stdenv.isLinux [
@@ -202,7 +213,7 @@
202213
pname = "roo-code-pnpm-deps";
203214
inherit version src;
204215
fetcherVersion = 2;
205-
hash = "sha256-AuDK65r2lanMp9sj9JdTljYIQ06goT08AxwcG+LawgI=";
216+
hash = "sha256-jtIRL4E4d0QjvQGHAVmcXvEXblRdg58VknaMlh/TxCY=";
206217
};
207218

208219
vsix = pkgs.stdenvNoCC.mkDerivation (

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"prettier": "^3.4.2",
4545
"rimraf": "^6.0.1",
4646
"tsx": "^4.19.3",
47-
"turbo": "^2.5.6",
47+
"turbo": "^2.7.6",
4848
"typescript": "5.8.3"
4949
},
5050
"lint-staged": {

pnpm-lock.yaml

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)