Update ESLint

master-co · Oct 27, 2023 · c173341 · c173341
1 parent 07bc511
commit c173341
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 40 deletions.
diff --git a/docs/eslint/content.mdx b/docs/eslint/content.mdx
@@ -35,12 +35,12 @@ Detect syntax errors early when writing classes.
     }
 }
 ```
-Set `disallowUnknowClass: true` to disallow using traditional classes:
+Set `disallowUnknownClass: true` to disallow using traditional classes:
 ```json name=.eslintrc.json
 {
     "rules": {
         "@master/css/class-validation": ["error", {
-            "disallowUnknowClass": true
+            "disallowUnknownClass": true
         }]
     }
 }

diff --git a/examples/eslint/.eslintrc.js b/examples/eslint/.eslintrc.js
@@ -0,0 +1,26 @@
+module.exports = {
+    extends: [
+        '@master/css'
+    ],
+    rules: {
+        '@master/css/class-validation': ['error', {
+            disallowUnknownClass: true
+        }],
+    },
+    overrides: [
+        {
+            'files': [
+                '*.html'
+            ],
+            'parser': '@angular-eslint/template-parser'
+        },
+        {
+            'files': [
+                '*.ts',
+                '*.tsx',
+                '*.js'
+            ],
+            'parser': '@typescript-eslint/parser'
+        }
+    ]
+}
diff --git a/examples/eslint/.eslintrc.json b/examples/eslint/.eslintrc.json
diff --git a/examples/eslint/master.css.js b/examples/eslint/master.css.js
@@ -1,6 +1,6 @@
 /** @type {import('@master/css').Config} */
 export default {
     styles: {
-        btn: 'inline-flex'
+        // btn: 'inline-flex px:15'
     }
 }
diff --git a/examples/eslint/unknow.html b/examples/eslint/unknow.html
@@ -0,0 +1 @@
+<button class="btn">...</button>
diff --git a/examples/eslint/validation.html b/examples/eslint/validation.html
@@ -1,5 +1,3 @@
-<div class="btn card bg:#">
-    ...
-</div>
+<div class="bg:#">...</div>
 
 
diff --git a/packages/eslint-plugin/src/rules/class-collision.ts b/packages/eslint-plugin/src/rules/class-collision.ts
@@ -8,10 +8,10 @@ import { Rule } from 'eslint'
 export default {
     meta: {
         docs: {
-            description: 'Avoid declaring the identical CSS property repeatedly',
+            description: 'Avoid applying classes with the same CSS declaration',
             category: 'Stylistic Issues',
             recommended: false,
-            url: 'https://beta.css.master.co/docs/code-linting#avoid-declaring-the-identical-css-property-repeatedly',
+            url: 'https://beta.css.master.co/docs/code-linting#class-collision-detection',
         },
         messages: {
             collisionClass: '{{message}}',

diff --git a/packages/eslint-plugin/src/rules/class-order.ts b/packages/eslint-plugin/src/rules/class-order.ts
@@ -11,7 +11,7 @@ export default {
             description: 'Enforce a consistent and logical order of classes',
             category: 'Stylistic Issues',
             recommended: false,
-            url: 'https://beta.css.master.co/docs/code-linting#enforce-a-consistent-and-logical-order-of-classes',
+            url: 'https://beta.css.master.co/docs/code-linting#consistent-class-order',
         },
         messages: {
             invalidClassOrder: 'No consistent class order followed.',

diff --git a/packages/eslint-plugin/src/rules/class-validation.ts b/packages/eslint-plugin/src/rules/class-validation.ts
@@ -7,14 +7,14 @@ import { Rule } from 'eslint'
 export default {
     meta: {
         docs: {
-            description: 'Check the validity of classes with your configuration',
+            description: 'Detect syntax errors early when writing classes',
             category: 'Stylistic Issues',
             recommended: false,
-            url: 'https://beta.css.master.co/docs/code-linting#check-the-validity-of-classes-with-your-configuration',
+            url: 'https://beta.css.master.co/docs/code-linting#syntax-error-checks',
         },
         messages: {
             invalidClass: '{{message}}',
-            disallowUnknowClass: '{{message}}',
+            disallowUnknownClass: '{{message}}',
         },
         fixable: null
     },
@@ -41,12 +41,12 @@ export default {
                                             message: error.message + '.',
                                         }
                                     })
-                                } else if (options.disallowUnknowClass) {
+                                } else if (options.disallowUnknownClass) {
                                     context.report({
                                         loc: astUtil.findLoc(className, sourceCodeLines, nodeStartLine, nodeEndLine),
-                                        messageId: 'disallowUnknowClass',
+                                        messageId: 'disallowUnknownClass',
                                         data: {
-                                            message: `"${className}" is not a valid or known class.`,
+                                            message: `"${className}" is not a valid or known class.`
                                         }
                                     })
                                 }

diff --git a/packages/eslint-plugin/tests/validation.test.ts b/packages/eslint-plugin/tests/validation.test.ts
@@ -18,11 +18,11 @@ new RuleTester({
             code: `<div class="bg:black m:mistake rrr">Simple, basic</div>`,
             errors: [
                 { messageId: 'invalidClass' },
-                { messageId: 'disallowUnknowClass' }
+                { messageId: 'disallowUnknownClass' }
             ],
             options: [
                 {
-                    disallowUnknowClass: true
+                    disallowUnknownClass: true
                 }
             ]
         },
@@ -54,12 +54,12 @@ new RuleTester({
         {
             code: `<div class="btn rrr bg:black m:mistake">Simple, basic</div>`,
             errors: [
-                { messageId: 'disallowUnknowClass' },
+                { messageId: 'disallowUnknownClass' },
                 { messageId: 'invalidClass' }
             ],
             options: [
                 {
-                    disallowUnknowClass: true
+                    disallowUnknownClass: true
                 }
             ]
         },