Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: #216
  • Loading branch information
francoismassart committed Mar 1, 2023
commit 9310b42cc5a50a569fe1bad53d08d7d76f8519fa
2 changes: 1 addition & 1 deletion lib/rules/classnames-order.js
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ module.exports = {
*/
VAttribute: function (node) {
switch (true) {
case !astUtil.isValidVueAttribute(node):
case !astUtil.isValidVueAttribute(node, classRegex):
return;
case astUtil.isVLiteralValue(node):
sortNodeArgumentValue(node, null);
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/enforces-negative-arbitrary-values.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ module.exports = {
*/
VAttribute: function (node) {
switch (true) {
case !astUtil.isValidVueAttribute(node):
case !astUtil.isValidVueAttribute(node, classRegex):
return;
case astUtil.isVLiteralValue(node):
parseForNegativeArbitraryClassNames(node);
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/enforces-shorthand.js
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ module.exports = {
*/
VAttribute: function (node) {
switch (true) {
case !astUtil.isValidVueAttribute(node):
case !astUtil.isValidVueAttribute(node, classRegex):
return;
case astUtil.isVLiteralValue(node):
parseForShorthandCandidates(node);
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/migration-from-tailwind-2.js
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ module.exports = {
*/
VAttribute: function (node) {
switch (true) {
case !astUtil.isValidVueAttribute(node):
case !astUtil.isValidVueAttribute(node, classRegex):
return;
case astUtil.isVLiteralValue(node):
parseForObsoleteClassNames(node);
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-arbitrary-value.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ module.exports = {
*/
VAttribute: function (node) {
switch (true) {
case !astUtil.isValidVueAttribute(node):
case !astUtil.isValidVueAttribute(node, classRegex):
return;
case astUtil.isVLiteralValue(node):
parseForArbitraryValues(node, null);
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-contradicting-classname.js
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ module.exports = {
*/
VAttribute: function (node) {
switch (true) {
case !astUtil.isValidVueAttribute(node):
case !astUtil.isValidVueAttribute(node, classRegex):
return;
case astUtil.isVLiteralValue(node):
astUtil.parseNodeRecursive(node, null, parseForContradictingClassNames, true);
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-custom-classname.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ module.exports = {
*/
VAttribute: function (node) {
switch (true) {
case !astUtil.isValidVueAttribute(node):
case !astUtil.isValidVueAttribute(node, classRegex):
return;
case astUtil.isVLiteralValue(node):
astUtil.parseNodeRecursive(node, null, parseForCustomClassNames);
Expand Down
16 changes: 9 additions & 7 deletions lib/util/ast.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,26 @@ function isClassAttribute(node, classRegex) {
* Find out if node is `class`
*
* @param {ASTNode} node The AST node being checked
* @param {String} classRegex Regex to test the attribute that is being checked against
* @returns {Boolean}
*/
function isVueClassAttribute(node) {
function isVueClassAttribute(node, classRegex) {
const re = new RegExp(classRegex);
let name = '';
switch (true) {
case node.key && /^class$/.test(node.key.name):
case node.key && node.key.name && re.test(node.key.name):
// class="vue-classes-as-litteral"
return true;
break;
case node.key &&
node.key.name &&
node.key.name.name &&
node.key.argument &&
node.key.argument.name &&
/^bind$/.test(node.key.name.name) &&
/^class$/.test(node.key.argument.name):
re.test(node.key.argument.name):
// v-bind:class="vue-classes-as-bind"
// :class="vue-classes-as-bind"
return true;
break;
default:
return false;
}
Expand Down Expand Up @@ -154,10 +155,11 @@ function isValidJSXAttribute(node, classRegex) {
* Find out if the node is a valid candidate for our rules
*
* @param {ASTNode} node The AST node being checked
* @param {String} classRegex Regex to test the attribute that is being checked against
* @returns {Boolean}
*/
function isValidVueAttribute(node) {
if (!isVueClassAttribute(node)) {
function isValidVueAttribute(node, classRegex) {
if (!isVueClassAttribute(node, classRegex)) {
// Only run for class attributes
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-plugin-tailwindcss",
"version": "3.10.0",
"version": "3.10.1-beta.3",
"description": "Rules enforcing best practices while using Tailwind CSS",
"keywords": [
"eslint",
Expand Down