Merge branch 'main' into fix-explicit-member-accessibility

typescript-eslint · Aug 24, 2022 · 5471380 · 5471380
2 parents 6395b8f + 1b2601a
commit 5471380
Show file tree

Hide file tree

Showing 25 changed files with 1,109 additions and 1,569 deletions.
diff --git a/...Declaration/fixtures/assertion/fixture.ts → ...ion/fixtures/_error_/assertion/fixture.ts b/...Declaration/fixtures/assertion/fixture.ts → ...ion/fixtures/_error_/assertion/fixture.ts
diff --git a/...s/assertion/snapshots/1-TSESTree-AST.shot → ..._/assertion/snapshots/1-TSESTree-AST.shot b/...s/assertion/snapshots/1-TSESTree-AST.shot → ..._/assertion/snapshots/1-TSESTree-AST.shot
diff --git a/...aration/ExportNamedDeclaration/fixtures/_error_/assertion/snapshots/1-TSESTree-Error.shot b/...aration/ExportNamedDeclaration/fixtures/_error_/assertion/snapshots/1-TSESTree-Error.shot
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AST Fixtures declaration ExportNamedDeclaration _error_ assertion TSESTree - Error 1`] = `"NO ERROR"`;
diff --git a/...eclaration/ExportNamedDeclaration/fixtures/_error_/assertion/snapshots/2-Babel-Error.shot b/...eclaration/ExportNamedDeclaration/fixtures/_error_/assertion/snapshots/2-Babel-Error.shot
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AST Fixtures declaration ExportNamedDeclaration _error_ assertion Babel - Error 1`] = `[SyntaxError: A JSON module can only be imported with \`default\`. (1:9)]`;
diff --git a/...ssertion/snapshots/2-TSESTree-Tokens.shot → ...ssertion/snapshots/2-TSESTree-Tokens.shot b/...ssertion/snapshots/2-TSESTree-Tokens.shot → ...ssertion/snapshots/2-TSESTree-Tokens.shot
diff --git a/...ration/ExportNamedDeclaration/fixtures/_error_/assertion/snapshots/3-Alignment-Error.shot b/...ration/ExportNamedDeclaration/fixtures/_error_/assertion/snapshots/3-Alignment-Error.shot
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AST Fixtures declaration ExportNamedDeclaration _error_ assertion Error Alignment 1`] = `"Babel errored but TSESTree didn't"`;
diff --git a/...ures/assertion/snapshots/3-Babel-AST.shot → ...ror_/assertion/snapshots/3-Babel-AST.shot b/...ures/assertion/snapshots/3-Babel-AST.shot → ...ror_/assertion/snapshots/3-Babel-AST.shot
diff --git a/...s/assertion/snapshots/4-Babel-Tokens.shot → ..._/assertion/snapshots/4-Babel-Tokens.shot b/...s/assertion/snapshots/4-Babel-Tokens.shot → ..._/assertion/snapshots/4-Babel-Tokens.shot
diff --git a/...ertion/snapshots/5-AST-Alignment-AST.shot → ...ertion/snapshots/5-AST-Alignment-AST.shot b/...ertion/snapshots/5-AST-Alignment-AST.shot → ...ertion/snapshots/5-AST-Alignment-AST.shot
diff --git a/...ion/snapshots/6-AST-Alignment-Tokens.shot → ...ion/snapshots/6-AST-Alignment-Tokens.shot b/...ion/snapshots/6-AST-Alignment-Tokens.shot → ...ion/snapshots/6-AST-Alignment-Tokens.shot
diff --git a/packages/ast-spec/tests/fixtures-with-differences-errors.shot b/packages/ast-spec/tests/fixtures-with-differences-errors.shot
@@ -9,6 +9,7 @@ Object {
     "declaration/ExportAllDeclaration/fixtures/_error_/kind-type/fixture.ts",
     "declaration/ExportAllDeclaration/fixtures/_error_/type-kind/fixture.ts",
     "declaration/ExportNamedDeclaration/fixtures/_error_/anonymous-class/fixture.ts",
+    "declaration/ExportNamedDeclaration/fixtures/_error_/assertion/fixture.ts",
     "declaration/FunctionDeclaration/fixtures/_error_/missing-type-param/fixture.ts",
     "declaration/TSDeclareFunction/fixtures/_error_/async/fixture.ts",
     "declaration/TSDeclareFunction/fixtures/_error_/declare-with-body/fixture.ts",

diff --git a/packages/eslint-plugin/src/rules/array-type.ts b/packages/eslint-plugin/src/rules/array-type.ts
@@ -104,18 +104,18 @@ export default util.createRule<Options, MessageIds>({
     },
     schema: [
       {
-        definitions: {
+        $defs: {
           arrayOption: {
             enum: ['array', 'generic', 'array-simple'],
           },
         },
         properties: {
           default: {
-            $ref: '#/definitions/arrayOption',
+            $ref: '#/$defs/arrayOption',
             description: 'The array type expected for mutable cases...',
           },
           readonly: {
-            $ref: '#/definitions/arrayOption',
+            $ref: '#/$defs/arrayOption',
             description:
               'The array type expected for readonly cases. If omitted, the value for `default` will be used.',
           },

diff --git a/packages/eslint-plugin/src/rules/ban-ts-comment.ts b/packages/eslint-plugin/src/rules/ban-ts-comment.ts
@@ -40,7 +40,7 @@ export default util.createRule<[Options], MessageIds>({
     },
     schema: [
       {
-        definitions: {
+        $defs: {
           directiveConfigSchema: {
             oneOf: [
               {
@@ -62,11 +62,11 @@ export default util.createRule<[Options], MessageIds>({
         type: 'object',
         properties: {
           'ts-expect-error': {
-            $ref: '#/definitions/directiveConfigSchema',
+            $ref: '#/$defs/directiveConfigSchema',
           },
-          'ts-ignore': { $ref: '#/definitions/directiveConfigSchema' },
-          'ts-nocheck': { $ref: '#/definitions/directiveConfigSchema' },
-          'ts-check': { $ref: '#/definitions/directiveConfigSchema' },
+          'ts-ignore': { $ref: '#/$defs/directiveConfigSchema' },
+          'ts-nocheck': { $ref: '#/$defs/directiveConfigSchema' },
+          'ts-check': { $ref: '#/$defs/directiveConfigSchema' },
           minimumDescriptionLength: {
             type: 'number',
             default: defaultMinimumDescriptionLength,

diff --git a/packages/eslint-plugin/src/rules/comma-dangle.ts b/packages/eslint-plugin/src/rules/comma-dangle.ts
@@ -46,7 +46,7 @@ export default util.createRule<Options, MessageIds>({
       extendsBaseRule: true,
     },
     schema: {
-      definitions: {
+      $defs: {
         value: {
           enum: OPTION_VALUE_SCHEME,
         },
@@ -59,19 +59,19 @@ export default util.createRule<Options, MessageIds>({
         {
           oneOf: [
             {
-              $ref: '#/definitions/value',
+              $ref: '#/$defs/value',
             },
             {
               type: 'object',
               properties: {
-                arrays: { $ref: '#/definitions/valueWithIgnore' },
-                objects: { $ref: '#/definitions/valueWithIgnore' },
-                imports: { $ref: '#/definitions/valueWithIgnore' },
-                exports: { $ref: '#/definitions/valueWithIgnore' },
-                functions: { $ref: '#/definitions/valueWithIgnore' },
-                enums: { $ref: '#/definitions/valueWithIgnore' },
-                generics: { $ref: '#/definitions/valueWithIgnore' },
-                tuples: { $ref: '#/definitions/valueWithIgnore' },
+                arrays: { $ref: '#/$defs/valueWithIgnore' },
+                objects: { $ref: '#/$defs/valueWithIgnore' },
+                imports: { $ref: '#/$defs/valueWithIgnore' },
+                exports: { $ref: '#/$defs/valueWithIgnore' },
+                functions: { $ref: '#/$defs/valueWithIgnore' },
+                enums: { $ref: '#/$defs/valueWithIgnore' },
+                generics: { $ref: '#/$defs/valueWithIgnore' },
+                tuples: { $ref: '#/$defs/valueWithIgnore' },
               },
               additionalProperties: false,
             },

diff --git a/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts b/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
@@ -68,20 +68,20 @@ export default util.createRule<Options, MessageIds>({
     },
     schema: [
       {
-        definitions: {
+        $defs: {
           accessibilityLevel,
         },
         type: 'object',
         properties: {
-          accessibility: { $ref: '#/definitions/accessibilityLevel' },
+          accessibility: { $ref: '#/$defs/accessibilityLevel' },
           overrides: {
             type: 'object',
             properties: {
-              accessors: { $ref: '#/definitions/accessibilityLevel' },
-              constructors: { $ref: '#/definitions/accessibilityLevel' },
-              methods: { $ref: '#/definitions/accessibilityLevel' },
-              properties: { $ref: '#/definitions/accessibilityLevel' },
-              parameterProperties: { $ref: '#/definitions/accessibilityLevel' },
+              accessors: { $ref: '#/$defs/accessibilityLevel' },
+              constructors: { $ref: '#/$defs/accessibilityLevel' },
+              methods: { $ref: '#/$defs/accessibilityLevel' },
+              properties: { $ref: '#/$defs/accessibilityLevel' },
+              parameterProperties: { $ref: '#/$defs/accessibilityLevel' },
             },
 
             additionalProperties: false,

diff --git a/packages/eslint-plugin/src/rules/padding-line-between-statements.ts b/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
@@ -594,7 +594,7 @@ export default util.createRule<Options, MessageIds>({
     fixable: 'whitespace',
     hasSuggestions: false,
     schema: {
-      definitions: {
+      $defs: {
         paddingType: {
           enum: Object.keys(PaddingTypes),
         },
@@ -615,9 +615,9 @@ export default util.createRule<Options, MessageIds>({
       items: {
         type: 'object',
         properties: {
-          blankLine: { $ref: '#/definitions/paddingType' },
-          prev: { $ref: '#/definitions/statementType' },
-          next: { $ref: '#/definitions/statementType' },
+          blankLine: { $ref: '#/$defs/paddingType' },
+          prev: { $ref: '#/$defs/statementType' },
+          next: { $ref: '#/$defs/statementType' },
         },
         additionalProperties: false,
         required: ['blankLine', 'prev', 'next'],

diff --git a/packages/eslint-plugin/src/rules/parameter-properties.ts b/packages/eslint-plugin/src/rules/parameter-properties.ts
@@ -38,7 +38,7 @@ export default util.createRule<Options, MessageIds>({
     },
     schema: [
       {
-        definitions: {
+        $defs: {
           modifier: {
             enum: [
               'readonly',
@@ -56,7 +56,7 @@ export default util.createRule<Options, MessageIds>({
           allow: {
             type: 'array',
             items: {
-              $ref: '#/definitions/modifier',
+              $ref: '#/$defs/modifier',
             },
             minItems: 1,
           },

diff --git a/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts b/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts
@@ -397,6 +397,11 @@ tester.addFixturePatternConfig('typescript/basics', {
      * SyntaxError: Missing initializer in const declaration.
      */
     'var-with-definite-assignment',
+    /**
+     * [BABEL ERRORED, BUT TS-ESTREE DID NOT]
+     * SyntaxError: A JSON module can only be imported with `default`.
+     */
+    'export-with-import-assertions',
   ],
   ignoreSourceType: [
     /**

diff --git a/packages/website/docusaurusConfig.ts b/packages/website/docusaurusConfig.ts
@@ -55,8 +55,8 @@ const pluginContentDocsOptions: PluginContentDocsOptions = {
 
 const themeConfig: ThemeCommonConfig & AlgoliaThemeConfig = {
   algolia: {
-    appId: 'BH4D9OD16A',
-    apiKey: '1ad6b47d4e742c4c0653877b5511c602',
+    appId: 'N1HUB2TU6A',
+    apiKey: '74d42ed10d0f7b327d74d774570035c7',
     indexName: 'typescript-eslint',
   },
   metadata: [

diff --git a/packages/website/package.json b/packages/website/package.json
@@ -15,10 +15,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.3",
-    "@docusaurus/core": "2.0.0-beta.21",
-    "@docusaurus/preset-classic": "2.0.0-beta.21",
-    "@docusaurus/remark-plugin-npm2yarn": "2.0.0-beta.21",
-    "@docusaurus/theme-common": "2.0.0-beta.21",
+    "@docusaurus/core": "~2.0.1",
+    "@docusaurus/preset-classic": "~2.0.1",
+    "@docusaurus/remark-plugin-npm2yarn": "~2.0.1",
+    "@docusaurus/theme-common": "~2.0.1",
     "@mdx-js/react": "1.6.22",
     "@typescript-eslint/parser": "5.34.0",
     "@typescript-eslint/website-eslint": "5.34.0",
@@ -37,7 +37,7 @@
     "typescript": "*"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "^2.0.0-beta.21",
+    "@docusaurus/module-type-aliases": "~2.0.1",
     "@types/react": "^18.0.9",
     "@types/react-helmet": "^6.1.5",
     "@types/react-router-dom": "^5.3.3",
@@ -50,7 +50,7 @@
     "eslint-plugin-react-hooks": "^4.5.0",
     "globby": "^11.1.0",
     "monaco-editor": "^0.33.0",
-    "webpack": "^5.72.1"
+    "webpack": "^5.74.0"
   },
   "browserslist": {
     "production": [

diff --git a/packages/website/src/components/ErrorsViewer.tsx b/packages/website/src/components/ErrorsViewer.tsx
@@ -3,7 +3,7 @@ import type Monaco from 'monaco-editor';
 import clsx from 'clsx';
 
 import type { ErrorItem, ErrorGroup } from './types';
-import IconExternalLink from '@theme/IconExternalLink';
+import IconExternalLink from '@theme/Icon/ExternalLink';
 import styles from './ErrorsViewer.module.css';
 
 export interface ErrorsViewerProps {

diff --git a/packages/website/src/pages/play.tsx b/packages/website/src/pages/play.tsx
@@ -8,7 +8,11 @@ function Play(): JSX.Element {
     <Layout title="Playground" description="Playground" noFooter={true}>
       <BrowserOnly fallback={<Loader />}>
         {(): JSX.Element => {
-          const Playground = lazy(() => import('../components/Playground'));
+          const Playground = lazy(
+            () =>
+              // @ts-expect-error: This does not follow Node resolution
+              import('../components/Playground') as Promise<() => JSX.Element>,
+          );
           return (
             <Suspense fallback={<Loader />}>
               <Playground />

diff --git a/packages/website/src/theme/CodeBlock/Content/String.tsx b/packages/website/src/theme/CodeBlock/Content/String.tsx
@@ -2,15 +2,14 @@
 
 import React from 'react';
 import clsx from 'clsx';
+import { useThemeConfig, usePrismTheme } from '@docusaurus/theme-common';
 import {
-  useThemeConfig,
   parseCodeBlockTitle,
   parseLanguage,
   parseLines,
   containsLineNumbers,
-  usePrismTheme,
   useCodeWordWrap,
-} from '@docusaurus/theme-common';
+} from '@docusaurus/theme-common/internal';
 import Highlight, { defaultProps, type Language } from 'prism-react-renderer';
 import Line from '@theme/CodeBlock/Line';
 import CopyButton from '@theme/CodeBlock/CopyButton';

diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "module": "commonjs",
-    "moduleResolution": "node",
+    "module": "CommonJS",
+    "moduleResolution": "NodeNext",
     "allowJs": true,
     "esModuleInterop": true,
     "jsx": "react",