From 6aed350a3cadda5abb30345210fab19401b5a1d7 Mon Sep 17 00:00:00 2001 From: QA Runner Date: Wed, 22 Jul 2026 10:22:26 -0700 Subject: [PATCH] fix: repair JSON corrupted by the merge of main (package.json + lockfile) The "Merge branch 'main'" commit (71a7aba) auto-merged backend/package.json and backend/package-lock.json without raising a conflict, but git's line-level merge produced invalid JSON in both files: package.json lost the comma after the new "test:stack" script, and package-lock.json lost the two closing-brace lines of the supertest/cookie-signature entry. npm treats an unparseable lockfile as absent, which is why CI failed with the misleading "npm ci can only install with an existing package-lock.json". package.json: restore the comma. package-lock.json: rebuilt from main's known-good copy via `npm install --package-lock-only` against this branch's package.json. Verified locally: npm ci, npm test (259 passed), npm run build. Co-Authored-By: Claude Fable 5 --- backend/package-lock.json | 2 ++ backend/package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 11c4367..7bed718 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -6806,6 +6806,8 @@ "license": "MIT", "engines": { "node": ">=6.6.0" + } + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", diff --git a/backend/package.json b/backend/package.json index e64e591..0223d9a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -7,7 +7,7 @@ "build": "tsc", "start": "node dist/index.js", "test": "vitest run", - "test:stack": "bash scripts/test-stack.sh" + "test:stack": "bash scripts/test-stack.sh", "test:coverage": "vitest run --coverage" }, "dependencies": {