Handle form validations before submit

packages/strapi-plugin-settings-manager/admin/src/components/EditForm/index.js

@@ -30,6 +30,7 @@ class EditForm extends React.Component { // eslint-disable-line react/prefer-sta
                     values={this.props.values}
                     handleChange={this.props.handleChange}
                     cancelAction={this.props.cancelAction}
+                    formErrors={this.props.formErrors}
                   />
                   {line}
                 </div>
@@ -56,6 +57,7 @@ class EditForm extends React.Component { // eslint-disable-line react/prefer-sta
 
 EditForm.propTypes = {
   cancelAction: React.PropTypes.bool,
+  formErrors: React.PropTypes.array,
   handleCancel: React.PropTypes.func,
   handleChange: React.PropTypes.func.isRequired,
   handleSubmit: React.PropTypes.func,

packages/strapi-plugin-settings-manager/admin/src/components/EditFormSection/index.js

@@ -39,6 +39,7 @@ class EditFormSection extends React.Component { // eslint-disable-line react/pre
                       values={this.props.values}
                       handleChange={this.props.handleChange}
                       sectionNested
+                      formErrors={this.props.formErrors}
                     />
                   </div>
                 )
@@ -53,6 +54,7 @@ class EditFormSection extends React.Component { // eslint-disable-line react/pre
 }
 
 EditFormSection.propTypes = {
+  formErrors: React.PropTypes.array,
   handleChange: React.PropTypes.func,
   renderInput: React.PropTypes.func,
   section: React.PropTypes.object,

packages/strapi-plugin-settings-manager/admin/src/components/EditFormSectionNested/index.js

@@ -53,8 +53,6 @@ class EditFormSectionNested extends React.Component { // eslint-disable-line rea
   }
 
   render() {
-    // console.log(this.state);
-
     return (
       <div className={`${this.props.styles.padded} ${this.props.styles.nesTedFormContainer}`}>
         <div className="row">
@@ -68,7 +66,7 @@ class EditFormSectionNested extends React.Component { // eslint-disable-line rea
                     section={this.state.section}
                     values={this.props.values}
                     handleChange={this.props.handleChange}
-
+                    formErrors={this.props.formErrors}
                   />
                 </div>
               )
@@ -83,6 +81,7 @@ class EditFormSectionNested extends React.Component { // eslint-disable-line rea
 }
 
 EditFormSectionNested.propTypes = {
+  formErrors: React.PropTypes.array,
   handleChange: React.PropTypes.func,
   renderInput: React.PropTypes.func,
   section: React.PropTypes.oneOfType([

packages/strapi-plugin-settings-manager/admin/src/components/PopUpForm/index.js

@@ -23,7 +23,6 @@ class PopUpForm extends React.Component { // eslint-disable-line react/prefer-st
                   {map(this.props.sections, (section) => {
                     // custom rendering
                     if (this.props.renderPopUpForm) {
-                      console.log('ook')
                       // Need to pass props to use this.props.renderInput from WithFormSection HOC
                       return this.props.renderPopUpForm(section, this.props, styles);
                     }

packages/strapi-plugin-settings-manager/admin/src/components/WithFormSection/index.js

@@ -5,7 +5,7 @@
 */
 
 import React from 'react';
-import { forEach, has, isObject , join, pullAt, split, includes} from 'lodash';
+import { findIndex, forEach, has, isObject , join, pullAt, split, includes} from 'lodash';
 
 import InputNumber from 'components/InputNumber';
 import InputText from 'components/InputText';
@@ -21,6 +21,7 @@ const WithFormSection = (InnerComponent) => class extends React.Component {
   static propTypes = {
     addRequiredInputDesign: React.PropTypes.bool,
     cancelAction: React.PropTypes.bool,
+    formErrors: React.PropTypes.array,
     handleChange: React.PropTypes.func.isRequired,
     section: React.PropTypes.oneOfType([
       React.PropTypes.object,
@@ -104,6 +105,9 @@ const WithFormSection = (InnerComponent) => class extends React.Component {
     const handleChange = this.state.hasNestedInput ? this.handleChange :  this.props.handleChange;
     const hiddenLabel = includes(props.name, 'enabled');
 
+    const errorIndex = findIndex(this.props.formErrors, ['target', props.target]);
+    const errors = errorIndex !== -1 ? this.props.formErrors[errorIndex].errors : [];
+
     return (
       <Input
         customBootstrapClass={customBootstrapClass}
@@ -118,6 +122,7 @@ const WithFormSection = (InnerComponent) => class extends React.Component {
         addRequiredInputDesign={this.props.addRequiredInputDesign}
         hiddenLabel={hiddenLabel}
         inputDescription={props.description}
+        errors={errors}
       />
     );
   }

packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/actions.js

@@ -5,6 +5,7 @@
 */
 
 import { includes, forEach, has, remove, get, split } from 'lodash';
+import { getInputsValidationsFromConfigs } from '../../utils/inputValidations';
 import {
   CONFIG_FETCH,
   LANGUAGES_FETCH,
@@ -30,6 +31,7 @@ import {
   LANGUAGE_ACTION_ERROR,
   DATABASE_ACTION_ERROR,
   EMPTY_DB_MODIFIED_DATA,
+  SET_ERRORS,
 } from './constants';
 
 export function defaultAction() {
@@ -47,11 +49,12 @@ export function configFetch(endPoint) {
 
 export function configFetchSucceded(configs) {
   const data = getDataFromConfigs(configs);
-
+  const formValidations = getInputsValidationsFromConfigs(configs);
   return {
     type: CONFIG_FETCH_SUCCEEDED,
     configs,
     data,
+    formValidations,
   };
 }
 
@@ -120,13 +123,9 @@ export function editSettings(newSettings, endPoint) {
   };
 }
 
-export function editSettingsSucceeded(optimisticResponse) {
+export function editSettingsSucceeded() {
-  const data = getDataFromConfigs(optimisticResponse);
-
   return {
     type: EDIT_SETTINGS_SUCCEEDED,
-    optimisticResponse,
-    data,
   };
 }
 
@@ -214,12 +213,15 @@ export function databasesFetchSucceeded(listDatabases, availableDatabases) {
   };
 
   const dbNameTarget = availableDatabases.sections[0].items[0].target;
+  const formValidations = getInputsValidationsFromConfigs(availableDatabases);
+
   return {
     type: DATABASES_FETCH_SUCCEEDED,
     configsDisplay,
     appDatabases,
     modifiedData,
     dbNameTarget,
+    formValidations,
   };
 }
 
@@ -266,11 +268,13 @@ export function specificDatabaseFetchSucceeded(db) {
   remove(database.sections[0].items, (item) => item.target === `database.connections.${name}.connector`);
   const dbNameTarget = database.sections[0].items[0].target;
 
+  const formValidations = getInputsValidationsFromConfigs(db);
   return {
     type: SPECIFIC_DATABASE_FETCH_SUCCEEDED,
     database,
     data,
     dbNameTarget,
+    formValidations,
   };
 }
 
@@ -288,3 +292,10 @@ export function emptyDbModifiedData() {
     type: EMPTY_DB_MODIFIED_DATA,
   };
 }
+
+export function setErrors(errors) {
+  return {
+    type: SET_ERRORS,
+    errors,
+  };
+}

packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/constants.js

@@ -29,3 +29,4 @@ export const SPECIFIC_DATABASE_FETCH_SUCCEEDED = 'SettingsManager/HomePage/SPECI
 export const DATABASE_EDIT = 'SettingsManager/HomePage/DATABASE_EDIT';
 export const DATABASE_ACTION_ERROR = 'SettingsManager/HomePage/DATABASE_ACTION_ERROR';
 export const EMPTY_DB_MODIFIED_DATA = 'SettingsManager/HomePage/EMPTY_DB_MODIFIED_DATA';
+export const SET_ERRORS = 'SettingsManager/HomePage/SET_ERRORS';

packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/index.js

@@ -40,6 +40,7 @@ import RowLanguage from 'components/RowLanguage';
 import { makeSelectSections, makeSelectEnvironments } from 'containers/App/selectors';
 
 // utils
+import { checkFormValidity } from '../../utils/inputValidations';
 import getFlag, { formatLanguageLocale } from '../../utils/getFlag';
 import sendUpdatedParams from '../../utils/sendUpdatedParams';
 
@@ -58,6 +59,7 @@ import {
   languagesFetch,
   newLanguagePost,
   newDatabasePost,
+  setErrors,
   specificDatabaseFetch,
 } from './actions'
 
@@ -188,7 +190,7 @@ export class HomePage extends React.Component { // eslint-disable-line react/pre
   }
 
   handleChange = ({ target }) => {
-    let value = target.type === 'number' ? toNumber(target.value) : target.value;
+    let value = target.type === 'number' && target.value !== '' ? toNumber(target.value) : target.value;
     let name = target.name;
 
     if (this.props.params.slug === 'security') {
@@ -205,17 +207,20 @@ export class HomePage extends React.Component { // eslint-disable-line react/pre
 
   handleCancel = () => this.props.cancelChanges();
 
-  handleSubmit = (e) => {
+  handleSubmit = (e) => { // eslint-disable-line consistent-return
     e.preventDefault();
     const apiUrl = this.props.params.env ? `${this.props.params.slug}/${this.props.params.env}` : this.props.params.slug;
 
     // send only updated settings
     const body = this.sendUpdatedParams();
+    const formErrors = checkFormValidity(body, this.props.home.formValidations);
 
-    if (!isEmpty(body)) {
+    if (isEmpty(body)) return window.Strapi.notification.info('Settings are equals');
+    if (isEmpty(formErrors)) {
       this.props.editSettings(body, apiUrl);
     } else {
-      window.Strapi.notification.info('Settings are equals');
+      this.props.setErrors(formErrors);
+      // window.Strapi.notification.info('Settings are equals');
     }
   }
 
@@ -395,6 +400,7 @@ export class HomePage extends React.Component { // eslint-disable-line react/pre
         actionBeforeOpenPopUp={actionBeforeOpenPopUp}
         addRequiredInputDesign={addRequiredInputDesign}
         addListTitleMarginTop={addListTitleMarginTop}
+        formErrors={this.props.home.formErrors}
       />
     );
   }
@@ -469,6 +475,7 @@ function mapDispatchToProps(dispatch) {
       languagesFetch,
       newDatabasePost,
       newLanguagePost,
+      setErrors,
       specificDatabaseFetch,
     },
     dispatch
@@ -494,6 +501,7 @@ HomePage.propTypes = {
   newDatabasePost: React.PropTypes.func,
   newLanguagePost: React.PropTypes.func,
   params: React.PropTypes.object.isRequired,
+  setErrors: React.PropTypes.func,
   specificDatabaseFetch: React.PropTypes.func,
 };
 

packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/reducer.js

@@ -23,6 +23,7 @@ import {
   DATABASE_ACTION_ERROR,
   NEW_LANGUAGE_POST,
   EMPTY_DB_MODIFIED_DATA,
+  SET_ERRORS,
 } from './constants';
 
 /* eslint-disable new-cap */
@@ -39,6 +40,8 @@ const initialState = fromJS({
   specificDatabase: OrderedMap(),
   dbNameTarget: '',
   selectOptions: Map(),
+  formValidations: [],
+  formErrors: [],
 });
 /* eslint-disable no-case-declarations */
 
@@ -49,12 +52,16 @@ function homePageReducer(state = initialState, action) {
         .set('loading', false)
         .set('configsDisplay', OrderedMap(action.configs))
         .set('initialData', Map(action.data))
-        .set('modifiedData', Map(action.data));
+        .set('modifiedData', Map(action.data))
+        .set('formErrors', [])
+        .set('formValidations', action.formValidations);
     case CHANGE_INPUT:
+    // TODO remove error
       return state.updateIn(['modifiedData', action.key], () => action.value);
     case CANCEL_CHANGES:
       return state
       .set('modifiedData', state.get('initialData'))
+      .set('formErrors', [])
       .set('cancelAction', !state.get('cancelAction'));
     case DATABASES_FETCH_SUCCEEDED:
       return state
@@ -65,6 +72,8 @@ function homePageReducer(state = initialState, action) {
         .set('loading', false)
         .set('initialData', Map())
         .set('dbNameTarget', action.dbNameTarget)
+        .set('formValidations', action.formValidations)
+        .set('formErrors', [])
         .set('modifiedData', Map(action.modifiedData));
     case LANGUAGE_DELETE:
       return state
@@ -80,12 +89,11 @@ function homePageReducer(state = initialState, action) {
         .set('initialData', Map())
         .set('modifiedData', Map(action.selectedLanguage))
         .set('selectOptions', Map(action.selectOptions))
+        .set('formErrors', [])
         .set('listLanguages', Map(action.listLanguages));
     case EDIT_SETTINGS_SUCCEEDED:
       return state
-        .set('configsDisplay', OrderedMap(action.optimisticResponse))
+        .set('formErrors', []);
-        .set('initialData', Map(action.data))
-        .set('modifiedData', Map(action.data));
     case CHANGE_DEFAULT_LANGUAGE:
       return state
         .set('configsDisplay', OrderedMap(action.configsDisplay))
@@ -106,18 +114,22 @@ function homePageReducer(state = initialState, action) {
         .set('specificDatabase', OrderedMap(action.database))
         .set('dbNameTarget', action.dbNameTarget)
         .set('initialData', Map(action.data))
+        .set('formErrors', [])
         .set('modifiedData', Map(action.data));
     case EMPTY_DB_MODIFIED_DATA:
       const defaultDbConnection = state.getIn(['modifiedData', 'database.defaultConnection']);
       return state
       .set('modifiedData', Map())
       .set('dbNameTarget', 'database.connections.${name}.name') // eslint-disable-line no-template-curly-in-string
+      .set('formErrors', [])
       .setIn(['modifiedData', 'database.defaultConnection'], defaultDbConnection);
     case NEW_LANGUAGE_POST:
       const sections = state.getIn(['configsDisplay', 'sections']);
       sections.push({ active: false, name: state.getIn(['modifiedData', 'language.defaultLocale']) });
       const newSections = sortBy(sections, (o) => o.name);
       return state.setIn(['configsDisplay', 'sections'], newSections);
+    case SET_ERRORS:
+      return state.set('formErrors', action.errors);
     default:
       return state;
   }

packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/sagas.js

@@ -24,6 +24,7 @@ import {
 import {
   configFetchSucceded,
   databasesFetchSucceeded,
+  editSettingsSucceeded,
   languagesFetchSucceeded,
   languageActionError,
   databaseActionSucceeded,
@@ -241,7 +242,7 @@ export function* settingsEdit(action) {
 
     // TODO handle server reload to get response
     window.Strapi.notification.success('Your modifications have been updated');
-
+    yield put(editSettingsSucceeded());
 
   } catch(error) {
     window.Strapi.notification.error('An error occured');

packages/strapi-plugin-settings-manager/admin/src/utils/inputValidations.js

@@ -0,0 +1,127 @@
+import { findIndex, mapKeys, forEach, includes, has, isUndefined, reject, isEmpty } from 'lodash';
+
+export function checkFormValidity(formData, formValidations) {
+  const errors = [];
+  forEach(formData, (value, key) => { // eslint-disable-line consistent-return
+    let valueValidations = formValidations[findIndex(formValidations, ['target', key])];
+    let inputErrors = [];
+
+    if (!valueValidations) {
+      forEach(formValidations, (data) => {
+        if (data.nestedValidations) {
+          forEach(data.nestedValidations, (nestedData) => {
+            if (nestedData.target === key) valueValidations = nestedData;
+          })
+        }
+      });
+    }
+
+    // If section is disabled don't need further checks
+    if (includes(key, 'enabled') && !value) return false;
+
+    forEach(valueValidations.nestedValidations, (nestedValidations) => {
+      if (nestedValidations.validations.required && !has(formData, nestedValidations.target)) {
+        errors.push({ target: nestedValidations.target, errors: [{ id: 'request.error.validation.required' }] });
+      }
+    });
+
+    if (!isUndefined(valueValidations)) {
+      inputErrors = validate(value, valueValidations.validations);
+    }
+
+    if (!isEmpty(inputErrors)) errors.push({ target: key, errors: inputErrors });
+
+    if (formData['security.xframe.value'] && formData['security.xframe.value'] === 'ALLOW-FROM.ALLOW-FROM ') {
+      errors.push({ target: 'security.xframe.value.nested', errors: [{ id: 'request.error.validation.required' }] });
+    }
+  });
+
+  return errors;
+}
+
+
+function validate(value, validations) {
+  let errors = [];
+  // Handle i18n
+  const requiredError = { id: 'request.error.validation.required' };
+  mapKeys(validations, (validationValue, validationKey) => {
+    switch (validationKey) {
+      case 'maxLength':
+        if (value.length > validationValue) {
+          errors.push({ id: 'request.error.validation.maxLength' });
+        }
+        break;
+      case 'minLength':
+        if (value.length < validationValue) {
+          errors.push({ id: 'request.error.validation.minLength' });
+        }
+        break;
+      case 'required':
+        if (value.length === 0) {
+          errors.push({ id: 'request.error.validation.required' });
+        }
+        break;
+      case 'regex':
+        if (!new RegExp(validationValue).test(value)) {
+          errors.push({ id: 'request.error.validation.regex' });
+        }
+        break;
+      default:
+        errors = [];
+    }
+  });
+
+  if (includes(errors, requiredError)) {
+    errors = reject(errors, (error) => error !== requiredError);
+  }
+  return errors;
+}
+
+
+/*
+* @method : get input validations from configs
+* @param {object} configs
+*
+* @return {array} returns formValidations
+*/
+
+
+export function getInputsValidationsFromConfigs(configs) {
+  const formValidations = [];
+
+  forEach(configs.sections, (section) => {
+    forEach(section.items, (item) => {
+
+      if (!isUndefined(item.target)) {
+        const validations = {
+          target: item.target,
+          validations: item.validations,
+        };
+
+        if (has(item, 'items')) {
+          validations.nestedValidations = [];
+
+          forEach(item.items, (subItem, key) => {
+            if (!isUndefined(subItem.target) && !isUndefined(subItem.validations)) {
+              if (has(subItem, 'items')) {
+                validations.nestedValidations.push({ target: subItem.target, validations: subItem.validations, nestedValidations: [] });
+                forEach(subItem.items, (nestedSubItem) => {
+                  if (!isUndefined(nestedSubItem.target)) {
+                    validations.nestedValidations[key].nestedValidations.push({ target: nestedSubItem.target, validations: nestedSubItem.validations });
+                  }
+                });
+              } else {
+                validations.nestedValidations.push({ target: subItem.target, validations: subItem.validations });
+              }
+            }
+          });
+          formValidations.push(validations)
+        } else {
+          formValidations.push(validations);
+        }
+      }
+    });
+  });
+
+  return formValidations;
+}

packages/strapi-plugin-settings-manager/admin/src/utils/sendUpdatedParams.js

@@ -1,4 +1,4 @@
-import { forEach, has, includes } from 'lodash';
+import { forEach, includes } from 'lodash';
 
 export default function sendUpdatedParams() {
   const prevSettings = this.props.home.initialData;
@@ -8,14 +8,14 @@ export default function sendUpdatedParams() {
     if (value !== prevSettings[key] && key !== 'security.xframe.value.nested') {
       body[key] = value;
     }
+    else if (key === 'security.xframe.value.nested' && prevSettings['security.xframe.value.nested'] !== this.props.home.modifiedData['security.xframe.value.nested'] && this.props.home.modifiedData['security.xframe.value'] === 'ALLOW-FROM') {
+      const xFrameValue = includes(this.props.home.modifiedData['security.xframe.value.nested'], 'ALLOW-FROM') ?
+      `ALLOW-FROM ${this.props.home.modifiedData['security.xframe.value.nested']}`
+       : `ALLOW-FROM.ALLOW-FROM ${this.props.home.modifiedData['security.xframe.value.nested']}`;
+
+      body['security.xframe.value'] = xFrameValue;
+    }
   });
 
-  if (has(this.props.home.modifiedData, 'security.xframe.value.nested') && this.props.home.modifiedData['security.xframe.value'] === 'ALLOW-FROM') {
-    const value = includes(this.props.home.modifiedData['security.xframe.value.nested'], 'ALLOW-FROM') ?
-    `ALLOW-FROM ${this.props.home.modifiedData['security.xframe.value.nested']}`
-     : `ALLOW-FROM.ALLOW-FROM ${this.props.home.modifiedData['security.xframe.value.nested']}`;
-
-    body['security.xframe.value'] = value;
-  }
   return body;
 }

packages/strapi-plugin-settings-manager/package-lock.json

@@ -1434,13 +1434,15 @@
       "dependencies": {
         "abbrev": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+          "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
           "dev": true,
           "optional": true
         },
         "ajv": {
           "version": "4.11.8",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1450,18 +1452,21 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
         "aproba": {
           "version": "1.1.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
+          "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=",
           "dev": true,
           "optional": true
         },
         "are-we-there-yet": {
           "version": "1.1.4",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+          "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1471,42 +1476,49 @@
         },
         "asn1": {
           "version": "0.2.3",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
           "dev": true,
           "optional": true
         },
         "assert-plus": {
           "version": "0.2.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
           "dev": true,
           "optional": true
         },
         "asynckit": {
           "version": "0.4.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
           "dev": true,
           "optional": true
         },
         "aws-sign2": {
           "version": "0.6.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
           "dev": true,
           "optional": true
         },
         "aws4": {
           "version": "1.6.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
           "dev": true,
           "optional": true
         },
         "balanced-match": {
           "version": "0.4.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
           "dev": true
         },
         "bcrypt-pbkdf": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+          "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1515,7 +1527,8 @@
         },
         "block-stream": {
           "version": "0.0.9",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+          "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
           "dev": true,
           "requires": {
             "inherits": "2.0.3"
@@ -1523,7 +1536,8 @@
         },
         "boom": {
           "version": "2.10.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
           "dev": true,
           "requires": {
             "hoek": "2.16.3"
@@ -1531,7 +1545,8 @@
         },
         "brace-expansion": {
           "version": "1.1.7",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
+          "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
           "dev": true,
           "requires": {
             "balanced-match": "0.4.2",
@@ -1540,29 +1555,34 @@
         },
         "buffer-shims": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+          "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
           "dev": true
         },
         "caseless": {
           "version": "0.12.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
           "dev": true,
           "optional": true
         },
         "co": {
           "version": "4.6.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
           "dev": true,
           "optional": true
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
           "dev": true
         },
         "combined-stream": {
           "version": "1.0.5",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+          "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
           "dev": true,
           "requires": {
             "delayed-stream": "1.0.0"
@@ -1570,22 +1590,26 @@
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
           "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
           "dev": true
         },
         "cryptiles": {
           "version": "2.0.5",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1594,7 +1618,8 @@
         },
         "dashdash": {
           "version": "1.14.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1603,7 +1628,8 @@
           "dependencies": {
             "assert-plus": {
               "version": "1.0.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
               "dev": true,
               "optional": true
             }
@@ -1611,7 +1637,8 @@
         },
         "debug": {
           "version": "2.6.8",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1620,24 +1647,28 @@
         },
         "deep-extend": {
           "version": "0.4.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+          "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
           "dev": true,
           "optional": true
         },
         "delayed-stream": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
           "dev": true
         },
         "delegates": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
           "dev": true,
           "optional": true
         },
         "ecc-jsbn": {
           "version": "0.1.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+          "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1646,24 +1677,28 @@
         },
         "extend": {
           "version": "3.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
           "dev": true,
           "optional": true
         },
         "extsprintf": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
+          "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
           "dev": true
         },
         "forever-agent": {
           "version": "0.6.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
           "dev": true,
           "optional": true
         },
         "form-data": {
           "version": "2.1.4",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1674,12 +1709,14 @@
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "dev": true
         },
         "fstream": {
           "version": "1.0.11",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+          "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
           "dev": true,
           "requires": {
             "graceful-fs": "4.1.11",
@@ -1690,7 +1727,8 @@
         },
         "fstream-ignore": {
           "version": "1.0.5",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+          "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1701,7 +1739,8 @@
         },
         "gauge": {
           "version": "2.7.4",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1717,7 +1756,8 @@
         },
         "getpass": {
           "version": "0.1.7",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1726,7 +1766,8 @@
           "dependencies": {
             "assert-plus": {
               "version": "1.0.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
               "dev": true,
               "optional": true
             }
@@ -1734,7 +1775,8 @@
         },
         "glob": {
           "version": "7.1.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
           "dev": true,
           "requires": {
             "fs.realpath": "1.0.0",
@@ -1747,18 +1789,21 @@
         },
         "graceful-fs": {
           "version": "4.1.11",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
           "dev": true
         },
         "har-schema": {
           "version": "1.0.5",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+          "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
           "dev": true,
           "optional": true
         },
         "har-validator": {
           "version": "4.2.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+          "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1768,13 +1813,15 @@
         },
         "has-unicode": {
           "version": "2.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+          "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
           "dev": true,
           "optional": true
         },
         "hawk": {
           "version": "3.1.3",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1786,12 +1833,14 @@
         },
         "hoek": {
           "version": "2.16.3",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
           "dev": true
         },
         "http-signature": {
           "version": "1.1.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1802,7 +1851,8 @@
         },
         "inflight": {
           "version": "1.0.6",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "dev": true,
           "requires": {
             "once": "1.4.0",
@@ -1811,18 +1861,21 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         },
         "ini": {
           "version": "1.3.4",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+          "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
           "dev": true,
           "optional": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
             "number-is-nan": "1.0.1"
@@ -1830,24 +1883,28 @@
         },
         "is-typedarray": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
           "dev": true,
           "optional": true
         },
         "isarray": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "dev": true
         },
         "isstream": {
           "version": "0.1.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+          "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
           "dev": true,
           "optional": true
         },
         "jodid25519": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
+          "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1856,19 +1913,22 @@
         },
         "jsbn": {
           "version": "0.1.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
           "dev": true,
           "optional": true
         },
         "json-schema": {
           "version": "0.2.3",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+          "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
           "dev": true,
           "optional": true
         },
         "json-stable-stringify": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+          "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1877,19 +1937,22 @@
         },
         "json-stringify-safe": {
           "version": "5.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+          "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
           "dev": true,
           "optional": true
         },
         "jsonify": {
           "version": "0.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
           "dev": true,
           "optional": true
         },
         "jsprim": {
           "version": "1.4.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
+          "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1901,7 +1964,8 @@
           "dependencies": {
             "assert-plus": {
               "version": "1.0.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
               "dev": true,
               "optional": true
             }
@@ -1909,12 +1973,14 @@
         },
         "mime-db": {
           "version": "1.27.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
+          "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
           "dev": true
         },
         "mime-types": {
           "version": "2.1.15",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
+          "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
           "dev": true,
           "requires": {
             "mime-db": "1.27.0"
@@ -1922,7 +1988,8 @@
         },
         "minimatch": {
           "version": "3.0.4",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
           "requires": {
             "brace-expansion": "1.1.7"
@@ -1930,12 +1997,14 @@
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
           "dev": true
         },
         "mkdirp": {
           "version": "0.5.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
           "requires": {
             "minimist": "0.0.8"
@@ -1943,13 +2012,15 @@
         },
         "ms": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true,
           "optional": true
         },
         "node-pre-gyp": {
           "version": "0.6.36",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
+          "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1966,7 +2037,8 @@
         },
         "nopt": {
           "version": "4.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1976,7 +2048,8 @@
         },
         "npmlog": {
           "version": "4.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",
+          "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1988,24 +2061,28 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
           "dev": true
         },
         "oauth-sign": {
           "version": "0.8.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
           "dev": true,
           "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
           "dev": true,
           "optional": true
         },
         "once": {
           "version": "1.4.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
           "requires": {
             "wrappy": "1.0.2"
@@ -2013,19 +2090,22 @@
         },
         "os-homedir": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
           "dev": true,
           "optional": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+          "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
           "dev": true,
           "optional": true
         },
         "osenv": {
           "version": "0.1.4",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+          "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2035,35 +2115,41 @@
         },
         "path-is-absolute": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
           "dev": true
         },
         "performance-now": {
           "version": "0.2.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+          "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
           "dev": true,
           "optional": true
         },
         "process-nextick-args": {
           "version": "1.0.7",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
           "dev": true
         },
         "punycode": {
           "version": "1.4.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
           "dev": true,
           "optional": true
         },
         "qs": {
           "version": "6.4.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
           "dev": true,
           "optional": true
         },
         "rc": {
           "version": "1.2.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+          "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2075,7 +2161,8 @@
           "dependencies": {
             "minimist": {
               "version": "1.2.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
               "dev": true,
               "optional": true
             }
@@ -2083,7 +2170,8 @@
         },
         "readable-stream": {
           "version": "2.2.9",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
+          "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
           "dev": true,
           "requires": {
             "buffer-shims": "1.0.0",
@@ -2097,7 +2185,8 @@
         },
         "request": {
           "version": "2.81.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2127,7 +2216,8 @@
         },
         "rimraf": {
           "version": "2.6.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+          "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
           "dev": true,
           "requires": {
             "glob": "7.1.2"
@@ -2135,30 +2225,35 @@
         },
         "safe-buffer": {
           "version": "5.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+          "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
           "dev": true
         },
         "semver": {
           "version": "5.3.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
           "dev": true,
           "optional": true
         },
         "set-blocking": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "dev": true,
           "optional": true
         },
         "signal-exit": {
           "version": "3.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
           "dev": true,
           "optional": true
         },
         "sntp": {
           "version": "1.0.9",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2167,7 +2262,8 @@
         },
         "sshpk": {
           "version": "1.13.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
+          "integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2184,7 +2280,8 @@
           "dependencies": {
             "assert-plus": {
               "version": "1.0.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
               "dev": true,
               "optional": true
             }
@@ -2192,7 +2289,8 @@
         },
         "string_decoder": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
+          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
           "dev": true,
           "requires": {
             "safe-buffer": "5.0.1"
@@ -2200,7 +2298,8 @@
         },
         "string-width": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
             "code-point-at": "1.1.0",
@@ -2210,13 +2309,15 @@
         },
         "stringstream": {
           "version": "0.0.5",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
           "dev": true,
           "optional": true
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
             "ansi-regex": "2.1.1"
@@ -2224,13 +2325,15 @@
         },
         "strip-json-comments": {
           "version": "2.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
           "dev": true,
           "optional": true
         },
         "tar": {
           "version": "2.2.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+          "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
           "dev": true,
           "requires": {
             "block-stream": "0.0.9",
@@ -2240,7 +2343,8 @@
         },
         "tar-pack": {
           "version": "3.4.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+          "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2256,7 +2360,8 @@
         },
         "tough-cookie": {
           "version": "2.3.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+          "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2265,7 +2370,8 @@
         },
         "tunnel-agent": {
           "version": "0.6.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2274,30 +2380,35 @@
         },
         "tweetnacl": {
           "version": "0.14.5",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+          "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
           "dev": true,
           "optional": true
         },
         "uid-number": {
           "version": "0.0.6",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+          "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
           "dev": true,
           "optional": true
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
           "dev": true
         },
         "uuid": {
           "version": "3.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
+          "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=",
           "dev": true,
           "optional": true
         },
         "verror": {
           "version": "1.3.6",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
+          "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2306,7 +2417,8 @@
         },
         "wide-align": {
           "version": "1.1.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+          "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2315,7 +2427,8 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
           "dev": true
         }
       }