Skip to content

Commit 337c6ba

Browse files
authored
Merge pull request #108 from deini/eslint-8
Bump eslint to v8 and all plugins
2 parents dea469a + c2c96de commit 337c6ba

11 files changed

Lines changed: 1241 additions & 818 deletions

File tree

.circleci/config.yml

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,48 @@
11
version: 2.1
22
orbs:
3-
node: circleci/node@1.1.4
3+
node: circleci/node@4.7.0
44

55
default_executor: &default_executor
66
executor:
77
name: node/default
8-
tag: '14.16'
8+
tag: '14.17'
99

1010
commands:
1111
install-dependencies:
12+
parameters:
13+
cache-version:
14+
type: string
15+
default: v1
16+
description: Change the cache version if you need to clear the cache for any reason.
17+
1218
steps:
1319
- node/install-yarn:
1420
version: 1.22.10
1521

16-
- node/with-cache:
17-
cache-key: yarn.lock
18-
cache-version: v1
19-
include-branch-in-cache-key: false
20-
steps:
21-
- run:
22-
name: yarn install
23-
command: |
24-
CKSUM_BEFORE=$(cksum yarn.lock)
25-
yarn install
26-
CKSUM_AFTER=$(cksum yarn.lock)
27-
28-
if [[ $CKSUM_BEFORE != $CKSUM_AFTER ]]; then
29-
echo "yarn.lock was modified unexpectedly - terminating"
30-
exit 1
31-
fi
22+
- restore_cache:
23+
keys:
24+
- node-deps-<<parameters.cache-version>>-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
25+
- node-deps-<<parameters.cache-version>>-{{ checksum "package.json" }}
26+
- node-deps-<<parameters.cache-version>>
27+
28+
- run:
29+
name: yarn install
30+
command: |
31+
CKSUM_BEFORE=$(cksum yarn.lock)
32+
yarn install
33+
CKSUM_AFTER=$(cksum yarn.lock)
34+
35+
if [[ $CKSUM_BEFORE != $CKSUM_AFTER ]]; then
36+
echo "yarn.lock was modified unexpectedly - terminating"
37+
exit 1
38+
fi
39+
40+
- save_cache:
41+
key: node-deps-<<parameters.cache-version>>-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
42+
paths:
43+
- node_modules
44+
- packages/eslint-config/node_modules
45+
- packages/eslint-plugin/node_modules
3246

3347
jobs:
3448
test:

export_maps_resolver.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// temporary workaround while we wait for https://github.com/facebook/jest/issues/9771
2+
const enhancedResolve = require('enhanced-resolve');
3+
4+
const resolver = enhancedResolve.create.sync({
5+
conditionNames: ['require', 'node', 'default'],
6+
extensions: ['.js', '.json'],
7+
mainFields: ['exports', 'main', 'require'],
8+
});
9+
10+
module.exports = (request, options) => {
11+
return resolver(options.basedir, request);
12+
};

jest.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
resolver: './export_maps_resolver.js',
3+
};

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@
2121
},
2222
"devDependencies": {
2323
"@bigcommerce/validate-commits": "^2.0.2",
24-
"eslint": "^7.26.0",
25-
"jest": "^27.0.4",
24+
"enhanced-resolve": "^5.8.3",
25+
"eslint": "^8.1.0",
26+
"jest": "^27.3.1",
2627
"lerna": "^4.0.0",
27-
"typescript": "^4.2.4"
28-
}
28+
"typescript": "^4.4.4"
29+
},
30+
"dependencies": {}
2931
}

packages/eslint-config/configs/typescript.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,34 @@ module.exports = {
109109
],
110110
'@typescript-eslint/no-use-before-define': ['error', 'nofunc'],
111111
'@typescript-eslint/no-useless-constructor': 'error',
112+
'@typescript-eslint/padding-line-between-statements': [
113+
'warn',
114+
{
115+
blankLine: 'always',
116+
next: 'return',
117+
prev: '*',
118+
},
119+
{
120+
blankLine: 'always',
121+
next: ['block', 'block-like', 'class', 'const', 'let', 'var', 'interface'],
122+
prev: '*',
123+
},
124+
{
125+
blankLine: 'always',
126+
next: '*',
127+
prev: ['block', 'block-like', 'class', 'const', 'let', 'var', 'interface'],
128+
},
129+
{
130+
blankLine: 'any',
131+
next: ['const', 'let', 'var'],
132+
prev: ['const', 'let', 'var'],
133+
},
134+
{
135+
blankLine: 'any',
136+
next: ['case'],
137+
prev: ['case'],
138+
},
139+
],
112140
'@typescript-eslint/prefer-for-of': 'error',
113141
'@typescript-eslint/prefer-function-type': 'error',
114142
'@typescript-eslint/require-await': 'error',
@@ -128,6 +156,7 @@ module.exports = {
128156
'no-unused-vars': 'off',
129157
'no-use-before-define': 'off',
130158
'no-useless-constructor': 'off',
159+
'padding-line-between-statements': 'off',
131160
'sort-keys': 'off',
132161
},
133162
settings: {

packages/eslint-config/package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@
2121
},
2222
"dependencies": {
2323
"@bigcommerce/eslint-plugin": "^1.0.0",
24-
"@rushstack/eslint-patch": "^1.0.6",
25-
"@typescript-eslint/eslint-plugin": "^4.22.0",
26-
"@typescript-eslint/parser": "^4.22.0",
24+
"@rushstack/eslint-patch": "^1.0.9",
25+
"@typescript-eslint/eslint-plugin": "^5.2.0",
26+
"@typescript-eslint/parser": "^5.2.0",
2727
"eslint-config-prettier": "^8.3.0",
28-
"eslint-import-resolver-typescript": "^2.4.0",
29-
"eslint-plugin-gettext": "^1.1.0",
30-
"eslint-plugin-import": "^2.22.1",
31-
"eslint-plugin-jest": "^24.3.6",
28+
"eslint-import-resolver-typescript": "^2.5.0",
29+
"eslint-plugin-gettext": "^1.2.0",
30+
"eslint-plugin-import": "^2.25.2",
31+
"eslint-plugin-jest": "^25.2.2",
3232
"eslint-plugin-jest-formatting": "^3.0.0",
33-
"eslint-plugin-jsdoc": "^35.1.2",
33+
"eslint-plugin-jsdoc": "^37.0.3",
3434
"eslint-plugin-jsx-a11y": "^6.4.1",
35-
"eslint-plugin-prettier": "^3.4.0",
36-
"eslint-plugin-react": "^7.23.2",
35+
"eslint-plugin-prettier": "^4.0.0",
36+
"eslint-plugin-react": "^7.26.1",
3737
"eslint-plugin-react-hooks": "^4.2.0",
3838
"eslint-plugin-switch-case": "^1.1.2",
39-
"prettier": "^2.2.1"
39+
"prettier": "^2.4.1"
4040
},
4141
"devDependencies": {
4242
"react": "^17.0.2"
4343
},
4444
"peerDependencies": {
45-
"eslint": "^7.0.0",
45+
"eslint": "^8.0.0",
4646
"typescript": "^4.0.0"
4747
},
4848
"peerDependenciesMeta": {

0 commit comments

Comments
 (0)