Merge branch 'main' into fix/5043

typescript-eslint · May 29, 2022 · 599925b · 599925b
2 parents 7dd9e03 + eaa99cf
commit 599925b
Show file tree

Hide file tree

Showing 8 changed files with 576 additions and 423 deletions.
diff --git a/.github/actions/prepare-install/action.yml b/.github/actions/prepare-install/action.yml
@@ -31,7 +31,9 @@ runs:
     - uses: actions/cache@v3
       id: yarn-cache
       with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        path: |
+          ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          ~/.cache/Cypress
         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
         restore-keys: |
           ${{ runner.os }}-yarn-

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -193,6 +193,9 @@ jobs:
       - name: Build
         uses: ./.github/actions/prepare-build
 
+      - name: Install Cypress
+        run: yarn cypress install
+
       - name: Cypress run
         uses: cypress-io/github-action@v2
         with:

diff --git a/packages/parser/src/parser.ts b/packages/parser/src/parser.ts
@@ -98,7 +98,6 @@ function parseForESLint(
 
   const parserOptions: TSESTreeOptions = {};
   Object.assign(parserOptions, options, {
-    useJSXTextNode: validateBoolean(options.useJSXTextNode, true),
     jsx: validateBoolean(options.ecmaFeatures.jsx),
   });
   const analyzeOptions: AnalyzeOptions = {

diff --git a/packages/parser/tests/lib/parser.ts b/packages/parser/tests/lib/parser.ts
@@ -40,7 +40,6 @@ describe('parser', () => {
       // ts-estree specific
       filePath: 'isolated-file.src.ts',
       project: 'tsconfig.json',
-      useJSXTextNode: false,
       errorOnUnknownASTType: false,
       errorOnTypeScriptSyntacticAndSemanticIssues: false,
       tsconfigRootDir: 'tests/fixtures/services',
@@ -62,7 +61,6 @@ describe('parser', () => {
       ecmaFeatures: {},
       jsx: false,
       sourceType: 'script',
-      useJSXTextNode: true,
       warnOnUnsupportedTypeScriptVersion: true,
     });
     spy.mockClear();
@@ -71,7 +69,6 @@ describe('parser', () => {
       ecmaFeatures: {},
       jsx: false,
       sourceType: 'script',
-      useJSXTextNode: true,
       loggerFn: false,
       warnOnUnsupportedTypeScriptVersion: false,
     });
@@ -98,7 +95,6 @@ describe('parser', () => {
       // ts-estree specific
       filePath: 'isolated-file.src.ts',
       project: 'tsconfig.json',
-      useJSXTextNode: false,
       errorOnUnknownASTType: false,
       errorOnTypeScriptSyntacticAndSemanticIssues: false,
       tsconfigRootDir: 'tests/fixtures/services',

diff --git a/packages/types/src/parser-options.ts b/packages/types/src/parser-options.ts
@@ -56,7 +56,6 @@ interface ParserOptions {
   sourceType?: SourceType;
   tokens?: boolean;
   tsconfigRootDir?: string;
-  useJSXTextNode?: boolean;
   warnOnUnsupportedTypeScriptVersion?: boolean;
   moduleResolver?: string;
 }

diff --git a/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts b/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts
@@ -455,8 +455,8 @@ tester.addFixturePatternConfig('typescript/expressions', {
   fileType: 'ts',
   ignore: [
     /**
-     * Produced AST is different
-     * TODO: investigate in more details
+     * Babel produces incorrect structure for TSInstantiationExpression and optional ChainExpression
+     * @see https://github.com/babel/babel/issues/14613
      */
     'instantiation-expression',
   ],

diff --git a/packages/website/package.json b/packages/website/package.json
@@ -14,11 +14,11 @@
     "test:open": "cypress open"
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.2",
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/preset-classic": "2.0.0-beta.20",
-    "@docusaurus/remark-plugin-npm2yarn": "2.0.0-beta.20",
-    "@docusaurus/theme-common": "2.0.0-beta.20",
+    "@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",
     "@mdx-js/react": "1.6.22",
     "@typescript-eslint/website-eslint": "5.26.0",
     "clsx": "^1.1.1",
@@ -32,11 +32,11 @@
     "typescript": "*"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "^2.0.0-beta.18",
+    "@docusaurus/module-type-aliases": "^2.0.0-beta.21",
     "@types/react": "^18.0.9",
     "@types/react-helmet": "^6.1.5",
     "@types/react-router-dom": "^5.3.3",
-    "copy-webpack-plugin": "^10.2.4",
+    "copy-webpack-plugin": "^11.0.0",
     "cypress": "8.3.0",
     "cypress-axe": "^0.14.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",