Skip to content

Commit 7d6a7f0

Browse files
authored
Merge pull request #2 from Nayeemuddin-khan/3.3.0
FEND-670: Updating peer dependencies of eslint and eslint-plugin-react
2 parents 398f929 + d482ac1 commit 7d6a7f0

File tree

3 files changed

+31
-22
lines changed

3 files changed

+31
-22
lines changed

legacy.js

+16-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
module.exports = {
2-
'extends': [
2+
extends: [
33
'eslint-config-smartthings/rules/best-practices',
44
'eslint-config-smartthings/rules/errors',
55
'eslint-config-smartthings/rules/node',
66
'eslint-config-smartthings/rules/strict',
77
'eslint-config-smartthings/rules/style',
88
'eslint-config-smartthings/rules/variables'
99
],
10-
'env': {
11-
'browser': true,
12-
'node': true,
13-
'amd': false,
14-
'mocha': false,
15-
'jasmine': false
10+
env: {
11+
browser: true,
12+
node: true,
13+
amd: false,
14+
mocha: false,
15+
jasmine: false
1616
},
17-
'globals': {},
18-
'rules': {}
17+
parserOptions: {
18+
ecmaVersion: 2018,
19+
ecmaFeatures: {
20+
jsx: true,
21+
modules: true
22+
}
23+
},
24+
globals: {},
25+
rules: {}
1926
};

package.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-config-smartthings",
3-
"version": "3.0.1",
3+
"version": "3.1.0",
44
"description": "SmartThings's ESLint config",
55
"main": "index.js",
66
"repository": {
@@ -23,6 +23,10 @@
2323
{
2424
"name": "Adan Perez @adanperez",
2525
"url": "http://github.com/adanperez"
26+
},
27+
{
28+
"name": "Nayeemuddin Khan @nayeemuddin.khan",
29+
"url": "https://github.com/Nayeemuddin-khan"
2630
}
2731
],
2832
"license": "Apache-2.0",
@@ -32,7 +36,7 @@
3236
},
3337
"homepage": "https://github.com/SmartThingsOSS/eslint-config-smartthings",
3438
"peerDependencies": {
35-
"eslint": "^4.0.0",
36-
"eslint-plugin-react": "^7.0.0"
39+
"eslint": "^5.1.0",
40+
"eslint-plugin-react": "^7.7.0"
3741
}
3842
}

rules/es6.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
module.exports = {
2-
'env': {
3-
'es6': true
2+
env: {
3+
es6: true
44
},
5-
'parserOptions': {
6-
'ecmaVersion': 7,
7-
'sourceType': 'module',
8-
'ecmaFeatures': {
9-
'experimentalObjectRestSpread': true
10-
}
5+
parserOptions: {
6+
ecmaVersion: 2018,
7+
sourceType: 'module',
8+
ecmaFeatures: {}
119
},
12-
'rules': {
10+
rules: {
1311
// require braces around arrow function bodies
1412
'arrow-body-style': 0,
1513
// require parens in arrow function arguments
@@ -47,7 +45,7 @@ module.exports = {
4745
// require method and property shorthand syntax for object literals
4846
'object-shorthand': 0,
4947
// require arrow functions as callbacks
50-
'prefer-arrow-callback': [2, { 'allowNamedFunctions': true }],
48+
'prefer-arrow-callback': [2, { allowNamedFunctions: true }],
5149
// suggest using of const declaration for variables that are never modified after declared
5250
'prefer-const': 2,
5351
// require destructuring from arrays and/or objects

0 commit comments

Comments
 (0)