Merge remote-tracking branch 'upstream/dev' into accurateVueTypes

Conflicts:
	types/vue.d.ts

Author: DanielRosenwasser

.flowconfig

@@ -20,3 +20,4 @@ module.name_mapper='^weex/\(.*\)$' -> '<PROJECT_ROOT>/src/platforms/weex/\1'
 module.name_mapper='^server/\(.*\)$' -> '<PROJECT_ROOT>/src/server/\1'
 module.name_mapper='^entries/\(.*\)$' -> '<PROJECT_ROOT>/src/entries/\1'
 module.name_mapper='^sfc/\(.*\)$' -> '<PROJECT_ROOT>/src/sfc/\1'
+suppress_comment= \\(.\\|\n\\)*\\$flow-disable-line

.github/COMMIT_CONVENTION.md

@@ -4,32 +4,32 @@
 
 #### Examples
 
-Appears under "Features" header, pencil subheader:
+Appears under "Features" header, `compiler` subheader:
 
 ```
-feat(pencil): add 'graphiteWidth' option
+feat(compiler): add 'comments' option
 ```
 
-Appears under "Bug Fixes" header, graphite subheader, with a link to issue #28:
+Appears under "Bug Fixes" header, `v-model` subheader, with a link to issue #28:
 
 ```
-fix(graphite): stop graphite breaking when width < 0.1
+fix(v-model): handle events on blur
 
 close #28
 ```
 
 Appears under "Performance Improvements" header, and under "Breaking Changes" with the breaking change explanation:
 
 ```
-perf(pencil): remove graphiteWidth option
+perf(core): improve vdom diffing by removing 'foo' option
 
-BREAKING CHANGE: The graphiteWidth option has been removed. The default graphite width of 10mm is always used for performance reason.
+BREAKING CHANGE: The 'foo' option has been removed.
 ```
 
 The following commit and commit `667ecc1` do not appear in the changelog if they are under the same release. If not, the revert commit appears under the "Reverts" header.
 
 ```
-revert: feat(pencil): add 'graphiteWidth' option
+revert: feat(compiler): add 'comments' option
 
 This reverts commit 667ecc1654a317a13331b17617d973392f415f02.
 ```

.github/CONTRIBUTING.md

@@ -41,9 +41,10 @@ After cloning the repo, run:
 
 ``` bash
 $ npm install
+& npm run setup
 ```
 
-This will also run the `postinstall` script which links two git hooks:
+The `setup` script links two git hooks:
 
 - `pre-commit`: runs ESLint on staged files.
 - `commit-msg`: validates commit message format (see below).

.gitignore

@@ -10,3 +10,9 @@ test/e2e/reports
 test/e2e/screenshots
 coverage
 RELEASE_NOTE*.md
+dist/*.js
+packages/vue-server-renderer/basic.js
+packages/vue-server-renderer/build.js
+packages/vue-server-renderer/server-plugin.js
+packages/vue-server-renderer/client-plugin.js
+packages/vue-template-compiler/build.js

README.md

@@ -6,6 +6,7 @@
   <a href="https://www.npmjs.com/package/vue"><img src="https://img.shields.io/npm/dm/vue.svg" alt="Downloads"></a>
   <a href="https://www.npmjs.com/package/vue"><img src="https://img.shields.io/npm/v/vue.svg" alt="Version"></a>
   <a href="https://www.npmjs.com/package/vue"><img src="https://img.shields.io/npm/l/vue.svg" alt="License"></a>
+  <a href="https://chat.vuejs.org/"><img src="https://img.shields.io/badge/chat-on%20discord-7289da.svg" alt="Chat">
   <br>
   <a href="https://saucelabs.com/u/vuejs"><img src="https://saucelabs.com/browser-matrix/vuejs.svg" alt="Sauce Test Status"></a>
 </p>
@@ -96,7 +97,7 @@ To check out live examples and docs, visit [vuejs.org](https://vuejs.org).
 
 ## Questions
 
-For questions and support please use the [Gitter chat room](https://gitter.im/vuejs/vue) or [the official forum](http://forum.vuejs.org). The issue list of this repo is **exclusively** for bug reports and feature requests.
+For questions and support please use the [the official forum](http://forum.vuejs.org) or [community chat](https://chat.vuejs.org/). The issue list of this repo is **exclusively** for bug reports and feature requests.
 
 ## Issues
 

build/build.js

@@ -42,22 +42,23 @@ function build (builds) {
 
 function buildEntry (config) {
   const isProd = /min\.js$/.test(config.dest)
-  return rollup.rollup(config).then(bundle => {
-    const code = bundle.generate(config).code
-    if (isProd) {
-      var minified = (config.banner ? config.banner + '\n' : '') + uglify.minify(code, {
-        output: {
-          ascii_only: true
-        },
-        compress: {
-          pure_funcs: ['makeMap']
-        }
-      }).code
-      return write(config.dest, minified, true)
-    } else {
-      return write(config.dest, code)
-    }
-  })
+  return rollup.rollup(config)
+    .then(bundle => bundle.generate(config))
+    .then(({ code }) => {
+      if (isProd) {
+        var minified = (config.banner ? config.banner + '\n' : '') + uglify.minify(code, {
+          output: {
+            ascii_only: true
+          },
+          compress: {
+            pure_funcs: ['makeMap']
+          }
+        }).code
+        return write(config.dest, minified, true)
+      } else {
+        return write(config.dest, code)
+      }
+    })
 }
 
 function write (dest, code, zip) {

build/gen-release-note.js

@@ -1,6 +1,6 @@
-const version = process.env.VERSION
+const version = process.argv[2] || process.env.VERSION
 const cc = require('conventional-changelog')
-const file = `./RELEASE_NOTE_${version}.md`
+const file = `./RELEASE_NOTE${version ? `_${version}` : ``}.md`
 const fileStream = require('fs').createWriteStream(file)
 
 cc({

build/release-weex.sh

@@ -31,7 +31,6 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
   cd -
 
   # commit
-  git add src/entries/weex*
   git add packages/weex*
   git commit -m "[release] weex-vue-framework@$NEXT_VERSION"
 fi

build/release.sh

@@ -12,11 +12,13 @@ echo
 if [[ $REPLY =~ ^[Yy]$ ]]; then
   echo "Releasing $VERSION ..."
 
-  npm run lint
-  npm run flow
-  npm run test:cover
-  npm run test:e2e
-  npm run test:ssr
+  if [[ -z $SKIP_TESTS ]]; then
+    npm run lint
+    npm run flow
+    npm run test:cover
+    npm run test:e2e
+    npm run test:ssr
+  fi
 
   if [[ -z $SKIP_SAUCE ]]; then
     export SAUCE_BUILD_ID=$VERSION:`date +"%s"`
@@ -47,8 +49,15 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
 
   # commit
   git add -A
-  git commit -m "[build] $VERSION"
-  npm version $VERSION --message "[release] $VERSION"
+  git add -f \
+    dist/*.js \
+    packages/vue-server-renderer/basic.js \
+    packages/vue-server-renderer/build.js \
+    packages/vue-server-renderer/server-plugin.js \
+    packages/vue-server-renderer/client-plugin.js \
+    packages/vue-template-compiler/build.js
+  git commit -m "build: build $VERSION"
+  npm version $VERSION --message "build: release $VERSION"
 
   # publish
   git push origin refs/tags/v$VERSION
@@ -58,7 +67,4 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
   else
     npm publish --tag $RELEASE_TAG
   fi
-
-  # generate release note
-  VERSION=$VERSION npm run release:note
 fi