diff --git a/package.json b/package.json index b51d6ec205d6..71c90b8e4108 100644 --- a/package.json +++ b/package.json @@ -66,8 +66,8 @@ "resolve": "1.5.0", "semver": "5.4.1", "string-width": "2.1.1", - "typescript": "3.0.1", - "typescript-estree": "1.0.0", + "typescript": "3.2.0-rc", + "typescript-estree": "6.0.0-rc.1", "unicode-regex": "2.0.0", "unified": "6.1.6", "vnopts": "1.0.2", diff --git a/src/language-js/parser-typescript.js b/src/language-js/parser-typescript.js index b8a4c309dee1..efcacf2e7b8c 100644 --- a/src/language-js/parser-typescript.js +++ b/src/language-js/parser-typescript.js @@ -43,7 +43,7 @@ function tryParseTypeScript(text, jsx) { tokens: true, comment: true, useJSXTextNode: true, - ecmaFeatures: { jsx }, + jsx, // Override logger function with noop, // to avoid unsupported version errors being logged loggerFn: () => {} diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js index 72b654e8671c..44160fabf6ae 100644 --- a/src/language-js/printer-estree.js +++ b/src/language-js/printer-estree.js @@ -1571,7 +1571,15 @@ function printPathNoParens(path, options, print, args) { case "NumericLiteral": // Babel 6 Literal split return printNumber(n.extra.raw); case "BigIntLiteral": - return concat([printNumber(n.extra.rawValue), "n"]); + return concat([ + printNumber( + n.extra + ? n.extra.rawValue + : // TypeScript + n.value + ), + "n" + ]); case "BooleanLiteral": // Babel 6 Literal split case "StringLiteral": // Babel 6 Literal split case "Literal": { @@ -2096,7 +2104,6 @@ function printPathNoParens(path, options, print, args) { ); } case "JSXFragment": - case "TSJsxFragment": case "JSXElement": { const elem = comments.printComments( path, @@ -2202,14 +2209,11 @@ function printPathNoParens(path, options, print, args) { case "JSXClosingElement": return concat([""]); case "JSXOpeningFragment": - case "JSXClosingFragment": - case "TSJsxOpeningFragment": - case "TSJsxClosingFragment": { + case "JSXClosingFragment": { const hasComment = n.comments && n.comments.length; const hasOwnLineComment = hasComment && !n.comments.every(handleComments.isBlockComment); - const isOpeningFragment = - n.type === "JSXOpeningFragment" || n.type === "TSJsxOpeningFragment"; + const isOpeningFragment = n.type === "JSXOpeningFragment"; return concat([ isOpeningFragment ? "<" : "