Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Proposal: Add WHATWG URL API #30

Merged
merged 2 commits into from
Jun 13, 2017
Merged

Proposal: Add WHATWG URL API #30

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5600a92
Add WHATWG URL API
jasnell Oct 10, 2016
45db232
Merge branch 'master' into url
leobalter Jun 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions stage-0-proposals.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ Stage 0 proposals are either
| | [Function expression decorators](https://goo.gl/8MmCMG) | Igor Minar | 0 |
| | [Zones](https://github.com/domenic/zones) ([spec](https://domenic.github.io/zones/)) | Domenic Denicola & Miško Hevery | 0 |
| | [Updates to Tail Calls to include an explicit syntactic opt-in](https://github.com/tc39/proposal-ptc-syntax) | Brian Terlson & Eric Faust | 0 |
| 🚀 | [Unicode property escapes `\p{…}` and `\P{…}` in regular expressions](https://github.com/mathiasbynens/es-regexp-unicode-property-escapes) | Mathias Bynens, Daniel Ehrenberg, Brian Terlson | 0 |
| 🚀?| [Nested `import` declarations](https://github.com/tc39/ecma262/pull/646) | Ben Newman, Meteor Development Group | 0 |
| 🚀 | [`s` (`dotAll`) flag for regular expressions](https://github.com/mathiasbynens/es-regexp-dotall-flag) | Mathias Bynens, Brian Terlson | 0 |
| | [WHATWG URL](https://github.com/jasnell/proposal-url) | James M Snell | 0 |
| | [Nested `import` declarations](https://github.com/tc39/ecma262/pull/646) | Ben Newman, Meteor Development Group | 0 |
Copy link
Member

Choose a reason for hiding this comment

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

This seems to have broken some of the whitespace changes added; this shouldn't have been merged with this large a diff.

Copy link
Member

Choose a reason for hiding this comment

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

this is weird, I thought I got these fixed through GH's merging tool.

This is how I see the diff: https://www.dropbox.com/s/or9soz53vn2yb1t/Screenshot%202017-06-13%2015.55.27.png?dl=0

Copy link
Member

Choose a reason for hiding this comment

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

also the raw file seems ok: https://raw.githubusercontent.com/tc39/proposals/master/stage-0-proposals.md

It looks like you're looking only at the last commit, resolving the merge conflicts, but not the final set of changes.

I wanted to squash but this repo requires the merge commit with all the commits from the PR.

Copy link
Member

Choose a reason for hiding this comment

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

ah, that might be the case. if you'd rebased instead of merged master this wouldn't have occurred (in the PR, prior to merging)

| | [`is{Type}` methods](https://github.com/jasnell/proposal-istypes) | James M Snell | 0 |
|🚀| [Cancellation API](https://github.com/tc39/proposal-cancellation) | Ron Buckton, Brian Terlson | 0 |
| | [Orthogonal classes](https://github.com/erights/Orthogonal-Classes) | Mark S. Miller, Allen Wirfs-Brock | 0 |
| | [Normative ICU Reference](https://github.com/tc39/tc39-notes/blob/master/es8/2017-05/may-23.md#normative-icu-reference) | Domenic Denicola | 0 |
| | [WHATWG URL](https://github.com/jasnell/proposal-url) | James M Snell | 0 |

🚀 means the champion thinks it's ready to advance but has not yet presented to the committee.

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.