Merge branch 'dev'

package.json

@@ -3,12 +3,12 @@
 	"version": "version",
 	
 	"scripts": {
-		"prestart": "npm install",
+		"prestart": "yarn",
 		"start":    "gulp && concurrently \"gulp watch\" \"lite-server\"",
 		
-		"build-testing": "npm install && gulp --env testing",
-		"build-staging": "npm install && gulp --env staging",
-		"build":         "npm install && gulp --env production"
+		"build-testing": "yarn && gulp --env testing",
+		"build-staging": "yarn && gulp --env staging",
+		"build":         "yarn && gulp --env production"
 	},
 	
 	"devDependencies": {

src/js/_deps.js

+'use strict';
+
+module.exports = {
+	Vue: require('vue/dist/vue.runtime.common')
+};

src/js/app.js

 'use strict';
 
-var Vue = require('vue/dist/vue.common');
+var Vue = require('./_deps').Vue;
 
 var app = new Vue({
 	el: '#app',
@@ -8,6 +8,10 @@ var app = new Vue({
 	router: require('./app.router'),
 	store:  require('./app.store'),
 	created: function () {
-		this.$store.dispatch('getData');
+		this.$store.dispatch('fetchData');
 	}
 });
+
+if (process.env.NODE_ENV !== 'production') {
+	window.app = app;
+}

src/js/app.router.js

 'use strict';
 
-var Vue       = require('vue/dist/vue.common');
+var Vue       = require('./_deps').Vue;
 var VueRouter = require('vue-router');
 
 Vue.use(VueRouter);

src/js/app.store.js

 'use strict';
 
-var Vue  = require('vue/dist/vue.common');
+var Vue  = require('./_deps').Vue;
 var Vuex = require('vuex');
 
 Vue.use(Vuex);
@@ -10,7 +10,7 @@ module.exports = new Vuex.Store({
 		module: require('./store/module.store')
 	},
 	actions: {
-		getData: function (context) {
+		fetchData: function (context) {
 			context.dispatch('module/...');
 		}
 	}