Skip to content

Commit 218f4a4

Browse files
committed
chore: Use eslint global
1 parent 28d9f83 commit 218f4a4

File tree

22 files changed

+58
-166
lines changed

22 files changed

+58
-166
lines changed

Diff for: .eslintignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/node_modules
2+
/packages/*/node_modules
3+
/packages/*/coverage
4+
/packages/*/dist

Diff for: .eslintrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": ["./packages/eslint-config-cozy-app/react.js"]
3+
}

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"url": "https://github.com/cozy/cozy-libs/issues"
1414
},
1515
"scripts": {
16-
"lint": "lerna run --parallel lint",
16+
"lint": "eslint . --ext js,jsx",
1717
"test": "lerna run --parallel test",
1818
"build": "lerna run --parallel build",
1919
"commitmsg": "commitlint -e $GIT_PARAMS"

Diff for: packages/babel-preset-cozy-app/index.js

+18-10
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const nodeEnv = {
2121
useBuiltIns: false
2222
}
2323

24-
module.exports = declare((api, options, dirname) => {
24+
module.exports = declare((api, options) => {
2525
// default options
2626
let presetOptions = {
2727
node: false,
@@ -33,7 +33,9 @@ module.exports = declare((api, options, dirname) => {
3333
for (let option in presetOptions) {
3434
if (options.hasOwnProperty(option)) {
3535
if (typeof options[option] !== 'boolean') {
36-
throw new Error(`Preset cozy-app '${option}' option must be a boolean.`)
36+
throw new Error(
37+
`Preset cozy-app '${option}' option must be a boolean.`
38+
)
3739
}
3840
presetOptions[option] = options[option]
3941
}
@@ -64,18 +66,24 @@ module.exports = declare((api, options, dirname) => {
6466
// Transform rest properties for object destructuring assignment
6567
// and spread properties for object literals
6668
// useBuiltIns to directly use Object.assign instead of using Babel extends
67-
[require.resolve('babel-plugin-transform-object-rest-spread'), {
68-
useBuiltIns: false
69-
}]
69+
[
70+
require.resolve('babel-plugin-transform-object-rest-spread'),
71+
{
72+
useBuiltIns: false
73+
}
74+
]
7075
]
7176
if (!node && transformRegenerator) {
7277
plugins.push(
7378
// Polyfills generator functions (for async/await usage)
74-
[require.resolve('babel-plugin-transform-runtime'), {
75-
helpers: false,
76-
polyfill: false,
77-
regenerator: true
78-
}]
79+
[
80+
require.resolve('babel-plugin-transform-runtime'),
81+
{
82+
helpers: false,
83+
polyfill: false,
84+
regenerator: true
85+
}
86+
]
7987
)
8088
}
8189
config.plugins = plugins

Diff for: packages/commitlint-config/.eslintrc

-3
This file was deleted.

Diff for: packages/commitlint-config/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@
1414
"url": "https://github.com/cozy/cozy-libs/issues"
1515
},
1616
"scripts": {
17-
"test": "jest --env node ./*.spec.js",
18-
"lint": "eslint ./*.js"
17+
"test": "jest --env node ./*.spec.js"
1918
},
2019
"devDependencies": {
2120
"@commitlint/lint": "7.1.2",
2221
"babel-cli": "6.26.0",
2322
"babel-jest": "23.4.2",
2423
"babel-preset-cozy-app": "0.10.1",
25-
"eslint-config-cozy-app": "0.10.0",
2624
"jest": "23.4.2"
2725
},
2826
"dependencies": {

Diff for: packages/cozy-app-publish/.eslintrc.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
2-
"extends": ["cozy-app"],
3-
"rules": {
4-
"no-console": 0
5-
}
2+
"rules": {
3+
"no-console": 0
4+
}
65
}

Diff for: packages/cozy-app-publish/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
"author": "Cozy",
66
"license": "MIT",
77
"scripts": {
8-
"lint": "eslint '{lib, utils,test}/**/*.js'",
9-
"pretest": "yarn lint",
108
"test": "jest --verbose --coverage",
119
"test:manual": "jest test/manual.spec.js",
1210
"test:publish": "jest test/publish.spec.js",
@@ -33,7 +31,6 @@
3331
"lib"
3432
],
3533
"devDependencies": {
36-
"eslint-config-cozy-app": "0.10.0",
3734
"jest": "23.4.2",
3835
"jest-fetch-mock": "1.6.5"
3936
},

Diff for: packages/cozy-device-helper/.eslintrc

-3
This file was deleted.

Diff for: packages/cozy-device-helper/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
"scripts": {
2020
"prepublishOnly": "yarn run build",
2121
"build": "babel src -d dist --ignore *.spec.js",
22-
"test": "jest src/**",
23-
"lint": "eslint src/**"
22+
"test": "jest src/**"
2423
},
2524
"dependencies": {
2625
"lodash": "4.17.10"
@@ -31,7 +30,6 @@
3130
"babel-jest": "23.0.1",
3231
"babel-preset-cozy-app": "0.10.0",
3332
"babel-preset-env": "1.7.0",
34-
"eslint-config-cozy-app": "0.10.0",
3533
"jest": "23.4.2"
3634
},
3735
"jest": {

Diff for: packages/cozy-release/cozy-release.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ const cliArgs = process.argv.slice(2)
77

88
execSh(`sh ${scriptPath} ${cliArgs.join(' ')}`, (err, stderr) => {
99
if (err) {
10-
if (stderr) console.error(stderr)
10+
if (stderr) {
11+
// eslint-disable-next-line no-console
12+
console.error(stderr)
13+
}
1114
throw new Error(`Exit code: ${err.code}`)
1215
}
1316
})

Diff for: packages/doctypes/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@
1414
"devDependencies": {
1515
"btoa": "^1.2.1",
1616
"cozy-client-js": "^0.12.0",
17-
"eslint": "^5.0.0",
18-
"eslint-config-cozy-app": "^0.8.0",
1917
"jest": "^23.5.0"
2018
},
2119
"scripts": {
22-
"lint": "eslint src/**",
2320
"test": "jest src/"
2421
}
2522
}

Diff for: packages/eslint-config-cozy-app/basics.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
module.exports = {
44
plugins: ['prettier'],
5-
extends: [
6-
'eslint:recommended',
7-
'eslint-config-prettier'
8-
],
5+
extends: ['eslint:recommended', 'eslint-config-prettier'],
96
parser: 'babel-eslint',
107
env: {
118
browser: true,
@@ -14,9 +11,12 @@ module.exports = {
1411
es6: true
1512
},
1613
rules: {
17-
'prettier/prettier': ['error', {
18-
singleQuote: true,
19-
semi: false
20-
}]
14+
'prettier/prettier': [
15+
'error',
16+
{
17+
singleQuote: true,
18+
semi: false
19+
}
20+
]
2121
}
2222
}

Diff for: packages/eslint-config-cozy-app/react.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ const basics = require('./basics')
44

55
module.exports = {
66
plugins: basics.plugins,
7-
extends: basics.extends.concat([
8-
'plugin:react/recommended'
9-
]),
7+
extends: basics.extends.concat(['plugin:react/recommended']),
108
parser: basics.parser,
119
parserOptions: { ecmaFeatures: { jsx: true } },
1210
env: basics.env,

Diff for: packages/eslint-config-cozy-app/vue.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ const basics = require('./basics')
44

55
module.exports = {
66
plugins: basics.plugins,
7-
extends: basics.extends.concat([
8-
'plugin:vue/recommended'
9-
]),
7+
extends: basics.extends.concat(['plugin:vue/recommended']),
108
parserOptions: {
119
parser: 'babel-eslint'
1210
},

Diff for: packages/flags/.eslintrc

-3
This file was deleted.

Diff for: packages/flags/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@
1414
"url": "https://github.com/cozy/cozy-libs/issues"
1515
},
1616
"scripts": {
17-
"lint": "eslint src/**",
1817
"build": "babel src -d dist",
1918
"test": "true",
2019
"prepublishOnly": "yarn build"
2120
},
2221
"devDependencies": {
2322
"babel-cli": "6.26.0",
24-
"babel-preset-cozy-app": "0.10.0",
25-
"eslint-config-cozy-app": "0.10.0"
23+
"babel-preset-cozy-app": "0.10.0"
2624
}
2725
}

Diff for: packages/interapp/.eslintrc

-3
This file was deleted.

Diff for: packages/interapp/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515
},
1616
"scripts": {
1717
"test": "jest",
18-
"build": "babel src -d dist --ignore *.spec.js",
19-
"lint": "eslint src/**"
18+
"build": "babel src -d dist --ignore *.spec.js"
2019
},
2120
"devDependencies": {
2221
"babel-cli": "6.26.0",
2322
"babel-preset-cozy-app": "^1.1.1",
24-
"eslint-config-cozy-app": "^1.1.1",
2523
"jest": "23.5.0"
2624
}
2725
}

Diff for: packages/realtime/.eslintrc

-3
This file was deleted.

Diff for: packages/realtime/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@
1515
},
1616
"scripts": {
1717
"test": "true",
18-
"lint": "eslint src/**",
1918
"build": "babel src -d dist",
2019
"prepublishOnly": "yarn build",
2120
"watch": "yarn build --watch"
2221
},
2322
"devDependencies": {
2423
"babel-cli": "6.26.0",
25-
"babel-preset-cozy-app": "0.10.0",
26-
"eslint-config-cozy-app": "0.10.0"
24+
"babel-preset-cozy-app": "0.10.0"
2725
}
2826
}

0 commit comments

Comments
 (0)