From 8bbbfebb6e34249583d895c790b17ab71742ffbc Mon Sep 17 00:00:00 2001
From: Kylart <Kylart.dev@gmail.com>
Date: Sat, 2 Sep 2017 17:13:28 +0200
Subject: [PATCH] One step after another

---
 assets/app.js                    | 8 ++++++++
 package.json                     | 2 +-
 webpack/webpack.base.config.js   | 1 -
 webpack/webpack.server.config.js | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/assets/app.js b/assets/app.js
index 6a51028..e833bbb 100644
--- a/assets/app.js
+++ b/assets/app.js
@@ -12,6 +12,7 @@ import { sync } from 'vuex-router-sync'
 import {
   Vuetify,
   VApp,
+  VGrid,
   VSelect,
   VMenu,
   VList,
@@ -28,11 +29,14 @@ import {
   VTextField
 } from 'vuetify'
 
+import { Tooltip, Ripple } from 'vuetify/src/directives'
+
 Vue.use(Vuetify, {
   components: {
     VApp,
     VSelect,
     VMenu,
+    VGrid,
     VList,
     VNavigationDrawer,
     VToolbar,
@@ -45,6 +49,10 @@ Vue.use(Vuetify, {
     VCard,
     VDialog,
     VTextField
+  },
+  directives: {
+    Tooltip,
+    Ripple
   }
 })
 Vue.use(VueClipboards)
diff --git a/package.json b/package.json
index 7c81ab4..df093f0 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "vue-loader": "^13.0.4",
     "vue-router": "^2.7.0",
     "vue-server-renderer": "^2.4.2",
-    "vuetify": "^0.15.0-beta.4",
+    "vuetify": "^0.15.1",
     "vuex": "^2.3.1",
     "vuex-router-sync": "^4.1.2"
   },
diff --git a/webpack/webpack.base.config.js b/webpack/webpack.base.config.js
index bb1c189..00d32bd 100644
--- a/webpack/webpack.base.config.js
+++ b/webpack/webpack.base.config.js
@@ -52,7 +52,6 @@ module.exports = {
       {
         test: /\.js$/,
         loader: 'babel-loader',
-        exclude: /node_modules/,
         include: [
           resolve('components/_index.js'),
           resolve('mixins'),
diff --git a/webpack/webpack.server.config.js b/webpack/webpack.server.config.js
index 018c381..d73513e 100644
--- a/webpack/webpack.server.config.js
+++ b/webpack/webpack.server.config.js
@@ -16,7 +16,7 @@ module.exports = merge(base, {
   // https://github.com/liady/webpack-node-externals
   externals: nodeExternals({
     // do not externalize CSS files in case we need to import it from a dep
-    whitelist: /\.css$/
+    whitelist: [/\.css$/, /vuetify/]
   }),
   plugins: [
     new webpack.DefinePlugin({