Merge pull request #292 from 0Miles/dev/beta

Update ESLint
master-co · Oct 25, 2023 · f1185c0 · f1185c0
2 parents 89039fe + 5ca326c
commit f1185c0
Show file tree

Hide file tree

Showing 2 changed files with 421 additions and 3 deletions.
diff --git a/packages/eslint-plugin/lib/rules/class-order.js b/packages/eslint-plugin/lib/rules/class-order.js
@@ -123,8 +123,13 @@ module.exports = {
                 const w = whitespaces[i] ?? ''
                 const cls = orderedClassNames[i]
                 validatedClassNamesValue += headSpace ? `${w}${cls}` : `${cls}${w}`
-                if (headSpace && tailSpace && i === orderedClassNames.length - 1) {
-                    validatedClassNamesValue += whitespaces[whitespaces.length - 1] ?? ''
+                if (cls) {
+                    if (!tailSpace && i === orderedClassNames.length - 1) {
+                        validatedClassNamesValue = validatedClassNamesValue.replace(/\s+$/, '')
+                    }
+                    if (headSpace && tailSpace && i === orderedClassNames.length - 1) {
+                        validatedClassNamesValue += whitespaces[whitespaces.length - 1] ?? ''
+                    }
                 }
             }