fix(cli): 模版内 eslintrc 变量读读取错误导致初始化报错

zhangquan · Apr 11, 2019 · 09cdab1 · 09cdab1
1 parent 8990d4f
commit 09cdab1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/packages/taro-cli/templates/default/eslintrc b/packages/taro-cli/templates/default/eslintrc
@@ -4,7 +4,7 @@
     "no-unused-vars": ["error", { "varsIgnorePattern": "Taro" }],
     "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx", ".tsx"] }]
   },
-  <%if (!typescript) {-%>
+  <%if (!locals.typescript) {-%>
   "parser": "babel-eslint"
   <%} else { -%>
   "parser": "@typescript-eslint/parser",

diff --git a/packages/taro-cli/templates/mobx/eslintrc b/packages/taro-cli/templates/mobx/eslintrc
@@ -4,7 +4,7 @@
     "no-unused-vars": ["error", { "varsIgnorePattern": "Taro" }],
     "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx", ".tsx"] }]
   },
-  <%if (!typescript) {-%>
+  <%if (!locals.typescript) {-%>
   "parser": "babel-eslint"
   <%} else { -%>
   "parser": "@typescript-eslint/parser",

diff --git a/packages/taro-cli/templates/redux/eslintrc b/packages/taro-cli/templates/redux/eslintrc
@@ -4,7 +4,7 @@
     "no-unused-vars": ["error", { "varsIgnorePattern": "Taro" }],
     "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx", ".tsx"] }]
   },
-  <%if (!typescript) {-%>
+  <%if (!locals.typescript) {-%>
   "parser": "babel-eslint"
   <%} else { -%>
   "parser": "@typescript-eslint/parser",

diff --git a/packages/taro-cli/templates/wxcloud/client/eslintrc b/packages/taro-cli/templates/wxcloud/client/eslintrc
@@ -4,6 +4,16 @@
     "no-unused-vars": ["error", { "varsIgnorePattern": "Taro" }],
     "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx", ".tsx"] }]
   },
-  "parser": "babel-eslint"<% if (typescript) {%>,
-  "plugins": ["typescript"]<%}%>
+  <%if (!locals.typescript) {-%>
+  "parser": "babel-eslint"
+  <%} else { -%>
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "useJSXTextNode": true,
+    "project": "./tsconfig.json"
+  }
+  <%}-%>
 }
diff --git a/packages/taro-cli/templates/wxplugin/eslintrc b/packages/taro-cli/templates/wxplugin/eslintrc
@@ -4,6 +4,16 @@
     "no-unused-vars": ["error", { "varsIgnorePattern": "Taro" }],
     "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx", ".tsx"] }]
   },
-  "parser": "babel-eslint"<% if (typescript) {%>,
-  "plugins": ["typescript"]<%}%>
+  <%if (!locals.typescript) {-%>
+  "parser": "babel-eslint"
+  <%} else { -%>
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "useJSXTextNode": true,
+    "project": "./tsconfig.json"
+  }
+  <%}-%>
 }