Skip to content

Commit

Permalink
Merge branch 'dev' into move_to_typescript
Browse files Browse the repository at this point in the history
# Conflicts:
#	dist/vue.common.dev.js
#	dist/vue.common.prod.js
#	dist/vue.esm.browser.js
#	dist/vue.esm.browser.min.js
#	dist/vue.esm.js
#	dist/vue.js
#	dist/vue.min.js
#	dist/vue.runtime.common.dev.js
#	dist/vue.runtime.common.prod.js
#	dist/vue.runtime.esm.js
#	dist/vue.runtime.js
#	dist/vue.runtime.min.js
#	packages/vue-server-renderer/basic.js
#	packages/vue-server-renderer/build.dev.js
#	packages/vue-server-renderer/build.prod.js
#	packages/vue-server-renderer/client-plugin.js
#	packages/vue-server-renderer/server-plugin.js
#	packages/vue-template-compiler/browser.js
#	packages/vue-template-compiler/build.js
#	packages/weex-template-compiler/build.js
#	packages/weex-vue-framework/index.js
#	src/compiler/codegen/index.ts
#	src/core/components/keep-alive.ts
#	src/core/instance/lifecycle.js
#	src/core/instance/render-helpers/render-slot.ts
#	src/core/instance/state.ts
#	src/core/observer/watcher.ts
#	src/core/vdom/helpers/normalize-scoped-slots.ts
#	src/core/vdom/patch.ts
#	src/platforms/web/runtime/modules/events.ts
#	src/platforms/weex/entry-framework.ts
#	src/server/webpack-plugin/client.js
#	src/server/webpack-plugin/server.ts
#	src/server/webpack-plugin/util.ts
#	yarn.lock
  • Loading branch information
pikax committed Apr 29, 2022
2 parents f22b216 + 6aa1187 commit da64b4a
Show file tree
Hide file tree
Showing 51 changed files with 31,490 additions and 26,652 deletions.
10 changes: 1 addition & 9 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,7 @@ The default test script will do the following: lint with ESLint -> type check wi

## Financial Contribution

As a pure community-driven project without major corporate backing, we also welcome financial contributions via Patreon and OpenCollective.

- [Become a backer or sponsor on Patreon](https://www.patreon.com/evanyou)
- [Become a backer or sponsor on OpenCollective](https://opencollective.com/vuejs)
- [One-time donation via PayPal or crypto-currencies](https://vuejs.org/support-vuejs/#One-time-Donations)

### What's the difference between Patreon and OpenCollective funding?

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.
As a pure community-driven project without major corporate backing, we also welcome financial contributions via GitHub Sponsors and OpenCollective. Please consult the [Sponsor Page](https://vuejs.org/sponsor/) for more details.

## Credits

Expand Down
485 changes: 3 additions & 482 deletions BACKERS.md

Large diffs are not rendered by default.

295 changes: 17 additions & 278 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue",
"version": "2.6.12",
"version": "2.6.14",
"description": "Reactive, component-oriented view layer for modern web interfaces.",
"main": "dist/vue.runtime.common.js",
"module": "dist/vue.runtime.esm.js",
Expand Down
Loading

0 comments on commit da64b4a

Please sign in to comment.