mirror of
https://github.com/garrytan/gstack.git
synced 2026-09-09 14:38:59 +02:00
fix: restore main's dependency manifest clobbered by the merge resolution
The v1.67.0.0 merge resolved the package.json conflict wholesale --ours, which kept this branch's version stamp but erased main's dependency work (playwright 1.58->1.62 + its patchedDependencies entry, transformers 4.1->4.2, cross-spawn added, puppeteer-core removed — which is also why main dropped the basic-ftp pin test: the pinned package left the tree with it — marked/socks bumps, adm-zip override) while bun.lock auto-merged to main's side. Every CI job that runs `bun install --frozen-lockfile` failed on the mismatch (check-freshness, quality, free-tests, gate, windows x2). Take main's package.json + bun.lock verbatim, re-stamp the version through gstack-version-bump (1.67.1.0). bun.lock is now byte-identical to main's; frozen install verified locally; full free suite green for the branch. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Fable 5
parent
1578c4c6ce
commit
f12c8470c7
+9
-6
@@ -51,14 +51,14 @@
|
||||
"slop:diff": "bun run scripts/slop-diff.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"@huggingface/transformers": "^4.1.0",
|
||||
"@huggingface/transformers": "^4.2.0",
|
||||
"@ngrok/ngrok": "^1.7.0",
|
||||
"cross-spawn": "^7.0.6",
|
||||
"diff": "^9.0.0",
|
||||
"html-to-docx": "1.8.0",
|
||||
"marked": "^18.0.2",
|
||||
"playwright": "^1.58.2",
|
||||
"puppeteer-core": "^24.40.0",
|
||||
"socks": "^2.8.8"
|
||||
"marked": "^18.0.9",
|
||||
"playwright": "^1.62.1",
|
||||
"socks": "^2.8.9"
|
||||
},
|
||||
"engines": {
|
||||
"bun": ">=1.0.0"
|
||||
@@ -80,6 +80,9 @@
|
||||
"xterm-addon-fit": "^0.8.0"
|
||||
},
|
||||
"overrides": {
|
||||
"basic-ftp": "5.3.1"
|
||||
"adm-zip": "^0.6.0"
|
||||
},
|
||||
"patchedDependencies": {
|
||||
"playwright-core@1.62.1": "patches/playwright-core@1.62.1.patch"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user