Merge branch 'dev' of https://github.com/vuejs/vue into dev

* 'dev' of https://github.com/vuejs/vue:
  remove env vars from npm scripts
  also catch error in data() (close vuejs#5198)
  always use uid when calling performance.mark (fix vuejs#5209)

Author: awamwang

benchmarks/ssr/renderToStream.js

@@ -2,6 +2,8 @@
 
 'use strict'
 
+process.env.NODE_ENV = 'production'
+
 const Vue = require('../../dist/vue.runtime.common.js')
 const createRenderer = require('../../packages/vue-server-renderer').createRenderer
 const renderToStream = createRenderer().renderToStream

benchmarks/ssr/renderToString.js

@@ -1,5 +1,7 @@
 'use strict'
 
+process.env.NODE_ENV = 'production'
+
 const Vue = require('../../dist/vue.runtime.common.js')
 const createRenderer = require('../../packages/vue-server-renderer').createRenderer
 const renderToString = createRenderer().renderToString

build/karma.base.config.js

@@ -19,8 +19,8 @@ var webpackConfig = {
       __WEEX__: false,
       'process.env': {
         NODE_ENV: '"development"',
-        TRANSITION_DURATION: process.env.SAUCE ? 500 : 50,
-        TRANSITION_BUFFER: process.env.SAUCE ? 50 : 10
+        TRANSITION_DURATION: 50,
+        TRANSITION_BUFFER: 10
       }
     })
   ],

build/karma.sauce.config.js

@@ -1,5 +1,18 @@
+var webpack = require('webpack')
 var base = require('./karma.base.config.js')
 
+base.webpack.plugins = [
+  new webpack.DefinePlugin({
+    __WEEX__: false,
+    'process.env': {
+      NODE_ENV: '"development"',
+      // sauce lab vms are slow!
+      TRANSITION_DURATION: 500,
+      TRANSITION_BUFFER: 50
+    }
+  })
+]
+
 /**
  * Having too many tests running concurrently on saucelabs
  * causes timeouts and errors, so we have to run them in

package.json

@@ -12,13 +12,13 @@
     "types/*.d.ts"
   ],
   "scripts": {
-    "dev": "TARGET=web-full-dev rollup -w -c build/config.js",
-    "dev:cjs": "TARGET=web-runtime-cjs rollup -w -c build/config.js",
+    "dev": "rollup -w -c build/config.js --environment TARGET:web-full-dev",
+    "dev:cjs": "rollup -w -c build/config.js --environment TARGET:web-runtime-cjs",
     "dev:test": "karma start build/karma.dev.config.js",
-    "dev:ssr": "TARGET=web-server-renderer rollup -w -c build/config.js",
-    "dev:compiler": "TARGET=web-compiler rollup -w -c build/config.js",
-    "dev:weex": "TARGET=weex-framework rollup -w -c build/config.js",
-    "dev:weex:compiler": "TARGET=weex-compiler rollup -w -c build/config.js",
+    "dev:ssr": "rollup -w -c build/config.js --environment TARGET:web-server-renderer",
+    "dev:compiler": "rollup -w -c build/config.js --environment TARGET:web-compiler ",
+    "dev:weex": "rollup -w -c build/config.js --environment TARGET:weex-framework ",
+    "dev:weex:compiler": "rollup -w -c build/config.js --environment TARGET:weex-compiler ",
     "build": "node build/build.js",
     "build:ssr": "npm run build -- vue.runtime.common.js,vue-server-renderer",
     "build:weex": "npm run build -- weex-vue-framework,weex-template-compiler",
@@ -32,8 +32,8 @@
     "test:types": "tsc -p ./types/test/tsconfig.json",
     "lint": "eslint src build test",
     "flow": "flow check",
-    "sauce": "SAUCE=true karma start build/karma.sauce.config.js",
-    "bench:ssr": "npm run build:ssr && NODE_ENV=production node benchmarks/ssr/renderToString.js && NODE_ENV=production VUE_ENV=server node benchmarks/ssr/renderToStream.js",
+    "sauce": "karma start build/karma.sauce.config.js",
+    "bench:ssr": "npm run build:ssr && node benchmarks/ssr/renderToString.js && node benchmarks/ssr/renderToStream.js",
     "release": "bash build/release.sh",
     "release:weex": "bash build/release-weex.sh",
     "install:hooks": "ln -fs ../../build/git-hooks/pre-commit .git/hooks/pre-commit"

src/core/instance/init.js

@@ -15,14 +15,18 @@ let uid = 0
 // [wangnew2013]:2017-02-16 16:20:37 Vue是一个节点类型为Component的树
 export function initMixin (Vue: Class<Component>) {
   Vue.prototype._init = function (options?: Object) {
+    const vm: Component = this
+    // a uid
+    vm._uid = uid++
+
     /* istanbul ignore if */
+    let startTag, endTag
     if (process.env.NODE_ENV !== 'production' && config.performance && mark) {
-      mark('vue-perf-init')
+      startTag = `vue-perf-init:${vm._uid}`
+      endTag = `vue-perf-end:${vm._uid}`
+      mark(startTag)
     }
 
-    const vm: Component = this
-    // a uid
-    vm._uid = uid++
     // a flag to avoid this being observed
     vm._isVue = true
     // merge options
@@ -58,8 +62,8 @@ export function initMixin (Vue: Class<Component>) {
     /* istanbul ignore if */
     if (process.env.NODE_ENV !== 'production' && config.performance && mark) {
       vm._name = formatComponentName(vm, false)
-      mark('vue-perf-init-end')
-      measure(`${vm._name} init`, 'vue-perf-init', 'vue-perf-init-end')
+      mark(endTag)
+      measure(`${vm._name} init`, startTag, endTag)
     }
 
     if (vm.$options.el) {

src/core/instance/state.js

@@ -7,18 +7,19 @@ import {
   set,
   del,
   observe,
-  defineReactive,
-  observerState
+  observerState,
+  defineReactive
 } from '../observer/index'
 
 import {
   warn,
+  bind,
+  noop,
   hasOwn,
   isReserved,
-  isPlainObject,
-  bind,
+  handleError,
   validateProp,
-  noop
+  isPlainObject
 } from '../util/index'
 
 const sharedPropertyDefinition = {
@@ -101,7 +102,7 @@ function initProps (vm: Component, propsOptions: Object) {
 function initData (vm: Component) {
   let data = vm.$options.data
   data = vm._data = typeof data === 'function'
-    ? data.call(vm)
+    ? getData(data, vm)
     : data || {}
   if (!isPlainObject(data)) {
     data = {}
@@ -130,6 +131,15 @@ function initData (vm: Component) {
   observe(data, true /* asRootData */)
 }
 
+function getData (data: Function, vm: Component): any {
+  try {
+    return data.call(vm)
+  } catch (e) {
+    handleError(e, vm, `data()`)
+    return {}
+  }
+}
+
 const computedWatcherOptions = { lazy: true }
 
 function initComputed (vm: Component, computed: Object) {

test/unit/features/error-handling.spec.js

@@ -7,6 +7,7 @@ describe('Error handling', () => {
   // hooks that prevents the component from rendering, but should not
   // break parent component
   ;[
+    ['data', 'data()'],
     ['render', 'render function'],
     ['beforeCreate', 'beforeCreate hook'],
     ['created', 'created hook'],
@@ -128,6 +129,16 @@ describe('Error handling', () => {
 function createErrorTestComponents () {
   const components = {}
 
+  // data
+  components.data = {
+    data () {
+      throw new Error('data')
+    },
+    render (h) {
+      return h('div')
+    }
+  }
+
   // render error
   components.render = {
     render (h) {