Merge branch 'dev' into next

packages/vant-cli/yarn.lock

@@ -2918,9 +2918,9 @@ bluebird@^3.1.1, bluebird@^3.5.5:
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+  version "4.11.9"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
+  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
 
 body-parser@1.19.0:
   version "1.19.0"
@@ -4617,9 +4617,9 @@ elegant-spinner@^2.0.0:
   integrity sha1-8jY3iYXs0W2nVIjRZr5LaI/Vr5Q=
 
 elliptic@^6.0.0:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
-  integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"

packages/vant-icons/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Changelog
 
+## 1.2.5
+
+- add back-top icon
+
+## 1.2.4
+
+- add photo-fail icon
+
 ## 1.2.3
 
 - fix enlarge icon align

packages/vant-icons/build/codepoints.js

@@ -229,6 +229,8 @@ const map = {
   F0E2: 'wechat',
   F0E3: 'youzan-shield',
   F0E4: 'enlarge',
+  F0E5: 'photo-fail',
+  F0E6: 'back-top',
 };
 
 const reversedMap = {};

packages/vant-icons/build/template.tpl

@@ -13,7 +13,7 @@
 .van-icon {
   position: relative;
   display: inline-block;
-  font: normal normal normal 14px/1 "<%= fontName %>";
+  font: normal normal normal 14px/1 '<%= fontName %>';
   font-size: inherit;
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
@@ -24,7 +24,7 @@
 }
 
 <% _.each(glyphs, function(glyph) { %>.van-icon-<%= glyph.fileName %>::before {
-  content: "\<%= glyph.codePoint %>";
+  content: '\<%= glyph.codePoint %>';
 }
 
 <% }); %>

packages/vant-icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vant/icons",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "vant icons",
   "main": "./src/config.js",
   "files": [

packages/vant-icons/src/config.js

@@ -103,6 +103,7 @@ module.exports = {
     'desktop-o',
     'apps-o',
     'home-o',
+    'back-top',
     'search',
     'points',
     'edit',
@@ -237,5 +238,6 @@ module.exports = {
     'bars',
     'wap-nav',
     'enlarge',
+    'photo-fail',
   ],
 };

packages/vant-icons/src/index.less

@@ -5,9 +5,9 @@
   font-family: 'vant-icon';
   font-style: normal;
   font-display: auto;
-  src: url('https://img.yzcdn.cn/vant/vant-icon-6ae417.woff2') format('woff2'),
-    url('https://img.yzcdn.cn/vant/vant-icon-6ae417.woff') format('woff'),
-    url('https://img.yzcdn.cn/vant/vant-icon-6ae417.ttf') format('truetype');
+  src: url('https://img.yzcdn.cn/vant/vant-icon-eeb192.woff2') format('woff2'),
+    url('https://img.yzcdn.cn/vant/vant-icon-eeb192.woff') format('woff'),
+    url('https://img.yzcdn.cn/vant/vant-icon-eeb192.ttf') format('truetype');
 }
 
 .van-icon {
@@ -83,6 +83,10 @@
   content: '\F00E';
 }
 
+.van-icon-back-top::before {
+  content: '\F0E6';
+}
+
 .van-icon-bag-o::before {
   content: '\F00F';
 }
@@ -651,6 +655,10 @@
   content: '\F09B';
 }
 
+.van-icon-photo-fail::before {
+  content: '\F0E5';
+}
+
 .van-icon-photo-o::before {
   content: '\F09C';
 }