[build] 2.0.0-alpha.1

Author: yyx990803

dist/vue.common.js

@@ -179,12 +179,6 @@ function genStaticKeys(modules) {
 }
 
 var config = {
-
-  /**
-   * Preserve whitespaces between elements.
-   */
-  preserveWhitespace: true,
-
   /**
    * Option merge strategies (used in core/util/options)
    */
@@ -399,7 +393,8 @@ var proxyHandlers = void 0;
 var initProxy = void 0;
 if (process.env.NODE_ENV !== 'production') {
   (function () {
-    var allowedGlobals = makeMap('Infinity,undefined,NaN,isFinite,isNaN,' + 'parseFloat,parseInt,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,' + 'Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl');
+    var allowedGlobals = makeMap('Infinity,undefined,NaN,isFinite,isNaN,' + 'parseFloat,parseInt,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,' + 'Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl,' + 'require,__webpack_require__' // for Webpack/Browserify
+    );
 
     hasProxy = typeof Proxy !== 'undefined' && Proxy.toString().match(/native code/);
 
@@ -620,10 +615,11 @@ var Watcher = function () {
         if (config.errorHandler) {
           config.errorHandler.call(null, e, this.vm);
         } else {
-          warn(e.stack);
+          throw e;
         }
       }
       // return old value when evaluation fails so the current UI is preserved
+      // if the error was somehow handled by user
       value = this.value;
     }
     // "touch" every property so they are all tracked as
@@ -1304,9 +1300,9 @@ var VNode = function () {
   return VNode;
 }();
 
-var emptyVNode = new VNode(undefined, undefined, undefined, '');
-
-var whitespace = new VNode(undefined, undefined, undefined, ' ');
+var emptyVNode = function emptyVNode() {
+  return new VNode(undefined, undefined, undefined, '');
+};
 
 function normalizeChildren(children) {
   // invoke children thunks.
@@ -1326,13 +1322,8 @@ function normalizeChildren(children) {
       if (Array.isArray(c)) {
         res.push.apply(res, normalizeChildren(c));
       } else if (isPrimitive(c)) {
-        // optimize whitespace
-        if (c === ' ') {
-          res.push(whitespace);
-        } else {
-          // convert primitive to vnode
-          res.push(new VNode(undefined, undefined, undefined, c));
-        }
+        // convert primitive to vnode
+        res.push(new VNode(undefined, undefined, undefined, c));
       } else if (c instanceof VNode) {
         res.push(c);
       }
@@ -1420,9 +1411,7 @@ function lifecycleMixin(Vue) {
     var vm = this;
     vm.$el = el;
     if (!vm.$options.render) {
-      vm.$options.render = function () {
-        return emptyVNode;
-      };
+      vm.$options.render = emptyVNode;
       if (process.env.NODE_ENV !== 'production') {
         /* istanbul ignore if */
         if (vm.$options.template) {
@@ -1799,7 +1788,7 @@ function renderElement(tag, data, namespace) {
   }
   if (!tag) {
     // in case of component :is set to falsy value
-    return emptyVNode;
+    return emptyVNode();
   }
   if (typeof tag === 'string') {
     var Ctor = void 0;
@@ -1853,19 +1842,24 @@ function renderMixin(Vue) {
 
   Vue.prototype._render = function () {
     var vm = this;
+
+    // set current active instance
     var prev = renderState.activeInstance;
     renderState.activeInstance = vm;
-    if (!vm._isMounted) {
-      // render static sub-trees for once on initial render
-      renderStaticTrees(vm);
-    }
+
     var _vm$$options = vm.$options;
     var render = _vm$$options.render;
+    var staticRenderFns = _vm$$options.staticRenderFns;
     var _renderChildren = _vm$$options._renderChildren;
     var _parentVnode = _vm$$options._parentVnode;
+
+
+    if (staticRenderFns && !vm._staticTrees) {
+      // render static sub-trees for once on initial render
+      renderStaticTrees(vm, staticRenderFns);
+    }
     // resolve slots. becaues slots are rendered in parent scope,
     // we set the activeInstance to parent.
-
     if (_renderChildren) {
       resolveSlots(vm, _renderChildren);
     }
@@ -1876,7 +1870,7 @@ function renderMixin(Vue) {
       if (process.env.NODE_ENV !== 'production' && Array.isArray(vnode)) {
         warn('Multiple root nodes returned from render function. Render function ' + 'should return a single root node.', vm);
       }
-      vnode = emptyVNode;
+      vnode = emptyVNode();
     }
     // set parent
     vnode.parent = _parentVnode;
@@ -1949,13 +1943,10 @@ function renderMixin(Vue) {
   };
 }
 
-function renderStaticTrees(vm) {
-  var staticRenderFns = vm.$options.staticRenderFns;
-  if (staticRenderFns) {
-    var trees = vm._staticTrees = new Array(staticRenderFns.length);
-    for (var i = 0; i < staticRenderFns.length; i++) {
-      trees[i] = staticRenderFns[i].call(vm._renderProxy);
-    }
+function renderStaticTrees(vm, fns) {
+  var trees = vm._staticTrees = new Array(fns.length);
+  for (var i = 0; i < fns.length; i++) {
+    trees[i] = fns[i].call(vm._renderProxy);
   }
 }
 
@@ -2680,7 +2671,7 @@ function initAssetRegisters(Vue) {
           }
         }
         if (type === 'component' && isPlainObject(definition)) {
-          definition.name = id;
+          definition.name = definition.name || id;
           definition = Vue.extend(definition);
         }
         this.options[type + 's'][id] = definition;
@@ -2764,7 +2755,7 @@ Object.defineProperty(Vue.prototype, '$isServer', {
   }
 });
 
-Vue.version = '2.0.0-alpha.0';
+Vue.version = '2.0.0-alpha.1';
 
 // attributes that should be using props for binding
 var mustUseProp = makeMap('value,selected,checked,muted');
@@ -2958,6 +2949,10 @@ function childNodes(node) {
   return node.childNodes;
 }
 
+function setAttribute(node, key, val) {
+  node.setAttribute(key, val);
+}
+
 var nodeOps = Object.freeze({
   createElement: createElement,
   createElementNS: createElementNS,
@@ -2969,7 +2964,8 @@ var nodeOps = Object.freeze({
   nextSibling: nextSibling,
   tagName: tagName,
   setTextContent: setTextContent,
-  childNodes: childNodes
+  childNodes: childNodes,
+  setAttribute: setAttribute
 });
 
 var emptyNode = new VNode('', {}, []);
@@ -3045,13 +3041,15 @@ function createPatchFunction(backend) {
       // in that case we can just return the element and be done.
       if (isDef(i = vnode.child)) {
         invokeCreateHooks(vnode, insertedVnodeQueue);
+        setScope(vnode);
         return vnode.elm;
       }
     }
     var children = vnode.children;
     var tag = vnode.tag;
     if (isDef(tag)) {
       elm = vnode.elm = vnode.ns ? nodeOps.createElementNS(vnode.ns, tag) : nodeOps.createElement(tag);
+      setScope(vnode);
       if (Array.isArray(children)) {
         for (i = 0; i < children.length; ++i) {
           nodeOps.appendChild(elm, createElm(children[i], insertedVnodeQueue));
@@ -3079,6 +3077,16 @@ function createPatchFunction(backend) {
     }
   }
 
+  // set scope id attribute for scoped CSS.
+  // this is implemented as a special case to avoid the overhead
+  // of going through the normal attribute patching process.
+  function setScope(vnode) {
+    var i = void 0;
+    if (isDef(i = vnode.context) && isDef(i = i.$options._scopeId)) {
+      nodeOps.setAttribute(vnode.elm, i, '');
+    }
+  }
+
   function addVnodes(parentElm, before, vnodes, startIdx, endIdx, insertedVnodeQueue) {
     for (; startIdx <= endIdx; ++startIdx) {
       nodeOps.insertBefore(parentElm, createElm(vnodes[startIdx], insertedVnodeQueue), before);
@@ -3222,6 +3230,7 @@ function createPatchFunction(backend) {
   }
 
   function patchVnode(oldVnode, vnode, insertedVnodeQueue) {
+    if (oldVnode === vnode) return;
     var i = void 0,
         hook = void 0;
     if (isDef(i = vnode.data) && isDef(hook = i.hook) && isDef(i = hook.prepatch)) {
@@ -3230,7 +3239,6 @@ function createPatchFunction(backend) {
     var elm = vnode.elm = oldVnode.elm;
     var oldCh = oldVnode.children;
     var ch = vnode.children;
-    if (oldVnode === vnode) return;
     if (isDef(vnode.data)) {
       for (i = 0; i < cbs.update.length; ++i) {
         cbs.update[i](oldVnode, vnode);