From 4e97bd465d6767e2684ea7b8afc9083368848c11 Mon Sep 17 00:00:00 2001 From: Xavier Damman Date: Tue, 9 May 2017 09:21:36 -0400 Subject: [PATCH 1/6] Added backers and sponsors on the README --- README.md | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 45918d0147..8519f8dc59 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@

+ Build Status Windows Build Status  Coverage Status @@ -169,8 +170,74 @@ Note: we recommend putting `.nuxt` in `.npmignore` or `.gitignore`. https://github.com/nuxt/nuxt.js/projects/1 -## Donate +## Backers -Feel free to make a donation to support us. +Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/nuxtjs#backer)] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +## Sponsors + +Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/nuxtjs#sponsor)] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -Support us From a71ac29166a76b4bd1a32364da620563f21a6408 Mon Sep 17 00:00:00 2001 From: Xavier Damman Date: Tue, 9 May 2017 09:21:36 -0400 Subject: [PATCH 2/6] Added call to donate after npm install --- package.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a1276b865f..1320758da4 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,8 @@ "build": "webpack", "watch": "webpack --watch", "precommit": "npm run lint", - "prepublish": "npm run build" + "prepublish": "npm run build", + "postinstall": "opencollective postinstall" }, "engines": { "node": ">=4.3.0 <5.0.0 || >=5.10", @@ -74,6 +75,7 @@ "lru-cache": "^4.0.2", "memory-fs": "^0.4.1", "offline-plugin": "^4.7.0", + "opencollective": "^1.0.3", "pify": "^2.3.0", "post-compile-webpack-plugin": "^0.1.1", "preload-webpack-plugin": "^1.2.2", @@ -118,5 +120,10 @@ "request": "^2.81.0", "request-promise-native": "^1.0.3", "webpack-node-externals": "^1.5.4" + }, + "collective": { + "type": "opencollective", + "url": "https://opencollective.com/nuxtjs", + "logo": "https://opencollective.com/nuxtjs/logo.txt?reverse=true&variant=variant2" } -} +} \ No newline at end of file From 77d35ab594d65db6429bf4fe4e3564ec2aa86faf Mon Sep 17 00:00:00 2001 From: Andrii Korzh Date: Tue, 9 May 2017 21:44:53 +0300 Subject: [PATCH 3/6] add linkExactActiveClass to router options From version 2.5.0+ exact active class supported https://router.vuejs.org/en/api/options.html#linkexactactiveclass --- lib/nuxt.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/nuxt.js b/lib/nuxt.js index 798941a0de..9e4f1f4eee 100644 --- a/lib/nuxt.js +++ b/lib/nuxt.js @@ -37,6 +37,7 @@ class Nuxt { base: '/', middleware: [], linkActiveClass: 'nuxt-link-active', + linkExactActiveClass: 'nuxt-link-exact-active', extendRoutes: null, scrollBehavior: null }, From 4beaecdc5cabda0c887296591a463e2a1a096cfc Mon Sep 17 00:00:00 2001 From: Andrii Korzh Date: Tue, 9 May 2017 21:46:11 +0300 Subject: [PATCH 4/6] add linkExactActiveClass Pass linkExactActiveClass to router options --- lib/app/router.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/app/router.js b/lib/app/router.js index 4d3dc71f64..735b6cf2ec 100644 --- a/lib/app/router.js +++ b/lib/app/router.js @@ -58,6 +58,7 @@ export function createRouter () { mode: '<%= router.mode %>', base: '<%= router.base %>', linkActiveClass: '<%= router.linkActiveClass %>', + linkExactActiveClass: '<%= router.linkExactActiveClass %>', scrollBehavior, routes: [ <%= _routes %> From 756929079aaf1dbef8b869d917e0fc8a0f4f3a10 Mon Sep 17 00:00:00 2001 From: Mihal Malostanidis Date: Wed, 10 May 2017 18:53:16 +0300 Subject: [PATCH 5/6] Fix copy paste typo in the comments --- examples/vue-apollo/nuxt.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vue-apollo/nuxt.config.js b/examples/vue-apollo/nuxt.config.js index 1ea10b9c69..f73ea6eaf6 100644 --- a/examples/vue-apollo/nuxt.config.js +++ b/examples/vue-apollo/nuxt.config.js @@ -6,7 +6,7 @@ module.exports = { middleware: 'apollo' }, plugins: [ - // Will inject the plugin in the $root app and also in the context as `i18n` + // Will inject the plugin in the $root app and also in the context as `apolloProvider` { src: '~plugins/apollo.js', injectAs: 'apolloProvider' } ] } From 2b85669c163ab3a3f7b4df48252b99af68d2851a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= Date: Thu, 11 May 2017 13:56:57 +0200 Subject: [PATCH 6/6] Update donation badges --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8519f8dc59..19b4648111 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@

- Build Status Windows Build Status  Coverage Status @@ -8,7 +7,11 @@ Version License Gitter - Support us +

+

+ + + Support us