Skip to content

Commit 6cddc13

Browse files
committed
test(lint): Merge TS and JS linting ESLint configs
1 parent 7b17647 commit 6cddc13

7 files changed

+30
-28
lines changed

.eslintrc.js

+25-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,36 @@
11
// eslint config for .js files
22
module.exports = {
3-
extends: [
4-
'standard'
5-
],
63
plugins: [
74
'react'
85
],
96
rules: {
107
'react/jsx-uses-react': 'error',
118
'react/jsx-uses-vars': 'error'
129
},
10+
parser: '@typescript-eslint/parser',
1311
parserOptions: {
14-
jsx: true
15-
}
12+
jsx: true,
13+
ecmaVersion: 2018
14+
},
15+
overrides: [
16+
// linting for js files
17+
{
18+
files: ['**/*.js'],
19+
extends: [
20+
'standard'
21+
]
22+
},
23+
// linting for ts files
24+
{
25+
files: ['**/*.ts'],
26+
extends: [
27+
'eslint:recommended',
28+
'plugin:@typescript-eslint/eslint-recommended',
29+
'plugin:@typescript-eslint/recommended'
30+
],
31+
rules: {
32+
'@typescript-eslint/no-explicit-any': 'off'
33+
}
34+
}
35+
]
1636
}

.eslintrc.ts.js

-18
This file was deleted.

dockerfiles/Dockerfile.browser

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ WORKDIR /app
88
COPY package*.json ./
99
RUN npm install
1010

11-
COPY babel.config.js lerna.json .eslintignore .eslintrc.js .eslintrc.ts.js ./
11+
COPY babel.config.js lerna.json .eslintignore .eslintrc.js ./
1212
ADD min_packages.tar .
1313
COPY bin ./bin
1414
RUN npx lerna bootstrap

dockerfiles/Dockerfile.ci

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ WORKDIR /app
88
COPY package*.json ./
99
RUN npm install
1010

11-
COPY babel.config.js lerna.json .eslintignore .eslintrc.js .eslintrc.ts.js ./
11+
COPY babel.config.js lerna.json .eslintignore .eslintrc.js ./
1212
ADD min_packages.tar .
1313
COPY bin ./bin
1414
RUN npx lerna bootstrap

dockerfiles/Dockerfile.expo-publisher

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WORKDIR /app
77
COPY package*.json ./
88
RUN npm install
99

10-
COPY babel.config.js lerna.json .eslintignore .eslintrc.js .eslintrc.ts.js ./
10+
COPY babel.config.js lerna.json .eslintignore .eslintrc.js ./
1111
COPY packages ./packages
1212
COPY bin ./bin
1313
RUN npx lerna bootstrap

dockerfiles/Dockerfile.node

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ WORKDIR /app
88
COPY package*.json ./
99
RUN npm install
1010

11-
COPY babel.config.js lerna.json .eslintignore .eslintrc.js .eslintrc.ts.js ./
11+
COPY babel.config.js lerna.json .eslintignore .eslintrc.js ./
1212
ADD min_packages.tar .
1313
COPY bin ./bin
1414
RUN npx lerna bootstrap

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"scripts": {
3737
"bootstrap": "lerna bootstrap",
3838
"build": "lerna run build --scope '@bugsnag/node' --scope '@bugsnag/browser' --scope '@bugsnag/expo' && lerna run build --ignore '@bugsnag/node' --ignore '@bugsnag/browser' --ignore '@bugsnag/expo'",
39-
"test:lint": "eslint . --report-unused-disable-directives && eslint --no-eslintrc -c .eslintrc.ts.js --ext .ts .",
39+
"test:lint": "eslint . --report-unused-disable-directives",
4040
"test:unit": "lerna run test --ignore '@bugsnag/browser' --ignore '@bugsnag/node'",
4141
"test:types": "lerna run test:types",
4242
"test:test-container-registry-login": "$(aws ecr get-login --profile=opensource --no-include-email)",

0 commit comments

Comments
 (0)