From 10ecf9bcd54c89be0e82f5507bcfa2e936f6ce23 Mon Sep 17 00:00:00 2001
From: Sebastian De Deyne <sebastiandedeyne@gmail.com>
Date: Tue, 4 Oct 2016 19:51:22 +0200
Subject: [PATCH 1/5] Resolve .vue extensions

---
 index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.js b/index.js
index b39efc8..3f0886c 100644
--- a/index.js
+++ b/index.js
@@ -6,7 +6,8 @@ Elixir.ready(function () {
     resolve: {
       alias: {
         vue: 'vue/dist/vue.js'
-      }
+      },
+      extensions: ['.js', '.vue']
     },
     // use buble loader since it is the default in Elixir
     vue: {

From 6e66f3d9ef5a3bb560fd887d2a3972e92848df09 Mon Sep 17 00:00:00 2001
From: Chris Blackwell <chris@yabhq.com>
Date: Wed, 30 Nov 2016 10:01:02 -0500
Subject: [PATCH 2/5] Update vue-loader to version 10.0.0 to work with Vue 2.1
 (#21)

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

diff --git a/package.json b/package.json
index b51f7b9..edc917c 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,6 @@
     "file-loader": "^0.9.0",
     "sass-loader": "^4.0.0",
     "url-loader": "^0.5.7",
-    "vue-loader": "^9.3.2"
+    "vue-loader": "^10.0.0"
   }
 }

From 690a65707bcae87f12278aa92d190efbcd6b3964 Mon Sep 17 00:00:00 2001
From: Luke Policinski <Luke@LukePOLO.com>
Date: Wed, 30 Nov 2016 10:01:14 -0500
Subject: [PATCH 3/5] Update index.js (#23)

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 3f0886c..d64a928 100644
--- a/index.js
+++ b/index.js
@@ -5,7 +5,7 @@ Elixir.ready(function () {
     // ensure we are using the version of Vue that supports templates
     resolve: {
       alias: {
-        vue: 'vue/dist/vue.js'
+        vue: 'vue/dist/vue.common.js'
       },
       extensions: ['.js', '.vue']
     },

From 336e76e3e93d5f023a4219b8ecc2fdeb435d983f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Nov 2016 11:15:43 -0500
Subject: [PATCH 4/5] bump deps

---
 README.md    | 24 ++++++++++++++++++++++++
 index.js     |  5 ++---
 package.json |  8 ++++++--
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 4d73553..fe0364b 100644
--- a/README.md
+++ b/README.md
@@ -23,3 +23,27 @@ elixir(function(mix) {
   mix.webpack('app.js'); // resources/assets/js/app.js
 })
 ```
+
+## Extending/Modifying the Default Config
+
+From Elixir's docs:
+
+> If you'd like to leverage more of Webpack's functionality, Elixir will read any webpack.config.js file that is in your project root and factor its configuration into the build process.
+
+For example, to make Vue use `sass-loader` for `<style lang="scss">`:
+
+``` js
+// webpack.config.js
+module.exports = {
+  vue: {
+    loaders: {
+      js: 'buble-loader',
+      scss: 'vue-style-loader!css-loader!sass-loader'
+    }
+  }
+}
+```
+
+## Using Spread Operator
+
+The [Object spread operator](https://github.com/sebmarkbage/ecmascript-rest-spread) requires `Object.assign` to be available. Make sure to [polyfill it](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill) if you target browsers that don't support it yet.
diff --git a/index.js b/index.js
index d64a928..51d51ec 100644
--- a/index.js
+++ b/index.js
@@ -9,10 +9,9 @@ Elixir.ready(function () {
       },
       extensions: ['.js', '.vue']
     },
-    // use buble loader since it is the default in Elixir
     vue: {
-      loaders: {
-        js: 'buble-loader'
+      buble: {
+        objectAssign: 'Object.assign'
       }
     },
     module: {
diff --git a/package.json b/package.json
index edc917c..e62a77a 100644
--- a/package.json
+++ b/package.json
@@ -17,11 +17,15 @@
     "url": "https://github.com/vuejs/laravel-elixir-vue-2/issues"
   },
   "homepage": "https://github.com/vuejs/laravel-elixir-vue-2#readme",
+  "peerDependencies": {
+    "vue": "^2.1.0"
+  },
   "dependencies": {
-    "css-loader": "^0.23.1",
+    "css-loader": "^0.26.0",
     "file-loader": "^0.9.0",
     "sass-loader": "^4.0.0",
     "url-loader": "^0.5.7",
-    "vue-loader": "^10.0.0"
+    "vue-loader": "^10.0.0",
+    "vue-template-compiler": "^2.1.0"
   }
 }

From 326c18c6ce05237ce2ccf09fb4b1b82a563225b2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Nov 2016 11:16:06 -0500
Subject: [PATCH 5/5] 0.3.0

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

diff --git a/package.json b/package.json
index e62a77a..e491763 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "laravel-elixir-vue-2",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "'Laravel Elixir Vue 2.0 Integration'",
   "main": "index.js",
   "repository": {