Skip to content

Commit d8a1ee8

Browse files
gavrielcclaude
andcommitted
fix: use npm ci in bootstrap to prevent dirty lockfile blocking merges
setup.sh ran npm install which modified package-lock.json, causing git merge to refuse during channel skill installation. Switch to npm ci (deterministic, doesn't modify lockfile) and clean up stale peer flags in the lockfile. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent d572bab commit d8a1ee8

3 files changed

Lines changed: 3 additions & 8 deletions

File tree

.claude/skills/setup/SKILL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Run `bash setup.sh` and parse the status block.
5858
- macOS: `brew install node@22` (if brew available) or install nvm then `nvm install 22`
5959
- Linux: `curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash - && sudo apt-get install -y nodejs`, or nvm
6060
- After installing Node, re-run `bash setup.sh`
61-
- If DEPS_OK=false → Read `logs/setup.log`. Try: delete `node_modules` and `package-lock.json`, re-run `bash setup.sh`. If native module build fails, install build tools (`xcode-select --install` on macOS, `build-essential` on Linux), then retry.
61+
- If DEPS_OK=false → Read `logs/setup.log`. Try: delete `node_modules`, re-run `bash setup.sh`. If native module build fails, install build tools (`xcode-select --install` on macOS, `build-essential` on Linux), then retry.
6262
- If NATIVE_OK=false → better-sqlite3 failed to load. Install build tools and re-run.
6363
- Record PLATFORM and IS_WSL for later steps.
6464

package-lock.json

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

setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ install_deps() {
7979
log "Running as root, using --unsafe-perm"
8080
fi
8181

82-
log "Running npm install $npm_flags"
83-
if npm install $npm_flags >> "$LOG_FILE" 2>&1; then
82+
log "Running npm ci $npm_flags"
83+
if npm ci $npm_flags >> "$LOG_FILE" 2>&1; then
8484
DEPS_OK="true"
8585
log "npm install succeeded"
8686
else

0 commit comments

Comments
 (0)