chore: fix bad merge

bradzacher · bradzacher · commit 6586d98b944a · 2023-03-15T11:14:59.000+10:30
diff --git a/packages/eslint-plugin/src/rules/no-misused-promises.ts b/packages/eslint-plugin/src/rules/no-misused-promises.ts
@@ -378,7 +378,8 @@ export default util.createRule<Options, MessageId>({
       const contextualType = checker.getContextualType(value);
       if (
         contextualType !== undefined &&
-        isVoidReturningFunctionType(checker, value, contextualType)
+        isVoidReturningFunctionType(checker, value, contextualType) &&
+        returnsThenable(checker, value)
       ) {
         context.report({
           messageId: 'voidReturnAttribute',
diff --git a/packages/typescript-estree/src/parser.ts b/packages/typescript-estree/src/parser.ts
@@ -200,7 +200,7 @@ function parseAndGenerateServices<T extends TSESTreeOptions = TSESTreeOptions>(
   const hasFullTypeInformation =
     parseSettings.programs != null || parseSettings.projects?.length > 0;
 
-  if (typeof options !== 'undefined') {
+  if (options !== undefined) {
     if (
       typeof options.errorOnTypeScriptSyntacticAndSemanticIssues ===
         'boolean' &&
diff --git a/packages/website-eslint/types/index.d.ts b/packages/website-eslint/types/index.d.ts
diff --git a/packages/website/src/components/ASTViewerESTree.tsx b/packages/website/src/components/ASTViewerESTree.tsx
@@ -8,21 +8,19 @@ import { createESTreeSerializer } from './ast/serializer/serializerESTree';
 import type { ASTViewerBaseProps } from './ast/types';
 
 export interface ASTESTreeViewerProps extends ASTViewerBaseProps {
-  readonly value: TSESTree.BaseNode | TSESTree.Program;
+  readonly value: TSESTree.Node | TSESTree.Program;
   readonly filter?: ESQuery.Selector;
 }
 
-function tryToApplyFilter<T extends TSESTree.BaseNode>(
+function tryToApplyFilter<T extends TSESTree.Node>(
   value: T,
   filter?: ESQuery.Selector,
 ): T | T[] {
   try {
     if (window.esquery && filter) {
-      // @ts-expect-error - esquery requires js ast types
-      return window.esquery.match(value, filter);
+      return window.esquery.match(value, filter) as T[];
     }
   } catch (e: unknown) {
-    // eslint-disable-next-line no-console
     console.error(e);
   }
   return value;
diff --git a/packages/website/src/components/linter/WebLinter.ts b/packages/website/src/components/linter/WebLinter.ts
@@ -5,6 +5,7 @@ import type { ParserOptions } from '@typescript-eslint/types';
 import type { astConverter } from '@typescript-eslint/typescript-estree/use-at-your-own-risk/ast-converter';
 import type { getScriptKind } from '@typescript-eslint/typescript-estree/use-at-your-own-risk/getScriptKind';
 import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
+import type esquery from 'esquery';
 import type {
   CompilerHost,
   CompilerOptions,
@@ -20,6 +21,7 @@ export interface LintUtils {
   visitorKeys: TSESLint.SourceCode.VisitorKeys;
   astConverter: typeof astConverter;
   getScriptKind: typeof getScriptKind;
+  esquery: typeof esquery;
 }
 
 export class WebLinter {
diff --git a/packages/website/src/globals.d.ts b/packages/website/src/globals.d.ts
@@ -1,10 +1,11 @@
 import type * as SandboxFactory from '@site/src/vendor/sandbox';
 import type * as TsWorker from '@site/src/vendor/tsWorker';
-import type { LintUtils } from '@typescript-eslint/website-eslint';
 import type esquery from 'esquery';
 import type MonacoType from 'monaco-editor';
 import type * as TSType from 'typescript';
 
+import type { LintUtils } from './components/linter/WebLinter';
+
 declare global {
   type WindowRequireCb = (
     main: typeof MonacoType,
diff --git a/patches/@types+esquery+1.0.2.patch b/patches/@types+esquery+1.0.2.patch
@@ -0,0 +1,20 @@
+diff --git a/node_modules/@types/esquery/index.d.ts b/node_modules/@types/esquery/index.d.ts
+index ba54dba..c101712 100755
+--- a/node_modules/@types/esquery/index.d.ts
++++ b/node_modules/@types/esquery/index.d.ts
+@@ -4,12 +4,14 @@
+ //                 Brad Zacher <https://github.com/bradzacher>
+ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+ 
+-import { Node } from 'estree';
++import { TSESTree } from '@typescript-eslint/types';
+ 
+ export as namespace esquery;
+ 
+ export = query;
+ 
++type Node = TSESTree.Node;
++
+ /** Query the code AST using the selector string. */
+ declare function query(ast: Node, selector: string): Node[];
+ 
