Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-12-14 17:07:29 +08:00
11 changed files with 29 additions and 25 deletions
+5
View File
@@ -8374,6 +8374,11 @@ prepend-http@^2.0.0:
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
prettier@2.1.0:
version "2.1.0"
resolved "https://registry.npm.taobao.org/prettier/download/prettier-2.1.0.tgz?cache=0&sync_timestamp=1606521234483&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fprettier%2Fdownload%2Fprettier-2.1.0.tgz#5a9789f767a243118c60f3e56d95cb6544914fbb"
integrity sha1-WpeJ92eiQxGMYPPlbZXLZUSRT7s=
prettier@^2.2.0:
version "2.2.0"
resolved "https://registry.npm.taobao.org/prettier/download/prettier-2.2.0.tgz#8a03c7777883b29b37fb2c4348c66a78e980418b"