1.1.1

avoid flash of 'no data' when loading favorites

CHANGELOG.md

@@ -1,6 +1,21 @@
 ### Changelog
 
-#### 1.0.0 (9 September 2018)
+#### [v1.1.1](https://git.w33ble.com/w33ble/strain-tools/compare/v1.1.0...v1.1.1) (2 August 2019)
+- fix: only pre-render the main page [`cb2b782`](https://git.w33ble.com/w33ble/strain-tools/commit/cb2b7827f11bb9db029d7d9fd7fbe9a6a27930f2)
+
+#### [v1.1.0](https://git.w33ble.com/w33ble/strain-tools/compare/v1.0.2...v1.1.0) (18 September 2018)
+- feat: basic routing and fav nav [`3b39345`](https://git.w33ble.com/w33ble/strain-tools/commit/3b39345fa66ac4748a400e9e80e032ec9ae9697b)
+- feat: show favorite strain cards [`85efbd8`](https://git.w33ble.com/w33ble/strain-tools/commit/85efbd84d1704c55a3eefae7fa2d36e7fd7f3cc2)
+- fix: weird bug in StrainList [`2c60ec4`](https://git.w33ble.com/w33ble/strain-tools/commit/2c60ec4afc16f81fd6b610443091d26d278d3f81)
+
+#### [v1.0.2](https://git.w33ble.com/w33ble/strain-tools/compare/v1.0.1...v1.0.2) (13 September 2018)
+
+#### [v1.0.1](https://git.w33ble.com/w33ble/strain-tools/compare/v1.0.0...v1.0.1) (13 September 2018)
+- fix: correct localstorage fallback [`d5b0cd0`](https://git.w33ble.com/w33ble/strain-tools/commit/d5b0cd07307dbf06d8d4530803a00c2b2ab8c4c5)
+- docs: update readme with usable scripts [`5bdd35b`](https://git.w33ble.com/w33ble/strain-tools/commit/5bdd35b74b417706c76bd50d7162567b60dbdcb2)
+- fix: scrape strains alphabetically [`fa2db8d`](https://git.w33ble.com/w33ble/strain-tools/commit/fa2db8d4304b0b0d91221b4ef942daa74ab3df94)
+
+#### v1.0.0 (9 September 2018)
 - fix: assign key to strain cards [`e3e95e7`](https://git.w33ble.com/w33ble/strain-tools/commit/e3e95e7c2b390ca52633e84604cf6a4a9b239d54)
 - fix: remove listener on form unmount [`4591a47`](https://git.w33ble.com/w33ble/strain-tools/commit/4591a47dbaa62cbd330bbc9b96ace2be1ace8bd6)
 - feat: add fav/unfav control [`50a3b1d`](https://git.w33ble.com/w33ble/strain-tools/commit/50a3b1db92a64fcd7e10e35ba045a3970a1440ba)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "strain-tools",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "strain tools",
   "main": "index",
   "module": "index.mjs",
@@ -9,10 +9,10 @@
     "lint": "eslint \"packages/*/*.{js,mjs,vue}\" \"packages/*/src/**/*.{js,mjs,vue}\"",
     "precommit": "lint-staged",
     "prepush": "npm run lint",
-    "version": "auto-changelog -p && auto-authors && git add CHANGELOG.md AUTHORS.md",
+    "sync-versions": "node -r esm scripts/version-sync.mjs",
+    "version": "npm run sync-versions && auto-changelog -p && auto-authors && git add CHANGELOG.md AUTHORS.md packages",
     "start": "node .",
-    "dev": "nodemon --ignore db.json .",
-    "setversion": "npx oao reset-all-versions"
+    "dev": "nodemon --ignore db.json ."
   },
   "repository": {
     "type": "git",
@@ -33,10 +33,10 @@
     "commitLimit": false
   },
   "lint-staged": {
-    "*.{js,mjs}": [
+    "*.{js,mjs,vue}": [
       "eslint --fix"
     ],
-    "*.{js,mjs,json,css}": [
+    "*.{js,mjs,vue,json,css}": [
       "prettier --write"
     ]
   },
@@ -61,7 +61,6 @@
     "eslint-plugin-react": "^7.1.0",
     "husky": "^0.14.3",
     "lint-staged": "^7.0.4",
-    "oao": "^1.5.1",
     "prettier": "^1.9.0"
   }
 }

packages/scraper/README.md

@@ -8,5 +8,3 @@ Clone repo and run the command. Resulting data can be found in `db.json`.
 yarn install
 yarn start
 ```
-
-**NOTE**: You may need to run it multiple times (4 or 5 should do it), since some strains will get skipped the first few times. I don't know if it's leafly's endpoint or some weird race condition in the scraping code though.

packages/scraper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scraper",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "private": true,
   "description": "scrapes strain info, stores for later reference",
   "main": "index",

packages/scraper/src/leafly.mjs

@@ -8,14 +8,14 @@ const adapter = new FileAsync('db.json');
 const xhr = axios.create({
   headers: {
     Accept: 'application/json, text/plain, */*',
-    Referer: 'https://www.leafly.com/explore',
+    Referer: 'https://www.leafly.com/explore/sort-alpha',
   },
 });
 
 const pSeries = tasks => tasks.reduce((c, task) => c.then(task), Promise.resolve());
 
 const getPage = async num => {
-  const url = `https://www.leafly.com/explore/page-${num}`;
+  const url = `https://www.leafly.com/explore/page-${num}/sort-alpha`;
   const response = await xhr.get(url, {
     responseType: 'json',
   });

packages/search-site/README.md

@@ -6,6 +6,12 @@ Strain search static website. Use it to search for strains by name, effects, med
 
 Based on data from leafly. You'll need to run the scraper first since that's where the data comes from.
 
+## Usage
+
+- `yarn start`: starts the dev server, with HMR
+- `yarn build`: builds the static site into the `dist` path
+- `yarn deploy`: builds and deploys the app onto firebase
+
 #### License
 
 MIT © [w33ble](https://github.com/w33ble)

packages/search-site/package.json

@@ -1,6 +1,6 @@
 {
   "name": "search-site",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "private": true,
   "main": "index",
   "module": "index.mjs",
@@ -16,10 +16,8 @@
     "cjs": true
   },
   "dependencies": {
-    "ejs": "^2.6.1",
     "esm": "^3.0.82",
     "lunr": "^2.3.3",
-    "mitt": "^1.1.3",
     "vue": "^2.5.17",
     "vue-router": "^3.0.1",
     "vue-template-compiler": "^2.5.17"
@@ -29,7 +27,6 @@
     "babel-eslint": "^9.0.0",
     "eslint-plugin-vue": "^4.7.1",
     "firebase-tools": "^4.2.1",
-    "nodemon": "^1.18.4",
     "poi": "^10.2.10"
   }
 }

packages/search-site/poi.config.js

@@ -4,5 +4,9 @@ const path = require('path');
 module.exports = {
   entry: path.resolve(__dirname, 'src/index.mjs'),
   outDir: 'dist',
-  plugins: [require('@poi/plugin-vue-static')()],
+  plugins: [
+    require('@poi/plugin-vue-static')({
+      routes: ['/'],
+    }),
+  ],
 };

packages/search-site/src/components/AppNav.vue

@@ -0,0 +1,14 @@
+<template>
+  <div id="app-nav" class="tabs">
+    <ul>
+      <li class="is-active"><a>Search</a></li>
+      <li><a>Favorites</a></li>
+    </ul>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AppNav',
+};
+</script>

packages/search-site/src/components/SearchForm.vue

@@ -1,89 +1,81 @@
 <template>
   <form @submit.prevent="handleSubmit">
-      <div class="container">
-        <h1 class="title">
-          Strain Search
-        </h1>
+    <!-- Name Search Input -->
+    <div class="field">
+      <label class="label">Search By Name</label>
+      <div class="control">
+        <input ref="name" class="input" type="text" placeholder="Text input">
+        <p v-if="error.length" class="help is-danger">{{error}}</p>
+      </div>
+    </div>
 
-        <!-- Name Search Input -->
-        <div class="field">
-          <label class="label">Search By Name</label>
-          <div class="control">
-            <input ref="name" class="input" type="text" placeholder="Text input">
-            <p v-if="error.length" class="help is-danger">{{error}}</p>
-          </div>
-        </div>
-
-        <!-- Multi-Selects -->
-        <div class="columns filters">
+    <!-- Multi-Selects -->
+    <div class="columns filters">
+      <div class="column is-half">
+        <div class="columns is-mobile">
           <div class="column is-half">
-            <div class="columns is-mobile">
-              <div class="column is-half">
-                <div class="field">
-                  <label class="label">Desired Effects</label>
-                  <div class="select is-multiple">
-                    <select ref="effects" multiple size="6">
-                      <option v-for="effect in effects" :key="effect" :value="effect">{{effect | capitalize}}</option>
-                    </select>
-                  </div>
-                </div>
-              </div>
-              <div class="column is-half">
-                <div class="field">
-                  <label class="label">Medical Use</label>
-                  <div class="select is-multiple">
-                    <select ref="uses" multiple size="6">
-                      <option v-for="use in uses" :key="use" :value="use">{{use | capitalize}}</option>
-                    </select>
-                  </div>
-                </div>
+            <div class="field">
+              <label class="label">Desired Effects</label>
+              <div class="select is-multiple">
+                <select ref="effects" multiple size="6">
+                  <option v-for="effect in effects" :key="effect" :value="effect">{{effect | capitalize}}</option>
+                </select>
               </div>
             </div>
           </div>
-
           <div class="column is-half">
-            <div class="columns is-mobile">
-              <div class="column is-half">
-                <div class="field">
-                  <label class="label">Condition</label>
-                  <div class="select is-multiple">
-                    <select ref="conditions" multiple size="6">
-                      <option v-for="condition in conditions" :key="condition" :value="condition">{{condition | capitalize}}</option>
-                    </select>
-                  </div>
-                </div>
-              </div>
-
-              <div class="column is-half">
-                <div class="field">
-                  <label class="label">Flavor</label>
-                  <div class="select is-multiple">
-                    <select ref="flavors" multiple size="6">
-                      <option v-for="flavor in flavors" :key="flavor" :value="flavor">{{flavor | capitalize}}</option>
-                    </select>
-                  </div>
-                </div>
+            <div class="field">
+              <label class="label">Medical Use</label>
+              <div class="select is-multiple">
+                <select ref="uses" multiple size="6">
+                  <option v-for="use in uses" :key="use" :value="use">{{use | capitalize}}</option>
+                </select>
               </div>
             </div>
           </div>
         </div>
-
-        <!-- Form Submits  -->
-        <div class="field is-grouped">
-          <div class="control">
-            <button type="submit" class="button is-link">Submit</button>
-          </div>
-          <div class="control">
-            <button type="button" class="button is-text" @click.prevent="resetForm">Clear</button>
-          </div>
-        </div>
       </div>
-    </form>
+
+      <div class="column is-half">
+        <div class="columns is-mobile">
+          <div class="column is-half">
+            <div class="field">
+              <label class="label">Condition</label>
+              <div class="select is-multiple">
+                <select ref="conditions" multiple size="6">
+                  <option v-for="condition in conditions" :key="condition" :value="condition">{{condition | capitalize}}</option>
+                </select>
+              </div>
+            </div>
+          </div>
+
+          <div class="column is-half">
+            <div class="field">
+              <label class="label">Flavor</label>
+              <div class="select is-multiple">
+                <select ref="flavors" multiple size="6">
+                  <option v-for="flavor in flavors" :key="flavor" :value="flavor">{{flavor | capitalize}}</option>
+                </select>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Form Submits  -->
+    <div class="field is-grouped">
+      <div class="control">
+        <button type="submit" class="button is-link">Submit</button>
+      </div>
+      <div class="control">
+        <button type="button" class="button is-text" @click.prevent="resetForm">Clear</button>
+      </div>
+    </div>
+  </form>
 </template>
 
 <script>
-import emitter from '../lib/emitter.mjs';
-
 const getMultiValues = node => Array.from(node.selectedOptions).map(o => o.value);
 
 export default {
@@ -92,17 +84,10 @@ export default {
     uses: Array,
     conditions: Array,
     flavors: Array,
-  },
-  data() {
-    return {
-      error: '',
-    };
-  },
-  created() {
-    emitter.on('error', this.setError);
-  },
-  beforeDestroy() {
-    emitter.off('error', this.setError);
+    error: {
+      type: String,
+      default: '',
+    },
   },
   methods: {
     handleSubmit() {
@@ -114,15 +99,11 @@ export default {
         flavors: getMultiValues(this.$refs.flavors),
       };
 
-      this.error = '';
-      emitter.emit('search', requirements);
+      this.$emit('search', requirements);
     },
     resetForm() {
       this.$el.reset();
     },
-    setError(msg) {
-      this.error = msg;
-    },
   },
 };
 </script>

packages/search-site/src/components/StrainCard.vue

@@ -31,7 +31,6 @@
 
 <script>
 import store from '../lib/store.mjs';
-import emitter from '../lib/emitter.mjs';
 import TagList from './TagList.vue';
 
 export default {
@@ -50,8 +49,22 @@ export default {
   },
   methods: {
     toggleFavorite() {
-      this.favorite = !this.favorite;
-      emitter.emit('favorite', { id: this.strain.id, isFav: this.favorite });
+      const isFav = !this.favorite;
+      const { id } = this.strain;
+      const favs = store.get('favorites') || [];
+      const idx = favs.indexOf(id);
+
+      // update component state
+      this.favorite = isFav;
+
+      // update the store
+      if (idx >= 0 && !isFav) {
+        // remove previously favorited strain
+        store.set('favorites', favs.filter(f => f !== id));
+      } else if (idx === -1 && isFav) {
+        // add new favorited strain
+        store.set('favorites', favs.concat(id));
+      }
     },
   },
 };

packages/search-site/src/components/StrainList.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="container">
+  <div>
     <div>
-      <h3 v-if="strains.length === 0" class="title is-3">No Matching Strains :(</h3>
-      <h3 v-if="strains.length > 0" class="title is-3">Found {{strains.length}} Strains</h3>
+      <h3 v-show="strains.length === 0" class="title is-3">No Matching Strains :(</h3>
+      <h3 v-show="strains.length > 0" class="title is-3">Found {{strains.length}} Strains</h3>
     </div>
 
     <div class="cards">

packages/search-site/src/filters.mjs

@@ -0,0 +1,12 @@
+import Vue from 'vue';
+
+Vue.filter('capitalize', value => {
+  if (!value) return '';
+  const v = value.toString();
+  return v.charAt(0).toUpperCase() + v.slice(1);
+});
+
+Vue.filter('round', (value, digits = 2) => {
+  const v = parseFloat(value, 10);
+  return Math.round(v * (10 * digits)) / (10 * digits);
+});

packages/search-site/src/index.mjs

@@ -1,26 +1,44 @@
 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);
 
-Vue.filter('capitalize', value => {
-  if (!value) return '';
-  const v = value.toString();
-  return v.charAt(0).toUpperCase() + v.slice(1);
-});
-
-Vue.filter('round', (value, digits = 2) => {
-  const v = parseFloat(value, 10);
-  return Math.round(v * (10 * digits)) / (10 * digits);
-});
-
 const router = new Router({
   mode: 'history',
   routes: [
     {
       path: '/',
-      name: 'home',
-      component: () => import(/* webpackChunkName: "homeapp" */ './pages/Home.vue'),
+      component: () => import(/* webpackChunkName: "Home" */ './pages/Home.vue'),
+      children: [
+        {
+          path: '',
+          name: 'search',
+          component: () => import(/* webpackChunkName: "Search" */ './pages/Search.vue'),
+        },
+        {
+          path: 'favorites',
+          name: 'favorites',
+          component: () => import(/* webpackChunkName: "Favorites" */ './pages/Favorites.vue'),
+        },
+      ],
     },
   ],
 });

packages/search-site/src/lib/emitter.mjs

@@ -1,5 +0,0 @@
-import mitt from 'mitt';
-
-const emitter = mitt();
-
-export default emitter;

packages/search-site/src/lib/store.mjs

@@ -1,14 +1,15 @@
 /* eslint-env browser */
 
 const storage = (() => {
-  // return localstorage in the browser env
-  if (this && this.localStorage) return this.localStorage;
-
-  // return a mock localstorage in the server env
-  return {
-    getItem: () => null,
-    setItem: () => null,
-  };
+  try {
+    return window.localStorage;
+  } catch (err) {
+    // return a mock localstorage in the server env
+    return {
+      getItem: () => null,
+      setItem: () => null,
+    };
+  }
 })();
 
 export default {

packages/search-site/src/pages/Favorites.vue

@@ -0,0 +1,43 @@
+<template>
+  <div id="favorites-page">
+    <div class="container">
+      <h1 class="title">
+        Favorites
+      </h1>
+
+      <h3 class="title is-5">
+        Strains you have saved
+      </h3>
+    </div>
+
+    <section class="section">
+      <div class="container">
+        <StrainList :strains="favoriteStrains" no-save-control />
+      </div>
+    </section>
+  </div>
+</template>
+
+<script>
+import store from '../lib/store.mjs';
+import StrainList from '../components/StrainList.vue';
+
+export default {
+  name: 'FavoritesPage',
+  components: {
+    StrainList,
+  },
+  data() {
+    const favorites = store.get('favorites') || [];
+
+    return {
+      favorites,
+    };
+  },
+  computed: {
+    favoriteStrains() {
+      return this.$strainData.strains.filter(strain => this.favorites.indexOf(strain.id) !== -1);
+    },
+  },
+};
+</script>

packages/search-site/src/pages/Home.vue

@@ -1,27 +1,31 @@
 <template>
-  <div>
-    <section class="section">
-      <SearchForm :effects="effects" :uses="uses" :conditions="conditions" :flavors="flavors" />
-    </section>
-    <section class="section">
-      <StrainList :strains="matches" />
-    </section>
+  <div id="home-page">
+    <div id="app-nav" class="tabs is-centered">
+      <ul>
+        <li :class="{'is-active': activeTab === 'search'}" @click="setActive('search')">
+          <router-link :to="{name: 'search'}">Search</router-link>
+        </li>
+        <li :class="{'is-active': activeTab === 'favorites'}" @click="setActive('favorites')">
+          <router-link :to="{name: 'favorites'}">Favorites</router-link>
+        </li>
+      </ul>
+    </div>
+    <router-view></router-view>
   </div>
 </template>
 
 <script>
-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';
-
 export default {
-  name: 'Home',
-  components: {
-    SearchForm,
-    StrainList,
+  name: 'HomePage',
+  data() {
+    return {
+      activeTab: this.$route.name,
+    };
+  },
+  methods: {
+    setActive(name) {
+      this.activeTab = name;
+    },
   },
   head: {
     title: 'Strain Search',
@@ -32,118 +36,5 @@ export default {
       },
     ],
   },
-  data() {
-    return {
-      ...data,
-      matches: [],
-      requirements: {
-        name: '',
-        effects: [],
-        uses: [],
-        conditions: [],
-        flavors: [],
-      },
-    };
-  },
-  computed: {
-    hasName() {
-      return this.requirements.name.length > 0;
-    },
-    hasFilters() {
-      return (
-        this.requirements.effects.length > 0 ||
-        this.requirements.uses.length > 0 ||
-        this.requirements.conditions.length > 0 ||
-        this.requirements.flavors.length > 0
-      );
-    },
-    searchParams() {
-      const searchParts = [this.requirements.name];
-      this.requirements.effects.forEach(t => searchParts.push(`+effects:${t}`));
-      this.requirements.uses.forEach(t => searchParts.push(`+uses:${t}`));
-      this.requirements.conditions.forEach(t => searchParts.push(`+conditions:${t}`));
-      this.requirements.flavors.forEach(t => searchParts.push(`+flavors:${t}`));
-
-      return searchParts.join(' ');
-    },
-  },
-  methods: {
-    showDefaults(limit = 40) {
-      // const favs = store.get('favorites') || [];
-      // const favStrains = this.strains.filter(({ id }) => favs.indexOf(id) !== -1);
-      // this.matches = favStrains.concat(this.strains.slice(0, limit - favStrains.length));
-
-      this.matches = this.strains.slice(0, limit);
-    },
-    updateMatches(limit = 40) {
-      if (!this.hasName && !this.hasFilters) {
-        this.showDefaults(limit);
-        return;
-      }
-
-      try {
-        const hits = this.idx.search(this.searchParams);
-        // .slice(0, limit);
-        const refs = hits.map(({ ref }) => parseInt(ref, 10));
-
-        this.matches = this.strains
-          .map(strain => {
-            const idx = refs.indexOf(strain.id);
-            if (idx < 0) return null;
-            return Object.assign({ score: hits[idx].score }, strain);
-          })
-          .filter(Boolean)
-          .sort((a, b) => {
-            if (a.score === b.score) {
-              // sort matching search score by adjusted rating
-              if (a.rating_adjusted === b.rating_adjusted) return 0;
-              return a.rating_adjusted > b.rating_adjusted ? -1 : 1;
-            }
-            return a.score > b.score ? -1 : 1;
-          });
-      } catch (err) {
-        this.matches = [];
-        emitter.emit('error', err.message);
-      }
-    },
-  },
-  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;
-      this.updateMatches();
-    };
-
-    // listen for search form submissions
-    emitter.on('search', r => this.searchListener(r));
-
-    // listen for favorite changes
-    emitter.on('favorite', ({ id, isFav }) => {
-      const favs = store.get('favorites') || [];
-      const idx = favs.indexOf(id);
-
-      // remove previously favorited strain
-      if (idx >= 0 && !isFav) {
-        store.set('favorites', favs.filter(f => f !== id));
-      } else if (idx === -1 && isFav) {
-        store.set('favorites', favs.concat(id));
-      }
-    });
-    this.updateMatches(); // set initial match list
-  },
-  beforeDestroy() {
-    emitter.off('search', r => this.searchListener(r));
-  },
 };
 </script>

packages/search-site/src/pages/Search.vue

@@ -0,0 +1,140 @@
+<template>
+  <div id="search-page">
+    <div class="container">
+      <h1 class="title">
+        Strain Search
+      </h1>
+    </div>
+
+    <section class="section">
+      <div class="container">
+        <SearchForm
+          :effects="effects"
+          :uses="uses"
+          :conditions="conditions"
+          :flavors="flavors"
+          :error="error"
+          @search="onSearch"
+        />
+      </div>
+    </section>
+
+    <section class="section">
+      <div class="container">
+        <StrainList :strains="matches" />
+      </div>
+    </section>
+  </div>
+</template>
+
+<script>
+import SearchForm from '../components/SearchForm.vue';
+import StrainList from '../components/StrainList.vue';
+
+export default {
+  name: 'SearchPage',
+  components: {
+    SearchForm,
+    StrainList,
+  },
+  data() {
+    return {
+      error: '',
+      matches: [],
+      requirements: {
+        name: '',
+        effects: [],
+        uses: [],
+        conditions: [],
+        flavors: [],
+      },
+    };
+  },
+  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;
+    },
+    hasFilters() {
+      return (
+        this.requirements.effects.length > 0 ||
+        this.requirements.uses.length > 0 ||
+        this.requirements.conditions.length > 0 ||
+        this.requirements.flavors.length > 0
+      );
+    },
+    searchParams() {
+      const searchParts = [this.requirements.name];
+      this.requirements.effects.forEach(t => searchParts.push(`+effects:${t}`));
+      this.requirements.uses.forEach(t => searchParts.push(`+uses:${t}`));
+      this.requirements.conditions.forEach(t => searchParts.push(`+conditions:${t}`));
+      this.requirements.flavors.forEach(t => searchParts.push(`+flavors:${t}`));
+
+      return searchParts.join(' ');
+    },
+  },
+  methods: {
+    onSearch(reqs) {
+      this.requirements = reqs;
+      this.updateMatches();
+    },
+    showDefaults(limit = 40) {
+      // const favs = store.get('favorites') || [];
+      // const favStrains = this.strains.filter(({ id }) => favs.indexOf(id) !== -1);
+      // this.matches = favStrains.concat(this.strains.slice(0, limit - favStrains.length));
+
+      this.matches = this.strains.slice(0, limit);
+    },
+    updateMatches(limit = 40) {
+      this.error = '';
+
+      if (!this.hasName && !this.hasFilters) {
+        this.showDefaults(limit);
+        return;
+      }
+
+      try {
+        const hits = this.$lunr.search(this.searchParams);
+        // .slice(0, limit);
+        const refs = hits.map(({ ref }) => parseInt(ref, 10));
+
+        this.matches = this.strains
+          .map(strain => {
+            const idx = refs.indexOf(strain.id);
+            if (idx < 0) return null;
+            return Object.assign({ score: hits[idx].score }, strain);
+          })
+          .filter(Boolean)
+          .sort((a, b) => {
+            if (a.score === b.score) {
+              // sort matching search score by adjusted rating
+              if (a.rating_adjusted === b.rating_adjusted) return 0;
+              return a.rating_adjusted > b.rating_adjusted ? -1 : 1;
+            }
+            return a.score > b.score ? -1 : 1;
+          });
+      } catch (err) {
+        this.matches = [];
+        this.error = err.message;
+      }
+    },
+  },
+  created() {
+    this.updateMatches(); // set initial match list
+  },
+};
+</script>

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);
+    },
+  };
+}

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;
+  },
+};

scripts/version-sync.mjs

@@ -0,0 +1,26 @@
+import fs from 'fs';
+import { promisify } from 'util';
+import { join } from 'path';
+import pkg from '../package.json';
+
+const readDir = promisify(fs.readdir);
+const readFile = promisify(fs.readFile);
+const writeFile = promisify(fs.writeFile);
+
+async function syncPackageVersions() {
+  const packagesPath = 'packages'; // path for all packages
+  const { version } = pkg;
+
+  const packages = await readDir(packagesPath);
+
+  packages.forEach(async pack => {
+    const packagePath = join(packagesPath, pack, 'package.json');
+    const p = JSON.parse(await readFile(packagePath, 'utf-8'));
+    p.version = version;
+    await writeFile(packagePath, `${JSON.stringify(p, null, 2)}\n`);
+  });
+
+  console.log(`Versions with root: ${version}`);
+}
+
+syncPackageVersions();

yarn.lock

@@ -1004,10 +1004,6 @@ ansi-escapes@^1.0.0, ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
-ansi-escapes@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b"
-
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
@@ -1202,13 +1198,6 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async-kit@^2.2.3:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/async-kit/-/async-kit-2.2.4.tgz#53249064fc5c894c46210cbd1c1a9ff5bd44bf9f"
-  dependencies:
-    nextgen-events "^0.14.5"
-    tree-kit "^0.5.27"
-
 async@2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
@@ -1358,7 +1347,7 @@ babel-plugin-transform-vue-jsx@^3.5.0:
   dependencies:
     esutils "^2.0.2"
 
-babel-polyfill@6.26.0, babel-polyfill@^6.26.0:
+babel-polyfill@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
   dependencies:
@@ -1821,7 +1810,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@1.x, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -2072,10 +2061,6 @@ combined-stream@1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-
 commander@2.17.x, commander@^2.11.0, commander@^2.14.1, commander@^2.8.1, commander@^2.9.0, commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
@@ -2874,10 +2859,6 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-ejs@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
-
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.62:
   version "1.3.64"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.64.tgz#39f5a93bf84ab7e10cfbb7522ccfc3f1feb756cf"
@@ -3258,18 +3239,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.3.tgz#57b69a594f081759c69e5370f0d17b9cb11658fe"
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
@@ -3890,16 +3859,6 @@ globals@^11.0.1, globals@^11.1.0:
   version "11.7.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
 
-globby@6.1.0, globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 globby@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
@@ -3911,6 +3870,16 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 globby@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
@@ -4493,25 +4462,6 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
-inquirer@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.2.1.tgz#06ceb0f540f45ca548c17d6840959878265fa175"
-  dependencies:
-    ansi-escapes "^2.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
 inquirer@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
@@ -4556,10 +4506,6 @@ internal-ip@^3.0.1:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
 
-interpret@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-
 into-stream@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
@@ -5060,10 +5006,6 @@ jws@^3.0.0, jws@^3.1.4, jws@^3.1.5:
     jwa "^1.1.5"
     safe-buffer "^5.0.1"
 
-kebab-case@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/kebab-case/-/kebab-case-1.0.0.tgz#3f9e4990adcad0c686c0e701f7645868f75f91eb"
-
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
@@ -5750,10 +5692,6 @@ mississippi@^2.0.0:
     stream-each "^1.1.0"
     through2 "^2.0.0"
 
-mitt@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.1.3.tgz#528c506238a05dce11cd914a741ea2cc332da9b8"
-
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
@@ -5898,14 +5836,6 @@ next-tick@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
 
-nextgen-events@^0.14.5:
-  version "0.14.6"
-  resolved "https://registry.yarnpkg.com/nextgen-events/-/nextgen-events-0.14.6.tgz#945b3fc75951fe8c945f8455c35bf644a3a2c8b1"
-
-nextgen-events@^0.9.8:
-  version "0.9.9"
-  resolved "https://registry.yarnpkg.com/nextgen-events/-/nextgen-events-0.9.9.tgz#39a8afc4a2b845388c57e2c6bb9716711986a3a0"
-
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -6109,26 +6039,6 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-oao@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/oao/-/oao-1.5.1.tgz#ead609ee2b36bf56699f06a38be16340ce6be099"
-  dependencies:
-    babel-polyfill "6.26.0"
-    commander "2.11.0"
-    execa "0.6.3"
-    globby "6.1.0"
-    inquirer "3.2.1"
-    kebab-case "1.0.0"
-    minimatch "^3.0.4"
-    rimraf "2.6.1"
-    semver "5.4.1"
-    shelljs "0.7.8"
-    split "1.0.1"
-    storyboard "3.1.1"
-    storyboard-listener-console "3.1.1"
-    storyboard-listener-console-parallel "3.1.2"
-    timm "1.2.5"
-
 oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
@@ -6557,10 +6467,6 @@ pkginfo@0.x.x:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff"
 
-platform@1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.3.tgz#646c77011899870b6a0903e75e997e8e51da7461"
-
 please-upgrade-node@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
@@ -7204,12 +7110,6 @@ readline2@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     mute-stream "0.0.5"
 
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  dependencies:
-    resolve "^1.1.6"
-
 redent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
@@ -7452,7 +7352,7 @@ resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
-resolve@^1.1.6, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1:
+resolve@^1.2.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   dependencies:
@@ -7503,12 +7403,6 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
-  dependencies:
-    glob "^7.0.5"
-
 rimraf@2.6.2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
@@ -7643,10 +7537,6 @@ semver-diff@^2.0.0:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
 
-semver@5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-
 semver@5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
@@ -7764,14 +7654,6 @@ shell-quote@^1.6.1:
     array-reduce "~0.0.0"
     jsonify "~0.0.0"
 
-shelljs@0.7.8:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -7961,12 +7843,6 @@ split@0.3:
   dependencies:
     through "2"
 
-split@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
-  dependencies:
-    through "2"
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -8031,36 +7907,6 @@ steno@^0.4.1:
   dependencies:
     graceful-fs "^4.1.3"
 
-storyboard-core@^3.1.1:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/storyboard-core/-/storyboard-core-3.1.4.tgz#37a9a45e2b89e8930da748afd491b3c4abeb2ad8"
-  dependencies:
-    chalk "1.x"
-    lodash "^4.17.10"
-    platform "1.3.3"
-    semver "^5.3.0"
-    timm "^1.6.1"
-    uuid "^3.0.1"
-
-storyboard-listener-console-parallel@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/storyboard-listener-console-parallel/-/storyboard-listener-console-parallel-3.1.2.tgz#c1b6fa23537bb0bf4306c6516e8249cf0600544c"
-  dependencies:
-    terminal-kit "^0.26.1"
-    timm "^1.2.3"
-
-storyboard-listener-console@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/storyboard-listener-console/-/storyboard-listener-console-3.1.1.tgz#ace66cfb6353570d7991ece078f3cb34e8115824"
-  dependencies:
-    timm "^1.2.3"
-
-storyboard@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/storyboard/-/storyboard-3.1.1.tgz#8242aa8ab8c413f79b4ce8c4b71a81375607bdab"
-  dependencies:
-    storyboard-core "^3.1.1"
-
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -8113,13 +7959,6 @@ string-format-obj@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string-format-obj/-/string-format-obj-1.1.1.tgz#c7612ca4e2ad923812a81db192dc291850aa1f65"
 
-string-kit@^0.5.12:
-  version "0.5.27"
-  resolved "https://registry.yarnpkg.com/string-kit/-/string-kit-0.5.27.tgz#5bd58b7172d7efd7a2981a398967b8dbc78fabe1"
-  dependencies:
-    tree-kit "^0.5.24"
-    xregexp "^3.2.0"
-
 string-length@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
@@ -8322,15 +8161,6 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terminal-kit@^0.26.1:
-  version "0.26.2"
-  resolved "https://registry.yarnpkg.com/terminal-kit/-/terminal-kit-0.26.2.tgz#545e61585e90c284782a5bb0d17f6f1be9b8f1ad"
-  dependencies:
-    async-kit "^2.2.3"
-    nextgen-events "^0.9.8"
-    string-kit "^0.5.12"
-    tree-kit "^0.5.26"
-
 text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -8386,14 +8216,6 @@ timers-ext@^0.1.5:
     es5-ext "~0.10.14"
     next-tick "1"
 
-timm@1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/timm/-/timm-1.2.5.tgz#2892ac9f490a33e2300e5d94797f184cef16748b"
-
-timm@^1.2.3, timm@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/timm/-/timm-1.6.1.tgz#5f8aafc932248c76caf2c6af60542a32d3c30701"
-
 tmp@0.0.33, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -8477,10 +8299,6 @@ trash@^4.3.0:
     uuid "^3.1.0"
     xdg-trashdir "^2.1.1"
 
-tree-kit@^0.5.24, tree-kit@^0.5.26, tree-kit@^0.5.27:
-  version "0.5.27"
-  resolved "https://registry.yarnpkg.com/tree-kit/-/tree-kit-0.5.27.tgz#d055a7ae6a087dda918cd92ac8c8c2abf5cfaea3"
-
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
@@ -9243,10 +9061,6 @@ xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
 
-xregexp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-3.2.0.tgz#cb3601987bfe2695b584000c18f1c4a8c322878e"
-
 xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"