Merge branch '2.x' into dev

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

@@ -39,6 +39,7 @@ export function getSiteDevBaseConfig(): WebpackConfig {
 
   const siteConfig = getSiteConfig();
   const title = getTitle(siteConfig);
+  const { htmlPluginOptions } = vantConfig.site;
 
   return merge(baseConfig as any, {
     entry: {
@@ -88,6 +89,7 @@ export function getSiteDevBaseConfig(): WebpackConfig {
         template: join(__dirname, '../../site/desktop/index.html'),
         filename: 'index.html',
         baiduAnalytics,
+        ...htmlPluginOptions,
       }),
       new HtmlWebpackPlugin({
         title,
@@ -97,6 +99,7 @@ export function getSiteDevBaseConfig(): WebpackConfig {
         template: join(__dirname, '../../site/mobile/index.html'),
         filename: 'mobile.html',
         baiduAnalytics,
+        ...htmlPluginOptions,
       }),
     ],
   });