Merge pull request #1 from vueComponent/master

sync

Author: zt8989

.babelrc

@@ -1,16 +1,14 @@
 {
-    "env": {
-        "test": {
-            "presets": [
-                ["env", { "targets": { "node": "current" } }]
-            ],
-            "plugins": [
-                "transform-vue-jsx",
-                "transform-object-assign",
-                "transform-object-rest-spread",
-                "transform-class-properties",
-                "transform-runtime"
-            ]
-        }
+  "env": {
+    "test": {
+      "presets": [["env", { "targets": { "node": "current" } }]],
+      "plugins": [
+        "transform-vue-jsx",
+        "transform-object-assign",
+        "transform-object-rest-spread",
+        "transform-class-properties",
+        "transform-runtime"
+      ]
     }
+  }
 }

.eslintrc

@@ -1,25 +1,36 @@
 {
-    "root": true,
-    "env": {
-        "browser": true,
-        "node": true,
-        "jasmine": true,
-        "jest": true,
-        "es6": true
-    },
-    "parserOptions": {
-        "parser": "babel-eslint"
-    },
-    "extends": ["plugin:vue/recommended", "prettier"],
-    "rules": {
-        "comma-dangle": [2, "always-multiline"],
-        "no-var": "error",
-        "camelcase": "off",
-        "no-extra-boolean-cast": "off",
-        "semi": ["error", "always"],
-        "vue/require-prop-types": "off",
-        "vue/require-default-prop": "off",
-        "vue/no-reserved-keys": "off",
-        "vue/prop-name-casing": "off"
-    }
-}
+  "root": true,
+  "env": {
+    "browser": true,
+    "node": true,
+    "jasmine": true,
+    "jest": true,
+    "es6": true
+  },
+  "parserOptions": {
+    "parser": "babel-eslint"
+  },
+  "extends": ["plugin:vue/recommended", "prettier"],
+  "plugins": ["markdown"],
+  "rules": {
+    "comma-dangle": [2, "always-multiline"],
+    "no-var": "error",
+    "camelcase": "off",
+    "no-extra-boolean-cast": "off",
+    "semi": ["error", "always"],
+    "vue/require-prop-types": "off",
+    "vue/require-default-prop": "off",
+    "vue/no-reserved-keys": "off",
+    "vue/prop-name-casing": "off",
+    "vue/max-attributes-per-line": [
+      2,
+      {
+        "singleline": 20,
+        "multiline": {
+          "max": 1,
+          "allowFirstLine": false
+        }
+      }
+    ]
+  }
+}

.github/ISSUE_TEMPLATE/----please-use-new-issue-ant-design-vue---.md

@@ -1,9 +1,7 @@
 ---
-name: "⚠️  Please use issue-helper ⚠️"
-about: The issue which is not created via https://vuecomponent.github.io/issue-helper/ will be closed
-  immediately.
+name: '⚠️  Please use issue-helper ⚠️'
+about: The issue which is not created via https://vuecomponent.github.io/issue-helper/ will be closed immediately.
 labels:
-
 ---
 
 The issue which is not created via https://vuecomponent.github.io/issue-helper/ will be closed immediately.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,6 @@
 First of all, thank you for your contribution! 😄
 
-New feature please send pull request to feature branch, and rest to master branch.
-Pull request will be merged after one of collaborators approve.
-Please makes sure that these form are filled before submitting your pull request, thank you!
+New feature please send pull request to feature branch, and rest to master branch. Pull request will be merged after one of collaborators approve. Please makes sure that these form are filled before submitting your pull request, thank you!
 
 [[中文版模板 / Chinese template](https://github.com/vueComponent/ant-design-vue/blob/master/.github/PULL_REQUEST_TEMPLATE/pr_cn.md)]
 
@@ -50,4 +48,4 @@ Please makes sure that these form are filled before submitting your pull request
 
 ### Additional Plan? (Optional if not new feature)
 
-> If this PR related with other PR or following info. You can type here.
+> If this PR related with other PR or following info. You can type here.

.github/PULL_REQUEST_TEMPLATE/pr_cn.md

@@ -1,8 +1,6 @@
 首先，感谢你的贡献！ 😄
 
-新特性请提交至 feature 分支，其余可提交至 master 分支。
-在一个维护者审核通过后合并。
-请确保填写以下 pull request 的信息，谢谢！~
+新特性请提交至 feature 分支，其余可提交至 master 分支。在一个维护者审核通过后合并。请确保填写以下 pull request 的信息，谢谢！~
 
 [[English Template / 英文模板](?expand=1)]
 
@@ -28,7 +26,7 @@
 
 > 1. 基本的解决思路和其他可选方案。
 > 2. 列出最终的 API 实现和用法。
-> 3. 涉及UI/交互变动需要有截图或 GIF。
+> 3. 涉及 UI/交互变动需要有截图或 GIF。
 
 ### 对用户的影响和可能的风险（非新功能可选）
 
@@ -49,4 +47,4 @@
 
 ### 后续计划（非新功能可选）
 
-> 如果这个提交后面还有相关的其他提交和跟进信息，可以写在这里。
+> 如果这个提交后面还有相关的其他提交和跟进信息，可以写在这里。

.gitignore

@@ -69,3 +69,4 @@ package-lock.json
 
 # 备份文件
 /components/test/*
+list.txt

.jest.js

@@ -1,40 +1,31 @@
 const libDir = process.env.LIB_DIR;
 
 const transformIgnorePatterns = [
-  '/dist/', 'node_modules\/[^/]+?\/(?!(es|node_modules)\/)', // Ignore modules without es dir
+  '/dist/',
+  'node_modules/[^/]+?/(?!(es|node_modules)/)', // Ignore modules without es dir
 ];
 
 module.exports = {
   testURL: 'http://localhost/',
   setupFiles: ['./tests/setup.js'],
-  moduleFileExtensions: [
-    "js",
-    "jsx",
-    "json",
-    "vue",
-    "md",
-    "jpg"
-  ],
+  moduleFileExtensions: ['js', 'jsx', 'json', 'vue', 'md', 'jpg'],
   modulePathIgnorePatterns: ['/_site/'],
-  testPathIgnorePatterns: [
-    '/node_modules/', 'node'
-  ],
+  testPathIgnorePatterns: ['/node_modules/', 'node'],
   transform: {
-    ".*\\.(vue|md)$": "<rootDir>/node_modules/vue-jest",
-    "^.+\\.(js|jsx)$": "<rootDir>/node_modules/babel-jest"
+    '.*\\.(vue|md)$': '<rootDir>/node_modules/vue-jest',
+    '^.+\\.(js|jsx)$': '<rootDir>/node_modules/babel-jest',
+    '^.+\\.svg$': '<rootDir>/node_modules/jest-transform-stub',
   },
-  testRegex: libDir === 'dist'
-    ? 'demo\\.test\\.js$'
-    : '.*\\.test\\.js$',
+  testRegex: libDir === 'dist' ? 'demo\\.test\\.js$' : '.*\\.test\\.js$',
   moduleNameMapper: {
-    "^@/(.*)$": "<rootDir>/$1",
-    "ant-design-vue": "<rootDir>/components/index.js",
-    "^vue$": "vue/dist/vue.common.js"
+    '^@/(.*)$': '<rootDir>/$1',
+    'ant-design-vue': '<rootDir>/components/index.js',
+    '^vue$': 'vue/dist/vue.common.js',
   },
-  snapshotSerializers: ["<rootDir>/node_modules/jest-serializer-vue"],
+  snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
   collectCoverage: process.env.COVERAGE === 'true',
   collectCoverageFrom: [
-    "components/**/*.{js,jsx,vue}",
+    'components/**/*.{js,jsx,vue}',
     '!components/*/style/index.{js,jsx}',
     '!components/style/*.{js,jsx}',
     '!components/*/locale/*.{js,jsx}',
@@ -45,7 +36,7 @@ module.exports = {
     '!components/align/**/*',
     '!components/trigger/**/*',
     '!components/style.js',
-    "!**/node_modules/**"
+    '!**/node_modules/**',
   ],
-  transformIgnorePatterns
+  transformIgnorePatterns,
 };

.prettierignore

@@ -1,9 +1,26 @@
-**/*.md
 **/*.svg
-**/*.ejs
-**/*.html
 package.json
-es/**
-lib/**
-_site/**
-dist/**
+lib/
+es/
+dist/
+_site/
+coverage/
+CNAME
+LICENSE
+yarn.lock
+netlify.toml
+yarn-error.log
+*.sh
+*.snap
+.gitignore
+.npmignore
+.prettierignore
+.DS_Store
+.editorconfig
+.eslintignore
+**/*.yml
+components/style/color/*.less
+**/assets
+.gitattributes
+.stylelintrc
+.vcmrc

.prettierrc

@@ -2,18 +2,13 @@
   "singleQuote": true,
   "trailingComma": "all",
   "printWidth": 100,
+  "proseWrap": "never",
   "overrides": [
     {
       "files": ".prettierrc",
       "options": {
         "parser": "json"
       }
-    },
-    {
-      "files": ".stylelintrc",
-      "options": {
-        "parser": "json"
-      }
     }
   ]
 }

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 sudo: required
 node_js:
-  - 10.10.0
+  - 12.4.0
 before_script:
   - npm install vue vue-template-compiler
 script:

BACKERS.md

@@ -35,9 +35,8 @@
 
 <h2 align="center">支付宝/微信</h2>
 
-### 使用支付宝/微信的赞助的用户，如需要添加名单，赞助后可发github账号到邮箱([email protected])
+### 使用支付宝/微信的赞助的用户，如需要添加名单，赞助后可发 github 账号到邮箱([email protected])
 
 - [fastgoo](https://github.com/fastgoo)
 - [sendya](https://github.com/sendya)
 - [limichange](https://github.com/limichange)
-