From 985077e054c1d00963145a21eb43dcde413902cd Mon Sep 17 00:00:00 2001
From: Jeff Pope <jpopeufl@gmail.com>
Date: Tue, 9 Feb 2021 16:25:58 -0500
Subject: [PATCH] Use patch for list updates (#1511)

* use patch for list updates

* i forget tbh

* create list if and only if it doesnt exist

* cleanup

* fix reference

* add peerDependency for amphora
---
 inputs/autocomplete.vue    |  18 ++-
 inputs/simple-list.test.js |  17 +--
 inputs/simple-list.vue     |  74 +++++++-----
 lib/core-data/api.js       |  19 +++
 lib/lists/actions.js       |  43 ++++++-
 lib/lists/actions.test.js  |  27 +++++
 lib/lists/helpers.js       |  44 -------
 lib/lists/helpers.test.js  |  73 ------------
 package-lock.json          | 230 ++++++++++++++++++-------------------
 package.json               |   1 +
 10 files changed, 266 insertions(+), 280 deletions(-)

diff --git a/inputs/autocomplete.vue b/inputs/autocomplete.vue
index 58c4c72c4..69f718ee8 100644
--- a/inputs/autocomplete.vue
+++ b/inputs/autocomplete.vue
@@ -16,7 +16,7 @@
 <script>
   import _ from 'lodash';
   import item from './autocomplete-item.vue';
-  import { getProp, removeListItem } from '../lib/lists/helpers';
+  import { getItemIndex, getProp } from '../lib/lists/helpers';
 
   export default {
     props: ['args', 'select', 'query', 'focusIndex', 'updateFocusIndex', 'updateMatches', 'unselect', 'disabled'],
@@ -95,25 +95,21 @@
         });
       },
       removeFromList(item) {
-        let stringProperty;
-
         const listName = this.args.list;
 
         this.unselect();
 
-        return this.$store.dispatch('updateList', {
+        return this.$store.dispatch('patchList', {
           listName: listName,
           fn: (items) => {
-            stringProperty = getProp(items, 'text');
+            const stringProperty = getProp(items, 'text'),
+              index = getItemIndex(items, item, stringProperty);
 
-            if (stringProperty) {
-              return removeListItem(items, item, stringProperty);
-            } else {
-              return removeListItem(items, item);
+            if (index !== -1) {
+              return { remove: [items[index]] };
             }
           }
-        })
-          .then(this.fetchListItems);
+        }).then(list => this.listItems = _.map(list, item => _.isObject(item) ? item.text : item));
       }
     },
     mounted() {
diff --git a/inputs/simple-list.test.js b/inputs/simple-list.test.js
index 0a68ecde0..c81aaa02c 100644
--- a/inputs/simple-list.test.js
+++ b/inputs/simple-list.test.js
@@ -23,21 +23,22 @@ describe('SimpleList input', () => {
   test('Should decrease count when there is a removedItem', () => {
     wrapper.vm.removedItem = { text: 'test2' };
 
-    expect(wrapper.vm.handleRemoveItem(items)).toStrictEqual([
-      { text: 'test1', count: 1 },
-      { text: 'test2', count: 1 }
-    ]);
+    // since it exists, it decreases count
+    expect(wrapper.vm.handleRemoveItem(items)).toStrictEqual({
+      add: [{ text: 'test2', count: 1 }],
+      remove: [{ text: 'test2', count: 2 }]
+    });
   });
 
-  test("Should return same array if removedItem doesn't exist", () => {
+  test("Should return undefined removedItem doesn't exist", () => {
     wrapper.vm.removedItem = { text: 'something else' };
 
-    expect(wrapper.vm.handleRemoveItem(items)).toStrictEqual(items);
+    expect(wrapper.vm.handleRemoveItem(items)).toStrictEqual(undefined);
   });
 
-  test('Should return same array if removedItem is null', () => {
+  test('Should return undefined if removedItem is null', () => {
     wrapper.vm.removedItem = null;
 
-    expect(wrapper.vm.handleRemoveItem(items)).toStrictEqual(items);
+    expect(wrapper.vm.handleRemoveItem(items)).toStrictEqual(undefined);
   });
 });
diff --git a/inputs/simple-list.vue b/inputs/simple-list.vue
index ac82c5961..f6a8761e7 100644
--- a/inputs/simple-list.vue
+++ b/inputs/simple-list.vue
@@ -108,7 +108,7 @@
   import simpleListItem from './simple-list-item.vue';
   import simpleListInput from './simple-list-input.vue';
   import attachedButton from './attached-button.vue';
-  import { addListItem, getItemIndex, getProp } from '../lib/lists/helpers';
+  import { getItemIndex, getProp } from '../lib/lists/helpers';
   import { DynamicEvents } from './mixins';
 
   const log = logger(__filename);
@@ -249,7 +249,7 @@
         if (this.args.autocomplete && this.args.autocomplete.allowRemove) {
           const listName = this.args.autocomplete.list;
 
-          return this.$store.dispatch('updateList', {
+          return this.$store.dispatch('patchList', {
             listName: listName,
             fn: this.handleRemoveItem
           });
@@ -268,57 +268,79 @@
           const itemIndex = getItemIndex(items, (this.removedItem || {}).text, 'text');
 
           if (itemIndex !== -1 && items[itemIndex][countProperty]) {
-          // decrease count if the item already exists in the list and count is more than 0
-            items[itemIndex][countProperty]--;
+            // decrease count if the item already exists in the list and count is more than 0
+
+            const old = items[itemIndex],
+              updated = _.cloneDeep(old);
+
+            updated[countProperty]--;
+
             this.removedItem = {};
+
+            return {
+              add: [updated],
+              remove: [old]
+            };
           }
         }
-
-        return items;
       },
       addItem(newItem) {
-        let countProperty,
-          itemIndex,
-          listName,
-          stringProperty;
-
         this.items.push(newItem);
         this.update(this.items);
 
         // only add items to the list if the schema allows it
         if (this.args.autocomplete && this.args.autocomplete.allowCreate) {
-          listName = this.args.autocomplete.list;
+          const listName = this.args.autocomplete.list;
 
-          return this.$store.dispatch('updateList', {
+          return this.$store.dispatch('patchList', {
             listName: listName,
             fn: (items) => {
-            // validate that the list has items with these properties
-              stringProperty = getProp(items, 'text');
-              countProperty = getProp(items, 'count');
+              const patch = {
+                  add: [],
+                  remove: []
+                },
+                // validate that the list has items with these properties
+                stringProperty = getProp(items, 'text'),
+                countProperty = getProp(items, 'count');
 
               if (stringProperty && countProperty) {
-                itemIndex = getItemIndex(items, newItem.text, 'text');
+                const itemIndex = getItemIndex(items, newItem.text, 'text');
 
                 if (itemIndex !== -1) {
-                // increase count if the item already exists in the list
-                  items[itemIndex][countProperty]++;
+                  // remove the old, add new object with new count
+                  const old = items[itemIndex],
+                    updated = _.cloneDeep(old);
 
-                  return items;
+                  patch.remove.push(old);
+
+                  // increase count if the item already exists in the list
+                  updated[countProperty]++;
+                  patch.add.push(updated);
+
+                  return patch;
                 } else {
-                // add item to the list
+                  // add item to the list
                   _.set(newItem, countProperty, 1);
 
-                  return addListItem(items, newItem);
+                  patch.add.push(newItem);
+
+                  return patch;
                 }
               } else if (_.isString(_.head(items))) {
-              // if the list is just an array of strings, just add the string
-              // property
-                return addListItem(items, newItem.text);
+                // if the list is just an array of strings, just add the string property
+
+                if (getItemIndex(items, newItem.text) === -1) {
+                  patch.add.push(newItem.text);
+
+                  return patch;
+                }
               } else if (items.length === 0) {
                 log.warn('The list is empty, unable to determine data structure. Adding item with default data structure.', { action: 'adding item to a list' });
                 _.set(newItem, 'count', 1);
 
-                return addListItem(items, newItem);
+                patch.add.push(newItem);
+
+                return patch;
               }
             }
           });
diff --git a/lib/core-data/api.js b/lib/core-data/api.js
index 07281a900..fc6019d39 100644
--- a/lib/core-data/api.js
+++ b/lib/core-data/api.js
@@ -399,6 +399,25 @@ export function saveList(prefix, listName, items) {
   })).then(expectJSONResult);
 }
 
+/**
+ * convenience function to save list data
+ * @param  {string} prefix
+ * @param  {string} listName
+ * @param {array} items
+ * @return {Promise}
+ */
+export function patchList(prefix, listName, patch) {
+  let uri = `${prefix}${listsRoute}${listName}`;
+
+  assertUri(uri);
+
+  return send(addJsonHeader({
+    method: 'PATCH',
+    url: uri,
+    body: JSON.stringify(patch)
+  })).then(expectJSONResult);
+}
+
 export function getMeta(uri) {
   assertUri(uri);
 
diff --git a/lib/lists/actions.js b/lib/lists/actions.js
index c777b5a64..55e61fd4c 100644
--- a/lib/lists/actions.js
+++ b/lib/lists/actions.js
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { LIST_LOAD_PENDING, LIST_LOAD_SUCCESS, LIST_LOAD_FAIL } from './mutationTypes';
-import { getList as getListFromAPI, saveList } from '../core-data/api';
+import { getList as getListFromAPI, saveList, patchList as patchListAPI } from '../core-data/api';
 
 /**
  * @module lists
@@ -16,15 +16,52 @@ export function getList(store, listName) {
     .catch(error => store.commit(LIST_LOAD_FAIL, { listName, error }));
 }
 
-export function updateList(store, { listName, fn }) {
+/**
+ * if a list doesn't exist, creates the empty list
+ * @param {Object} store
+ * @param {string} listName
+ * @returns {Array<Object>}
+ */
+function getOrStartList(store, listName) {
   const prefix = _.get(store, 'state.site.prefix');
 
   store.commit(LIST_LOAD_PENDING, { listName });
 
   return getListFromAPI(prefix, listName)
-    .catch(() => []) // allow adding to a new list
+    .catch(error => {
+      // if it's a 404, that means the list doesn't exist and we need to create it
+      if (error && error.response && error.response.status === 404) {
+        return saveList(prefix, listName, []);
+      } else {
+        throw error;
+      }
+    });
+}
+
+export function updateList(store, { listName, fn }) {
+  const prefix = _.get(store, 'state.site.prefix');
+
+  return getOrStartList(store, listName)
     .then(listItems => fn(_.cloneDeep(listItems)))
     .then(listItems => saveList(prefix, listName, listItems))
     .then(listItems => store.commit(LIST_LOAD_SUCCESS, { listName, listItems }))
     .catch(error => store.commit(LIST_LOAD_FAIL, { listName, error }));
 }
+
+export function patchList(store, { listName, fn }) {
+  const prefix = _.get(store, 'state.site.prefix');
+
+  // get the list
+  return getOrStartList(store, listName)
+    // pass list to fn
+    .then(list => {
+      const patch = fn(list);
+
+      // fn needs to return a patch `{ remove: [], add: [] }`
+      return patch && (patch.add || patch.remove) ? patchListAPI(prefix, listName, patch) : list;
+    })
+    // patch api returns full list
+    .then(listItems => store.commit(LIST_LOAD_SUCCESS, { listName, listItems }))
+    // catch and log errors
+    .catch(error => store.commit(LIST_LOAD_FAIL, { listName, error }));
+}
diff --git a/lib/lists/actions.test.js b/lib/lists/actions.test.js
index 86ad7b479..5ca021c41 100644
--- a/lib/lists/actions.test.js
+++ b/lib/lists/actions.test.js
@@ -82,4 +82,31 @@ describe('list actions', () => {
       });
     });
   });
+
+  describe.only('patchList', () => {
+    const fn = lib.patchList,
+      prefix = 'domain.com',
+      listName = 'listName';
+
+    test('allows sends a PATCH request to api with remove and add in body', () => {
+      const store = {
+          commit: jest.fn(),
+          state: {
+            site: {
+              prefix
+            }
+          }
+        },
+        start = [1, 2, 3],
+        patch = { add: [4], remove: [1] },
+        end = [2, 3, 4];
+
+      api.getList.mockResolvedValue(start);
+      api.patchList.mockResolvedValue(end);
+
+      return fn(store, { listName: listName, fn: () => patch }).then(() => {
+        expect(api.patchList).toHaveBeenCalledWith(prefix, listName, patch);
+      });
+    });
+  });
 });
diff --git a/lib/lists/helpers.js b/lib/lists/helpers.js
index 8cfe63c57..12c3af8f6 100644
--- a/lib/lists/helpers.js
+++ b/lib/lists/helpers.js
@@ -3,26 +3,6 @@ import logger from '../utils/log';
 
 const log = logger(__filename);
 
-/**
- * @param {array} items
- * @param {string | object} testItem
- * @param {string} testProperty (optional)
- * @returns {array}
- */
-export function addListItem(items, testItem) {
-  const index = getItemIndex(items, testItem);
-
-  if (index !== -1) {
-    log.info('This item already exists in this list.', { action: 'modifyList' });
-
-    return items;
-  } else {
-    items.push(testItem);
-
-    return items;
-  }
-}
-
 /**
 * check that item in a list have a property that is a string or number 0 and then return that property
 * @param {array} items
@@ -86,30 +66,6 @@ export function getItemIndex(items, testItem, testProperty) {
   return index;
 }
 
-/**
- * @param {array} items
- * @param {string | object} deletedItem
- * @param {string} testProperty (optional)
- * @returns {string}
- */
-export function removeListItem(items, deletedItem, testProperty) {
-  let index;
-
-  if (testProperty) {
-    index = getItemIndex(items, deletedItem, testProperty);
-  } else {
-    index = getItemIndex(items, deletedItem);
-  }
-
-  if (index !== -1) {
-    items.splice(index, 1);
-  } else {
-    log.error(`Cannot remove ${deletedItem} because it is not in the list.`, { action: 'modifyList' });
-  }
-
-  return items;
-}
-
 /**
  * when fetching or updating pages, make sure they're sorted
  * note: this will also place them into a General category if they don't currently have categories
diff --git a/lib/lists/helpers.test.js b/lib/lists/helpers.test.js
index c3d2a976c..3fa531b6e 100644
--- a/lib/lists/helpers.test.js
+++ b/lib/lists/helpers.test.js
@@ -1,50 +1,6 @@
 import * as lib from './helpers';
 
 describe('list helpers', () => {
-  describe('addListItem', () => {
-    const fn = lib.addListItem;
-
-    test('add an item to a list of strings', () => {
-      const items = [
-          'alpha',
-          'beta',
-          'gamma'
-        ],
-        tester = 'theta',
-        updatedItems = fn(items, tester);
-
-      expect(updatedItems.length).toEqual(4);
-      expect(updatedItems.indexOf(tester)).toEqual(3);
-    });
-
-    test('add an item to a list of objects', () => {
-      const items = [
-          { text: 'alpha' },
-          { text: 'beta' },
-          { text: 'gamma' }],
-        tester = { text: 'theta' },
-        updatedItems = fn(items, tester);
-
-      expect(updatedItems.length).toEqual(4);
-      expect(updatedItems.indexOf(tester)).toEqual(3);
-    });
-
-    test(
-      'throw an error if trying to add an already existing item to a list',
-      () => {
-        const items = [
-            { text: 'alpha' },
-            { text: 'beta' },
-            { text: 'gamma' }],
-          tester = { text: 'alpha' },
-          updatedItems = fn(items, tester);
-
-        expect(updatedItems).toEqual(items);
-        expect(mockLogger).toHaveBeenCalledWith('info', 'This item already exists in this list.', { action: 'modifyList' });
-      }
-    );
-  });
-
   describe('getProp', () => {
     const fn = lib.getProp;
 
@@ -188,35 +144,6 @@ describe('list helpers', () => {
     );
   });
 
-  describe('removeListItem', () => {
-    const fn = lib.removeListItem;
-
-    test('remove an item from a list', () => {
-      const items = [
-          { text: 'alpha' },
-          { text: 'beta' },
-          { text: 'gamma' }],
-        tester = 'gamma',
-        updatedItems = fn(items, tester, 'text');
-
-      expect(lib.getItemIndex(updatedItems, tester, 'text')).toEqual(-1);
-    });
-
-    test(
-      'throw an error if trying to remove a non-existent item from a list',
-      () => {
-        const items = [
-            { text: 'alpha' },
-            { text: 'beta' },
-            { text: 'gamma' }],
-          tester = 'theta';
-
-        fn(items, tester, 'text');
-        expect(mockLogger).toHaveBeenCalledWith('error', 'Cannot remove theta because it is not in the list.', { action: 'modifyList' });
-      }
-    );
-  });
-
   describe('sortPages', () => {
     const fn = lib.sortPages;
 
diff --git a/package-lock.json b/package-lock.json
index a45045532..f68fb6ceb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4327,28 +4327,28 @@
       "dependencies": {
         "abbrev": {
           "version": "1.1.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
           "dev": true,
           "optional": true
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true,
           "optional": true
         },
         "aproba": {
           "version": "1.2.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
           "dev": true,
           "optional": true
         },
         "are-we-there-yet": {
           "version": "1.1.4",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
           "dev": true,
           "optional": true,
@@ -4359,14 +4359,14 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
           "dev": true,
           "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
           "optional": true,
@@ -4382,35 +4382,35 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
           "dev": true,
           "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "dev": true,
           "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
           "dev": true,
           "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
           "dev": true,
           "optional": true
         },
         "debug": {
           "version": "2.6.9",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "optional": true,
@@ -4420,14 +4420,14 @@
         },
         "delegates": {
           "version": "1.0.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
           "dev": true,
           "optional": true
         },
         "detect-libc": {
           "version": "1.0.3",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
           "dev": true,
           "optional": true
@@ -4442,14 +4442,14 @@
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "dev": true,
           "optional": true
         },
         "gauge": {
           "version": "2.7.4",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
           "dev": true,
           "optional": true,
@@ -4466,7 +4466,7 @@
         },
         "glob": {
           "version": "7.1.2",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
           "dev": true,
           "optional": true,
@@ -4481,14 +4481,14 @@
         },
         "has-unicode": {
           "version": "2.0.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
           "dev": true,
           "optional": true
         },
         "iconv-lite": {
           "version": "0.4.21",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==",
           "dev": true,
           "optional": true,
@@ -4498,7 +4498,7 @@
         },
         "ignore-walk": {
           "version": "3.0.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
           "dev": true,
           "optional": true,
@@ -4508,7 +4508,7 @@
         },
         "inflight": {
           "version": "1.0.6",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "dev": true,
           "optional": true,
@@ -4519,14 +4519,14 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true,
           "optional": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "optional": true,
@@ -4536,14 +4536,14 @@
         },
         "isarray": {
           "version": "1.0.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "dev": true,
           "optional": true
         },
         "minimatch": {
           "version": "3.0.4",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
           "optional": true,
@@ -4553,7 +4553,7 @@
         },
         "minimist": {
           "version": "0.0.8",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
           "dev": true,
           "optional": true
@@ -4577,7 +4577,7 @@
         },
         "mkdirp": {
           "version": "0.5.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
           "optional": true,
@@ -4587,14 +4587,14 @@
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true,
           "optional": true
         },
         "needle": {
           "version": "2.2.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-eFagy6c+TYayorXw/qtAdSvaUpEbBsDwDyxYFgLZ0lTojfH7K+OdBqAF7TAFwDokJaGpubpSGG0wO3iC0XPi8w==",
           "dev": true,
           "optional": true,
@@ -4606,7 +4606,7 @@
         },
         "node-pre-gyp": {
           "version": "0.9.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-8RwHUW3ZL4cZnbx+GDjqt81WyeA=",
           "dev": true,
           "optional": true,
@@ -4625,7 +4625,7 @@
         },
         "nopt": {
           "version": "4.0.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "dev": true,
           "optional": true,
@@ -4636,14 +4636,14 @@
         },
         "npm-bundled": {
           "version": "1.0.3",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==",
           "dev": true,
           "optional": true
         },
         "npm-packlist": {
           "version": "1.1.10",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==",
           "dev": true,
           "optional": true,
@@ -4654,7 +4654,7 @@
         },
         "npmlog": {
           "version": "4.1.2",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
           "dev": true,
           "optional": true,
@@ -4667,21 +4667,21 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
           "dev": true,
           "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
           "dev": true,
           "optional": true
         },
         "once": {
           "version": "1.4.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
           "optional": true,
@@ -4691,21 +4691,21 @@
         },
         "os-homedir": {
           "version": "1.0.2",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
           "dev": true,
           "optional": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
           "dev": true,
           "optional": true
         },
         "osenv": {
           "version": "0.1.5",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
           "dev": true,
           "optional": true,
@@ -4716,21 +4716,21 @@
         },
         "path-is-absolute": {
           "version": "1.0.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
           "dev": true,
           "optional": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
           "dev": true,
           "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "optional": true,
@@ -4746,7 +4746,7 @@
         },
         "rimraf": {
           "version": "2.6.2",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
           "dev": true,
           "optional": true,
@@ -4756,47 +4756,47 @@
         },
         "safe-buffer": {
           "version": "5.1.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
         },
         "safer-buffer": {
           "version": "2.1.2",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
           "dev": true,
           "optional": true
         },
         "sax": {
           "version": "1.2.4",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
           "dev": true,
           "optional": true
         },
         "semver": {
           "version": "5.5.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
           "dev": true,
           "optional": true
         },
         "set-blocking": {
           "version": "2.0.0",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "dev": true,
           "optional": true
         },
         "signal-exit": {
           "version": "3.0.2",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
           "dev": true,
           "optional": true
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "optional": true,
@@ -4808,7 +4808,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "optional": true,
@@ -4818,7 +4818,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "optional": true,
@@ -4828,14 +4828,14 @@
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
           "dev": true,
           "optional": true
         },
         "wide-align": {
           "version": "1.1.2",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
           "dev": true,
           "optional": true,
@@ -4845,7 +4845,7 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "resolved": "",
+          "resolved": false,
           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
           "dev": true,
           "optional": true
@@ -11402,28 +11402,28 @@
           "dependencies": {
             "abbrev": {
               "version": "1.1.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
               "dev": true,
               "optional": true
             },
             "ansi-regex": {
               "version": "2.1.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
               "dev": true,
               "optional": true
             },
             "aproba": {
               "version": "1.2.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
               "dev": true,
               "optional": true
             },
             "are-we-there-yet": {
               "version": "1.1.4",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
               "dev": true,
               "optional": true,
@@ -11434,14 +11434,14 @@
             },
             "balanced-match": {
               "version": "1.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
               "dev": true,
               "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
               "dev": true,
               "optional": true,
@@ -11457,35 +11457,35 @@
             },
             "code-point-at": {
               "version": "1.1.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
               "dev": true,
               "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
               "dev": true,
               "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
               "dev": true,
               "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
               "dev": true,
               "optional": true
             },
             "debug": {
               "version": "2.6.9",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
               "dev": true,
               "optional": true,
@@ -11495,21 +11495,21 @@
             },
             "deep-extend": {
               "version": "0.5.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==",
               "dev": true,
               "optional": true
             },
             "delegates": {
               "version": "1.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
               "dev": true,
               "optional": true
             },
             "detect-libc": {
               "version": "1.0.3",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
               "dev": true,
               "optional": true
@@ -11524,14 +11524,14 @@
             },
             "fs.realpath": {
               "version": "1.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
               "dev": true,
               "optional": true
             },
             "gauge": {
               "version": "2.7.4",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
               "dev": true,
               "optional": true,
@@ -11548,7 +11548,7 @@
             },
             "glob": {
               "version": "7.1.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
               "dev": true,
               "optional": true,
@@ -11563,14 +11563,14 @@
             },
             "has-unicode": {
               "version": "2.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
               "dev": true,
               "optional": true
             },
             "iconv-lite": {
               "version": "0.4.21",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==",
               "dev": true,
               "optional": true,
@@ -11580,7 +11580,7 @@
             },
             "ignore-walk": {
               "version": "3.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
               "dev": true,
               "optional": true,
@@ -11590,7 +11590,7 @@
             },
             "inflight": {
               "version": "1.0.6",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
               "dev": true,
               "optional": true,
@@ -11601,21 +11601,21 @@
             },
             "inherits": {
               "version": "2.0.3",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
               "dev": true,
               "optional": true
             },
             "ini": {
               "version": "1.3.5",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
               "dev": true,
               "optional": true
             },
             "is-fullwidth-code-point": {
               "version": "1.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
               "dev": true,
               "optional": true,
@@ -11625,14 +11625,14 @@
             },
             "isarray": {
               "version": "1.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
               "dev": true,
               "optional": true
             },
             "minimatch": {
               "version": "3.0.4",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
               "dev": true,
               "optional": true,
@@ -11642,7 +11642,7 @@
             },
             "minimist": {
               "version": "0.0.8",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
               "dev": true,
               "optional": true
@@ -11666,7 +11666,7 @@
             },
             "mkdirp": {
               "version": "0.5.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
               "dev": true,
               "optional": true,
@@ -11676,14 +11676,14 @@
             },
             "ms": {
               "version": "2.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
               "dev": true,
               "optional": true
             },
             "needle": {
               "version": "2.2.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-eFagy6c+TYayorXw/qtAdSvaUpEbBsDwDyxYFgLZ0lTojfH7K+OdBqAF7TAFwDokJaGpubpSGG0wO3iC0XPi8w==",
               "dev": true,
               "optional": true,
@@ -11695,7 +11695,7 @@
             },
             "node-pre-gyp": {
               "version": "0.10.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-G7kEonQLRbcA/mOoFoxvlMrw6Q6dPf92+t/l0DFSMuSlDoWaI9JWIyPwK0jyE1bph//CUEL65/Fz1m2vJbmjQQ==",
               "dev": true,
               "optional": true,
@@ -11714,7 +11714,7 @@
             },
             "nopt": {
               "version": "4.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
               "dev": true,
               "optional": true,
@@ -11725,14 +11725,14 @@
             },
             "npm-bundled": {
               "version": "1.0.3",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==",
               "dev": true,
               "optional": true
             },
             "npm-packlist": {
               "version": "1.1.10",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==",
               "dev": true,
               "optional": true,
@@ -11743,7 +11743,7 @@
             },
             "npmlog": {
               "version": "4.1.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
               "dev": true,
               "optional": true,
@@ -11756,21 +11756,21 @@
             },
             "number-is-nan": {
               "version": "1.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
               "dev": true,
               "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
               "dev": true,
               "optional": true
             },
             "once": {
               "version": "1.4.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
               "dev": true,
               "optional": true,
@@ -11780,21 +11780,21 @@
             },
             "os-homedir": {
               "version": "1.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
               "dev": true,
               "optional": true
             },
             "os-tmpdir": {
               "version": "1.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
               "dev": true,
               "optional": true
             },
             "osenv": {
               "version": "0.1.5",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
               "dev": true,
               "optional": true,
@@ -11805,21 +11805,21 @@
             },
             "path-is-absolute": {
               "version": "1.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
               "dev": true,
               "optional": true
             },
             "process-nextick-args": {
               "version": "2.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
               "dev": true,
               "optional": true
             },
             "rc": {
               "version": "1.2.7",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==",
               "dev": true,
               "optional": true,
@@ -11832,7 +11832,7 @@
               "dependencies": {
                 "minimist": {
                   "version": "1.2.0",
-                  "resolved": "",
+                  "resolved": false,
                   "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
                   "dev": true,
                   "optional": true
@@ -11841,7 +11841,7 @@
             },
             "readable-stream": {
               "version": "2.3.6",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
               "dev": true,
               "optional": true,
@@ -11857,7 +11857,7 @@
             },
             "rimraf": {
               "version": "2.6.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
               "dev": true,
               "optional": true,
@@ -11867,47 +11867,47 @@
             },
             "safe-buffer": {
               "version": "5.1.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
             },
             "safer-buffer": {
               "version": "2.1.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
               "dev": true,
               "optional": true
             },
             "sax": {
               "version": "1.2.4",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
               "dev": true,
               "optional": true
             },
             "semver": {
               "version": "5.5.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
               "dev": true,
               "optional": true
             },
             "set-blocking": {
               "version": "2.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
               "dev": true,
               "optional": true
             },
             "signal-exit": {
               "version": "3.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
               "dev": true,
               "optional": true
             },
             "string-width": {
               "version": "1.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
               "dev": true,
               "optional": true,
@@ -11919,7 +11919,7 @@
             },
             "string_decoder": {
               "version": "1.1.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
               "dev": true,
               "optional": true,
@@ -11929,7 +11929,7 @@
             },
             "strip-ansi": {
               "version": "3.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
               "dev": true,
               "optional": true,
@@ -11939,21 +11939,21 @@
             },
             "strip-json-comments": {
               "version": "2.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
               "dev": true,
               "optional": true
             },
             "util-deprecate": {
               "version": "1.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
               "dev": true,
               "optional": true
             },
             "wide-align": {
               "version": "1.1.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
               "dev": true,
               "optional": true,
@@ -11963,7 +11963,7 @@
             },
             "wrappy": {
               "version": "1.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
               "dev": true,
               "optional": true
diff --git a/package.json b/package.json
index adcb93d48..57757e1b6 100644
--- a/package.json
+++ b/package.json
@@ -168,6 +168,7 @@
     "whatwg-fetch": "^2.0.3"
   },
   "peerDependencies": {
+    "amphora": "^7.9.0",
     "amphora-search": "^6.2.0"
   }
 }