Commit 2e2b68d
Merge pre_prod into APS-9999-cypress-cli-security-omnibus-sep2026
Resolve package-lock.json conflict by taking pre_prod's baseline and
re-running `npm install --package-lock-only` so my security overrides
re-apply on top of pre_prod's newer package.json (adm-zip added, version
bumped to 1.37.1, decompress removed).
Verified post-merge tree:
js-yaml: 4.1.x → 4.3.2, 3.14.x → 3.15.2 (my overrides)
brace-expansion: 1.1.x → 1.1.18, 2.1.x → 2.1.4 (my overrides)
adm-zip: 0.6.1 (from pre_prod)
axios: 1.16.1 (unchanged)
form-data: 4.0.5 (unchanged)
Target CVEs (GHSA-52cp-r559-cp3m js-yaml, GHSA-3jxr-9vmj-r5cp
brace-expansion) absent from `npm audit`.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>8 files changed
Lines changed: 43 additions & 427 deletions
File tree
- .github/workflows
- bin/helpers
- test/unit/bin/helpers
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
31 | 34 | | |
32 | 35 | | |
33 | 36 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
1 | 2 | | |
2 | 3 | | |
| 4 | + | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
154 | 154 | | |
155 | 155 | | |
156 | 156 | | |
157 | | - | |
| 157 | + | |
| 158 | + | |
158 | 159 | | |
159 | 160 | | |
160 | | - | |
| 161 | + | |
161 | 162 | | |
162 | 163 | | |
163 | 164 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
171 | 171 | | |
172 | 172 | | |
173 | 173 | | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
180 | 179 | | |
181 | 180 | | |
182 | | - | |
| 181 | + | |
183 | 182 | | |
184 | 183 | | |
185 | 184 | | |
| |||
0 commit comments