Skip to content

fix(registry): Specify correct rebase flag#188

Merged
jan-auer merged 2 commits into
masterfrom
fix/registry-rebase
Mar 19, 2021
Merged

fix(registry): Specify correct rebase flag#188
jan-auer merged 2 commits into
masterfrom
fix/registry-rebase

Conversation

@jan-auer

@jan-auer jan-auer commented Mar 19, 2021

Copy link
Copy Markdown
Member

Passes --rebase as option, instead of a literal rebase which git interprets as a remote. Additionally, I'm opting for the array-based syntax as it's more concise and in line with other git invocations in the same file. See how to specify options.

Disclaimer: I did not test this branch. Please test before merging.

@jan-auer
jan-auer requested a review from BYK March 19, 2021 18:29
@jan-auer

Copy link
Copy Markdown
Member Author

Verified via manual publish of sentry-javascript 6.2.3

@jan-auer
jan-auer merged commit c8da1e5 into master Mar 19, 2021
@jan-auer
jan-auer deleted the fix/registry-rebase branch March 19, 2021 20:06
BYK added a commit that referenced this pull request Jul 1, 2026
## Summary

Resolves 3 Dependabot alerts (**#186, #187, #188**), all the same
advisory across both projects.

- **Advisory:**
[GHSA-h67p-54hq-rp68](GHSA-h67p-54hq-rp68)
/ CVE-2026-53550 — *js-yaml: Quadratic-complexity DoS in merge key
handling via repeated aliases* (medium severity)
- **Vulnerable:** \`>= 4.0.0, <= 4.1.1\` → **patched:** \`4.2.0\`

These alerts were opened by the post-merge rescan right after #839
landed (newly-published advisory), not caused by that change.

## Fix

| Alert | Manifest | Relationship | Change |
|---|---|---|---|
| #187 | root \`package.json\` | direct devDep | bump pinned \`js-yaml\`
\`4.1.1\` → \`4.2.0\` |
| #188 | root \`pnpm-lock.yaml\` | direct devDep | regenerated →
\`4.2.0\` |
| #186 | \`docs/pnpm-lock.yaml\` | transitive (astro/starlight) |
\`pnpm.overrides\` \`js-yaml: ^4.2.0\` → resolves to \`4.3.0\` |

- Root uses an exact pin (matching the repo's pinned-devDep convention,
e.g. \`tar\`); docs uses an override (matching the docs override style)
since js-yaml is transitive there.
- Both lockfile diffs are 100% js-yaml-scoped — no unrelated drift. No
\`@babel/core\`/other packages touched.

## Verification

- Root: \`pnpm build\` ✅, \`pnpm test\` ✅ (1025 passed, 1 skipped),
\`pnpm lint\` ✅ (0 errors), \`pnpm format:check\` ✅ (tracked files)
- Docs: \`pnpm build\` ✅ (27 pages built)
- \`grep "js-yaml@" pnpm-lock.yaml docs/pnpm-lock.yaml\` — only
\`4.2.0\`/\`4.3.0\` remain; \`4.1.1\` gone. (\`@types/js-yaml\` is
type-defs only, not the vulnerable package.)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants