Merge branch 'dev' into alpha

packages/uni-template-compiler/lib/auto-components.js

@@ -111,7 +111,7 @@ const compilerModule = {
     if (process.env.UNI_PLATFORM === 'quickapp-native') {
       // 排查所有标签
       (options.isUnaryTag.autoComponents || (options.isUnaryTag.autoComponents = new Set())).add(el.tag)
-    } else if (isComponent(el.tag, options.mp.platform) && el.tag !== 'App') { // App.vue
+    } else if (isComponent(el.tag, options.mp && options.mp.platform) && el.tag !== 'App') { // App.vue
       // 挂在 isUnaryTag 上边,可以保证外部访问到
       (options.isUnaryTag.autoComponents || (options.isUnaryTag.autoComponents = new Set())).add(el.tag)
     }

packages/uni-template-compiler/lib/index.js

@@ -67,7 +67,7 @@ module.exports = {
       options.optimize = false // 启用 staticRenderFns
       // domProps => attrs
       options.mustUseProp = () => false
-      options.isReservedTag = (tagName) => !isComponent(tagName, options.mp.platform) // 非组件均为内置
+      options.isReservedTag = (tagName) => !isComponent(tagName, options.mp && options.mp.platform) // 非组件均为内置
       options.getTagNamespace = () => false
 
       try {