comminting to change branch

Author: danielcherubini

lib/renderer/renderer-webpack.js

@@ -178,30 +178,6 @@ class Renderer {
                 },
             );
         }
-        this.jsToStringOptions = {
-            functions: [{
-                name: "data",
-                // @ts-ignore
-                toString: function(script) {
-                    const func = `module.exports = function data() { return ${jsToString(
-                            script(),
-                        )}; };`;
-                    const required = requireFromString(func);
-                    return String(required);
-                },
-            } ],
-        };
-    }
-    /**
-     * @param {Object} oldData
-     * @param {Object} newData
-     * @returns {Function}
-     */
-    FixData(oldData, newData) {
-        const mergedData = Object.assign({}, oldData, this.data, newData);
-        return function data() {
-            return mergedData;
-        };
     }
     /**
      * @param {string} filePath
@@ -213,24 +189,27 @@ class Renderer {
             const parsedBundlePath = path.parse(filePath);
             const app = `import Vue from "vue";
             import App from "${filePath}";
-            export function createApp (state) {
+
+            export function createApp (data) {
                 const app = new Vue({
-                    render: h => h(App, {props: state})
+                    data,
+                    render: h => h(App)
                 })
                 return { app }
             }`;
 
             const server = `import { createApp } from "./app"
             export default context => {
                 return new Promise((resolve, reject) => {
-                    const { app } = createApp(context.state);
+                    const { app } = createApp(context);
+
                     resolve(app);
                 });
             };`;
 
             const client = `import { createApp } from "./app"
-            const state = window.__INITIAL_STATE__;
-            const { app } = createApp(state ? state : {});
+            const store = window.__INITIAL_STATE__;
+            const { app } = createApp(store ? store : {});
             app.$mount("#app")`;
 
             const parsedFilePath = filePath.replace(this.trueRootPath, "").replace(".vue", "");

package-lock.json

@@ -28,9 +28,11 @@
     "uglify-js": "^3.3.16",
     "vue": "^2.5.16",
     "vue-loader": "^15.0.4",
+    "vue-router": "^3.0.1",
     "vue-server-renderer": "^2.5.16",
     "vue-template-compiler": "^2.5.16",
     "vueify": "^9.4.1",
+    "vuex": "^3.0.1",
     "webpack": "^4.6.0",
     "xss": "^0.3.7"
   },

package.json

@@ -2,13 +2,11 @@
   <div>
     <h1 class="red">{{msg}}</h1>
     <foo hellodata="component"></foo>
-    <p>{{bar}}</p>
-    <div v-html="fakehtml"></div>
+    <p>{{$root.bar}}</p>
+    <div v-html="$root.fakehtml"></div>
     <h1>{{title}}</h1>
     <p>Welcome to the {{title}} demo. Click a link:</p>
-    <p>import fooTransitionExpand from '@foo/styles-animation/src/components/foo-transition-expand.vue';</p>
-    <p>const test = require("foo.vue");</p>
-    <p>const bar = require("bar.vue");</p>
+    <p>{{$root.sentence}}</p>
     <input v-model="messageOuter" placeholder="edit me">
     <button type="button" name="button" v-on:click="hello(messageOuter)">{{messageOuter}}</button>
     <message-comp :message="messageOuter"></message-comp>
@@ -18,21 +16,14 @@
 </template>
 
 <script>
-
+import axios from "axios";
 import foo from "../../components/component.vue";
 import messageComp from '../../components/message-comp.vue';
 import users from '../../components/users.vue';
 import helloMixin from '../../mixins/exampleMixin.js';
 import simple from 'simple-vue-component-test/simple.vue';
 export default {
     props: {
-        bar: {
-            type: Boolean
-        },
-        fakehtml: {
-            type: String,
-            default: ""
-        },
         title: {
             type: String,
             default: ""