From a2f70e00a7aab17bdb483802fe82d3bed7befc58 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 1 Apr 2017 13:49:03 +0200
Subject: [PATCH 1/2] Add an alias from '@' to src

Closes #422
This makes it easier to combine with the official webpack template
---
 bin/vue-build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/vue-build b/bin/vue-build
index 801035c84c..39ade2dda0 100755
--- a/bin/vue-build
+++ b/bin/vue-build
@@ -150,7 +150,9 @@ var webpackConfig = {
       cwd('node_modules'), // modules in cwd's node_modules
       ownDir('node_modules') // modules in package's node_modules
     ],
-    alias: {}
+    alias: {
+      '@': 'src'
+    }
   },
   resolveLoader: {
     modules: [

From fac0b8b2f4d2aa96815c62515eb62af15317f6be Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva@users.noreply.github.com>
Date: Wed, 7 Jun 2017 14:38:17 +0200
Subject: [PATCH 2/2] Update vue-build

---
 bin/vue-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/vue-build b/bin/vue-build
index 39ade2dda0..1a066838ec 100755
--- a/bin/vue-build
+++ b/bin/vue-build
@@ -151,7 +151,7 @@ var webpackConfig = {
       ownDir('node_modules') // modules in package's node_modules
     ],
     alias: {
-      '@': 'src'
+      '@': path.resolve('src')
     }
   },
   resolveLoader: {