Skip to content

Commit

Permalink
fix(eslint): apply all extensions to TypeScript files
Browse files Browse the repository at this point in the history
This change makes the JavaScript and TypeScript ESLint extensions match.

Refs #422
  • Loading branch information
thewilkybarkid committed Nov 3, 2021
1 parent aae83f7 commit b85411e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
19 changes: 15 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
],
"extends": [
"eslint:recommended",
"plugin:import/errors",
"plugin:import/warnings",
"plugin:import/recommended",
"plugin:jest/recommended",
"plugin:node/recommended-module",
"plugin:promise/recommended",
Expand All @@ -44,10 +43,22 @@
"project": "./tsconfig.dev.json"
},
"extends": [
"plugin:react/recommended",
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:import/recommended",
"plugin:import/typescript",
"plugin:jest/recommended",
"plugin:node/recommended-module",
"plugin:promise/recommended",
"plugin:react/recommended",
"prettier"
]
],
"rules": {
"import/namespace": ["error", {
"allowComputed": true
}],
"node/no-missing-import": "off"
}
},
{
"files": [
Expand Down
3 changes: 1 addition & 2 deletions src/backend/models/groups.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { EntityRepository, MikroORM, Repository } from '@mikro-orm/core';
import { ORCID as orcidUtils } from 'orcid-utils';
import { validate as uuidValidate } from 'uuid';
import { Group } from './entities';
import { User } from './entities';
import { Group, User } from './entities';
import { getLogger } from '../log';

const log = getLogger('backend:models:groups');
Expand Down

0 comments on commit b85411e

Please sign in to comment.