Merge branch 'main' of github.com:gajus/eslint-config-canonical

gajus · Sep 9, 2024 · 4f34ef5 · 4f34ef5
2 parents d9a5da7 + 20ffdad
commit 4f34ef5
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/configurations/cypress.js b/configurations/cypress.js
@@ -1,9 +1,11 @@
+const cypress = require('eslint-plugin-cypress/flat');
+
 module.exports.recommended = {
-  // env: {
-  //   'cypress/globals': true,
-  // },
+  languageOptions: {
+    globals: cypress.recommended.plugins.cypress.environments.globals.globals,
+  },
   plugins: {
-    cypress: require('eslint-plugin-cypress'),
+    cypress,
   },
   rules: {
     'cypress/assertion-before-screenshot': 2,

diff --git a/configurations/jest.js b/configurations/jest.js
@@ -1,9 +1,12 @@
+const jest = require('eslint-plugin-jest');
+
 module.exports.recommended = {
-  plugins: [
-    {
-      jest: require('eslint-plugin-jest'),
-    },
-  ],
+  languageOptions: {
+    globals: jest.environments.globals.globals,
+  },
+  plugins: {
+    jest,
+  },
   rules: {
     'jest/consistent-test-it': 2,
     'jest/expect-expect': 2,

diff --git a/configurations/jsdoc.js b/configurations/jsdoc.js
@@ -12,7 +12,12 @@ module.exports.recommended = {
     'jsdoc/check-param-names': 2,
     'jsdoc/check-property-names': 2,
     'jsdoc/check-syntax': 2,
-    'jsdoc/check-tag-names': 2,
+    'jsdoc/check-tag-names': [
+      2,
+      {
+        definedTags: ['jest-environment', 'jest-environment-options'],
+      },
+    ],
     'jsdoc/check-types': 2,
     'jsdoc/check-values': 2,
     'jsdoc/empty-tags': 2,

diff --git a/configurations/mocha.js b/configurations/mocha.js
@@ -1,6 +1,8 @@
+const globals = require('globals');
+
 module.exports.recommended = {
-  env: {
-    mocha: true,
+  languageOptions: {
+    globals: globals.mocha,
   },
   plugins: {
     mocha: require('eslint-plugin-mocha'),

diff --git a/configurations/react.js b/configurations/react.js
@@ -1,7 +1,7 @@
 const globals = require('globals');
 
 module.exports.recommended = {
-  files: ['**/*.tsx'],
+  files: ['**/*.{jsx,tsx}'],
   languageOptions: {
     globals: {
       ...globals.browser,