fix config from v1.3.3

burtek · Nov 21, 2021 · 1346236 · 1346236
1 parent 8668932
commit 1346236
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 16 deletions.
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
@@ -34,9 +34,11 @@ jobs:
             package.json
             yarn.lock
             eslint-config-*.js
+      - name: 'Install dependencies'
+        run: yarn
+      - name: 'Test configs'
+        run: yarn test
       - name: 'Publish package'
-        run: |
-          yarn
-          yarn publish --tag latest --access public
+        run: yarn publish --tag latest --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.npmignore b/.npmignore
@@ -2,4 +2,5 @@
 /.github/
 /.gitignore
 /.markdownlint.json
-/.eslintrc
+/.eslintrc
+/eslint.test.js
diff --git a/eslint-config-base.js b/eslint-config-base.js
@@ -72,23 +72,11 @@ module.exports = {
                         'modifiers': ['const', 'global'],
                         'format': ['camelCase', 'UPPER_CASE']
                     },
-                    {
-                        'selector': 'variable',
-                        'modifiers': ['const', 'global', 'exported'],
-                        'type': 'function',
-                        'format': ['camelCase', 'UPPER_CASE', 'PascalCase']
-                    },
                     {
                         'selector': 'function',
                         'modifiers': ['global'],
                         'format': ['camelCase', 'PascalCase']
                     },
-                    {
-                        'selector': 'function',
-                        'modifiers': ['const', 'global'],
-                        'filter': /^use/,
-                        'format': ['camelCase']
-                    },
                     {
                         'selector': 'parameter',
                         'modifiers': ['unused'],

diff --git a/eslint-config-react.js b/eslint-config-react.js
@@ -61,6 +61,60 @@ module.exports = {
         'react/void-dom-elements-no-children': 'error'
     },
     overrides: [
+        {
+            files: ['*.tsx'],
+            rules: {
+                '@typescript-eslint/naming-convention': ['error',
+                    {
+                        'selector': 'default',
+                        'format': ['camelCase'],
+                        'leadingUnderscore': 'forbid',
+                        'trailingUnderscore': 'forbid'
+                    },
+                    {
+                        'selector': 'variable',
+                        'modifiers': ['const', 'global'],
+                        'format': ['camelCase', 'UPPER_CASE']
+                    },
+                    {
+                        'selector': 'variable',
+                        'modifiers': ['const', 'global', 'exported'],
+                        'types': ['function'],
+                        'format': ['camelCase', 'UPPER_CASE', 'PascalCase']
+                    },
+                    {
+                        'selector': 'variable',
+                        'modifiers': ['const', 'global', 'exported'],
+                        'types': ['function'],
+                        'filter': '^use',
+                        'format': ['camelCase']
+                    },
+                    {
+                        'selector': 'function',
+                        'modifiers': ['global'],
+                        'format': ['camelCase', 'PascalCase']
+                    },
+                    {
+                        'selector': 'function',
+                        'filter': '^use',
+                        'format': ['camelCase']
+                    },
+                    {
+                        'selector': 'parameter',
+                        'modifiers': ['unused'],
+                        'leadingUnderscore': 'allow',
+                        'format': null
+                    },
+                    {
+                        'selector': 'enumMember',
+                        'format': ['UPPER_CASE']
+                    },
+                    {
+                        'selector': 'typeLike',
+                        'format': ['PascalCase']
+                    }],
+            }
+        },
         {
             files: ['*.jsx', '*.tsx'],
             rules: {

diff --git a/eslint.test.js b/eslint.test.js
@@ -0,0 +1,23 @@
+const fs = require('fs');
+const eslint = require('eslint');
+
+function getErrors(configFile) {
+    const ESLint = eslint.ESLint;
+
+    const cli = new ESLint({
+        overrideConfigFile: configFile,
+    });
+
+    return cli.lintText('');
+}
+
+fs.readdirSync('.', { withFileTypes: true }).filter(f => f.isFile() && f.name.startsWith('eslint-config') && f.name.endsWith('.js')).forEach(async f => {
+    try {
+        await getErrors(f.name);
+    } catch (error) {
+        console.error('Error in file', f.name)
+        console.error(error)
+
+        process.exit(1);
+    }
+})
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
   },
   "private": false,
   "scripts": {
+    "test": "node eslint.test.js",
     "version": "auto-changelog -p && git add CHANGELOG.md"
   },
   "repository": {