Skip to content

Commit 2b17f61

Browse files
jeddy3jeddy3
committed
Remove support for Stylelint less than 16.0.0
1 parent c0ac3bd commit 2b17f61

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2956
-7914
lines changed

Diff for: ‎.eslintrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"jest": true
77
},
88
"parserOptions": {
9-
"ecmaVersion": "latest"
9+
"ecmaVersion": "latest",
10+
"sourceType": "module"
1011
},
1112
"globals": {
1213
"testRule": true

Diff for: ‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## Head
4+
5+
## Removed
6+
7+
- support for Stylelint less than 16.0.0
8+
39
## 3.1.1
410

511
### Fixed

Diff for: ‎jest.config.js

-4
This file was deleted.

Diff for: ‎jest.setup.js

-3
This file was deleted.

Diff for: ‎lib/index.js

+24-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1-
module.exports = [
2-
require("./rules/alpha-values"),
3-
require("./rules/border-widths"),
4-
require("./rules/font-sizes"),
5-
require("./rules/font-weights"),
6-
require("./rules/letter-spacings"),
7-
require("./rules/line-heights"),
8-
require("./rules/radii"),
9-
require("./rules/sizes"),
10-
require("./rules/space"),
11-
require("./rules/word-spacings"),
12-
require("./rules/z-indices"),
1+
import alphaValues from "./rules/alpha-values/index.js";
2+
import borderWidths from "./rules/border-widths/index.js";
3+
import fontSizes from "./rules/font-sizes/index.js";
4+
import fontWeights from "./rules/font-weights/index.js";
5+
import letterSpacings from "./rules/letter-spacings/index.js";
6+
import lineHeights from "./rules/line-heights/index.js";
7+
import radii from "./rules/radii/index.js";
8+
import sizes from "./rules/sizes/index.js";
9+
import space from "./rules/space/index.js";
10+
import wordSpacings from "./rules/word-spacings/index.js";
11+
import zIndices from "./rules/z-indices/index.js";
12+
13+
export default [
14+
alphaValues,
15+
borderWidths,
16+
fontSizes,
17+
fontWeights,
18+
letterSpacings,
19+
lineHeights,
20+
radii,
21+
sizes,
22+
space,
23+
wordSpacings,
24+
zIndices,
1325
];

Diff for: ‎lib/rules/alpha-values/index.js

+20-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
1-
const { parse } = require("postcss-values-parser");
1+
import { parse } from "postcss-values-parser";
2+
import stylelint from "stylelint";
3+
4+
import createRuleMessages from "../../utils/createRuleMessages.js";
5+
import getClosest from "../../utils/getClosest.js";
6+
import getValue from "../../utils/getValue.js";
7+
import hasNumericScale from "../../utils/hasNumericScale.js";
8+
import isOnNumericScale from "../../utils/isOnNumericScale.js";
9+
import setValue from "../../utils/setValue.js";
10+
211
const {
312
createPlugin,
413
utils: { report, validateOptions },
5-
} = require("stylelint");
6-
7-
const createRuleMessages = require("../../utils/createRuleMessages");
8-
const getClosest = require("../../utils/getClosest");
9-
const getValue = require("../../utils/getValue");
10-
const hasNumericScale = require("../../utils/hasNumericScale");
11-
const isOnNumericScale = require("../../utils/isOnNumericScale");
12-
const setValue = require("../../utils/setValue");
14+
} = stylelint;
1315

1416
const ruleName = "scales/alpha-values";
1517
const messages = createRuleMessages(ruleName);
18+
const meta = {
19+
url: "https://github.com/jeddy3/stylelint-scales/blob/main/lib/rules/alpha-values/README.md",
20+
fixable: true,
21+
};
1622

1723
const alphaValueProperties = new Set(["opacity", "shape-image-threshold"]);
1824
const alphaValueFunctions = new Set(["hsl", "hwb", "lab", "lch", "rgb"]);
@@ -106,6 +112,8 @@ function findAlphaValue(nodes) {
106112

107113
rule.primaryOptionArray = true;
108114

109-
module.exports = createPlugin(ruleName, rule);
110-
module.exports.ruleName = ruleName;
111-
module.exports.messages = messages;
115+
rule.ruleName = ruleName;
116+
rule.messages = messages;
117+
rule.meta = meta;
118+
119+
export default createPlugin(ruleName, rule);

Diff for: ‎lib/rules/alpha-values/__tests__/index.js renamed to ‎lib/rules/alpha-values/index.test.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
const { stripIndent } = require("common-tags");
1+
import { stripIndent } from "common-tags";
2+
import { testRule } from "stylelint-test-rule-node";
23

3-
const { messages, ruleName } = require("..");
4+
import plugin from "./index.js";
5+
const {
6+
rule: { messages, ruleName },
7+
} = plugin;
48

59
testRule({
610
ruleName,
711
config: [10, 20],
812
fix: true,
13+
plugins: [plugin],
914

1015
accept: [
1116
{

Diff for: ‎lib/rules/border-widths/index.js

+21-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1-
const { parse } = require("postcss-values-parser");
1+
import { parse } from "postcss-values-parser";
2+
import stylelint from "stylelint";
3+
4+
import createRuleMessages from "../../utils/createRuleMessages.js";
5+
import findScaleByUnit from "../../utils/findScaleByUnit.js";
6+
import getClosest from "../../utils/getClosest.js";
7+
import getValue from "../../utils/getValue.js";
8+
import hasScalesWithUnits from "../../utils/hasScalesWithUnits.js";
9+
import isOnNumericScale from "../../utils/isOnNumericScale.js";
10+
import setValue from "../../utils/setValue.js";
11+
212
const {
313
createPlugin,
414
utils: { report, validateOptions },
5-
} = require("stylelint");
6-
7-
const createRuleMessages = require("../../utils/createRuleMessages");
8-
const findScaleByUnit = require("../../utils/findScaleByUnit");
9-
const getClosest = require("../../utils/getClosest");
10-
const getValue = require("../../utils/getValue");
11-
const hasScalesWithUnits = require("../../utils/hasScalesWithUnits");
12-
const isOnNumericScale = require("../../utils/isOnNumericScale");
13-
const setValue = require("../../utils/setValue");
15+
} = stylelint;
1416

1517
const ruleName = "scales/border-widths";
1618
const messages = createRuleMessages(ruleName);
19+
const meta = {
20+
url: "https://github.com/jeddy3/stylelint-scales/blob/main/lib/rules/border-widths/README.md",
21+
fixable: true,
22+
};
1723

1824
const propertyFilter =
1925
/^border$|^border.*(width$|top$|right$|bottom$|left$|block$|inline$|start$|end$)/;
@@ -69,6 +75,8 @@ const rule = (primary, secondary, { fix }) => {
6975

7076
rule.primaryOptionArray = true;
7177

72-
module.exports = createPlugin(ruleName, rule);
73-
module.exports.ruleName = ruleName;
74-
module.exports.messages = messages;
78+
rule.ruleName = ruleName;
79+
rule.messages = messages;
80+
rule.meta = meta;
81+
82+
export default createPlugin(ruleName, rule);

Diff for: ‎lib/rules/border-widths/__tests__/index.js renamed to ‎lib/rules/border-widths/index.test.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
const { messages, ruleName } = require("..");
1+
import { testRule } from "stylelint-test-rule-node";
2+
3+
import plugin from "./index.js";
4+
5+
const {
6+
rule: { messages, ruleName },
7+
} = plugin;
28

39
testRule({
410
ruleName,
@@ -9,6 +15,7 @@ testRule({
915
},
1016
],
1117
fix: true,
18+
plugins: [plugin],
1219

1320
accept: [
1421
{

Diff for: ‎lib/rules/font-sizes/index.js

+24-16
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
1-
const { parse } = require("postcss-values-parser");
1+
import { parse } from "postcss-values-parser";
2+
import stylelint from "stylelint";
3+
4+
import createRuleMessages from "../../utils/createRuleMessages.js";
5+
import findScaleByUnit from "../../utils/findScaleByUnit.js";
6+
import getClosest from "../../utils/getClosest.js";
7+
import getValue from "../../utils/getValue.js";
8+
import hasScalesWithUnits from "../../utils/hasScalesWithUnits.js";
9+
import hasObjectWithNumericArray from "../../utils/hasObjectWithNumericArray.js";
10+
import isIgnoredFunctionArgument from "../../utils/isIgnoredFunctionArgument.js";
11+
import isLineHeight from "../../utils/isLineHeight.js";
12+
import isOnNumericScale from "../../utils/isOnNumericScale.js";
13+
import setValue from "../../utils/setValue.js";
14+
215
const {
316
createPlugin,
417
utils: { report, validateOptions },
5-
} = require("stylelint");
6-
7-
const createRuleMessages = require("../../utils/createRuleMessages");
8-
const findScaleByUnit = require("../../utils/findScaleByUnit");
9-
const getClosest = require("../../utils/getClosest");
10-
const getValue = require("../../utils/getValue");
11-
const hasScalesWithUnits = require("../../utils/hasScalesWithUnits");
12-
const hasObjectWithNumericArray = require("../../utils/hasObjectWithNumericArray");
13-
const isIgnoredFunctionArgument = require("../../utils/isIgnoredFunctionArgument");
14-
const isLineHeight = require("../../utils/isLineHeight");
15-
const isOnNumericScale = require("../../utils/isOnNumericScale");
16-
const setValue = require("../../utils/setValue");
18+
} = stylelint;
1719

1820
const ruleName = "scales/font-sizes";
1921
const messages = createRuleMessages(ruleName);
22+
const meta = {
23+
url: "https://github.com/jeddy3/stylelint-scales/blob/main/lib/rules/font-sizes/README.md",
24+
fixable: true,
25+
};
2026

2127
const propertyFilter = /^font-size$|^font$/;
2228

@@ -104,6 +110,8 @@ function findFontSize(nodes) {
104110

105111
rule.primaryOptionArray = true;
106112

107-
module.exports = createPlugin(ruleName, rule);
108-
module.exports.ruleName = ruleName;
109-
module.exports.messages = messages;
113+
rule.ruleName = ruleName;
114+
rule.messages = messages;
115+
rule.meta = meta;
116+
117+
export default createPlugin(ruleName, rule);

Diff for: ‎lib/rules/font-sizes/__tests__/index.js renamed to ‎lib/rules/font-sizes/index.test.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
const { messages, ruleName } = require("..");
1+
import { testRule } from "stylelint-test-rule-node";
2+
3+
import plugin from "./index.js";
4+
5+
const {
6+
rule: { messages, ruleName },
7+
} = plugin;
28

39
testRule({
410
ruleName,
@@ -9,6 +15,7 @@ testRule({
915
},
1016
],
1117
fix: true,
18+
plugins: [plugin],
1219

1320
accept: [
1421
{
@@ -72,6 +79,7 @@ testRule({
7279
},
7380
],
7481
fix: true,
82+
plugins: [plugin],
7583

7684
accept: [
7785
{

Diff for: ‎lib/rules/font-weights/index.js

+21-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1-
const { parse } = require("postcss-values-parser");
1+
import { parse } from "postcss-values-parser";
2+
import stylelint from "stylelint";
3+
4+
import createRuleMessages from "../../utils/createRuleMessages.js";
5+
import getClosest from "../../utils/getClosest.js";
6+
import getValue from "../../utils/getValue.js";
7+
import hasNumericScale from "../../utils/hasNumericScale.js";
8+
import isLineHeight from "../../utils/isLineHeight.js";
9+
import isOnNumericScale from "../../utils/isOnNumericScale.js";
10+
import setValue from "../../utils/setValue.js";
11+
212
const {
313
createPlugin,
414
utils: { report, validateOptions },
5-
} = require("stylelint");
6-
7-
const createRuleMessages = require("../../utils/createRuleMessages");
8-
const getClosest = require("../../utils/getClosest");
9-
const getValue = require("../../utils/getValue");
10-
const hasNumericScale = require("../../utils/hasNumericScale");
11-
const isLineHeight = require("../../utils/isLineHeight");
12-
const isOnNumericScale = require("../../utils/isOnNumericScale");
13-
const setValue = require("../../utils/setValue");
15+
} = stylelint;
1416

1517
const ruleName = "scales/font-weights";
1618
const messages = createRuleMessages(ruleName);
19+
const meta = {
20+
url: "https://github.com/jeddy3/stylelint-scales/blob/main/lib/rules/font-weights/README.md",
21+
fixable: true,
22+
};
1723

1824
const propertyFilter = /^font-weight$|^font$/;
1925

@@ -86,6 +92,8 @@ function findFontWeight(nodes) {
8692

8793
rule.primaryOptionArray = true;
8894

89-
module.exports = createPlugin(ruleName, rule);
90-
module.exports.ruleName = ruleName;
91-
module.exports.messages = messages;
95+
rule.ruleName = ruleName;
96+
rule.messages = messages;
97+
rule.meta = meta;
98+
99+
export default createPlugin(ruleName, rule);

Diff for: ‎lib/rules/font-weights/__tests__/index.js renamed to ‎lib/rules/font-weights/index.test.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
1-
const { messages, ruleName } = require("..");
1+
import { testRule } from "stylelint-test-rule-node";
2+
3+
import plugin from "./index.js";
4+
5+
const {
6+
rule: { messages, ruleName },
7+
} = plugin;
28

39
testRule({
410
ruleName,
511
config: [400, 700],
612
fix: true,
13+
plugins: [plugin],
714

815
accept: [
916
{

Diff for: ‎lib/rules/letter-spacings/index.js

+21-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1-
const { parse } = require("postcss-values-parser");
1+
import { parse } from "postcss-values-parser";
2+
import stylelint from "stylelint";
3+
4+
import createRuleMessages from "../../utils/createRuleMessages.js";
5+
import findScaleByUnit from "../../utils/findScaleByUnit.js";
6+
import getClosest from "../../utils/getClosest.js";
7+
import getValue from "../../utils/getValue.js";
8+
import hasScalesWithUnits from "../../utils/hasScalesWithUnits.js";
9+
import isOnNumericScale from "../../utils/isOnNumericScale.js";
10+
import setValue from "../../utils/setValue.js";
11+
212
const {
313
createPlugin,
414
utils: { report, validateOptions },
5-
} = require("stylelint");
6-
7-
const createRuleMessages = require("../../utils/createRuleMessages");
8-
const findScaleByUnit = require("../../utils/findScaleByUnit");
9-
const getClosest = require("../../utils/getClosest");
10-
const getValue = require("../../utils/getValue");
11-
const hasScalesWithUnits = require("../../utils/hasScalesWithUnits");
12-
const isOnNumericScale = require("../../utils/isOnNumericScale");
13-
const setValue = require("../../utils/setValue");
15+
} = stylelint;
1416

1517
const ruleName = "scales/letter-spacings";
1618
const messages = createRuleMessages(ruleName);
19+
const meta = {
20+
url: "https://github.com/jeddy3/stylelint-scales/blob/main/lib/rules/letter-spacings/README.md",
21+
fixable: true,
22+
};
1723

1824
const propertyFilter = "letter-spacing";
1925

@@ -68,6 +74,8 @@ const rule = (primary, secondary, { fix }) => {
6874

6975
rule.primaryOptionArray = true;
7076

71-
module.exports = createPlugin(ruleName, rule);
72-
module.exports.ruleName = ruleName;
73-
module.exports.messages = messages;
77+
rule.ruleName = ruleName;
78+
rule.messages = messages;
79+
rule.meta = meta;
80+
81+
export default createPlugin(ruleName, rule);

0 commit comments

Comments
 (0)