Merge branch 'dev' into next

2025-10-18 01:17:15 +00:00 · 2020-09-26 21:35:53 +08:00
parent 9010a0edf1 6148cdf154
commit 47a270effb
9 changed files with 233 additions and 40 deletions
--- a/packages/vant-cli/src/common/index.ts
+++ b/packages/vant-cli/src/common/index.ts
@@ -109,7 +109,7 @@ export function getWebpackConfig(defaultConfig: WebpackConfig): WebpackConfig {
    // 如果是函数形式，可能并不仅仅是添加额外的处理流程，而是在原有流程上进行修改
    // 比如修改markdown-loader,添加options.enableMetaData
    if (typeof config === 'function') {
-      return config(defaultConfig);
+      return merge(defaultConfig, config(defaultConfig));
    }

    return merge(defaultConfig, config);