Skip to content

Commit

Permalink
Merge pull request #901 from appworks-lab/fix-override-glob
Browse files Browse the repository at this point in the history
Fix overrides files not work
  • Loading branch information
luhc228 committed Jul 16, 2021
2 parents c335d13 + 3c583e0 commit fe359e4
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
4 changes: 4 additions & 0 deletions extensions/doctor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log


## 1.1.2

- feat: update @appworks/doctor to support custom config set extends and plugins.
## 1.1.1

- fix: empty project show wrong CodeMod notice.
Expand Down
4 changes: 2 additions & 2 deletions extensions/doctor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Doctor",
"description": "A free security and quality audit tool for modern DevOps teams",
"publisher": "iceworks-team",
"version": "1.1.1",
"version": "1.1.2",
"engines": {
"vscode": "^1.41.0"
},
Expand Down Expand Up @@ -82,7 +82,7 @@
"@appworks/common-service": "^0.1.0",
"@appworks/connector": "^0.1.0",
"@appworks/constant": "^0.1.0",
"@appworks/doctor": "^0.2.0",
"@appworks/doctor": "^0.2.1",
"@appworks/project-service": "^0.1.0",
"@appworks/recorder": "^0.1.0",
"@appworks/storage": "^0.1.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/doctor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# changelog

## 0.2.1

- Support custom config set extends and plugins.

## 0.2.0

- Remove codemod CLI usage.
Expand Down
2 changes: 1 addition & 1 deletion packages/doctor/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@appworks/doctor",
"description": "Analyse and running codemods over react/rax projects, troubleshooting and automatically fixing errors",
"version": "0.2.0",
"version": "0.2.1",
"keywords": [
"doctor",
"analysis",
Expand Down
4 changes: 3 additions & 1 deletion packages/doctor/src/workers/eslint/getEslintReports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ export default function getEslintReports(directory: string, files: IFileInfo[],
const cliEngine = new CLIEngine({
cache: false,
baseConfig: deepmerge(getESLintConfig(ruleKey), customConfig),
cwd: path.dirname(require.resolve('@iceworks/spec')),
cwd: directory,
// If user add extends or plugins, should find plugin form target directory
resolvePluginsRelativeTo: customConfig.extends || customConfig.plugins ? directory : path.dirname(require.resolve('@iceworks/spec')),
fix: !!fixErr,
useEslintrc: false,
});
Expand Down

0 comments on commit fe359e4

Please sign in to comment.