merge

Author: wangxueliang

.gitignore

@@ -61,6 +61,7 @@ typings/
 dist
 lib
 es
+site-dist
 
 # 备份文件
 /components/test/*

components/icon/demo/index.vue

@@ -1,5 +1,5 @@
 <script>
-import IconSet from '@/examples/components/IconSet/index'
+import IconSet from '@/site/components/IconSet/index'
 const md = {
   cn: `# 图标 Icon
         语义化的矢量图形。

examples/components/api.vue

@@ -24,7 +24,8 @@
   "scripts": {
     "start": "NODE_ENV=development ./node_modules/.bin/webpack-dev-server --open --hot",
     "test": "karma start test/karma.conf.js --single-run",
-    "build": "sh build.sh",
+    "site": "node scripts/run.js site-dist",
+    "copy": "node scripts/run.js copy-html",
     "compile": "node antd-tools/cli/run.js compile",
     "dist": "node antd-tools/cli/run.js dist",
     "lint": "eslint -c ./.eslintrc --fix --ext .jsx ./components",
@@ -100,6 +101,7 @@
     "markdown-it": "^8.4.0",
     "marked": "^0.3.7",
     "merge2": "^1.2.1",
+    "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
     "postcss": "^6.0.20",
     "postcss-loader": "^2.1.2",

package-lock.json

@@ -6,15 +6,15 @@ if [[ $TRAVIS_BRANCH == "master" && $TRAVIS_PULL_REQUEST == "false" ]]; then
 
 echo "Starting to update gh-pages\n"
 
-rm -rf dist
-mkdir dist
+rm -rf site-dist
+mkdir site-dist
 
 git config --global user.email "[email protected]"
 git config --global user.name "Travis"
 
-./node_modules/.bin/webpack --config webpack.site.config.js
+npm run site
 
-cd dist
+cd site-dist
 git init
 git add -f .
 git commit -m "Travis build"