Skip to content

Commit 702808d

Browse files
committed
lint: use .gitignore to decide eslint ignore patterns
TODO: extract the eslint invocation to scripts/lint.ts so that it's not duplicated in the "lintfix" task.
1 parent 3636963 commit 702808d

File tree

4 files changed

+24
-34
lines changed

4 files changed

+24
-34
lines changed

.eslintignore

Lines changed: 0 additions & 24 deletions
This file was deleted.

.gitignore

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Note: also used for `eslint --ignore-path`.
2+
13
out
24
dist
35
node_modules
@@ -27,15 +29,15 @@ packages/core/src/shared/telemetry/vscodeTelemetry.json
2729
.test-reports
2830

2931
# Auto generated type definitions
30-
packages/core/src/shared/telemetry/clienttelemetry.d.ts
31-
packages/core/src/codewhisperer/client/codewhispererclient.d.ts
32-
packages/core/src/codewhisperer/client/codewhispereruserclient.d.ts
33-
packages/core/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
34-
packages/core/src/auth/sso/oidcclientpkce.d.ts
32+
**/src/shared/telemetry/clienttelemetry.d.ts
33+
**/src/codewhisperer/client/codewhispererclient.d.ts
34+
**/src/codewhisperer/client/codewhispereruserclient.d.ts
35+
**/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
36+
**/src/auth/sso/oidcclientpkce.d.ts
3537

3638
# Generated by tests
37-
packages/core/src/testFixtures/**/bin
38-
packages/core/src/testFixtures/**/obj
39+
**/src/testFixtures/**/bin
40+
**/src/testFixtures/**/obj
3941

4042
# Generated by copyFiles.ts
4143
packages/*/LICENSE

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"newChange": "echo 'Must specify subproject/workspace with -w packages/<subproject>' && false",
3434
"createRelease": "echo 'Must specify subproject/workspace with -w packages/<subproject>' && false",
3535
"lint": "npm run lint -w packages/ --if-present",
36-
"lintfix": "eslint -c .eslintrc.js --fix --ext .ts packages plugins && npm run formatfix",
36+
"lintfix": "eslint -c .eslintrc.js --ignore-path .gitignore --ignore-pattern '**/*.json' --ignore-pattern '**/*.gen.ts' --ignore-pattern '**/types/*.d.ts' --ignore-pattern '**/src/testFixtures/**' --ignore-pattern '**/resources/js/graphStateMachine.js' --fix --ext .ts packages plugins",
3737
"clean": "npm run clean -w packages/ -w plugins/",
3838
"reset": "npm run clean && ts-node ./scripts/clean.ts node_modules && npm install",
3939
"generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present"

packages/core/src/testLint/eslint.test.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,20 @@ describe('eslint', function () {
1515
'../../node_modules/.bin/eslint',
1616
'-c',
1717
'../../.eslintrc.js',
18+
// Note: eslint currently does not support multiple --ignore-path args.
19+
// Use --ignore-pattern as a workaround.
1820
'--ignore-path',
19-
'../../.eslintignore',
21+
'../../.gitignore',
22+
'--ignore-pattern',
23+
'**/*.json',
24+
'--ignore-pattern',
25+
'**/*.gen.ts',
26+
'--ignore-pattern',
27+
'**/types/*.d.ts',
28+
'--ignore-pattern',
29+
'**/src/testFixtures/**',
30+
'--ignore-pattern',
31+
'**/resources/js/graphStateMachine.js',
2032
'--ext',
2133
'.ts',
2234
'.',
@@ -25,6 +37,6 @@ describe('eslint', function () {
2537
throws: false,
2638
}
2739
)
28-
assert.strictEqual(result.status, 0, result.stdout.toString())
40+
assert.strictEqual(result.status, 0, result.output.toString())
2941
})
3042
})

0 commit comments

Comments
 (0)