Merge branch 'dev' into next
This commit is contained in:
chenjiahan
@@ -35,6 +35,7 @@ yarn add @vant/cli --dev
|
||||
"dev": "vant-cli dev",
|
||||
"test": "vant-cli test",
|
||||
"lint": "vant-cli lint",
|
||||
"build": "vant-cli build",
|
||||
"release": "vant-cli release",
|
||||
"build-site": "vant-cli build-site"
|
||||
},
|
||||
|
||||
@@ -33,22 +33,22 @@
|
||||
"@vue/compiler-sfc": "3.x"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/fs-extra": "^8.1.0",
|
||||
"@types/lodash": "^4.14.150",
|
||||
"@types/fs-extra": "^9.0.1",
|
||||
"@types/lodash": "^4.14.153",
|
||||
"@types/postcss-load-config": "^2.0.1",
|
||||
"@types/webpack": "^4.41.12",
|
||||
"@types/webpack-dev-server": "^3.10.1",
|
||||
"@types/webpack": "^4.41.13",
|
||||
"@types/webpack-dev-server": "^3.11.0",
|
||||
"@types/webpack-merge": "^4.1.5"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.9.6",
|
||||
"@babel/plugin-syntax-jsx": "^7.8.3",
|
||||
"@babel/plugin-transform-object-assign": "^7.8.3",
|
||||
"@babel/plugin-transform-runtime": "^7.9.6",
|
||||
"@babel/preset-env": "^7.9.6",
|
||||
"@babel/preset-typescript": "^7.9.0",
|
||||
"@babel/core": "^7.10.1",
|
||||
"@babel/plugin-syntax-jsx": "^7.10.1",
|
||||
"@babel/plugin-transform-object-assign": "^7.10.1",
|
||||
"@babel/plugin-transform-runtime": "^7.10.1",
|
||||
"@babel/preset-env": "^7.10.1",
|
||||
"@babel/preset-typescript": "^7.10.1",
|
||||
"@nuxt/friendly-errors-webpack-plugin": "^2.5.0",
|
||||
"@types/jest": "^25.2.1",
|
||||
"@types/jest": "^25.2.3",
|
||||
"@vant/eslint-config": "^2.2.2",
|
||||
"@vant/markdown-loader": "^3.0.0-alpha.0",
|
||||
"@vant/markdown-vetur": "^2.0.1",
|
||||
@@ -58,18 +58,18 @@
|
||||
"@vue/component-compiler-utils": "^3.1.2",
|
||||
"@vue/test-utils": "1.0.0-beta.29",
|
||||
"address": "^1.1.2",
|
||||
"autoprefixer": "^9.7.6",
|
||||
"babel-jest": "^25.5.1",
|
||||
"autoprefixer": "^9.8.0",
|
||||
"babel-jest": "^26.0.1",
|
||||
"babel-loader": "^8.1.0",
|
||||
"babel-plugin-import": "^1.13.0",
|
||||
"babel-plugin-transform-jsx-vue3": "^0.1.8",
|
||||
"cache-loader": "^4.1.0",
|
||||
"chokidar": "^3.4.0",
|
||||
"clean-css": "^4.2.3",
|
||||
"codecov": "^3.6.5",
|
||||
"codecov": "^3.7.0",
|
||||
"commander": "^5.1.0",
|
||||
"consola": "^2.11.3",
|
||||
"conventional-changelog": "^3.1.18",
|
||||
"consola": "^2.12.2",
|
||||
"conventional-changelog": "^3.1.21",
|
||||
"cross-env": "^7.0.2",
|
||||
"css-loader": "^3.5.3",
|
||||
"eslint": "^6.8.0",
|
||||
@@ -83,25 +83,25 @@
|
||||
"jest-canvas-mock": "^2.2.0",
|
||||
"jest-serializer-vue": "^2.0.2",
|
||||
"less": "^3.11.1",
|
||||
"less-loader": "^6.0.0",
|
||||
"lint-staged": "^10.2.2",
|
||||
"less-loader": "^6.1.0",
|
||||
"lint-staged": "^10.2.7",
|
||||
"lodash": "^4.17.15",
|
||||
"ora": "^4.0.4",
|
||||
"portfinder": "^1.0.26",
|
||||
"postcss": "^7.0.28",
|
||||
"postcss": "^7.0.31",
|
||||
"postcss-loader": "^3.0.0",
|
||||
"prettier": "^2.0.5",
|
||||
"release-it": "^13.5.7",
|
||||
"sass": "^1.26.5",
|
||||
"release-it": "^13.6.1",
|
||||
"sass": "^1.26.7",
|
||||
"sass-loader": "^8.0.2",
|
||||
"style-loader": "^1.2.1",
|
||||
"stylelint": "^13.3.3",
|
||||
"typescript": "^3.8.3",
|
||||
"stylelint": "^13.5.0",
|
||||
"typescript": "^3.9.3",
|
||||
"vue-jest": "4.0.0-beta.2",
|
||||
"vue-loader": "^16.0.0-beta.3",
|
||||
"vue-router": "^4.0.0-alpha.12",
|
||||
"webpack": "^4.43.0",
|
||||
"webpack-dev-server": "3.10.3",
|
||||
"webpack-dev-server": "3.11.0",
|
||||
"webpack-merge": "^4.2.2",
|
||||
"webpackbar": "^4.0.0"
|
||||
},
|
||||
|
||||
+1213
-770
File diff suppressed because it is too large
Load Diff
@@ -30,4 +30,5 @@ yarn add @vant/icons
|
||||
|
||||
1. Add new icon to assets/icons.sketch
|
||||
2. Add icon name to src/config.js
|
||||
3. Make a Pull Request
|
||||
3. Add icon codepoints to build/codepoints.js
|
||||
4. Make a Pull Request
|
||||
|
||||
@@ -11,6 +11,7 @@ const md5File = require('md5-file');
|
||||
const iconfont = require('gulp-iconfont');
|
||||
const iconfontCss = require('gulp-iconfont-css');
|
||||
const config = require('../src/config');
|
||||
const codepoints = require('./codepoints');
|
||||
|
||||
const srcDir = path.join(__dirname, '../src');
|
||||
const svgDir = path.join(__dirname, '../assets/svg');
|
||||
@@ -23,8 +24,10 @@ const md5 = md5File.sync(sketch).slice(0, 6);
|
||||
const fontName = `${config.name}-${md5}`;
|
||||
|
||||
// remove previous fonts
|
||||
const prevFonts = glob.sync(formats.map(ext => path.join(srcDir, '*.' + ext)));
|
||||
prevFonts.forEach(font => fs.removeSync(font));
|
||||
const prevFonts = glob.sync(
|
||||
formats.map((ext) => path.join(srcDir, '*.' + ext))
|
||||
);
|
||||
prevFonts.forEach((font) => fs.removeSync(font));
|
||||
|
||||
// generate font from svg && build index.less
|
||||
function font() {
|
||||
@@ -35,7 +38,7 @@ function font() {
|
||||
path: template,
|
||||
targetPath: '../src/index.less',
|
||||
normalize: true,
|
||||
firstGlyph: 0xf000,
|
||||
fixedCodepoints: codepoints,
|
||||
cssClass: fontName, // this is a trick to pass fontName to template
|
||||
})
|
||||
)
|
||||
@@ -53,7 +56,7 @@ function upload(done) {
|
||||
encode(fontName, srcDir);
|
||||
|
||||
// upload font to cdn
|
||||
formats.forEach(ext => {
|
||||
formats.forEach((ext) => {
|
||||
shell.exec(`superman-cdn /vant ${path.join(srcDir, fontName + '.' + ext)}`);
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,239 @@
|
||||
/* eslint-disable no-useless-escape */
|
||||
const map = {
|
||||
F000: 'add-o',
|
||||
F001: 'add-square',
|
||||
F002: 'add',
|
||||
F003: 'after-sale',
|
||||
F004: 'aim',
|
||||
F005: 'alipay',
|
||||
F006: 'apps-o',
|
||||
F007: 'arrow-down',
|
||||
F008: 'arrow-left',
|
||||
F009: 'arrow-up',
|
||||
F00A: 'arrow',
|
||||
F00B: 'ascending',
|
||||
F00C: 'audio',
|
||||
F00D: 'award-o',
|
||||
F00E: 'award',
|
||||
F00F: 'bag-o',
|
||||
F010: 'bag',
|
||||
F011: 'balance-list-o',
|
||||
F012: 'balance-list',
|
||||
F013: 'balance-o',
|
||||
F014: 'balance-pay',
|
||||
F015: 'bar-chart-o',
|
||||
F016: 'bars',
|
||||
F017: 'bell',
|
||||
F018: 'bill-o',
|
||||
F019: 'bill',
|
||||
F01A: 'birthday-cake-o',
|
||||
F01B: 'bookmark-o',
|
||||
F01C: 'bookmark',
|
||||
F01D: 'browsing-history-o',
|
||||
F01E: 'browsing-history',
|
||||
F01F: 'brush-o',
|
||||
F020: 'bulb-o',
|
||||
F021: 'bullhorn-o',
|
||||
F022: 'calender-o',
|
||||
F023: 'card',
|
||||
F024: 'cart-circle-o',
|
||||
F025: 'cart-circle',
|
||||
F026: 'cart-o',
|
||||
F027: 'cart',
|
||||
F028: 'cash-back-record',
|
||||
F029: 'cash-on-deliver',
|
||||
F02A: 'cashier-o',
|
||||
F02B: 'certificate',
|
||||
F02C: 'chart-trending-o',
|
||||
F02D: 'chat-o',
|
||||
F02E: 'chat',
|
||||
F02F: 'checked',
|
||||
F030: 'circle',
|
||||
F031: 'clear',
|
||||
F032: 'clock-o',
|
||||
F033: 'clock',
|
||||
F034: 'close',
|
||||
F035: 'closed-eye',
|
||||
F036: 'cluster-o',
|
||||
F037: 'cluster',
|
||||
F038: 'column',
|
||||
F039: 'comment-circle-o',
|
||||
F03A: 'comment-circle',
|
||||
F03B: 'comment-o',
|
||||
F03C: 'comment',
|
||||
F03D: 'completed',
|
||||
F03E: 'contact',
|
||||
F03F: 'coupon-o',
|
||||
F040: 'coupon',
|
||||
F041: 'credit-pay',
|
||||
F042: 'cross',
|
||||
F043: 'debit-pay',
|
||||
F044: 'delete',
|
||||
F045: 'descending',
|
||||
F046: 'description',
|
||||
F047: 'desktop-o',
|
||||
F048: 'diamond-o',
|
||||
F049: 'diamond',
|
||||
F04A: 'discount',
|
||||
F04B: 'down',
|
||||
F04C: 'ecard-pay',
|
||||
F04D: 'edit',
|
||||
F04E: 'ellipsis',
|
||||
F04F: 'empty',
|
||||
F050: 'envelop-o',
|
||||
F051: 'exchange',
|
||||
F052: 'expand-o',
|
||||
F053: 'expand',
|
||||
F054: 'eye-o',
|
||||
F055: 'eye',
|
||||
F056: 'fail',
|
||||
F057: 'failure',
|
||||
F058: 'filter-o',
|
||||
F059: 'fire-o',
|
||||
F05A: 'fire',
|
||||
F05B: 'flag-o',
|
||||
F05C: 'flower-o',
|
||||
F05D: 'free-postage',
|
||||
F05E: 'friends-o',
|
||||
F05F: 'friends',
|
||||
F060: 'gem-o',
|
||||
F061: 'gem',
|
||||
F062: 'gift-card-o',
|
||||
F063: 'gift-card',
|
||||
F064: 'gift-o',
|
||||
F065: 'gift',
|
||||
F066: 'gold-coin-o',
|
||||
F067: 'gold-coin',
|
||||
F068: 'good-job-o',
|
||||
F069: 'good-job',
|
||||
F06A: 'goods-collect-o',
|
||||
F06B: 'goods-collect',
|
||||
F06C: 'graphic',
|
||||
F06D: 'home-o',
|
||||
F06E: 'hot-o',
|
||||
F06F: 'hot-sale-o',
|
||||
F070: 'hot-sale',
|
||||
F071: 'hot',
|
||||
F072: 'hotel-o',
|
||||
F073: 'idcard',
|
||||
F074: 'info-o',
|
||||
F075: 'info',
|
||||
F076: 'invition',
|
||||
F077: 'label-o',
|
||||
F078: 'label',
|
||||
F079: 'like-o',
|
||||
F07A: 'like',
|
||||
F07B: 'live',
|
||||
F07C: 'location-o',
|
||||
F07D: 'location',
|
||||
F07E: 'lock',
|
||||
F07F: 'logistics',
|
||||
F080: 'manager-o',
|
||||
F081: 'manager',
|
||||
F082: 'map-marked',
|
||||
F083: 'medal-o',
|
||||
F084: 'medal',
|
||||
F085: 'more-o',
|
||||
F086: 'more',
|
||||
F087: 'music-o',
|
||||
F088: 'music',
|
||||
F089: 'new-arrival-o',
|
||||
F08A: 'new-arrival',
|
||||
F08B: 'new-o',
|
||||
F08C: 'new',
|
||||
F08D: 'newspaper-o',
|
||||
F08E: 'notes-o',
|
||||
F08F: 'orders-o',
|
||||
F090: 'other-pay',
|
||||
F091: 'paid',
|
||||
F092: 'passed',
|
||||
F093: 'pause-circle-o',
|
||||
F094: 'pause-circle',
|
||||
F095: 'pause',
|
||||
F096: 'peer-pay',
|
||||
F097: 'pending-payment',
|
||||
F098: 'phone-circle-o',
|
||||
F099: 'phone-circle',
|
||||
F09A: 'phone-o',
|
||||
F09B: 'phone',
|
||||
F09C: 'photo-o',
|
||||
F09D: 'photo',
|
||||
F09E: 'photograph',
|
||||
F09F: 'play-circle-o',
|
||||
F0A0: 'play-circle',
|
||||
F0A1: 'play',
|
||||
F0A2: 'plus',
|
||||
F0A3: 'point-gift-o',
|
||||
F0A4: 'point-gift',
|
||||
F0A5: 'points',
|
||||
F0A6: 'printer',
|
||||
F0A7: 'qr-invalid',
|
||||
F0A8: 'qr',
|
||||
F0A9: 'question-o',
|
||||
F0AA: 'question',
|
||||
F0AB: 'records',
|
||||
F0AC: 'refund-o',
|
||||
F0AD: 'replay',
|
||||
F0AE: 'scan',
|
||||
F0AF: 'search',
|
||||
F0B0: 'send-gift-o',
|
||||
F0B1: 'send-gift',
|
||||
F0B2: 'service-o',
|
||||
F0B3: 'service',
|
||||
F0B4: 'setting-o',
|
||||
F0B5: 'setting',
|
||||
F0B6: 'share',
|
||||
F0B7: 'shop-collect-o',
|
||||
F0B8: 'shop-collect',
|
||||
F0B9: 'shop-o',
|
||||
F0BA: 'shop',
|
||||
F0BB: 'shopping-cart-o',
|
||||
F0BC: 'shopping-cart',
|
||||
F0BD: 'shrink',
|
||||
F0BE: 'sign',
|
||||
F0BF: 'smile-comment-o',
|
||||
F0C0: 'smile-comment',
|
||||
F0C1: 'smile-o',
|
||||
F0C2: 'smile',
|
||||
F0C3: 'star-o',
|
||||
F0C4: 'star',
|
||||
F0C5: 'stop-circle-o',
|
||||
F0C6: 'stop-circle',
|
||||
F0C7: 'stop',
|
||||
F0C8: 'success',
|
||||
F0C9: 'thumb-circle-o',
|
||||
F0CA: 'thumb-circle',
|
||||
F0CB: 'todo-list-o',
|
||||
F0CC: 'todo-list',
|
||||
F0CD: 'tosend',
|
||||
F0CE: 'tv-o',
|
||||
F0CF: 'umbrella-circle',
|
||||
F0D0: 'underway-o',
|
||||
F0D1: 'underway',
|
||||
F0D2: 'upgrade',
|
||||
F0D3: 'user-circle-o',
|
||||
F0D4: 'user-o',
|
||||
F0D5: 'video-o',
|
||||
F0D6: 'video',
|
||||
F0D7: 'vip-card-o',
|
||||
F0D8: 'vip-card',
|
||||
F0D9: 'volume-o',
|
||||
F0DA: 'volume',
|
||||
F0DB: 'wap-home-o',
|
||||
F0DC: 'wap-home',
|
||||
F0DD: 'wap-nav',
|
||||
F0DE: 'warn-o',
|
||||
F0DF: 'warning-o',
|
||||
F0E0: 'warning',
|
||||
F0E1: 'weapp-nav',
|
||||
F0E2: 'wechat',
|
||||
F0E3: 'youzan-shield',
|
||||
};
|
||||
|
||||
const reversedMap = {};
|
||||
|
||||
Object.keys(map).forEach((key) => {
|
||||
reversedMap[map[key]] = key;
|
||||
});
|
||||
|
||||
module.exports = reversedMap;
|
||||
@@ -17,14 +17,14 @@
|
||||
"license": "MIT",
|
||||
"repository": "https://github.com/youzan/vant/tree/dev/packages/vant-icons",
|
||||
"devDependencies": {
|
||||
"fast-glob": "^3.1.1",
|
||||
"fs-extra": "^8.1.0",
|
||||
"fast-glob": "^3.2.2",
|
||||
"fs-extra": "^9.0.1",
|
||||
"gulp": "^4.0.2",
|
||||
"gulp-iconfont": "^10.0.3",
|
||||
"gulp-iconfont-css": "^3.0.0",
|
||||
"md5-file": "^4.0.0",
|
||||
"release-it": "^12.4.3",
|
||||
"shelljs": "^0.8.3",
|
||||
"md5-file": "^5.0.0",
|
||||
"release-it": "^13.6.2",
|
||||
"shelljs": "^0.8.4",
|
||||
"svgo": "1.2.2"
|
||||
},
|
||||
"release-it": {
|
||||
|
||||
+714
-443
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user