Merge branch 'dev' into tracker-compatibility

Author: mitar

.github/CONTRIBUTING.md

@@ -10,29 +10,7 @@ Hi! I’m really excited that you are interested in contributing to Vue.js. Befo
 
 ## Issue Reporting Guidelines
 
-- The issue list of this repo is **exclusively** for bug reports and feature requests. Non-conforming issues will be closed immediately.
-
-  - For simple beginner questions, you can get quick answers from [The Gitter chat room](https://gitter.im/vuejs/vue).
-
-  - For more complicated questions, you can use [the official forum](http://forum.vuejs.org/) or StackOverflow. Make sure to provide enough information when asking your questions - this makes it easier for others to help you!
-
-- Try to search for your issue, it may have already been answered or even fixed in the development branch.
-
-- Check if the issue is reproducible with the latest stable version of Vue. If you are using a pre-release, please indicate the specific version you are using.
-
-- It is **required** that you clearly describe the steps necessary to reproduce the issue you are running into. Although we would love to help our users as much as possible, diagnosing issues without clear reproduction steps is extremely time-consuming and simply not sustainable.
-
-- Use only the minimum amount of code necessary to reproduce the unexpected behavior. A good bug report should isolate specific methods that exhibit unexpected behavior and precisely define how expectations were violated. What did you expect the method or methods to do, and how did the observed behavior differ? The more precisely you isolate the issue, the faster we can investigate.
-
-- Issues with no clear repro steps will not be triaged. If an issue labeled "need repro" receives no further input from the issue author for more than 5 days, it will be closed.
-
-- It is recommended that you make a JSFiddle/JSBin/Codepen to demonstrate your issue. You could start with [this template](https://jsfiddle.net/39epgLj0/) that already includes the latest version of Vue.
-
-- For potential SSR (Server Side Rendering) issue or bugs that involves build setups, you can create a reproduction repository with steps in the README.
-
-- If your issue is resolved but still open, don’t hesitate to close it. In case you found a solution by yourself, it could be helpful to explain how you fixed it.
-
-- Most importantly, we beg your patience: the team must balance your request against many other responsibilities — fixing other bugs, answering other questions, new features, new documentation, etc. The issue list is not paid support and we cannot make guarantees about how fast your issue can be resolved.
+- Always use [https://new-issue.vuejs.org/](https://new-issue.vuejs.org/) to create new issues.
 
 ## Pull Request Guidelines
 

.github/ISSUE_TEMPLATE.md

@@ -1,48 +1,7 @@
 <!--
-中文用户请注意：
+IMPORTANT: Please use the following link to create a new issue:
 
-1. issue 只接受带重现的 bug 报告，请不要用来提问题！不符合要求的 issue 会被直接关闭。
-2. 请尽量用英文描述你的 issue，这样能够让尽可能多的人帮到你。
+  https://new-issue.vuejs.org/
 
-Got a question?
-===============
-The issue list of this repo is **exclusively** for bug reports and feature requests. For simple questions, please use the following resources:
-
-- Read the docs: https://vuejs.org/guide/
-- Watch video tutorials: https://laracasts.com/series/learning-vue-step-by-step
-- Ask in the Gitter chat room: https://gitter.im/vuejs/vue
-- Ask on the forums: http://forum.vuejs.org/
-- Look for/ask questions on stack overflow: https://stackoverflow.com/questions/ask?tags=vue.js
-
-Reporting a bug?
-================
-- Try to search for your issue, it may have already been answered or even fixed in the development branch.
-
-- Check if the issue is reproducible with the latest stable version of Vue. If you are using a pre-release, please indicate the specific version you are using.
-
-- It is **required** that you clearly describe the steps necessary to reproduce the issue you are running into. Issues with no clear repro steps will not be triaged. If an issue labeled "need repro" receives no further input from the issue author for more than 5 days, it will be closed.
-
-- It is recommended that you make a JSFiddle/JSBin/Codepen to demonstrate your issue. You could start with [this template](https://jsfiddle.net/39epgLj0/) that already includes the latest version of Vue.
-
-- For potential SSR (Server Side Rendering) issue or bugs that involves build setups, you can create a reproduction repository with steps in the README.
-
-- If your issue is resolved but still open, don’t hesitate to close it. In case you found a solution by yourself, it could be helpful to explain how you fixed it.
-
-Have a feature request?
-=======================
-Remove the template from below and provide thoughtful commentary *and code samples* on what this feature means for your product. What will it allow you to do that you can't do today? How will it make current work-arounds straightforward? What potential bugs and edge cases does it help to avoid? etc. Please keep it product-centric.
+If your issue was not created using the app above, it will be closed immediately.
 -->
-
-<!-- BUG REPORT TEMPLATE -->
-### Vue.js version
-2.0.2
-
-### Reproduction Link
-<!-- A minimal JSBin, JSFiddle, Codepen, or a GitHub repository that can reproduce the bug. -->
-<!-- You could start with this template: https://jsfiddle.net/39epgLj0/ -->
-
-### Steps to reproduce
-
-### What is Expected?
-
-### What is actually happening?

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,3 +2,34 @@
 Please make sure to read the Pull Request Guidelines:
 https://github.com/vuejs/vue/blob/dev/.github/CONTRIBUTING.md#pull-request-guidelines
 -->
+
+<!-- PULL REQUEST TEMPLATE -->
+<!-- (Update "[ ]" to "[x]" to check a box) -->
+
+**What kind of change does this PR introduce?** (check at least one)
+
+- [ ] Bugfix
+- [ ] Feature
+- [ ] Code style update
+- [ ] Refactor
+- [ ] Build-related changes
+- [ ] Other, please describe:
+
+**Does this PR introduce a breaking change?** (check one)
+
+- [ ] Yes
+- [ ] No
+
+If yes, please describe the impact and migration path for existing applications:
+
+**The PR fulfills these requirements:**
+
+- [ ] It's submitted to the `dev` branch for v2.x (or to a previous version branch), _not_ the `master` branch
+- [ ] When resolving a specific issue, it's referenced in the PR's title (e.g. `fix #xxx[,#xxx]`, where "xxx" is the issue number)
+- [ ] All tests are passing: https://github.com/vuejs/vue/blob/dev/.github/CONTRIBUTING.md#development-setup
+- [ ] New/updated tests are included
+
+If adding a **new feature**, the PR's description includes:
+- [ ] A convincing reason for adding this feature (to avoid wasting your time, it's best to open a suggestion issue first and wait for approval before working on it)
+
+**Other information:**

benchmarks/dbmon/index.html

@@ -2,7 +2,6 @@
 <html>
 <head>
 <meta name="description" content="dbmon vue" />
-<link href="./lib/bootstrap.min.css" rel="stylesheet" type="text/css" />
 <link href="./lib/styles.css" rel="stylesheet" type="text/css" />
 <title>dbmon (Vue)</title>
 </head>

benchmarks/dbmon/lib/bootstrap.min.css

@@ -1,10 +1,26 @@
-.Query {
-  position: relative;
-}
+body {color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;margin:0;}
+label {display:inline-block;font-weight:700;margin-bottom:5px;}
+input[type=range] {display:block;width:100%;}
+table {border-collapse:collapse;border-spacing:0;}
+:before,:after {box-sizing: border-box;}
 
-.Query:hover .popover {
-  left: -100%;
-  width: 100%;
-  display: block;
-}
+.table > thead > tr > th,.table > tbody > tr > th,.table > tfoot > tr > th,.table > thead > tr > td,.table > tbody > tr > td,.table > tfoot > tr > td {border-top:1px solid #ddd;line-height:1.42857143;padding:8px;vertical-align:top;}
+.table {width:100%;}
+.table-striped > tbody > tr:nth-child(odd) > td,.table-striped > tbody > tr:nth-child(odd) > th {background:#f9f9f9;}
 
+.label {border-radius:.25em;color:#fff;display:inline;font-size:75%;font-weight:700;line-height:1;padding:.2em .6em .3em;text-align:center;vertical-align:baseline;white-space:nowrap;}
+.label-success {background-color:#5cb85c;}
+.label-warning {background-color:#f0ad4e;}
+
+.popover {background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;box-shadow:0 5px 10px rgba(0,0,0,.2);display:none;left:0;max-width:276px;padding:1px;position:absolute;text-align:left;top:0;white-space:normal;z-index:1010;}
+.popover>.arrow:after {border-width:10px;content:"";}
+.popover.left {margin-left:-10px;}
+.popover.left > .arrow {border-right-width:0;border-left-color:rgba(0,0,0,.25);margin-top:-11px;right:-11px;top:50%;}
+.popover.left > .arrow:after {border-left-color:#fff;border-right-width:0;bottom:-10px;content:" ";right:1px;}
+.popover > .arrow {border-width:11px;}
+.popover > .arrow,.popover>.arrow:after {border-color:transparent;border-style:solid;display:block;height:0;position:absolute;width:0;}
+
+.popover-content {padding:9px 14px;}
+
+.Query {position:relative;}
+.Query:hover .popover {display:block;left:-100%;width:100%;}

benchmarks/dbmon/lib/styles.css

@@ -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/renderToStream.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

benchmarks/ssr/renderToString.js

@@ -1,11 +1,5 @@
 set -e
-npm run lint
-npm run flow
-npm run test:types
-npm run test:cover
-npm run test:e2e -- --env phantomjs
-npm run test:ssr
-npm run test:weex
+npm test
 
 # report coverage stats for non-PRs
 if [[ -z $CI_PULL_REQUEST ]]; then

build/ci.sh

@@ -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.base.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