fix weex merge flow types

Author: yyx990803

Diff for: src/entries/weex-compiler.js

@@ -11,9 +11,10 @@ export function compile (
   options = options || {}
   const errors = []
   // allow injecting modules/directives
+  const baseModules = baseOptions.modules || []
   const modules = options.modules
-    ? baseOptions.modules.concat(options.modules)
-    : baseOptions.modules
+    ? baseModules.concat(options.modules)
+    : baseModules
   const directives = options.directives
     ? extend(extend({}, baseOptions.directives), options.directives)
     : baseOptions.directives

Diff for: src/platforms/weex/compiler/modules/style.js

@@ -19,14 +19,12 @@ function transformNode (el: ASTElement, options: CompilerOptions) {
   const warn = options.warn || baseWarn
   const staticStyle = getAndRemoveAttr(el, 'style')
   const { dynamic, styleResult } = parseStaticStyle(staticStyle, options)
-  if (dynamic) {
-    if (process.env.NODE_ENV !== 'production') {
-      warn(
-        `style="${staticStyle}": ` +
-        'Interpolation inside attributes has been deprecated. ' +
-        'Use v-bind or the colon shorthand instead.'
-      )
-    }
+  if (process.env.NODE_ENV !== 'production' && dynamic) {
+    warn(
+      `style="${String(staticStyle)}": ` +
+      'Interpolation inside attributes has been deprecated. ' +
+      'Use v-bind or the colon shorthand instead.'
+    )
   }
   if (!dynamic && styleResult) {
     el.staticStyle = styleResult
@@ -50,7 +48,7 @@ function genData (el: ASTElement): string {
   return data
 }
 
-function parseStaticStyle (staticStyle?: string, options: CompilerOptions): StaticStyleResult {
+function parseStaticStyle (staticStyle: ?string, options: CompilerOptions): StaticStyleResult {
   // "width: 200px; height: 200px;" -> {width: 200, height: 200}
   // "width: 200px; height: {{y}}" -> {width: 200, height: y}
   let dynamic = false

Diff for: src/platforms/weex/runtime/modules/class.js

@@ -14,16 +14,20 @@ function updateClass (oldVnode: VNodeWithData, vnode: VNodeWithData) {
   }
 
   const oldClassList = []
-  if (oldData.staticClass) {
-    oldClassList.push.apply(oldClassList, oldData.staticClass)
+  // unlike web, weex vnode staticClass is an Array
+  const oldStaticClass: any = oldData.staticClass
+  if (oldStaticClass) {
+    oldClassList.push.apply(oldClassList, oldStaticClass)
   }
   if (oldData.class) {
     oldClassList.push.apply(oldClassList, oldData.class)
   }
 
   const classList = []
-  if (data.staticClass) {
-    classList.push.apply(classList, data.staticClass)
+  // unlike web, weex vnode staticClass is an Array
+  const staticClass: any = data.staticClass
+  if (staticClass) {
+    classList.push.apply(classList, staticClass)
   }
   if (data.class) {
     classList.push.apply(classList, data.class)
@@ -36,7 +40,9 @@ function updateClass (oldVnode: VNodeWithData, vnode: VNodeWithData) {
 }
 
 function getStyle (oldClassList: Array<string>, classList: Array<string>, ctx: Component): Object {
-  const stylesheet = ctx.$options.style || {}
+  // style is a weex-only injected object
+  // compiled from <style> tags in weex files
+  const stylesheet: any = ctx.$options.style || {}
   const result = {}
   classList.forEach(name => {
     const style = stylesheet[name]

Diff for: src/platforms/weex/runtime/modules/style.js

@@ -25,8 +25,8 @@ function updateStyle (oldVnode: VNodeWithData, vnode: VNodeWithData) {
   }
   let cur, name
   const elm = vnode.elm
-  const oldStyle = oldVnode.data.style || {}
-  let style = vnode.data.style || {}
+  const oldStyle: any = oldVnode.data.style || {}
+  let style: any = vnode.data.style || {}
 
   const needClone = style.__ob__