Skip to content

Commit a58986c

Browse files
committed
update package-lock.json
1 parent 964d4ca commit a58986c

File tree

3 files changed

+3437
-3365
lines changed

3 files changed

+3437
-3365
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ jobs:
1616
with:
1717
registry-url: 'https://registry.npmjs.org/'
1818
node-version-file: 'package.json'
19+
- name: Show versions
20+
run: |
21+
echo "Node version: $(node --version)"
22+
echo "npm version: $(npm --version)"
1923
- name: CI Check
2024
run: make ci-check
2125

Makefile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,15 @@ ci-check: deps build prettier
3838
if git diff --quiet package-lock.json 2>/dev/null; then \
3939
echo "Please run 'make build' and 'make prettier' locally and commit the changes."; \
4040
else \
41-
echo "package-lock.json was modified. This means it's out of sync with package.json"; \
42-
echo "Please run 'npm install' locally and commit the updated package-lock.json"; \
41+
echo "package-lock.json was modified. Checking if it's just peer metadata differences..."; \
42+
git diff package-lock.json > /tmp/package-lock.diff; \
43+
if grep -q '^[+-].*"peer":' /tmp/package-lock.diff && ! grep -qvE '^[+-].*"peer":|^[+-]---|^[+]\+\+\+|^@@' /tmp/package-lock.diff; then \
44+
echo "⚠️ Only peer metadata differences detected. These are harmless but should be normalized."; \
45+
echo " Run 'npm install --package-lock-only' locally and commit the updated package-lock.json"; \
46+
else \
47+
echo "package-lock.json has significant differences (not just peer metadata)"; \
48+
echo "Please run 'npm install' locally and commit the updated package-lock.json"; \
49+
fi; \
4350
echo ""; \
4451
echo "Differences in package-lock.json:"; \
4552
git diff package-lock.json | head -100; \

0 commit comments

Comments
 (0)