You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/09/26 09:43:18 UTC

[incubator-dlab] branch DLAB-terraform updated (cff0bc7 -> ac6b9a3)

This is an automated email from the ASF dual-hosted git repository.

bhliva pushed a change to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


    from cff0bc7  Merge pull request #320 from apache/DLAB-terraform-fixing
     add 6e4db18  [DLAB-1056]: added project data to reporting grid
     add 794fd91  [DLAB-1031]: fixed names overlaping on billing detail dialog
     add ba581b2  [DLAB-1094]: prevent extra scrollbar on create notebook dialog
     add 1bb1214  moved servise pages
     add cb1a557  moved servise pages; separate service page module
     add 1cd5653  moved servise pages; separate service page module
     add f303f8a  [DLAB-1056]: added project parameter to configuration model
     add 42803a4  [DLAB-987]: exteneded billing filtering; added expanding
     add 4f21dbb  updated perameters and configurations
     add bd9cffb  added starting loader; mocked api url for dev mode
     add 5b93b55  Merge branch 'develop' of github.com:apache/incubator-dlab into dlab-loading
     add 26c4c23  moved interseptors loading to core module
     add a374b70  initial page preloader
     add dc28460  merge dlab-loading into DLAB-1056
     add 9a3dfca  Merge remote-tracking branch 'remotes/origin/develop' into DLAB-1056
     add effc3f8  DLAB-000 added possibility to filter by project on billing report page
     add 4416d09  Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
     add deca22e  DLAB-000 added project field to billing report
     add b307c81  Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
     add 39fa563  [DLAB-1056]: added filtering by project to billing report
     add 46787bc  [DLAB-1056]: changed ReportingConfigModel
     add 0e30fb4  [DLAB-1116]: Alter url endpoint error message
     add 032ad0d  Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
     add a2f4e02  added missed package
     add db72322  added missed package
     add f3aced2  routing animation added
     add 097fe95  added default api url key to production env variables
     add 957a333  Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
     add 6d72270  [DLAB-1079]: added key generation on project creation
     add 941dc21  Merge branch 'DLAB-1079' of github.com:apache/incubator-dlab into DLAB-1056
     add e680da2  [DLAB-1079]: generate key service fixes
     add 48a04ad  [DLAB-1079]: download key parameters fixes; util options added
     add a3ad97a  Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
     add 4c0bdae  [DLAB-1079]: key format for saving added
     add f7e3db4  package versions updates; mismatching issues fixes
     add 69ebf13  shared material module update; imports fixes
     add ce2cc00  request methods mapping
     add fb1f9b1  toastr notification appearing fixes
     add af3b90e  [DLAB-472]: added filtering controls to management grid
     add 8b57048  [DLAB-472]: added positioning fixes on reporting
     add 54416cd  [DLAB-472]: generate key controls fixes
     add cb317e9  [DLAB-472]: added filtering configuration to management grid
     add a579843  [DLAB-472]: added filtering configuration to management grid
     add 4c9df43  [DLAB-472]: added filtering by multiple values
     add caf4ef6  [DLAB-472]: added filter row collapsing
     add ce232d1  Updated node.js to v12.
     add 3340139  Merge remote-tracking branch 'origin/DLAB-1056' into DLAB-1056
     add 5e247e2  Updated node.js to v12 ssn.
     add 1708e1e  Fixed "npm install"
     add a49ce33  Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
     add 604b0d4  [DLAB-472]: fixed filter collapse on list of resources grid
     add 022f4ca  [DLAB-1151][DLAB-1149]: extended tags tooltips;
     add 4c32065  [DLAB-1147]: prevent project status check on env management dialog
     add 0d0a110  Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
     add 8114011  Merge pull request #321 from apache/DLAB-1056
     new 99c0767  Merge remote-tracking branch 'remotes/origin/develop' into DLAB-terraform
     new ac6b9a3  Merge remote-tracking branch 'remotes/origin/develop' into DLAB-terraform

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/general/lib/os/debian/ssn_lib.py           |     2 +-
 .../src/general/lib/os/redhat/ssn_lib.py           |     2 +-
 .../src/ssn/scripts/configure_ui.py                |     2 +-
 .../epam/dlab/backendapi/dao/BaseBillingDAO.java   |     4 +
 .../dlab/backendapi/dao/aws/AwsBillingDAO.java     |     3 +-
 .../backendapi/resources/dto/BillingFilter.java    |     3 +
 .../src/main/resources/webapp/angular.json         |    25 +-
 .../src/main/resources/webapp/browserslist         |    12 +
 .../src/main/resources/webapp/package-lock.json    | 19967 ++++++++-----------
 .../src/main/resources/webapp/package.json         |    66 +-
 .../app/access-denied/access-denied.component.html |    33 -
 .../backup-dilog/backup-dilog.component.ts         |     2 +-
 .../management/endpoints/endpoints.component.html  |     4 +-
 .../management/endpoints/endpoints.component.ts    |     2 +-
 .../manage-environment-dilog.component.html        |    23 +-
 .../manage-environment-dilog.component.ts          |     2 +-
 .../management/management-data.service.ts          |     4 +
 .../management-grid/management-grid.component.html |   125 +-
 .../management-grid/management-grid.component.scss |    56 +-
 .../management-grid/management-grid.component.ts   |    90 +-
 .../management/management.component.html           |     8 +-
 .../management/management.component.ts             |     2 +-
 .../administration/management/management.model.ts  |    27 +
 .../ssn-monitor/ssn-monitor.component.ts           |     2 +-
 .../project-form/project-form.component.html       |     4 +
 .../project-form/project-form.component.scss       |     7 +
 .../project/project-form/project-form.component.ts |    23 +-
 .../project/project-list/project-list.component.ts |     2 +-
 .../administration/project/project.component.ts    |     2 +-
 .../app/administration/roles/roles.component.ts    |     2 +-
 .../main/resources/webapp/src/app/app.module.ts    |    35 +-
 .../resources/webapp/src/app/app.routing.module.ts |     4 +-
 .../resources/webapp/src/app/core/core.module.ts   |    26 +-
 .../core/interceptors/httpInterceptor.service.ts   |     0
 .../core/interceptors/logInterceptor.factory.ts    |     0
 .../services/applicationServiceFacade.service.ts   |   176 +-
 .../src/app/core/services/userAccessKey.service.ts |     8 +-
 .../webapp/src/app/core/util/fileUtils.ts          |    21 +-
 .../webapp/src/app/core/util/http-methods.ts       |    11 +
 .../webapp/src/app/core/util/http-status-codes.ts  |   106 +-
 .../resources/webapp/src/app/core/util/index.ts    |     1 +
 .../webapp/src/app/layout/layout.component.ts      |     1 +
 .../webapp/src/app/not-found/not-found.module.ts   |    29 -
 .../reporting-grid/reporting-grid.component.html   |    92 +-
 .../reporting-grid/reporting-grid.component.scss   |    27 +-
 .../reporting-grid/reporting-grid.component.ts     |    10 +-
 .../src/app/reporting/reporting.component.ts       |    11 +-
 .../cluster-details/cluster-details.component.ts   |     4 +-
 ...mputational-resource-create-dialog.component.ts |     8 +-
 .../computational-resources-list.component.ts      |     2 +-
 .../ami-create-dialog.component.ts                 |     2 +-
 .../cost-details-dialog.component.scss             |    15 +-
 .../cost-details-dialog.component.ts               |     2 +-
 .../create-environment.component.scss              |     2 +-
 .../create-environment.component.ts                |     4 +-
 .../detail-dialog/detail-dialog.component.ts       |     8 +-
 .../install-libraries.component.ts                 |     6 +-
 .../manage-ungit/manage-ungit.component.ts         |     4 +-
 .../resources-grid/resources-grid.component.html   |    38 +-
 .../resources-grid/resources-grid.component.scss   |    46 +-
 .../resources-grid/resources-grid.component.ts     |     2 +-
 .../src/app/resources/resources.component.ts       |     4 +-
 .../app/resources/scheduler/scheduler.component.ts |    98 +-
 .../access-denied/access-denied.component.scss     |     0
 .../access-denied/access-denied.component.ts       |    17 +-
 .../not-found/not-found.component.html             |     0
 .../not-found/not-found.component.scss             |     0
 .../not-found/not-found.component.ts               |     0
 .../service-pages.module.ts}                       |     9 +-
 .../webapp/src/app/shared/bubble/bubble.service.ts |     4 +-
 .../main/resources/webapp/src/app/shared/index.ts  |     1 -
 .../webapp/src/app/shared/material.module.ts       |    66 +-
 .../confirmation-dialog.component.ts               |     2 +-
 .../shared/modal-dialog/key-upload-dialog/index.ts |    34 -
 .../key-upload-dialog.component.html               |    64 -
 .../key-upload-dialog.component.ts                 |    82 -
 .../key-upload-dialog/key-upload.model.ts          |    80 -
 .../notification-dialog.component.ts               |     2 +-
 .../progress-dialog/progress-dialog.component.ts   |     2 +-
 .../webapp/src/app/shared/navbar/index.ts          |     5 +-
 .../src/app/shared/navbar/navbar.component.html    |     7 +-
 .../src/app/shared/navbar/navbar.component.scss    |    52 +
 .../src/app/shared/navbar/navbar.component.ts      |    44 +-
 .../shared/time-picker/time-picker.component.scss  |     2 -
 .../shared/time-picker/time-picker.component.ts    |     2 +-
 .../src/app/webterminal/webterminal.component.ts   |     3 +-
 .../webapp/src/assets/styles/_dialogs.scss         |     5 -
 .../resources/webapp/src/assets/styles/_theme.scss |    41 +-
 .../webapp/src/assets/styles/app-loading.scss      |    86 +
 .../webapp/src/dictionary/aws.dictionary.ts        |     6 +-
 .../webapp/src/dictionary/azure.dictionary.ts      |     6 +-
 .../webapp/src/dictionary/gcp.dictionary.ts        |     6 +-
 .../webapp/src/environments/environment.prod.ts    |     3 +-
 .../webapp/src/environments/environment.ts         |     3 +-
 .../src/main/resources/webapp/src/index.html       |    80 +-
 .../src/main/resources/webapp/src/polyfills.ts     |    33 +-
 .../src/main/resources/webapp/src/styles.scss      |    11 +-
 .../main/resources/webapp/src/tsconfig.app.json    |     2 -
 .../main/resources/webapp/src/tsconfig.spec.json   |     1 -
 .../src/main/resources/webapp/tsconfig.json        |    16 +-
 .../src/main/resources/webapp/tslint.json          |     8 +-
 101 files changed, 9887 insertions(+), 12207 deletions(-)
 create mode 100644 services/self-service/src/main/resources/webapp/browserslist
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.html
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/core/interceptors/httpInterceptor.service.ts
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/core/interceptors/logInterceptor.factory.ts
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/core/util/http-methods.ts
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/not-found/not-found.module.ts
 rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/access-denied/access-denied.component.scss (100%)
 rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/access-denied/access-denied.component.ts (69%)
 rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/not-found/not-found.component.html (100%)
 rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/not-found/not-found.component.scss (100%)
 rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/not-found/not-found.component.ts (100%)
 rename services/self-service/src/main/resources/webapp/src/app/{access-denied/access-denied.module.ts => service-pages/service-pages.module.ts} (75%)
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.html
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload.model.ts
 create mode 100644 services/self-service/src/main/resources/webapp/src/assets/styles/app-loading.scss


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 01/02: Merge remote-tracking branch 'remotes/origin/develop' into DLAB-terraform

Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bhliva pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 99c07673ca6dc264f5218afdaeda674666864622
Merge: cff0bc7 8114011
Author: bhliva <bo...@epam.com>
AuthorDate: Thu Sep 26 11:43:29 2019 +0300

    Merge remote-tracking branch 'remotes/origin/develop' into DLAB-terraform
    
    # Conflicts:
    #	services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
    #	services/self-service/src/main/resources/webapp/src/app/webterminal/webterminal.component.ts

 .../src/general/lib/os/debian/ssn_lib.py           |     2 +-
 .../src/general/lib/os/redhat/ssn_lib.py           |     2 +-
 .../src/ssn/scripts/configure_ui.py                |     2 +-
 .../epam/dlab/backendapi/dao/BaseBillingDAO.java   |     4 +
 .../dlab/backendapi/dao/aws/AwsBillingDAO.java     |     3 +-
 .../backendapi/resources/dto/BillingFilter.java    |     3 +
 .../src/main/resources/webapp/angular.json         |    25 +-
 .../src/main/resources/webapp/browserslist         |    12 +
 .../src/main/resources/webapp/package-lock.json    | 19967 ++++++++-----------
 .../src/main/resources/webapp/package.json         |    66 +-
 .../app/access-denied/access-denied.component.html |    33 -
 .../backup-dilog/backup-dilog.component.ts         |     2 +-
 .../management/endpoints/endpoints.component.html  |     4 +-
 .../management/endpoints/endpoints.component.ts    |     2 +-
 .../manage-environment-dilog.component.html        |    23 +-
 .../manage-environment-dilog.component.ts          |     2 +-
 .../management/management-data.service.ts          |     4 +
 .../management-grid/management-grid.component.html |   125 +-
 .../management-grid/management-grid.component.scss |    56 +-
 .../management-grid/management-grid.component.ts   |    90 +-
 .../management/management.component.html           |     8 +-
 .../management/management.component.ts             |     2 +-
 .../administration/management/management.model.ts  |    27 +
 .../ssn-monitor/ssn-monitor.component.ts           |     2 +-
 .../project-form/project-form.component.html       |     4 +
 .../project-form/project-form.component.scss       |     7 +
 .../project/project-form/project-form.component.ts |    23 +-
 .../project/project-list/project-list.component.ts |     2 +-
 .../administration/project/project.component.ts    |     2 +-
 .../app/administration/roles/roles.component.ts    |     2 +-
 .../main/resources/webapp/src/app/app.module.ts    |    35 +-
 .../resources/webapp/src/app/app.routing.module.ts |     4 +-
 .../resources/webapp/src/app/core/core.module.ts   |    26 +-
 .../core/interceptors/httpInterceptor.service.ts   |     0
 .../core/interceptors/logInterceptor.factory.ts    |     0
 .../services/applicationServiceFacade.service.ts   |   178 +-
 .../src/app/core/services/userAccessKey.service.ts |     8 +-
 .../webapp/src/app/core/util/fileUtils.ts          |    21 +-
 .../webapp/src/app/core/util/http-methods.ts       |    11 +
 .../webapp/src/app/core/util/http-status-codes.ts  |   106 +-
 .../resources/webapp/src/app/core/util/index.ts    |     1 +
 .../webapp/src/app/layout/layout.component.ts      |     1 +
 .../webapp/src/app/not-found/not-found.module.ts   |    29 -
 .../reporting-grid/reporting-grid.component.html   |    92 +-
 .../reporting-grid/reporting-grid.component.scss   |    27 +-
 .../reporting-grid/reporting-grid.component.ts     |    10 +-
 .../src/app/reporting/reporting.component.ts       |    11 +-
 .../cluster-details/cluster-details.component.ts   |     4 +-
 ...mputational-resource-create-dialog.component.ts |     8 +-
 .../computational-resources-list.component.ts      |     2 +-
 .../ami-create-dialog.component.ts                 |     2 +-
 .../cost-details-dialog.component.scss             |    15 +-
 .../cost-details-dialog.component.ts               |     2 +-
 .../create-environment.component.scss              |     2 +-
 .../create-environment.component.ts                |     4 +-
 .../detail-dialog/detail-dialog.component.ts       |     8 +-
 .../install-libraries.component.ts                 |     6 +-
 .../manage-ungit/manage-ungit.component.ts         |     4 +-
 .../resources-grid/resources-grid.component.html   |    38 +-
 .../resources-grid/resources-grid.component.scss   |    46 +-
 .../resources-grid/resources-grid.component.ts     |     2 +-
 .../src/app/resources/resources.component.ts       |     4 +-
 .../app/resources/scheduler/scheduler.component.ts |    98 +-
 .../access-denied/access-denied.component.scss     |     0
 .../access-denied/access-denied.component.ts       |    17 +-
 .../not-found/not-found.component.html             |     0
 .../not-found/not-found.component.scss             |     0
 .../not-found/not-found.component.ts               |     0
 .../service-pages.module.ts}                       |     9 +-
 .../webapp/src/app/shared/bubble/bubble.service.ts |     4 +-
 .../main/resources/webapp/src/app/shared/index.ts  |     1 -
 .../webapp/src/app/shared/material.module.ts       |    66 +-
 .../confirmation-dialog.component.ts               |     2 +-
 .../shared/modal-dialog/key-upload-dialog/index.ts |    34 -
 .../key-upload-dialog.component.html               |    64 -
 .../key-upload-dialog.component.ts                 |    82 -
 .../key-upload-dialog/key-upload.model.ts          |    80 -
 .../notification-dialog.component.ts               |     2 +-
 .../progress-dialog/progress-dialog.component.ts   |     2 +-
 .../webapp/src/app/shared/navbar/index.ts          |     5 +-
 .../src/app/shared/navbar/navbar.component.html    |     7 +-
 .../src/app/shared/navbar/navbar.component.scss    |    52 +
 .../src/app/shared/navbar/navbar.component.ts      |    44 +-
 .../shared/time-picker/time-picker.component.scss  |     2 -
 .../shared/time-picker/time-picker.component.ts    |     2 +-
 .../src/app/webterminal/webterminal.component.ts   |     3 +-
 .../webapp/src/assets/styles/_dialogs.scss         |     5 -
 .../resources/webapp/src/assets/styles/_theme.scss |    41 +-
 .../webapp/src/assets/styles/app-loading.scss      |    86 +
 .../webapp/src/dictionary/aws.dictionary.ts        |     6 +-
 .../webapp/src/dictionary/azure.dictionary.ts      |     6 +-
 .../webapp/src/dictionary/gcp.dictionary.ts        |     6 +-
 .../webapp/src/environments/environment.prod.ts    |     3 +-
 .../webapp/src/environments/environment.ts         |     3 +-
 .../src/main/resources/webapp/src/index.html       |    80 +-
 .../src/main/resources/webapp/src/polyfills.ts     |    33 +-
 .../src/main/resources/webapp/src/styles.scss      |    11 +-
 .../main/resources/webapp/src/tsconfig.app.json    |     2 -
 .../main/resources/webapp/src/tsconfig.spec.json   |     1 -
 .../src/main/resources/webapp/tsconfig.json        |    16 +-
 .../src/main/resources/webapp/tslint.json          |     8 +-
 101 files changed, 9888 insertions(+), 12208 deletions(-)

diff --cc services/self-service/src/main/resources/webapp/package-lock.json
index a8fcfde,f6b216f..9b9ab8c
--- a/services/self-service/src/main/resources/webapp/package-lock.json
+++ b/services/self-service/src/main/resources/webapp/package-lock.json
@@@ -4979,27 -4814,139 +4814,139 @@@
              "util-deprecate": "~1.0.1"
            }
          },
-         "rimraf": {
-           "version": "2.6.3",
-           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-           "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+         "string_decoder": {
+           "version": "1.1.1",
+           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
            "dev": true,
-           "optional": true,
            "requires": {
-             "glob": "^7.1.3"
+             "safe-buffer": "~5.1.0"
            }
-         },
-         "safe-buffer": {
-           "version": "5.1.2",
-           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-           "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-           "dev": true,
-           "optional": true
-         },
-         "safer-buffer": {
+         }
+       }
+     },
+     "follow-redirects": {
+       "version": "1.9.0",
+       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
+       "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==",
+       "dev": true,
+       "requires": {
+         "debug": "^3.0.0"
+       },
+       "dependencies": {
+         "debug": {
+           "version": "3.2.6",
+           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+           "dev": true,
+           "requires": {
+             "ms": "^2.1.1"
+           }
+         },
+         "ms": {
            "version": "2.1.2",
-           "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-           "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+           "dev": true
+         }
+       }
+     },
+     "for-in": {
+       "version": "1.0.2",
+       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+       "dev": true
+     },
+     "forever-agent": {
+       "version": "0.6.1",
+       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+       "dev": true
+     },
+     "form-data": {
+       "version": "2.3.3",
+       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+       "dev": true,
+       "requires": {
+         "asynckit": "^0.4.0",
+         "combined-stream": "^1.0.6",
+         "mime-types": "^2.1.12"
+       }
+     },
+     "forwarded": {
+       "version": "0.1.2",
+       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+       "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+       "dev": true
+     },
+     "fragment-cache": {
+       "version": "0.2.1",
+       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+       "dev": true,
+       "requires": {
+         "map-cache": "^0.2.2"
+       }
+     },
+     "fresh": {
+       "version": "0.5.2",
+       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+       "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+       "dev": true
+     },
+     "from2": {
+       "version": "2.3.0",
+       "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+       "dev": true,
+       "requires": {
+         "inherits": "^2.0.1",
+         "readable-stream": "^2.0.0"
+       }
+     },
+     "fs-minipass": {
+       "version": "1.2.7",
+       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+       "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+       "dev": true,
+       "requires": {
+         "minipass": "^2.6.0"
+       }
+     },
+     "fs-write-stream-atomic": {
+       "version": "1.0.10",
+       "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+       "dev": true,
+       "requires": {
+         "graceful-fs": "^4.1.2",
+         "iferr": "^0.1.5",
+         "imurmurhash": "^0.1.4",
+         "readable-stream": "1 || 2"
+       }
+     },
+     "fs.realpath": {
+       "version": "1.0.0",
+       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+       "dev": true
+     },
+     "fsevents": {
+       "version": "1.2.9",
+       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+       "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+       "dev": true,
+       "optional": true,
+       "requires": {
+         "nan": "^2.12.1",
+         "node-pre-gyp": "^0.12.0"
+       },
+       "dependencies": {
+         "abbrev": {
+           "version": "1.1.1",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+           "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
            "dev": true,
            "optional": true
          },
@@@ -5010,63 -4957,60 +4957,60 @@@
            "dev": true,
            "optional": true
          },
-         "semver": {
-           "version": "5.7.0",
-           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-           "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+         "aproba": {
+           "version": "1.2.0",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+           "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
            "dev": true,
            "optional": true
          },
-         "set-blocking": {
-           "version": "2.0.0",
-           "resolved": false,
-           "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+         "are-we-there-yet": {
+           "version": "1.1.5",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+           "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
            "dev": true,
-           "optional": true
+           "optional": true,
+           "requires": {
+             "delegates": "^1.0.0",
+             "readable-stream": "^2.0.6"
+           }
          },
-         "signal-exit": {
-           "version": "3.0.2",
-           "resolved": false,
-           "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+         "balanced-match": {
+           "version": "1.0.0",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
            "dev": true,
            "optional": true
          },
-         "string-width": {
-           "version": "1.0.2",
-           "resolved": false,
-           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+         "brace-expansion": {
+           "version": "1.1.11",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
            "dev": true,
            "optional": true,
            "requires": {
-             "code-point-at": "^1.0.0",
-             "is-fullwidth-code-point": "^1.0.0",
-             "strip-ansi": "^3.0.0"
+             "balanced-match": "^1.0.0",
+             "concat-map": "0.0.1"
            }
          },
-         "string_decoder": {
+         "chownr": {
            "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+           "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
            "dev": true,
-           "optional": true,
-           "requires": {
-             "safe-buffer": "~5.1.0"
-           }
+           "optional": true
          },
-         "strip-ansi": {
-           "version": "3.0.1",
+         "code-point-at": {
+           "version": "1.1.0",
            "resolved": false,
-           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
            "dev": true,
-           "optional": true,
-           "requires": {
-             "ansi-regex": "^2.0.0"
-           }
+           "optional": true
          },
-         "strip-json-comments": {
-           "version": "2.0.1",
+         "concat-map": {
+           "version": "0.0.1",
            "resolved": false,
-           "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
            "dev": true,
            "optional": true
          },
@@@ -5093,970 -5028,521 +5028,521 @@@
            "dev": true,
            "optional": true
          },
-         "wide-align": {
-           "version": "1.1.3",
-           "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-           "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+         "debug": {
+           "version": "4.1.1",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
            "dev": true,
            "optional": true,
            "requires": {
-             "string-width": "^1.0.2 || 2"
+             "ms": "^2.1.1"
            }
          },
-         "wrappy": {
-           "version": "1.0.2",
+         "deep-extend": {
+           "version": "0.6.0",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+           "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+           "dev": true,
+           "optional": true
+         },
+         "delegates": {
+           "version": "1.0.0",
            "resolved": false,
-           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+           "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
            "dev": true,
            "optional": true
          },
-         "yallist": {
-           "version": "3.0.3",
-           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+         "detect-libc": {
+           "version": "1.0.3",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+           "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
            "dev": true,
            "optional": true
-         }
-       }
-     },
-     "fstream": {
-       "version": "1.0.11",
-       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-       "dev": true,
-       "requires": {
-         "graceful-fs": "^4.1.2",
-         "inherits": "~2.0.0",
-         "mkdirp": ">=0.5 0",
-         "rimraf": "2"
-       }
-     },
-     "gauge": {
-       "version": "2.7.4",
-       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-       "dev": true,
-       "requires": {
-         "aproba": "^1.0.3",
-         "console-control-strings": "^1.0.0",
-         "has-unicode": "^2.0.0",
-         "object-assign": "^4.1.0",
-         "signal-exit": "^3.0.0",
-         "string-width": "^1.0.1",
-         "strip-ansi": "^3.0.1",
-         "wide-align": "^1.1.0"
-       },
-       "dependencies": {
-         "is-fullwidth-code-point": {
+         },
+         "fs-minipass": {
+           "version": "1.2.5",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
+           "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+           "dev": true,
+           "optional": true,
+           "requires": {
+             "minipass": "^2.2.1"
+           }
+         },
+         "fs.realpath": {
            "version": "1.0.0",
-           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+           "resolved": false,
+           "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+           "dev": true,
+           "optional": true
+         },
+         "gauge": {
+           "version": "2.7.4",
+           "resolved": false,
+           "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
            "dev": true,
+           "optional": true,
            "requires": {
-             "number-is-nan": "^1.0.0"
+             "aproba": "^1.0.3",
+             "console-control-strings": "^1.0.0",
+             "has-unicode": "^2.0.0",
+             "object-assign": "^4.1.0",
+             "signal-exit": "^3.0.0",
+             "string-width": "^1.0.1",
+             "strip-ansi": "^3.0.1",
+             "wide-align": "^1.1.0"
            }
          },
-         "string-width": {
-           "version": "1.0.2",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+         "glob": {
+           "version": "7.1.3",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+           "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
            "dev": true,
+           "optional": true,
            "requires": {
-             "code-point-at": "^1.0.0",
-             "is-fullwidth-code-point": "^1.0.0",
-             "strip-ansi": "^3.0.0"
+             "fs.realpath": "^1.0.0",
+             "inflight": "^1.0.4",
+             "inherits": "2",
+             "minimatch": "^3.0.4",
+             "once": "^1.3.0",
+             "path-is-absolute": "^1.0.0"
            }
-         }
-       }
-     },
-     "gaze": {
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
-       "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
-       "dev": true,
-       "requires": {
-         "globule": "^1.0.0"
-       }
-     },
-     "genfun": {
-       "version": "5.0.0",
-       "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-       "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
-       "dev": true
-     },
-     "get-caller-file": {
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
-       "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
-       "dev": true
-     },
-     "get-stdin": {
-       "version": "4.0.1",
-       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-       "dev": true
-     },
-     "get-stream": {
-       "version": "4.1.0",
-       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-       "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-       "dev": true,
-       "requires": {
-         "pump": "^3.0.0"
-       }
-     },
-     "get-value": {
-       "version": "2.0.6",
-       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-       "dev": true
-     },
-     "getpass": {
-       "version": "0.1.7",
-       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-       "dev": true,
-       "requires": {
-         "assert-plus": "^1.0.0"
-       }
-     },
-     "glob": {
-       "version": "7.1.2",
-       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-       "dev": true,
-       "requires": {
-         "fs.realpath": "^1.0.0",
-         "inflight": "^1.0.4",
-         "inherits": "2",
-         "minimatch": "^3.0.4",
-         "once": "^1.3.0",
-         "path-is-absolute": "^1.0.0"
-       }
-     },
-     "glob-base": {
-       "version": "0.3.0",
-       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-       "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-       "dev": true,
-       "requires": {
-         "glob-parent": "^2.0.0",
-         "is-glob": "^2.0.0"
-       }
-     },
-     "glob-parent": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-       "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-       "dev": true,
-       "requires": {
-         "is-glob": "^2.0.0"
-       }
-     },
-     "globals": {
-       "version": "9.18.0",
-       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-       "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-       "dev": true
-     },
-     "globule": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
-       "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
-       "dev": true,
-       "requires": {
-         "glob": "~7.1.1",
-         "lodash": "~4.17.4",
-         "minimatch": "~3.0.2"
-       }
-     },
-     "graceful-fs": {
-       "version": "4.1.11",
-       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-       "dev": true
-     },
-     "guacamole-common-js": {
-       "version": "1.0.0-b",
-       "resolved": "https://registry.npmjs.org/guacamole-common-js/-/guacamole-common-js-1.0.0-b.tgz",
-       "integrity": "sha512-DLEy7yBQvwwJ4xoWfj1Z+DLOKCy5zwW4ELdpDeYKVWZMpBegbGGwI5qWb61b3aT7KBWsF6DRJHviPlcFHUdMRA=="
-     },
-     "gzip-size": {
-       "version": "5.1.1",
-       "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-       "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
-       "dev": true,
-       "requires": {
-         "duplexer": "^0.1.1",
-         "pify": "^4.0.1"
-       },
-       "dependencies": {
-         "pify": {
-           "version": "4.0.1",
-           "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-           "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-           "dev": true
-         }
-       }
-     },
-     "handle-thing": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-       "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
-       "dev": true
-     },
-     "handlebars": {
-       "version": "4.0.12",
-       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz",
-       "integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
-       "dev": true,
-       "requires": {
-         "async": "^2.5.0",
-         "optimist": "^0.6.1",
-         "source-map": "^0.6.1",
-         "uglify-js": "^3.1.4"
-       },
-       "dependencies": {
-         "source-map": {
-           "version": "0.6.1",
-           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-           "dev": true
-         }
-       }
-     },
-     "har-schema": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-       "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-       "dev": true
-     },
-     "har-validator": {
-       "version": "5.0.3",
-       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-       "dev": true,
-       "optional": true,
-       "requires": {
-         "ajv": "^5.1.0",
-         "har-schema": "^2.0.0"
-       },
-       "dependencies": {
-         "ajv": {
-           "version": "5.2.3",
-           "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
-           "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+         },
+         "has-unicode": {
+           "version": "2.0.1",
+           "resolved": false,
+           "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+           "dev": true,
+           "optional": true
+         },
+         "iconv-lite": {
+           "version": "0.4.24",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+           "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
            "dev": true,
            "optional": true,
            "requires": {
-             "co": "^4.6.0",
-             "fast-deep-equal": "^1.0.0",
-             "json-schema-traverse": "^0.3.0",
-             "json-stable-stringify": "^1.0.1"
+             "safer-buffer": ">= 2.1.2 < 3"
            }
-         }
-       }
-     },
-     "has-ansi": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-       "dev": true,
-       "requires": {
-         "ansi-regex": "^2.0.0"
-       }
-     },
-     "has-flag": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-       "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-       "dev": true
-     },
-     "has-unicode": {
-       "version": "2.0.1",
-       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-       "dev": true
-     },
-     "has-value": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-       "dev": true,
-       "requires": {
-         "get-value": "^2.0.6",
-         "has-values": "^1.0.0",
-         "isobject": "^3.0.0"
-       },
-       "dependencies": {
-         "isobject": {
+         },
+         "ignore-walk": {
            "version": "3.0.1",
-           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-           "dev": true
-         }
-       }
-     },
-     "has-values": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-       "dev": true,
-       "requires": {
-         "is-number": "^3.0.0",
-         "kind-of": "^4.0.0"
-       },
-       "dependencies": {
-         "is-number": {
-           "version": "3.0.0",
-           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
+           "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
            "dev": true,
+           "optional": true,
            "requires": {
-             "kind-of": "^3.0.2"
-           },
-           "dependencies": {
-             "kind-of": {
-               "version": "3.2.2",
-               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-               "dev": true,
-               "requires": {
-                 "is-buffer": "^1.1.5"
-               }
-             }
+             "minimatch": "^3.0.4"
            }
          },
-         "kind-of": {
-           "version": "4.0.0",
-           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+         "inflight": {
+           "version": "1.0.6",
+           "resolved": false,
+           "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
            "dev": true,
+           "optional": true,
            "requires": {
-             "is-buffer": "^1.1.5"
+             "once": "^1.3.0",
+             "wrappy": "1"
            }
-         }
-       }
-     },
-     "hash-base": {
-       "version": "3.0.4",
-       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-       "dev": true,
-       "requires": {
-         "inherits": "^2.0.1",
-         "safe-buffer": "^5.0.1"
-       }
-     },
-     "hash.js": {
-       "version": "1.1.7",
-       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-       "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-       "dev": true,
-       "requires": {
-         "inherits": "^2.0.3",
-         "minimalistic-assert": "^1.0.1"
-       }
-     },
-     "hawk": {
-       "version": "6.0.2",
-       "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-       "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-       "dev": true,
-       "optional": true,
-       "requires": {
-         "boom": "4.x.x",
-         "cryptiles": "3.x.x",
-         "hoek": "4.x.x",
-         "sntp": "2.x.x"
-       }
-     },
-     "hmac-drbg": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-       "dev": true,
-       "requires": {
-         "hash.js": "^1.0.3",
-         "minimalistic-assert": "^1.0.0",
-         "minimalistic-crypto-utils": "^1.0.1"
-       }
-     },
-     "hoek": {
-       "version": "4.2.0",
-       "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-       "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
-       "dev": true,
-       "optional": true
-     },
-     "hoopy": {
-       "version": "0.1.4",
-       "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-       "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-       "dev": true
-     },
-     "hosted-git-info": {
-       "version": "2.5.0",
-       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-       "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
-       "dev": true
-     },
-     "hpack.js": {
-       "version": "2.1.6",
-       "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-       "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-       "dev": true,
-       "requires": {
-         "inherits": "^2.0.1",
-         "obuf": "^1.0.0",
-         "readable-stream": "^2.0.1",
-         "wbuf": "^1.1.0"
-       }
-     },
-     "html-entities": {
-       "version": "1.2.1",
-       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-       "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-       "dev": true
-     },
-     "http-cache-semantics": {
-       "version": "3.8.1",
-       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-       "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
-       "dev": true
-     },
-     "http-deceiver": {
-       "version": "1.2.7",
-       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-       "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-       "dev": true
-     },
-     "http-errors": {
-       "version": "1.6.2",
-       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-       "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-       "dev": true,
-       "requires": {
-         "depd": "1.1.1",
-         "inherits": "2.0.3",
-         "setprototypeof": "1.0.3",
-         "statuses": ">= 1.3.1 < 2"
-       },
-       "dependencies": {
-         "setprototypeof": {
-           "version": "1.0.3",
-           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-           "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
-           "dev": true
-         }
-       }
-     },
-     "http-parser-js": {
-       "version": "0.5.0",
-       "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
-       "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
-       "dev": true
-     },
-     "http-proxy": {
-       "version": "1.16.2",
-       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz",
-       "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
-       "dev": true,
-       "requires": {
-         "eventemitter3": "1.x.x",
-         "requires-port": "1.x.x"
-       }
-     },
-     "http-proxy-agent": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-       "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
-       "dev": true,
-       "requires": {
-         "agent-base": "4",
-         "debug": "3.1.0"
-       },
-       "dependencies": {
-         "agent-base": {
-           "version": "4.2.1",
-           "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
-           "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+         },
+         "inherits": {
+           "version": "2.0.3",
+           "resolved": false,
+           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+           "dev": true,
+           "optional": true
+         },
+         "ini": {
+           "version": "1.3.5",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+           "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+           "dev": true,
+           "optional": true
+         },
+         "is-fullwidth-code-point": {
+           "version": "1.0.0",
+           "resolved": false,
+           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
            "dev": true,
+           "optional": true,
            "requires": {
-             "es6-promisify": "^5.0.0"
+             "number-is-nan": "^1.0.0"
            }
          },
-         "debug": {
-           "version": "3.1.0",
-           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-           "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+         "isarray": {
+           "version": "1.0.0",
+           "resolved": false,
+           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+           "dev": true,
+           "optional": true
+         },
+         "minimatch": {
+           "version": "3.0.4",
+           "resolved": false,
+           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
            "dev": true,
+           "optional": true,
            "requires": {
-             "ms": "2.0.0"
+             "brace-expansion": "^1.1.7"
            }
-         }
-       }
-     },
-     "http-proxy-middleware": {
-       "version": "0.18.0",
-       "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
-       "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
-       "dev": true,
-       "requires": {
-         "http-proxy": "^1.16.2",
-         "is-glob": "^4.0.0",
-         "lodash": "^4.17.5",
-         "micromatch": "^3.1.9"
-       },
-       "dependencies": {
-         "arr-diff": {
-           "version": "4.0.0",
-           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-           "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-           "dev": true
          },
-         "array-unique": {
-           "version": "0.3.2",
-           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-           "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-           "dev": true
+         "minimist": {
+           "version": "0.0.8",
+           "resolved": false,
+           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+           "dev": true,
+           "optional": true
          },
-         "braces": {
-           "version": "2.3.2",
-           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-           "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+         "minipass": {
+           "version": "2.3.5",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
            "dev": true,
+           "optional": true,
            "requires": {
-             "arr-flatten": "^1.1.0",
-             "array-unique": "^0.3.2",
-             "extend-shallow": "^2.0.1",
-             "fill-range": "^4.0.0",
-             "isobject": "^3.0.1",
-             "repeat-element": "^1.1.2",
-             "snapdragon": "^0.8.1",
-             "snapdragon-node": "^2.0.1",
-             "split-string": "^3.0.2",
-             "to-regex": "^3.0.1"
-           },
-           "dependencies": {
-             "extend-shallow": {
-               "version": "2.0.1",
-               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-               "dev": true,
-               "requires": {
-                 "is-extendable": "^0.1.0"
-               }
-             }
+             "safe-buffer": "^5.1.2",
+             "yallist": "^3.0.0"
            }
          },
-         "expand-brackets": {
-           "version": "2.1.4",
-           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-           "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+         "minizlib": {
+           "version": "1.2.1",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
+           "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
            "dev": true,
+           "optional": true,
            "requires": {
-             "debug": "^2.3.3",
-             "define-property": "^0.2.5",
-             "extend-shallow": "^2.0.1",
-             "posix-character-classes": "^0.1.0",
-             "regex-not": "^1.0.0",
-             "snapdragon": "^0.8.1",
-             "to-regex": "^3.0.1"
-           },
-           "dependencies": {
-             "define-property": {
-               "version": "0.2.5",
-               "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-               "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-               "dev": true,
-               "requires": {
-                 "is-descriptor": "^0.1.0"
-               }
-             },
-             "extend-shallow": {
-               "version": "2.0.1",
-               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-               "dev": true,
-               "requires": {
-                 "is-extendable": "^0.1.0"
-               }
-             },
-             "is-accessor-descriptor": {
-               "version": "0.1.6",
-               "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-               "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-               "dev": true,
-               "requires": {
-                 "kind-of": "^3.0.2"
-               },
-               "dependencies": {
-                 "kind-of": {
-                   "version": "3.2.2",
-                   "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                   "dev": true,
-                   "requires": {
-                     "is-buffer": "^1.1.5"
-                   }
-                 }
-               }
-             },
-             "is-data-descriptor": {
-               "version": "0.1.4",
-               "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-               "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-               "dev": true,
-               "requires": {
-                 "kind-of": "^3.0.2"
-               },
-               "dependencies": {
-                 "kind-of": {
-                   "version": "3.2.2",
-                   "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                   "dev": true,
-                   "requires": {
-                     "is-buffer": "^1.1.5"
-                   }
-                 }
-               }
-             },
-             "is-descriptor": {
-               "version": "0.1.6",
-               "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-               "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-               "dev": true,
-               "requires": {
-                 "is-accessor-descriptor": "^0.1.6",
-                 "is-data-descriptor": "^0.1.4",
-                 "kind-of": "^5.0.0"
-               }
-             },
-             "kind-of": {
-               "version": "5.1.0",
-               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-               "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-               "dev": true
-             }
+             "minipass": "^2.2.1"
            }
          },
-         "extglob": {
-           "version": "2.0.4",
-           "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-           "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+         "mkdirp": {
+           "version": "0.5.1",
+           "resolved": false,
+           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
            "dev": true,
+           "optional": true,
            "requires": {
-             "array-unique": "^0.3.2",
-             "define-property": "^1.0.0",
-             "expand-brackets": "^2.1.4",
-             "extend-shallow": "^2.0.1",
-             "fragment-cache": "^0.2.1",
-             "regex-not": "^1.0.0",
-             "snapdragon": "^0.8.1",
-             "to-regex": "^3.0.1"
-           },
-           "dependencies": {
-             "define-property": {
-               "version": "1.0.0",
-               "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-               "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-               "dev": true,
-               "requires": {
-                 "is-descriptor": "^1.0.0"
-               }
-             },
-             "extend-shallow": {
-               "version": "2.0.1",
-               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-               "dev": true,
-               "requires": {
-                 "is-extendable": "^0.1.0"
-               }
-             }
+             "minimist": "0.0.8"
            }
          },
-         "fill-range": {
-           "version": "4.0.0",
-           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-           "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+         "ms": {
+           "version": "2.1.1",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
            "dev": true,
+           "optional": true
+         },
+         "needle": {
+           "version": "2.3.0",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz",
+           "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
+           "dev": true,
+           "optional": true,
            "requires": {
-             "extend-shallow": "^2.0.1",
-             "is-number": "^3.0.0",
-             "repeat-string": "^1.6.1",
-             "to-regex-range": "^2.1.0"
-           },
-           "dependencies": {
-             "extend-shallow": {
-               "version": "2.0.1",
-               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-               "dev": true,
-               "requires": {
-                 "is-extendable": "^0.1.0"
-               }
-             }
+             "debug": "^4.1.0",
+             "iconv-lite": "^0.4.4",
+             "sax": "^1.2.4"
            }
          },
-         "is-accessor-descriptor": {
-           "version": "1.0.0",
-           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+         "node-pre-gyp": {
+           "version": "0.12.0",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz",
+           "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
            "dev": true,
+           "optional": true,
            "requires": {
-             "kind-of": "^6.0.0"
+             "detect-libc": "^1.0.2",
+             "mkdirp": "^0.5.1",
+             "needle": "^2.2.1",
+             "nopt": "^4.0.1",
+             "npm-packlist": "^1.1.6",
+             "npmlog": "^4.0.2",
+             "rc": "^1.2.7",
+             "rimraf": "^2.6.1",
+             "semver": "^5.3.0",
+             "tar": "^4"
            }
          },
-         "is-data-descriptor": {
-           "version": "1.0.0",
-           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+         "nopt": {
+           "version": "4.0.1",
+           "resolved": false,
+           "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
            "dev": true,
+           "optional": true,
            "requires": {
-             "kind-of": "^6.0.0"
+             "abbrev": "1",
+             "osenv": "^0.1.4"
            }
          },
-         "is-descriptor": {
-           "version": "1.0.2",
-           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+         "npm-bundled": {
+           "version": "1.0.6",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
+           "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
+           "dev": true,
+           "optional": true
+         },
+         "npm-packlist": {
+           "version": "1.4.1",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
+           "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
            "dev": true,
+           "optional": true,
            "requires": {
-             "is-accessor-descriptor": "^1.0.0",
-             "is-data-descriptor": "^1.0.0",
-             "kind-of": "^6.0.2"
+             "ignore-walk": "^3.0.1",
+             "npm-bundled": "^1.0.1"
            }
          },
-         "is-extglob": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-           "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-           "dev": true
+         "npmlog": {
+           "version": "4.1.2",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+           "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+           "dev": true,
+           "optional": true,
+           "requires": {
+             "are-we-there-yet": "~1.1.2",
+             "console-control-strings": "~1.1.0",
+             "gauge": "~2.7.3",
+             "set-blocking": "~2.0.0"
+           }
          },
-         "is-glob": {
-           "version": "4.0.0",
-           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-           "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+         "number-is-nan": {
+           "version": "1.0.1",
+           "resolved": false,
+           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+           "dev": true,
+           "optional": true
+         },
+         "object-assign": {
+           "version": "4.1.1",
+           "resolved": false,
+           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+           "dev": true,
+           "optional": true
+         },
+         "once": {
+           "version": "1.4.0",
+           "resolved": false,
+           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
            "dev": true,
+           "optional": true,
            "requires": {
-             "is-extglob": "^2.1.1"
+             "wrappy": "1"
            }
          },
-         "is-number": {
-           "version": "3.0.0",
-           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+         "os-homedir": {
+           "version": "1.0.2",
+           "resolved": false,
+           "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+           "dev": true,
+           "optional": true
+         },
+         "os-tmpdir": {
+           "version": "1.0.2",
+           "resolved": false,
+           "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+           "dev": true,
+           "optional": true
+         },
+         "osenv": {
+           "version": "0.1.5",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+           "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
            "dev": true,
+           "optional": true,
            "requires": {
-             "kind-of": "^3.0.2"
+             "os-homedir": "^1.0.0",
+             "os-tmpdir": "^1.0.0"
+           }
+         },
+         "path-is-absolute": {
+           "version": "1.0.1",
+           "resolved": false,
+           "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+           "dev": true,
+           "optional": true
+         },
+         "process-nextick-args": {
+           "version": "2.0.0",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+           "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+           "dev": true,
+           "optional": true
+         },
+         "rc": {
+           "version": "1.2.8",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+           "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+           "dev": true,
+           "optional": true,
+           "requires": {
+             "deep-extend": "^0.6.0",
+             "ini": "~1.3.0",
+             "minimist": "^1.2.0",
+             "strip-json-comments": "~2.0.1"
            },
            "dependencies": {
-             "kind-of": {
-               "version": "3.2.2",
-               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+             "minimist": {
+               "version": "1.2.0",
+               "resolved": false,
+               "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
                "dev": true,
-               "requires": {
-                 "is-buffer": "^1.1.5"
-               }
+               "optional": true
              }
            }
          },
-         "isobject": {
-           "version": "3.0.1",
-           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-           "dev": true
-         },
-         "kind-of": {
-           "version": "6.0.2",
-           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-           "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-           "dev": true
-         },
-         "lodash": {
-           "version": "4.17.11",
-           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-           "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-           "dev": true
+         "readable-stream": {
+           "version": "2.3.6",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+           "dev": true,
+           "optional": true,
+           "requires": {
+             "core-util-is": "~1.0.0",
+             "inherits": "~2.0.3",
+             "isarray": "~1.0.0",
+             "process-nextick-args": "~2.0.0",
+             "safe-buffer": "~5.1.1",
+             "string_decoder": "~1.1.1",
+             "util-deprecate": "~1.0.1"
+           }
          },
-         "micromatch": {
-           "version": "3.1.10",
-           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-           "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+         "rimraf": {
+           "version": "2.6.3",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+           "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
            "dev": true,
+           "optional": true,
            "requires": {
-             "arr-diff": "^4.0.0",
-             "array-unique": "^0.3.2",
-             "braces": "^2.3.1",
-             "define-property": "^2.0.2",
-             "extend-shallow": "^3.0.2",
-             "extglob": "^2.0.4",
-             "fragment-cache": "^0.2.1",
-             "kind-of": "^6.0.2",
-             "nanomatch": "^1.2.9",
-             "object.pick": "^1.3.0",
-             "regex-not": "^1.0.0",
-             "snapdragon": "^0.8.1",
-             "to-regex": "^3.0.2"
+             "glob": "^7.1.3"
            }
-         }
-       }
-     },
-     "http-signature": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-       "dev": true,
-       "requires": {
-         "assert-plus": "^1.0.0",
-         "jsprim": "^1.2.2",
-         "sshpk": "^1.7.0"
-       }
-     },
-     "https-browserify": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-       "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-       "dev": true
-     },
-     "humanize-ms": {
-       "version": "1.2.1",
-       "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-       "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
-       "dev": true,
-       "requires": {
-         "ms": "^2.0.0"
-       }
-     },
-     "iconv-lite": {
-       "version": "0.4.19",
-       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-       "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
-       "dev": true
-     },
-     "ieee754": {
-       "version": "1.1.12",
-       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-       "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
-       "dev": true
-     },
-     "iferr": {
-       "version": "0.1.5",
-       "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-       "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-       "dev": true
-     },
-     "ignore": {
-       "version": "3.3.10",
-       "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-       "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-       "dev": true
-     },
-     "ignore-walk": {
-       "version": "3.0.1",
-       "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
-       "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
-       "dev": true,
-       "requires": {
-         "minimatch": "^3.0.4"
-       }
-     },
-     "image-size": {
-       "version": "0.5.5",
-       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-       "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
-       "dev": true,
-       "optional": true
-     },
-     "import-cwd": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-       "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
-       "dev": true,
-       "requires": {
-         "import-from": "^2.1.0"
-       }
-     },
-     "import-from": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-       "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
-       "dev": true,
-       "requires": {
-         "resolve-from": "^3.0.0"
-       }
-     },
-     "import-local": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-       "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-       "dev": true,
-       "requires": {
-         "pkg-dir": "^3.0.0",
-         "resolve-cwd": "^2.0.0"
-       },
-       "dependencies": {
-         "find-up": {
-           "version": "3.0.0",
-           "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+         },
+         "safe-buffer": {
+           "version": "5.1.2",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+           "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+           "dev": true,
+           "optional": true
+         },
+         "safer-buffer": {
+           "version": "2.1.2",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+           "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+           "dev": true,
+           "optional": true
+         },
+         "sax": {
+           "version": "1.2.4",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+           "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+           "dev": true,
+           "optional": true
+         },
+         "semver": {
+           "version": "5.7.0",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+           "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+           "dev": true,
+           "optional": true
+         },
+         "set-blocking": {
+           "version": "2.0.0",
+           "resolved": false,
+           "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+           "dev": true,
+           "optional": true
+         },
+         "signal-exit": {
+           "version": "3.0.2",
+           "resolved": false,
+           "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+           "dev": true,
+           "optional": true
+         },
+         "string-width": {
+           "version": "1.0.2",
+           "resolved": false,
+           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
            "dev": true,
+           "optional": true,
            "requires": {
-             "locate-path": "^3.0.0"
+             "code-point-at": "^1.0.0",
+             "is-fullwidth-code-point": "^1.0.0",
+             "strip-ansi": "^3.0.0"
            }
          },
-         "locate-path": {
-           "version": "3.0.0",
-           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+         "string_decoder": {
+           "version": "1.1.1",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
            "dev": true,
+           "optional": true,
            "requires": {
-             "p-locate": "^3.0.0",
-             "path-exists": "^3.0.0"
+             "safe-buffer": "~5.1.0"
            }
          },
-         "p-limit": {
-           "version": "2.1.0",
-           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
-           "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
+         "strip-ansi": {
+           "version": "3.0.1",
+           "resolved": false,
+           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
            "dev": true,
+           "optional": true,
            "requires": {
-             "p-try": "^2.0.0"
+             "ansi-regex": "^2.0.0"
            }
          },
-         "p-locate": {
-           "version": "3.0.0",
-           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+         "strip-json-comments": {
+           "version": "2.0.1",
+           "resolved": false,
+           "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+           "dev": true,
+           "optional": true
+         },
+         "tar": {
+           "version": "4.4.8",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+           "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
            "dev": true,
+           "optional": true,
            "requires": {
-             "p-limit": "^2.0.0"
+             "chownr": "^1.1.1",
+             "fs-minipass": "^1.2.5",
+             "minipass": "^2.3.4",
+             "minizlib": "^1.1.1",
+             "mkdirp": "^0.5.0",
+             "safe-buffer": "^5.1.2",
+             "yallist": "^3.0.2"
            }
          },
-         "p-try": {
-           "version": "2.0.0",
-           "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
-           "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
-           "dev": true
-         },
-         "path-exists": {
-           "version": "3.0.0",
-           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-           "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-           "dev": true
+         "util-deprecate": {
+           "version": "1.0.2",
+           "resolved": false,
+           "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+           "dev": true,
+           "optional": true
          },
-         "pkg-dir": {
-           "version": "3.0.0",
-           "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-           "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+         "wide-align": {
+           "version": "1.1.3",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+           "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
            "dev": true,
+           "optional": true,
            "requires": {
-             "find-up": "^3.0.0"
+             "string-width": "^1.0.2 || 2"
            }
+         },
+         "wrappy": {
+           "version": "1.0.2",
+           "resolved": false,
+           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+           "dev": true,
+           "optional": true
+         },
+         "yallist": {
+           "version": "3.0.3",
 -          "resolved": false,
++          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+           "dev": true,
+           "optional": true
          }
        }
      },
diff --cc services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
index 5fe851e,b3730da..d01963d
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
@@@ -85,7 -90,7 +90,7 @@@ export class ApplicationServiceFacade 
    }
  
    public buildLogoutRequest(): Observable<any> {
-     return this.buildRequest(RequestMethod.Get,
 -    return this.buildRequest(HTTPMethod.POST,
++    return this.buildRequest(HTTPMethod.Get,
        this.requestRegistry.Item(ApplicationServiceFacade.LOGOUT),
        '',
        { observe: 'response' });
@@@ -102,17 -107,10 +107,17 @@@
        });
    }
  
 +  public buildLocationCheck(): Observable<any> {
 +    return this.buildRequest(RequestMethod.Get,
 +      this.requestRegistry.Item(ApplicationServiceFacade.OAUTH),
 +      null,
 +      { observe: 'response' });
 +  }
 +
    public buildGetAuthToken(body: any): Observable<any> {
-     return this.buildRequest(RequestMethod.Post,
-       this.requestRegistry.Item(ApplicationServiceFacade.OAUTH) + body,
-       null,
+     return this.buildRequest(HTTPMethod.POST,
+       this.requestRegistry.Item(ApplicationServiceFacade.OAUTH),
+       body,
        { observe: 'response' });
    }
  
@@@ -587,9 -585,9 +592,9 @@@
      this.requestRegistry.Add(ApplicationServiceFacade.FULL_ACTIVE_LIST, '/api/environment/all');
      this.requestRegistry.Add(ApplicationServiceFacade.ENV, '/api/environment');
  
 -    this.requestRegistry.Add(ApplicationServiceFacade.OAUTH, '/api/user/azure/oauth');
 +    this.requestRegistry.Add(ApplicationServiceFacade.OAUTH, '/api/oauth');
      this.requestRegistry.Add(ApplicationServiceFacade.ACCESS_KEY, '/api/user/access_key');
-     this.requestRegistry.Add(ApplicationServiceFacade.ACCESS_KEY_GENERATE, '/api/user/access_key/generate');
+     this.requestRegistry.Add(ApplicationServiceFacade.PROJECT_KEY_GENERATE, '/api/project/keys');
  
      // Exploratory Environment
      this.requestRegistry.Add(ApplicationServiceFacade.PROVISIONED_RESOURCES,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 02/02: Merge remote-tracking branch 'remotes/origin/develop' into DLAB-terraform

Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bhliva pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit ac6b9a381c3b6d2753ceae4c26717545a784d73c
Author: bhliva <bo...@epam.com>
AuthorDate: Thu Sep 26 12:41:28 2019 +0300

    Merge remote-tracking branch 'remotes/origin/develop' into DLAB-terraform
    
    # Conflicts:
    #	services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
    #	services/self-service/src/main/resources/webapp/src/app/webterminal/webterminal.component.ts
---
 .../src/app/core/services/applicationServiceFacade.service.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
index d01963d..af6d28b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
@@ -90,7 +90,7 @@ export class ApplicationServiceFacade {
   }
 
   public buildLogoutRequest(): Observable<any> {
-    return this.buildRequest(HTTPMethod.Get,
+    return this.buildRequest(HTTPMethod.GET,
       this.requestRegistry.Item(ApplicationServiceFacade.LOGOUT),
       '',
       { observe: 'response' });
@@ -108,7 +108,7 @@ export class ApplicationServiceFacade {
   }
 
   public buildLocationCheck(): Observable<any> {
-    return this.buildRequest(RequestMethod.Get,
+    return this.buildRequest(HTTPMethod.GET,
       this.requestRegistry.Item(ApplicationServiceFacade.OAUTH),
       null,
       { observe: 'response' });
@@ -116,8 +116,8 @@ export class ApplicationServiceFacade {
 
   public buildGetAuthToken(body: any): Observable<any> {
     return this.buildRequest(HTTPMethod.POST,
-      this.requestRegistry.Item(ApplicationServiceFacade.OAUTH),
-      body,
+      this.requestRegistry.Item(ApplicationServiceFacade.OAUTH) + body,
+      null,
       { observe: 'response' });
   }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org