Skip to content

Commit 896fc97

Browse files
adjust rules, fix type checked rules being disabled (#242)
Signed-off-by: Kangrui Johann Ye <[email protected]>
1 parent db5b3ef commit 896fc97

File tree

29 files changed

+44
-208
lines changed

29 files changed

+44
-208
lines changed

eslint.config.mjs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ export default tseslint.config(
1717
'packages/eslint-plugin-angular/src/configs/format-template.ts',
1818
'packages/eslint-plugin-react/*',
1919
'packages/eslint-plugin-typescript/src/configs/index.ts',
20-
'packages/eslint-plugin-typescript/src/configs/recommended/*',
21-
'packages/eslint-plugin-typescript/src/configs/recommended-json/*',
22-
'packages/eslint-plugin-typescript/src/configs/recommended-package/*',
23-
'packages/eslint-plugin-typescript/src/configs/recommended-typescript/recommended-typescript.config.ts',
24-
'packages/eslint-plugin-typescript/src/configs/recommended-typescript/rules/format.ts',
25-
'packages/eslint-plugin-typescript/src/configs/recommended-typescript/rules/import.ts',
26-
'packages/eslint-plugin-typescript/src/configs/recommended-typescript/rules/rxjs.ts',
20+
'packages/eslint-plugin-typescript/src/configs/json.ts',
21+
'packages/eslint-plugin-typescript/src/configs/package.ts',
22+
'packages/eslint-plugin-typescript/src/configs/format.ts',
23+
'packages/eslint-plugin-typescript/src/configs/import.ts',
24+
'packages/eslint-plugin-typescript/src/configs/rxjs.ts',
2725
'packages/eslint-plugin-typescript/src/rules/package/*',
2826
'packages/eslint-plugin-typescript/src/rules/ts-config/*',
2927
'packages/eslint-plugin-typescript/src/rules/typescript/*.spec.ts',

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cloudflight/eslint-plugin",
3-
"version": "1.0.0-rc4",
3+
"version": "1.0.0-rc5",
44
"private": true,
55
"volta": {
66
"node": "20.12.2",

packages/eslint-plugin-angular/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,16 @@ import { includeIgnoreFile } from '@eslint/compat';
4141
import { dirname, normalize, resolve } from 'node:path';
4242
import { fileURLToPath } from 'node:url';
4343

44-
const __filename = fileURLToPath(import.meta.url);
45-
const __dirname = dirname(__filename);
46-
const gitignorePath = normalize(resolve(__dirname, '.gitignore'));
44+
const directory = dirname(fileURLToPath(import.meta.url));
45+
const gitignorePath = normalize(resolve(directory, '.gitignore'));
4746

4847
export default [
4948
includeIgnoreFile(gitignorePath),
5049
...cloudflightAngularConfig,
5150
{
5251
languageOptions: {
5352
parserOptions: {
54-
project: ['tsconfig.*?.json'],
53+
project: ['tsconfig*(.*).json'],
5554
tsconfigRootDir: import.meta.dirname,
5655
},
5756
},

packages/eslint-plugin-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cloudflight/eslint-plugin-angular",
3-
"version": "1.0.0-rc4",
3+
"version": "1.0.0-rc5",
44
"description": "Cloudflight eslint-plugin & eslint-config for angular",
55
"volta": {
66
"extends": "../../package.json"

packages/eslint-plugin-angular/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import {angularEslintRules} from './configs/angular-eslint';
77
import {angularTemplateEslintRules} from './configs/angular-eslint-template';
88

99
export const cloudflightAngularTypescriptConfig = tseslint.config(
10+
...cloudflightTypescriptConfig,
1011
{
1112
files: ['**/*.{ts,mts,cts}'],
1213
extends: [
13-
...cloudflightTypescriptConfig,
1414
...angular.configs.tsRecommended,
1515
],
1616
processor: angular.processInlineTemplates,

packages/eslint-plugin-node/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,16 @@ import { includeIgnoreFile } from '@eslint/compat';
3232
import { dirname, normalize, resolve } from 'node:path';
3333
import { fileURLToPath } from 'node:url';
3434

35-
const __filename = fileURLToPath(import.meta.url);
36-
const __dirname = dirname(__filename);
37-
const gitignorePath = normalize(resolve(__dirname, '.gitignore'));
35+
const directory = dirname(fileURLToPath(import.meta.url));
36+
const gitignorePath = normalize(resolve(directory, '.gitignore'));
3837

3938
export default [
4039
includeIgnoreFile(gitignorePath),
4140
...cloudflightNodeConfig,
4241
{
4342
languageOptions: {
4443
parserOptions: {
45-
project: ['tsconfig.*?.json'],
44+
project: ['tsconfig*(.*).json'],
4645
tsconfigRootDir: import.meta.dirname,
4746
},
4847
},

packages/eslint-plugin-node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cloudflight/eslint-plugin-node",
3-
"version": "1.0.0-rc4",
3+
"version": "1.0.0-rc5",
44
"description": "Cloudflight eslint-plugin & eslint-config for node",
55
"volta": {
66
"extends": "../../package.json"

packages/eslint-plugin-node/src/configs/node.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@ export const nodeRules: TSESLint.Linter.RulesRecord = {
44
// require all requires be top-level
55
'n/global-require': 'error',
66

7-
// allow typescript files
8-
'n/no-missing-import': [
9-
'error',
10-
{
11-
tryExtensions: ['.js', '.ts', '.json', '.node'],
12-
},
13-
],
7+
// disabled because of https://github.com/eslint-community/eslint-plugin-n/issues/349
8+
'n/no-missing-import': 'off',
149

1510
// disallow use of new operator with the require function
1611
'n/no-new-require': 'error',

packages/eslint-plugin-node/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import {securityRules} from './configs/security';
77
import {nodeRules} from './configs/node';
88

99
export const cloudflightNodeConfig = tseslint.config(
10+
...cloudflightTypescriptConfig,
1011
{
1112
files: ['**/*.{js,mjs,cjs,ts,mts,cts}'],
1213
extends: [
13-
...cloudflightTypescriptConfig,
1414
pluginNode.configs['flat/recommended'],
1515
nounsanitized.configs.recommended,
1616
pluginSecurity.configs.recommended,

packages/eslint-plugin-react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cloudflight/eslint-plugin-react",
3-
"version": "1.0.0-rc4",
3+
"version": "1.0.0-rc5",
44
"description": "Cloudflight eslint-plugin & eslint-config for React",
55
"volta": {
66
"extends": "../../package.json"

0 commit comments

Comments
 (0)