eslint-plugin-better-tailwindcss 3.4.0 → 3.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/rules/no-conflicting-classes.d.ts.map +1 -1
- package/lib/cjs/rules/no-conflicting-classes.js +17 -16
- package/lib/cjs/rules/no-conflicting-classes.js.map +1 -1
- package/lib/cjs/tailwindcss/conflicting-classes.async.v4.d.ts.map +1 -1
- package/lib/cjs/tailwindcss/conflicting-classes.async.v4.js +10 -15
- package/lib/cjs/tailwindcss/conflicting-classes.async.v4.js.map +1 -1
- package/lib/cjs/tailwindcss/conflicting-classes.d.ts +6 -5
- package/lib/cjs/tailwindcss/conflicting-classes.d.ts.map +1 -1
- package/lib/cjs/tailwindcss/conflicting-classes.js.map +1 -1
- package/lib/esm/rules/no-conflicting-classes.d.ts.map +1 -1
- package/lib/esm/rules/no-conflicting-classes.js +18 -17
- package/lib/esm/rules/no-conflicting-classes.js.map +1 -1
- package/lib/esm/tailwindcss/conflicting-classes.async.v4.d.ts.map +1 -1
- package/lib/esm/tailwindcss/conflicting-classes.async.v4.js +10 -15
- package/lib/esm/tailwindcss/conflicting-classes.async.v4.js.map +1 -1
- package/lib/esm/tailwindcss/conflicting-classes.d.ts +6 -5
- package/lib/esm/tailwindcss/conflicting-classes.d.ts.map +1 -1
- package/lib/esm/tailwindcss/conflicting-classes.js.map +1 -1
- package/package.json +1 -1
- package/lib/cjs/rules/multiline.d.ts +0 -15
- package/lib/cjs/rules/multiline.d.ts.map +0 -1
- package/lib/cjs/rules/multiline.js +0 -566
- package/lib/cjs/rules/multiline.js.map +0 -1
- package/lib/cjs/rules/sort-classes.d.ts +0 -19
- package/lib/cjs/rules/sort-classes.d.ts.map +0 -1
- package/lib/cjs/rules/sort-classes.js +0 -157
- package/lib/cjs/rules/sort-classes.js.map +0 -1
- package/lib/esm/rules/multiline.d.ts +0 -15
- package/lib/esm/rules/multiline.d.ts.map +0 -1
- package/lib/esm/rules/multiline.js +0 -563
- package/lib/esm/rules/multiline.js.map +0 -1
- package/lib/esm/rules/sort-classes.d.ts +0 -19
- package/lib/esm/rules/sort-classes.d.ts.map +0 -1
- package/lib/esm/rules/sort-classes.js +0 -153
- package/lib/esm/rules/sort-classes.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-conflicting-classes.d.ts","sourceRoot":"","sources":["../../../src/rules/no-conflicting-classes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"no-conflicting-classes.d.ts","sourceRoot":"","sources":["../../../src/rules/no-conflicting-classes.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGnC,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,UAAU,EACV,SAAS,EACT,cAAc,EACf,MAAM,kCAAkC,CAAC;AAG1C,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CACL,eAAe,GACf,YAAY,GACZ,SAAS,GACT,cAAc,GACd;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CACF;CACF,CAAC;AAYF,eAAO,MAAM,oBAAoB,EAAE,UAAU,CAAC,OAAO,CA4BpD,CAAC;AAoDF,wBAAgB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW;;;;;;EAE/C"}
|
|
@@ -52,27 +52,28 @@ function lintLiterals(ctx, literals) {
|
|
|
52
52
|
if (Object.keys(conflictingClasses).length === 0) {
|
|
53
53
|
continue;
|
|
54
54
|
}
|
|
55
|
-
for (const
|
|
56
|
-
const conflicts = conflictingClasses[
|
|
57
|
-
|
|
58
|
-
const conflict = conflicts.find(conflict => conflict.tailwindClassName === conflictingClass);
|
|
59
|
-
if (!conflict || otherConflicts.length === 0) {
|
|
55
|
+
for (const className in conflictingClasses) {
|
|
56
|
+
const conflicts = Object.entries(conflictingClasses[className]);
|
|
57
|
+
if (conflicts.length === 0) {
|
|
60
58
|
continue;
|
|
61
59
|
}
|
|
60
|
+
const conflictingClassNames = conflicts.map(([conflictingClassName]) => conflictingClassName);
|
|
61
|
+
const conflictingProperties = conflicts.reduce((acc, [, properties]) => {
|
|
62
|
+
for (const property of properties) {
|
|
63
|
+
if (!acc.includes(property.cssPropertyName)) {
|
|
64
|
+
acc.push(property.cssPropertyName);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return acc;
|
|
68
|
+
}, []);
|
|
62
69
|
ctx.report({
|
|
63
70
|
data: {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
otherConflicts.push(`${otherConflict.tailwindClassName} -> (${otherConflict.cssPropertyName}: ${otherConflict.cssPropertyValue})`);
|
|
68
|
-
}
|
|
69
|
-
return otherConflicts;
|
|
70
|
-
}, []).join(", "),
|
|
71
|
-
property: conflict.cssPropertyName,
|
|
72
|
-
value: conflict.cssPropertyValue ?? ""
|
|
71
|
+
className,
|
|
72
|
+
conflictingClassNames: conflictingClassNames.join(", "),
|
|
73
|
+
conflictingProperties: conflictingProperties.map(conflictingProperty => `"${conflictingProperty}"`).join(", ")
|
|
73
74
|
},
|
|
74
|
-
loc: (0, utils_js_1.getExactClassLocation)(literal,
|
|
75
|
-
message: (0, utils_js_1.augmentMessageWithWarnings)("Conflicting class detected: {{
|
|
75
|
+
loc: (0, utils_js_1.getExactClassLocation)(literal, className),
|
|
76
|
+
message: (0, utils_js_1.augmentMessageWithWarnings)("Conflicting class detected: \"{{ className }}\" and \"{{ conflictingClassNames }}\" apply the same CSS properties: {{ conflictingProperties }}.", DOCUMENTATION_URL, warnings)
|
|
76
77
|
});
|
|
77
78
|
}
|
|
78
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-conflicting-classes.js","sourceRoot":"","sources":["../../../src/rules/no-conflicting-classes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"no-conflicting-classes.js","sourceRoot":"","sources":["../../../src/rules/no-conflicting-classes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflicting-classes.async.v4.d.ts","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.async.v4.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"conflicting-classes.async.v4.d.ts","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.async.v4.ts"],"names":[],"mappings":"AA2EA,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,aAAa,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,CAAC;IAC1C,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,OAAO,EAAE,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,OAAO,EAAE,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;AACtC,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,GAAG,SAAS,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const synckit_1 = require("synckit");
|
|
4
4
|
const context_async_v4_js_1 = require("./context.async.v4.js");
|
|
5
5
|
(0, synckit_1.runAsWorker)(async ({ classes, configPath }) => {
|
|
6
|
+
var _a;
|
|
6
7
|
const context = await (0, context_async_v4_js_1.createTailwindContext)(configPath);
|
|
7
8
|
const conflicts = {};
|
|
8
9
|
const classRules = classes.reduce((classRules, className) => ({
|
|
@@ -27,7 +28,6 @@ const context_async_v4_js_1 = require("./context.async.v4.js");
|
|
|
27
28
|
if (paths.length !== otherPaths.length) {
|
|
28
29
|
continue otherClassLoop;
|
|
29
30
|
}
|
|
30
|
-
const potentialConflicts = [];
|
|
31
31
|
for (const path of paths) {
|
|
32
32
|
for (const otherPath of otherPaths) {
|
|
33
33
|
if (path !== otherPath) {
|
|
@@ -37,24 +37,19 @@ const context_async_v4_js_1 = require("./context.async.v4.js");
|
|
|
37
37
|
continue otherClassLoop;
|
|
38
38
|
}
|
|
39
39
|
for (const classRuleProperty of classRule[path]) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
}
|
|
45
|
-
potentialConflicts.push({
|
|
46
|
-
...classRuleProperty,
|
|
47
|
-
tailwindClassName: className
|
|
48
|
-
}, {
|
|
49
|
-
...otherClassRuleProperty,
|
|
50
|
-
tailwindClassName: otherClassName
|
|
51
|
-
});
|
|
40
|
+
if (!otherClassRule[otherPath].find(otherProp => {
|
|
41
|
+
return otherProp.cssPropertyName === classRuleProperty.cssPropertyName;
|
|
42
|
+
})) {
|
|
43
|
+
continue otherClassLoop;
|
|
52
44
|
}
|
|
53
45
|
}
|
|
46
|
+
for (const otherClassRuleProperty of otherClassRule[otherPath]) {
|
|
47
|
+
conflicts[className] ?? (conflicts[className] = {});
|
|
48
|
+
(_a = conflicts[className])[otherClassName] ?? (_a[otherClassName] = []);
|
|
49
|
+
conflicts[className][otherClassName].push(otherClassRuleProperty);
|
|
50
|
+
}
|
|
54
51
|
}
|
|
55
52
|
}
|
|
56
|
-
conflicts[className] ?? (conflicts[className] = []);
|
|
57
|
-
conflicts[className].push(...potentialConflicts);
|
|
58
53
|
}
|
|
59
54
|
}
|
|
60
55
|
return conflicts;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflicting-classes.async.v4.js","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.async.v4.ts"],"names":[],"mappings":";;AAAA,qCAAsC;AAEtC,+DAA8D;AAS9D,IAAA,qBAAW,EAAC,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAgC,EAA0C,EAAE
|
|
1
|
+
{"version":3,"file":"conflicting-classes.async.v4.js","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.async.v4.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,12 @@ export interface GetConflictingClassesRequest {
|
|
|
5
5
|
export type GetConflictingClassesResponse = ConflictingClasses;
|
|
6
6
|
export type ConflictingClasses = {
|
|
7
7
|
[className: string]: {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
[conflictingClassName: string]: {
|
|
9
|
+
cssPropertyName: string;
|
|
10
|
+
important: boolean;
|
|
11
|
+
cssPropertyValue?: string;
|
|
12
|
+
}[];
|
|
13
|
+
};
|
|
13
14
|
};
|
|
14
15
|
export declare function getConflictingClasses({ classes, configPath, cwd }: {
|
|
15
16
|
classes: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflicting-classes.d.ts","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,6BAA6B,GAAG,kBAAkB,CAAC;AAE/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,SAAS,EAAE,MAAM,GAAG;QACnB,
|
|
1
|
+
{"version":3,"file":"conflicting-classes.d.ts","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,6BAA6B,GAAG,kBAAkB,CAAC;AAE/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,SAAS,EAAE,MAAM,GAAG;QACnB,CAAC,oBAAoB,EAAE,MAAM,GAAG;YAC9B,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,OAAO,CAAC;YACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;SAC3B,EAAE,CAAC;KACL,CAAC;CACH,CAAC;AAGF,wBAAgB,qBAAqB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;CAAE;;;EAKtI"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflicting-classes.js","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"conflicting-classes.js","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.ts"],"names":[],"mappings":";;AA8BA,sDAKC;AAnCD,YAAY;AACZ,yCAAoC;AAEpC,qCAAuC;AAEvC,wEAAiF;AACjF,oEAA4E;AAC5E,kEAAsE;AAuBtE,SAAgB,qBAAqB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAuE;IACrI,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAA,iCAAqB,EAAC,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IACrE,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpF,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;AACrD,CAAC;AAED,MAAM,yBAAyB,GAAG,IAAA,sBAAY,EAE5C,aAAa,EAAE,EAAE,IAAA,4BAAgB,GAAE,CAAC,CAAC;AAEvC,SAAS,aAAa;IACpB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,kCAAqB,GAAE,CAAC;IAC1C,OAAO,IAAA,mBAAO,EAAC,mBAAmB,EAAE,EAAE,gCAAgC,KAAK,KAAK,CAAC,CAAC;AACpF,CAAC;AAED,SAAS,mBAAmB;IAC1B,2EAA2E;IAC3E,4FAA4F;IAC5F,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;AAC7B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-conflicting-classes.d.ts","sourceRoot":"","sources":["../../../src/rules/no-conflicting-classes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"no-conflicting-classes.d.ts","sourceRoot":"","sources":["../../../src/rules/no-conflicting-classes.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGnC,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,UAAU,EACV,SAAS,EACT,cAAc,EACf,MAAM,kCAAkC,CAAC;AAG1C,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CACL,eAAe,GACf,YAAY,GACZ,SAAS,GACT,cAAc,GACd;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CACF;CACF,CAAC;AAYF,eAAO,MAAM,oBAAoB,EAAE,UAAU,CAAC,OAAO,CA4BpD,CAAC;AAoDF,wBAAgB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW;;;;;;EAE/C"}
|
|
@@ -3,7 +3,7 @@ import { ATTRIBUTE_SCHEMA, CALLEE_SCHEMA, ENTRYPOINT_SCHEMA, TAG_SCHEMA, TAILWIN
|
|
|
3
3
|
import { getConflictingClasses } from "../tailwindcss/conflicting-classes.js";
|
|
4
4
|
import { getCommonOptions } from "../utils/options.js";
|
|
5
5
|
import { createRuleListener } from "../utils/rule.js";
|
|
6
|
-
import { augmentMessageWithWarnings,
|
|
6
|
+
import { augmentMessageWithWarnings, getExactClassLocation, splitClasses } from "../utils/utils.js";
|
|
7
7
|
const defaultOptions = {
|
|
8
8
|
attributes: DEFAULT_ATTRIBUTE_NAMES,
|
|
9
9
|
callees: DEFAULT_CALLEE_NAMES,
|
|
@@ -48,27 +48,28 @@ function lintLiterals(ctx, literals) {
|
|
|
48
48
|
if (Object.keys(conflictingClasses).length === 0) {
|
|
49
49
|
continue;
|
|
50
50
|
}
|
|
51
|
-
for (const
|
|
52
|
-
const conflicts = conflictingClasses[
|
|
53
|
-
|
|
54
|
-
const conflict = conflicts.find(conflict => conflict.tailwindClassName === conflictingClass);
|
|
55
|
-
if (!conflict || otherConflicts.length === 0) {
|
|
51
|
+
for (const className in conflictingClasses) {
|
|
52
|
+
const conflicts = Object.entries(conflictingClasses[className]);
|
|
53
|
+
if (conflicts.length === 0) {
|
|
56
54
|
continue;
|
|
57
55
|
}
|
|
56
|
+
const conflictingClassNames = conflicts.map(([conflictingClassName]) => conflictingClassName);
|
|
57
|
+
const conflictingProperties = conflicts.reduce((acc, [, properties]) => {
|
|
58
|
+
for (const property of properties) {
|
|
59
|
+
if (!acc.includes(property.cssPropertyName)) {
|
|
60
|
+
acc.push(property.cssPropertyName);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return acc;
|
|
64
|
+
}, []);
|
|
58
65
|
ctx.report({
|
|
59
66
|
data: {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
otherConflicts.push(`${otherConflict.tailwindClassName} -> (${otherConflict.cssPropertyName}: ${otherConflict.cssPropertyValue})`);
|
|
64
|
-
}
|
|
65
|
-
return otherConflicts;
|
|
66
|
-
}, []).join(", "),
|
|
67
|
-
property: conflict.cssPropertyName,
|
|
68
|
-
value: conflict.cssPropertyValue ?? ""
|
|
67
|
+
className,
|
|
68
|
+
conflictingClassNames: conflictingClassNames.join(", "),
|
|
69
|
+
conflictingProperties: conflictingProperties.map(conflictingProperty => `"${conflictingProperty}"`).join(", ")
|
|
69
70
|
},
|
|
70
|
-
loc: getExactClassLocation(literal,
|
|
71
|
-
message: augmentMessageWithWarnings("Conflicting class detected: {{
|
|
71
|
+
loc: getExactClassLocation(literal, className),
|
|
72
|
+
message: augmentMessageWithWarnings("Conflicting class detected: \"{{ className }}\" and \"{{ conflictingClassNames }}\" apply the same CSS properties: {{ conflictingProperties }}.", DOCUMENTATION_URL, warnings)
|
|
72
73
|
});
|
|
73
74
|
}
|
|
74
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-conflicting-classes.js","sourceRoot":"","sources":["../../../src/rules/no-conflicting-classes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,UAAU,EACV,sBAAsB,EACtB,eAAe,EAChB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uDAAuD,CAAC;AAC9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,
|
|
1
|
+
{"version":3,"file":"no-conflicting-classes.js","sourceRoot":"","sources":["../../../src/rules/no-conflicting-classes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflicting-classes.async.v4.d.ts","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.async.v4.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"conflicting-classes.async.v4.d.ts","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.async.v4.ts"],"names":[],"mappings":"AA2EA,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,aAAa,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,CAAC;IAC1C,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,OAAO,EAAE,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,OAAO,EAAE,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;AACtC,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,GAAG,SAAS,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { runAsWorker } from "synckit";
|
|
2
2
|
import { createTailwindContext } from "./context.async.v4.js";
|
|
3
3
|
runAsWorker(async ({ classes, configPath }) => {
|
|
4
|
+
var _a;
|
|
4
5
|
const context = await createTailwindContext(configPath);
|
|
5
6
|
const conflicts = {};
|
|
6
7
|
const classRules = classes.reduce((classRules, className) => ({
|
|
@@ -25,7 +26,6 @@ runAsWorker(async ({ classes, configPath }) => {
|
|
|
25
26
|
if (paths.length !== otherPaths.length) {
|
|
26
27
|
continue otherClassLoop;
|
|
27
28
|
}
|
|
28
|
-
const potentialConflicts = [];
|
|
29
29
|
for (const path of paths) {
|
|
30
30
|
for (const otherPath of otherPaths) {
|
|
31
31
|
if (path !== otherPath) {
|
|
@@ -35,24 +35,19 @@ runAsWorker(async ({ classes, configPath }) => {
|
|
|
35
35
|
continue otherClassLoop;
|
|
36
36
|
}
|
|
37
37
|
for (const classRuleProperty of classRule[path]) {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
}
|
|
43
|
-
potentialConflicts.push({
|
|
44
|
-
...classRuleProperty,
|
|
45
|
-
tailwindClassName: className
|
|
46
|
-
}, {
|
|
47
|
-
...otherClassRuleProperty,
|
|
48
|
-
tailwindClassName: otherClassName
|
|
49
|
-
});
|
|
38
|
+
if (!otherClassRule[otherPath].find(otherProp => {
|
|
39
|
+
return otherProp.cssPropertyName === classRuleProperty.cssPropertyName;
|
|
40
|
+
})) {
|
|
41
|
+
continue otherClassLoop;
|
|
50
42
|
}
|
|
51
43
|
}
|
|
44
|
+
for (const otherClassRuleProperty of otherClassRule[otherPath]) {
|
|
45
|
+
conflicts[className] ?? (conflicts[className] = {});
|
|
46
|
+
(_a = conflicts[className])[otherClassName] ?? (_a[otherClassName] = []);
|
|
47
|
+
conflicts[className][otherClassName].push(otherClassRuleProperty);
|
|
48
|
+
}
|
|
52
49
|
}
|
|
53
50
|
}
|
|
54
|
-
conflicts[className] ?? (conflicts[className] = []);
|
|
55
|
-
conflicts[className].push(...potentialConflicts);
|
|
56
51
|
}
|
|
57
52
|
}
|
|
58
53
|
return conflicts;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflicting-classes.async.v4.js","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.async.v4.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAS9D,WAAW,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAgC,EAA0C,EAAE
|
|
1
|
+
{"version":3,"file":"conflicting-classes.async.v4.js","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.async.v4.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,12 @@ export interface GetConflictingClassesRequest {
|
|
|
5
5
|
export type GetConflictingClassesResponse = ConflictingClasses;
|
|
6
6
|
export type ConflictingClasses = {
|
|
7
7
|
[className: string]: {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
[conflictingClassName: string]: {
|
|
9
|
+
cssPropertyName: string;
|
|
10
|
+
important: boolean;
|
|
11
|
+
cssPropertyValue?: string;
|
|
12
|
+
}[];
|
|
13
|
+
};
|
|
13
14
|
};
|
|
14
15
|
export declare function getConflictingClasses({ classes, configPath, cwd }: {
|
|
15
16
|
classes: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflicting-classes.d.ts","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,6BAA6B,GAAG,kBAAkB,CAAC;AAE/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,SAAS,EAAE,MAAM,GAAG;QACnB,
|
|
1
|
+
{"version":3,"file":"conflicting-classes.d.ts","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,6BAA6B,GAAG,kBAAkB,CAAC;AAE/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,SAAS,EAAE,MAAM,GAAG;QACnB,CAAC,oBAAoB,EAAE,MAAM,GAAG;YAC9B,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,OAAO,CAAC;YACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;SAC3B,EAAE,CAAC;KACL,CAAC;CACH,CAAC;AAGF,wBAAgB,qBAAqB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;CAAE;;;EAKtI"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflicting-classes.js","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.ts"],"names":[],"mappings":"AAAA,YAAY;AACZ,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"conflicting-classes.js","sourceRoot":"","sources":["../../../src/tailwindcss/conflicting-classes.ts"],"names":[],"mappings":"AAAA,YAAY;AACZ,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAuBtE,MAAM,UAAU,qBAAqB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAuE;IACrI,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,qBAAqB,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IACrE,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpF,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;AACrD,CAAC;AAED,MAAM,yBAAyB,GAAG,YAAY,CAE5C,aAAa,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;AAEvC,SAAS,aAAa;IACpB,MAAM,EAAE,KAAK,EAAE,GAAG,qBAAqB,EAAE,CAAC;IAC1C,OAAO,OAAO,CAAC,mBAAmB,EAAE,EAAE,gCAAgC,KAAK,KAAK,CAAC,CAAC;AACpF,CAAC;AAED,SAAS,mBAAmB;IAC1B,2EAA2E;IAC3E,4FAA4F;IAC5F,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;AAC7B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import type { AttributeOption, CalleeOption, ESLintRule, TagOption, VariableOption } from "../../types/rule.js";
|
|
2
|
-
export type Options = [
|
|
3
|
-
Partial<AttributeOption & CalleeOption & TagOption & VariableOption & {
|
|
4
|
-
classesPerLine?: number;
|
|
5
|
-
entryPoint?: string;
|
|
6
|
-
group?: "emptyLine" | "never" | "newLine";
|
|
7
|
-
indent?: "tab" | number;
|
|
8
|
-
lineBreakStyle?: "unix" | "windows";
|
|
9
|
-
preferSingleLine?: boolean;
|
|
10
|
-
printWidth?: number;
|
|
11
|
-
tailwindConfig?: string;
|
|
12
|
-
}>
|
|
13
|
-
];
|
|
14
|
-
export declare const multiline: ESLintRule<Options>;
|
|
15
|
-
//# sourceMappingURL=multiline.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"multiline.d.ts","sourceRoot":"","sources":["../../../src/rules/multiline.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,UAAU,EACV,SAAS,EACT,cAAc,EACf,MAAM,kCAAkC,CAAC;AAI1C,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CACL,eAAe,GACf,YAAY,GACZ,SAAS,GACT,cAAc,GACd;QACE,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,KAAK,CAAC,EAAE,WAAW,GAAG,OAAO,GAAG,SAAS,CAAC;QAC1C,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;QACxB,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QACpC,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CACF;CACF,CAAC;AAqBF,eAAO,MAAM,SAAS,EAAE,UAAU,CAAC,OAAO,CAsEzC,CAAC"}
|