Skip to content

Commit 9178ba4

Browse files
dgrahamdgraham
committed
Format with prettier
1 parent fc2fa94 commit 9178ba4

Some content is hidden

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

44 files changed

+177
-291
lines changed

‎.eslintrc

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
{ "extends": "eslint:recommended",
1+
{
2+
"extends": "eslint:recommended",
23
"env": {
34
"node": true,
4-
"es6": true,
5+
"es6": true
56
},
7+
"plugins": ["prettier"],
68
"rules": {
9+
"prettier/prettier": "error",
10+
"camelcase": "error",
711
"eqeqeq": ["error", "smart"],
8-
"no-extra-parens": "error",
912
"no-implicit-globals": "error",
10-
"no-trailing-spaces": "error",
1113
"no-unused-expressions": "error",
12-
"semi": ["error", "never"],
14+
"no-var": "error",
15+
"prefer-const": "error",
1316
"strict": "error"
1417
}
1518
}

‎.prettierrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"bracketSpacing": false,
3+
"semi": false,
4+
"singleQuote": true,
5+
"trailingComma": "none"
6+
}

‎index.js

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -51,65 +51,65 @@ module.exports = {
5151
configs: {
5252
deprecated: {
5353
rules: {
54-
"jquery/no-ajax": 2,
55-
"jquery/no-ajax-events": 2,
56-
"jquery/no-animate": 2,
57-
"jquery/no-attr": 2,
58-
"jquery/no-bind": 2,
59-
"jquery/no-class": 2,
60-
"jquery/no-clone": 2,
61-
"jquery/no-closest": 2,
62-
"jquery/no-css": 2,
63-
"jquery/no-data": 2,
64-
"jquery/no-deferred": 2,
65-
"jquery/no-delegate": 2,
66-
"jquery/no-each": 2,
67-
"jquery/no-fade": 2,
68-
"jquery/no-filter": 2,
69-
"jquery/no-find": 2,
70-
"jquery/no-global-eval": 2,
71-
"jquery/no-has": 2,
72-
"jquery/no-hide": 2,
73-
"jquery/no-html": 2,
74-
"jquery/no-in-array": 2,
75-
"jquery/no-is": 2,
76-
"jquery/no-load": 2,
77-
"jquery/no-map": 2,
78-
"jquery/no-merge": 2,
79-
"jquery/no-param": 2,
80-
"jquery/no-parent": 2,
81-
"jquery/no-parents": 2,
82-
"jquery/no-parse-html": 2,
83-
"jquery/no-prop": 2,
84-
"jquery/no-proxy": 2,
85-
"jquery/no-ready": 2,
86-
"jquery/no-serialize": 2,
87-
"jquery/no-show": 2,
88-
"jquery/no-size": 2,
89-
"jquery/no-sizzle": 2,
90-
"jquery/no-slide": 2,
91-
"jquery/no-submit": 2,
92-
"jquery/no-text": 2,
93-
"jquery/no-toggle": 2,
94-
"jquery/no-trigger": 2,
95-
"jquery/no-trim": 2,
96-
"jquery/no-val": 2,
97-
"jquery/no-when": 2,
98-
"jquery/no-wrap": 2
54+
'jquery/no-ajax': 2,
55+
'jquery/no-ajax-events': 2,
56+
'jquery/no-animate': 2,
57+
'jquery/no-attr': 2,
58+
'jquery/no-bind': 2,
59+
'jquery/no-class': 2,
60+
'jquery/no-clone': 2,
61+
'jquery/no-closest': 2,
62+
'jquery/no-css': 2,
63+
'jquery/no-data': 2,
64+
'jquery/no-deferred': 2,
65+
'jquery/no-delegate': 2,
66+
'jquery/no-each': 2,
67+
'jquery/no-fade': 2,
68+
'jquery/no-filter': 2,
69+
'jquery/no-find': 2,
70+
'jquery/no-global-eval': 2,
71+
'jquery/no-has': 2,
72+
'jquery/no-hide': 2,
73+
'jquery/no-html': 2,
74+
'jquery/no-in-array': 2,
75+
'jquery/no-is': 2,
76+
'jquery/no-load': 2,
77+
'jquery/no-map': 2,
78+
'jquery/no-merge': 2,
79+
'jquery/no-param': 2,
80+
'jquery/no-parent': 2,
81+
'jquery/no-parents': 2,
82+
'jquery/no-parse-html': 2,
83+
'jquery/no-prop': 2,
84+
'jquery/no-proxy': 2,
85+
'jquery/no-ready': 2,
86+
'jquery/no-serialize': 2,
87+
'jquery/no-show': 2,
88+
'jquery/no-size': 2,
89+
'jquery/no-sizzle': 2,
90+
'jquery/no-slide': 2,
91+
'jquery/no-submit': 2,
92+
'jquery/no-text': 2,
93+
'jquery/no-toggle': 2,
94+
'jquery/no-trigger': 2,
95+
'jquery/no-trim': 2,
96+
'jquery/no-val': 2,
97+
'jquery/no-when': 2,
98+
'jquery/no-wrap': 2
9999
}
100100
},
101101
slim: {
102102
rules: {
103-
"jquery/no-ajax": 2,
104-
"jquery/no-animate": 2,
105-
"jquery/no-fade": 2,
106-
"jquery/no-hide": 2,
107-
"jquery/no-load": 2,
108-
"jquery/no-param": 2,
109-
"jquery/no-serialize": 2,
110-
"jquery/no-show": 2,
111-
"jquery/no-slide": 2,
112-
"jquery/no-toggle": 2
103+
'jquery/no-ajax': 2,
104+
'jquery/no-animate': 2,
105+
'jquery/no-fade': 2,
106+
'jquery/no-hide': 2,
107+
'jquery/no-load': 2,
108+
'jquery/no-param': 2,
109+
'jquery/no-serialize': 2,
110+
'jquery/no-show': 2,
111+
'jquery/no-slide': 2,
112+
'jquery/no-toggle': 2
113113
}
114114
}
115115
}

‎package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
},
2121
"devDependencies": {
2222
"eslint": "^4.12.1",
23-
"mocha": "^4.0.1"
23+
"eslint-plugin-prettier": "^2.3.1",
24+
"mocha": "^4.0.1",
25+
"prettier": "^1.9.1"
2426
}
2527
}

‎rules/no-ready.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,21 @@ const utils = require('./utils.js')
44

55
// $(function(){})
66
function isDirect(node) {
7-
return node.callee.type === 'Identifier' &&
7+
return (
8+
node.callee.type === 'Identifier' &&
89
node.callee.name === '$' &&
910
node.arguments[0] &&
1011
node.arguments[0].type === 'FunctionExpression'
12+
)
1113
}
1214

1315
// $(document).ready()
1416
function isChained(node) {
15-
return node.callee.type === 'MemberExpression' &&
17+
return (
18+
node.callee.type === 'MemberExpression' &&
1619
node.callee.property.name === 'ready' &&
1720
utils.isjQuery(node)
21+
)
1822
}
1923

2024
module.exports = function(context) {

‎rules/no-serialize.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ module.exports = function(context) {
1313
if (utils.isjQuery(node)) {
1414
context.report({
1515
node: node,
16-
message: 'Prefer FormData or URLSearchParams to $.' + node.callee.property.name
16+
message:
17+
'Prefer FormData or URLSearchParams to $.' +
18+
node.callee.property.name
1719
})
1820
}
1921
}

‎rules/no-sizzle.js

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,35 @@ const utils = require('./utils.js')
44

55
module.exports = function(context) {
66
const forbidden = /:animated|:button|:checkbox|:eq|:even|:file|:first([^-]|$)|:gt|:has|:header|:hidden|:image|:input|:last([^-]|$)|:lt|:odd|:parent|:password|:radio|:reset|:selected|:submit|:text|:visible/
7-
const traversals = ['children', 'closest', 'filter', 'find', 'has', 'is', 'next', 'nextAll', 'nextUntil', 'not', 'parent', 'parents', 'parentsUntil', 'prev', 'prevAll', 'prevUntil', 'siblings']
7+
const traversals = [
8+
'children',
9+
'closest',
10+
'filter',
11+
'find',
12+
'has',
13+
'is',
14+
'next',
15+
'nextAll',
16+
'nextUntil',
17+
'not',
18+
'parent',
19+
'parents',
20+
'parentsUntil',
21+
'prev',
22+
'prevAll',
23+
'prevUntil',
24+
'siblings'
25+
]
826

927
return {
1028
CallExpression: function(node) {
1129
if (!node.arguments[0]) return
1230
if (!utils.isjQuery(node)) return
13-
if (node.callee.type === 'MemberExpression' &&
14-
traversals.indexOf(node.callee.property.name) === -1) return
31+
if (
32+
node.callee.type === 'MemberExpression' &&
33+
traversals.indexOf(node.callee.property.name) === -1
34+
)
35+
return
1536

1637
if (forbidden.test(node.arguments[0].value)) {
1738
context.report({

‎tests/no-ajax-events.js

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,45 +15,57 @@ ruleTester.run('no-ajax-events', rule, {
1515
invalid: [
1616
{
1717
code: '$(document).on("ajaxSend", function(e){ })',
18-
errors: [{
19-
message: 'Prefer remoteForm to ajaxSend',
20-
type: 'CallExpression'
21-
}]
18+
errors: [
19+
{
20+
message: 'Prefer remoteForm to ajaxSend',
21+
type: 'CallExpression'
22+
}
23+
]
2224
},
2325
{
2426
code: '$(document).on("ajaxSuccess", function(e){ })',
25-
errors: [{
26-
message: 'Prefer remoteForm to ajaxSuccess',
27-
type: 'CallExpression'
28-
}]
27+
errors: [
28+
{
29+
message: 'Prefer remoteForm to ajaxSuccess',
30+
type: 'CallExpression'
31+
}
32+
]
2933
},
3034
{
3135
code: '$form.on("ajaxError", function(e){ })',
32-
errors: [{
33-
message: 'Prefer remoteForm to ajaxError',
34-
type: 'CallExpression'
35-
}]
36+
errors: [
37+
{
38+
message: 'Prefer remoteForm to ajaxError',
39+
type: 'CallExpression'
40+
}
41+
]
3642
},
3743
{
3844
code: '$form.on("ajaxComplete", function(e){ })',
39-
errors: [{
40-
message: 'Prefer remoteForm to ajaxComplete',
41-
type: 'CallExpression'
42-
}]
45+
errors: [
46+
{
47+
message: 'Prefer remoteForm to ajaxComplete',
48+
type: 'CallExpression'
49+
}
50+
]
4351
},
4452
{
4553
code: '$form.on("ajaxStart", function(e){ })',
46-
errors: [{
47-
message: 'Prefer remoteForm to ajaxStart',
48-
type: 'CallExpression'
49-
}]
54+
errors: [
55+
{
56+
message: 'Prefer remoteForm to ajaxStart',
57+
type: 'CallExpression'
58+
}
59+
]
5060
},
5161
{
5262
code: '$form.on("ajaxStop", function(e){ })',
53-
errors: [{
54-
message: 'Prefer remoteForm to ajaxStop',
55-
type: 'CallExpression'
56-
}]
63+
errors: [
64+
{
65+
message: 'Prefer remoteForm to ajaxStop',
66+
type: 'CallExpression'
67+
}
68+
]
5769
}
5870
]
5971
})

‎tests/no-animate.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ const error = '$.animate is not allowed'
77

88
const ruleTester = new RuleTester()
99
ruleTester.run('no-animate', rule, {
10-
valid: [
11-
'animate()',
12-
'[].animate()',
13-
'div.animate()',
14-
'div.animate'
15-
],
10+
valid: ['animate()', '[].animate()', 'div.animate()', 'div.animate'],
1611
invalid: [
1712
{
1813
code: '$("div").animate()',

‎tests/no-attr.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ const error = 'Prefer getAttribute to $.attr'
77

88
const ruleTester = new RuleTester()
99
ruleTester.run('no-attr', rule, {
10-
valid: [
11-
'attr()',
12-
'[].attr()',
13-
'div.attr()',
14-
'div.attr'
15-
],
10+
valid: ['attr()', '[].attr()', 'div.attr()', 'div.attr'],
1611
invalid: [
1712
{
1813
code: '$("div").attr()',

‎tests/no-bind.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ const error = 'Prefer addEventListener to $.bind'
77

88
const ruleTester = new RuleTester()
99
ruleTester.run('no-bind', rule, {
10-
valid: [
11-
'bind()',
12-
'[].bind()',
13-
'div.bind()',
14-
'div.bind'
15-
],
10+
valid: ['bind()', '[].bind()', 'div.bind()', 'div.bind'],
1611
invalid: [
1712
{
1813
code: '$("div").bind()',

‎tests/no-clone.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ const error = 'Prefer cloneNode to $.clone'
77

88
const ruleTester = new RuleTester()
99
ruleTester.run('no-clone', rule, {
10-
valid: [
11-
'clone()',
12-
'[].clone()',
13-
'div.clone()',
14-
'div.clone'
15-
],
10+
valid: ['clone()', '[].clone()', 'div.clone()', 'div.clone'],
1611
invalid: [
1712
{
1813
code: '$("div").clone()',

‎tests/no-closest.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ const error = 'Prefer closest to $.closest'
77

88
const ruleTester = new RuleTester()
99
ruleTester.run('no-closest', rule, {
10-
valid: [
11-
'closest()',
12-
'[].closest()',
13-
'div.closest()',
14-
'div.closest'
15-
],
10+
valid: ['closest()', '[].closest()', 'div.closest()', 'div.closest'],
1611
invalid: [
1712
{
1813
code: '$("div").closest()',

0 commit comments

Comments
 (0)