From 6b68b4011a712396053e224bcac235726939d49c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Mon, 18 Nov 2019 21:02:36 +0800
Subject: [PATCH] chore: merge vant-doc to vant-cli

---
 packages/vant-cli/package.json                |  1 -
 .../site/common}/style/base.less              |  0
 .../site/common}/style/highlight.less         |  0
 .../site/common}/style/index.less             |  0
 .../site/common}/style/variable.less          |  2 +-
 packages/vant-cli/site/desktop/App.vue        |  5 +++
 .../site/desktop/components}/Container.vue    |  2 +-
 .../site/desktop/components}/Content.vue      |  4 +-
 .../site/desktop/components}/Header.vue       |  2 +-
 .../site/desktop/components}/Nav.vue          |  4 +-
 .../site/desktop/components}/NavLink.vue      |  0
 .../site/desktop/components}/SearchInput.vue  |  2 +-
 .../site/desktop/components}/Simulator.vue    |  4 +-
 .../site/desktop/components/index.vue}        | 32 +++++++++++-----
 packages/vant-cli/site/desktop/main.js        |  2 -
 packages/vant-cli/site/mobile/App.vue         |  2 +-
 .../site/mobile/components/DemoBlock.vue      |  2 +-
 packages/vant-cli/yarn.lock                   |  5 ---
 packages/vant-doc/README.md                   | 15 --------
 packages/vant-doc/build/webpack.config.js     | 13 -------
 packages/vant-doc/package.json                | 21 -----------
 packages/vant-doc/src/component/DemoBlock.vue | 36 ------------------
 .../vant-doc/src/component/DemoSection.vue    | 32 ----------------
 packages/vant-doc/src/index.js                | 37 -------------------
 packages/vant-doc/yarn.lock                   | 35 ------------------
 25 files changed, 40 insertions(+), 218 deletions(-)
 rename packages/{vant-doc/src => vant-cli/site/common}/style/base.less (100%)
 rename packages/{vant-doc/src => vant-cli/site/common}/style/highlight.less (100%)
 rename packages/{vant-doc/src => vant-cli/site/common}/style/index.less (100%)
 rename packages/{vant-doc/src => vant-cli/site/common}/style/variable.less (96%)
 rename packages/{vant-doc/src/component => vant-cli/site/desktop/components}/Container.vue (94%)
 rename packages/{vant-doc/src/component => vant-cli/site/desktop/components}/Content.vue (97%)
 rename packages/{vant-doc/src/component => vant-cli/site/desktop/components}/Header.vue (99%)
 rename packages/{vant-doc/src/component => vant-cli/site/desktop/components}/Nav.vue (97%)
 rename packages/{vant-doc/src/component => vant-cli/site/desktop/components}/NavLink.vue (100%)
 rename packages/{vant-doc/src/component => vant-cli/site/desktop/components}/SearchInput.vue (97%)
 rename packages/{vant-doc/src/component => vant-cli/site/desktop/components}/Simulator.vue (94%)
 rename packages/{vant-doc/src/VanDoc.vue => vant-cli/site/desktop/components/index.vue} (80%)
 delete mode 100644 packages/vant-doc/README.md
 delete mode 100644 packages/vant-doc/build/webpack.config.js
 delete mode 100644 packages/vant-doc/package.json
 delete mode 100644 packages/vant-doc/src/component/DemoBlock.vue
 delete mode 100644 packages/vant-doc/src/component/DemoSection.vue
 delete mode 100644 packages/vant-doc/src/index.js
 delete mode 100644 packages/vant-doc/yarn.lock

diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json
index c4cd32dfa..6d81bab0a 100644
--- a/packages/vant-cli/package.json
+++ b/packages/vant-cli/package.json
@@ -51,7 +51,6 @@
     "@babel/preset-env": "^7.7.1",
     "@babel/preset-typescript": "^7.7.2",
     "@types/jest": "^24.0.22",
-    "@vant/doc": "^2.6.1",
     "@vant/eslint-config": "^1.4.0",
     "@vant/markdown-loader": "^2.2.0",
     "@vant/markdown-vetur": "^1.0.0",
diff --git a/packages/vant-doc/src/style/base.less b/packages/vant-cli/site/common/style/base.less
similarity index 100%
rename from packages/vant-doc/src/style/base.less
rename to packages/vant-cli/site/common/style/base.less
diff --git a/packages/vant-doc/src/style/highlight.less b/packages/vant-cli/site/common/style/highlight.less
similarity index 100%
rename from packages/vant-doc/src/style/highlight.less
rename to packages/vant-cli/site/common/style/highlight.less
diff --git a/packages/vant-doc/src/style/index.less b/packages/vant-cli/site/common/style/index.less
similarity index 100%
rename from packages/vant-doc/src/style/index.less
rename to packages/vant-cli/site/common/style/index.less
diff --git a/packages/vant-doc/src/style/variable.less b/packages/vant-cli/site/common/style/variable.less
similarity index 96%
rename from packages/vant-doc/src/style/variable.less
rename to packages/vant-cli/site/common/style/variable.less
index 6550e79ea..723b16e6f 100644
--- a/packages/vant-doc/src/style/variable.less
+++ b/packages/vant-cli/site/common/style/variable.less
@@ -1,4 +1,4 @@
-@van-doc-black: #333;
+@van-doc-black: #323233;
 @van-doc-blue: #1989fa;
 @van-doc-purple: #5758bb;
 @van-doc-fuchsia: #a7419e;
diff --git a/packages/vant-cli/site/desktop/App.vue b/packages/vant-cli/site/desktop/App.vue
index fc84d2d6b..49607d53d 100644
--- a/packages/vant-cli/site/desktop/App.vue
+++ b/packages/vant-cli/site/desktop/App.vue
@@ -7,9 +7,14 @@
 </template>
 
 <script>
+import VanDoc from './components';
 import { config } from '../../dist/desktop-config';
 
 export default {
+  components: {
+    VanDoc
+  },
+
   data() {
     return {
       config,
diff --git a/packages/vant-doc/src/component/Container.vue b/packages/vant-cli/site/desktop/components/Container.vue
similarity index 94%
rename from packages/vant-doc/src/component/Container.vue
rename to packages/vant-cli/site/desktop/components/Container.vue
index e66657bad..3afa5a54c 100644
--- a/packages/vant-doc/src/component/Container.vue
+++ b/packages/vant-cli/site/desktop/components/Container.vue
@@ -18,7 +18,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../style/variable';
+@import '../../common/style/index';
 
 .van-doc-container {
   box-sizing: border-box;
diff --git a/packages/vant-doc/src/component/Content.vue b/packages/vant-cli/site/desktop/components/Content.vue
similarity index 97%
rename from packages/vant-doc/src/component/Content.vue
rename to packages/vant-cli/site/desktop/components/Content.vue
index 23210f931..9013b4357 100644
--- a/packages/vant-doc/src/component/Content.vue
+++ b/packages/vant-cli/site/desktop/components/Content.vue
@@ -21,7 +21,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../style/variable';
+@import '../../common/style/index';
 
 .van-doc-content {
   position: relative;
@@ -188,7 +188,7 @@ export default {
   blockquote {
     margin: 20px 0 0;
     padding: 16px;
-    color: rgba(52, 73, 94, .8);
+    color: rgba(52, 73, 94, 0.8);
     font-size: 14px;
     background-color: #ecf9ff;
     border-left: 5px solid #50bfff;
diff --git a/packages/vant-doc/src/component/Header.vue b/packages/vant-cli/site/desktop/components/Header.vue
similarity index 99%
rename from packages/vant-doc/src/component/Header.vue
rename to packages/vant-cli/site/desktop/components/Header.vue
index cb66ace1d..0447bb964 100644
--- a/packages/vant-doc/src/component/Header.vue
+++ b/packages/vant-cli/site/desktop/components/Header.vue
@@ -98,7 +98,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../style/variable';
+@import '../../common/style/index';
 
 .van-doc-header {
   width: 100%;
diff --git a/packages/vant-doc/src/component/Nav.vue b/packages/vant-cli/site/desktop/components/Nav.vue
similarity index 97%
rename from packages/vant-doc/src/component/Nav.vue
rename to packages/vant-cli/site/desktop/components/Nav.vue
index e38969731..742725bdd 100644
--- a/packages/vant-doc/src/component/Nav.vue
+++ b/packages/vant-cli/site/desktop/components/Nav.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import NavLink from './NavLink.vue';
+import NavLink from './NavLink';
 
 export default {
   name: 'van-doc-nav',
@@ -76,7 +76,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../style/variable';
+@import '../../common/style/index';
 
 .van-doc-nav {
   position: fixed;
diff --git a/packages/vant-doc/src/component/NavLink.vue b/packages/vant-cli/site/desktop/components/NavLink.vue
similarity index 100%
rename from packages/vant-doc/src/component/NavLink.vue
rename to packages/vant-cli/site/desktop/components/NavLink.vue
diff --git a/packages/vant-doc/src/component/SearchInput.vue b/packages/vant-cli/site/desktop/components/SearchInput.vue
similarity index 97%
rename from packages/vant-doc/src/component/SearchInput.vue
rename to packages/vant-cli/site/desktop/components/SearchInput.vue
index 64d1d7278..c8f404444 100644
--- a/packages/vant-doc/src/component/SearchInput.vue
+++ b/packages/vant-cli/site/desktop/components/SearchInput.vue
@@ -40,7 +40,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../style/variable';
+@import '../../common/style/index';
 
 .van-doc-search {
   width: 200px;
diff --git a/packages/vant-doc/src/component/Simulator.vue b/packages/vant-cli/site/desktop/components/Simulator.vue
similarity index 94%
rename from packages/vant-doc/src/component/Simulator.vue
rename to packages/vant-cli/site/desktop/components/Simulator.vue
index 00e6d318e..b51b1df4e 100644
--- a/packages/vant-doc/src/component/Simulator.vue
+++ b/packages/vant-cli/site/desktop/components/Simulator.vue
@@ -44,7 +44,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../style/variable';
+@import '../../common/style/index';
 
 .van-doc-simulator {
   position: absolute;
@@ -71,7 +71,7 @@ export default {
 
   @media (min-width: @van-doc-row-max-width) {
     right: 50%;
-    margin-right: calc(-@van-doc-row-max-width / 2 + 40px);
+    margin-right: -@van-doc-row-max-width / 2 + 40px;
   }
 
   &-fixed {
diff --git a/packages/vant-doc/src/VanDoc.vue b/packages/vant-cli/site/desktop/components/index.vue
similarity index 80%
rename from packages/vant-doc/src/VanDoc.vue
rename to packages/vant-cli/site/desktop/components/index.vue
index 5c6d0b2d8..40448476b 100644
--- a/packages/vant-doc/src/VanDoc.vue
+++ b/packages/vant-cli/site/desktop/components/index.vue
@@ -1,20 +1,20 @@
 <template>
   <div class="van-doc">
-    <van-doc-header
+    <doc-header
       :lang="lang"
       :versions="versions"
       :config="config.header"
       :search-config="searchConfig"
       @switch-version="$emit('switch-version', $event)"
     />
-    <van-doc-nav :base="base" :nav-config="config.nav" />
-    <van-doc-container :has-simulator="!!(simulator || simulators.length)">
-      <van-doc-content>
+    <doc-nav :base="base" :nav-config="config.nav" />
+    <doc-container :has-simulator="!!(simulator || simulators.length)">
+      <doc-content>
         <slot />
-      </van-doc-content>
-    </van-doc-container>
-    <van-doc-simulator v-if="simulator" :src="simulator" />
-    <van-doc-simulator
+      </doc-content>
+    </doc-container>
+    <doc-simulator v-if="simulator" :src="simulator" />
+    <doc-simulator
       v-for="(url, index) in simulators"
       v-show="index === currentSimulator"
       :src="url"
@@ -24,9 +24,23 @@
 </template>
 
 <script>
+import DocNav from './Nav';
+import DocHeader from './Header';
+import DocContent from './Content';
+import DocContainer from './Container';
+import DocSimulator from './Simulator';
+
 export default {
   name: 'van-doc',
 
+  components: {
+    DocNav,
+    DocHeader,
+    DocContent,
+    DocContainer,
+    DocSimulator
+  },
+
   props: {
     lang: String,
     versions: Array,
@@ -124,5 +138,5 @@ export default {
 </script>
 
 <style lang="less">
-@import './style/index';
+@import '../../common/style/index';
 </style>
diff --git a/packages/vant-cli/site/desktop/main.js b/packages/vant-cli/site/desktop/main.js
index bbf4715c4..bac4c27f2 100644
--- a/packages/vant-cli/site/desktop/main.js
+++ b/packages/vant-cli/site/desktop/main.js
@@ -1,12 +1,10 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
-import VantDoc from '@vant/doc';
 import App from './App';
 import routes from './router';
 import { isMobile } from '../common';
 import '../common/iframe-router';
 
-Vue.use(VantDoc);
 Vue.use(VueRouter);
 
 if (isMobile) {
diff --git a/packages/vant-cli/site/mobile/App.vue b/packages/vant-cli/site/mobile/App.vue
index 0a108ad94..99f2db83d 100644
--- a/packages/vant-cli/site/mobile/App.vue
+++ b/packages/vant-cli/site/mobile/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <nav-bar />
+    <demo-nav />
     <keep-alive>
       <router-view />
     </keep-alive>
diff --git a/packages/vant-cli/site/mobile/components/DemoBlock.vue b/packages/vant-cli/site/mobile/components/DemoBlock.vue
index ebc569d1a..56b79c4c4 100644
--- a/packages/vant-cli/site/mobile/components/DemoBlock.vue
+++ b/packages/vant-cli/site/mobile/components/DemoBlock.vue
@@ -16,7 +16,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../style/variable';
+@import '../../common/style/index';
 
 .van-doc-demo-block {
   &__title {
diff --git a/packages/vant-cli/yarn.lock b/packages/vant-cli/yarn.lock
index ed2302fdf..a43f1d850 100644
--- a/packages/vant-cli/yarn.lock
+++ b/packages/vant-cli/yarn.lock
@@ -1421,11 +1421,6 @@
     semver "^6.3.0"
     tsutils "^3.17.1"
 
-"@vant/doc@^2.6.1":
-  version "2.6.1"
-  resolved "https://registry.npm.taobao.org/@vant/doc/download/@vant/doc-2.6.1.tgz#667db2ca32cd86f3def452a03c66076c1b97c969"
-  integrity sha1-Zn2yyjLNhvPe9FKgPGYHbBuXyWk=
-
 "@vant/eslint-config@^1.4.0":
   version "1.4.0"
   resolved "https://registry.npm.taobao.org/@vant/eslint-config/download/@vant/eslint-config-1.4.0.tgz#c9464beeea842a5ec64e5af714923a0cadf523b3"
diff --git a/packages/vant-doc/README.md b/packages/vant-doc/README.md
deleted file mode 100644
index 64a3e83cf..000000000
--- a/packages/vant-doc/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Vant Doc
-
-UI components of Vant document site
-
-#### NPM
-
-```shell
-npm i @vant/doc -D
-```
-
-#### YARN
-
-```shell
-yarn add @vant/doc --dev
-```
diff --git a/packages/vant-doc/build/webpack.config.js b/packages/vant-doc/build/webpack.config.js
deleted file mode 100644
index debfb641f..000000000
--- a/packages/vant-doc/build/webpack.config.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const path = require('path');
-const baseWebpackConfig = require('../../../build/webpack.pkg');
-
-module.exports = Object.assign(baseWebpackConfig, {
-  entry: {
-    index: './src/index.js'
-  },
-  output: {
-    path: path.resolve(__dirname, '../lib'),
-    filename: '[name].js',
-    libraryTarget: 'commonjs2'
-  }
-});
diff --git a/packages/vant-doc/package.json b/packages/vant-doc/package.json
deleted file mode 100644
index b7becdf43..000000000
--- a/packages/vant-doc/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "@vant/doc",
-  "version": "2.6.1",
-  "description": "vant document template",
-  "main": "./lib/index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "files": [
-    "lib"
-  ],
-  "scripts": {
-    "build": "webpack --progress --config ./build/webpack.config.js",
-    "release": "npm run build && npm publish"
-  },
-  "license": "MIT",
-  "repository": "https://github.com/youzan/vant/tree/dev/packages/vant-doc",
-  "devDependencies": {
-    "decamelize": "^3.2.0"
-  }
-}
diff --git a/packages/vant-doc/src/component/DemoBlock.vue b/packages/vant-doc/src/component/DemoBlock.vue
deleted file mode 100644
index ebc569d1a..000000000
--- a/packages/vant-doc/src/component/DemoBlock.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <section class="van-doc-demo-block">
-    <h2 class="van-doc-demo-block__title">{{ title }}</h2>
-    <slot />
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'demo-block',
-
-  props: {
-    title: String
-  }
-};
-</script>
-
-<style lang="less">
-@import '../style/variable';
-
-.van-doc-demo-block {
-  &__title {
-    margin: 0;
-    padding: 32px 16px 16px;
-    color: @van-doc-text-light-blue;
-    font-weight: normal;
-    font-size: 14px;
-  }
-
-  &:first-of-type {
-    .van-doc-demo-block__title {
-      padding-top: 20px;
-    }
-  }
-}
-</style>
diff --git a/packages/vant-doc/src/component/DemoSection.vue b/packages/vant-doc/src/component/DemoSection.vue
deleted file mode 100644
index 071e676ae..000000000
--- a/packages/vant-doc/src/component/DemoSection.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-  <section class="van-doc-demo-section" :class="demoName">
-    <slot />
-  </section>
-</template>
-
-<script>
-import decamelize from 'decamelize';
-
-export default {
-  name: 'demo-section',
-
-  computed: {
-    demoName() {
-      const { meta } = this.$route;
-      if (meta && meta.name) {
-        return `demo-${decamelize(meta.name, '-')}`;
-      }
-
-      return '';
-    }
-  }
-};
-</script>
-
-<style lang="less">
-.van-doc-demo-section {
-  box-sizing: border-box;
-  min-height: 100vh;
-  padding-bottom: 20px;
-}
-</style>
diff --git a/packages/vant-doc/src/index.js b/packages/vant-doc/src/index.js
deleted file mode 100644
index 8ace9eda3..000000000
--- a/packages/vant-doc/src/index.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import Vue from 'vue';
-import VanDoc from './VanDoc';
-import Nav from './component/Nav';
-import Header from './component/Header';
-import Content from './component/Content';
-import Container from './component/Container';
-import Simulator from './component/Simulator';
-import DemoBlock from './component/DemoBlock';
-import DemoSection from './component/DemoSection';
-
-const components = [
-  Nav,
-  Header,
-  VanDoc,
-  Content,
-  Container,
-  Simulator,
-  DemoBlock,
-  DemoSection
-];
-
-export default function install() {
-  components.forEach(Component => {
-    Vue.component(Component.name, Component);
-  });
-}
-
-export {
-  Nav,
-  Header,
-  VanDoc,
-  Content,
-  Container,
-  Simulator,
-  DemoBlock,
-  DemoSection
-};
diff --git a/packages/vant-doc/yarn.lock b/packages/vant-doc/yarn.lock
deleted file mode 100644
index 35eeb47a2..000000000
--- a/packages/vant-doc/yarn.lock
+++ /dev/null
@@ -1,35 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@babel/runtime-corejs2@^7.2.0":
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.7.2.tgz#5a8c4e2f8688ce58adc9eb1d8320b6e7341f96ce"
-  integrity sha512-GfVnHchOBvIMsweQ13l4jd9lT4brkevnavnVOej5g2y7PpTRY+R4pcQlCjWMZoUla5rMLFzaS/Ll2s59cB1TqQ==
-  dependencies:
-    core-js "^2.6.5"
-    regenerator-runtime "^0.13.2"
-
-core-js@^2.6.5:
-  version "2.6.10"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
-  integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
-
-decamelize@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-3.2.0.tgz#84b8e8f4f8c579f938e35e2cc7024907e0090851"
-  integrity sha512-4TgkVUsmmu7oCSyGBm5FvfMoACuoh9EOidm7V5/J2X2djAwwt57qb3F2KMP2ITqODTCSwb+YRV+0Zqrv18k/hw==
-  dependencies:
-    xregexp "^4.2.4"
-
-regenerator-runtime@^0.13.2:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
-  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
-
-xregexp@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.2.4.tgz#02a4aea056d65a42632c02f0233eab8e4d7e57ed"
-  integrity sha512-sO0bYdYeJAJBcJA8g7MJJX7UrOZIfJPd8U2SC7B2Dd/J24U0aQNoGp33shCaBSWeb0rD5rh6VBUIXOkGal1TZA==
-  dependencies:
-    "@babel/runtime-corejs2" "^7.2.0"