Merge remote-tracking branch 'upstream/master' into add-visitor-keys

Author: michalsnik

.gitignore

@@ -6,3 +6,4 @@ _test.js
 .DS_Store
 .vscode
 yarn.lock
+.eslint-release-info.json

CHANGELOG.md

@@ -1,3 +1,12 @@
+v20.0.0 - October 8, 2018
+
+* f4b9893 Breaking: Support TypeScript 3.1 (fixes #524) (#525) (James Henry)
+
+v19.0.2 - September 29, 2018
+
+* aa0fe13 Fix: Re-expose parse method (fixes #519) (#521) (Kevin Partington)
+* 655359f Chore: Makefile tweaks (#522) (Kevin Partington)
+
 v19.0.1 - September 25, 2018
 
 * 7a367c7 Fix: Remove lib from package.json files (#518) (James Henry)

Makefile.js

@@ -26,23 +26,6 @@ const OPEN_SOURCE_LICENSES = [
     /MIT/, /BSD/, /Apache/, /ISC/, /WTF/, /Public Domain/
 ];
 
-//------------------------------------------------------------------------------
-// Data
-//------------------------------------------------------------------------------
-
-const NODE_MODULES = "./node_modules/",
-
-    // Utilities - intentional extra space at the end of each string
-    JEST = `${NODE_MODULES}jest/bin/jest.js`,
-
-    // Files
-    MAKEFILE = "./Makefile.js",
-    /* eslint-disable no-use-before-define */
-    JS_FILES = "parser.js visitor-keys.js",
-    TEST_FILES = find("tests/lib/").filter(fileType("js")).join(" "),
-    TOOLS_FILES = find("tools/").filter(fileType("js")).join(" ");
-    /* eslint-enable no-use-before-define */
-
 //------------------------------------------------------------------------------
 // Helpers
 //------------------------------------------------------------------------------
@@ -59,6 +42,19 @@ function fileType(extension) {
     };
 }
 
+//------------------------------------------------------------------------------
+// Data
+//------------------------------------------------------------------------------
+
+const JEST = "jest",
+    LINT_OPTIONS = "--report-unused-disable-directives",
+
+    // Files
+    MAKEFILE = "./Makefile.js",
+    JS_FILES = "parser.js visitor-keys.js",
+    TEST_FILES = find("tests/lib/").filter(fileType("js")).join(" "),
+    TOOLS_FILES = find("tools/").filter(fileType("js")).join(" ");
+
 //------------------------------------------------------------------------------
 // Tasks
 //------------------------------------------------------------------------------
@@ -72,25 +68,25 @@ target.lint = function() {
         lastReturn;
 
     echo("Validating Makefile.js");
-    lastReturn = nodeCLI.exec("eslint", MAKEFILE);
+    lastReturn = nodeCLI.exec("eslint", MAKEFILE, LINT_OPTIONS);
     if (lastReturn.code !== 0) {
         errors++;
     }
 
     echo("Validating JavaScript files");
-    lastReturn = nodeCLI.exec("eslint", JS_FILES);
+    lastReturn = nodeCLI.exec("eslint", JS_FILES, LINT_OPTIONS);
     if (lastReturn.code !== 0) {
         errors++;
     }
 
     echo("Validating JavaScript test files");
-    lastReturn = nodeCLI.exec("eslint", TEST_FILES);
+    lastReturn = nodeCLI.exec("eslint", TEST_FILES, LINT_OPTIONS);
     if (lastReturn.code !== 0) {
         errors++;
     }
 
     echo("Validating JavaScript tools files");
-    lastReturn = nodeCLI.exec("eslint", TOOLS_FILES);
+    lastReturn = nodeCLI.exec("eslint", TOOLS_FILES, LINT_OPTIONS);
     if (lastReturn.code !== 0) {
         errors++;
     }

README.md

@@ -1,3 +1,6 @@
+> <h1>Help Wanted!</h1>
+> If you're familiar with TypeScript and ESLint, and you'd like to see this project progress, please consider contributing. We need people with a good knowledge of TypeScript to ensure that the integration with the ESLint ecosystem is useful.
+
 # TypeScript ESLint Parser
 
 An ESLint custom parser which leverages [TypeScript ESTree](https://github.com/JamesHenry/typescript-estree) to allow for ESLint to lint TypeScript source code.
@@ -37,10 +40,6 @@ If you use a non-supported version of TypeScript, the parser will log a warning
 
 **Please ensure that you are using a supported version before submitting any issues/bug reports.**
 
-## Help Wanted!
-
-If you're familiar with TypeScript and ESLint, and you'd like to see this project progress, please consider contributing. We need people with a good knowledge of TypeScript to ensure this parser is useful.
-
 ## Reporting Issues
 
 Please **do not report parsing/AST issues in this repo**, report them directly to [TypeScript ESTree](https://github.com/JamesHenry/typescript-estree).

package.json

@@ -1,10 +1,10 @@
 {
   "name": "typescript-eslint-parser",
-  "description": "An Esprima-style parser for TypeScript",
+  "description": "An ESLint custom parser which leverages TypeScript ESTree",
   "author": "Nicholas C. Zakas <[email protected]>",
   "homepage": "https://github.com/eslint/typescript-eslint-parser",
   "main": "parser.js",
-  "version": "19.0.1",
+  "version": "20.0.0",
   "files": [
     "parser.js",
     "visitor-keys.js"
@@ -20,12 +20,12 @@
   "devDependencies": {
     "eslint-config-eslint": "4.0.0",
     "eslint-plugin-node": "6.0.1",
-    "eslint-release": "0.11.1",
+    "eslint-release": "1.1.0",
     "jest": "23.1.0",
     "npm-license": "0.3.3",
     "shelljs": "0.8.2",
     "shelljs-nodecli": "0.1.1",
-    "typescript": "~3.0.1"
+    "typescript": "~3.1.1"
   },
   "keywords": [
     "ast",
@@ -42,16 +42,16 @@
     "integration-tests": "docker-compose -f tests/integration/docker-compose.yml up",
     "kill-integration-test-containers": "docker-compose -f tests/integration/docker-compose.yml down -v --rmi local",
     "lint": "node Makefile.js lint",
-    "release": "eslint-release",
-    "ci-release": "eslint-ci-release",
-    "gh-release": "eslint-gh-release",
-    "alpharelease": "eslint-prerelease alpha",
-    "betarelease": "eslint-prerelease beta"
+    "generate-release": "eslint-generate-release",
+    "generate-alpharelease": "eslint-generate-prerelease alpha",
+    "generate-betarelease": "eslint-generate-prerelease beta",
+    "generate-rcrelease": "eslint-generate-prerelease rc",
+    "publish-release": "eslint-publish-release"
   },
   "dependencies": {
     "eslint": "4.19.1",
-    "typescript-estree": "1.0.0",
-    "eslint-visitor-keys": "^1.0.0"
+    "eslint-visitor-keys": "^1.0.0",
+    "typescript-estree": "2.1.0"
   },
   "peerDependencies": {
     "typescript": "*"

parser.js

@@ -33,6 +33,10 @@ exports.parseForESLint = function parseForESLint(code, options) {
     return { ast, visitorKeys };
 };
 
+exports.parse = function(code, options) {
+    return this.parseForESLint(code, options).ast;
+};
+
 // Deep copy.
 /* istanbul ignore next */
 exports.Syntax = (function() {

tests/integration/declared-empty-body-functions-issue-162/package.json

@@ -8,6 +8,6 @@
     "devDependencies": {
         "eslint": "4.19.1",
         "jest": "23.1.0",
-        "typescript": "~2.9.1"
+        "typescript": "~3.1.1"
     }
 }

tests/integration/jsdoc-indent-issues-344-422/package.json

@@ -8,6 +8,6 @@
     "devDependencies": {
         "eslint": "4.19.1",
         "jest": "23.1.0",
-        "typescript": "~2.9.1"
+        "typescript": "~3.1.1"
     }
 }

tests/integration/method-overloads-issue-389/package.json

@@ -8,6 +8,6 @@
     "devDependencies": {
         "eslint": "4.19.1",
         "jest": "23.1.0",
-        "typescript": "~2.9.1"
+        "typescript": "~3.1.1"
     }
 }

tests/integration/no-redeclare-overloaded-functions-issue-402/package.json

@@ -8,6 +8,6 @@
     "devDependencies": {
         "eslint": "4.19.1",
         "jest": "23.1.0",
-        "typescript": "~2.9.1"
+        "typescript": "~3.1.1"
     }
 }

tests/integration/range-error-indent-issue-333/package.json

@@ -8,6 +8,6 @@
     "devDependencies": {
         "eslint": "4.19.1",
         "jest": "23.1.0",
-        "typescript": "~2.9.1"
+        "typescript": "~3.1.1"
     }
 }