Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
Signed-off-by: Kangrui Johann Ye <[email protected]>
  • Loading branch information
strawberry-choco committed Oct 2, 2024
1 parent 77a03fb commit 46d2aab
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 15 deletions.
26 changes: 25 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,35 @@ const gitignorePath = resolve(directory, '.gitignore');

export default tseslint.config(
includeIgnoreFile(gitignorePath),
{
// these files are temporarily disabled for linting
// until we are done with migrating everything to v9
ignores: [
'packages/eslint-plugin-angular/*',
'packages/eslint-plugin-node/*',
'packages/eslint-plugin-react/*',
'packages/eslint-plugin-vue/*',
'packages/eslint-plugin-typescript/src/configs/index.ts',
'packages/eslint-plugin-typescript/src/configs/recommended/*',
'packages/eslint-plugin-typescript/src/configs/recommended-json/*',
'packages/eslint-plugin-typescript/src/configs/recommended-package/*',
'packages/eslint-plugin-typescript/src/configs/recommended-typescript/recommended-typescript.config.ts',
'packages/eslint-plugin-typescript/src/configs/recommended-typescript/rules/custom.ts',
'packages/eslint-plugin-typescript/src/configs/recommended-typescript/rules/format.ts',
'packages/eslint-plugin-typescript/src/configs/recommended-typescript/rules/import.ts',
'packages/eslint-plugin-typescript/src/configs/recommended-typescript/rules/rxjs.ts',
'packages/eslint-plugin-typescript/src/rules/*',
'packages/eslint-plugin-typescript/src/util/*',
'scripts/*',
'.eslintrc.format.js',
'eslint.config.mjs',
]
},
...config,
{
languageOptions: {
parserOptions: {
projectService: true,
project: ['./packages/*/tsconfig.json', './packages/*/tsconfig.spec.json'],
tsconfigRootDir: import.meta.dirname,
},
},
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"scripts": {
"build-package": "tsc",
"test-package": "jest"
"test-packagex": "jest"
},
"dependencies": {
"@eslint/js": "^9.11.1",
Expand Down
30 changes: 18 additions & 12 deletions packages/eslint-plugin-typescript/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,21 @@ import tseslint from 'typescript-eslint';
import {eslintRules} from './configs/recommended-typescript/rules/eslint';
import {typescriptEslintRules} from './configs/recommended-typescript/rules/typescript-eslint';

export const config = tseslint.config({
files: ['**/*.{js,mjs,cjs,ts,mts,cts}'],
ignores: ['jest.config*.ts'],
extends: [
pluginJs.configs.recommended,
...tseslint.configs.recommendedTypeChecked,
],
rules: {
...eslintRules,
...typescriptEslintRules,
}
});
export const config = tseslint.config(
{
files: ['**/*.{js,mjs,cjs,ts,mts,cts}'],
ignores: ['jest.config*.ts'],
extends: [
pluginJs.configs.recommended,
...tseslint.configs.recommendedTypeChecked,
],
rules: {
...eslintRules,
...typescriptEslintRules,
}
},
{
files: ['**/*.{js,mjs,cjs}'],
extends: [tseslint.configs.disableTypeChecked],
},
);
2 changes: 1 addition & 1 deletion packages/eslint-plugin-typescript/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"module": "commonjs",
"types": ["jest", "node"]
},
"include": ["src/**/*.spec.ts"],
"include": ["src/**/*.spec.ts", "jest.config.ts"],
"exclude": ["src/index.ts"]
}

0 comments on commit 46d2aab

Please sign in to comment.