Skip to content

fix: better handling of whitespace (backport to v5) - #585

Merged
lukekarrys merged 1 commit into
npm:release/v5from
joaomoreno:joao/backport-564-to-v5
Jul 10, 2023
Merged

fix: better handling of whitespace (backport to v5)#585
lukekarrys merged 1 commit into
npm:release/v5from
joaomoreno:joao/backport-564-to-v5

Conversation

@joaomoreno

Copy link
Copy Markdown

This backports the security fix#564 to v5.

@joaomoreno
joaomoreno requested a review from a team as a code ownerJuly 7, 2023 13:45
@joaomoreno
joaomorenoforce-pushed the joao/backport-564-to-v5 branch from 0572517 to 57bfd39CompareJuly 7, 2023 13:47
@wraithgar

Copy link
Copy Markdown
Contributor

#580 should be fixed before we go backporting anything so we don't bring new bugs along.

@wraithgar

Copy link
Copy Markdown
Contributor

#587 Also needs to be fixed

@lukekarrys
lukekarrysforce-pushed the release/v5 branch 2 times, most recently from b67c2f8 to deb5ad5CompareJuly 7, 2023 17:50
@lukekarrys

Copy link
Copy Markdown
Contributor

the latest template-oss changes have been applied to release/v5. @joaomoreno can you rebase your branch so it only includes the semver.js and test/ changes?

@lukekarrys

Copy link
Copy Markdown
Contributor

The full set of changes that should be backported are:

This is a backport of the following commits squashed to land on
`release/v5`:
- 717534e
- abdd93d
- cc6fde2
- 99d8287
Ref: npm#564
Co-authored-by: joaomoreno <mail@joaomoreno.com>
@lukekarrys
lukekarrysforce-pushed the joao/backport-564-to-v5 branch from 74351cf to d4530b8CompareJuly 7, 2023 22:37
@lukekarrys

Copy link
Copy Markdown
Contributor

@joaomoreno i was able to push to your branch with the relevant commits. waiting on CI to see if tests pass in older versions of node

@lukekarryslukekarrys changed the title Backport to v5: fix: better handling of whitespacefix: better handling of whitespace (backport to v5)Jul 7, 2023
@joaomoreno

Copy link
Copy Markdown
Author

Sounds good, thanks @lukekarrys!

@lukekarrys
lukekarrys merged commit 2f8fd41 into npm:release/v5Jul 10, 2023
@github-actionsgithub-actionsBot mentioned this pull request Jul 10, 2023
@G-Rath

Copy link
Copy Markdown

I've opened github/advisory-database#2483 updating the advisory for v5

@G-Rath

Copy link
Copy Markdown

and I've opened github/advisory-database#2484 updating the advisory again for v6 and v5.

@lukekarrys

Copy link
Copy Markdown
Contributor

Thanks @G-Rath!

@joaomoreno

Copy link
Copy Markdown
Author

Thanks all!

Sign up for freeto 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.

4 participants

@joaomoreno@wraithgar@lukekarrys@G-Rath