fix: ts supports

eslint · Jul 5, 2022 · 4b2e121 · 4b2e121
1 parent c21f4c2
commit 4b2e121
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/lib/init/config-initializer.js b/lib/init/config-initializer.js
@@ -166,22 +166,16 @@ function processAnswers(answers) {
 
     // add in library information
     if (answers.framework === "react") {
-        config.parserOptions.ecmaFeatures = {
-            jsx: true
-        };
         config.plugins = ["react"];
         config.extends.push("plugin:react/recommended");
     } else if (answers.framework === "vue") {
         config.plugins = ["vue"];
         config.extends.push("plugin:vue/vue3-essential");
     }
 
-    if (answers.typescript) {
-        if (answers.framework === "vue") {
-            config.parserOptions.parser = "@typescript-eslint/parser";
-        } else {
-            config.parser = "@typescript-eslint/parser";
-        }
+    // if answers.source == "guide", the ts supports should be in the shared config.
+    if (answers.typescript && answers.source === "prompt") {
+        config.parser = "@typescript-eslint/parser";
 
         if (Array.isArray(config.plugins)) {
             config.plugins.push("@typescript-eslint");

diff --git a/tests/init/config-initializer.js b/tests/init/config-initializer.js
@@ -179,9 +179,9 @@ describe("configInitializer", () => {
                 answers.framework = "react";
                 const config = init.processAnswers(answers);
 
-                assert.strictEqual(config.parserOptions.ecmaFeatures.jsx, true);
                 assert.strictEqual(config.parserOptions.ecmaVersion, "latest");
                 assert.deepStrictEqual(config.plugins, ["react"]);
+                assert.include(config.extends, "plugin:react/recommended");
             });
 
             it("should enable vue plugin", () => {
@@ -208,7 +208,6 @@ describe("configInitializer", () => {
                 const config = init.processAnswers(answers);
 
                 assert.deepStrictEqual(config.extends, ["eslint:recommended", "plugin:vue/vue3-essential", "plugin:@typescript-eslint/recommended"]);
-                assert.strictEqual(config.parserOptions.parser, "@typescript-eslint/parser");
                 assert.deepStrictEqual(config.plugins, ["vue", "@typescript-eslint"]);
             });