Merge branch '2.x' into dev

README.md

@@ -94,12 +94,6 @@ You can scan the following QR code to access the demo：
 
 <img src="https://img.yzcdn.cn/vant/preview_qrcode_20180528.png" width="220" height="220" >
 
-## Wechat Group
-
-Scan the qrcode to join our wechat discussion group, please note that you want to join Vant discussion group.
-
-<img src="https://img.yzcdn.cn/vant/wechat_20180606.png" width="220" height="292" >
-
 ## LICENSE
 
 [MIT](https://en.wikipedia.org/wiki/MIT_License)

package.json

@@ -57,7 +57,7 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "7.x",
-    "@vant/icons": "1.3.2",
+    "@vant/icons": "1.4.0",
     "@vant/use": "^0.0.9",
     "vue-lazyload": "1.2.3"
   },

packages/vant-icons/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+## 1.4.0
+
+- add encode-woff2.less
+
 ## 1.3.2
 
 - fix incomplete after-sale icon

packages/vant-icons/build/build-iconfont.js

@@ -3,7 +3,6 @@
  */
 const { src, dest, series } = require('gulp');
 const fs = require('fs-extra');
-const path = require('path');
 const glob = require('fast-glob');
 const shell = require('shelljs');
 const encode = require('./build-encode');
@@ -12,11 +11,12 @@ const iconfont = require('gulp-iconfont');
 const iconfontCss = require('gulp-iconfont-css');
 const config = require('../src/config');
 const codepoints = require('./codepoints');
+const { join } = require('path');
 
-const srcDir = path.join(__dirname, '../src');
+const srcDir = join(__dirname, '../src');
-const svgDir = path.join(__dirname, '../assets/svg');
+const svgDir = join(__dirname, '../assets/svg');
-const sketch = path.join(__dirname, '../assets/icons.sketch');
+const sketch = join(__dirname, '../assets/icons.sketch');
-const template = path.join(__dirname, './template.tpl');
+const template = join(__dirname, './template.tpl');
 const formats = ['ttf', 'woff', 'woff2'];
 
 // get md5 from sketch
@@ -24,9 +24,7 @@ const md5 = md5File.sync(sketch).slice(0, 6);
 const fontName = `${config.name}-${md5}`;
 
 // remove previous fonts
-const prevFonts = glob.sync(
+const prevFonts = glob.sync(formats.map((ext) => join(srcDir, '*.' + ext)));
-  formats.map((ext) => path.join(srcDir, '*.' + ext))
-);
 prevFonts.forEach((font) => fs.removeSync(font));
 
 // generate font from svg && build index.less
@@ -51,16 +49,30 @@ function font() {
     .pipe(dest(srcDir));
 }
 
+function encodeWoff2(done) {
+  const cdnPath = `https://img.yzcdn.cn/vant/${fontName}.woff2`;
+  const srcFile = join(srcDir, 'index.less');
+  const woff2Base64 = fs.readFileSync(`../src/${fontName}.woff2`, 'base64');
+  const woff2DataUrl = `data:font/ttf;base64,${woff2Base64}`;
+
+  fs.writeFileSync(
+    join(srcDir, 'encode-woff2.less'),
+    fs.readFileSync(srcFile, 'utf-8').replace(cdnPath, woff2DataUrl)
+  );
+
+  done();
+}
+
 function upload(done) {
   // generate encode.less
   encode(fontName, srcDir);
 
   // upload font to cdn
   formats.forEach((ext) => {
-    shell.exec(`superman-cdn /vant ${path.join(srcDir, fontName + '.' + ext)}`);
+    shell.exec(`superman-cdn /vant ${join(srcDir, fontName + '.' + ext)}`);
   });
 
   done();
 }
 
-exports.default = series(font, upload);
+exports.default = series(font, encodeWoff2, upload);

packages/vant-icons/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@vant/icons",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "vant icons",
   "main": "./src/config.js",
   "files": [
     "src"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
     "export": "node ./build/export.js",

src/button/index.less

@@ -154,7 +154,6 @@
   }
 
   &__icon {
-    min-width: 1em;
     font-size: 1.2em;
     line-height: inherit;
   }

src/cell/index.less

@@ -50,7 +50,6 @@
 
   &__left-icon,
   &__right-icon {
-    min-width: 1em;
     height: @cell-line-height;
     font-size: @cell-icon-size;
     line-height: @cell-line-height;

src/field/index.less

@@ -116,7 +116,6 @@
   &__left-icon .van-icon,
   &__right-icon .van-icon {
     display: block;
-    min-width: 1em;
     font-size: @field-icon-size;
     line-height: inherit;
   }

src/icon/index.less

@@ -1,5 +1,5 @@
 @import '../style/var';
-@import '~@vant/icons/src/index.less';
+@import '~@vant/icons/src/encode-woff2.less';
 
 .van-icon {
   &__image {

src/nav-bar/index.less

@@ -16,7 +16,6 @@
   }
 
   &__arrow {
-    min-width: 1em;
     margin-right: @padding-base;
     font-size: @nav-bar-arrow-size;
   }

src/tabbar-item/index.less

@@ -17,7 +17,6 @@
 
     .van-icon {
       display: block;
-      min-width: 1em;
     }
 
     img {

src/tag/index.less

@@ -91,7 +91,6 @@
   }
 
   &__close {
-    min-width: 1em;
     margin-left: 2px;
     cursor: pointer;
   }

yarn.lock

@@ -2183,10 +2183,10 @@
     eslint-plugin-import "^2.22.1"
     eslint-plugin-vue "^7.1.0"
 
-"@vant/icons@1.3.2":
+"@vant/icons@1.4.0":
-  version "1.3.2"
+  version "1.4.0"
-  resolved "https://registry.npmjs.org/@vant/icons/-/icons-1.3.2.tgz#f0930010e7aaa9b06b03636fe9b5bc6477ea224b"
+  resolved "https://registry.npm.taobao.org/@vant/icons/download/@vant/icons-1.4.0.tgz#a91f7894f2f34356f78a5d6f8b9d4f1a46add0c5"
-  integrity sha512-uP0nUWw0pyMMGt3L9BO5fEacz/Cn7QIea0/gFoC/jPLv9ufvUxjPsV9HSyyUJsqMJ3qlYLAI/SxZDbmMZA814A==
+  integrity sha1-qR94lPLzQ1b3il1vi51PGkat0MU=
 
 "@vant/markdown-loader@^3.0.0-alpha.0":
   version "3.0.0-alpha.2"