diff --git a/Gulpfile.js b/Gulpfile.js index d033ee33c96..5d314da7ccb 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -346,8 +346,6 @@ const lintFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("lin /** @type { (folder: string) => { (): Promise; displayName?: string } } */ const eslint = (folder) => async () => { - const ESLINTRC_CI = ".eslintrc.ci.json"; - const isCIEnv = cmdLineOptions.ci || process.env.CI === "true"; const args = [ "node_modules/eslint/bin/eslint", @@ -358,13 +356,6 @@ const eslint = (folder) => async () => { "--ext", ".ts", ]; - if ( - isCIEnv && - fs.existsSync(path.resolve(folder, ESLINTRC_CI)) - ) { - args.push("--config", path.resolve(folder, ESLINTRC_CI)); - } - if (cmdLineOptions.fix) { args.push("--fix"); } diff --git a/src/.eslintrc.ci.json b/src/.eslintrc.ci.json deleted file mode 100644 index 0c204a99c5d..00000000000 --- a/src/.eslintrc.ci.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "./.eslintrc.json", - "parserOptions": { - "tsconfigRootDir": "src", - "project": "./tsconfig-base.json" - }, - "rules": { - "@typescript-eslint/no-unnecessary-qualifier": "error", - "@typescript-eslint/no-unnecessary-type-assertion": "error" - } -} diff --git a/src/.eslintrc.json b/src/.eslintrc.json index 4a05c98fb70..78ef6cc9692 100644 --- a/src/.eslintrc.json +++ b/src/.eslintrc.json @@ -1,5 +1,13 @@ { "extends": "../.eslintrc.json", + "parserOptions": { + "tsconfigRootDir": "src", + "project": "./tsconfig-base.json" + }, + "rules": { + "@typescript-eslint/no-unnecessary-qualifier": "error", + "@typescript-eslint/no-unnecessary-type-assertion": "error" + }, "overrides": [ { "files": ["lib/*.d.ts"],