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

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
 //------------------------------------------------------------------------------
@@ -68,7 +51,7 @@ const JEST = "jest",
 
     // Files
     MAKEFILE = "./Makefile.js",
-    JS_FILES = "parser.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(" ");
 

package.json

@@ -50,8 +50,8 @@
   },
   "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": "*"