Skip to content

Commit fe89cd6

Browse files
authored
Merge pull request #101 from microsoft/users/ryanlynch/add-buttons-folder
Adding a folder for all button rules.
2 parents b12fd16 + c68ab45 commit fe89cd6

7 files changed

+17
-18
lines changed

lib/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ console.log("Loading my-eslint-plugin");
1515
module.exports = {
1616
rules: {
1717
"checkbox-needs-labelling": require("./rules/checkbox-needs-labelling"),
18-
"image-button-missing-aria": require("./rules/image-button-missing-aria"),
18+
"image-button-missing-aria": require("./rules/buttons/image-button-missing-aria"),
1919
"image-link-missing-aria": require("./rules/image-link-missing-aria"),
2020
"input-missing-label": require("./rules/input-missing-label"),
2121
"menu-item-needs-labelling": require("./rules/menu-item-needs-labelling"),
@@ -26,8 +26,8 @@ module.exports = {
2626
"no-empty-components": require("./rules/no-empty-components"),
2727
"accordion-header-needs-labelling": require("./rules/accordion-header-needs-labelling"),
2828
"accordion-item-needs-header-and-panel": require("./rules/accordion-item-needs-header-and-panel"),
29-
"compound-button-needs-labelling": require("./rules/compound-button-needs-labelling"),
30-
"no-empty-buttons": require("./rules/no-empty-buttons"),
29+
"compound-button-needs-labelling": require("./rules/buttons/compound-button-needs-labelling"),
30+
"no-empty-buttons": require("./rules/buttons/no-empty-buttons"),
3131
"spin-button-needs-labelling": require("./rules/spin-button-needs-labelling"),
3232
"spin-button-unrecommended-labelling": require("./rules/spin-button-unrecommended-labelling"),
3333
"breadcrumb-needs-labelling": require("./rules/breadcrumb-needs-labelling"),

lib/rules/compound-button-needs-labelling.js renamed to lib/rules/buttons/compound-button-needs-labelling.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
"use strict";
55

6-
const { hasNonEmptyProp } = require("../util/hasNonEmptyProp");
7-
const { hasToolTipParent } = require("../util/hasTooltipParent");
8-
const { hasTextContentChild } = require("../util/hasTextContentChild");
9-
const { hasAssociatedLabelViaAriaLabelledBy } = require("../util/labelUtils");
6+
const { hasNonEmptyProp } = require("../../util/hasNonEmptyProp");
7+
const { hasToolTipParent } = require("../../util/hasTooltipParent");
8+
const { hasTextContentChild } = require("../../util/hasTextContentChild");
9+
const { hasAssociatedLabelViaAriaLabelledBy } = require("../../util/labelUtils");
1010
var elementType = require("jsx-ast-utils").elementType;
1111

1212
//------------------------------------------------------------------------------

lib/rules/image-button-missing-aria.js renamed to lib/rules/buttons/image-button-missing-aria.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
"use strict";
55

6-
const { hasNonEmptyProp } = require("../util/hasNonEmptyProp");
7-
const { hasToolTipParent } = require("../util/hasTooltipParent");
8-
const { hasTextContentChild } = require("../util/hasTextContentChild");
9-
const { hasAssociatedLabelViaAriaLabelledBy } = require("../util/labelUtils");
10-
const { applicableComponents } = require("../applicableComponents/buttonBasedComponents");
6+
const { hasNonEmptyProp } = require("../../util/hasNonEmptyProp");
7+
const { hasToolTipParent } = require("../../util/hasTooltipParent");
8+
const { hasTextContentChild } = require("../../util/hasTextContentChild");
9+
const { hasAssociatedLabelViaAriaLabelledBy } = require("../../util/labelUtils");
10+
const { applicableComponents } = require("../../applicableComponents/buttonBasedComponents");
1111
var hasProp = require("jsx-ast-utils").hasProp;
1212
var elementType = require("jsx-ast-utils").elementType;
1313

lib/rules/no-empty-buttons.js renamed to lib/rules/buttons/no-empty-buttons.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
"use strict";
55

6-
const { hasTextContentChild } = require("../util/hasTextContentChild");
7-
const { hasNonEmptyProp } = require("../util/hasNonEmptyProp");
6+
const { hasTextContentChild } = require("../../util/hasTextContentChild");
7+
const { hasNonEmptyProp } = require("../../util/hasNonEmptyProp");
88
var elementType = require("jsx-ast-utils").elementType;
99
var hasProp = require("jsx-ast-utils").hasProp;
1010

@@ -67,4 +67,3 @@ module.exports = {
6767
};
6868
}
6969
};
70-

tests/lib/rules/compound-button-needs-labelling.js renamed to tests/lib/rules/buttons/compound-button-needs-labelling.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Requirements
88
//------------------------------------------------------------------------------
99

10-
const rule = require("../../../lib/rules/compound-button-needs-labelling"),
10+
const rule = require("../../../../lib/rules/buttons/compound-button-needs-labelling"),
1111
RuleTester = require("eslint").RuleTester;
1212

1313
//------------------------------------------------------------------------------

tests/lib/rules/image-button-missing-aria.js renamed to tests/lib/rules/buttons/image-button-missing-aria.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Requirements
88
//------------------------------------------------------------------------------
99

10-
const rule = require("../../../lib/rules/image-button-missing-aria"),
10+
const rule = require("../../../../lib/rules/buttons/image-button-missing-aria"),
1111
RuleTester = require("eslint").RuleTester;
1212

1313
//------------------------------------------------------------------------------

tests/lib/rules/no-empty-buttons.js renamed to tests/lib/rules/buttons/no-empty-buttons.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
const RuleTester = require("eslint").RuleTester;
1111

12-
const rule = require("../../../lib/rules/no-empty-buttons");
12+
const rule = require("../../../../lib/rules/buttons/no-empty-buttons");
1313

1414
RuleTester.setDefaultConfig({
1515
parserOptions: {

0 commit comments

Comments
 (0)