Various updates to Babel 7 branch #1958
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,8 @@ | ||
| { | ||
| "presets": [["@babel/preset-env", { | ||
| "targets": { | ||
| "node": "6" | ||
| } | ||
| }]], | ||
| "ignore": ["builtins"] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| const traverse = require('@babel/traverse').default; | ||
|
|
||
| // Convert between babel 7 and babel 6 AST | ||
| // More info on the AST Changes: https://babeljs.io/docs/en/v7-migration-api#ast-changes | ||
| function babel7toBabel6(ast) { | ||
| const visitor = { | ||
| ArrowFunctionExpression: node => { | ||
| node.expression = node.body.type !== 'BlockStatement'; | ||
| }, | ||
| ExistsTypeAnnotation: node => { | ||
| node.type = 'ExistentialTypeParam'; | ||
| }, | ||
| NumberLiteralTypeAnnotation: node => { | ||
| node.type = 'NumericLiteralTypeAnnotation'; | ||
| }, | ||
| ObjectTypeIndexer: node => { | ||
| node.end++; | ||
| node.loc.end.column++; | ||
| }, | ||
| ForOfStatement: node => { | ||
| node.type = 'ForAwaitStatement'; | ||
| delete node.await; | ||
| }, | ||
| SpreadElement: (node, path) => { | ||
| if ( | ||
| path.parentPath.isObjectExpression() || | ||
| path.parentPath.isArrayExpression() | ||
| ) { | ||
| node.type = 'SpreadProperty'; | ||
| } | ||
| }, | ||
| RestElement: (node, path) => { | ||
| if ( | ||
| path.parentPath.isObjectPattern() || | ||
| path.parentPath.isArrayPattern() | ||
| ) { | ||
| node.type = 'RestProperty'; | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| traverse(ast, { | ||
| enter(path) { | ||
| if (path.node.variance && path.node.variance.type === 'Variance') { | ||
| path.node.variance = path.node.variance.kind; | ||
| } | ||
|
|
||
| let visitorFunc = visitor[path.node.type]; | ||
| if (visitorFunc) { | ||
| visitorFunc(path.node, path); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| return ast; | ||
| } | ||
|
|
||
| function babel6toBabel7(ast) { | ||
| const visitor = { | ||
| ArrowFunctionExpression: node => { | ||
| delete node.expression; | ||
| }, | ||
| ExistentialTypeParam: node => { | ||
| node.type = 'ExistsTypeAnnotation'; | ||
| }, | ||
| NumericLiteralTypeAnnotation: node => { | ||
| node.type = 'NumberLiteralTypeAnnotation'; | ||
| }, | ||
| ObjectTypeIndexer: node => { | ||
| node.end--; | ||
| node.loc.end.column--; | ||
| }, | ||
| ForAwaitStatement: node => { | ||
| node.type = 'ForOfStatement'; | ||
| node.await = true; | ||
| }, | ||
| SpreadProperty: node => { | ||
| node.type = 'SpreadElement'; | ||
| }, | ||
| RestProperty: node => { | ||
| node.type = 'RestElement'; | ||
| } | ||
| }; | ||
|
|
||
| traverse(ast, { | ||
| enter(path) { | ||
| if (path.node.variance && typeof path.node.variance === 'string') { | ||
| path.node.variance = { | ||
| type: 'VarianceNode', | ||
| kind: path.node.variance | ||
| }; | ||
| } | ||
|
|
||
| let visitorFunc = visitor[path.node.type]; | ||
| if (visitorFunc) { | ||
| visitorFunc(path.node); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| return ast; | ||
| } | ||
|
|
||
| module.exports = function(ast, version) { | ||
| if (![6, 7].includes(version)) { | ||
| throw new Error('This convertor only supports Babel 6 and 7 ASTs'); | ||
| } | ||
|
|
||
| return version === 7 ? babel7toBabel6(ast) : babel6toBabel7(ast); | ||
| }; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we remove this, or do a PR to their branch to update to
@babel/typesinstead ofbabel-typesIt might cause issues in certain cases, as babel-types has changed slightly
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
worth doing some perf testing. babylon-walk was WAY faster than babel-traverse for some cases where we don't need scope tracking and things.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm pretty sure it will still be slower, haven't tested it. I did however open up a PR to babylon-walk pugjs/babel-walk#2