Merge branch 'dev' into next

packages/vant-cli/README.md

@@ -70,12 +70,6 @@ yarn add @vant/cli --dev
 - [目录结构](https://github.com/youzan/vant/tree/dev/packages/vant-cli/docs/directory.md)
 - [更新日志](https://github.com/youzan/vant/tree/dev/packages/vant-cli/changelog.md)
 
-## 微信讨论群
-
-扫码加入 Vant Cli 交流群，若群二维码过期，可以联系有赞前端小秘书加群
-
-<img src="https://img.yzcdn.cn/vant/wechat_20200527.jpeg" width="220" height="285" >
-
 ## 关于桌面端组件
 
 目前 Vant Cli 仅支持移动端组件的预览，桌面端组件暂不支持预览（欢迎 PR）。

packages/vant-cli/changelog.md

@@ -1,5 +1,11 @@
 # 更新日志
 
+### v2.5.2
+
+`2020-07-05`
+
+- 内置的 demo-block 组件新增 card 属性
+
 ### v2.5.1
 
 `2020-05-27`

packages/vant-cli/package.json

@@ -36,8 +36,6 @@
     "@types/fs-extra": "^9.0.1",
     "@types/lodash": "^4.14.153",
     "@types/postcss-load-config": "^2.0.1",
-    "@types/webpack": "^4.41.13",
-    "@types/webpack-dev-server": "^3.11.0",
     "@types/webpack-merge": "^4.1.5"
   },
   "dependencies": {
@@ -49,6 +47,8 @@
     "@babel/preset-typescript": "^7.10.1",
     "@nuxt/friendly-errors-webpack-plugin": "^2.5.0",
     "@types/jest": "^25.2.3",
+    "@types/webpack": "^4.41.13",
+    "@types/webpack-dev-server": "^3.11.0",
     "@vant/eslint-config": "^2.2.2",
     "@vant/markdown-loader": "^3.0.0-alpha.0",
     "@vant/markdown-vetur": "^2.0.1",

packages/vant-cli/site/mobile/components/DemoBlock.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="van-doc-demo-block">
-    <h2 class="van-doc-demo-block__title">{{ title }}</h2>
-    <slot />
+    <h2 v-if="title" class="van-doc-demo-block__title">{{ title }}</h2>
+    <div v-if="card" class="van-doc-demo-block__card">
+      <slot />
+    </div>
+    <slot v-else />
   </div>
 </template>
 
@@ -10,6 +13,7 @@ export default {
   name: 'demo-block',
 
   props: {
+    card: Boolean,
     title: String,
   },
 };
@@ -28,6 +32,16 @@ export default {
     line-height: 16px;
   }
 
+  &__card {
+    margin: 12px 12px 0;
+    overflow: hidden;
+    border-radius: 8px;
+  }
+
+  &__title + &__card {
+    margin-top: 0;
+  }
+
   &:first-of-type {
     .van-doc-demo-block__title {
       padding-top: 20px;

packages/vant-cli/src/common/types.ts

@@ -0,0 +1,6 @@
+import type Webpack from 'webpack';
+import type WebpackDevServer from 'webpack-dev-server';
+
+export type WebpackConfig = Webpack.Configuration & {
+  devServer?: WebpackDevServer.Configuration;
+};

packages/vant-cli/src/config/webpack.base.ts

@@ -4,6 +4,7 @@ import { VueLoaderPlugin } from 'vue-loader';
 import { join } from 'path';
 import { existsSync } from 'fs';
 import { consola } from '../common/logger';
+import { WebpackConfig } from '../common/types';
 import {
   CWD,
   CACHE_DIR,
@@ -61,7 +62,7 @@ const plugins = [
 //   );
 // }
 
-export const baseConfig = {
+export const baseConfig: WebpackConfig = {
   mode: 'development',
   resolve: {
     extensions: [...SCRIPT_EXTS, ...STYLE_EXTS],

packages/vant-cli/src/config/webpack.package.ts

@@ -1,10 +1,11 @@
 import merge from 'webpack-merge';
 import { join } from 'path';
 import { baseConfig } from './webpack.base';
+import { WebpackConfig } from '../common/types';
 import { getVantConfig, getWebpackConfig, setBuildTarget } from '../common';
 import { LIB_DIR, ES_DIR } from '../common/constant';
 
-export function getPackageConfig(isMinify: boolean) {
+export function getPackageConfig(isMinify: boolean): WebpackConfig {
   const { name } = getVantConfig();
 
   setBuildTarget('package');

packages/vant-cli/src/config/webpack.site.dev.ts

@@ -4,6 +4,7 @@ import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { get } from 'lodash';
 import { join } from 'path';
 import { baseConfig } from './webpack.base';
+import { WebpackConfig } from '../common/types';
 import { getVantConfig, getWebpackConfig } from '../common';
 import { VantCliSitePlugin } from '../compiler/vant-cli-site-plugin';
 import {
@@ -12,7 +13,7 @@ import {
   SITE_DESKTOP_SHARED_FILE,
 } from '../common/constant';
 
-export function getSiteDevBaseConfig() {
+export function getSiteDevBaseConfig(): WebpackConfig {
   const vantConfig = getVantConfig();
   const baiduAnalytics = get(vantConfig, 'site.baiduAnalytics');
 
@@ -101,6 +102,6 @@ export function getSiteDevBaseConfig() {
   });
 }
 
-export function getSiteDevConfig() {
+export function getSiteDevConfig(): WebpackConfig {
   return merge(getSiteDevBaseConfig(), getWebpackConfig());
 }

packages/vant-cli/src/config/webpack.site.prd.ts

@@ -1,5 +1,6 @@
 import merge from 'webpack-merge';
 import { get } from 'lodash';
+import { WebpackConfig } from '../common/types';
 import { getVantConfig, getWebpackConfig } from '../common';
 import { getSiteDevBaseConfig } from './webpack.site.dev';
 import { SITE_DIST_DIR } from '../common/constant';
@@ -8,7 +9,7 @@ const vantConfig = getVantConfig();
 const outputDir = get(vantConfig, 'build.site.outputDir', SITE_DIST_DIR);
 const publicPath = get(vantConfig, 'build.site.publicPath', '/');
 
-export function getSitePrdConfig() {
+export function getSitePrdConfig(): WebpackConfig {
   return merge(
     getSiteDevBaseConfig(),
     {