Merge branch 'vuejs-dev' into dev

* vuejs-dev: (558 commits) chore: sponsors chore: update sponsors chore: update sponsors chore: sponsor cleanup chore: update sponsors chore(package.json): Add sideEffects: false field in package.json (vuejs#8099) chore: new sponsor chore(typo): no dots at the end of the comments (vuejs#8087) chore: new sponsor chore: update sponsors chore: update sponsors chore: use reactive components count in benchmark (vuejs#7996) feat(weex): support object syntax of class (vuejs#7930) feat(server, webpack-plugin): webpack 4 support (vuejs#7839) fix(ssr): render initial and used async css chunks (vuejs#7902) fix(ssr): remove trailing hash in webpack module identifier when generating client manifest chore: new sponsor chore: update sponsor build: release 2.5.17-beta.0 build: build 2.5.17-beta.0 ...
awamwang · Jul 8, 2018 · ff72987 · ff72987
2 parents 83bc7ff + 2df6315
commit ff72987
Show file tree

Hide file tree

Showing 356 changed files with 71,731 additions and 22,837 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,81 @@
+version: 2
+
+defaults: &defaults
+  working_directory: ~/project/vue
+  docker:
+    - image: circleci/node:6-browsers
+
+jobs:
+  install:
+    <<: *defaults
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-vue-{{ .Branch }}-{{ checksum "yarn.lock" }}
+            - v1-vue-{{ .Branch }}-
+            - v1-vue-
+      - run: npm install
+      - save_cache:
+          key: v1-vue-{{ .Branch }}-{{ checksum "yarn.lock" }}
+          paths:
+            - node_modules/
+      - persist_to_workspace:
+          root: ~/project
+          paths:
+            - vue
+
+  lint-flow-types:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: npm run lint
+      - run: npm run flow
+      - run: npm run test:types
+
+  test-cover:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: npm run test:cover
+      - run:
+         name: report coverage stats for non-PRs
+         command: |
+           if [[ -z $CI_PULL_REQUEST ]]; then
+             ./node_modules/.bin/codecov
+           fi
+
+  test-e2e:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: npm run test:e2e -- --env phantomjs
+
+  test-ssr-weex:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: npm run test:ssr
+      - run: npm run test:weex
+
+workflows:
+  version: 2
+  install-and-parallel-test:
+    jobs:
+      - install
+      - test-cover:
+          requires:
+            - install
+      - lint-flow-types:
+          requires:
+            - install
+      - test-e2e:
+          requires:
+            - install
+      - test-ssr-weex:
+          requires:
+            - install
diff --git a/.eslintrc b/.eslintrc
@@ -8,6 +8,7 @@
     "plugin:flowtype/recommended"
   ],
   "globals": {
-    "__WEEX__": true
+    "__WEEX__": true,
+    "WXEnvironment": true
   }
 }
diff --git a/.flowconfig b/.flowconfig
@@ -1,7 +1,7 @@
 [ignore]
 .*/node_modules/.*
 .*/test/.*
-.*/build/.*
+.*/scripts/.*
 .*/examples/.*
 .*/benchmarks/.*
 
@@ -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
diff --git a/.github/COMMIT_CONVENTION.md b/.github/COMMIT_CONVENTION.md
@@ -1,35 +1,43 @@
 ## Git Commit Message Convention
 
-> This is adapted from [Angular's commit convention](https://github.com/conventional-changelog/conventional-changelog/blob/master/packages/conventional-changelog-angular/convention.md).
+> This is adapted from [Angular's commit convention](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular).
+
+#### TL;DR:
+
+Messages must be matched by the following regex:
+
+``` js
+/^(revert: )?(feat|fix|polish|docs|style|refactor|perf|test|workflow|ci|chore|types)(\(.+\))?: .{1,50}/
+```
 
 #### 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.
 ```

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -40,17 +40,12 @@ You will need [Node.js](http://nodejs.org) **version 6+** and [Java Runtime Envi
 After cloning the repo, run:
 
 ``` bash
-$ npm install
+$ npm install # or yarn
 ```
 
-This will also run the `postinstall` script which links two git hooks:
+### Committing Changes
 
-- `pre-commit`: runs ESLint on staged files.
-- `commit-msg`: validates commit message format (see below).
-
-### Commiting Changes
-
-Commit messages should follow the [commit message convention](./COMMIT_CONVENTION.md) so that changelogs can be automatically generated. If git hooks have been properly linked, commit messages will be automatically validated upon commit. It is recommended to use `npm run commit` instead of `git commit`, which provides an interactive CLI for generating proper commit messages.
+Commit messages should follow the [commit message convention](./COMMIT_CONVENTION.md) so that changelogs can be automatically generated. Commit messages will be automatically validated upon commit. If you are not familiar with the commit message convention, you can use `npm run commit` instead of `git commit`, which provides an interactive CLI for generating proper commit messages.
 
 ### Commonly used NPM scripts
 
@@ -74,11 +69,11 @@ 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. However, it would be helpful to familiarize yourself with the following files:
+- **`scripts`**: contains build-related scripts and 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.
+  - `scripts/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.
+  - `scripts/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.
 
@@ -122,3 +117,24 @@ The default test script will do the following: lint with ESLint -> type check wi
 
   - **`shared`**: contains utilities shared across the entire codebase.
 
+  - **`types`**: contains TypeScript type definitions
+
+    - **`test`**: type definitions tests
+
+
+## Financial Contribution
+
+As a pure community-driven project without major corporate backing, we also welcome financial contributions via Patreon or OpenCollective.
+
+- [Become a backer or sponsor on Patreon](https://www.patreon.com/evanyou)
+- [Become a backer or sponsor on OpenCollective](https://opencollective.com/vuejs)
+
+### What's the difference between Patreon and OpenCollective?
+
+Funds donated via Patreon go directly to support Evan You's full-time work on Vue.js. Funds donated via OpenCollective are managed with transparent expenses and will be used for compensating work and expenses for core team members or sponsoring community events. Your name/logo will receive proper recognition and exposure by donating on either platform.
+
+## Credits
+
+Thank you to all the people who have already contributed to Vue.js!
+
+<a href="https://github.com/vuejs/vue/graphs/contributors"><img src="https://opencollective.com/vuejs/contributors.svg?width=890" /></a>
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -8,3 +8,9 @@ If your issue was not created using the app above, it will be closed immediately
 中文用户请注意：
 请使用上面的链接来创建新的 issue。如果不是用上述工具创建的 issue 会被自动关闭。
 -->
+
+<!--
+Love vuejs? Please consider supporting us via Patreon or OpenCollective:
+👉  https://www.patreon.com/evanyou
+👉  https://opencollective.com/vuejs/donate
+-->
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,12 @@ test/e2e/screenshots
 coverage
 RELEASE_NOTE*.md
 .idea/
-components/
-test/vue.test.js
+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
+.vscode
+