From d62ecce53df882fb7e07ad00d13ca0ee3e2ecb3f Mon Sep 17 00:00:00 2001
From: meixg <meixg@foxmail.com>
Date: Wed, 10 Apr 2019 17:23:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=8E=9F=E7=94=9F=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=92=8C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/mars-build/src/compiler/script/config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/mars-build/src/compiler/script/config.js b/packages/mars-build/src/compiler/script/config.js
index c1731f04..25fe5dfc 100644
--- a/packages/mars-build/src/compiler/script/config.js
+++ b/packages/mars-build/src/compiler/script/config.js
@@ -14,7 +14,8 @@ exports.compile = function compile(source, options) {
     Object.keys(components).forEach(k => {
         components[k] = components[k].replace(/\.vue$/, '');
     });
-    config.usingComponents = components;
+
+    config.usingComponents = Object.assign(components, config.usingComponents || {});
     return {
         code: JSON.stringify(config)
     };