Commit 1ca05f08 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

meep-frontend fixes + cypress upgrade from 3.2.0 to 3.6.0

parent 97132631

js-apps/meep-frontend/src/js/containers/meep-container.js

+7 −7
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ class MeepContainer extends Component { 
    this.refreshIntervalTimer = null;

    this.meepCfgApi = new meepCtrlRestApiClient.ScenarioConfigurationApi();

    this.meepExecApi = new meepCtrlRestApiClient.ScenarioExecutionApi();

    this.metricsPollingEnabled = false

    this.metricsPollingEnabled = false;

  }



  componentDidMount() {
@@ -189,16 +189,16 @@ class MeepContainer extends Component { 
  }



  setMetricsPolling() {

    if (this.props.dashboardView1 == VIS_VIEW && this.props.dashboardView2 == VIEW_NAME_NONE) {

      this.stopMetricsPolling()

    if (this.props.dashboardView1 === VIS_VIEW && this.props.dashboardView2 === VIEW_NAME_NONE) {

      this.stopMetricsPolling();

    } else {

      this.startMetricsPolling()

      this.startMetricsPolling();

    }

  }

  stopMetricsPolling() {

    if (this.metricsPollingEnabled) {

      clearInterval(this.dataTimer);

      this.metricsPollingEnabled = false

      this.metricsPollingEnabled = false;

    }

  }

  startMetricsPolling() {
@@ -209,7 +209,7 @@ class MeepContainer extends Component { 
        this.fetchMetrics();

      };

      this.dataTimer = setInterval(nextData, 1000);

      this.metricsPollingEnabled = true

      this.metricsPollingEnabled = true;

    }

  }
@@ -425,7 +425,7 @@ class MeepContainer extends Component { 


  render() {

    const flexString = this.props.mainDrawerOpen ? '0 0 250px' : '0 0 0px';

    this.setMetricsPolling()

    this.setMetricsPolling();



    return (

      <div style={{width: '100%'}}>

js-apps/meep-frontend/src/js/containers/settings/settings-page-container.js

+11 −7
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ import { TextField } from '@rmwc/textfield'; 
import { Checkbox } from '@rmwc/checkbox';

import { Elevation } from '@rmwc/elevation';



const VIS_CONFIGURATION_MODE_LABEL = 'VIS Configuration Mode';

const SHOW_DASHBOARD_CONFIG_LABEL = 'Show Dashboard Config (Experimental)';



import {

  uiSetAutomaticRefresh,

  uiChangeRefreshInterval,
@@ -32,9 +29,13 @@ import { 
} from '../../state/ui';



import {

  PAGE_SETTINGS,

  SET_EXEC_REFRESH_CHECKBOX,

  SET_EXEC_REFRESH_INT,

  PAGE_SETTINGS

  SET_VIS_CFG_CHECKBOX,

  SET_VIS_CFG_LABEL,

  SET_DASHBOARD_CFG_CHECKBOX,

  SET_DASHBOARD_CFG_LABEL

} from '../../meep-constants';



class SettingsPageContainer extends Component {
@@ -172,12 +173,14 @@ class SettingsPageContainer extends Component { 
                <CheckableSettingItem

                  stateItem={this.props.devMode}

                  changeStateItem={this.props.changeDevMode}

                  stateItemName={VIS_CONFIGURATION_MODE_LABEL}

                  stateItemName={SET_VIS_CFG_LABEL}

                  cydata={SET_VIS_CFG_CHECKBOX}

                />

                <CheckableSettingItem

                  stateItem={this.props.showDashboardConfig}

                  changeStateItem={this.props.changeShowDashboardConfig}

                  stateItemName={SHOW_DASHBOARD_CONFIG_LABEL}

                  stateItemName={SET_DASHBOARD_CFG_LABEL}

                  cydata={SET_DASHBOARD_CFG_CHECKBOX}

                />

              </Elevation>
@@ -189,7 +192,7 @@ class SettingsPageContainer extends Component { 
  }

}



const CheckableSettingItem = ({stateItem, changeStateItem, stateItemName}) => {

const CheckableSettingItem = ({stateItem, changeStateItem, stateItemName, cydata}) => {

  return (

    <Grid span={12} style={{marginTop: 10}}>

      <GridCell span={12}>
@@ -197,6 +200,7 @@ const CheckableSettingItem = ({stateItem, changeStateItem, stateItemName}) => { 
          <Checkbox

            checked={stateItem}

            onChange={e => changeStateItem(e.target.checked)}

            data-cy={cydata}

          >

            {stateItemName}

          </Checkbox>

js-apps/meep-frontend/src/js/meep-constants.js

+4 −1
Original line number Diff line number Diff line
@@ -186,7 +186,10 @@ export const MON_DASHBOARD_IFRAME = 'mon-dashboard-iframe'; 
// Settings Page IDs

export const SET_EXEC_REFRESH_CHECKBOX = 'set-exec-refresh-checkbox';

export const SET_EXEC_REFRESH_INT = 'set-exec-refresh-int';

export const SET_DEV_MODE_CHECKBOX = 'set-dev-mode-checkbox';

export const SET_VIS_CFG_CHECKBOX = 'set-vis-cfg-checkbox';

export const SET_VIS_CFG_LABEL = 'VIS Configuration Mode';

export const SET_DASHBOARD_CFG_CHECKBOX = 'set-dashboard-cfg-checkbox';

export const SET_DASHBOARD_CFG_LABEL = 'Show Dashboard Config (Experimental)';



// Logical Scenario types

export const TYPE_SCENARIO = 0;

test/cypress/integration/tests/meep-settings-spec.js

+10 −9
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ describe('MEEP Settings', function() { 
    // Go to monitoring page

    cy.log('Go to settings page');

    click(meep.MEEP_TAB_SET);

    verify(meep.SET_EXEC_REFRESH_CHECKBOX, 'not.be.checked');

    verifyEnabled(meep.SET_EXEC_REFRESH_INT, false);



    // Enable refresh interval

    check(meep.SET_EXEC_REFRESH_CHECKBOX, true);
@@ -60,15 +58,18 @@ describe('MEEP Settings', function() { 
    // Go to monitoring page

    cy.log('Go to settings page');

    click(meep.MEEP_TAB_SET);

    verify(meep.SET_DEV_MODE_CHECKBOX, 'not.be.checked');



    // Enable dev mode

    check(meep.SET_DEV_MODE_CHECKBOX, true);

    verify(meep.SET_DEV_MODE_CHECKBOX, 'be.checked');

    // Enable & disable vis config mode

    check(meep.SET_VIS_CFG_CHECKBOX, true);

    verify(meep.SET_VIS_CFG_CHECKBOX, 'be.checked');

    check(meep.SET_VIS_CFG_CHECKBOX, false);

    verify(meep.SET_VIS_CFG_CHECKBOX, 'not.be.checked');



    // Disable dev mode

    check(meep.SET_DEV_MODE_CHECKBOX, false);

    verify(meep.SET_DEV_MODE_CHECKBOX, 'not.be.checked');

    // Enable & disable dashboard config mode

    check(meep.SET_DASHBOARD_CFG_CHECKBOX, true);

    verify(meep.SET_DASHBOARD_CFG_CHECKBOX, 'be.checked');

    check(meep.SET_DASHBOARD_CFG_CHECKBOX, false);

    verify(meep.SET_DASHBOARD_CFG_CHECKBOX, 'not.be.checked');

  });



});

test/package-lock.json

+108 −86
Original line number Diff line number Diff line
@@ -47,10 +47,16 @@ 
        "lodash.once": "^4.1.1"

      }

    },

    "@types/sizzle": {

      "version": "2.3.2",

      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",

      "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==",

      "dev": true

    },

    "ajv": {

      "version": "6.10.0",

      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",

      "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",

      "version": "6.10.2",

      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",

      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",

      "dev": true,

      "requires": {

        "fast-deep-equal": "^2.0.1",
@@ -77,6 +83,12 @@ 
      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",

      "dev": true

    },

    "arch": {

      "version": "2.1.1",

      "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",

      "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==",

      "dev": true

    },

    "asn1": {

      "version": "0.2.4",

      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -93,12 +105,12 @@ 
      "dev": true

    },

    "async": {

      "version": "2.4.0",

      "resolved": "https://registry.npmjs.org/async/-/async-2.4.0.tgz",

      "integrity": "sha1-SZAgDxjqW4N8LMT4wDGmmFw4VhE=",

      "version": "2.6.1",

      "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",

      "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",

      "dev": true,

      "requires": {

        "lodash": "^4.14.0"

        "lodash": "^4.17.10"

      }

    },

    "asynckit": {
@@ -258,9 +270,9 @@ 
      "dev": true

    },

    "combined-stream": {

      "version": "1.0.7",

      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",

      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",

      "version": "1.0.8",

      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",

      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",

      "dev": true,

      "requires": {

        "delayed-stream": "~1.0.0"
@@ -316,39 +328,41 @@ 
      }

    },

    "cypress": {

      "version": "3.2.0",

      "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.2.0.tgz",

      "integrity": "sha512-PN0wz6x634QyNL56/voTzJoeScDfwtecvSfFTHfv5MkHuECVSR4VQcEZTvYtKWln3CMBMUkWbBKPIwwu2+a/kw==",

      "version": "3.6.0",

      "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.6.0.tgz",

      "integrity": "sha512-ODhbOrH1XZx0DUoYmJSvOSbEQjycNOpFYe7jOnHkT1+sdsn2+uqwAjZ1x982q3H4R/5iZjpSd50gd/iw2bofzg==",

      "dev": true,

      "requires": {

        "@cypress/listr-verbose-renderer": "0.4.1",

        "@cypress/xvfb": "1.2.4",

        "@types/sizzle": "2.3.2",

        "arch": "2.1.1",

        "bluebird": "3.5.0",

        "cachedir": "1.3.0",

        "chalk": "2.4.2",

        "check-more-types": "2.24.0",

        "commander": "2.15.1",

        "common-tags": "1.8.0",

        "debug": "3.1.0",

        "debug": "3.2.6",

        "execa": "0.10.0",

        "executable": "4.1.1",

        "extract-zip": "1.6.7",

        "fs-extra": "4.0.1",

        "getos": "3.1.0",

        "glob": "7.1.3",

        "fs-extra": "5.0.0",

        "getos": "3.1.1",

        "is-ci": "1.2.1",

        "is-installed-globally": "0.1.0",

        "lazy-ass": "1.6.0",

        "listr": "0.12.0",

        "lodash": "4.17.11",

        "lodash": "4.17.15",

        "log-symbols": "2.2.0",

        "minimist": "1.2.0",

        "moment": "2.24.0",

        "ramda": "0.24.1",

        "request": "2.88.0",

        "request-progress": "0.4.0",

        "request-progress": "3.0.0",

        "supports-color": "5.5.0",

        "tmp": "0.0.33",

        "tmp": "0.1.0",

        "untildify": "3.0.3",

        "url": "0.11.0",

        "yauzl": "2.10.0"

      }
@@ -369,12 +383,12 @@ 
      "dev": true

    },

    "debug": {

      "version": "3.1.0",

      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",

      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",

      "version": "3.2.6",

      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",

      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",

      "dev": true,

      "requires": {

        "ms": "2.0.0"

        "ms": "^2.1.1"

      }

    },

    "delayed-stream": {
@@ -462,6 +476,12 @@ 
            "ms": "2.0.0"

          }

        },

        "ms": {

          "version": "2.0.0",

          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",

          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",

          "dev": true

        },

        "yauzl": {

          "version": "2.4.1",

          "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
@@ -528,13 +548,13 @@ 
      }

    },

    "fs-extra": {

      "version": "4.0.1",

      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.1.tgz",

      "integrity": "sha1-f8DGyJV/mD9X8waiTlud3Y0N2IA=",

      "version": "5.0.0",

      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",

      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",

      "dev": true,

      "requires": {

        "graceful-fs": "^4.1.2",

        "jsonfile": "^3.0.0",

        "jsonfile": "^4.0.0",

        "universalify": "^0.1.0"

      }

    },
@@ -551,12 +571,12 @@ 
      "dev": true

    },

    "getos": {

      "version": "3.1.0",

      "resolved": "https://registry.npmjs.org/getos/-/getos-3.1.0.tgz",

      "integrity": "sha512-i9vrxtDu5DlLVFcrbqUqGWYlZN/zZ4pGMICCAcZoYsX3JA54nYp8r5EThw5K+m2q3wszkx4Th746JstspB0H4Q==",

      "version": "3.1.1",

      "resolved": "https://registry.npmjs.org/getos/-/getos-3.1.1.tgz",

      "integrity": "sha512-oUP1rnEhAr97rkitiszGP9EgDVYnmchgFzfqRzSkgtfv7ai6tEi7Ko8GgjNXts7VLWEqrTWyhsOKLe5C5b/Zkg==",

      "dev": true,

      "requires": {

        "async": "2.4.0"

        "async": "2.6.1"

      }

    },

    "getpass": {
@@ -569,9 +589,9 @@ 
      }

    },

    "glob": {

      "version": "7.1.3",

      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",

      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",

      "version": "7.1.5",

      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz",

      "integrity": "sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==",

      "dev": true,

      "requires": {

        "fs.realpath": "^1.0.0",
@@ -592,9 +612,9 @@ 
      }

    },

    "graceful-fs": {

      "version": "4.1.15",

      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",

      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",

      "version": "4.2.3",

      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",

      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",

      "dev": true

    },

    "har-schema": {
@@ -659,9 +679,9 @@ 
      }

    },

    "inherits": {

      "version": "2.0.3",

      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",

      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",

      "version": "2.0.4",

      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",

      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",

      "dev": true

    },

    "ini": {
@@ -777,9 +797,9 @@ 
      "dev": true

    },

    "jsonfile": {

      "version": "3.0.1",

      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",

      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",

      "version": "4.0.0",

      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",

      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",

      "dev": true,

      "requires": {

        "graceful-fs": "^4.1.6"
@@ -949,9 +969,9 @@ 
      }

    },

    "lodash": {

      "version": "4.17.11",

      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",

      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",

      "version": "4.17.15",

      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",

      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",

      "dev": true

    },

    "lodash.once": {
@@ -1033,9 +1053,9 @@ 
      "dev": true

    },

    "ms": {

      "version": "2.0.0",

      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",

      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",

      "version": "2.1.2",

      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",

      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",

      "dev": true

    },

    "nice-try": {
@@ -1044,12 +1064,6 @@ 
      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",

      "dev": true

    },

    "node-eta": {

      "version": "0.1.1",

      "resolved": "https://registry.npmjs.org/node-eta/-/node-eta-0.1.1.tgz",

      "integrity": "sha1-QGYQmzk3HHYccrfr2pqeoKXeEh8=",

      "dev": true

    },

    "npm-run-path": {

      "version": "2.0.2",

      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -1131,12 +1145,6 @@ 
      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",

      "dev": true

    },

    "os-tmpdir": {

      "version": "1.0.2",

      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",

      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",

      "dev": true

    },

    "p-finally": {

      "version": "1.0.0",

      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -1186,15 +1194,15 @@ 
      "dev": true

    },

    "process-nextick-args": {

      "version": "2.0.0",

      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",

      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",

      "version": "2.0.1",

      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",

      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",

      "dev": true

    },

    "psl": {

      "version": "1.1.31",

      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",

      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",

      "version": "1.4.0",

      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",

      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",

      "dev": true

    },

    "punycode": {
@@ -1274,13 +1282,12 @@ 
      }

    },

    "request-progress": {

      "version": "0.4.0",

      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.4.0.tgz",

      "integrity": "sha1-wZVOOQhqqFJpxWYLzuAUKmpw1+c=",

      "version": "3.0.0",

      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",

      "integrity": "sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=",

      "dev": true,

      "requires": {

        "node-eta": "^0.1.1",

        "throttleit": "^0.0.2"

        "throttleit": "^1.0.0"

      }

    },

    "restore-cursor": {
@@ -1293,6 +1300,15 @@ 
        "onetime": "^1.0.0"

      }

    },

    "rimraf": {

      "version": "2.7.1",

      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",

      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",

      "dev": true,

      "requires": {

        "glob": "^7.1.3"

      }

    },

    "rxjs": {

      "version": "5.5.12",

      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
@@ -1315,9 +1331,9 @@ 
      "dev": true

    },

    "semver": {

      "version": "5.7.0",

      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",

      "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",

      "version": "5.7.1",

      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",

      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",

      "dev": true

    },

    "shebang-command": {
@@ -1421,18 +1437,18 @@ 
      "dev": true

    },

    "throttleit": {

      "version": "0.0.2",

      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",

      "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=",

      "version": "1.0.0",

      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",

      "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",

      "dev": true

    },

    "tmp": {

      "version": "0.0.33",

      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",

      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",

      "version": "0.1.0",

      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz",

      "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==",

      "dev": true,

      "requires": {

        "os-tmpdir": "~1.0.2"

        "rimraf": "^2.6.3"

      }

    },

    "tough-cookie": {
@@ -1480,6 +1496,12 @@ 
      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",

      "dev": true

    },

    "untildify": {

      "version": "3.0.3",

      "resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",

      "integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",

      "dev": true

    },

    "uri-js": {

      "version": "4.2.2",

      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -1514,9 +1536,9 @@ 
      "dev": true

    },

    "uuid": {

      "version": "3.3.2",

      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",

      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",

      "version": "3.3.3",

      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",

      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",

      "dev": true

    },

    "verror": {