From e4f934dfde9f0026ef010cf8264b352cb8db62ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Wed, 27 Nov 2019 11:45:35 +0800
Subject: [PATCH] feat(cli): auto install all components

---
 packages/vant-cli/site/desktop/App.vue           |  2 +-
 packages/vant-cli/site/desktop/main.js           |  4 ++++
 packages/vant-cli/site/desktop/router.js         |  2 +-
 .../vant-cli/site/mobile/components/DemoHome.vue |  2 +-
 packages/vant-cli/site/mobile/main.js            |  4 ++++
 packages/vant-cli/site/mobile/router.js          |  2 +-
 packages/vant-cli/src/commands/dev.ts            | 10 ++++++----
 packages/vant-cli/src/common/constant.ts         |  6 +++---
 ...en-desktop-config.ts => gen-desktop-entry.ts} |  6 +++---
 ...{gen-mobile-config.ts => gen-mobile-entry.ts} | 16 ++++++++++++----
 .../vant-cli/src/compiler/gen-package-entry.ts   |  2 +-
 packages/vant-cli/src/config/webpack.package.ts  |  5 ++---
 packages/vant-cli/src/config/webpack.site.dev.ts |  8 +++++++-
 13 files changed, 46 insertions(+), 23 deletions(-)
 rename packages/vant-cli/src/compiler/{gen-desktop-config.ts => gen-desktop-entry.ts} (94%)
 rename packages/vant-cli/src/compiler/{gen-mobile-config.ts => gen-mobile-entry.ts} (81%)

diff --git a/packages/vant-cli/site/desktop/App.vue b/packages/vant-cli/site/desktop/App.vue
index 49607d53d..b5c4fcffc 100644
--- a/packages/vant-cli/site/desktop/App.vue
+++ b/packages/vant-cli/site/desktop/App.vue
@@ -8,7 +8,7 @@
 
 <script>
 import VanDoc from './components';
-import { config } from '../../dist/desktop-config';
+import { config } from 'desktop-entry';
 
 export default {
   components: {
diff --git a/packages/vant-cli/site/desktop/main.js b/packages/vant-cli/site/desktop/main.js
index 5de1e86c1..e46d4848e 100644
--- a/packages/vant-cli/site/desktop/main.js
+++ b/packages/vant-cli/site/desktop/main.js
@@ -5,6 +5,10 @@ import { routes } from './router';
 import { isMobile } from '../common';
 import '../common/iframe-router';
 
+if (process.env.NODE_ENV !== 'production') {
+  Vue.config.productionTip = false;
+}
+
 Vue.use(VueRouter);
 
 if (isMobile) {
diff --git a/packages/vant-cli/site/desktop/router.js b/packages/vant-cli/site/desktop/router.js
index 68501985f..95fc100a8 100644
--- a/packages/vant-cli/site/desktop/router.js
+++ b/packages/vant-cli/site/desktop/router.js
@@ -1,5 +1,5 @@
 import decamelize from 'decamelize';
-import { documents } from '../../dist/desktop-config';
+import { documents } from 'desktop-entry';
 
 const routes = [];
 const names = Object.keys(documents);
diff --git a/packages/vant-cli/site/mobile/components/DemoHome.vue b/packages/vant-cli/site/mobile/components/DemoHome.vue
index 57408cb6b..ea89304c7 100644
--- a/packages/vant-cli/site/mobile/components/DemoHome.vue
+++ b/packages/vant-cli/site/mobile/components/DemoHome.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { config } from '../../../dist/mobile-config';
+import { config } from 'mobile-entry';
 import DemoHomeNav from './DemoHomeNav';
 
 export default {
diff --git a/packages/vant-cli/site/mobile/main.js b/packages/vant-cli/site/mobile/main.js
index 3bdb01242..c02aa7f4a 100644
--- a/packages/vant-cli/site/mobile/main.js
+++ b/packages/vant-cli/site/mobile/main.js
@@ -7,6 +7,10 @@ import App from './App';
 import '@vant/touch-emulator';
 import '../common/iframe-router';
 
+if (process.env.NODE_ENV !== 'production') {
+  Vue.config.productionTip = false;
+}
+
 Vue.use(VueRouter);
 Vue.component(DemoBlock.name, DemoBlock);
 Vue.component(DemoSection.name, DemoSection);
diff --git a/packages/vant-cli/site/mobile/router.js b/packages/vant-cli/site/mobile/router.js
index daaecb651..2b6b0c841 100644
--- a/packages/vant-cli/site/mobile/router.js
+++ b/packages/vant-cli/site/mobile/router.js
@@ -1,6 +1,6 @@
 import decamelize from 'decamelize';
 import DemoHome from './components/DemoHome';
-import { demos } from '../../dist/mobile-config';
+import { demos } from 'mobile-entry';
 
 const routes = [];
 const names = Object.keys(demos);
diff --git a/packages/vant-cli/src/commands/dev.ts b/packages/vant-cli/src/commands/dev.ts
index 24252037e..b9699575f 100644
--- a/packages/vant-cli/src/commands/dev.ts
+++ b/packages/vant-cli/src/commands/dev.ts
@@ -3,8 +3,9 @@ import WebpackDevServer from 'webpack-dev-server';
 import { getPort } from 'portfinder';
 import { clean } from '../commands/clean';
 import { siteDevConfig } from '../config/webpack.site.dev';
-import { genMobileConfig } from '../compiler/gen-mobile-config';
-import { genDesktopConfig } from '../compiler/gen-desktop-config';
+import { genPackageEntry } from '../compiler/gen-package-entry';
+import { genMobileEntry } from '../compiler/gen-mobile-entry';
+import { genDesktopEntry } from '../compiler/gen-desktop-entry';
 
 function runWebpack() {
   const server = new WebpackDevServer(
@@ -33,7 +34,8 @@ function runWebpack() {
 
 export function dev() {
   clean();
-  genMobileConfig();
-  genDesktopConfig();
+  genPackageEntry();
+  genMobileEntry();
+  genDesktopEntry();
   runWebpack();
 }
diff --git a/packages/vant-cli/src/common/constant.ts b/packages/vant-cli/src/common/constant.ts
index 5287fd596..b969a4f73 100644
--- a/packages/vant-cli/src/common/constant.ts
+++ b/packages/vant-cli/src/common/constant.ts
@@ -12,9 +12,9 @@ export const WEBPACK_CONFIG_FILE = join(CWD, 'webpack.config.js');
 export const DIST_DIR = join(__dirname, '../../dist');
 export const CONFIG_DIR = join(__dirname, '../config');
 
-export const PACKAGE_ENTRY_FILE = join(DIST_DIR, 'index.js');
-export const MOBILE_CONFIG_FILE = join(DIST_DIR, 'mobile-config.js');
-export const DESKTOP_CONFIG_FILE = join(DIST_DIR, 'desktop-config.js');
+export const PACKAGE_ENTRY_FILE = join(DIST_DIR, 'package-entry.js');
+export const MOBILE_ENTRY_FILE = join(DIST_DIR, 'mobile-entry.js');
+export const DESKTOP_ENTRY_FILE = join(DIST_DIR, 'desktop-entry.js');
 
 export const JEST_CONFIG_FILE = join(CONFIG_DIR, 'jest.config.js');
 export const BABEL_CONFIG_FILE = join(CONFIG_DIR, 'babel.config.js');
diff --git a/packages/vant-cli/src/compiler/gen-desktop-config.ts b/packages/vant-cli/src/compiler/gen-desktop-entry.ts
similarity index 94%
rename from packages/vant-cli/src/compiler/gen-desktop-config.ts
rename to packages/vant-cli/src/compiler/gen-desktop-entry.ts
index c6fcd430b..b1bba4e64 100644
--- a/packages/vant-cli/src/compiler/gen-desktop-config.ts
+++ b/packages/vant-cli/src/compiler/gen-desktop-entry.ts
@@ -7,7 +7,7 @@ import {
   DOCS_DIR,
   DIST_DIR,
   CONFIG_FILE,
-  DESKTOP_CONFIG_FILE
+  DESKTOP_ENTRY_FILE
 } from '../common/constant';
 
 type DocumentItem = {
@@ -58,7 +58,7 @@ function genExportConfig() {
   return 'export { config };';
 }
 
-export function genDesktopConfig() {
+export function genDesktopEntry() {
   const components = getComponents();
   const documents = resolveDocuments(components);
 
@@ -69,5 +69,5 @@ ${genExportConfig()}
 ${genExportDocuments(documents)}
 `;
 
-  writeFileSync(DESKTOP_CONFIG_FILE, code);
+  writeFileSync(DESKTOP_ENTRY_FILE, code);
 }
diff --git a/packages/vant-cli/src/compiler/gen-mobile-config.ts b/packages/vant-cli/src/compiler/gen-mobile-entry.ts
similarity index 81%
rename from packages/vant-cli/src/compiler/gen-mobile-config.ts
rename to packages/vant-cli/src/compiler/gen-mobile-entry.ts
index f85175d15..cba373c3d 100644
--- a/packages/vant-cli/src/compiler/gen-mobile-config.ts
+++ b/packages/vant-cli/src/compiler/gen-mobile-entry.ts
@@ -4,7 +4,7 @@ import { decamelize, pascalize, removeExt, getComponents } from '../common';
 import {
   SRC_DIR,
   DIST_DIR,
-  MOBILE_CONFIG_FILE,
+  MOBILE_ENTRY_FILE,
   CONFIG_FILE
 } from '../common/constant';
 
@@ -13,6 +13,14 @@ type DemoItem = {
   path: string;
 };
 
+function genInstall() {
+  return `import Vue from 'vue';
+import PackageEntry from './package-entry';
+
+Vue.use(PackageEntry);
+`;
+}
+
 function genImports(demos: DemoItem[]) {
   return demos
     .map(item => {
@@ -49,13 +57,13 @@ function genCode(components: string[]) {
     }))
     .filter(item => existsSync(item.path));
 
-  return `${genImports(demos)}\n\n${genExports(demos)}\n${genConfig(demos)}\n`;
+  return `${genInstall()}\n${genImports(demos)}\n\n${genExports(demos)}\n${genConfig(demos)}\n`;
 }
 
-export function genMobileConfig() {
+export function genMobileEntry() {
   const components = getComponents();
   const code = genCode(components);
 
   ensureDirSync(DIST_DIR);
-  writeFileSync(MOBILE_CONFIG_FILE, code);
+  writeFileSync(MOBILE_ENTRY_FILE, code);
 }
diff --git a/packages/vant-cli/src/compiler/gen-package-entry.ts b/packages/vant-cli/src/compiler/gen-package-entry.ts
index b66b0401b..8778c7d21 100644
--- a/packages/vant-cli/src/compiler/gen-package-entry.ts
+++ b/packages/vant-cli/src/compiler/gen-package-entry.ts
@@ -36,7 +36,7 @@ const components = [
   ${names.join(',\n  ')}
 ];
 
-function install() {
+function install(Vue) {
   components.forEach(item => {
     if (item.install) {
       Vue.use(Component);
diff --git a/packages/vant-cli/src/config/webpack.package.ts b/packages/vant-cli/src/config/webpack.package.ts
index 612b8e83f..8b8c05d88 100644
--- a/packages/vant-cli/src/config/webpack.package.ts
+++ b/packages/vant-cli/src/config/webpack.package.ts
@@ -1,8 +1,7 @@
 import merge from 'webpack-merge';
-import { join } from 'path';
 import { baseConfig } from './webpack.base';
 import { getWebpackConfig } from '../common';
-import { LIB_DIR, DIST_DIR, CONFIG_FILE } from '../common/constant';
+import { LIB_DIR, CONFIG_FILE, PACKAGE_ENTRY_FILE } from '../common/constant';
 
 // eslint-disable-next-line
 const config = require(CONFIG_FILE);
@@ -14,7 +13,7 @@ export function packageConfig(isMinify: boolean) {
     {
       mode: 'production',
       entry: {
-        [name]: join(DIST_DIR, 'index.js')
+        [name]: PACKAGE_ENTRY_FILE
       },
       stats: 'none',
       output: {
diff --git a/packages/vant-cli/src/config/webpack.site.dev.ts b/packages/vant-cli/src/config/webpack.site.dev.ts
index c9df20e3e..90ff19ad9 100644
--- a/packages/vant-cli/src/config/webpack.site.dev.ts
+++ b/packages/vant-cli/src/config/webpack.site.dev.ts
@@ -2,7 +2,7 @@ import merge from 'webpack-merge';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { join } from 'path';
 import { baseConfig } from './webpack.base';
-import { CONFIG_FILE } from '../common/constant';
+import { CONFIG_FILE, MOBILE_ENTRY_FILE, DESKTOP_ENTRY_FILE } from '../common/constant';
 import { getWebpackConfig } from '../common';
 
 // eslint-disable-next-line
@@ -22,6 +22,12 @@ export const siteDevConfig = merge(
       stats: 'errors-only',
       disableHostCheck: true
     },
+    resolve: {
+      alias: {
+        'mobile-entry': MOBILE_ENTRY_FILE,
+        'desktop-entry': DESKTOP_ENTRY_FILE
+      }
+    },
     output: {
       path: join(__dirname, '../../site/dist'),
       publicPath: '/',