fix(eslint-plugin): remove imports from typescript-estree (#706)

mikeharder · bradzacher · commit ceb2d32030cf · 2019-07-15T21:13:21.000-07:00
Fixes #705
diff --git a/packages/eslint-plugin/src/rules/prefer-readonly.ts b/packages/eslint-plugin/src/rules/prefer-readonly.ts
@@ -2,7 +2,10 @@ import * as tsutils from 'tsutils';
 import ts from 'typescript';
 import * as util from '../util';
 import { typeIsOrHasBaseType } from '../util';
-import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/typescript-estree';
+import {
+  TSESTree,
+  AST_NODE_TYPES,
+} from '@typescript-eslint/experimental-utils';
 
 type MessageIds = 'preferReadonly';
 
diff --git a/packages/eslint-plugin/src/rules/prefer-regexp-exec.ts b/packages/eslint-plugin/src/rules/prefer-regexp-exec.ts
@@ -1,4 +1,4 @@
-import { TSESTree } from '@typescript-eslint/typescript-estree';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 import { createRule, getParserServices, getTypeName } from '../util';
 import { getStaticValue } from 'eslint-utils';
 
diff --git a/packages/eslint-plugin/src/rules/triple-slash-reference.ts b/packages/eslint-plugin/src/rules/triple-slash-reference.ts
@@ -1,10 +1,5 @@
 import * as util from '../util';
-import {
-  Literal,
-  Node,
-  TSExternalModuleReference,
-} from '@typescript-eslint/typescript-estree/dist/ts-estree/ts-estree';
-import { TSESTree } from '@typescript-eslint/typescript-estree';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 type Options = [
   {
@@ -55,14 +50,14 @@ export default util.createRule<Options, MessageIds>({
     },
   ],
   create(context, [{ lib, path, types }]) {
-    let programNode: Node;
+    let programNode: TSESTree.Node;
     const sourceCode = context.getSourceCode();
     const references: ({
       comment: TSESTree.Comment;
       importName: string;
     })[] = [];
 
-    function hasMatchingReference(source: Literal) {
+    function hasMatchingReference(source: TSESTree.Literal) {
       references.forEach(reference => {
         if (reference.importName === source.value) {
           context.report({
@@ -78,14 +73,14 @@ export default util.createRule<Options, MessageIds>({
     return {
       ImportDeclaration(node) {
         if (programNode) {
-          const source = node.source as Literal;
+          const source = node.source as TSESTree.Literal;
           hasMatchingReference(source);
         }
       },
       TSImportEqualsDeclaration(node) {
         if (programNode) {
-          const source = (node.moduleReference as TSExternalModuleReference)
-            .expression as Literal;
+          const source = (node.moduleReference as TSESTree.TSExternalModuleReference)
+            .expression as TSESTree.Literal;
           hasMatchingReference(source);
         }
       },

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { TSESTree } from '@typescript-eslint/typescript-estree';`
	`1`	`+import { TSESTree } from '@typescript-eslint/experimental-utils';`
`2`	`2`	`import { createRule, getParserServices, getTypeName } from '../util';`
`3`	`3`	`import { getStaticValue } from 'eslint-utils';`
`4`	`4`