From 8c45a533b0a46660db64e7146a4932d60b492c84 Mon Sep 17 00:00:00 2001
From: joe fleming <joe.fleming@gmail.com>
Date: Mon, 17 Sep 2018 18:09:42 -0700
Subject: [PATCH] chore: add data and lunr via plugins

this way lunr is only set up once, which speeds up the loading of the search page. also makes sure the data doesn't increadse the bundle sizes of the various pages that use it.
---
 packages/search-site/src/index.mjs            | 17 ++++++++++
 packages/search-site/src/pages/Favorites.vue  |  4 +--
 packages/search-site/src/pages/Search.vue     | 31 ++++++++++---------
 packages/search-site/src/plugins/lunr.mjs     | 10 ++++++
 .../search-site/src/plugins/strainData.mjs    |  8 +++++
 5 files changed, 53 insertions(+), 17 deletions(-)
 create mode 100644 packages/search-site/src/plugins/lunr.mjs
 create mode 100644 packages/search-site/src/plugins/strainData.mjs

diff --git a/packages/search-site/src/index.mjs b/packages/search-site/src/index.mjs
index 60c8184..34a432d 100644
--- a/packages/search-site/src/index.mjs
+++ b/packages/search-site/src/index.mjs
@@ -1,6 +1,23 @@
 import Vue from 'vue';
 import Router from 'vue-router';
 import './filters.mjs';
+import strainData from './plugins/strainData.mjs';
+import lunr from './plugins/lunr.mjs';
+
+Vue.use(strainData);
+
+Vue.use(
+  lunr(function lunrSetup() {
+    // lunr search index setup
+    this.ref('id');
+    this.field('name');
+    this.field('effects');
+    this.field('uses');
+    this.field('conditions');
+    this.field('flavors');
+    Vue.prototype.$strainData.strains.forEach(doc => this.add(doc));
+  })
+);
 
 Vue.use(Router);
 
diff --git a/packages/search-site/src/pages/Favorites.vue b/packages/search-site/src/pages/Favorites.vue
index 3f65a6b..d3a3aa1 100644
--- a/packages/search-site/src/pages/Favorites.vue
+++ b/packages/search-site/src/pages/Favorites.vue
@@ -19,7 +19,6 @@
 </template>
 
 <script>
-import data from '../../../scraper/db.json';
 import store from '../lib/store.mjs';
 import StrainList from '../components/StrainList.vue';
 
@@ -32,13 +31,12 @@ export default {
     const favorites = store.get('favorites') || [];
 
     return {
-      ...data,
       favorites
     };
   },
   computed: {
     favoriteStrains() {
-      return this.strains.filter(strain => this.favorites.indexOf(strain.id) !== -1);
+      return this.$strainData.strains.filter(strain => this.favorites.indexOf(strain.id) !== -1);
     }
   },
 }
diff --git a/packages/search-site/src/pages/Search.vue b/packages/search-site/src/pages/Search.vue
index a5d71e1..a01dba5 100644
--- a/packages/search-site/src/pages/Search.vue
+++ b/packages/search-site/src/pages/Search.vue
@@ -24,7 +24,6 @@
 import lunr from 'lunr';
 import SearchForm from '../components/SearchForm.vue';
 import StrainList from '../components/StrainList.vue';
-import data from '../../../scraper/db.json';
 import emitter from '../lib/emitter.mjs';
 import store from '../lib/store.mjs';
 
@@ -36,7 +35,6 @@ export default {
   },
   data() {
     return {
-      ...data,
       matches: [],
       requirements: {
         name: '',
@@ -48,6 +46,21 @@ export default {
     };
   },
   computed: {
+    strains() {
+      return this.$strainData.strains;
+    },
+    effects() {
+      return this.$strainData.effects;
+    },
+    uses() {
+      return this.$strainData.uses;
+    },
+    conditions() {
+      return this.$strainData.conditions;
+    },
+    flavors() {
+      return this.$strainData.flavors;
+    },
     hasName() {
       return this.requirements.name.length > 0;
     },
@@ -84,7 +97,7 @@ export default {
       }
 
       try {
-        const hits = this.idx.search(this.searchParams);
+        const hits = this.$lunr.search(this.searchParams);
         // .slice(0, limit);
         const refs = hits.map(({ ref }) => parseInt(ref, 10));
 
@@ -110,17 +123,6 @@ export default {
     },
   },
   created() {
-    // lunr setup
-    this.idx = lunr(function lunrSetup() {
-      this.ref('id');
-      this.field('name');
-      this.field('effects');
-      this.field('uses');
-      this.field('conditions');
-      this.field('flavors');
-      data.strains.forEach(doc => this.add(doc));
-    });
-
     // function to handle search form submissions
     this.searchListener = reqs => {
       this.requirements = reqs;
@@ -142,6 +144,7 @@ export default {
         store.set('favorites', favs.concat(id));
       }
     });
+
     this.updateMatches(); // set initial match list
   },
   beforeDestroy() {
diff --git a/packages/search-site/src/plugins/lunr.mjs b/packages/search-site/src/plugins/lunr.mjs
new file mode 100644
index 0000000..95d3305
--- /dev/null
+++ b/packages/search-site/src/plugins/lunr.mjs
@@ -0,0 +1,10 @@
+/* eslint no-param-reassign: 0 */
+import lunr from 'lunr';
+
+export default function(lunrSetup) {
+  return {
+    install(Vue) {
+      Vue.prototype.$lunr = lunr(lunrSetup);
+    },
+  };
+}
diff --git a/packages/search-site/src/plugins/strainData.mjs b/packages/search-site/src/plugins/strainData.mjs
new file mode 100644
index 0000000..3588ffe
--- /dev/null
+++ b/packages/search-site/src/plugins/strainData.mjs
@@ -0,0 +1,8 @@
+/* eslint no-param-reassign: 0 */
+import data from '../../../scraper/db.json';
+
+export default {
+  install(Vue) {
+    Vue.prototype.$strainData = data;
+  },
+};