From 45ccdbb208340fa77a516f68d4eee48102dd4bea Mon Sep 17 00:00:00 2001
From: nemo-shen <kienshin626@gmail.com>
Date: Mon, 13 Dec 2021 02:17:36 +0800
Subject: [PATCH] fix(compiler): replace icon path when compile

---
 build/compiler.js            |  23 +++-
 package.json                 |   1 +
 packages/icon/demo/index.ts  | 255 +----------------------------------
 packages/steps/demo/index.ts | 254 +---------------------------------
 yarn.lock                    |  26 +++-
 5 files changed, 45 insertions(+), 514 deletions(-)

diff --git a/build/compiler.js b/build/compiler.js
index 49155108..b41bbe84 100644
--- a/build/compiler.js
+++ b/build/compiler.js
@@ -5,6 +5,7 @@ const less = require('gulp-less');
 const insert = require('gulp-insert');
 const rename = require('gulp-rename');
 const postcss = require('gulp-postcss');
+const ts = require('gulp-typescript');
 const util = require('util');
 const exec = util.promisify(require('child_process').exec);
 
@@ -52,9 +53,23 @@ const lessCompiler = (dist) =>
   };
 
 const tsCompiler = (dist, config) =>
-  async function compileTs() {
-    await exec(`npx tsc -p ${config}`);
-    await exec(`npx tscpaths -p ${config} -s ../packages -o ${dist}`);
+  function compileTs() {
+    const tsProject = ts.createProject(config);
+    return tsProject
+      .src()
+      .pipe(tsProject())
+      .js.pipe(
+        insert.transform((contents, file) => {
+          if (dist === exampleDistDir && file.path.includes('/demo/')) {
+            contents = contents.replace(
+              '@vant/icons/src/config',
+              '../../@vant/icons/src/config'
+            );
+          }
+          return contents;
+        })
+      )
+      .pipe(gulp.dest(dist));
   };
 
 const copier = (dist, ext) =>
@@ -119,7 +134,7 @@ tasks.buildExample = gulp.series(
         const component = path.replace(/(pages\/|\/index)/g, '');
         fs.writeFileSync(
           `${examplePagesDir}/${component}/index.js`,
-          "import Page from '../../common/page';Page();"
+          "import Page from '../../common/page';\n\nPage();"
         );
         fs.writeFileSync(
           `${examplePagesDir}/${component}/index.wxml`,
diff --git a/package.json b/package.json
index 613efaed..6aab9c68 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "gulp-less": "^5.0.0",
     "gulp-postcss": "^9.0.1",
     "gulp-rename": "^2.0.0",
+    "gulp-typescript": "^6.0.0-alpha.1",
     "jest": "^27.3.1",
     "miniprogram-api-typings": "^3.1.6",
     "miniprogram-ci": "^1.6.1",
diff --git a/packages/icon/demo/index.ts b/packages/icon/demo/index.ts
index 4b2ff04b..801356d7 100644
--- a/packages/icon/demo/index.ts
+++ b/packages/icon/demo/index.ts
@@ -1,258 +1,5 @@
 import { VantComponent } from '../../common/component';
-
-const icons = {
-  name: 'vant-icon',
-  basic: [
-    'arrow',
-    'arrow-left',
-    'arrow-up',
-    'arrow-down',
-    'success',
-    'cross',
-    'plus',
-    'minus',
-    'fail',
-    'circle',
-  ],
-  outline: [
-    // has corresponding filled icon
-    'location-o',
-    'like-o',
-    'star-o',
-    'phone-o',
-    'setting-o',
-    'fire-o',
-    'coupon-o',
-    'cart-o',
-    'shopping-cart-o',
-    'cart-circle-o',
-    'friends-o',
-    'comment-o',
-    'gem-o',
-    'gift-o',
-    'point-gift-o',
-    'send-gift-o',
-    'service-o',
-    'bag-o',
-    'todo-list-o',
-    'balance-list-o',
-    'close',
-    'clock-o',
-    'question-o',
-    'passed',
-    'add-o',
-    'gold-coin-o',
-    'info-o',
-    'play-circle-o',
-    'pause-circle-o',
-    'stop-circle-o',
-    'warning-o',
-    'phone-circle-o',
-    'music-o',
-    'smile-o',
-    'thumb-circle-o',
-    'comment-circle-o',
-    'browsing-history-o',
-    'underway-o',
-    'more-o',
-    'video-o',
-    'shop-o',
-    'shop-collect-o',
-    'share-o',
-    'chat-o',
-    'smile-comment-o',
-    'vip-card-o',
-    'award-o',
-    'diamond-o',
-    'volume-o',
-    'cluster-o',
-    'wap-home-o',
-    'photo-o',
-    'gift-card-o',
-    'expand-o',
-    'medal-o',
-    'good-job-o',
-    'manager-o',
-    'label-o',
-    'bookmark-o',
-    'bill-o',
-    'hot-o',
-    'hot-sale-o',
-    'new-o',
-    'new-arrival-o',
-    'goods-collect-o',
-    'eye-o',
-    'delete-o',
-    'font-o',
-    // without corresponding filled icon
-    'balance-o',
-    'refund-o',
-    'birthday-cake-o',
-    'user-o',
-    'orders-o',
-    'tv-o',
-    'envelop-o',
-    'flag-o',
-    'flower-o',
-    'filter-o',
-    'bar-chart-o',
-    'chart-trending-o',
-    'brush-o',
-    'bullhorn-o',
-    'hotel-o',
-    'cashier-o',
-    'newspaper-o',
-    'warn-o',
-    'notes-o',
-    'calendar-o',
-    'bulb-o',
-    'user-circle-o',
-    'desktop-o',
-    'apps-o',
-    'home-o',
-    'back-top',
-    'search',
-    'points',
-    'edit',
-    'qr',
-    'qr-invalid',
-    'closed-eye',
-    'down',
-    'scan',
-    'revoke',
-    'free-postage',
-    'certificate',
-    'logistics',
-    'contact',
-    'cash-back-record',
-    'after-sale',
-    'exchange',
-    'upgrade',
-    'ellipsis',
-    'description',
-    'records',
-    'sign',
-    'completed',
-    'failure',
-    'ecard-pay',
-    'peer-pay',
-    'balance-pay',
-    'credit-pay',
-    'debit-pay',
-    'cash-on-deliver',
-    'other-pay',
-    'tosend',
-    'pending-payment',
-    'paid',
-    'aim',
-    'discount',
-    'idcard',
-    'replay',
-    'shrink',
-    'shield-o',
-    'guide-o',
-  ],
-  filled: [
-    // has corresponding outline icon
-    'location',
-    'like',
-    'star',
-    'phone',
-    'setting',
-    'fire',
-    'coupon',
-    'cart',
-    'shopping-cart',
-    'cart-circle',
-    'friends',
-    'comment',
-    'gem',
-    'gift',
-    'point-gift',
-    'send-gift',
-    'service',
-    'bag',
-    'todo-list',
-    'balance-list',
-    'clear',
-    'clock',
-    'question',
-    'checked',
-    'add',
-    'gold-coin',
-    'info',
-    'play-circle',
-    'pause-circle',
-    'stop-circle',
-    'warning',
-    'phone-circle',
-    'music',
-    'smile',
-    'thumb-circle',
-    'comment-circle',
-    'browsing-history',
-    'underway',
-    'more',
-    'video',
-    'shop',
-    'shop-collect',
-    'share',
-    'chat',
-    'smile-comment',
-    'vip-card',
-    'award',
-    'diamond',
-    'volume',
-    'cluster',
-    'wap-home',
-    'photo',
-    'gift-card',
-    'expand',
-    'medal',
-    'good-job',
-    'manager',
-    'label',
-    'bookmark',
-    'bill',
-    'hot',
-    'hot-sale',
-    'new',
-    'new-arrival',
-    'goods-collect',
-    'eye',
-    'delete',
-    'font',
-    // without corresponding outline icon
-    'wechat',
-    'wechat-pay',
-    'alipay',
-    'photograph',
-    'youzan-shield',
-    'umbrella-circle',
-    'bell',
-    'printer',
-    'map-marked',
-    'card',
-    'add-square',
-    'live',
-    'lock',
-    'audio',
-    'graphic',
-    'column',
-    'invitation',
-    'play',
-    'pause',
-    'stop',
-    'weapp-nav',
-    'ascending',
-    'descending',
-    'bars',
-    'wap-nav',
-    'enlarge',
-    'photo-fail',
-    'sort',
-  ],
-};
+import icons from '@vant/icons/src/config';
 
 VantComponent({
   data: {
diff --git a/packages/steps/demo/index.ts b/packages/steps/demo/index.ts
index fa0b8931..bf24b920 100644
--- a/packages/steps/demo/index.ts
+++ b/packages/steps/demo/index.ts
@@ -1,259 +1,7 @@
 import { VantComponent } from '../../common/component';
 import Toast from '../../toast/toast';
+import icons from '@vant/icons/src/config';
 
-const icons = {
-  name: 'vant-icon',
-  basic: [
-    'arrow',
-    'arrow-left',
-    'arrow-up',
-    'arrow-down',
-    'success',
-    'cross',
-    'plus',
-    'minus',
-    'fail',
-    'circle',
-  ],
-  outline: [
-    // has corresponding filled icon
-    'location-o',
-    'like-o',
-    'star-o',
-    'phone-o',
-    'setting-o',
-    'fire-o',
-    'coupon-o',
-    'cart-o',
-    'shopping-cart-o',
-    'cart-circle-o',
-    'friends-o',
-    'comment-o',
-    'gem-o',
-    'gift-o',
-    'point-gift-o',
-    'send-gift-o',
-    'service-o',
-    'bag-o',
-    'todo-list-o',
-    'balance-list-o',
-    'close',
-    'clock-o',
-    'question-o',
-    'passed',
-    'add-o',
-    'gold-coin-o',
-    'info-o',
-    'play-circle-o',
-    'pause-circle-o',
-    'stop-circle-o',
-    'warning-o',
-    'phone-circle-o',
-    'music-o',
-    'smile-o',
-    'thumb-circle-o',
-    'comment-circle-o',
-    'browsing-history-o',
-    'underway-o',
-    'more-o',
-    'video-o',
-    'shop-o',
-    'shop-collect-o',
-    'share-o',
-    'chat-o',
-    'smile-comment-o',
-    'vip-card-o',
-    'award-o',
-    'diamond-o',
-    'volume-o',
-    'cluster-o',
-    'wap-home-o',
-    'photo-o',
-    'gift-card-o',
-    'expand-o',
-    'medal-o',
-    'good-job-o',
-    'manager-o',
-    'label-o',
-    'bookmark-o',
-    'bill-o',
-    'hot-o',
-    'hot-sale-o',
-    'new-o',
-    'new-arrival-o',
-    'goods-collect-o',
-    'eye-o',
-    'delete-o',
-    'font-o',
-    // without corresponding filled icon
-    'balance-o',
-    'refund-o',
-    'birthday-cake-o',
-    'user-o',
-    'orders-o',
-    'tv-o',
-    'envelop-o',
-    'flag-o',
-    'flower-o',
-    'filter-o',
-    'bar-chart-o',
-    'chart-trending-o',
-    'brush-o',
-    'bullhorn-o',
-    'hotel-o',
-    'cashier-o',
-    'newspaper-o',
-    'warn-o',
-    'notes-o',
-    'calendar-o',
-    'bulb-o',
-    'user-circle-o',
-    'desktop-o',
-    'apps-o',
-    'home-o',
-    'back-top',
-    'search',
-    'points',
-    'edit',
-    'qr',
-    'qr-invalid',
-    'closed-eye',
-    'down',
-    'scan',
-    'revoke',
-    'free-postage',
-    'certificate',
-    'logistics',
-    'contact',
-    'cash-back-record',
-    'after-sale',
-    'exchange',
-    'upgrade',
-    'ellipsis',
-    'description',
-    'records',
-    'sign',
-    'completed',
-    'failure',
-    'ecard-pay',
-    'peer-pay',
-    'balance-pay',
-    'credit-pay',
-    'debit-pay',
-    'cash-on-deliver',
-    'other-pay',
-    'tosend',
-    'pending-payment',
-    'paid',
-    'aim',
-    'discount',
-    'idcard',
-    'replay',
-    'shrink',
-    'shield-o',
-    'guide-o',
-  ],
-  filled: [
-    // has corresponding outline icon
-    'location',
-    'like',
-    'star',
-    'phone',
-    'setting',
-    'fire',
-    'coupon',
-    'cart',
-    'shopping-cart',
-    'cart-circle',
-    'friends',
-    'comment',
-    'gem',
-    'gift',
-    'point-gift',
-    'send-gift',
-    'service',
-    'bag',
-    'todo-list',
-    'balance-list',
-    'clear',
-    'clock',
-    'question',
-    'checked',
-    'add',
-    'gold-coin',
-    'info',
-    'play-circle',
-    'pause-circle',
-    'stop-circle',
-    'warning',
-    'phone-circle',
-    'music',
-    'smile',
-    'thumb-circle',
-    'comment-circle',
-    'browsing-history',
-    'underway',
-    'more',
-    'video',
-    'shop',
-    'shop-collect',
-    'share',
-    'chat',
-    'smile-comment',
-    'vip-card',
-    'award',
-    'diamond',
-    'volume',
-    'cluster',
-    'wap-home',
-    'photo',
-    'gift-card',
-    'expand',
-    'medal',
-    'good-job',
-    'manager',
-    'label',
-    'bookmark',
-    'bill',
-    'hot',
-    'hot-sale',
-    'new',
-    'new-arrival',
-    'goods-collect',
-    'eye',
-    'delete',
-    'font',
-    // without corresponding outline icon
-    'wechat',
-    'wechat-pay',
-    'alipay',
-    'photograph',
-    'youzan-shield',
-    'umbrella-circle',
-    'bell',
-    'printer',
-    'map-marked',
-    'card',
-    'add-square',
-    'live',
-    'lock',
-    'audio',
-    'graphic',
-    'column',
-    'invitation',
-    'play',
-    'pause',
-    'stop',
-    'weapp-nav',
-    'ascending',
-    'descending',
-    'bars',
-    'wap-nav',
-    'enlarge',
-    'photo-fail',
-    'sort',
-  ],
-};
 const steps = [
   {
     text: '步骤一',
diff --git a/yarn.lock b/yarn.lock
index f6b696bc..a5afce96 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7020,6 +7020,18 @@ gulp-rename@^2.0.0:
   resolved "https://registry.npm.taobao.org/gulp-rename/download/gulp-rename-2.0.0.tgz#9bbc3962b0c0f52fc67cd5eaff6c223ec5b9cf6c"
   integrity sha1-m7w5YrDA9S/GfNXq/2wiPsW5z2w=
 
+gulp-typescript@^6.0.0-alpha.1:
+  version "6.0.0-alpha.1"
+  resolved "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-6.0.0-alpha.1.tgz#fcb0dbbc79c34201f0945c6323c194a8f5455a04"
+  integrity sha512-KoT0TTfjfT7w3JItHkgFH1T/zK4oXWC+a8xxKfniRfVcA0Fa1bKrIhztYelYmb+95RB80OLMBreknYkdwzdi2Q==
+  dependencies:
+    ansi-colors "^4.1.1"
+    plugin-error "^1.0.1"
+    source-map "^0.7.3"
+    through2 "^3.0.1"
+    vinyl "^2.2.0"
+    vinyl-fs "^3.0.3"
+
 gulp@^4.0.2:
   version "4.0.2"
   resolved "https://registry.npm.taobao.org/gulp/download/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa"
@@ -10898,7 +10910,7 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.1.1, readable-stream@^3.4.0:
+"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.1.1, readable-stream@^3.4.0:
   version "3.6.0"
   resolved "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha1-M3u9o63AcGvT4CRCaihtS0sskZg=
@@ -12187,6 +12199,14 @@ through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
+through2@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
+  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
+  dependencies:
+    inherits "^2.0.4"
+    readable-stream "2 || 3"
+
 through2@^4.0.0:
   version "4.0.2"
   resolved "https://registry.npm.taobao.org/through2/download/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
@@ -12842,7 +12862,7 @@ vfile@^4.0.0:
     unist-util-stringify-position "^2.0.0"
     vfile-message "^2.0.0"
 
-vinyl-fs@^3.0.0:
+vinyl-fs@^3.0.0, vinyl-fs@^3.0.3:
   version "3.0.3"
   resolved "https://registry.npm.taobao.org/vinyl-fs/download/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
   integrity sha1-yFhJQF9nQo/qu71cXb3WT0fTG8c=
@@ -12885,7 +12905,7 @@ vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1:
   dependencies:
     source-map "^0.5.1"
 
-vinyl@^2.0.0:
+vinyl@^2.0.0, vinyl@^2.2.0:
   version "2.2.1"
   resolved "https://registry.npm.taobao.org/vinyl/download/vinyl-2.2.1.tgz?cache=0&sync_timestamp=1600750956998&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvinyl%2Fdownload%2Fvinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
   integrity sha1-I8+4u6tezjgDqiwKHrKK98u6GXQ=