From 2a542302bc961a64cb04b69bec000fe851cdba31 Mon Sep 17 00:00:00 2001 From: wancat Date: Tue, 6 Feb 2024 09:31:20 +0800 Subject: [PATCH] update eslint to omit blank line between members --- .eslintrc.js | 13 +++++++++++++ package.json | 2 +- packages/utils/src/dag.ts | 4 +++- packages/utils/tsconfig.json | 3 ++- yarn.lock | 4 ++-- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 8a60988..0e3ae44 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -40,6 +40,11 @@ module.exports = { 'prettier/prettier': ['error', { endOfLine: 'auto', semi: false }], 'import/prefer-default-export': 'off', 'no-restricted-syntax': ['off', 'ForOfStatement'], + 'lines-between-class-members': [ + 'error', + 'always', + { exceptAfterSingleLine: true }, + ], '@typescript-eslint/explicit-module-boundary-types': 'off', @@ -55,4 +60,12 @@ module.exports = { }, ], }, + overrides: [ + { + files: ['**/tests/**/*.js', '**/tests/**/*.ts'], // Adjust the pattern to match your test files + rules: { + 'import/extensions': 'off', // Turn off the rule for test files + }, + }, + ], } diff --git a/package.json b/package.json index 81e089b..1e28d49 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "build:quests": "yarn workspace server build:quests" }, "devDependencies": { - "@types/jest": "^29.5.11", + "@types/jest": "^29.5.12", "@types/node": "^20.10.4", "@typescript-eslint/eslint-plugin": "^6.14.0", "@typescript-eslint/parser": "^6.14.0", diff --git a/packages/utils/src/dag.ts b/packages/utils/src/dag.ts index b428e80..b5ef439 100644 --- a/packages/utils/src/dag.ts +++ b/packages/utils/src/dag.ts @@ -53,7 +53,9 @@ export default class DAG { if (node.layer !== undefined) { return node.layer } - const previousLayer = node.requirements.map((rId: string) => this.setLayer(rId)) + const previousLayer = node.requirements.map((rId: string) => + this.setLayer(rId) + ) node.layer = Math.max(...previousLayer, 0) + 1 if (this.layers.length < node.layer) { this.layers.push(1) diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index bf649ac..8f50229 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -2,7 +2,8 @@ "extends": "../../tsconfig.json", "compilerOptions": { "rootDir": "src", - "outDir": "./dist" + "outDir": "./dist", + "allowJs": false }, "include": ["src"], "exclude": ["node_modules", "dist"] diff --git a/yarn.lock b/yarn.lock index 81241b8..e74795e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1460,7 +1460,7 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^29.5.11": +"@types/jest@npm:^29.5.12": version: 29.5.12 resolution: "@types/jest@npm:29.5.12" dependencies: @@ -6495,7 +6495,7 @@ __metadata: version: 0.0.0-use.local resolution: "linux-odyssey@workspace:." dependencies: - "@types/jest": "npm:^29.5.11" + "@types/jest": "npm:^29.5.12" "@types/node": "npm:^20.10.4" "@typescript-eslint/eslint-plugin": "npm:^6.14.0" "@typescript-eslint/parser": "npm:^6.14.0"