merge

Author: awamwang

.editorconfig

@@ -0,0 +1,15 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false

.eslintrc

@@ -1,14 +1,13 @@
 {
   "root": true,
-  "parser": "babel-eslint",
-  "extends": "vue",
-  "plugins": ["flowtype"],
+  "plugins": [
+    "flowtype"
+  ],
+  "extends": [
+    "plugin:vue-libs/recommended",
+    "plugin:flowtype/recommended"
+  ],
   "globals": {
     "__WEEX__": true
-  },
-  "rules": {
-    "no-useless-escape": 0,
-    "flowtype/define-flow-type": 1,
-    "flowtype/use-flow-type": 1
   }
 }

.github/CONTRIBUTING.md

@@ -73,10 +73,16 @@ The default test script will do the following: lint with ESLint -> type check wi
 
 ## Project Structure
 
-- **`build`**: contains build-related configuration files. In most cases you don't need to touch them.
+- **`build`**: contains build-related configuration files. In most cases you don't need to touch them. However, it would be helpful to familiarize yourself with the following files:
+
+  - `build/alias.js`: module import aliases used across all source code and tests.
+
+  - `build/config.js`: contains the build configurations for all files found in `dist/`. Check this file if you want to find out the entry source file for a dist file.
 
 - **`dist`**: contains built files for distribution. Note this directory is only updated when a release happens; they do not reflect the latest changes in development branches.
 
+  See [dist/README.md](https://github.com/vuejs/vue/blob/dev/dist/README.md) for more details on dist files.
+
 - **`flow`**: contains type declarations for [Flow](https://flowtype.org/). These declarations are loaded **globally** and you will see them used in type annotations in normal source code.
 
 - **`packages`**: contains `vue-server-renderer` and `vue-template-compiler`, which are distributed as separate NPM packages. They are automatically generated from the source code and always have the same version with the main `vue` package.
@@ -85,16 +91,6 @@ The default test script will do the following: lint with ESLint -> type check wi
 
 - **`src`**: contains the source code, obviously. The codebase is written in ES2015 with [Flow](https://flowtype.org/) type annotations.
 
-  - **`entries`**: contains entries for different builds and packages.
-
-    - **`web-runtime`**: the entry for `dist/vue.common.js`, a.k.a the runtime-only build. It does not include the template to render function compiler, so it does not support the `template` option. **This is set as the `main` field in `package.json` so it is the default export when you import Vue as an NPM package.**
-
-    - **`web-runtime-with-compiler`**: the entry for `dist/vue.js`, a.k.a the standalone build. It includes the template to render function compiler. To use this build from the NPM packages, do `import Vue from 'vue/dist/vue'`, or alias `vue` to `vue/dist/vue` in your build tool configuration.
-
-    - **`web-compiler.js`**: the entry for the `vue-template-compiler` NPM package.
-
-    - **`web-server-renderer.js`**: the entry for the `vue-server-renderer` NPM package.
-
   - **`compiler`**: contains code for the template-to-render-function compiler.
 
     The compiler consists of a parser (converts template strings to element ASTs), an optimizer (detects static trees for vdom render optimization), and a code generator (generate render function code from element ASTs). Note the codegen directly generates code strings from the element AST - it's done this way for smaller code size because the compiler is shipped to the browser in the standalone build.
@@ -117,6 +113,8 @@ The default test script will do the following: lint with ESLint -> type check wi
 
   - **`platforms`**: contains platform-specific code.
 
+    Entry files for dist builds are located in their respective platform directory.
+
     Each platform module contains three parts: `compiler`, `runtime` and `server`, corresponding to the three directories above. Each part contains platform-specific modules/utilities which are then imported and injected to the core counterparts in platform-specific entry files. For example, the code implementing the logic behind `v-bind:class` is in `platforms/web/runtime/modules/class.js` - which is imported in `entries/web-runtime.js` and used to create the browser-specific vdom patching function.
 
   - **`sfc`**: contains single-file component (`*.vue` files) parsing logic. This is used in the `vue-template-compiler` package.

.github/ISSUE_TEMPLATE.md

@@ -4,4 +4,7 @@ IMPORTANT: Please use the following link to create a new issue:
   https://new-issue.vuejs.org/
 
 If your issue was not created using the app above, it will be closed immediately.
+
+中文用户请注意：
+请使用上面的链接来创建新的 issue。如果不是用上述工具创建的 issue 会被自动关闭。
 -->

BACKERS.md

@@ -10,91 +10,95 @@ You can join them in supporting  Vue.js development by [pledging on Patreon](htt
 
 ---
 
+### $1000
+
+<a href="https://www.upyun.com/?utm_source=vue&utm_medium=ad&utm_content=github">
+  <img width="400px" src="https://raw.githubusercontent.com/vuejs/cn.vuejs.org/master/themes/vue/source/images/upyun-large.png">
+</a>
+
+---
+
 ### $500
 
 <a href="https://deepstreamhub.com">
   <img width="260px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/deepstream.png">
 </a>
-
+<br><br>
 <a href="https://jsfiddle.net/">
   <img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/jsfiddle.png">
 </a>
-
+<br><br>
 <a href="https://laravel.com">
   <img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/laravel.png">
 </a>
-
+<br><br>
 <a href="https://chaitin.cn">
   <img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/chaitin.png">
 </a>
-
+<br><br>
 <a href="https://htmlburger.com/">
   <img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/htmlburger.png">
 </a>
-
+<br><br>
 <a href="https://starter.someline.com/">
   <img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/someline.png">
 </a>
-
+<br><br>
 <a href="http://monterail.com/" target="_blank">
   <img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/monterail.png">
 </a>
-
+<br><br>
 <a href="https://www.trisoft.ro/" target="_blank">
   <img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/trisoft.png">
 </a>
-
+<br><br>
 <a href="https://www.2mhost.com/" target="_blank">
   <img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/2mhost.png">
 </a>
-
+<br><br>
 <a href="https://vuejsjob.com/?ref=vuejs" target="_blank">
   <img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/vuejobs.png">
 </a>
-
+<br><br>
 <a href="https://leanpub.com/vuejs2" target="_blank">
   <img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/tmvuejs2.png">
 </a>
-
-<a href="https://fancygrid.com" target="_blank">
-  <img width="240px" src="http://fancygrid.com/logo/logo.png">
+<br><br>
+<a href="https://famebroker.com" target="_blank">
+  <img width="260px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/famebroker.png">
 </a>
-
+<br><br>
 <a href="https://component.io/" target="_blank">
   <img width="260px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/component_io.png">
 </a>
 
-#### Sacha Kupambana
-
----
-
-### $250
-
-[It could be you!](https://www.patreon.com/bePatron?u=2341390)
-
 ---
 
 ### $100
 
 <a href="http://tighten.co/">
   <img width="240px" src="http://i.imgur.com/T7fQYLT.png">
 </a>
-
+<br><br>
 <a href="http://invoicemachine.com/">
   <img width="220px" src="http://assets.invoicemachine.com/images/flat_logo.png">
 </a>
-
+<br><br>
 <a href="https://alligator.io">
   <img width="240px" src="https://alligator.io/images/alligator-logo.svg">
 </a>
-
+<br><br>
 <a href="https://monei.net/">
   <img width="200px" src="http://i.imgur.com/JUSjHAi.png">
 </a>
-
+<br><br>
 <a href="https://www.accelebrate.com/">
   <img width="220px" src="https://www.accelebrate.com/assets/images/[email protected]">
 </a>
+<br><br>
+<a href="https://www.waterfall.com">
+  <img width="200px" src="https://waterfall.com/waterfall_logo_large.png">
+</a>
 
 ---
 
@@ -110,7 +114,6 @@ You can join them in supporting  Vue.js development by [pledging on Patreon](htt
 - Wasim Khamlichi
 - errorrik
 - Alex Balashov
-- Cheng-Wei Chien
 
 ---
 
@@ -155,7 +158,6 @@ You can join them in supporting  Vue.js development by [pledging on Patreon](htt
 - Anders
 - Dexter Miguel
 - Stephen Michael Hartley
-- TJ Fogarty
 - Wen-Tien Chang
 - Ole Støvern
 - Valerian Cure
@@ -247,3 +249,17 @@ You can join them in supporting  Vue.js development by [pledging on Patreon](htt
 - Dan Barrett
 - Zoran Knezevic
 - Charles Beaumont
+- Jonathan Kent
+- James Simpson
+- Pascal Germain
+- Pierre Vanhulst
+- Vincent Gabriel
+- Kyovo Digaw
+- devneko
+- Cheng-Wei Chien
+- Michael Mazurczak
+- Daniel
+- Chris Anderson
+- Jon Hobbs-Smith
+- Chez Tschetter
+- Akiho Nagao

README.md

@@ -3,7 +3,7 @@
 <p align="center">
   <a href="https://circleci.com/gh/vuejs/vue/tree/dev"><img src="https://img.shields.io/circleci/project/vuejs/vue/dev.svg" alt="Build Status"></a>
   <a href="https://codecov.io/github/vuejs/vue?branch=dev"><img src="https://img.shields.io/codecov/c/github/vuejs/vue/dev.svg" alt="Coverage Status"></a>
-  <a href="https://www.npmjs.com/package/vue"><img src="https://img.shields.io/npm/dt/vue.svg" alt="Downloads"></a>
+  <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>
   <br>
@@ -21,6 +21,10 @@ Vue.js is an MIT-licensed open source project. Its ongoing development is made p
     <img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/stdlib.png">
   </a>
   <br><br>
+  <a href="https://www.upyun.com/?utm_source=vue&utm_medium=ad&utm_content=github">
+    <img width="160px" src="https://raw.githubusercontent.com/vuejs/cn.vuejs.org/master/themes/vue/source/images/upyun-small.png">
+  </a>
+  <br><br>
   <a href="https://deepstreamhub.com" target="_blank">
     <img width="140px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/deepstream.png">
   </a>
@@ -65,8 +69,8 @@ Vue.js is an MIT-licensed open source project. Its ongoing development is made p
     <img width="120px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/tmvuejs2.png">
   </a>
   <br><br>
-  <a href="https://fancygrid.com" target="_blank">
-    <img width="120px" src="http://fancygrid.com/logo/logo.png">
+  <a href="https://famebroker.com" target="_blank">
+    <img width="130px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/famebroker.png">
   </a>
   <br><br>
   <a href="https://component.io/" target="_blank">
@@ -78,13 +82,17 @@ Vue.js is an MIT-licensed open source project. Its ongoing development is made p
 
 Vue.js is a library for building interactive web interfaces. It provides data-reactive components with a simple and flexible API. Core features include:
 
-- [Declarative rendering with a plain JavaScript object based reactivity system.](https://vuejs.org/guide/index.html#Declarative-Rendering)
+- [Declarative rendering with a plain JavaScript object based reactivity system](https://vuejs.org/guide/index.html#Declarative-Rendering)
 - [Component-oriented development style with tooling support](https://vuejs.org/guide/index.html#Composing-with-Components)
 - Lean and extensible core
 - [Flexible transition effect system](https://vuejs.org/guide/transitions.html)
 - Fast without the need for complex optimization
 
-Note that Vue.js only supports [ES5-compliant browsers](http://kangax.github.io/compat-table/es5/) (IE8 and below are not supported). To check out live examples and docs, visit [vuejs.org](https://vuejs.org).
+Note that Vue.js only supports [ES5-compliant browsers](http://kangax.github.io/compat-table/es5/) (IE8 and below are not supported).
+
+## Documentation
+
+To check out live examples and docs, visit [vuejs.org](https://vuejs.org).
 
 ## Questions
 
@@ -104,7 +112,7 @@ Details changes for each release are documented in the [release notes](https://g
 
 ## Stay In Touch
 
-- For latest releases and announcements, follow on Twitter: [@vuejs](https://twitter.com/vuejs)
+For the latest releases and announcements, follow on Twitter: [@vuejs](https://twitter.com/vuejs)
 
 ## License
 

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/entries/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/build.js

@@ -46,9 +46,7 @@ function buildEntry (config) {
     const code = bundle.generate(config).code
     if (isProd) {
       var minified = (config.banner ? config.banner + '\n' : '') + uglify.minify(code, {
-        fromString: true,
         output: {
-          screw_ie8: true,
           ascii_only: true
         },
         compress: {