Skip to content

Add npm run diff#7486

Merged
queengooborg merged 9 commits intomdn:mainfrom
saschanaz:git-diff
May 13, 2022
Merged

Add npm run diff#7486
queengooborg merged 9 commits intomdn:mainfrom
saschanaz:git-diff

Conversation

@saschanaz
Copy link
Copy Markdown
Contributor

@saschanaz saschanaz commented Nov 24, 2020

A checklist to help your pull request get merged faster:

This intends to succeed what @foolip did in #6862 using git commands. Example:

> npm run diff ef6b236 80991e0

> @mdn/[email protected] diff
> node scripts/diff.js "ef6b236" "80991e0"

api.Document.caretRangeFromPoint:
 → support.safari_ios.version_added is edited (5 → 4)
api.Document.contentType:
 → support.safari.version_added is edited (9.1 → 9)
 → support.safari_ios.version_added is edited (9.3 → 9)
api.Document.createNodeIterator:
 → support.safari_ios.version_added is edited (true → 1)
api.Document.createTouch:
 → support.safari_ios.version_added is edited (true → ≤3)
api.Document.createTouchList:
 → support.safari_ios.version_added is edited (true → ≤3)
api.Document.currentScript:
 → support.safari.version_added is edited (7 → 6.1)
 → support.safari_ios.version_added is edited (7 → 8)
api.Document.head:
 → support.safari_ios.version_added is edited (true → 4)
api.Document.hidden:
 → support.safari.version_added is edited (7 → 6.1)
api.Document.onpointerlockchange:
 → support.safari_ios.version_added is edited (10.3 → false)
api.Document.onpointerlockerror:
 → support.safari_ios.version_added is edited (10.3 → false)
api.Document.onreadystatechange:
 → support.safari_ios.version_added is edited (6 → 5)
api.HTMLFrameSetElement:
 → status.deprecated is edited (false → true)
api.HTMLFrameSetElement.event_handlers:
 → status.deprecated is edited (false → true)
api.HTMLFrameSetElement.onlanguage:
 → status.deprecated is edited (false → true)
api.HTMLFrameSetElement.onstorage:
 → status.deprecated is edited (false → true)
api.NavigatorConcurrentHardware:
 → support.safari.version_added is edited (null → false)
 → support.safari_ios.version_added is edited (null → false)
api.NavigatorConcurrentHardware.hardwareConcurrency:
 → support.safari.version_added is edited (null → false)
 → support.safari_ios.version_added is edited (null → false)
api.NavigatorConcurrentHardware.worker_support:
 → support.safari.version_added is edited (null → false)
 → support.safari_ios.version_added is edited (null → false)
css.selectors:
 → css.selectors.-moz-ui-invalid is deleted
 → css.selectors.target-within is added
css.selectors.user-invalid:
 → Newly added

npm run diff is a shorthand of npm run diff origin/HEAD, which compares current changes against origin/HEAD. The longhand is primarily for debugging and test.

@saschanaz saschanaz requested a review from ddbeck as a code owner November 24, 2020 15:36
@github-actions github-actions bot added dependencies Pull requests that update a dependency package or file. infra Infrastructure issues (npm, GitHub Actions, releases) of this project scripts Issues or pull requests regarding the scripts in scripts/. labels Nov 24, 2020
@ddbeck ddbeck removed their request for review December 17, 2020 16:26
Base automatically changed from master to main March 24, 2021 12:54
@queengooborg
Copy link
Copy Markdown
Contributor

Hey @saschanaz, this is LGTM for the most part and I'd love to add it in! Would you mind rebasing this real quick?

@saschanaz
Copy link
Copy Markdown
Contributor Author

saschanaz commented Apr 20, 2022

Done, but I only have npm 8. Feel free to regenerate package-lock.json.

@queengooborg queengooborg mentioned this pull request Apr 21, 2022
@queengooborg
Copy link
Copy Markdown
Contributor

We upgraded to use NodeJS v16, which uses NPM v8 and package-lock v2. Looks like this one needs another quick rebase!

@queengooborg queengooborg requested a review from foolip April 24, 2022 00:21
Copy link
Copy Markdown
Contributor

@queengooborg queengooborg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This script is LGTM and I'm excited to integrate it! I'd like @foolip's review as well though, since this builds upon his work!

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented May 7, 2022

This pull request has merge conflicts that must be resolved before we can merge this.

1 similar comment
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented May 7, 2022

This pull request has merge conflicts that must be resolved before we can merge this.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented May 9, 2022

This pull request has merge conflicts that must be resolved before we can merge this.

@github-actions
Copy link
Copy Markdown
Contributor

This pull request has merge conflicts that must be resolved before we can merge this.

Copy link
Copy Markdown
Contributor

@queengooborg queengooborg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, happened to notice a small thing -- could we use ~ vs. ^ for the version number to maintain consistency between the dependencies?

Co-authored-by: Queen Vinyl Da.i'gyu-Kazotetsu <[email protected]>
@queengooborg
Copy link
Copy Markdown
Contributor

queengooborg commented May 13, 2022

Odd, the CI should've failed because package-lock.json wasn't updated... Real quick, could you update package-lock.json as well?

@saschanaz
Copy link
Copy Markdown
Contributor Author

Could you do that for me, I'm on bed 🤔

Copy link
Copy Markdown
Contributor

@queengooborg queengooborg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, thank you! This is LGTM, and essential for some plans Open Web Docs has, so I'll merge this now!

@queengooborg queengooborg enabled auto-merge (squash) May 13, 2022 07:26
@queengooborg queengooborg merged commit d4abf11 into mdn:main May 13, 2022
@saschanaz saschanaz deleted the git-diff branch May 13, 2022 07:32
@saschanaz
Copy link
Copy Markdown
Contributor Author

What plans, BTW? 👀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency package or file. infra Infrastructure issues (npm, GitHub Actions, releases) of this project scripts Issues or pull requests regarding the scripts in scripts/.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants