diff --git a/packages/taro-cli/templates/default/_eslintrc b/packages/taro-cli/templates/default/_eslintrc index e8c9a7ef084e..dc480133fb5b 100644 --- a/packages/taro-cli/templates/default/_eslintrc +++ b/packages/taro-cli/templates/default/_eslintrc @@ -1,13 +1,20 @@ { +<%if (!locals.typescript) {-%> "extends": ["taro"], "rules": { "no-unused-vars": ["error", { "varsIgnorePattern": "Taro" }], "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx", ".tsx"] }] }, - <%if (!locals.typescript) {-%> "parser": "babel-eslint" - <%} else { -%> + <%} else {-%> + "extends": ["taro", "plugin:@typescript-eslint/recommended"], "parser": "@typescript-eslint/parser", + "rules": { + "no-unused-vars": ["error", { "varsIgnorePattern": "Taro" }], + "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx", ".tsx"] }], + "@typescript-eslint/explicit-function-return-type": 0, + "@typescript-eslint/no-empty-function": ["warn"] + }, "parserOptions": { "ecmaFeatures": { "jsx": true @@ -15,5 +22,5 @@ "useJSXTextNode": true, "project": "./tsconfig.json" } - <%}-%> +<%}-%> } diff --git a/packages/taro-cli/templates/default/package.json b/packages/taro-cli/templates/default/package.json index ff150a334a0d..77854d11ecda 100644 --- a/packages/taro-cli/templates/default/package.json +++ b/packages/taro-cli/templates/default/package.json @@ -67,7 +67,8 @@ "stylelint-config-taro-rn": "<%= version %>", "stylelint-taro-rn": "<%= version %>", "eslint-plugin-taro": "<%= version %>"<% if (typescript) {%>, - "@typescript-eslint/parser": "^1.6.0", + "@typescript-eslint/eslint-plugin": "^2.13.0", + "@typescript-eslint/parser": "^2.13.0", "typescript": "^3.0.1"<%}%> } }