Merge branch 'migrate-plugin-to-ts' into contributors

bradzacher · bradzacher · commit 48bf8be9f840 · 2019-02-10T10:24:15.000-08:00
diff --git a/packages/parser/src/analyze-scope.ts b/packages/parser/src/analyze-scope.ts
@@ -361,7 +361,9 @@ class Referencer extends OriginalReferencer {
    * Create reference objects for the references in parameters and return type.
    * @param node The TSEmptyBodyFunctionExpression node to visit.
    */
-  TSEmptyBodyFunctionExpression(node: TSESTree.FunctionExpression): void {
+  TSEmptyBodyFunctionExpression(
+    node: TSESTree.TSEmptyBodyFunctionExpression
+  ): void {
     const upperTypeMode = this.typeMode;
     const { typeParameters, params, returnType } = node;
 
diff --git a/packages/parser/tests/lib/parser.ts b/packages/parser/tests/lib/parser.ts
@@ -33,12 +33,12 @@ describe('parser', () => {
   it('parseAndGenerateServices() should be called with options', () => {
     const code = 'const valid = true;';
     const spy = jest.spyOn(typescriptESTree, 'parseAndGenerateServices');
-    parseForESLint(code, {
+    const config = {
       loc: false,
       comment: false,
       range: false,
       tokens: false,
-      sourceType: 'module',
+      sourceType: 'module' as 'module',
       ecmaVersion: 10,
       ecmaFeatures: {
         globalReturn: false,
@@ -50,29 +50,13 @@ describe('parser', () => {
       useJSXTextNode: false,
       errorOnUnknownASTType: false,
       errorOnTypeScriptSyntacticAndSemanticIssues: false,
-      tsconfigRootDir: '../../',
+      tsconfigRootDir: './',
       extraFileExtensions: ['foo']
-    });
+    };
+    parseForESLint(code, config);
     expect(spy).toHaveBeenCalledWith(code, {
       jsx: false,
-      loc: false,
-      comment: false,
-      range: false,
-      tokens: false,
-      sourceType: 'module',
-      ecmaVersion: 10,
-      ecmaFeatures: {
-        globalReturn: false,
-        jsx: false
-      },
-      // ts-estree specific
-      filePath: 'test/foo',
-      project: 'tsconfig.json',
-      useJSXTextNode: false,
-      errorOnUnknownASTType: false,
-      errorOnTypeScriptSyntacticAndSemanticIssues: false,
-      tsconfigRootDir: '../../',
-      extraFileExtensions: ['foo']
+      ...config
     });
   });
 
diff --git a/packages/typescript-estree/tests/lib/semanticInfo.ts b/packages/typescript-estree/tests/lib/semanticInfo.ts
@@ -17,7 +17,7 @@ import {
   VariableDeclaration,
   ClassDeclaration,
   ClassProperty
-} from '../../src/typedefs';
+} from '../../src/ts-estree';
 
 //------------------------------------------------------------------------------
 // Setup
