Fix eslint (#32)

* chore(packages): update * fix(eslint): update config * feat(eslint): wxs config
NewFuture · Aug 18, 2019 · 7b7a919 · 7b7a919
1 parent a783d20
commit 7b7a919
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 53 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -2,10 +2,20 @@
     "root": true,
     "parserOptions": {
         "parser": "@typescript-eslint/parser",
-        "project": "tsconfig.json",
-        "tsconfigRootDir": "./"
+        "project": "tsconfig.json"
     },
-    "plugins": ["prettier", "@typescript-eslint"],
+    "overrides": [
+        {
+            "files": ["src/**/*.wxts"],
+            "parserOptions": {
+                "parser": "@typescript-eslint/parser",
+                "createDefaultProgram ": true,
+                "project": "tsconfig.wxs.json",
+                "extraFileExtensions": [".wxts"]
+            }
+        }
+    ],
+    "plugins": ["@typescript-eslint", "prettier"],
     "extends": [
         "eslint:recommended",
         "plugin:@typescript-eslint/recommended",
@@ -16,8 +26,16 @@
     ],
     "rules": {
         "prettier/prettier": "warn",
-        "no-console": "warn",
+        "no-cond-assign": ["warn", "always"],
         "no-dupe-class-members": "off",
+        "no-console": "warn",
+        "require-atomic-updates": "warn",
+        "sort-vars": [
+            "warn",
+            {
+                "ignoreCase": true
+            }
+        ],
         "require-jsdoc": [
             "error",
             {
@@ -27,34 +45,38 @@
                 }
             }
         ],
-        "@typescript-eslint/generic-type-naming": 1,
+        "prefer-const": "error",
+        "prefer-rest-params": "warn",
+        "@typescript-eslint/generic-type-naming": "warn",
+        "@typescript-eslint/no-namespace": "off",
         "@typescript-eslint/member-naming": [
-            1,
+            "warn",
             {
-                "private": "^_",
+                "private": "^_[a-z][a-zA-Z0-9]*$",
                 "public": "^\\$?[a-z][a-zA-Z0-9]*$"
             }
         ],
-        "@typescript-eslint/member-ordering": 1,
-        "@typescript-eslint/no-extraneous-class": [2, {}],
+        "@typescript-eslint/member-ordering": "warn",
+        "@typescript-eslint/no-empty-function": "warn",
+        "@typescript-eslint/no-extraneous-class": ["error", {}],
         "@typescript-eslint/no-this-alias": [
-            1,
+            "warn",
             {
                 "allowedNames": []
             }
         ],
-        "@typescript-eslint/no-for-in-array": 1,
-        "@typescript-eslint/no-non-null-assertion": 1,
-        "@typescript-eslint/no-unnecessary-qualifier": 1,
+        "@typescript-eslint/no-for-in-array": "warn",
+        "@typescript-eslint/no-non-null-assertion": "off",
+        "@typescript-eslint/no-unnecessary-qualifier": "off",
         "@typescript-eslint/no-unnecessary-type-assertion": [
-            2,
+            "off",
             {
                 "typesToIgnore": []
             }
         ],
-        "@typescript-eslint/prefer-function-type": 0,
+        "@typescript-eslint/prefer-function-type": "off",
         "@typescript-eslint/explicit-function-return-type": [
-            1,
+            "error",
             {
                 "allowExpressions": true
             }
@@ -77,6 +99,7 @@
         "clearTimeout": "readonly",
         "setInterval": "readonly",
         "clearInterval": "readonly",
+        "requirePlugin": "readonly",
         "getRegExp": "readonly",
         "getDate": "readonly"
     }

diff --git a/.prettierignore b/.prettierignore
@@ -40,3 +40,5 @@ build/Release
 
 # next.js build output
 .next
+
+.npmrc
diff --git a/.prettierrc b/.prettierrc
@@ -46,12 +46,6 @@
                 "trailingComma": "all"
             }
         },
-        {
-            "files": ".npmrc",
-            "options": {
-                "parser": "markdown"
-            }
-        },
         {
             "files": "*.{wxs,js}",
             "options": {

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -37,6 +37,15 @@
     "[wxml]": {
         "editor.defaultFormatter": "qiu8310.minapp-vscode",
     },
+    "[typescript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+    },
+    "[json]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+    },
+    "[jsonc]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+    },
     "emmet.includeLanguages": {
         "wxml": "html",
         "wxss": "css",
@@ -48,25 +57,24 @@
     "html.suggest.html5": false,
     "htmlhint.documentSelector": ["html", "wxml"],
     "dot-template-vscode.watchFilesGlobPattern": "src/**/*",
+    "emmet.syntaxProfiles": {
+        "html": {
+            "filters": "html, bem",
+            "self_closing_tag": true,
+        },
+    },
     "minapp-vscode.wxmlFormatter": "prettier",
+    "minapp-vscode.disableDecorate": true,
+    "minapp-vscode.linkAttributeNames": ["src"],
+    "minapp-vscode.globalStyleFiles": ["src/app.scss"],
+    "minapp-vscode.resolveRoots": ["src"],
+    "minapp-vscode.selfCloseTags": ["img"],
     "minapp-vscode.styleExtensions": ["wxss", "css", "scss"],
     "minapp-vscode.documentSelector": ["wxml", "html"],
-    "minapp-vscode.globalStyleFiles": ["src/app.scss"],
-    "minapp-vscode.decorateComplexInterpolation": true,
-    "minapp-vscode.selfCloseTags": [],
     "minapp-vscode.snippets": {
-        "wxml": {
-            "open-data": {
-                // prettier-ignore
-                "body": "<open-data type=\"${1|groupName,userNickName,userAvatarUrl,userGender,userCity,userProvince,userCountry,userLanguage|}\" lang=\"${2|en,zh_CN,zh_TW|}\" ></open-data>$0"
-            },
-        },
+        "wxml": {},
     },
-    // "minapp-vscode.sass": {
-    //     "includePaths": ["${workspaceFolder}/src", "${workspaceFolder}/src/assets"],
-    // },
     // prettier
-
     "prettier.ignorePath": ".prettierignore", // use .prettierignore
     "prettier.eslintIntegration": true,
     "prettier.stylelintIntegration": true,
@@ -85,6 +93,10 @@
             "fileMatch": ["app.json", "app.jsonc", "app.json5", "app.cjson"],
             "url": "https://newfuture.github.io/miniprogram-json-schema/app.json",
         },
+        {
+            "fileMatch": ["sitemap.json", "sitemap.jsonc", "sitemap.json5", "sitemap.cjson"],
+            "url": "https://newfuture.github.io/miniprogram-json-schema/sitemap.json",
+        },
         {
             "fileMatch": [
                 "project.config.json",
@@ -94,10 +106,6 @@
             ],
             "url": "https://newfuture.github.io/miniprogram-json-schema/project.config.json",
         },
-        {
-            "fileMatch": ["sitemap.json", "sitemap.jsonc", "sitemap.json5", "sitemap.cjson"],
-            "url": "https://newfuture.github.io/miniprogram-json-schema/sitemap.json",
-        },
         {
             "fileMatch": [
                 "src/pages/**/*.jsonc",

diff --git a/.vscode/wxml.code-snippets b/.vscode/wxml.code-snippets
@@ -0,0 +1,14 @@
+{
+    "prettier-ignore": {
+        "scope": "wxml,html",
+        "prefix": ["<!--"],
+        "body": "$BLOCK_COMMENT_START ${1|prettier-ignore-attribute class,prettier-ignore|} $BLOCK_COMMENT_END$0",
+        "description": "prettier ignore attribute",
+    },
+    "prettier-ignore-attribute": {
+        "scope": "html",
+        "prefix": ["prettier-ignore-attribute"],
+        "body": "$BLOCK_COMMENT_START prettier-ignore-attribute ${1|style,class|} $BLOCK_COMMENT_END$0",
+        "description": "prettier ignore attribute",
+    },
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "miniprogram-template",
-    "version": "0.1.1",
+    "version": "0.1.3",
     "description": "Mini Program Template Projects",
     "repository": {
         "type": "git",
@@ -21,10 +21,10 @@
         "fix": "npm run prettier-fix && npm run lint-fix",
         "help": "miniprogram-build -h",
         "lint": "npm run lint:js && npm run lint:wxss && npm run lint:wxml && npm run lint:config",
-        "lint-fix": "npm run lint-fix:wxss && npm run lint-fix:js && npm run lint-fix:config",
-        "lint-fix:config": "prettier *.json .*rc \"env/*\" \".vscode/*\" --write",
-        "lint-fix:js": "eslint \"src/**/*.{ts,js,wxs,wxts}\" --fix",
-        "lint-fix:wxss": "stylelint \"src/**/*\" --fix",
+        "lint-fix": "npm run fix:wxss && npm run fix:js && npm run fix:config",
+        "fix:config": "prettier *.json .*rc \"env/*\" \".vscode/*\" --write",
+        "fix:js": "eslint \"src/**/*.{ts,js,wxs,wxts}\" --fix",
+        "fix:wxss": "stylelint \"src/**/*\" --fix",
         "lint:config": "prettier *.json .*rc \"env/*\" \".vscode/*\" --check",
         "lint:js": "eslint \"src/**/*.{ts,js,wxs,wxts}\"",
         "lint:wxml": "htmlhint \"src/**/*.{wxml,html}\"",
@@ -47,12 +47,12 @@
         "tslib": "^1.10.0"
     },
     "devDependencies": {
-        "@dragongate/miniprogram-api-typings": "^2.7.7",
+        "@dragongate/miniprogram-api-typings": "^2.7.14",
         "@types/miniprogram-wxs": "^2.6.2",
-        "@typescript-eslint/eslint-plugin": "^1.11.0",
-        "@typescript-eslint/parser": "^1.11.0",
-        "eslint": "^6.0.1",
-        "eslint-config-prettier": "^5.1.0",
+        "@typescript-eslint/eslint-plugin": "^2.0.0",
+        "@typescript-eslint/parser": "^2.0.0",
+        "eslint": "^5.16.0",
+        "eslint-config-prettier": "^6.0.0",
         "eslint-plugin-prettier": "^3.1.0",
         "htmlhint": "^0.11.0",
         "miniprogram-build": "^6.4.3",
@@ -61,9 +61,9 @@
         "stylelint-config-prettier": "^5.2.0",
         "stylelint-config-rational-order": "^0.1.2",
         "stylelint-config-recommended-scss": "^3.3.0",
-        "stylelint-order": "^3.0.0",
+        "stylelint-order": "^3.0.1",
         "stylelint-prettier": "^1.1.1",
-        "stylelint-scss": "^3.8.0",
-        "typescript": "^3.5.2"
+        "stylelint-scss": "^3.9.3",
+        "typescript": "^3.5.3"
     }
 }
diff --git a/src/app.ts b/src/app.ts
@@ -41,7 +41,6 @@ App({
         // 获取用户信息
         wx.getSetting({
             success: (res) => {
-                //@ts-ignore
                 if (res.authSetting["scope.userInfo"]) {
                     // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框
                 }

diff --git a/tsconfig.wxs.json b/tsconfig.wxs.json
@@ -0,0 +1,8 @@
+{
+    "extends": "./tsconfig.json",
+    "include": ["src/**/*.wxts"],
+    "compilerOptions": {
+        "types": [],
+        "lib": []
+    }
+}