refactoring

Author: leaves4j

client/webpack.config.js

@@ -1,78 +1,4 @@
-module.exports =
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId])
-/******/ 			return installedModules[moduleId].exports;
-
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-
-
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-
-/******/ 	// identity function for calling harmony imports with the correct context
-/******/ 	__webpack_require__.i = function(value) { return value; };
-
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
-/******/ 		}
-/******/ 	};
-
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
+'use strict';
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
@@ -83,23 +9,13 @@ vueEasyRenderer.install = function (Vue, options) {
       if (this.$isServer || this.$parent) return;
       var initState = window.__VUE_INITIAL_STATE__; //eslint-disable-line 
       if (this.$options.store && initState) {
-        this.$options.store.replaceState(_extends(this.$options.store.state, initState));
+        this.$options.store.replaceState(_extends({}, this.$options.store.state, initState));
       } else {
         var data = typeof this.$options.data === 'function' ? this.$options.data.call(this) : this.$options.data || {};
-        this.$options.data = _extends(data, initState || {});
+        this.$options.data = _extends({}, data, initState);
       }
     }
   });
 };
 
 module.exports = vueEasyRenderer;
-
-/***/ }),
-/* 1 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(0);
-
-
-/***/ })
-/******/ ]);

connect.js

@@ -55,9 +55,8 @@ declare module 'vue' {
 }
 
 declare module 'vue-server-renderer' {
-  declare type RenderCallback = (err: Error | null, html: string) => void;
   declare class VueServerRenderer {
-    renderToString(vm: Vue, context?: Object, callback: RenderCallback): string;
+    renderToString(vm: Vue, context: any, callback: any): string;
     renderToStream(vm: Vue, context?: Object): Readable;
   }
   declare module.exports :{
@@ -72,3 +71,7 @@ declare module 'vuex' {
 declare module 'vue-router' {
   declare module.exports :{ }
 }
+
+declare module 'memory-fs' {
+  declare module.exports: FileSystem;
+}