Merge branch 'ssr-optimize' into dev

Author: yyx990803

benchmarks/ssr/renderToString.js

@@ -11,7 +11,9 @@ console.log('--- renderToString --- ')
 const self = (global || root)
 self.s = self.performance.now()
 
-renderToString(new Vue(gridComponent), () => {
+renderToString(new Vue(gridComponent), (err, res) => {
+  if (err) throw err
+  // console.log(res)
   console.log('Complete time: ' + (self.performance.now() - self.s).toFixed(2) + 'ms')
   console.log()
 })

build/alias.js

@@ -1,7 +1,7 @@
 const path = require('path')
 
 module.exports = {
-  vue: path.resolve(__dirname, '../src/platforms/web/runtime-with-compiler'),
+  vue: path.resolve(__dirname, '../src/platforms/web/entry-runtime-with-compiler'),
   compiler: path.resolve(__dirname, '../src/compiler'),
   core: path.resolve(__dirname, '../src/core'),
   shared: path.resolve(__dirname, '../src/shared'),

build/config.js

@@ -35,14 +35,14 @@ const resolve = p => {
 const builds = {
   // Runtime only (CommonJS). Used by bundlers e.g. Webpack & Browserify
   'web-runtime-cjs': {
-    entry: resolve('web/runtime.js'),
+    entry: resolve('web/entry-runtime.js'),
     dest: resolve('dist/vue.runtime.common.js'),
     format: 'cjs',
     banner
   },
   // Runtime+compiler CommonJS build (CommonJS)
   'web-full-cjs': {
-    entry: resolve('web/runtime-with-compiler.js'),
+    entry: resolve('web/entry-runtime-with-compiler.js'),
     dest: resolve('dist/vue.common.js'),
     format: 'cjs',
     alias: { he: './entity-decoder' },
@@ -51,38 +51,38 @@ const builds = {
   // Runtime only (ES Modules). Used by bundlers that support ES Modules,
   // e.g. Rollup & Webpack 2
   'web-runtime-esm': {
-    entry: resolve('web/runtime.js'),
+    entry: resolve('web/entry-runtime.js'),
     dest: resolve('dist/vue.runtime.esm.js'),
     format: 'es',
     banner
   },
   // Runtime+compiler CommonJS build (ES Modules)
   'web-full-esm': {
-    entry: resolve('web/runtime-with-compiler.js'),
+    entry: resolve('web/entry-runtime-with-compiler.js'),
     dest: resolve('dist/vue.esm.js'),
     format: 'es',
     alias: { he: './entity-decoder' },
     banner
   },
   // runtime-only build (Browser)
   'web-runtime-dev': {
-    entry: resolve('web/runtime.js'),
+    entry: resolve('web/entry-runtime.js'),
     dest: resolve('dist/vue.runtime.js'),
     format: 'umd',
     env: 'development',
     banner
   },
   // runtime-only production build (Browser)
   'web-runtime-prod': {
-    entry: resolve('web/runtime.js'),
+    entry: resolve('web/entry-runtime.js'),
     dest: resolve('dist/vue.runtime.min.js'),
     format: 'umd',
     env: 'production',
     banner
   },
   // Runtime+compiler development build (Browser)
   'web-full-dev': {
-    entry: resolve('web/runtime-with-compiler.js'),
+    entry: resolve('web/entry-runtime-with-compiler.js'),
     dest: resolve('dist/vue.js'),
     format: 'umd',
     env: 'development',
@@ -91,7 +91,7 @@ const builds = {
   },
   // Runtime+compiler production build  (Browser)
   'web-full-prod': {
-    entry: resolve('web/runtime-with-compiler.js'),
+    entry: resolve('web/entry-runtime-with-compiler.js'),
     dest: resolve('dist/vue.min.js'),
     format: 'umd',
     env: 'production',
@@ -100,14 +100,14 @@ const builds = {
   },
   // Web compiler (CommonJS).
   'web-compiler': {
-    entry: resolve('web/compiler.js'),
+    entry: resolve('web/entry-compiler.js'),
     dest: resolve('packages/vue-template-compiler/build.js'),
     format: 'cjs',
     external: Object.keys(require('../packages/vue-template-compiler/package.json').dependencies)
   },
   // Web server renderer (CommonJS).
   'web-server-renderer': {
-    entry: resolve('web/server-renderer.js'),
+    entry: resolve('web/entry-server-renderer.js'),
     dest: resolve('packages/vue-server-renderer/build.js'),
     format: 'cjs',
     external: Object.keys(require('../packages/vue-server-renderer/package.json').dependencies)
@@ -127,22 +127,22 @@ const builds = {
   // Weex runtime factory
   'weex-factory': {
     weex: true,
-    entry: resolve('weex/runtime-factory.js'),
+    entry: resolve('weex/entry-runtime-factory.js'),
     dest: resolve('packages/weex-vue-framework/factory.js'),
     format: 'cjs',
     plugins: [weexFactoryPlugin]
   },
   // Weex runtime framework (CommonJS).
   'weex-framework': {
     weex: true,
-    entry: resolve('weex/framework.js'),
+    entry: resolve('weex/entry-framework.js'),
     dest: resolve('packages/weex-vue-framework/index.js'),
     format: 'cjs'
   },
   // Weex compiler (CommonJS). Used by Weex's Webpack loader.
   'weex-compiler': {
     weex: true,
-    entry: resolve('weex/compiler.js'),
+    entry: resolve('weex/entry-compiler.js'),
     dest: resolve('packages/weex-template-compiler/build.js'),
     format: 'cjs',
     external: Object.keys(require('../packages/weex-template-compiler/package.json').dependencies)

flow/compiler.js

@@ -16,22 +16,21 @@ declare type CompilerOptions = {
   shouldDecodeTags?: boolean;
   shouldDecodeNewlines?: boolean;
 
+  // for ssr optimization compiler
+  scopeId?: string;
+
   // runtime user-configurable
   delimiters?: [string, string]; // template delimiters
-}
+};
 
 declare type CompiledResult = {
   ast: ?ASTElement;
   render: string;
   staticRenderFns: Array<string>;
+  stringRenderFns?: Array<string>;
   errors?: Array<string>;
   tips?: Array<string>;
-}
-
-declare type CompiledFunctionResult = {
-  render: Function;
-  staticRenderFns: Array<Function>;
-}
+};
 
 declare type ModuleOptions = {
   preTransformNode: (el: ASTElement) => void;
@@ -40,29 +39,29 @@ declare type ModuleOptions = {
   genData: (el: ASTElement) => string; // generate extra data string for an element
   transformCode?: (el: ASTElement, code: string) => string; // further transform generated code for an element
   staticKeys?: Array<string>; // AST properties to be considered static
-}
+};
 
-declare type ASTModifiers = { [key: string]: boolean }
-declare type ASTIfConditions = Array<{ exp: ?string; block: ASTElement }>
+declare type ASTModifiers = { [key: string]: boolean };
+declare type ASTIfConditions = Array<{ exp: ?string; block: ASTElement }>;
 
 declare type ASTElementHandler = {
   value: string;
   modifiers: ?ASTModifiers;
-}
+};
 
 declare type ASTElementHandlers = {
   [key: string]: ASTElementHandler | Array<ASTElementHandler>;
-}
+};
 
 declare type ASTDirective = {
   name: string;
   rawName: string;
   value: string;
   arg: ?string;
   modifiers: ?ASTModifiers;
-}
+};
 
-declare type ASTNode = ASTElement | ASTText | ASTExpression
+declare type ASTNode = ASTElement | ASTText | ASTExpression;
 
 declare type ASTElement = {
   type: 1;
@@ -132,22 +131,29 @@ declare type ASTElement = {
   onceProcessed?: boolean;
   wrapData?: (code: string) => string;
 
+  // 2.4 ssr optimization
+  ssrOptimizability?: number;
+
   // weex specific
   appendAsTree?: boolean;
-}
+};
 
 declare type ASTExpression = {
   type: 2;
   expression: string;
   text: string;
   static?: boolean;
-}
+  // 2.4 ssr optimization
+  ssrOptimizability?: number;
+};
 
 declare type ASTText = {
   type: 3;
   text: string;
   static?: boolean;
-}
+  // 2.4 ssr optimization
+  ssrOptimizability?: number;
+};
 
 // SFC-parser related declarations
 
@@ -166,7 +172,7 @@ declare type SFCCustomBlock = {
   end?: number;
   src?: string;
   attrs: {[attribute:string]: string};
-}
+};
 
 declare type SFCBlock = {
   type: string;
@@ -177,4 +183,4 @@ declare type SFCBlock = {
   src?: string;
   scoped?: boolean;
   module?: string | boolean;
-}
+};

flow/component.js

@@ -108,6 +108,16 @@ declare interface Component {
   // resolve scoped slots
   _u: (scopedSlots: ScopedSlotsData, res?: Object) => { [key: string]: Function };
 
+  // SSR specific
+  _ssrNode: Function;
+  _ssrList: Function;
+  _ssrEscape: Function;
+  _ssrAttr: Function;
+  _ssrAttrs: Function;
+  _ssrDOMProps: Function;
+  _ssrClass: Function;
+  _ssrStyle: Function;
+
   // allow dynamic method registration
   [key: string]: any
-}
+};

flow/global-api.js

@@ -18,4 +18,4 @@ declare interface GlobalAPI {
 
   // allow dynamic method registration
   [key: string]: any
-}
+};

flow/options.js

@@ -10,7 +10,7 @@ declare type InternalComponentOptions = {
   _refElm: ?Node;
   render?: Function;
   staticRenderFns?: Array<Function>
-}
+};
 
 declare type ComponentOptions = {
   // data
@@ -80,7 +80,7 @@ declare type ComponentOptions = {
   _base: Class<Component>;
   _parentElm: ?Node;
   _refElm: ?Node;
-}
+};
 
 declare type PropOptions = {
   type: Function | Array<Function> | null;

flow/ssr.js

@@ -3,19 +3,19 @@ declare type ComponentWithCacheContext = {
   bufferIndex: number;
   buffer: Array<string>;
   key: string;
-}
+};
 
 declare type ElementContext = {
   type: 'Element';
   children: Array<VNode>;
   rendered: number;
   endTag: string;
   total: number;
-}
+};
 
 declare type ComponentContext = {
   type: 'Component';
   prevActive: Component;
-}
+};
 
-declare type RenderState = ComponentContext | ComponentWithCacheContext | ElementContext
+declare type RenderState = ComponentContext | ComponentWithCacheContext | ElementContext;

flow/vnode.js

@@ -1,20 +1,20 @@
-declare type VNodeChildren = Array<?VNode | string | VNodeChildren> | string
+declare type VNodeChildren = Array<?VNode | string | VNodeChildren> | string;
 
 declare type VNodeComponentOptions = {
   Ctor: Class<Component>;
   propsData: ?Object;
   listeners: ?Object;
   children: ?Array<VNode>;
   tag?: string;
-}
+};
 
 declare type MountedComponentVNode = {
   context: Component;
   componentOptions: VNodeComponentOptions;
   componentInstance: Component;
   parent: VNode;
   data: VNodeData;
-}
+};
 
 // interface for vnodes in update modules
 declare type VNodeWithData = {
@@ -29,7 +29,7 @@ declare type VNodeWithData = {
   parent?: VNodeWithData;
   componentInstance?: Component;
   isRootInsert: boolean;
-}
+};
 
 declare interface VNodeData {
   key?: string | number;
@@ -61,7 +61,7 @@ declare interface VNodeData {
     value: any;
     callback: Function;
   };
-}
+};
 
 declare type VNodeDirective = {
   name: string;