diff --git a/lib/compile-vue.js b/lib/compile-vue.js
index 299a0f9..c44ab68 100644
--- a/lib/compile-vue.js
+++ b/lib/compile-vue.js
@@ -186,8 +186,16 @@ export function parseJs(
         if (isBuild) {
           name = name.replace(/\.vue$/, '.js')
         }
+        if (alias.trim() === '*') {
+          return `${t} ${alias} from '${name}'`
+        }
+        let _alias = alias
+        if (alias.includes('* as')) {
+          _alias = ' default ' + alias.replace('* as', '').trim()
+        }
+
         return `import ${alias} from '${name}'${
-          t === 'export' ? `\nexport ${alias}` : ''
+          t === 'export' ? `\nexport ${_alias}` : ''
         }`
       }
     )
diff --git a/lib/dev.js b/lib/dev.js
index b4aa41b..7a27de4 100644
--- a/lib/dev.js
+++ b/lib/dev.js
@@ -42,6 +42,10 @@ export default async function createServer(root = '', conf = {}) {
     conf.imports['vue-router'] = conf.imports['vue-router-dev']
   }
 
+  if (conf.devServer.headers) {
+    Object.assign(COMMON_HEADERS, conf.devServer.headers)
+  }
+
   if (USE_HTTPS) {
     Object.assign(SERVER_OPTIONS, conf.devServer.ssl)