Commit 4731d6d
ci: repair 1274 branch after main merge (restore package files, fix cancel test)
The main merge re-introduced a duplicate mysql2 override that made
package.json invalid JSON, churned package-lock.json, and left a broken
concurrent-cancel block in the integration test (duplicate promise2
declaration and dangling .set chain) that failed to compile.
Restore package.json and package-lock.json to match main and repair the
integration test so the branch diff contains only the keeper-key blast
radius change.
Generated with Codebuff 🤖
Co-Authored-By: Codebuff <noreply@codebuff.com>1 parent 24c6fb3 commit 4731d6d
3 files changed
Lines changed: 85 additions & 161 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
169 | 169 | | |
170 | 170 | | |
171 | 171 | | |
172 | | - | |
173 | | - | |
174 | 172 | | |
175 | 173 | | |
176 | 174 | | |
| |||
186 | 184 | | |
187 | 185 | | |
188 | 186 | | |
189 | | - | |
190 | | - | |
191 | | - | |
192 | | - | |
193 | 187 | | |
194 | 188 | | |
195 | 189 | | |
| |||
209 | 203 | | |
210 | 204 | | |
211 | 205 | | |
212 | | - | |
213 | 206 | | |
214 | 207 | | |
215 | 208 | | |
| |||
0 commit comments