refactor: adjust weex branch coverage and build for merging into dev

Author: yyx990803

src/compiler/codegen/events.js

@@ -47,6 +47,7 @@ export function genHandlers (
 }
 
 // Generate handler code with binding params on Weex
+/* istanbul ignore next */
 function genWeexHandler (params: Array<any>, handlerCode: string) {
   let innerHandlerCode = handlerCode
   const exps = params.filter(exp => simplePathRE.test(exp) && exp !== '$event')
@@ -82,6 +83,7 @@ function genHandler (
     if (isMethodPath || isFunctionExpression) {
       return handler.value
     }
+    /* istanbul ignore if */
     if (__WEEX__ && handler.params) {
       return genWeexHandler(handler.params, handler.value)
     }
@@ -121,6 +123,7 @@ function genHandler (
       : isFunctionExpression
         ? `(${handler.value})($event)`
         : handler.value
+    /* istanbul ignore if */
     if (__WEEX__ && handler.params) {
       return genWeexHandler(handler.params, code + handlerCode)
     }

src/compiler/codegen/index.js

@@ -487,11 +487,17 @@ function genProps (props: Array<{ name: string, value: any }>): string {
   let res = ''
   for (let i = 0; i < props.length; i++) {
     const prop = props[i]
-    res += `"${prop.name}":${generateValue(prop.value)},`
+    /* istanbul ignore if */
+    if (__WEEX__) {
+      res += `"${prop.name}":${generateValue(prop.value)},`
+    } else {
+      res += `"${prop.name}":${transformSpecialNewlines(prop.value)},`
+    }
   }
   return res.slice(0, -1)
 }
 
+/* istanbul ignore next */
 function generateValue (value) {
   if (typeof value === 'string') {
     return transformSpecialNewlines(value)

src/core/vdom/create-component.js

@@ -200,6 +200,7 @@ export function createComponent (
   // Weex specific: invoke recycle-list optimized @render function for
   // extracting cell-slot template.
   // https://github.com/Hanks10100/weex-native-directive/tree/master/component
+  /* istanbul ignore if */
   if (__WEEX__ && isRecyclableComponent(vnode)) {
     return renderRecyclableComponentTemplate(vnode)
   }

src/core/vdom/helpers/update-listeners.js

@@ -54,6 +54,7 @@ export function updateListeners (
     def = cur = on[name]
     old = oldOn[name]
     event = normalizeEvent(name)
+    /* istanbul ignore if */
     if (__WEEX__ && isPlainObject(def)) {
       cur = def.handler
       event.params = def.params

src/platforms/web/compiler/modules/model.js

@@ -11,6 +11,7 @@
  */
 
 import {
+  addRawAttr,
   getBindingAttr,
   getAndRemoveAttr
 } from 'compiler/helpers'
@@ -77,11 +78,6 @@ function cloneASTElement (el) {
   return createASTElement(el.tag, el.attrsList.slice(), el.parent)
 }
 
-function addRawAttr (el, name, value) {
-  el.attrsMap[name] = value
-  el.attrsList.push({ name, value })
-}
-
 export default {
   preTransformNode
 }

src/platforms/weex/compiler/index.js

@@ -12,7 +12,7 @@ import {
   isReservedTag,
   canBeLeftOpenTag,
   getTagNamespace
-} from '../util/index'
+} from '../util/element'
 
 export const baseOptions: WeexCompilerOptions = {
   modules,

src/platforms/weex/runtime/index.js

@@ -12,7 +12,7 @@ import {
   isReservedTag,
   isRuntimeComponent,
   isUnknownElement
-} from 'weex/util/index'
+} from 'weex/util/element'
 
 // install platform specific utils
 Vue.config.mustUseProp = mustUseProp

src/platforms/weex/util/element.js

@@ -0,0 +1,52 @@
+/* @flow */
+
+// These util functions are split into its own file because Rollup cannot drop
+// makeMap() due to potential side effects, so these variables end up
+// bloating the web builds.
+
+import { makeMap } from 'shared/util'
+
+export const isReservedTag = makeMap(
+  'template,script,style,element,content,slot,link,meta,svg,view,' +
+  'a,div,img,image,text,span,input,switch,textarea,spinner,select,' +
+  'slider,slider-neighbor,indicator,canvas,' +
+  'list,cell,header,loading,loading-indicator,refresh,scrollable,scroller,' +
+  'video,web,embed,tabbar,tabheader,datepicker,timepicker,marquee,countdown',
+  true
+)
+
+// Elements that you can, intentionally, leave open (and which close themselves)
+// more flexible than web
+export const canBeLeftOpenTag = makeMap(
+  'web,spinner,switch,video,textarea,canvas,' +
+  'indicator,marquee,countdown',
+  true
+)
+
+export const isRuntimeComponent = makeMap(
+  'richtext,transition,transition-group',
+  true
+)
+
+export const isUnaryTag = makeMap(
+  'embed,img,image,input,link,meta',
+  true
+)
+
+export function mustUseProp (tag: string, type: ?string, name: string): boolean {
+  return false
+}
+
+export function getTagNamespace (tag?: string): string | void { }
+
+export function isUnknownElement (tag?: string): boolean {
+  return false
+}
+
+export function query (el: string | Element, document: Object) {
+  // document is injected by weex factory wrapper
+  const placeholder = document.createComment('root')
+  placeholder.hasAttribute = placeholder.removeAttribute = function () {} // hack for patch
+  document.documentElement.appendChild(placeholder)
+  return placeholder
+}

src/platforms/weex/util/index.js

@@ -1,56 +1,10 @@
 /* @flow */
 declare var document: Object;
 
-import { makeMap } from 'shared/util'
 import { warn } from 'core/util/index'
 
 export const RECYCLE_LIST_MARKER = '@inRecycleList'
 
-export const isReservedTag = makeMap(
-  'template,script,style,element,content,slot,link,meta,svg,view,' +
-  'a,div,img,image,text,span,input,switch,textarea,spinner,select,' +
-  'slider,slider-neighbor,indicator,canvas,' +
-  'list,cell,header,loading,loading-indicator,refresh,scrollable,scroller,' +
-  'video,web,embed,tabbar,tabheader,datepicker,timepicker,marquee,countdown',
-  true
-)
-
-// Elements that you can, intentionally, leave open (and which close themselves)
-// more flexible than web
-export const canBeLeftOpenTag = makeMap(
-  'web,spinner,switch,video,textarea,canvas,' +
-  'indicator,marquee,countdown',
-  true
-)
-
-export const isRuntimeComponent = makeMap(
-  'richtext,transition,transition-group',
-  true
-)
-
-export const isUnaryTag = makeMap(
-  'embed,img,image,input,link,meta',
-  true
-)
-
-export function mustUseProp (tag: string, type: ?string, name: string): boolean {
-  return false
-}
-
-export function getTagNamespace (tag?: string): string | void { }
-
-export function isUnknownElement (tag?: string): boolean {
-  return false
-}
-
-export function query (el: string | Element, document: Object) {
-  // document is injected by weex factory wrapper
-  const placeholder = document.createComment('root')
-  placeholder.hasAttribute = placeholder.removeAttribute = function () {} // hack for patch
-  document.documentElement.appendChild(placeholder)
-  return placeholder
-}
-
 // Register the component hook to weex native render engine.
 // The hook will be triggered by native, not javascript.
 export function registerComponentHook (

test/unit/karma.cover.config.js

@@ -24,7 +24,8 @@ module.exports = function (config) {
         'test/',
         'src/compiler/parser/html-parser.js',
         'src/core/instance/proxy.js',
-        'src/sfc/deindent.js'
+        'src/sfc/deindent.js',
+        'src/platforms/weex/'
       ]
     }]]
   }