Skip to content

Commit

Permalink
Merge pull request #111 from xing/update-eslint-plugin-import-and-con…
Browse files Browse the repository at this point in the history
…ventional-commits-parser

fix: update eslint plugin import and conventional commits parser
  • Loading branch information
irmkr authored May 10, 2022
2 parents 49a60ac + 2047880 commit 8509501
Show file tree
Hide file tree
Showing 6 changed files with 378 additions and 267 deletions.
6 changes: 6 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module.exports = {
'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
'prettier', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
'plugin:prettier/recommended',
'plugin:import/typescript',
],
plugins: ['@typescript-eslint', 'prettier', 'import'],
parser: '@typescript-eslint/parser',
Expand Down Expand Up @@ -88,4 +89,9 @@ module.exports = {
rules: { 'import/no-extraneous-dependencies': ['off'] },
},
],
settings: {
'import/resolver': {
typescript: {},
},
},
};
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,14 @@
"@types/semver": "^7.3.7",
"@types/yargs": "^17.0.0",
"@typescript-eslint/eslint-plugin": "^4.28.5",
"@typescript-eslint/parser": "^4.28.5",
"@typescript-eslint/parser": "^5.23.0",
"commitizen": "4.2.4",
"cz-conventional-changelog": "3.3.0",
"eslint": "7.29.0",
"eslint-config-prettier": "8.3.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.23.4",
"eslint-import-resolver-typescript": "^2.7.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "3.4.0",
"eslint-plugin-promise": "^5.1.0",
Expand All @@ -62,7 +63,7 @@
"dependencies": {
"@schemastore/package": "^0.0.6",
"chalk": "^4.1.1",
"conventional-commits-parser": "3.2.1",
"conventional-commits-parser": "3.2.4",
"cosmiconfig": "^7.0.0",
"find-up": "^5.0.0",
"glob": "7.1.7",
Expand Down
2 changes: 1 addition & 1 deletion src/analyse/adapt-dependencies.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import semver from 'semver';
import * as semver from 'semver';

import { clone } from 'ramda';

Expand Down
2 changes: 1 addition & 1 deletion src/analyse/determine-version.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { clone } from 'ramda';
import semver from 'semver';
import * as semver from 'semver';
import { green, red, yellow, white } from 'chalk';

import { logger } from '../helpers/logger';
Expand Down
2 changes: 1 addition & 1 deletion src/analyse/spec/adapt-dependencies.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-env node, jest */
import semver from 'semver';
import * as semver from 'semver';

import { clone } from 'ramda';

Expand Down
Loading

0 comments on commit 8509501

Please sign in to comment.