Merge branch 'dev' into next

packages/vant-icons/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Changelog
 
+## 1.3.0
+
+- add share-o icon
+- fix calendar-o typo
+
 ## 1.2.5
 
 - add back-top icon

packages/vant-icons/build/codepoints.js

@@ -34,7 +34,7 @@ const map = {
   F01F: 'brush-o',
   F020: 'bulb-o',
   F021: 'bullhorn-o',
-  F022: 'calender-o',
+  F022: 'calendar-o',
   F023: 'card',
   F024: 'cart-circle-o',
   F025: 'cart-circle',
@@ -231,6 +231,7 @@ const map = {
   F0E4: 'enlarge',
   F0E5: 'photo-fail',
   F0E6: 'back-top',
+  F0E7: 'share-o',
 };
 
 const reversedMap = {};

packages/vant-icons/package.json

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

packages/vant-icons/src/config.js

@@ -54,6 +54,7 @@ module.exports = {
     'video-o',
     'shop-o',
     'shop-collect-o',
+    'share-o',
     'chat-o',
     'smile-comment-o',
     'vip-card-o',
@@ -97,7 +98,7 @@ module.exports = {
     'newspaper-o',
     'warn-o',
     'notes-o',
-    'calender-o',
+    'calendar-o',
     'bulb-o',
     'user-circle-o',
     'desktop-o',
@@ -188,6 +189,7 @@ module.exports = {
     'video',
     'shop',
     'shop-collect',
+    'share',
     'chat',
     'smile-comment',
     'vip-card',
@@ -212,7 +214,6 @@ module.exports = {
     'goods-collect',
     'eye',
     // without corresponding outline icon
-    'share',
     'alipay',
     'wechat',
     'photograph',

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-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');
+  src: url('https://img.yzcdn.cn/vant/vant-icon-0c347b.woff2') format('woff2'),
+    url('https://img.yzcdn.cn/vant/vant-icon-0c347b.woff') format('woff'),
+    url('https://img.yzcdn.cn/vant/vant-icon-0c347b.ttf') format('truetype');
 }
 
 .van-icon {
@@ -163,7 +163,7 @@
   content: '\F021';
 }
 
-.van-icon-calender-o::before {
+.van-icon-calendar-o::before {
   content: '\F022';
 }
 
@@ -763,6 +763,10 @@
   content: '\F0B5';
 }
 
+.van-icon-share-o::before {
+  content: '\F0E7';
+}
+
 .van-icon-share::before {
   content: '\F0B6';
 }