From 828ebd54ed4ec5d24c39eade8ae6245655cbb833 Mon Sep 17 00:00:00 2001 From: Alexander T Date: Thu, 8 Aug 2019 10:57:04 +0300 Subject: [PATCH] add eslint setting for .vscode --- .gitignore | 3 +++ .vscode/extensions.json | 9 +++++++++ .vscode/settings.json | 12 ++++++++++++ Gulpfile.js | 4 ++-- scripts/eslint/tsconfig.json | 2 +- 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index a906e2cf7d5..a220522b5f0 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ tests/cases/**/*.js !tests/cases/docker/*.js/ tests/cases/**/*.js.map *.config +scripts/eslint/built/ scripts/debug.bat scripts/run.bat scripts/word2md.js @@ -60,6 +61,8 @@ internal/ **/.vs **/.vscode !**/.vscode/tasks.json +!**/.vscode/settings.json +!**/.vscode/extensions.json !tests/cases/projects/projectOption/**/node_modules !tests/cases/projects/NodeModulesSearch/**/* !tests/baselines/reference/project/nodeModules*/**/* diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 00000000000..bae8c12d07c --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,9 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint" + ], + + "unwantedRecommendations": [ + "ms-vscode.vscode-typescript-tslint-plugin" + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..294364106e6 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,12 @@ +{ + "eslint.validate": [ + "javascript", + { + "language": "typescript", + "autoFix": true + } + ], + "eslint.options": { + "rulePaths": ["./scripts/eslint/built/rules/"], + } +} \ No newline at end of file diff --git a/Gulpfile.js b/Gulpfile.js index 838d4190b18..26df480e082 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -327,7 +327,7 @@ cleanTasks.push(cleanEslintRules); task("clean-eslint-rules", cleanEslintRules); task("clean-eslint-rules").description = "Cleans the outputs for the eslint rules"; -const runEslintRulesTests = () => runConsoleTests("built/eslint/tests", "mocha-fivemat-progress-reporter", /*runInParallel*/ false, /*watchMode*/ false); +const runEslintRulesTests = () => runConsoleTests("scripts/eslint/built/tests", "mocha-fivemat-progress-reporter", /*runInParallel*/ false, /*watchMode*/ false); task("run-eslint-rules-tests", series(buildEslintRules, runEslintRulesTests)); task("run-eslint-rules-tests").description = "Runs the eslint rule tests"; @@ -337,7 +337,7 @@ const eslint = (path) => async () => { const args = [ "node_modules/eslint/bin/eslint", "--format", "autolinkable-stylish", - "--rulesdir", "built/eslint/rules/", + "--rulesdir", "scripts/eslint/built/rules", "--ext", ".ts", `"${ path }"`, ]; diff --git a/scripts/eslint/tsconfig.json b/scripts/eslint/tsconfig.json index 8832e89713a..6ddaa3e12f8 100644 --- a/scripts/eslint/tsconfig.json +++ b/scripts/eslint/tsconfig.json @@ -16,7 +16,7 @@ "strict": true, "module": "commonjs", "target": "es6", - "outDir": "../../built/eslint", + "outDir": "./built", "lib": ["es2015", "es2016"] },