From 31019454819d366b81adafbf89c8adb486ec012f Mon Sep 17 00:00:00 2001
From: Jakub Juszczak <netghost03@gmail.com>
Date: Sat, 17 Dec 2016 17:29:41 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Add=20mixins=20to=20alias?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/webpack.base.conf.js | 3 ++-
 build/webpack.prod.conf.js | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index 1b14c48..beea8c4 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -16,8 +16,9 @@ module.exports = {
     extensions: ['', '.js', '.vue'],
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
-      'vue': 'vue/dist/vue.js',
+      'vue': 'vue/dist/vue.common.js',
       'src': path.resolve(__dirname, '../src'),
+      'mixins': path.resolve(__dirname, '../src/mixins'),
       'BaseCharts': path.resolve(__dirname, '../src/BaseCharts')
     }
   },
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index 86f9793..a23470c 100644
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -1,6 +1,9 @@
 const webpack = require('webpack')
 const base = require('./webpack.base.conf')
 const config = require('../config')
+var env = process.env.NODE_ENV === 'testing'
+  ? require('../config/test.env')
+  : config.build.env
 
 base.entry = {
   lib: './src/index.js'
@@ -19,9 +22,7 @@ var webpackConfig = Object.assign({}, base)
 webpackConfig.devtool = '#source-map'
 webpackConfig.plugins = (webpackConfig.plugins || []).concat([
   new webpack.DefinePlugin({
-    'process.env': {
-      NODE_ENV: '"production"'
-    }
+    'process.env.NODE_ENV': env
   }),
   new webpack.optimize.UglifyJsPlugin({
     compress: { warnings: false }