Merge remote-tracking branch 'origin/master' into fix-scope-analysis

# Conflicts:
#	package.json

Author: mysticatea

README.md

@@ -17,7 +17,9 @@ npm install --save-dev typescript-eslint-parser
 In your ESLint configuration file, set the `parser` property:
 
 ```json
-"parser": "typescript-eslint-parser"
+{
+    "parser": "typescript-eslint-parser"
+}
 ```
 
 There is sometimes an incorrect assumption that the parser itself is what does everything necessary to facilitate the use of ESLint with TypeScript. In actuality, it is the combination of the parser _and_ one or more plugins which allow you to maximize your usage of ESLint with TypeScript.
@@ -30,6 +32,26 @@ Instead, you also need to make use of one more plugins which will add or extend
 
 By far the most common case will be installing the [eslint-plugin-typescript](https://github.com/nzakas/eslint-plugin-typescript) plugin, but there are also other relevant options available such a [eslint-plugin-tslint](https://github.com/JamesHenry/eslint-plugin-tslint).
 
+## Configuration
+
+The following additional configuration options are available by specifying them in [`parserOptions`](https://eslint.org/docs/user-guide/configuring#specifying-parser-options) in your ESLint configuration file.
+
+**`jsx`** - default `false`. Enable parsing JSX when `true`. More details can be found [here](https://www.typescriptlang.org/docs/handbook/jsx.html).
+
+**`useJSXTextNode`** - default `false`. The JSX AST changed the node type for string literals inside a JSX Element from `Literal` to `JSXText`. When value is `true`, these nodes will be parsed as type `JSXText`. When value is `false`, these nodes will be parsed as type `Literal`.
+
+### .eslintrc.json
+
+```json
+{
+    "parser": "typescript-eslint-parser",
+    "parserOptions": {
+        "jsx": true,
+        "useJSXTextNode": true
+    }
+}
+```
+
 ## Supported TypeScript Version
 
 We will always endeavor to support the latest stable version of TypeScript.

package.json

@@ -54,7 +54,7 @@
     "eslint-scope": "^4.0.0",
     "eslint-visitor-keys": "^1.0.0",
     "lodash": "^4.17.11",
-    "typescript-estree": "2.1.0"
+    "typescript-estree": "5.0.0"
   },
   "peerDependencies": {
     "typescript": "*"

tests/lib/__snapshots__/basics.js.snap

@@ -94,6 +94,7 @@ Object {
       "type": "ExpressionStatement",
     },
   ],
+  "comments": Array [],
   "loc": Object {
     "end": Object {
       "column": 0,
@@ -499,6 +500,7 @@ Object {
       "type": "DoWhileStatement",
     },
   ],
+  "comments": Array [],
   "loc": Object {
     "end": Object {
       "column": 0,
@@ -1177,6 +1179,7 @@ Object {
       "type": "FunctionDeclaration",
     },
   ],
+  "comments": Array [],
   "loc": Object {
     "end": Object {
       "column": 0,
@@ -1544,6 +1547,7 @@ Object {
       "type": "ExpressionStatement",
     },
   ],
+  "comments": Array [],
   "loc": Object {
     "end": Object {
       "column": 17,
@@ -1712,6 +1716,7 @@ Object {
       "type": "ExpressionStatement",
     },
   ],
+  "comments": Array [],
   "loc": Object {
     "end": Object {
       "column": 0,
@@ -1973,6 +1978,7 @@ Object {
       "type": "ExpressionStatement",
     },
   ],
+  "comments": Array [],
   "loc": Object {
     "end": Object {
       "column": 6,
@@ -2215,6 +2221,7 @@ Object {
       "type": "ExpressionStatement",
     },
   ],
+  "comments": Array [],
   "loc": Object {
     "end": Object {
       "column": 0,
@@ -2515,6 +2522,7 @@ Object {
       "type": "ExpressionStatement",
     },
   ],
+  "comments": Array [],
   "loc": Object {
     "end": Object {
       "column": 4,
@@ -2974,6 +2982,7 @@ Object {
       "type": "ExpressionStatement",
     },
   ],
+  "comments": Array [],
   "loc": Object {
     "end": Object {
       "column": 0,