Skip to content

Conversation

rattrayalex
Copy link

@rattrayalex rattrayalex commented Apr 30, 2017

They indented everything, changed a few nodes, few other changes. I think I was able to hunt down all bugs but this was a real beast to do. Hopefully future merges are much smoother.

mathiasbynens and others added 30 commits January 10, 2017 20:14
This is not necessary anymore if we drop support for Node.js v0.10 and v0.12.

Ref. babel/babel#4315.
* Remove node 0.10, 0.12 and 5 from Travis

* add engines to package.json
# Conflicts:
#	src/parser/statement.js
#	src/plugins/jsx/index.js
…el#349)

* Remove ForAwaitStatement, add await flag to ForOfStatement

* Set await flag for all ForOfStatements
* Reintroduce Variance node

* Optimize code and coverage

tt.plusMin can only be + or - so no need to have an elseif
# Conflicts:
#	src/parser/index.js
# Conflicts:
#	src/plugins/flow.js
…babel#384)

* [7.0] Change RestProperty/SpreadProperty to RestElement/SpreadElement

* Fix rest element in array pattern at invalid location
greenkeeper bot and others added 20 commits April 21, 2017 14:26
* chore(package): update flow-bin to version 0.44.0

https://greenkeeper.io/

* Update yarn.lock
* Add support for declare export

* Do not allow declare module inside declare module

* Reallow module exports outside module

* Add handling of `declare export default`

Add check for multiple module.export declarations

* Disallow export let/const/type

Refactor parsing object properties to share more code and add support
for getters and setters

* Rename tests

* Update test fixtures

* Optimize for performance

* disallow declare export interface outside of module

* Refactor code to be more readable and less lookahead

* Add comments

* Add test for export star as

* Test for number literal getter/setter

* Add more tests

* Fix tests

* Allow union types and correctly eat semi after type

* Use non computed keys

* Fix tests
* Fixed invalid number literal parsing

* Don't ignore period or E characters after octal numbers
cherry-pick fix from acorn

* Fix tests
* Type-check utils

* Improve test coverage
* Type-check JSX plugin

* Improve test coverage
* Type-check flow plugin

* Fix typo
@rattrayalex rattrayalex changed the base branch from lightscript to master April 30, 2017 04:38
@rattrayalex rattrayalex changed the base branch from master to lightscript May 3, 2017 23:50
@rattrayalex rattrayalex changed the title [WIP] Merge upstream 7 Merge upstream babylon (v7.0, incomplete) May 3, 2017
@rattrayalex rattrayalex changed the title Merge upstream babylon (v7.0, incomplete) Merge upstream babylon/master (v7.0, incomplete) May 3, 2017
@rattrayalex rattrayalex merged commit 08f4cdc into lightscript May 4, 2017
@rattrayalex rattrayalex deleted the merge-upstream-7 branch May 4, 2017 02:26
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.