Merge branch 'master' into develop

Author: danielcherubini

example/vueFiles/components/uuid.vue

@@ -0,0 +1,20 @@
+<template>
+    <div>
+        <h2>Uuid: {{uuid ? uuid : 'no uuid'}}</h2>
+    </div>
+</template>
+
+<script>
+export default {
+    props: ['uuid'],
+    data: function () {
+        return {}
+    }
+}
+</script>
+
+<style lang="css">
+.test {
+    color: blue;
+}
+</style>

example/vueFiles/components/uuid2.vue

@@ -0,0 +1,20 @@
+<template>
+    <div>
+        <h3>Uuid2: {{uuid2 ? uuid2 : 'no uuid'}}</h3>
+    </div>
+</template>
+
+<script>
+export default {
+    props: ['uuid2'],
+    data: function () {
+        return {}
+    }
+}
+</script>
+
+<style lang="css">
+.test {
+    color: blue;
+}
+</style>

example/vueFiles/mixins/exampleMixin.js

@@ -0,0 +1,10 @@
+const exampleMixin = {
+    methods: {
+        hello: function () {
+            console.log('Hello');
+        }
+    }
+};
+
+module.exports = exampleMixin;
+exports.default = exampleMixin;

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "express-vue-renderer",
-    "version": "0.6.1",
+    "version": "0.6.3",
     "description": "Rendering Engine for turning Vue files into Javascript Objects",
     "homepage": "https://github.com/express-vue/express-vue-renderer",
     "author": {
@@ -81,7 +81,7 @@
         "xss": "^0.3.3"
     },
     "devDependencies": {
-        "ava": "^0.21.0",
+        "ava": "^0.22.0",
         "babel-cli": "^6.24.1",
         "babel-plugin-transform-flow-strip-types": "^6.22.0",
         "babel-preset-env": "^1.6.0",
@@ -92,7 +92,7 @@
         "eslint-config-xo-space": "^0.16.0",
         "eslint-plugin-flowtype": "^2.35.0",
         "express": "^4.15.4",
-        "flow-bin": "^0.52.0",
+        "flow-bin": "^0.53.0",
         "flow-remove-types": "^1.2.1",
         "jest": "^20.0.4",
         "jest-cli": "^20.0.0",

package.json

@@ -13,8 +13,8 @@ class Options {
     rootPath: string;
     defaults: Models.Defaults;
     constructor(optsObj: Object) {
-        this.vueFileRegex = /([\w/.\-_\d]*\.vue)/igm;
-        this.requireRegex = /(require\(')([\w/.\-_\d]*\.vue)('\))/igm;
+        this.vueFileRegex = /([\w/.\-@_\d]*\.vue)/igm;
+        this.requireRegex = /(require\(')([\w/.\-@_\d]*\.vue)('\))/igm;
         this.appendPaths = optsObj.appendPaths || [];
         this.prependPaths = optsObj.prependPaths || [];
         this.rootPath = optsObj.rootPath || '';