tweak build + upgrade flow

Author: yyx990803

build/config.js

@@ -77,14 +77,14 @@ const builds = {
     entry: path.resolve(__dirname, '../src/entries/web-compiler.js'),
     dest: path.resolve(__dirname, '../packages/vue-template-compiler/build.js'),
     format: 'cjs',
-    external: ['he', 'de-indent']
+    external: Object.keys(require('../packages/vue-template-compiler/package.json').dependencies)
   },
   // Web server renderer (CommonJS).
   'web-server-renderer': {
     entry: path.resolve(__dirname, '../src/entries/web-server-renderer.js'),
     dest: path.resolve(__dirname, '../packages/vue-server-renderer/build.js'),
     format: 'cjs',
-    external: ['he', 'de-indent', 'source-map']
+    external: Object.keys(require('../packages/vue-server-renderer/package.json').dependencies)
   },
   // Weex runtime factory
   'weex-factory': {
@@ -107,7 +107,7 @@ const builds = {
     entry: path.resolve(__dirname, '../src/entries/weex-compiler.js'),
     dest: path.resolve(__dirname, '../packages/weex-template-compiler/build.js'),
     format: 'cjs',
-    external: ['he', 'de-indent']
+    external: Object.keys(require('../packages/weex-template-compiler/package.json').dependencies)
   }
 }
 

flow/modules.js

@@ -29,3 +29,14 @@ declare module 'de-indent' {
     (input: string): string
   }
 }
+
+declare module 'vue-ssr-html-stream' {
+  declare interface HTMLStreamOptions {
+    template: string;
+    context: Object;
+  }
+  declare class HTMLStream extends stream$Transform {
+    constructor(options: HTMLStreamOptions): void;
+  }
+  declare module.exports: HTMLStream
+}

package.json

@@ -81,7 +81,7 @@
     "eslint-plugin-flowtype": "^2.16.0",
     "eslint-plugin-jasmine": "^2.1.0",
     "eslint-plugin-vue": "^1.0.0",
-    "flow-bin": "^0.33.0",
+    "flow-bin": "^0.39.0",
     "he": "^1.1.0",
     "http-server": "^0.9.0",
     "jasmine": "^2.5.2",

src/core/global-api/use.js

@@ -13,7 +13,7 @@ export function initUse (Vue: GlobalAPI) {
     args.unshift(this)
     if (typeof plugin.install === 'function') {
       plugin.install.apply(plugin, args)
-    } else {
+    } else if (typeof plugin === 'function') {
       plugin.apply(null, args)
     }
     plugin.installed = true

src/platforms/web/runtime/class-util.js

@@ -4,7 +4,7 @@
  * Add class with compatibility for SVG since classList is not supported on
  * SVG elements in IE
  */
-export function addClass (el: Element, cls: ?string) {
+export function addClass (el: HTMLElement, cls: ?string) {
   /* istanbul ignore if */
   if (!cls || !(cls = cls.trim())) {
     return
@@ -18,7 +18,7 @@ export function addClass (el: Element, cls: ?string) {
       el.classList.add(cls)
     }
   } else {
-    const cur = ' ' + el.getAttribute('class') + ' '
+    const cur = ` ${el.getAttribute('class') || ''} `
     if (cur.indexOf(' ' + cls + ' ') < 0) {
       el.setAttribute('class', (cur + cls).trim())
     }
@@ -29,7 +29,7 @@ export function addClass (el: Element, cls: ?string) {
  * Remove class with compatibility for SVG since classList is not supported on
  * SVG elements in IE
  */
-export function removeClass (el: Element, cls: ?string) {
+export function removeClass (el: HTMLElement, cls: ?string) {
   /* istanbul ignore if */
   if (!cls || !(cls = cls.trim())) {
     return
@@ -43,7 +43,7 @@ export function removeClass (el: Element, cls: ?string) {
       el.classList.remove(cls)
     }
   } else {
-    let cur = ' ' + el.getAttribute('class') + ' '
+    let cur = ` ${el.getAttribute('class') || ''} `
     const tar = ' ' + cls + ' '
     while (cur.indexOf(tar) >= 0) {
       cur = cur.replace(tar, ' ')

src/platforms/web/runtime/components/transition-group.js

@@ -101,7 +101,8 @@ export default {
     children.forEach(applyTranslation)
 
     // force reflow to put everything in position
-    const f = document.body.offsetHeight // eslint-disable-line
+    const body: any = document.body
+    const f = body.offsetHeight // eslint-disable-line
 
     children.forEach(c => {
       if (c.data.moved) {

src/platforms/web/util/index.js

@@ -11,14 +11,15 @@ export * from './element'
  */
 export function query (el: string | Element): Element {
   if (typeof el === 'string') {
-    const selector = el
-    el = document.querySelector(el)
-    if (!el) {
+    const selected = document.querySelector(el)
+    if (!selected) {
       process.env.NODE_ENV !== 'production' && warn(
-        'Cannot find element: ' + selector
+        'Cannot find element: ' + el
       )
       return document.createElement('div')
     }
+    return selected
+  } else {
+    return el
   }
-  return el
 }

src/server/create-bundle-renderer.js

@@ -24,8 +24,12 @@ type RenderBundle = {
 };
 
 export function createBundleRendererCreator (createRenderer: () => Renderer) {
-  return (bundle: string | RenderBundle, rendererOptions?: RenderOptions) => {
+  return function createBundleRenderer (
+    bundle: string | RenderBundle,
+    rendererOptions?: RenderOptions
+  ) {
     const renderer = createRenderer(rendererOptions)
+
     let files, entry, maps
     if (typeof bundle === 'object') {
       entry = bundle.entry
@@ -60,6 +64,7 @@ export function createBundleRendererCreator (createRenderer: () => Renderer) {
           }
         })
       },
+
       renderToStream: (context?: Object) => {
         const res = new PassThrough()
         evaluate(context).catch(err => {
@@ -79,6 +84,7 @@ export function createBundleRendererCreator (createRenderer: () => Renderer) {
             renderStream.pipe(res)
           }
         })
+
         return res
       }
     }

src/server/create-renderer.js

@@ -9,11 +9,18 @@ export type Renderer = {
   renderToStream: (component: Component) => RenderStream;
 };
 
+type RenderCache = {
+  get: (key: string, cb?: Function) => string | void;
+  set: (key: string, val: string) => void;
+  has?: (key: string, cb?: Function) => boolean | void;
+};
+
 export type RenderOptions = {
-  modules: Array<Function>,
-  directives: Object,
-  isUnaryTag: Function,
-  cache: ?Object
+  modules?: Array<(vnode: VNode) => string>;
+  directives?: Object;
+  isUnaryTag?: Function;
+  cache?: RenderCache;
+  template?: string;
 };
 
 export function createRenderer ({

yarn.lock

@@ -2093,9 +2093,9 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
-flow-bin@^0.33.0:
-  version "0.33.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.33.0.tgz#ef011eace7a6100f1ae08b852db78279032b8750"
+flow-bin@^0.39.0:
+  version "0.39.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.39.0.tgz#b1012a14460df1aa79d3a728e10f93c6944226d0"
 
 flow-remove-types-no-whitespace@^1.0.3:
   version "1.0.5"