From c0ae85e53b3c51f09089308f5d16283cc4519475 Mon Sep 17 00:00:00 2001
From: Espen Bratberg <espen.bratberg@nrk.no>
Date: Sun, 19 Mar 2017 08:17:32 +0100
Subject: [PATCH 1/4] Update with-vuetify example with theme overrides

---
 examples/with-vuetify/README.md               |  4 +++-
 examples/with-vuetify/css/app.styl            |  1 +
 examples/with-vuetify/css/vendor/vuetify.styl | 14 ++++++++++++++
 examples/with-vuetify/layouts/default.vue     |  6 ------
 examples/with-vuetify/nuxt.config.js          | 13 ++++++++++++-
 examples/with-vuetify/package.json            |  4 ++++
 examples/with-vuetify/pages/index.vue         |  9 +++++++--
 7 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 examples/with-vuetify/css/app.styl
 create mode 100644 examples/with-vuetify/css/vendor/vuetify.styl
 delete mode 100644 examples/with-vuetify/layouts/default.vue

diff --git a/examples/with-vuetify/README.md b/examples/with-vuetify/README.md
index 4873ceb77b..04bf622643 100644
--- a/examples/with-vuetify/README.md
+++ b/examples/with-vuetify/README.md
@@ -1,4 +1,6 @@
 # Using Vuetify.js with Nuxt.js
 
-https://nuxtjs.org/examples/with-vuetify
+https://nuxtjs.org/examples/with-vuetify<br>
 https://vuetifyjs.com/
+
+*NOTE: Some Vuetify components needs Vue v2.2.x (or later) to work properly (Nuxt currently uses v2.1.x)*
diff --git a/examples/with-vuetify/css/app.styl b/examples/with-vuetify/css/app.styl
new file mode 100644
index 0000000000..0b24ada921
--- /dev/null
+++ b/examples/with-vuetify/css/app.styl
@@ -0,0 +1 @@
+@require './vendor/vuetify.styl'
diff --git a/examples/with-vuetify/css/vendor/vuetify.styl b/examples/with-vuetify/css/vendor/vuetify.styl
new file mode 100644
index 0000000000..6865590deb
--- /dev/null
+++ b/examples/with-vuetify/css/vendor/vuetify.styl
@@ -0,0 +1,14 @@
+// Specify overrides (theme and/or base variables etc.)
+// See https://vuetifyjs.com/quick-start
+$theme := {
+  primary: #9c27b0
+  accent: #ce93d8
+  secondary: #424242
+  info: #0D47A1
+  warning: #ffb300
+  error: #B71C1C
+  success: #2E7D32
+}
+
+// Import Vuetify styling
+@require '~vuetify/src/stylus/main.styl'
diff --git a/examples/with-vuetify/layouts/default.vue b/examples/with-vuetify/layouts/default.vue
deleted file mode 100644
index 3f33e63651..0000000000
--- a/examples/with-vuetify/layouts/default.vue
+++ /dev/null
@@ -1,6 +0,0 @@
-<template>
-  <div>
-    <nuxt/>
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-  </div>
-</template>
diff --git a/examples/with-vuetify/nuxt.config.js b/examples/with-vuetify/nuxt.config.js
index bd26adf454..9edc6811ef 100644
--- a/examples/with-vuetify/nuxt.config.js
+++ b/examples/with-vuetify/nuxt.config.js
@@ -1,7 +1,18 @@
+
+const { join } = require('path')
+
 module.exports = {
   build: {
     vendor: ['vuetify']
   },
   plugins: ['~plugins/vuetify.js'],
-  css: ['vuetify/dist/vuetify.min.css']
+  css: [
+    { src: join(__dirname, 'css/app.styl'), lang: 'styl' }
+  ],
+  head: {
+    link: [
+      { rel: 'stylesheet', href: 'https://fonts.googleapis.com/css?family=Roboto' },
+      { rel: 'stylesheet', href: 'https://fonts.googleapis.com/icon?family=Material+Icons' }
+    ]
+  }
 }
diff --git a/examples/with-vuetify/package.json b/examples/with-vuetify/package.json
index 0ee9083525..908878ba03 100644
--- a/examples/with-vuetify/package.json
+++ b/examples/with-vuetify/package.json
@@ -8,5 +8,9 @@
     "dev": "nuxt",
     "build": "nuxt build",
     "start": "nuxt start"
+  },
+  "devDependencies": {
+    "stylus": "^0.54.5",
+    "stylus-loader": "^3.0.1"
   }
 }
diff --git a/examples/with-vuetify/pages/index.vue b/examples/with-vuetify/pages/index.vue
index 5aeb83257a..8551eaff81 100644
--- a/examples/with-vuetify/pages/index.vue
+++ b/examples/with-vuetify/pages/index.vue
@@ -16,7 +16,12 @@
       </v-sidebar>
       <v-content>
         <v-container fluid>
-          <div class="title">Main Content</div>
+          <div class="title">
+            <h2>Main content</h2>
+            <v-btn primary>Primary button</v-btn>
+            <v-btn secondary>Secondary button</v-btn>
+            <v-btn success>Success button</v-btn>
+          </div>
         </v-container>
       </v-content>
     </main>
@@ -33,7 +38,7 @@
   }
 </script>
 
-<style>
+<style scoped>
   .title {
     padding-left: 20px;
   }

From c99571e78eecc5a87739e4fa45e20fec28ec0611 Mon Sep 17 00:00:00 2001
From: Pierre RAMBAUD <pierre.rambaud86@gmail.com>
Date: Mon, 20 Mar 2017 12:11:20 +0100
Subject: [PATCH 2/4] Typo fix, const must be renamed clientCompiler

---
 lib/build.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/build.js b/lib/build.js
index e6d72082a2..27f7c3e089 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -386,8 +386,8 @@ function webpackWatchAndUpdate () {
 function webpackRunClient () {
   return new Promise((resolve, reject) => {
     const clientConfig = getWebpackClientConfig.call(this)
-    const serverCompiler = webpack(clientConfig)
-    serverCompiler.run((err, stats) => {
+    const clientCompiler = webpack(clientConfig)
+    clientCompiler.run((err, stats) => {
       if (err) return reject(err)
       console.log('[nuxt:build:client]\n', stats.toString(webpackStats)) // eslint-disable-line no-console
       if (stats.hasErrors()) return reject('Webpack build exited with errors')

From 32b9038fc4fc3cb10d3bfb43ea9bf667163368fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Mon, 20 Mar 2017 16:16:26 +0100
Subject: [PATCH 3/4] Vue sur 2.2.0

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 7d860957c6..fb55baa258 100644
--- a/package.json
+++ b/package.json
@@ -86,6 +86,7 @@
     "vue-meta": "^0.5.3",
     "vue-router": "^2.2.0",
     "vue-server-renderer": "^2.1.10",
+    "vue-ssr-html-stream": "^2.2.0",
     "vue-template-compiler": "^2.1.10",
     "vuex": "^2.1.2",
     "webpack": "^2.2.1",

From 401bba0035e874545ee093194315e581fabedd1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Mon, 20 Mar 2017 16:29:51 +0100
Subject: [PATCH 4/4] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 72e969fdc2..28d0c2ccd0 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@
   <a href="https://donorbox.org/nuxt"><img src="https://img.shields.io/badge/Support%20us-donate-41B883.svg" alt="Support us"></a>
   
 </p>
+
 > Nuxt.js is a framework for server-rendered Vue applications (inspired by [Next.js](https://github.com/zeit/next.js))
 
 ## 🚧 Under active development, 1.0 will be released soon :fire: