Merge remote-tracking branch 'origin/V2.14.1' into V2.15.0

.prettierignore

+.editorconfig
+.gitignore
+.npmrc
+yarn.lock
\ No newline at end of file

.prettierrc

+{
+  "printWidth": 100,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": false,
+  "singleQuote": true,
+  "quoteProps": "as-needed",
+  "jsxSingleQuote": false,
+  "trailingComma": "es5",
+  "bracketSpacing": true,
+  "jsxBracketSameLine": false,
+  "arrowParens": "avoid",
+  "proseWrap": "preserve",
+  "htmlWhitespaceSensitivity": "css",
+  "endOfLine": "auto"
+}

README.md

 # ptfw-uniapp
 
+> 注意：在 git commit 之前建议主动执行代码格式化命令 yarn run pretty，确保格式化后的代码能够正常运行，不然 git commit 时会自动进行格式化，打断提交；代码格式化操作只对已暂存的文件生效，即只对 git add 的文件进行格式化。

jsconfig.json

@@ -4,5 +4,6 @@
     "paths": {
       "@/*": ["./src/*"]
     }
-  }
+  },
+  "exclude": ["node_modules", "dist"]
 }

package.json

@@ -15,7 +15,8 @@
     "dev:mp-alipay": "npm run dev:alipay",
     "build:mp-weixin": "npm run master:weixin",
     "build:mp-alipay": "npm run master:alipay",
-    "info": "node node_modules/@dcloudio/vue-cli-plugin-uni/commands/info.js"
+    "info": "node node_modules/@dcloudio/vue-cli-plugin-uni/commands/info.js",
+    "pretty": "pretty-quick --staged"
   },
   "dependencies": {
     "@dcloudio/uni-mp-alipay": "*",
@@ -37,8 +38,11 @@
     "@vue/cli-plugin-babel": "3.5.1",
     "@vue/cli-service": "^3.8.0",
     "babel-plugin-import": "^1.11.0",
+    "husky": "^3.0.1",
     "node-sass": "^4.12.0",
     "postcss-comment": "^2.0.0",
+    "prettier": "^1.18.2",
+    "pretty-quick": "^1.11.1",
     "sass-loader": "^7.1.0",
     "vue-template-compiler": "^2.6.10"
   },
@@ -46,5 +50,10 @@
     "last 3 versions",
     "Android >= 4.4",
     "ios >= 8"
-  ]
+  ],
+  "husky": {
+    "hooks": {
+      "pre-commit": "pretty-quick --staged --bail"
+    }
+  }
 }

postcss.config.js

-const pkg = require('./package.json')
 module.exports = {
   parser: require('postcss-comment'),
   plugins: [
     require('postcss-import'),
     require('autoprefixer')({
-      remove: process.env.UNI_PLATFORM !== 'h5'
+      remove: process.env.UNI_PLATFORM !== 'h5',
     }),
-    require('@dcloudio/vue-cli-plugin-uni/packages/postcss')
-  ]
+    require('@dcloudio/vue-cli-plugin-uni/packages/postcss'),
+  ],
 }