From c66a10a04b279b30b830383ed4a9847efa5c5f0d Mon Sep 17 00:00:00 2001 From: Dominik Simonik Date: Sat, 6 Apr 2019 12:18:52 +0200 Subject: [PATCH] update angular + restructure project --- angular.json | 18 +- package-lock.json | 3581 +++++++++-------- package.json | 52 +- src/app/app-routing.module.ts | 6 +- src/app/app.module.ts | 27 +- .../contribue-panel.module.ts | 16 + .../contribute-panel.component.css | 0 .../contribute-panel.component.html | 0 .../contribute-panel.component.ts | 3 +- .../footer/footer.component.html | 0 .../footer/footer.component.scss | 0 .../footer/footer.component.ts | 0 src/app/components/footer/footer.module.ts | 18 + .../invoice-form/invoice-form.component.css | 0 .../invoice-form/invoice-form.component.html | 0 .../invoice-form/invoice-form.component.ts | 2 +- .../invoice-form/invoice-form.module.ts | 32 + .../iticket/ticket-group-view.ts | 2 +- .../iticket/ticket-view.ts | 2 +- .../member-card/member-card.component.css | 0 .../member-card/member-card.component.html | 0 .../member-card/member-card.component.ts | 5 +- .../member-card/member-card.module.ts | 30 + .../member-card/socials.pipe.ts | 0 .../navigation/navigation.component.css | 0 .../navigation/navigation.component.html | 0 .../navigation/navigation.component.ts | 0 .../navigation/navigation.module.ts | 28 + .../neon-date/neon-date.component.css | 0 .../neon-date/neon-date.component.html | 0 .../neon-date/neon-date.component.ts | 0 .../components/neon-date/neon-date.module.ts | 16 + .../neon-logo/neon-logo.component.css | 0 .../neon-logo/neon-logo.component.html | 0 .../neon-logo/neon-logo.component.ts | 0 .../components/neon-logo/neon-logo.module.ts | 16 + .../partner-logo/partner-logo.component.css | 0 .../partner-logo/partner-logo.component.html | 0 .../partner-logo/partner-logo.component.ts | 0 .../partner-logo/partner-logo.module.ts | 16 + .../partner-panel/partner-panel.component.css | 0 .../partner-panel.component.html | 0 .../partner-panel/partner-panel.component.ts | 2 +- .../partner-panel/partner-panel.module.ts | 18 + .../photo-section/photo-section.component.css | 0 .../photo-section.component.html | 0 .../photo-section/photo-section.component.ts | 0 .../photo-section/photo-section.module.ts | 18 + .../ticket-additional-info.component.css | 0 .../ticket-additional-info.component.html | 0 .../ticket-additional-info.component.ts | 0 .../tickets-additional-info.module.ts | 18 + .../tickets/tickets.component.html | 0 .../tickets/tickets.component.scss | 0 .../tickets/tickets.component.ts | 2 +- src/app/components/tickets/tickets.module.ts | 22 + src/app/core/core.module.ts | 19 - src/app/{dto => data}/new-invoice.ts | 0 src/app/{dto => data}/partner.ts | 0 src/app/{dto => data}/social.ts | 0 src/app/{dto => data}/team-member.ts | 0 src/app/{dto => data}/ticket-group.ts | 0 src/app/home/home.module.ts | 61 - .../{ => pages}/home/home-routing.module.ts | 0 src/app/{ => pages}/home/home.component.css | 0 src/app/{ => pages}/home/home.component.html | 0 src/app/{ => pages}/home/home.component.ts | 4 +- src/app/pages/home/home.module.ts | 40 + .../partners/partners-routing.module.ts | 0 .../partners/partners.component.css | 0 .../partners/partners.component.html | 0 .../partners/partners.component.ts | 2 +- .../{ => pages}/partners/partners.module.ts | 6 +- .../{ => pages}/team/team-routing.module.ts | 0 src/app/{ => pages}/team/team.component.css | 0 src/app/{ => pages}/team/team.component.html | 0 src/app/{ => pages}/team/team.component.ts | 2 +- src/app/pages/team/team.module.ts | 17 + .../social-icons.service.ts | 2 +- src/app/shared/shared.module.ts | 51 - src/app/team/team.module.ts | 27 - src/assets/projector.png | Bin 98030 -> 20553 bytes src/main.ts | 1 - src/polyfills.ts | 59 +- src/tslint.json | 30 +- tslint.json | 82 +- 86 files changed, 2282 insertions(+), 2071 deletions(-) create mode 100644 src/app/components/contribute-panel/contribue-panel.module.ts rename src/app/{shared => components}/contribute-panel/contribute-panel.component.css (100%) rename src/app/{shared => components}/contribute-panel/contribute-panel.component.html (100%) rename src/app/{shared => components}/contribute-panel/contribute-panel.component.ts (70%) rename src/app/{shared => components}/footer/footer.component.html (100%) rename src/app/{shared => components}/footer/footer.component.scss (100%) rename src/app/{shared => components}/footer/footer.component.ts (100%) create mode 100644 src/app/components/footer/footer.module.ts rename src/app/{home => components}/invoice-form/invoice-form.component.css (100%) rename src/app/{home => components}/invoice-form/invoice-form.component.html (100%) rename src/app/{home => components}/invoice-form/invoice-form.component.ts (98%) create mode 100644 src/app/components/invoice-form/invoice-form.module.ts rename src/app/{home => components}/iticket/ticket-group-view.ts (69%) rename src/app/{home => components}/iticket/ticket-view.ts (81%) rename src/app/{team => components}/member-card/member-card.component.css (100%) rename src/app/{team => components}/member-card/member-card.component.html (100%) rename src/app/{team => components}/member-card/member-card.component.ts (95%) create mode 100644 src/app/components/member-card/member-card.module.ts rename src/app/{team => components}/member-card/socials.pipe.ts (100%) rename src/app/{shared => components}/navigation/navigation.component.css (100%) rename src/app/{shared => components}/navigation/navigation.component.html (100%) rename src/app/{shared => components}/navigation/navigation.component.ts (100%) create mode 100644 src/app/components/navigation/navigation.module.ts rename src/app/{shared => components}/neon-date/neon-date.component.css (100%) rename src/app/{shared => components}/neon-date/neon-date.component.html (100%) rename src/app/{shared => components}/neon-date/neon-date.component.ts (100%) create mode 100644 src/app/components/neon-date/neon-date.module.ts rename src/app/{shared => components}/neon-logo/neon-logo.component.css (100%) rename src/app/{shared => components}/neon-logo/neon-logo.component.html (100%) rename src/app/{shared => components}/neon-logo/neon-logo.component.ts (100%) create mode 100644 src/app/components/neon-logo/neon-logo.module.ts rename src/app/{shared => components}/partner-logo/partner-logo.component.css (100%) rename src/app/{shared => components}/partner-logo/partner-logo.component.html (100%) rename src/app/{shared => components}/partner-logo/partner-logo.component.ts (100%) create mode 100644 src/app/components/partner-logo/partner-logo.module.ts rename src/app/{shared => components}/partner-panel/partner-panel.component.css (100%) rename src/app/{shared => components}/partner-panel/partner-panel.component.html (100%) rename src/app/{shared => components}/partner-panel/partner-panel.component.ts (94%) create mode 100644 src/app/components/partner-panel/partner-panel.module.ts rename src/app/{home => components}/photo-section/photo-section.component.css (100%) rename src/app/{home => components}/photo-section/photo-section.component.html (100%) rename src/app/{home => components}/photo-section/photo-section.component.ts (100%) create mode 100644 src/app/components/photo-section/photo-section.module.ts rename src/app/{home => components}/ticket-additional-info/ticket-additional-info.component.css (100%) rename src/app/{home => components}/ticket-additional-info/ticket-additional-info.component.html (100%) rename src/app/{home => components}/ticket-additional-info/ticket-additional-info.component.ts (100%) create mode 100644 src/app/components/ticket-additional-info/tickets-additional-info.module.ts rename src/app/{home => components}/tickets/tickets.component.html (100%) rename src/app/{home => components}/tickets/tickets.component.scss (100%) rename src/app/{home => components}/tickets/tickets.component.ts (97%) create mode 100644 src/app/components/tickets/tickets.module.ts delete mode 100644 src/app/core/core.module.ts rename src/app/{dto => data}/new-invoice.ts (100%) rename src/app/{dto => data}/partner.ts (100%) rename src/app/{dto => data}/social.ts (100%) rename src/app/{dto => data}/team-member.ts (100%) rename src/app/{dto => data}/ticket-group.ts (100%) delete mode 100644 src/app/home/home.module.ts rename src/app/{ => pages}/home/home-routing.module.ts (100%) rename src/app/{ => pages}/home/home.component.css (100%) rename src/app/{ => pages}/home/home.component.html (100%) rename src/app/{ => pages}/home/home.component.ts (87%) create mode 100644 src/app/pages/home/home.module.ts rename src/app/{ => pages}/partners/partners-routing.module.ts (100%) rename src/app/{ => pages}/partners/partners.component.css (100%) rename src/app/{ => pages}/partners/partners.component.html (100%) rename src/app/{ => pages}/partners/partners.component.ts (94%) rename src/app/{ => pages}/partners/partners.module.ts (73%) rename src/app/{ => pages}/team/team-routing.module.ts (100%) rename src/app/{ => pages}/team/team.component.css (100%) rename src/app/{ => pages}/team/team.component.html (100%) rename src/app/{ => pages}/team/team.component.ts (94%) create mode 100644 src/app/pages/team/team.module.ts rename src/app/{shared => services}/social-icons.service.ts (99%) delete mode 100644 src/app/shared/shared.module.ts delete mode 100644 src/app/team/team.module.ts diff --git a/angular.json b/angular.json index 20fecfd3..795c8e83 100644 --- a/angular.json +++ b/angular.json @@ -8,7 +8,11 @@ "sourceRoot": "src", "projectType": "application", "prefix": "app", - "schematics": {}, + "schematics": { + "@schematics/angular:component": { + "style": "scss" + } + }, "architect": { "build": { "builder": "@angular-devkit/build-angular:browser", @@ -25,7 +29,8 @@ "styles": [ "src/styles.scss" ], - "scripts": [] + "scripts": [], + "es5BrowserSupport": true }, "configurations": { "production": { @@ -43,7 +48,14 @@ "aot": true, "extractLicenses": true, "vendorChunk": false, - "buildOptimizer": true + "buildOptimizer": true, + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "5mb" + } + ] } } }, diff --git a/package-lock.json b/package-lock.json index 9ab4ffb5..eb687aca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,27 +5,27 @@ "requires": true, "dependencies": { "@angular-devkit/architect": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.8.8.tgz", - "integrity": "sha512-tJEShCUGdNfCBtKhY1IFuE+BiHZLkC2yNlB//CXsvP74XQkKd7d6godF8VGKIZBd4hG6cVmJC/8nnP3aiTDUxQ==", + "version": "0.13.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.8.tgz", + "integrity": "sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==", "dev": true, "requires": { - "@angular-devkit/core": "0.8.8", - "rxjs": "6.2.2" + "@angular-devkit/core": "7.3.8", + "rxjs": "6.3.3" } }, "@angular-devkit/build-angular": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.1.tgz", - "integrity": "sha512-vkKwMVQ+NNCcVR3HFMffS+Mq4b2afXeUjI+02N38hBuFTppnC83uivUB6Uu2NUk5NTSQA4BnJlG5CbMs6N4QYg==", + "version": "0.13.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.8.tgz", + "integrity": "sha512-uRb8CKC0hUdcE+Fv2Ov9LJNelyjsiMuddBpo8pdTKCIHVVC6hvip9S/Z18Tvb207kKI3k7Dn+Ji1J63mCqmQzA==", "dev": true, "requires": { - "@angular-devkit/architect": "0.13.1", - "@angular-devkit/build-optimizer": "0.13.1", - "@angular-devkit/build-webpack": "0.13.1", - "@angular-devkit/core": "7.3.1", - "@ngtools/webpack": "7.3.1", - "ajv": "6.7.0", + "@angular-devkit/architect": "0.13.8", + "@angular-devkit/build-optimizer": "0.13.8", + "@angular-devkit/build-webpack": "0.13.8", + "@angular-devkit/core": "7.3.8", + "@ngtools/webpack": "7.3.8", + "ajv": "6.9.1", "autoprefixer": "9.4.6", "circular-dependency-plugin": "5.0.2", "clean-css": "4.2.1", @@ -41,7 +41,7 @@ "mini-css-extract-plugin": "0.5.0", "minimatch": "3.0.4", "node-sass": "4.11.0", - "opn": "5.4.0", + "open": "6.0.0", "parse5": "4.0.0", "postcss": "7.0.14", "postcss-import": "12.0.1", @@ -52,7 +52,7 @@ "semver": "5.6.0", "source-map-loader": "0.2.4", "source-map-support": "0.5.10", - "speed-measure-webpack-plugin": "1.3.0", + "speed-measure-webpack-plugin": "1.3.1", "stats-webpack-plugin": "0.7.0", "style-loader": "0.23.1", "stylus": "0.54.5", @@ -67,101 +67,18 @@ "webpack-subresource-integrity": "1.1.0-rc.6" }, "dependencies": { - "@angular-devkit/architect": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.1.tgz", - "integrity": "sha512-QDmIbqde75ZZSEFbw6Q6kQWq4cY6C7D67yujXw6XTyubDNAs1tyXJyxTIB8vjSlEKwRizTTDd/B0ZXVcke3Mvw==", - "dev": true, - "requires": { - "@angular-devkit/core": "7.3.1", - "rxjs": "6.3.3" - } - }, - "@angular-devkit/core": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.1.tgz", - "integrity": "sha512-56XDWWfIzOAkEk69lBLgmCYybPUA4yjunhmMlCk7vVdb7gbQUyzNjFD04Uj0GjlejatAQ5F76tRwygD9C+3RXQ==", - "dev": true, - "requires": { - "ajv": "6.7.0", - "chokidar": "2.0.4", - "fast-json-stable-stringify": "2.0.0", - "rxjs": "6.3.3", - "source-map": "0.7.3" - } - }, - "ajv": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz", - "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "rxjs": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", - "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "parse5": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", + "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", "dev": true - }, - "source-map-support": { - "version": "0.5.10", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", - "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - }, - "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 - } - } - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } } } }, "@angular-devkit/build-optimizer": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.1.tgz", - "integrity": "sha512-LmvHiI3H451aVWY5Ac6Fqz0i1eX/mUfWN+uJvo8NaL6Jc0HKYX2o3l4ODr8UUECWWctUC9AMD522ZMwAvnvsKQ==", + "version": "0.13.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.8.tgz", + "integrity": "sha512-RvYxtsdYuvpFb1iivVixylSVN/Q8LsQ449uYuqEe3OsDjQBvUVG2fMLPOQjmKWhi0NC9WSsNiUluxLDNdvd0Vw==", "dev": true, "requires": { "loader-utils": "1.2.3", @@ -175,412 +92,384 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", "dev": true - }, - "typescript": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz", - "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==", - "dev": true } } }, "@angular-devkit/build-webpack": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.1.tgz", - "integrity": "sha512-OGwC7bAl3u+w7Glw+OqIrN7OD1BkDXgrWbeQSpKAmsx6VdNPCnI4NPS+JldWNp70LVlE2nQlJUhtEqMVfBMnlg==", + "version": "0.13.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.8.tgz", + "integrity": "sha512-WMyn1vUHyx+VfJKgYuEHrICwQzPMDTaUNB1zlvzZt9gX/9H+XnetrebeWBZCITPXHBw/377oA6wmiHWJ0yaZRw==", "dev": true, "requires": { - "@angular-devkit/architect": "0.13.1", - "@angular-devkit/core": "7.3.1", + "@angular-devkit/architect": "0.13.8", + "@angular-devkit/core": "7.3.8", "rxjs": "6.3.3" - }, - "dependencies": { - "@angular-devkit/architect": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.1.tgz", - "integrity": "sha512-QDmIbqde75ZZSEFbw6Q6kQWq4cY6C7D67yujXw6XTyubDNAs1tyXJyxTIB8vjSlEKwRizTTDd/B0ZXVcke3Mvw==", - "dev": true, - "requires": { - "@angular-devkit/core": "7.3.1", - "rxjs": "6.3.3" - } - }, - "@angular-devkit/core": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.1.tgz", - "integrity": "sha512-56XDWWfIzOAkEk69lBLgmCYybPUA4yjunhmMlCk7vVdb7gbQUyzNjFD04Uj0GjlejatAQ5F76tRwygD9C+3RXQ==", - "dev": true, - "requires": { - "ajv": "6.7.0", - "chokidar": "2.0.4", - "fast-json-stable-stringify": "2.0.0", - "rxjs": "6.3.3", - "source-map": "0.7.3" - } - }, - "ajv": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz", - "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "rxjs": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", - "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - } } }, "@angular-devkit/core": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.8.8.tgz", - "integrity": "sha512-FDt+ZrKT/pAR74YnbZJQ5Nza+1b5PxGjgvbUtyX63VNxgETTjPa7Oe9Hc6jqW0CekTxHzAFJn79VPRUwKQIocg==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.8.tgz", + "integrity": "sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==", "dev": true, "requires": { - "ajv": "6.4.0", + "ajv": "6.9.1", "chokidar": "2.0.4", - "rxjs": "6.2.2", - "source-map": "0.5.7" + "fast-json-stable-stringify": "2.0.0", + "rxjs": "6.3.3", + "source-map": "0.7.3" } }, "@angular-devkit/schematics": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.8.8.tgz", - "integrity": "sha512-MXdjdG9KENur1Pu9etAfO5rbO0T5bk5tFWlCxdPr34a/EDy1rkz5taReTSV1Fc5ERWx3Brubws0EB2NrgPkRcw==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.8.tgz", + "integrity": "sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==", "dev": true, "requires": { - "@angular-devkit/core": "0.8.8", - "rxjs": "6.2.2" + "@angular-devkit/core": "7.3.8", + "rxjs": "6.3.3" } }, "@angular/animations": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.1.10.tgz", - "integrity": "sha512-dd/lq7kw3uwfHPICan8psu2nthuUpp7PvMLuNIm0XxObZ4oNs0ls6uxKEDPnEkRKoGdiJpvmsyzZZN9ACMPEAA==", + "version": "7.2.12", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.12.tgz", + "integrity": "sha512-J7d9hYXNqNz2kVxKEZlAAn4iojjF63WfGenEnMCtFgXU26ok03EAiR+VaiIqIvcevxvvR+iDrCHb+Hub0C212w==", "requires": { "tslib": "^1.9.0" } }, "@angular/cdk": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.1.1.tgz", - "integrity": "sha512-woW9lWDBKRuxZipMzWofrAY7YpuZd4vf/J1YPjmAqV7U94MaDFyizRLyFolbTZVYo8ggh9U3SQAWRrEBvJNsjg==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.3.7.tgz", + "integrity": "sha512-xbXxhHHKGkVuW6K7pzPmvpJXIwpl0ykBnvA2g+/7Sgy5Pd35wCC+UtHD9RYczDM/mkygNxMQtagyCErwFnDtQA==", "requires": { "parse5": "^5.0.0", "tslib": "^1.7.1" - }, - "dependencies": { - "parse5": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", - "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==", - "optional": true - } } }, "@angular/cli": { - "version": "6.2.8", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-6.2.8.tgz", - "integrity": "sha512-fKaagJJc9xykkj+vQNQy2hn5vvcZaskkvAwNW7FthW28CGb+h19uf6RHsRWpmKvuC5qTxSJQD+OCbIFG8aXADw==", - "dev": true, - "requires": { - "@angular-devkit/architect": "0.8.8", - "@angular-devkit/core": "0.8.8", - "@angular-devkit/schematics": "0.8.8", - "@schematics/angular": "0.8.8", - "@schematics/update": "0.8.8", - "json-schema-traverse": "0.4.1", - "opn": "5.4.0", - "rxjs": "6.2.2", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.8.tgz", + "integrity": "sha512-5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg==", + "dev": true, + "requires": { + "@angular-devkit/architect": "0.13.8", + "@angular-devkit/core": "7.3.8", + "@angular-devkit/schematics": "7.3.8", + "@schematics/angular": "7.3.8", + "@schematics/update": "0.13.8", + "@yarnpkg/lockfile": "1.1.0", + "ini": "1.3.5", + "inquirer": "6.2.1", + "npm-package-arg": "6.1.0", + "open": "6.0.0", + "pacote": "9.4.0", "semver": "5.6.0", - "symbol-observable": "1.2.0", - "yargs-parser": "10.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "yargs-parser": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", - "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", - "dev": true, - "requires": { - "camelcase": "^4.1.0" - } - } + "symbol-observable": "1.2.0" } }, "@angular/common": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.1.10.tgz", - "integrity": "sha512-73xxTSYJNKfiJ7C1Ajg+sz5l8y+blb/vNgHYg7O3yem5zLBnfPpidJ1UGg4W4d2Y+jwUVJbZKh8SKJarqAJVUQ==", + "version": "7.2.12", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.12.tgz", + "integrity": "sha512-JzcysRDfx2dvvcZ4uwgn+6gFDYlbH9j2Uyz6fWOSinAA0kcleOu/Gb77XbCI5M3Xvh1hxHVyz0Zxv/Pi0Y1O1g==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.1.10.tgz", - "integrity": "sha512-FPIb2j3zfoBwb6vo/u0gQeu70h8InGlSisBr3xMACs/35/pwB6kbQR+JQiUr0D7k6QApg7AuMkvq8aFNelg0aw==", + "version": "7.2.12", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.12.tgz", + "integrity": "sha512-B1N+/ECqIQz7PD2Zjb/21OOCmrXkl8DSXCBGNMXOSng+uYJM4dFPWkYkaAeHj8gcLDHvIPWlsapJ6JqyB3RPxA==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler-cli": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.1.10.tgz", - "integrity": "sha512-GCWdyeNQSnF4RfzO4A0+WHsNEgxKpl5arg4ldLSWMNkj/DrhMD4TnmxhR+IVY+7ieMkUBwpcuWRnjdOdnbmV+w==", + "version": "7.2.12", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.12.tgz", + "integrity": "sha512-EXJuN9XuYjO9gwe5JWfatb64ljPjItZh5bd1MQtntMJONS4ntOtwiCd9RuNVK2ZXM7Co9PcvzE1qynB6tMseCw==", "dev": true, "requires": { - "chokidar": "^1.4.2", + "canonical-path": "1.0.0", + "chokidar": "^2.1.1", + "convert-source-map": "^1.5.1", + "dependency-graph": "^0.7.2", + "magic-string": "^0.25.0", "minimist": "^1.2.0", "reflect-metadata": "^0.1.2", - "tsickle": "^0.32.1" + "shelljs": "^0.8.1", + "source-map": "^0.6.1", + "tslib": "^1.9.0", + "yargs": "9.0.1" }, "dependencies": { - "anymatch": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "chokidar": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz", + "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==", "dev": true, "requires": { - "micromatch": "^2.1.5", - "normalize-path": "^2.0.0" + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" } }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "arr-flatten": "^1.0.1" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" } }, - "chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "mem": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "anymatch": "^1.3.0", - "async-each": "^1.0.0", - "fsevents": "^1.0.0", - "glob-parent": "^2.0.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^2.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0" + "mimic-fn": "^1.0.0" } }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "is-posix-bracket": "^0.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "pify": "^2.0.0" } }, - "glob-parent": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "read-pkg": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { - "is-glob": "^2.0.0" + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" } }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" + } + }, + "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 }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "ansi-regex": "^3.0.0" } }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "yargs": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz", + "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=", "dev": true, "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" + "camelcase": "^4.1.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "read-pkg-up": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^7.0.0" } }, - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true + "yargs-parser": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", + "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", + "dev": true, + "requires": { + "camelcase": "^4.1.0" + } } } }, "@angular/core": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.1.10.tgz", - "integrity": "sha512-61l3rIQTVdT45eOf6/fBJIeVmV10mcrxqS4N/1OWkuDT29YSJTZSxGcv8QjAyyutuhcqWWpO6gVRkN07rWmkPg==", + "version": "7.2.12", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.12.tgz", + "integrity": "sha512-E5BtJPL4Fz1xyGTsoE4LELoZ33x0S0lJ0iUKqLRFeKKYM/fJ8l8mVNSZ7LnURTwpcjCiHcCRMcaCfuXWj7Kqhw==", "requires": { "tslib": "^1.9.0" } }, "@angular/fire": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@angular/fire/-/fire-5.1.1.tgz", - "integrity": "sha512-QfLVEhZYW3+3fh2d1z76/vab1GkLnEQWzFQK06D1ZaT8jZsVEdFMIPr7GSTJWAuOdqBRYq14iqzqEkJH3WHzig==" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@angular/fire/-/fire-5.1.2.tgz", + "integrity": "sha512-XTpS2+Vnw+poY5FmybOH5+iIgorIHnLH1/r/Zltt7iigvxajsTBPKD9wvxsT0/CtsDIOPB2ql9q0SJVK08iD1A==" }, "@angular/forms": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.1.10.tgz", - "integrity": "sha512-zAPx2kMV1/FbP5DrY472Sd/ze1m+GS6T5ullZCtP392r62p2RkwzDCXieR51YiRJjZj3M6c3AcRND7PWBdXT7A==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@angular/http": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.1.10.tgz", - "integrity": "sha512-LDsSqyexh8fj23y+G2oSGLWSZVhbxBBo2ehYHnRgH/jlp0pmZVLRaGgUMNSCVtZc1rxLzpEjZjtw+P+qlutAtw==", + "version": "7.2.12", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.12.tgz", + "integrity": "sha512-gQU8663C9LOyuza87XDkEQ2HXbaLt3LY8X45swUNfe+BvpKNhF5ZwwY22d93wuzvm/vFrCTPK7949ImfUW0XnA==", "requires": { "tslib": "^1.9.0" } }, "@angular/language-service": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.1.10.tgz", - "integrity": "sha512-nN29Ovomg21eL8acwOSUFAYwWFI1TuFwUgUu37ZssfVQrYdaV+BFx3yv3P0nKU90h3Hp+oIkWHd8U34UYrvBCg==", + "version": "7.2.12", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.12.tgz", + "integrity": "sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==", "dev": true }, "@angular/material": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-7.1.1.tgz", - "integrity": "sha512-wjYAWsdWpb8/BgoIfoUomnycoljU00avJ3hRIgPNnEpZhB7zqiBA8tCitzDS4NK8dKBJjM9WRAOj6yl6x3+9wA==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-7.3.7.tgz", + "integrity": "sha512-Eq+7frkeNGkLOfEtmkmJgR+AgoWajOipXZWWfCSamNfpCcPof82DwvGOpAmgGni9FuN2XFQdqP5MoaffQzIvUA==", "requires": { "tslib": "^1.7.1" } }, "@angular/platform-browser": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.1.10.tgz", - "integrity": "sha512-CB7pqMwtgb7KjdHDAJlsXcs0rrU+2xQVaoOaqEfJtUrKhtGMLaZh8Qoic5l92SoGattkOw7SYarAOsWlAsVfvw==", + "version": "7.2.12", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.12.tgz", + "integrity": "sha512-rhKxUtWM6LfM0cK0kVzQpdnzfGeL3KImk6kNn+RrZiXLk2N/pnwbrzfd6VUtm+zdg54S4BO8ui1NahwIC/PSKw==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.10.tgz", - "integrity": "sha512-DmBSUyFPoyKqkmBXyJ2CrP1oXDioeoBlPA8lmWUDUv2yBuoHIzIkdY/OkTZbdyu/QYa1hK2Jl9OlfoeoenKddg==", + "version": "7.2.12", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.12.tgz", + "integrity": "sha512-maKmjCTaS+jrXnor9qVJZfkWAKrt6neIlYrjvcr9v2YUqv9vdMcd5WRaODvIXBqwh65gpMxk3hbZ48Yjh8EbBQ==", "requires": { "tslib": "^1.9.0" } }, "@angular/router": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.1.10.tgz", - "integrity": "sha512-tekI3dkdvd65oMoxjjgRA+16uDgPUBWHhYxids6pgO8vobZNtCo8VaVlcDyLUhdmtS5kONELx0iL5E2M0Y2Bag==", + "version": "7.2.12", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.12.tgz", + "integrity": "sha512-n7EFKuOa6YDDvGZT/t7mXfQMuomkTVPJcWkpfPrViAKi4mcUnaU5IqYiBnv/WJfDDqocVD/Yf9YQD9zAajthEw==", "requires": { "tslib": "^1.9.0" } @@ -595,14 +484,14 @@ } }, "@babel/generator": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.0.tgz", - "integrity": "sha512-BA75MVfRlFQG2EZgFYIwyT1r6xSkwfP2bdkY/kLZusEYWiJs4xCowab/alaEaT0wSvmVuXGqiefeBlP+7V1yKg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz", + "integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==", "dev": true, "requires": { - "@babel/types": "^7.2.0", + "@babel/types": "^7.4.0", "jsesc": "^2.5.1", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "source-map": "^0.5.0", "trim-right": "^1.0.1" }, @@ -612,6 +501,12 @@ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true } } }, @@ -636,12 +531,12 @@ } }, "@babel/helper-split-export-declaration": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz", - "integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz", + "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==", "dev": true, "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.4.0" } }, "@babel/highlight": { @@ -664,52 +559,52 @@ } }, "@babel/parser": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.0.tgz", - "integrity": "sha512-M74+GvK4hn1eejD9lZ7967qAwvqTZayQa3g10ag4s9uewgR7TKjeaT0YMyoq+gVfKYABiWZ4MQD701/t5e1Jhg==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.3.tgz", + "integrity": "sha512-gxpEUhTS1sGA63EGQGuA+WESPR/6tz6ng7tSHFCmaTJK/cGK8y37cBTspX+U2xCAue2IQVvF6Z0oigmjwD8YGQ==", "dev": true }, "@babel/template": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz", - "integrity": "sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz", + "integrity": "sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.1.2", - "@babel/types": "^7.1.2" + "@babel/parser": "^7.4.0", + "@babel/types": "^7.4.0" } }, "@babel/traverse": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz", - "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.3.tgz", + "integrity": "sha512-HmA01qrtaCwwJWpSKpA948cBvU5BrmviAief/b3AVw936DtcdsTexlbyzNuDnthwhOQ37xshn7hvQaEQk7ISYQ==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.1.6", + "@babel/generator": "^7.4.0", "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.0.0", - "@babel/parser": "^7.1.6", - "@babel/types": "^7.1.6", + "@babel/helper-split-export-declaration": "^7.4.0", + "@babel/parser": "^7.4.3", + "@babel/types": "^7.4.0", "debug": "^4.1.0", "globals": "^11.1.0", - "lodash": "^4.17.10" + "lodash": "^4.17.11" }, "dependencies": { "debug": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", - "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { "ms": "^2.1.1" } }, "globals": { - "version": "11.9.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz", - "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==", + "version": "11.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz", + "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==", "dev": true }, "ms": { @@ -721,13 +616,13 @@ } }, "@babel/types": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.0.tgz", - "integrity": "sha512-b4v7dyfApuKDvmPb+O488UlGuR1WbwMXFsO/cyqMrnfvRAChZKJAYeeglWTjUO1b9UghKKgepAQM5tsvBJca6A==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz", + "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "to-fast-properties": "^2.0.0" }, "dependencies": { @@ -740,316 +635,198 @@ } }, "@firebase/app": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.3.5.tgz", - "integrity": "sha512-DaAlb74yzwXbkFXvfsUVFeurSETPJAvKNtVpAKlS6RThyD+Y+ci1/8JVw4INm2hihbj/edxlAUelg9eoOZNCKA==", + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.3.14.tgz", + "integrity": "sha512-l/Qdi0XRbiciTTivIQsvTtgdbLeTOIjksA28ktMXVyqr/cBYFDInrNrQDh9r5/PIrE6YJjmADSO0lTAAitVTQg==", "requires": { - "@firebase/app-types": "0.3.2", - "@firebase/util": "0.2.3", + "@firebase/app-types": "0.3.7", + "@firebase/util": "0.2.11", "dom-storage": "2.1.0", - "tslib": "1.9.0", + "tslib": "1.9.3", "xmlhttprequest": "1.8.0" - }, - "dependencies": { - "tslib": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", - "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" - } } }, "@firebase/app-types": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.3.2.tgz", - "integrity": "sha512-ZD8lTgW07NGgo75bTyBJA8Lt9+NweNzot7lrsBtIvfciwUzaFJLsv2EShqjBeuhF7RpG6YFucJ6m67w5buCtzw==" + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.3.7.tgz", + "integrity": "sha512-rY/dw4GeCMhCv9qs0yX8dqL+DL4siQYNkUXAKujte3jVlEy0wNW+AYIkjgFB6jxO39lWDC2hFbYeFXbsFlwtUg==" }, "@firebase/auth": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.9.1.tgz", - "integrity": "sha512-kiJtKXzM7DD1UNTdWcMmmRoU4LBX95JPWgCUN6nzumO1Ed+1izsgE4OwYVbZo+inSlOp6au0JTJrecsHHBemug==", + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.9.7.tgz", + "integrity": "sha512-6DyylOzHfnf1NZUOJQNs2S1HpRN8fH/O/oIByO1qTC7SqOa9Tnz4d8Lmc/Z/UfjMENCcaZbxs4p58GGYiEkjZQ==", "requires": { - "@firebase/auth-types": "0.5.0" + "@firebase/auth-types": "0.5.5" } }, "@firebase/auth-types": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.5.0.tgz", - "integrity": "sha512-DSjtsIjTy5RSiWyGHqiGkLcDgEgFEf2aD2O0t/0+lHmAzxUGrJFO5+IkPNV6i0ffmtiJaXQDJ7z7q4OdypDBCg==" + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.5.5.tgz", + "integrity": "sha512-1JDDWZPBhHcW08NoZfkviVlvsPJQpk4gaUKI4sua0EXggpOn5JolXzIs7ZUXfqyLtBRbx690HZeb8orQPzXUEg==" }, "@firebase/database": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.3.8.tgz", - "integrity": "sha512-y+QJjxC62triL1g6e58sapkGKegvbNIp3hOttE6olYG/zzb+U4Q7lUbYjtMkVpGWKYSsQOPu8JkH3FNhFvX95Q==", + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.3.17.tgz", + "integrity": "sha512-YHXdBOoBowRiDUPSXuc9/6zo8JOm0gEt9/NC7s9Izf3TW71N6XBLXlL13j5zEO2UEhRSDIufvWty7TiMLPir4g==", "requires": { - "@firebase/database-types": "0.3.2", - "@firebase/logger": "0.1.2", - "@firebase/util": "0.2.3", + "@firebase/database-types": "0.3.8", + "@firebase/logger": "0.1.10", + "@firebase/util": "0.2.11", "faye-websocket": "0.11.1", - "tslib": "1.9.0" - }, - "dependencies": { - "faye-websocket": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", - "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", - "requires": { - "websocket-driver": ">=0.5.1" - } - }, - "tslib": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", - "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" - } + "tslib": "1.9.3" } }, "@firebase/database-types": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.3.2.tgz", - "integrity": "sha512-9ZYdvYQ6r3aaHJarhUM5Hf6lQWu3ZJme+RR0o8qfBb9L04TL3uNjt+AJFku1ysVPntTn+9GqJjiIB2/OC3JtwA==" + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.3.8.tgz", + "integrity": "sha512-n/D/0S5bIsgrJuFoBa/4F1K1/Lr9jcS3O7sBBsQJJjkZ6WsE0J8Pg5AHJargBYspLh+4x43Pa7x/r5xGjRxbgA==" }, "@firebase/firestore": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-0.9.1.tgz", - "integrity": "sha512-R4VzozcniHgoS7kldk2aOYr1AhgG+9evkin/pG+6lZcZOabO04LYxT6HWLq+Q1KAyaEl9LOjJ1ne28S5l9IA5g==", - "requires": { - "@firebase/firestore-types": "0.8.0", - "@firebase/logger": "0.1.2", - "@firebase/webchannel-wrapper": "0.2.11", - "grpc": "1.16.1", - "tslib": "1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", - "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" - } + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.1.3.tgz", + "integrity": "sha512-usijF8/S9XUXvG8q9cEEnX2s8P3X/Nf+704VbzHQGqWGiUBnYgNCmhLE/FWOUugMmdJ6XymRcTNHMGxJcKGPMQ==", + "requires": { + "@firebase/firestore-types": "1.1.1", + "@firebase/logger": "0.1.10", + "@firebase/webchannel-wrapper": "0.2.16", + "grpc": "1.19.0", + "tslib": "1.9.3" } }, "@firebase/firestore-types": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-0.8.0.tgz", - "integrity": "sha512-FdLy2TbZ6aAeT9eDmVMPAFsUqhjN2e+jcdVpl0Pz1W6ElRWWyr30hgTY7xIqIKpMs1iT6IF/8w9CKvI6fPbKxA==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-1.1.1.tgz", + "integrity": "sha512-l0hgXrUKj0kW2+unJPiNpBI2fCjvr4ELD7ikSTczP4nX61r55VHdxP0Ft1dbjOq/ICUo2kq/b8AWDeVUF2u6ow==" }, "@firebase/functions": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.3.3.tgz", - "integrity": "sha512-t8CE1AQivqWeDJ1MvaITGn+x6Z78CVnJi3mLz/+2Vx7UwU4HRhkfJcxhrRnnMzWY9OoCJ9j1wUoDsXfKmU546w==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.4.3.tgz", + "integrity": "sha512-KQ7zYouuxx0f2mIusWtDy6MgFl8u1mwdwTkb9K+0jrViyWQ0KMRL3xcryVvXe/OEZzRmdiqYwpPp5uNQWWu19g==", "requires": { - "@firebase/functions-types": "0.2.1", - "@firebase/messaging-types": "0.2.3", + "@firebase/functions-types": "0.3.2", + "@firebase/messaging-types": "0.2.8", "isomorphic-fetch": "2.2.1", - "tslib": "1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", - "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" - } + "tslib": "1.9.3" } }, "@firebase/functions-types": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.2.1.tgz", - "integrity": "sha512-hH78lgDoa5E1peBSXnfQyshENmh/5a8aia+S4Ocjc53OUWRJ4VqYwWUV5gE4b2mqVKTpN4akJccLq2pCnNGZcA==" + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.3.2.tgz", + "integrity": "sha512-TZAlW+SAg8P/m/OY6XgqUufq/KPX56psGvJ58sDztsBTUWg6FzGqIU8n7lBwlYDvHD9Ca6AlGQyxCfYPHtTKzA==" }, "@firebase/logger": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.2.tgz", - "integrity": "sha512-4NHGRIbZChg9vDUxynzYrw14G/U/71v0pea+jXPicrpflL0N0PSCULXGGSTmzn9fqZ5W5djEwVLBCVwKndXG8w==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.10.tgz", + "integrity": "sha512-JRDSP1OtvMdzhLOuNxSB47rFCsAg59tcduSjCfSrDl1p2xsiBSnclcn/0bUHIG7I0vsA3mGcAx5YuTrvWTa0wQ==" }, "@firebase/messaging": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.3.7.tgz", - "integrity": "sha512-8tZgRVJuvmFe5HDUiKvGAsK/jehrMnoUx95XU3RkZHX2D5QHjXAvvXIfFQ118EtG5/whZoEo1nCjEHAd9mSalA==", + "version": "0.3.16", + "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.3.16.tgz", + "integrity": "sha512-NeogyiCKWZkmWU/sT081qNObq9UqUfwJor/AqqlP0sxmzaVyXm2Ds+n5QtnQ79LkJenrsf6GDQPmOrgU+lLwdQ==", "requires": { - "@firebase/messaging-types": "0.2.3", - "@firebase/util": "0.2.3", - "tslib": "1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", - "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" - } + "@firebase/messaging-types": "0.2.8", + "@firebase/util": "0.2.11", + "tslib": "1.9.3" } }, "@firebase/messaging-types": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.2.3.tgz", - "integrity": "sha512-avwCgZzcx2uxIW/wT3p3G/EyHftIrvMyiTS7AA7dxDlzfx+8dpAeTsb1+jsHJT4F6foSh5HG17Nw8sDzYuxH1Q==" + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.2.8.tgz", + "integrity": "sha512-Pz3IZqfWzb/cHBBNAjLKF+yQS7gYtwow1bwXLQhE+ptHB+2V9fEcqYhOYUpDbuE51cH/XO7qGNFVnXSveFBt9g==" }, "@firebase/polyfill": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.3.tgz", - "integrity": "sha512-xs8IZf1WEbufYXyfV8YjmiFZOaujRRq0T03NteihYfuGVTTym7z5SmvLvEHLEUjf2fgeobPEzZ2JgrCQHS+QHw==", + "version": "0.3.10", + "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.10.tgz", + "integrity": "sha512-9LmGf0LbwmAokfolFqWP1IFzLWORU90v81VQbBYgr3AYqijG5ufju7vCv1HLUznjyOsbcpGQpxg0os3rxsG55g==", "requires": { - "core-js": "2.5.5", - "promise-polyfill": "7.1.2", + "core-js": "3.0.0", + "promise-polyfill": "8.1.0", "whatwg-fetch": "2.0.4" }, "dependencies": { "core-js": { - "version": "2.5.5", - "resolved": "http://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz", - "integrity": "sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.0.tgz", + "integrity": "sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ==" }, "whatwg-fetch": { "version": "2.0.4", - "resolved": "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==" } } }, "@firebase/storage": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.2.4.tgz", - "integrity": "sha512-uqA6CoZYkugk69ImqB16VBPP7JRPRfZwcUP9CsE0GPVGQkZQQfBGwzIyEoFA8lUfVLrvxQiL0sQvHUXZ945LMg==", + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.2.12.tgz", + "integrity": "sha512-CAN370NV7+n2iXj+O/8LqJk3aWQPasXHrIvX6V4kIzqNdlPEZuEbsE7wWZ2B2Aw8JyJw0zWYhnbU+b9IlH8S6Q==", "requires": { - "@firebase/storage-types": "0.2.3", - "tslib": "1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", - "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" - } + "@firebase/storage-types": "0.2.8", + "tslib": "1.9.3" } }, "@firebase/storage-types": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.2.3.tgz", - "integrity": "sha512-RaZeam2LgsB7xwAtOQr4G0Geoyf7D5TnLF3a12By6Rh0Z9PqBSlWn0SVYGW3SkmxIdqvWZMZvCyamUlqQvQzWw==" + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.2.8.tgz", + "integrity": "sha512-kWSmS60OkqE0MDUmvuPNpkWUiDwV5jqzrGEFrsUixSpT8bbxHnSwmnWk5njH+yH0K4e1957JB5P/dtscK0rc7w==" }, "@firebase/util": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.3.tgz", - "integrity": "sha512-ngAG4qYpcnnshUKbBlEiR9+j37U7dTrTVJlS4v7ahW1ROuyLT9xj6cWyHQANzcTR2yKLmEv3yfwoZwedz7V0oQ==", + "version": "0.2.11", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.11.tgz", + "integrity": "sha512-sYIxzZcAeK1k0fLa1gWSnIrBFtPLFN+mgTTlQ29Pe9MBppSBluKguh43ejQioDgcGwPGhrbQx8urmSiI55SrCQ==", "requires": { - "tslib": "1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", - "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" - } + "tslib": "1.9.3" } }, "@firebase/webchannel-wrapper": { - "version": "0.2.11", - "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.11.tgz", - "integrity": "sha512-WyMXDxk/WZ+f2lOCeEvDWUce2f5Kk2sNfvArK8f+PlUnzFdy/MBzLXrmbMgyZXP7GP4ooUxYV8Sdmoh1hGk1Uw==" + "version": "0.2.16", + "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.16.tgz", + "integrity": "sha512-p5QPUrmag+C77l2S7jtLlixNyBGqgeQLknzZY9ck76ipAUFNk0uJEfHJiI1Tz2pEjB7XwmoovaDhGlQDvNb5vA==" }, "@ngtools/webpack": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.1.tgz", - "integrity": "sha512-EGQRjgDf5XP+Fm1MdZNRFiPd9e1vhl11BhjkwqkAsewic4eoz6fqXfj/Osz1hQy8xU+2dPPf/byQ/+nY3E02Zg==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.8.tgz", + "integrity": "sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==", "dev": true, "requires": { - "@angular-devkit/core": "7.3.1", + "@angular-devkit/core": "7.3.8", "enhanced-resolve": "4.1.0", "rxjs": "6.3.3", "tree-kill": "1.2.1", "webpack-sources": "1.3.0" - }, - "dependencies": { - "@angular-devkit/core": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.1.tgz", - "integrity": "sha512-56XDWWfIzOAkEk69lBLgmCYybPUA4yjunhmMlCk7vVdb7gbQUyzNjFD04Uj0GjlejatAQ5F76tRwygD9C+3RXQ==", - "dev": true, - "requires": { - "ajv": "6.7.0", - "chokidar": "2.0.4", - "fast-json-stable-stringify": "2.0.0", - "rxjs": "6.3.3", - "source-map": "0.7.3" - } - }, - "ajv": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz", - "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "rxjs": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", - "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - } } }, "@schematics/angular": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.8.8.tgz", - "integrity": "sha512-9Br6gX6iZ4JRIVE4fN+Glt1KaiXxmPMBwhXWCjGJ1HFe2k3iG/6ejFtHfrSr5NIZqji/wiWS0SARCJDngq0dyQ==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.8.tgz", + "integrity": "sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==", "dev": true, "requires": { - "@angular-devkit/core": "0.8.8", - "@angular-devkit/schematics": "0.8.8", - "typescript": ">=2.6.2 <2.10" + "@angular-devkit/core": "7.3.8", + "@angular-devkit/schematics": "7.3.8", + "typescript": "3.2.4" } }, "@schematics/update": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.8.8.tgz", - "integrity": "sha512-Ir0DmhIRheTIohpPqOZ+90y80hkz/pHJwWvi+iTiVQFmenCN/vuNtZWwxsj6WqOA+POwWlIxqdVsOsqvgWZV0A==", + "version": "0.13.8", + "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.8.tgz", + "integrity": "sha512-2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g==", "dev": true, "requires": { - "@angular-devkit/core": "0.8.8", - "@angular-devkit/schematics": "0.8.8", - "npm-registry-client": "8.6.0", - "rxjs": "6.2.2", + "@angular-devkit/core": "7.3.8", + "@angular-devkit/schematics": "7.3.8", + "@yarnpkg/lockfile": "1.1.0", + "ini": "1.3.5", + "pacote": "9.4.0", + "rxjs": "6.3.3", "semver": "5.6.0", "semver-intersect": "1.4.0" } }, "@types/jasmine": { - "version": "2.8.12", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.12.tgz", - "integrity": "sha512-eE+xeiGBPgQsNcyg61JBqQS6NtxC+s2yfOikMCnc0Z4NqKujzmSahmtjLCKVQU/AyrTEQ76TOwQBnr8wGP2bmA==", + "version": "2.8.16", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.16.tgz", + "integrity": "sha512-056oRlBBp7MDzr+HoU5su099s/s7wjZ3KcHxLfv+Byqb9MwdLUvsfLgw1VS97hsh3ddxSPyQu+olHMnoVTUY6g==", "dev": true }, "@types/jasminewd2": { @@ -1063,20 +840,20 @@ }, "@types/node": { "version": "8.9.5", - "resolved": "http://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==", "dev": true }, "@types/q": { "version": "0.0.32", - "resolved": "http://registry.npmjs.org/@types/q/-/q-0.0.32.tgz", + "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz", "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", "dev": true }, "@types/selenium-webdriver": { - "version": "3.0.14", - "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.14.tgz", - "integrity": "sha512-4GbNCDs98uHCT/OMv40qQC/OpoPbYn9XdXeTiFwHBBFO6eJhYEPUu2zDKirXSbHlvDV8oZ9l8EQ+HrEx/YS9DQ==", + "version": "3.0.16", + "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.16.tgz", + "integrity": "sha512-lMC2G0ItF2xv4UCiwbJGbnJlIuUixHrioOhNGHSCsYCJ8l4t9hMCUimCytvFv7qy6AfSzRxhRHoGa+UqaqwyeA==", "dev": true }, "@types/source-list-map": { @@ -1288,6 +1065,22 @@ "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==", "dev": true }, + "@yarnpkg/lockfile": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "dev": true + }, + "JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "dev": true, + "requires": { + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" + } + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -1306,9 +1099,9 @@ } }, "acorn": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz", - "integrity": "sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", + "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", "dev": true }, "acorn-dynamic-import": { @@ -1338,16 +1131,25 @@ "es6-promisify": "^5.0.0" } }, + "agentkeepalive": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz", + "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==", + "dev": true, + "requires": { + "humanize-ms": "^1.2.1" + } + }, "ajv": { - "version": "6.4.0", - "resolved": "http://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz", - "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz", + "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==", "dev": true, "requires": { - "fast-deep-equal": "^1.0.0", + "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0", - "uri-js": "^3.0.2" + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" } }, "ajv-errors": { @@ -1369,9 +1171,15 @@ "dev": true }, "ansi-colors": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", - "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", + "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", + "dev": true + }, + "ansi-escapes": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", "dev": true }, "ansi-html": { @@ -1405,9 +1213,9 @@ } }, "app-root-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz", - "integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz", + "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==", "dev": true }, "append-transform": { @@ -1475,12 +1283,6 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, - "array-slice": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", - "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", - "dev": true - }, "array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", @@ -1567,7 +1369,7 @@ }, "util": { "version": "0.10.3", - "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { @@ -1598,9 +1400,9 @@ } }, "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.2.tgz", + "integrity": "sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==", "dev": true }, "async-foreach": { @@ -1673,7 +1475,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -1706,6 +1508,14 @@ "lodash": "^4.17.4", "source-map": "^0.5.7", "trim-right": "^1.0.1" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } } }, "babel-messages": { @@ -1890,9 +1700,9 @@ "dev": true }, "binary-extensions": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz", - "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", "dev": true }, "blob": { @@ -1918,20 +1728,12 @@ "dev": true, "requires": { "minimist": "^1.2.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } } }, "bluebird": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz", - "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz", + "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==", "dev": true }, "bn.js": { @@ -1956,6 +1758,17 @@ "qs": "6.5.2", "raw-body": "2.3.3", "type-is": "~1.6.16" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", + "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } } }, "bonjour": { @@ -2018,7 +1831,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { @@ -2055,7 +1868,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -2088,20 +1901,20 @@ } }, "browserslist": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz", - "integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.4.tgz", + "integrity": "sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000929", - "electron-to-chromium": "^1.3.103", - "node-releases": "^1.1.3" + "caniuse-lite": "^1.0.30000955", + "electron-to-chromium": "^1.3.122", + "node-releases": "^1.1.13" } }, "browserstack": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.1.tgz", - "integrity": "sha512-O8VMT64P9NOLhuIoD4YngyxBURefaSdR4QdhG8l6HZ9VxtU7jc3m6jLufFwKA5gaf7fetfB2TnRJnMxyob+heg==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.2.tgz", + "integrity": "sha512-+6AFt9HzhKykcPF79W6yjEUJcdvZOV0lIXdkORXMJftGrDl0OKWqRF4GHqpDNkxiceDT/uB7Fb/aDwktvXX7dg==", "dev": true, "requires": { "https-proxy-agent": "^2.2.1" @@ -2109,7 +1922,7 @@ }, "buffer": { "version": "4.9.1", - "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { @@ -2192,7 +2005,7 @@ }, "cacache": { "version": "10.0.4", - "resolved": "http://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { @@ -2209,6 +2022,14 @@ "ssri": "^5.2.4", "unique-filename": "^1.1.0", "y18n": "^4.0.0" + }, + "dependencies": { + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": true + } } }, "cache-base": { @@ -2241,7 +2062,7 @@ }, "camelcase-keys": { "version": "2.1.0", - "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "optional": true, @@ -2251,9 +2072,15 @@ } }, "caniuse-lite": { - "version": "1.0.30000938", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000938.tgz", - "integrity": "sha512-ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw==", + "version": "1.0.30000957", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz", + "integrity": "sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==", + "dev": true + }, + "canonical-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz", + "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==", "dev": true }, "caseless": { @@ -2263,16 +2090,33 @@ "dev": true }, "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } }, + "chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true + }, "chokidar": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", @@ -2325,12 +2169,6 @@ "integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==", "dev": true }, - "circular-json": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz", - "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==", - "dev": true - }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -2371,6 +2209,21 @@ } } }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "^2.0.0" + } + }, + "cli-width": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "dev": true + }, "cliui": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", @@ -2411,17 +2264,31 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "codelyzer": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.3.0.tgz", - "integrity": "sha512-RLMrtLwrBS0dfo2/KTP+2NHofCpzcuh0bEp/A/naqvQonbUL4AW/qWQdbpn8dMNudtpmzEx9eS8KEpGdVPg1BA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.5.0.tgz", + "integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==", "dev": true, "requires": { - "app-root-path": "^2.0.1", + "app-root-path": "^2.1.0", "css-selector-tokenizer": "^0.7.0", "cssauron": "^1.4.0", "semver-dsl": "^1.0.1", "source-map": "^0.5.7", - "sprintf-js": "^1.0.3" + "sprintf-js": "^1.1.1" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "sprintf-js": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", + "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "dev": true + } } }, "collection-visit": { @@ -2451,7 +2318,7 @@ }, "colors": { "version": "1.1.2", - "resolved": "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", "dev": true }, @@ -2460,15 +2327,6 @@ "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz", "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=" }, - "combine-lists": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz", - "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", - "dev": true, - "requires": { - "lodash": "^4.5.0" - } - }, "combined-stream": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", @@ -2479,9 +2337,9 @@ } }, "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", "dev": true }, "commondir": { @@ -2515,25 +2373,25 @@ "dev": true }, "compressible": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz", - "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz", + "integrity": "sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==", "dev": true, "requires": { - "mime-db": ">= 1.36.0 < 2" + "mime-db": ">= 1.38.0 < 2" } }, "compression": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz", - "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, "requires": { "accepts": "~1.3.5", "bytes": "3.0.0", - "compressible": "~2.0.14", + "compressible": "~2.0.16", "debug": "2.6.9", - "on-headers": "~1.0.1", + "on-headers": "~1.0.2", "safe-buffer": "5.1.2", "vary": "~1.1.2" } @@ -2687,9 +2545,9 @@ } }, "core-js": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.0.tgz", - "integrity": "sha512-kLRC6ncVpuEW/1kwrOXYX6KQASCVtrh1gQr/UiaVgFlf9WE5Vp+lNe5+h3LuMr5PAucWnnEXwH0nQHRH/gpGtw==" + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz", + "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==" }, "core-util-is": { "version": "1.0.2", @@ -2733,7 +2591,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { @@ -2746,7 +2604,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { @@ -2852,9 +2710,9 @@ } }, "date-format": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz", - "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz", + "integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==", "dev": true }, "date-now": { @@ -2973,7 +2831,7 @@ "dependencies": { "globby": { "version": "6.1.0", - "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { @@ -2986,7 +2844,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -3012,6 +2870,12 @@ "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", "dev": true }, + "dependency-graph": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz", + "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==", + "dev": true + }, "des.js": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", @@ -3057,7 +2921,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { @@ -3152,9 +3016,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.113", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz", - "integrity": "sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==", + "version": "1.3.124", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz", + "integrity": "sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==", "dev": true }, "elliptic": { @@ -3228,7 +3092,7 @@ }, "engine.io-client": { "version": "3.2.1", - "resolved": "http://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==", "dev": true, "requires": { @@ -3286,6 +3150,12 @@ "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", "dev": true }, + "err-code": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz", + "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=", + "dev": true + }, "errno": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", @@ -3305,14 +3175,14 @@ } }, "es6-promise": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz", - "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz", + "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==", "dev": true }, "es6-promisify": { "version": "5.0.0", - "resolved": "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", "dev": true, "requires": { @@ -3332,15 +3202,21 @@ "dev": true }, "eslint-scope": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", - "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", "dev": true, "requires": { "esrecurse": "^4.1.0", "estraverse": "^4.1.1" } }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, "esrecurse": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", @@ -3435,56 +3311,6 @@ "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", "dev": true }, - "expand-braces": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", - "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", - "dev": true, - "requires": { - "array-slice": "^0.2.3", - "array-unique": "^0.2.1", - "braces": "^0.1.2" - }, - "dependencies": { - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "braces": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz", - "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", - "dev": true, - "requires": { - "expand-range": "^0.1.0" - } - }, - "expand-range": { - "version": "0.1.1", - "resolved": "http://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz", - "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", - "dev": true, - "requires": { - "is-number": "^0.1.1", - "repeat-string": "^0.2.2" - } - }, - "is-number": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz", - "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=", - "dev": true - }, - "repeat-string": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz", - "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=", - "dev": true - } - } - }, "expand-brackets": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", @@ -3500,73 +3326,22 @@ "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" - } - } - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "http://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, - "requires": { - "fill-range": "^2.1.0" - }, - "dependencies": { - "fill-range": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", - "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", - "dev": true, - "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^3.0.0", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" - } - }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "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": { - "isarray": "1.0.0" + "is-descriptor": "^0.1.0" } }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "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-buffer": "^1.1.5" + "is-extendable": "^0.1.0" } } } @@ -3611,7 +3386,7 @@ "dependencies": { "array-flatten": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", "dev": true } @@ -3644,6 +3419,17 @@ } } }, + "external-editor": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz", + "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==", + "dev": true, + "requires": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + } + }, "extglob": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", @@ -3716,9 +3502,9 @@ "dev": true }, "fast-deep-equal": { - "version": "1.1.0", - "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, "fast-json-stable-stringify": { @@ -3734,10 +3520,9 @@ "dev": true }, "faye-websocket": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", - "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", - "dev": true, + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", + "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", "requires": { "websocket-driver": ">=0.5.1" } @@ -3748,6 +3533,15 @@ "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==", "dev": true }, + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, "file-loader": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz", @@ -3758,12 +3552,6 @@ "schema-utils": "^1.0.0" } }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, "fileset": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", @@ -3799,7 +3587,7 @@ }, "finalhandler": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", "dev": true, "requires": { @@ -3833,20 +3621,26 @@ } }, "firebase": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/firebase/-/firebase-5.7.1.tgz", - "integrity": "sha512-mzquoe+m7lMC5UHyidrOUENImaInB9k2bBKLr6TSThtoCxsBmvHUiexqsYQ8QRl28X0GdVcKEOOESBltnlRsnQ==", + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/firebase/-/firebase-5.9.3.tgz", + "integrity": "sha512-58ytmGOhthiMyBIQBsbqNJ/uiJswXcAOEkYeA88362sZhnrRFhzE4QWg4wWZkeDQ09gZvJRC660P8gb3tiDGdg==", "requires": { - "@firebase/app": "0.3.5", - "@firebase/auth": "0.9.1", - "@firebase/database": "0.3.8", - "@firebase/firestore": "0.9.1", - "@firebase/functions": "0.3.3", - "@firebase/messaging": "0.3.7", - "@firebase/polyfill": "0.3.3", - "@firebase/storage": "0.2.4" + "@firebase/app": "0.3.14", + "@firebase/auth": "0.9.7", + "@firebase/database": "0.3.17", + "@firebase/firestore": "1.1.3", + "@firebase/functions": "0.4.3", + "@firebase/messaging": "0.3.16", + "@firebase/polyfill": "0.3.10", + "@firebase/storage": "0.2.12" } }, + "flatted": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz", + "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==", + "dev": true + }, "flush-write-stream": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", @@ -3858,22 +3652,28 @@ } }, "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz", + "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==", "dev": true, "requires": { - "debug": "=3.1.0" + "debug": "^3.2.6" }, "dependencies": { "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" } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true } } }, @@ -3942,13 +3742,33 @@ }, "fs-access": { "version": "1.0.1", - "resolved": "http://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", "dev": true, "requires": { "null-check": "^1.0.0" } }, + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "fs-minipass": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", + "dev": true, + "requires": { + "minipass": "^2.2.1" + } + }, "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", @@ -3967,9 +3787,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", - "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz", + "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==", "dev": true, "optional": true, "requires": { @@ -3995,7 +3815,7 @@ "optional": true }, "are-we-there-yet": { - "version": "1.1.4", + "version": "1.1.5", "bundled": true, "dev": true, "optional": true, @@ -4007,21 +3827,19 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "chownr": { - "version": "1.0.1", + "version": "1.1.1", "bundled": true, "dev": true, "optional": true @@ -4029,20 +3847,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -4060,7 +3875,7 @@ } }, "deep-extend": { - "version": "0.5.1", + "version": "0.6.0", "bundled": true, "dev": true, "optional": true @@ -4109,7 +3924,7 @@ } }, "glob": { - "version": "7.1.2", + "version": "7.1.3", "bundled": true, "dev": true, "optional": true, @@ -4129,12 +3944,12 @@ "optional": true }, "iconv-lite": { - "version": "0.4.21", + "version": "0.4.24", "bundled": true, "dev": true, "optional": true, "requires": { - "safer-buffer": "^2.1.0" + "safer-buffer": ">= 2.1.2 < 3" } }, "ignore-walk": { @@ -4159,8 +3974,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -4172,7 +3986,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4187,7 +4000,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4195,20 +4007,19 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { - "version": "2.2.4", + "version": "2.3.5", "bundled": true, "dev": true, "requires": { - "safe-buffer": "^5.1.1", + "safe-buffer": "^5.1.2", "yallist": "^3.0.0" } }, "minizlib": { - "version": "1.1.0", + "version": "1.2.1", "bundled": true, "dev": true, "optional": true, @@ -4231,7 +4042,7 @@ "optional": true }, "needle": { - "version": "2.2.0", + "version": "2.2.4", "bundled": true, "dev": true, "optional": true, @@ -4242,18 +4053,18 @@ } }, "node-pre-gyp": { - "version": "0.10.0", + "version": "0.10.3", "bundled": true, "dev": true, "optional": true, "requires": { "detect-libc": "^1.0.2", "mkdirp": "^0.5.1", - "needle": "^2.2.0", + "needle": "^2.2.1", "nopt": "^4.0.1", "npm-packlist": "^1.1.6", "npmlog": "^4.0.2", - "rc": "^1.1.7", + "rc": "^1.2.7", "rimraf": "^2.6.1", "semver": "^5.3.0", "tar": "^4" @@ -4270,13 +4081,13 @@ } }, "npm-bundled": { - "version": "1.0.3", + "version": "1.0.5", "bundled": true, "dev": true, "optional": true }, "npm-packlist": { - "version": "1.1.10", + "version": "1.2.0", "bundled": true, "dev": true, "optional": true, @@ -4300,8 +4111,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -4352,12 +4162,12 @@ "optional": true }, "rc": { - "version": "1.2.7", + "version": "1.2.8", "bundled": true, "dev": true, "optional": true, "requires": { - "deep-extend": "^0.5.1", + "deep-extend": "^0.6.0", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" @@ -4387,16 +4197,16 @@ } }, "rimraf": { - "version": "2.6.2", + "version": "2.6.3", "bundled": true, "dev": true, "optional": true, "requires": { - "glob": "^7.0.5" + "glob": "^7.1.3" } }, "safe-buffer": { - "version": "5.1.1", + "version": "5.1.2", "bundled": true, "dev": true }, @@ -4413,7 +4223,7 @@ "optional": true }, "semver": { - "version": "5.5.0", + "version": "5.6.0", "bundled": true, "dev": true, "optional": true @@ -4434,7 +4244,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4465,17 +4274,17 @@ "optional": true }, "tar": { - "version": "4.4.1", + "version": "4.4.8", "bundled": true, "dev": true, "optional": true, "requires": { - "chownr": "^1.0.1", + "chownr": "^1.1.1", "fs-minipass": "^1.2.5", - "minipass": "^2.2.4", - "minizlib": "^1.1.0", + "minipass": "^2.3.4", + "minizlib": "^1.1.1", "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.1", + "safe-buffer": "^5.1.2", "yallist": "^3.0.2" } }, @@ -4486,12 +4295,12 @@ "optional": true }, "wide-align": { - "version": "1.1.2", + "version": "1.1.3", "bundled": true, "dev": true, "optional": true, "requires": { - "string-width": "^1.0.2" + "string-width": "^1.0.2 || 2" } }, "wrappy": { @@ -4500,7 +4309,7 @@ "dev": true }, "yallist": { - "version": "3.0.2", + "version": "3.0.3", "bundled": true, "dev": true } @@ -4544,6 +4353,12 @@ "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.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", @@ -4558,7 +4373,7 @@ }, "get-stream": { "version": "3.0.0", - "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", "dev": true }, @@ -4590,42 +4405,6 @@ "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" - }, - "dependencies": { - "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" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", @@ -4686,11 +4465,12 @@ "dev": true }, "grpc": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.16.1.tgz", - "integrity": "sha512-7uHN1Nd3UqfvwgQ6f5U3+EZb/0iuHJ9mbPH+ydaTkszJsUi3nwdz6DuSh0eJwYVXXn6Gojv2khiQAadMongGKg==", + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.19.0.tgz", + "integrity": "sha512-xX+jZ1M3YXjngsRj/gTxB4EwM0WoWUr54DmyNq9xTeg1oSuVaTPD/PK9wnZKOJWTt1pkeFspXqwJPhddZNxHOA==", "requires": { - "lodash": "^4.17.5", + "lodash.camelcase": "^4.3.0", + "lodash.clone": "^4.5.0", "nan": "^2.0.0", "node-pre-gyp": "^0.12.0", "protobufjs": "^5.0.3" @@ -4793,7 +4573,7 @@ } }, "glob": { - "version": "7.1.3", + "version": "7.1.2", "bundled": true, "requires": { "fs.realpath": "^1.0.0", @@ -4809,7 +4589,7 @@ "bundled": true }, "iconv-lite": { - "version": "0.4.24", + "version": "0.4.23", "bundled": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" @@ -5096,7 +4876,7 @@ "bundled": true }, "yallist": { - "version": "3.0.2", + "version": "3.0.3", "bundled": true } } @@ -5108,12 +4888,12 @@ "dev": true }, "handlebars": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.0.tgz", - "integrity": "sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz", + "integrity": "sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==", "dev": true, "requires": { - "async": "^2.5.0", + "neo-async": "^2.6.0", "optimist": "^0.6.1", "source-map": "^0.6.1", "uglify-js": "^3.1.4" @@ -5141,41 +4921,6 @@ "requires": { "ajv": "^6.5.5", "har-schema": "^2.0.0" - }, - "dependencies": { - "ajv": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz", - "integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - } } }, "has-ansi": { @@ -5309,6 +5054,12 @@ "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", @@ -5317,7 +5068,7 @@ }, "http-errors": { "version": "1.6.3", - "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { @@ -5343,9 +5094,30 @@ "requires-port": "^1.0.0" } }, + "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": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, "http-proxy-middleware": { "version": "0.18.0", - "resolved": "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz", "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==", "dev": true, "requires": { @@ -5399,18 +5171,27 @@ } } }, + "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.23", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", - "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "requires": { "safer-buffer": ">= 2.1.2 < 3" } }, "ieee754": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz", - "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", "dev": true }, "iferr": { @@ -5425,6 +5206,15 @@ "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", @@ -5486,9 +5276,9 @@ } }, "p-limit": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz", - "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", + "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -5504,9 +5294,9 @@ } }, "p-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, "pkg-dir": { @@ -5558,17 +5348,90 @@ "wrappy": "1" } }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "dev": true - }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + }, + "inquirer": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz", + "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==", + "dev": true, + "requires": { + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.0", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.0", + "figures": "^2.0.0", + "lodash": "^4.17.10", + "mute-stream": "0.0.7", + "run-async": "^2.2.0", + "rxjs": "^6.1.0", + "string-width": "^2.1.0", + "strip-ansi": "^5.0.0", + "through": "^2.3.6" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + } + } + } + } + }, "internal-ip": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz", @@ -5579,6 +5442,12 @@ "ipaddr.js": "^1.5.2" } }, + "interpret": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", + "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", + "dev": true + }, "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -5613,7 +5482,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -5652,18 +5521,9 @@ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { @@ -5706,21 +5566,6 @@ "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", "dev": true }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "dev": true, - "requires": { - "is-primitive": "^2.0.0" - } - }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", @@ -5751,9 +5596,9 @@ } }, "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "dev": true, "requires": { "is-extglob": "^2.1.1" @@ -5812,16 +5657,10 @@ "isobject": "^3.0.1" } }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", "dev": true }, "is-stream": { @@ -5896,44 +5735,36 @@ "dev": true }, "istanbul-api": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.0.6.tgz", - "integrity": "sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.1.tgz", + "integrity": "sha512-kVmYrehiwyeBAk/wE71tW6emzLiHGjYIiDrc8sfyty4F8M02/lrgXSm+R1kXysmF20zArvmZXjlE/mg24TVPJw==", "dev": true, "requires": { "async": "^2.6.1", "compare-versions": "^3.2.1", "fileset": "^2.0.3", - "istanbul-lib-coverage": "^2.0.1", - "istanbul-lib-hook": "^2.0.1", - "istanbul-lib-instrument": "^3.0.0", - "istanbul-lib-report": "^2.0.2", - "istanbul-lib-source-maps": "^2.0.1", - "istanbul-reports": "^2.0.1", + "istanbul-lib-coverage": "^2.0.3", + "istanbul-lib-hook": "^2.0.3", + "istanbul-lib-instrument": "^3.1.0", + "istanbul-lib-report": "^2.0.4", + "istanbul-lib-source-maps": "^3.0.2", + "istanbul-reports": "^2.1.1", "js-yaml": "^3.12.0", "make-dir": "^1.3.0", + "minimatch": "^3.0.4", "once": "^1.4.0" }, "dependencies": { - "async": { - "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.17.10" - } - }, "istanbul-lib-coverage": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", - "integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", + "integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==", "dev": true }, "istanbul-lib-instrument": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz", - "integrity": "sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz", + "integrity": "sha512-ooVllVGT38HIk8MxDj/OIHXSYvH+1tq/Vb38s8ixt9GoJadXska4WkGY+0wkmtYCZNYtaARniH/DixUGGLZ0uA==", "dev": true, "requires": { "@babel/generator": "^7.0.0", @@ -5941,7 +5772,7 @@ "@babel/template": "^7.0.0", "@babel/traverse": "^7.0.0", "@babel/types": "^7.0.0", - "istanbul-lib-coverage": "^2.0.1", + "istanbul-lib-coverage": "^2.0.3", "semver": "^5.5.0" } } @@ -5971,6 +5802,18 @@ "json-schema-traverse": "^0.3.0" } }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "dev": true + }, "schema-utils": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", @@ -5989,9 +5832,9 @@ "dev": true }, "istanbul-lib-hook": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz", - "integrity": "sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.3.tgz", + "integrity": "sha512-CLmEqwEhuCYtGcpNVJjLV1DQyVnIqavMLFHV/DP+np/g3qvdxu3gsPqYoJMXm15sN84xOlckFB3VNvRbf5yEgA==", "dev": true, "requires": { "append-transform": "^1.0.0" @@ -6013,50 +5856,50 @@ } }, "istanbul-lib-report": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz", - "integrity": "sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz", + "integrity": "sha512-sOiLZLAWpA0+3b5w5/dq0cjm2rrNdAfHWaGhmn7XEFW6X++IV9Ohn+pnELAl9K3rfpaeBfbmH9JU5sejacdLeA==", "dev": true, "requires": { - "istanbul-lib-coverage": "^2.0.1", + "istanbul-lib-coverage": "^2.0.3", "make-dir": "^1.3.0", - "supports-color": "^5.4.0" + "supports-color": "^6.0.0" }, "dependencies": { "istanbul-lib-coverage": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", - "integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", + "integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==", "dev": true } } }, "istanbul-lib-source-maps": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz", - "integrity": "sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz", + "integrity": "sha512-JX4v0CiKTGp9fZPmoxpu9YEkPbEqCqBbO3403VabKjH+NRXo72HafD5UgnjTEqHL2SAjaZK1XDuDOkn6I5QVfQ==", "dev": true, "requires": { - "debug": "^3.1.0", - "istanbul-lib-coverage": "^2.0.1", + "debug": "^4.1.1", + "istanbul-lib-coverage": "^2.0.3", "make-dir": "^1.3.0", "rimraf": "^2.6.2", "source-map": "^0.6.1" }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { "ms": "^2.1.1" } }, "istanbul-lib-coverage": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", - "integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", + "integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==", "dev": true }, "ms": { @@ -6074,12 +5917,12 @@ } }, "istanbul-reports": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.0.1.tgz", - "integrity": "sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.1.1.tgz", + "integrity": "sha512-FzNahnidyEPBCI0HcufJoSEoKykesRlFcSzQqjH9x0+LC8tnnE/p/90PBLu8iZTxr8yYZNyTtiAujUqyN+CIxw==", "dev": true, "requires": { - "handlebars": "^4.0.11" + "handlebars": "^4.1.0" } }, "jasmine": { @@ -6103,19 +5946,10 @@ }, "jasmine-core": { "version": "2.99.1", - "resolved": "http://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz", "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=", "dev": true }, - "jasmine-diff": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/jasmine-diff/-/jasmine-diff-0.1.3.tgz", - "integrity": "sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=", - "dev": true, - "requires": { - "diff": "^3.2.0" - } - }, "jasmine-spec-reporter": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz", @@ -6145,21 +5979,13 @@ "dev": true }, "js-yaml": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", - "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" - }, - "dependencies": { - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - } } }, "jsbn": { @@ -6170,7 +5996,7 @@ }, "jsesc": { "version": "1.3.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", "dev": true }, @@ -6187,9 +6013,9 @@ "dev": true }, "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, "json-stringify-safe": { @@ -6211,16 +6037,23 @@ "dev": true, "requires": { "minimist": "^1.2.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } } }, + "jsonfile": { + "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" + } + }, + "jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", + "dev": true + }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -6234,80 +6067,39 @@ } }, "jszip": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz", - "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.2.1.tgz", + "integrity": "sha512-iCMBbo4eE5rb1VCpm5qXOAaUiRKRUKiItn8ah2YQQx9qymmSAY98eyQfioChEYcVQLh0zxJ3wS4A0mh90AVPvw==", "dev": true, "requires": { - "core-js": "~2.3.0", - "es6-promise": "~3.0.2", - "lie": "~3.1.0", + "lie": "~3.3.0", "pako": "~1.0.2", - "readable-stream": "~2.0.6" - }, - "dependencies": { - "core-js": { - "version": "2.3.0", - "resolved": "http://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz", - "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU=", - "dev": true - }, - "es6-promise": { - "version": "3.0.2", - "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", - "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "readable-stream": { - "version": "2.0.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "string_decoder": "~0.10.x", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } + "readable-stream": "~2.3.6", + "set-immediate-shim": "~1.0.1" } }, "karma": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/karma/-/karma-3.0.0.tgz", - "integrity": "sha512-ZTjyuDXVXhXsvJ1E4CnZzbCjSxD6sEdzEsFYogLuZM0yqvg/mgz+O+R1jb0J7uAQeuzdY8kJgx6hSNXLwFuHIQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/karma/-/karma-4.0.1.tgz", + "integrity": "sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==", "dev": true, "requires": { "bluebird": "^3.3.0", "body-parser": "^1.16.1", + "braces": "^2.3.2", "chokidar": "^2.0.3", "colors": "^1.1.0", - "combine-lists": "^1.0.0", "connect": "^3.6.0", "core-js": "^2.2.0", "di": "^0.0.1", "dom-serialize": "^2.2.0", - "expand-braces": "^0.1.1", + "flatted": "^2.0.0", "glob": "^7.1.1", "graceful-fs": "^4.1.2", "http-proxy": "^1.13.0", "isbinaryfile": "^3.0.0", - "lodash": "^4.17.4", - "log4js": "^3.0.0", + "lodash": "^4.17.11", + "log4js": "^4.0.0", "mime": "^2.3.1", "minimatch": "^3.0.2", "optimist": "^0.6.1", @@ -6318,13 +6110,13 @@ "socket.io": "2.1.1", "source-map": "^0.6.1", "tmp": "0.0.33", - "useragent": "2.2.1" + "useragent": "2.3.0" }, "dependencies": { "mime": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", - "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.1.tgz", + "integrity": "sha512-VRUfmQO0rCd3hKwBymAn3kxYzBHr3I/wdVMywgG3HhXOwrCQgN84ZagpdTm2tZ4TNtwsSmyJWYO88mb5XvzGqQ==", "dev": true }, "source-map": { @@ -6346,12 +6138,12 @@ } }, "karma-coverage-istanbul-reporter": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz", - "integrity": "sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz", + "integrity": "sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==", "dev": true, "requires": { - "istanbul-api": "^2.0.5", + "istanbul-api": "^2.1.1", "minimatch": "^3.0.4" } }, @@ -6363,7 +6155,7 @@ }, "karma-jasmine-html-reporter": { "version": "0.2.2", - "resolved": "http://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz", + "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz", "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=", "dev": true, "requires": { @@ -6447,9 +6239,9 @@ } }, "lie": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", - "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", "dev": true, "requires": { "immediate": "~3.0.5" @@ -6457,7 +6249,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -6470,7 +6262,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -6506,7 +6298,8 @@ "lodash": { "version": "4.17.11", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "dev": true }, "lodash.assign": { "version": "4.2.0", @@ -6515,6 +6308,16 @@ "dev": true, "optional": true }, + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=" + }, + "lodash.clone": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz", + "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=" + }, "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", @@ -6541,22 +6344,22 @@ "dev": true }, "log4js": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz", - "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.1.0.tgz", + "integrity": "sha512-eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA==", "dev": true, "requires": { - "circular-json": "^0.5.5", - "date-format": "^1.2.0", - "debug": "^3.1.0", + "date-format": "^2.0.0", + "debug": "^4.1.1", + "flatted": "^2.0.0", "rfdc": "^1.1.2", - "streamroller": "0.7.0" + "streamroller": "^1.0.4" }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { "ms": "^2.1.1" @@ -6611,6 +6414,15 @@ "yallist": "^2.1.2" } }, + "magic-string": { + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz", + "integrity": "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==", + "dev": true, + "requires": { + "sourcemap-codec": "^1.4.4" + } + }, "make-dir": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", @@ -6626,6 +6438,109 @@ "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==", "dev": true }, + "make-fetch-happen": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz", + "integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==", + "dev": true, + "requires": { + "agentkeepalive": "^3.4.1", + "cacache": "^11.0.1", + "http-cache-semantics": "^3.8.1", + "http-proxy-agent": "^2.1.0", + "https-proxy-agent": "^2.2.1", + "lru-cache": "^4.1.2", + "mississippi": "^3.0.0", + "node-fetch-npm": "^2.0.2", + "promise-retry": "^1.1.1", + "socks-proxy-agent": "^4.0.0", + "ssri": "^6.0.0" + }, + "dependencies": { + "cacache": { + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz", + "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==", + "dev": true, + "requires": { + "bluebird": "^3.5.3", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.3", + "graceful-fs": "^4.1.15", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.2", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + } + } + }, + "mississippi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", + "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", + "dev": true, + "requires": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + } + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "ssri": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "dev": true, + "requires": { + "figgy-pudding": "^3.5.1" + } + }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": 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==", + "dev": true + } + } + }, "map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", @@ -6656,12 +6571,6 @@ "object-visit": "^1.0.0" } }, - "math-random": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", - "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=", - "dev": true - }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -6675,18 +6584,18 @@ }, "media-typer": { "version": "0.3.0", - "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, "mem": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.1.0.tgz", - "integrity": "sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", + "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", "dev": true, "requires": { "map-age-cleaner": "^0.1.1", - "mimic-fn": "^1.0.0", + "mimic-fn": "^2.0.0", "p-is-promise": "^2.0.0" } }, @@ -6702,7 +6611,7 @@ }, "meow": { "version": "3.7.0", - "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "optional": true, @@ -6717,15 +6626,6 @@ "read-pkg-up": "^1.0.1", "redent": "^1.0.0", "trim-newlines": "^1.0.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true, - "optional": true - } } }, "merge-descriptors": { @@ -6779,24 +6679,24 @@ "optional": true }, "mime-db": { - "version": "1.37.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", - "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==", + "version": "1.38.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz", + "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==", "dev": true }, "mime-types": { - "version": "2.1.21", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", - "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", + "version": "2.1.22", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz", + "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==", "dev": true, "requires": { - "mime-db": "~1.37.0" + "mime-db": "~1.38.0" } }, "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true }, "mini-css-extract-plugin": { @@ -6831,11 +6731,38 @@ } }, "minimist": { - "version": "0.0.8", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, + "minipass": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "dev": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + }, + "dependencies": { + "yallist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "dev": true + } + } + }, + "minizlib": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", + "dev": true, + "requires": { + "minipass": "^2.2.1" + } + }, "mississippi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", @@ -6895,11 +6822,19 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + } } }, "move-concurrently": { @@ -6938,10 +6873,16 @@ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", "dev": true }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, "nan": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz", - "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==" + "version": "2.13.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", + "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==" }, "nanomatch": { "version": "1.2.13", @@ -6975,9 +6916,9 @@ "dev": true }, "ng-simple-slideshow": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/ng-simple-slideshow/-/ng-simple-slideshow-1.2.8.tgz", - "integrity": "sha512-ZMM2ZEoAQY0RkceCZljwEWiCVehDc848/erWR2MPf+q0JUWpzQK3cIssKtyAaZnzohynE5YixY/t+zCGxkEwDw==" + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/ng-simple-slideshow/-/ng-simple-slideshow-1.2.9.tgz", + "integrity": "sha512-05bLd9pWFAIhlOuScO1FOhCubNm9oZ3HK7fJ0oZgn9m9kl257yxXQv/1fBsVrCu0v/25zQRGRS9EgkX5UXhJdQ==" }, "nice-try": { "version": "1.0.5", @@ -6994,6 +6935,17 @@ "is-stream": "^1.0.1" } }, + "node-fetch-npm": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz", + "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==", + "dev": true, + "requires": { + "encoding": "^0.1.11", + "json-parse-better-errors": "^1.0.0", + "safe-buffer": "^5.1.1" + } + }, "node-forge": { "version": "0.7.5", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", @@ -7023,7 +6975,7 @@ "dependencies": { "semver": { "version": "5.3.0", - "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "dev": true, "optional": true @@ -7070,9 +7022,9 @@ } }, "node-releases": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.7.tgz", - "integrity": "sha512-bKdrwaqJUPHqlCzDD7so/R+Nk0jGv9a11ZhLrD9f6i947qGLrGAhU3OxRENa19QQmwzGy/g6zCDEuLGDO8HPvA==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.13.tgz", + "integrity": "sha512-fKZGviSXR6YvVPyc011NHuJDSD8gFQvLPmc2d2V3BS4gr52ycyQ1Xzs7a8B+Ax3Ni/W+5h1h4SqmzeoA8WZRmA==", "dev": true, "requires": { "semver": "^5.3.0" @@ -7115,7 +7067,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "optional": true, @@ -7147,13 +7099,13 @@ } }, "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, "requires": { "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", + "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" } @@ -7173,6 +7125,12 @@ "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", "dev": true }, + "npm-bundled": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", + "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", + "dev": true + }, "npm-package-arg": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz", @@ -7185,24 +7143,39 @@ "validate-npm-package-name": "^3.0.0" } }, - "npm-registry-client": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.6.0.tgz", - "integrity": "sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==", + "npm-packlist": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz", + "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", + "dev": true, + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" + } + }, + "npm-pick-manifest": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz", + "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==", + "dev": true, + "requires": { + "figgy-pudding": "^3.5.1", + "npm-package-arg": "^6.0.0", + "semver": "^5.4.1" + } + }, + "npm-registry-fetch": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz", + "integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==", "dev": true, "requires": { - "concat-stream": "^1.5.2", - "graceful-fs": "^4.1.6", - "normalize-package-data": "~1.0.1 || ^2.0.0", - "npm-package-arg": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", - "npmlog": "2 || ^3.1.0 || ^4.0.0", - "once": "^1.3.3", - "request": "^2.74.0", - "retry": "^0.10.0", - "safe-buffer": "^5.1.1", - "semver": "2 >=2.2.1 || 3.x || 4 || 5", - "slide": "^1.1.3", - "ssri": "^5.2.4" + "JSONStream": "^1.3.4", + "bluebird": "^3.5.1", + "figgy-pudding": "^3.4.1", + "lru-cache": "^4.1.3", + "make-fetch-happen": "^4.0.1", + "npm-package-arg": "^6.1.0" } }, "npm-run-path": { @@ -7301,27 +7274,6 @@ "isobject": "^3.0.0" } }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "dev": true, - "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" - }, - "dependencies": { - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - } - } - }, "object.pick": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", @@ -7347,9 +7299,9 @@ } }, "on-headers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", - "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", "dev": true }, "once": { @@ -7360,10 +7312,36 @@ "wrappy": "1" } }, + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "dev": true, + "requires": { + "mimic-fn": "^1.0.0" + }, + "dependencies": { + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true + } + } + }, + "open": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/open/-/open-6.0.0.tgz", + "integrity": "sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==", + "dev": true, + "requires": { + "is-wsl": "^1.1.0" + } + }, "opn": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz", - "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", + "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", "dev": true, "requires": { "is-wsl": "^1.1.0" @@ -7379,10 +7357,10 @@ "wordwrap": "~0.0.2" }, "dependencies": { - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true } } @@ -7409,13 +7387,13 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, "os-locale": { "version": "1.4.0", - "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "requires": { "lcid": "^1.0.0" @@ -7423,7 +7401,7 @@ }, "os-tmpdir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, @@ -7485,10 +7463,151 @@ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true }, + "pacote": { + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz", + "integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==", + "dev": true, + "requires": { + "bluebird": "^3.5.3", + "cacache": "^11.3.2", + "figgy-pudding": "^3.5.1", + "get-stream": "^4.1.0", + "glob": "^7.1.3", + "lru-cache": "^5.1.1", + "make-fetch-happen": "^4.0.1", + "minimatch": "^3.0.4", + "minipass": "^2.3.5", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "normalize-package-data": "^2.4.0", + "npm-package-arg": "^6.1.0", + "npm-packlist": "^1.1.12", + "npm-pick-manifest": "^2.2.3", + "npm-registry-fetch": "^3.8.0", + "osenv": "^0.1.5", + "promise-inflight": "^1.0.1", + "promise-retry": "^1.1.1", + "protoduck": "^5.0.1", + "rimraf": "^2.6.2", + "safe-buffer": "^5.1.2", + "semver": "^5.6.0", + "ssri": "^6.0.1", + "tar": "^4.4.8", + "unique-filename": "^1.1.1", + "which": "^1.3.1" + }, + "dependencies": { + "cacache": { + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz", + "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==", + "dev": true, + "requires": { + "bluebird": "^3.5.3", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.3", + "graceful-fs": "^4.1.15", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.2", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + } + }, + "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" + } + }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "mississippi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", + "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", + "dev": true, + "requires": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + } + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "ssri": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "dev": true, + "requires": { + "figgy-pudding": "^3.5.1" + } + }, + "tar": { + "version": "4.4.8", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", + "dev": true, + "requires": { + "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" + } + }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": 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==", + "dev": true + } + } + }, "pako": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.7.tgz", - "integrity": "sha512-3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz", + "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==", "dev": true }, "parallel-transform": { @@ -7516,35 +7635,6 @@ "safe-buffer": "^5.1.1" } }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "dev": true, - "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, "parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", @@ -7555,10 +7645,10 @@ } }, "parse5": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", - "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", - "dev": true + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", + "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==", + "optional": true }, "parseqs": { "version": "0.0.5", @@ -7592,7 +7682,7 @@ }, "path-browserify": { "version": "0.0.0", - "resolved": "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", "dev": true }, @@ -7610,7 +7700,7 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-is-inside": { @@ -7731,42 +7821,11 @@ "supports-color": "^6.1.0" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "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 - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } + "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 } } }, @@ -7810,12 +7869,6 @@ "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", "dev": true }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", - "dev": true - }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -7845,9 +7898,19 @@ "dev": true }, "promise-polyfill": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-7.1.2.tgz", - "integrity": "sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ==" + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.1.0.tgz", + "integrity": "sha512-OzSf6gcCUQ01byV4BgwyUCswlaQQ6gzXc23aLQWhicvfX9kfsUiUhgt3CCQej8jDnl8/PhGF31JdHX2/MzF3WA==" + }, + "promise-retry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz", + "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=", + "dev": true, + "requires": { + "err-code": "^1.0.0", + "retry": "^0.10.0" + } }, "protobufjs": { "version": "5.0.3", @@ -7858,36 +7921,23 @@ "bytebuffer": "~5", "glob": "^7.0.5", "yargs": "^3.10.0" - }, - "dependencies": { - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" - }, - "yargs": { - "version": "3.32.0", - "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", - "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", - "requires": { - "camelcase": "^2.0.1", - "cliui": "^3.0.3", - "decamelize": "^1.1.1", - "os-locale": "^1.4.0", - "string-width": "^1.0.1", - "window-size": "^0.1.4", - "y18n": "^3.2.0" - } - } + } + }, + "protoduck": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz", + "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==", + "dev": true, + "requires": { + "genfun": "^5.0.0" } }, "protractor": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.1.tgz", - "integrity": "sha512-ORey5ewQMYiXQxcQohsqEiKYOg/r5yJoJbt0tuROmmgajdg/CA3gTOZNIFJncUVMAJIk5YFqBBLUjKVmQO6tfA==", + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.2.tgz", + "integrity": "sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA==", "dev": true, "requires": { - "@types/node": "^6.0.46", "@types/q": "^0.0.32", "@types/selenium-webdriver": "^3.0.0", "blocking-proxy": "^1.0.0", @@ -7905,12 +7955,6 @@ "webdriver-manager": "^12.0.6" }, "dependencies": { - "@types/node": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.14.2.tgz", - "integrity": "sha512-JWB3xaVfsfnFY8Ofc9rTB/op0fqqTSqy4vBcVk1LuRJvta7KTX+D//fCkiTMeLGhdr2EbFZzQjC97gvmPilk9Q==", - "dev": true - }, "ansi-styles": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", @@ -7919,7 +7963,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -7947,7 +7991,7 @@ }, "globby": { "version": "5.0.0", - "resolved": "http://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { @@ -7959,18 +8003,18 @@ "pinkie-promise": "^2.0.0" } }, - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, "source-map-support": { "version": "0.4.18", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", @@ -7987,9 +8031,9 @@ "dev": true }, "webdriver-manager": { - "version": "12.1.0", - "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.0.tgz", - "integrity": "sha512-oEc5fmkpz6Yh6udhwir5m0eN5mgRPq9P/NU5YWuT3Up5slt6Zz+znhLU7q4+8rwCZz/Qq3Fgpr/4oao7NPCm2A==", + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.1.tgz", + "integrity": "sha512-L9TEQmZs6JbMMRQI1w60mfps265/NCr0toYJl7p/R2OAk6oXAfwI6jqYP7EWae+d7Ad2S2Aj4+rzxoSjqk3ZuA==", "dev": true, "requires": { "adm-zip": "^0.4.9", @@ -8107,34 +8151,15 @@ "dev": true }, "querystringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz", - "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz", + "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==", "dev": true }, - "randomatic": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", - "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==", - "dev": true, - "requires": { - "is-number": "^4.0.0", - "kind-of": "^6.0.0", - "math-random": "^1.0.1" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", - "dev": true - } - } - }, "randombytes": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", - "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, "requires": { "safe-buffer": "^5.1.0" @@ -8166,6 +8191,17 @@ "http-errors": "1.6.3", "iconv-lite": "0.4.23", "unpipe": "1.0.0" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", + "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } } }, "raw-loader": { @@ -8189,7 +8225,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -8219,7 +8255,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -8258,7 +8294,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { @@ -8282,6 +8318,15 @@ "readable-stream": "^2.0.2" } }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, + "requires": { + "resolve": "^1.1.6" + } + }, "redent": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", @@ -8294,9 +8339,9 @@ } }, "reflect-metadata": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.12.tgz", - "integrity": "sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==", + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", + "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==", "dev": true }, "regenerate": { @@ -8311,15 +8356,6 @@ "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", "dev": true }, - "regex-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", - "dev": true, - "requires": { - "is-equal-shallow": "^0.1.3" - } - }, "regex-not": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", @@ -8332,7 +8368,7 @@ }, "regexpu-core": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "dev": true, "requires": { @@ -8343,13 +8379,13 @@ }, "regjsgen": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", "dev": true }, "regjsparser": { "version": "0.1.5", - "resolved": "http://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { @@ -8358,7 +8394,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true } @@ -8473,6 +8509,16 @@ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "dev": true, + "requires": { + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" + } + }, "ret": { "version": "0.1.15", "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", @@ -8492,12 +8538,12 @@ "dev": true }, "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "^7.1.3" } }, "ripemd160": { @@ -8510,6 +8556,15 @@ "inherits": "^2.0.1" } }, + "run-async": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", + "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", + "dev": true, + "requires": { + "is-promise": "^2.1.0" + } + }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", @@ -8520,9 +8575,9 @@ } }, "rxjs": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", - "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "requires": { "tslib": "^1.9.0" } @@ -8535,7 +8590,7 @@ }, "safe-regex": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { @@ -8558,6 +8613,37 @@ "lodash": "^4.0.0", "scss-tokenizer": "^0.2.3", "yargs": "^7.0.0" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true, + "optional": true + }, + "yargs": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", + "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "dev": true, + "optional": true, + "requires": { + "camelcase": "^3.0.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.2", + "which-module": "^1.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^5.0.0" + } + } } }, "sass-loader": { @@ -8585,7 +8671,7 @@ }, "sax": { "version": "0.5.8", - "resolved": "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz", + "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz", "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=", "dev": true }, @@ -8613,7 +8699,7 @@ "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "optional": true, @@ -8753,6 +8839,12 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true }, + "set-immediate-shim": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", + "dev": true + }, "set-value": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", @@ -8790,7 +8882,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { @@ -8832,6 +8924,17 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, + "shelljs": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz", + "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==", + "dev": true, + "requires": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + } + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", @@ -8844,10 +8947,10 @@ "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", "dev": true }, - "slide": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", - "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", + "smart-buffer": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.2.tgz", + "integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==", "dev": true }, "snapdragon": { @@ -8883,6 +8986,12 @@ "requires": { "is-extendable": "^0.1.0" } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true } } }, @@ -9023,7 +9132,7 @@ }, "socket.io-parser": { "version": "3.2.0", - "resolved": "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==", "dev": true, "requires": { @@ -9057,6 +9166,17 @@ "requires": { "faye-websocket": "^0.10.0", "uuid": "^3.0.1" + }, + "dependencies": { + "faye-websocket": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", + "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", + "dev": true, + "requires": { + "websocket-driver": ">=0.5.1" + } + } } }, "sockjs-client": { @@ -9082,15 +9202,6 @@ "ms": "^2.1.1" } }, - "faye-websocket": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", - "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", - "dev": true, - "requires": { - "websocket-driver": ">=0.5.1" - } - }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -9099,6 +9210,26 @@ } } }, + "socks": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz", + "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==", + "dev": true, + "requires": { + "ip": "^1.1.5", + "smart-buffer": "4.0.2" + } + }, + "socks-proxy-agent": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz", + "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==", + "dev": true, + "requires": { + "agent-base": "~4.2.1", + "socks": "~2.3.2" + } + }, "source-list-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", @@ -9106,9 +9237,9 @@ "dev": true }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true }, "source-map-loader": { @@ -9135,9 +9266,9 @@ } }, "source-map-support": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz", - "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==", + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", + "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -9158,6 +9289,12 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, + "sourcemap-codec": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz", + "integrity": "sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==", + "dev": true + }, "spdx-correct": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", @@ -9185,9 +9322,9 @@ } }, "spdx-license-ids": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz", - "integrity": "sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz", + "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==", "dev": true }, "spdy": { @@ -9250,9 +9387,9 @@ "dev": true }, "readable-stream": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz", - "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz", + "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==", "dev": true, "requires": { "inherits": "^2.0.3", @@ -9263,9 +9400,9 @@ } }, "speed-measure-webpack-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz", - "integrity": "sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz", + "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==", "dev": true, "requires": { "chalk": "^2.0.1" @@ -9282,14 +9419,14 @@ }, "sprintf-js": { "version": "1.0.3", - "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, "sshpk": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz", - "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", "dev": true, "requires": { "asn1": "~0.2.3", @@ -9398,15 +9535,16 @@ "dev": true }, "streamroller": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz", - "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.4.tgz", + "integrity": "sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==", "dev": true, "requires": { - "date-format": "^1.2.0", + "async": "^2.6.1", + "date-format": "^2.0.0", "debug": "^3.1.0", - "mkdirp": "^0.5.1", - "readable-stream": "^2.3.0" + "fs-extra": "^7.0.0", + "lodash": "^4.17.10" }, "dependencies": { "debug": { @@ -9438,7 +9576,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { @@ -9447,7 +9585,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { "ansi-regex": "^2.0.0" @@ -9464,7 +9602,7 @@ }, "strip-eof": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, @@ -9518,7 +9656,7 @@ }, "source-map": { "version": "0.1.43", - "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { @@ -9539,9 +9677,9 @@ } }, "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { "has-flag": "^3.0.0" @@ -9561,7 +9699,7 @@ }, "tar": { "version": "2.2.1", - "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "dev": true, "optional": true, @@ -9572,14 +9710,14 @@ } }, "terser": { - "version": "3.16.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz", - "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", "dev": true, "requires": { - "commander": "~2.17.1", + "commander": "^2.19.0", "source-map": "~0.6.1", - "source-map-support": "~0.5.9" + "source-map-support": "~0.5.10" }, "dependencies": { "source-map": { @@ -9629,13 +9767,13 @@ } }, "find-cache-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz", - "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", + "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", "dev": true, "requires": { "commondir": "^1.0.1", - "make-dir": "^1.0.0", + "make-dir": "^2.0.0", "pkg-dir": "^3.0.0" } }, @@ -9667,6 +9805,16 @@ "yallist": "^3.0.2" } }, + "make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + } + }, "mississippi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", @@ -9686,9 +9834,9 @@ } }, "p-limit": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz", - "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", + "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -9704,9 +9852,15 @@ } }, "p-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true }, "pkg-dir": { @@ -9743,6 +9897,12 @@ "figgy-pudding": "^3.5.1" } }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": true + }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", @@ -9753,7 +9913,7 @@ }, "through": { "version": "2.3.8", - "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, @@ -9912,41 +10072,6 @@ "mkdirp": "^0.5.1", "source-map-support": "^0.5.6", "yn": "^2.0.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, - "tsickle": { - "version": "0.32.1", - "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.32.1.tgz", - "integrity": "sha512-JW9j+W0SaMSZGejIFZBk0AiPfnhljK3oLx5SaqxrJhjlvzFyPml5zqG1/PuScUj6yTe1muEqwk5CnDK0cOZmKw==", - "dev": true, - "requires": { - "jasmine-diff": "^0.1.3", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", - "source-map": "^0.6.0", - "source-map-support": "^0.5.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "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 - } } }, "tslib": { @@ -9972,17 +10097,6 @@ "semver": "^5.3.0", "tslib": "^1.8.0", "tsutils": "^2.27.2" - }, - "dependencies": { - "resolve": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", - "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", - "dev": true, - "requires": { - "path-parse": "^1.0.5" - } - } } }, "tsutils": { @@ -9996,7 +10110,7 @@ }, "tty-browserify": { "version": "0.0.0", - "resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, @@ -10032,22 +10146,29 @@ "dev": true }, "typescript": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", - "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz", + "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==", "dev": true }, "uglify-js": { - "version": "3.4.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", - "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz", + "integrity": "sha512-rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw==", "dev": true, "optional": true, "requires": { - "commander": "~2.17.1", + "commander": "~2.19.0", "source-map": "~0.6.1" }, "dependencies": { + "commander": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", + "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==", + "dev": true, + "optional": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -10116,6 +10237,12 @@ "imurmurhash": "^0.1.4" } }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true + }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -10163,15 +10290,15 @@ } }, "upath": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", - "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", + "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==", "dev": true }, "uri-js": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz", - "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "dev": true, "requires": { "punycode": "^2.1.0" @@ -10218,21 +10345,13 @@ "dev": true }, "useragent": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz", - "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", + "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", "dev": true, "requires": { - "lru-cache": "2.2.x", + "lru-cache": "4.1.x", "tmp": "0.0.x" - }, - "dependencies": { - "lru-cache": { - "version": "2.2.4", - "resolved": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", - "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=", - "dev": true - } } }, "util": { @@ -10300,7 +10419,7 @@ }, "vm-browserify": { "version": "0.0.4", - "resolved": "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", "dev": true, "requires": { @@ -10405,7 +10524,7 @@ }, "source-map": { "version": "0.4.4", - "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { @@ -10427,9 +10546,9 @@ }, "dependencies": { "mime": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", - "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.1.tgz", + "integrity": "sha512-VRUfmQO0rCd3hKwBymAn3kxYzBHr3I/wdVMywgG3HhXOwrCQgN84ZagpdTm2tZ4TNtwsSmyJWYO88mb5XvzGqQ==", "dev": true } } @@ -10602,9 +10721,9 @@ } }, "mime": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", - "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.1.tgz", + "integrity": "sha512-VRUfmQO0rCd3hKwBymAn3kxYzBHr3I/wdVMywgG3HhXOwrCQgN84ZagpdTm2tZ4TNtwsSmyJWYO88mb5XvzGqQ==", "dev": true }, "ms": { @@ -10625,9 +10744,9 @@ } }, "p-limit": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz", - "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", + "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -10643,9 +10762,9 @@ } }, "p-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, "pump": { @@ -10679,6 +10798,15 @@ } } }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + }, "webpack-dev-middleware": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz", @@ -10829,6 +10957,12 @@ "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=" }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true + }, "worker-farm": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz", @@ -10840,7 +10974,7 @@ }, "wrap-ansi": { "version": "2.1.0", - "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "requires": { "string-width": "^1.0.1", @@ -10883,7 +11017,7 @@ }, "xmlbuilder": { "version": "9.0.7", - "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", "dev": true }, @@ -10911,10 +11045,9 @@ "dev": true }, "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" }, "yallist": { "version": "2.1.2", @@ -10923,41 +11056,17 @@ "dev": true }, "yargs": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", - "dev": true, - "optional": true, + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", + "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", + "camelcase": "^2.0.1", + "cliui": "^3.0.3", "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true, - "optional": true - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true, - "optional": true - } + "string-width": "^1.0.1", + "window-size": "^0.1.4", + "y18n": "^3.2.0" } }, "yargs-parser": { @@ -10992,9 +11101,9 @@ "dev": true }, "zone.js": { - "version": "0.8.26", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.26.tgz", - "integrity": "sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==" + "version": "0.8.29", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz", + "integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ==" } } } diff --git a/package.json b/package.json index 09f14639..48481446 100644 --- a/package.json +++ b/package.json @@ -4,39 +4,43 @@ "scripts": { "ng": "ng", "start": "ng serve", - "build": "ng build" + "build": "ng build", + "test": "ng test", + "lint": "ng lint", + "e2e": "ng e2e" }, + "private": true, "dependencies": { - "@angular/animations": "^6.1.10", - "@angular/cdk": "^7.1.1", - "@angular/common": "^6.1.0", - "@angular/compiler": "^6.1.0", - "@angular/core": "^6.1.0", - "@angular/fire": "^5.1.1", - "@angular/forms": "^6.1.0", - "@angular/http": "^6.1.0", - "@angular/material": "^7.1.1", - "@angular/platform-browser": "^6.1.0", - "@angular/platform-browser-dynamic": "^6.1.0", - "@angular/router": "^6.1.0", + "@angular/animations": "~7.2.0", + "@angular/cdk": "^7.3.7", + "@angular/common": "~7.2.0", + "@angular/compiler": "~7.2.0", + "@angular/core": "~7.2.0", + "@angular/fire": "^5.1.2", + "@angular/forms": "~7.2.0", + "@angular/material": "^7.3.7", + "@angular/platform-browser": "~7.2.0", + "@angular/platform-browser-dynamic": "~7.2.0", + "@angular/router": "~7.2.0", "core-js": "^2.5.4", - "firebase": "^5.7.1", - "ng-simple-slideshow": "^1.2.8", - "rxjs": "~6.2.0", + "firebase": "^5.9.3", + "ng-simple-slideshow": "^1.2.9", + "rxjs": "~6.3.3", + "tslib": "^1.9.0", "zone.js": "~0.8.26" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.13.1", - "@angular/cli": "~6.2.6", - "@angular/compiler-cli": "^6.1.0", - "@angular/language-service": "^6.1.0", + "@angular-devkit/build-angular": "~0.13.0", + "@angular/cli": "~7.3.6", + "@angular/compiler-cli": "~7.2.0", + "@angular/language-service": "~7.2.0", + "@types/node": "~8.9.4", "@types/jasmine": "~2.8.8", "@types/jasminewd2": "~2.0.3", - "@types/node": "~8.9.4", - "codelyzer": "~4.3.0", + "codelyzer": "~4.5.0", "jasmine-core": "~2.99.1", "jasmine-spec-reporter": "~4.2.1", - "karma": "~3.0.0", + "karma": "~4.0.0", "karma-chrome-launcher": "~2.2.0", "karma-coverage-istanbul-reporter": "~2.0.1", "karma-jasmine": "~1.1.2", @@ -44,6 +48,6 @@ "protractor": "~5.4.0", "ts-node": "~7.0.0", "tslint": "~5.11.0", - "typescript": "^2.9.2" + "typescript": "~3.2.2" } } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 8d89a3c2..09bc80e7 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,15 +4,15 @@ import { Routes, RouterModule, PreloadAllModules } from '@angular/router'; const routes: Routes = [ { path: 'home', - loadChildren: './home/home.module#HomeModule' + loadChildren: './pages/home/home.module#HomeModule' }, { path: 'team', - loadChildren: './team/team.module#TeamModule' + loadChildren: './pages/team/team.module#TeamModule' }, { path: 'partners', - loadChildren: './partners/partners.module#PartnersModule' + loadChildren: './pages/partners/partners.module#PartnersModule' }, { path: '**', redirectTo: 'home' } ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ab9564bc..175e89cb 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,28 +1,41 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; - import { AppComponent } from './app.component'; - import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { SharedModule } from './shared/shared.module'; -import { CoreModule } from './core/core.module'; +import { AngularFireModule } from '@angular/fire'; +import { environment } from '../environments/environment'; +import { AngularFirestoreModule } from '@angular/fire/firestore'; +import { AngularFireStorageModule } from '@angular/fire/storage'; +import { AngularFireFunctionsModule } from '@angular/fire/functions'; import { AppRoutingModule } from './app-routing.module'; import { HttpClientModule } from '@angular/common/http'; import { MatSidenavModule } from '@angular/material/sidenav'; import { MatListModule } from '@angular/material/list'; - +import { NavigationComponentModule } from './components/navigation/navigation.module'; +import { ContributePanelComponentModule } from './components/contribute-panel/contribue-panel.module'; +import { FooterComponentModule } from './components/footer/footer.module'; +import { NeonLogoComponentModule } from './components/neon-logo/neon-logo.module'; +import { NeonDateComponentModule } from './components/neon-date/neon-date.module'; @NgModule({ declarations: [ AppComponent, ], imports: [ + AngularFireModule.initializeApp(environment.firebase), + AngularFirestoreModule.enablePersistence({experimentalTabSynchronization: true}), + AngularFireStorageModule, + AngularFireFunctionsModule, HttpClientModule, BrowserModule, BrowserAnimationsModule, AppRoutingModule, - SharedModule, - CoreModule, + + NavigationComponentModule, + ContributePanelComponentModule, + FooterComponentModule, + NeonLogoComponentModule, + NeonDateComponentModule, MatSidenavModule, MatListModule ], diff --git a/src/app/components/contribute-panel/contribue-panel.module.ts b/src/app/components/contribute-panel/contribue-panel.module.ts new file mode 100644 index 00000000..c8e03e6f --- /dev/null +++ b/src/app/components/contribute-panel/contribue-panel.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { ContributePanelComponent } from './contribute-panel.component'; + +@NgModule({ + imports: [ + CommonModule, + ], + declarations: [ + ContributePanelComponent, + ], + exports: [ + ContributePanelComponent + ] +}) +export class ContributePanelComponentModule { } diff --git a/src/app/shared/contribute-panel/contribute-panel.component.css b/src/app/components/contribute-panel/contribute-panel.component.css similarity index 100% rename from src/app/shared/contribute-panel/contribute-panel.component.css rename to src/app/components/contribute-panel/contribute-panel.component.css diff --git a/src/app/shared/contribute-panel/contribute-panel.component.html b/src/app/components/contribute-panel/contribute-panel.component.html similarity index 100% rename from src/app/shared/contribute-panel/contribute-panel.component.html rename to src/app/components/contribute-panel/contribute-panel.component.html diff --git a/src/app/shared/contribute-panel/contribute-panel.component.ts b/src/app/components/contribute-panel/contribute-panel.component.ts similarity index 70% rename from src/app/shared/contribute-panel/contribute-panel.component.ts rename to src/app/components/contribute-panel/contribute-panel.component.ts index 5b3bacb9..d200262e 100644 --- a/src/app/shared/contribute-panel/contribute-panel.component.ts +++ b/src/app/components/contribute-panel/contribute-panel.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { SocialIconsService } from '../social-icons.service'; @Component({ selector: 'app-contribute-panel', @@ -8,7 +7,7 @@ import { SocialIconsService } from '../social-icons.service'; }) export class ContributePanelComponent implements OnInit { - constructor( private socialsSer: SocialIconsService) { } + constructor() { } ngOnInit() { } diff --git a/src/app/shared/footer/footer.component.html b/src/app/components/footer/footer.component.html similarity index 100% rename from src/app/shared/footer/footer.component.html rename to src/app/components/footer/footer.component.html diff --git a/src/app/shared/footer/footer.component.scss b/src/app/components/footer/footer.component.scss similarity index 100% rename from src/app/shared/footer/footer.component.scss rename to src/app/components/footer/footer.component.scss diff --git a/src/app/shared/footer/footer.component.ts b/src/app/components/footer/footer.component.ts similarity index 100% rename from src/app/shared/footer/footer.component.ts rename to src/app/components/footer/footer.component.ts diff --git a/src/app/components/footer/footer.module.ts b/src/app/components/footer/footer.module.ts new file mode 100644 index 00000000..2f58c8db --- /dev/null +++ b/src/app/components/footer/footer.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FooterComponent } from './footer.component'; +import { MatButtonModule } from '@angular/material/button'; + +@NgModule({ + imports: [ + CommonModule, + MatButtonModule + ], + declarations: [ + FooterComponent, + ], + exports: [ + FooterComponent + ] +}) +export class FooterComponentModule { } diff --git a/src/app/home/invoice-form/invoice-form.component.css b/src/app/components/invoice-form/invoice-form.component.css similarity index 100% rename from src/app/home/invoice-form/invoice-form.component.css rename to src/app/components/invoice-form/invoice-form.component.css diff --git a/src/app/home/invoice-form/invoice-form.component.html b/src/app/components/invoice-form/invoice-form.component.html similarity index 100% rename from src/app/home/invoice-form/invoice-form.component.html rename to src/app/components/invoice-form/invoice-form.component.html diff --git a/src/app/home/invoice-form/invoice-form.component.ts b/src/app/components/invoice-form/invoice-form.component.ts similarity index 98% rename from src/app/home/invoice-form/invoice-form.component.ts rename to src/app/components/invoice-form/invoice-form.component.ts index b03dd36d..f295a0e3 100644 --- a/src/app/home/invoice-form/invoice-form.component.ts +++ b/src/app/components/invoice-form/invoice-form.component.ts @@ -5,7 +5,7 @@ import { TicketView } from '../iticket/ticket-view'; import { HttpClient } from '@angular/common/http'; import { MatDialogRef } from '@angular/material/dialog'; import { FormControl, Validators } from '@angular/forms'; -import { NewInvoice } from 'src/app/dto/new-invoice'; +import { NewInvoice } from 'src/app/data/new-invoice'; import { AngularFirestore } from '@angular/fire/firestore'; import { elementEnd } from '@angular/core/src/render3/instructions'; import { MatSnackBar } from '@angular/material/snack-bar'; diff --git a/src/app/components/invoice-form/invoice-form.module.ts b/src/app/components/invoice-form/invoice-form.module.ts new file mode 100644 index 00000000..c572dd79 --- /dev/null +++ b/src/app/components/invoice-form/invoice-form.module.ts @@ -0,0 +1,32 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { InvoiceFormComponent } from './invoice-form.component'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { HttpClientModule } from '@angular/common/http'; +import {MatInputModule} from '@angular/material/input'; +import {MatSelectModule} from '@angular/material/select'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatButtonModule } from '@angular/material/button'; + + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + HttpClientModule, + ReactiveFormsModule, + MatInputModule, + MatSelectModule, + MatDialogModule, + MatButtonModule, + MatSnackBarModule + ], + declarations: [ + InvoiceFormComponent, + ], + exports: [ + InvoiceFormComponent + ] +}) +export class InvoiceFormComponentModule { } diff --git a/src/app/home/iticket/ticket-group-view.ts b/src/app/components/iticket/ticket-group-view.ts similarity index 69% rename from src/app/home/iticket/ticket-group-view.ts rename to src/app/components/iticket/ticket-group-view.ts index a1fc3c2e..5795590d 100644 --- a/src/app/home/iticket/ticket-group-view.ts +++ b/src/app/components/iticket/ticket-group-view.ts @@ -1,4 +1,4 @@ -import { TicketGroup } from "src/app/dto/ticket-group"; +import { TicketGroup } from "src/app/data/ticket-group"; import { TicketView } from './ticket-view'; export interface TicketGroupView extends TicketGroup { diff --git a/src/app/home/iticket/ticket-view.ts b/src/app/components/iticket/ticket-view.ts similarity index 81% rename from src/app/home/iticket/ticket-view.ts rename to src/app/components/iticket/ticket-view.ts index 9d19720f..8f163fb7 100644 --- a/src/app/home/iticket/ticket-view.ts +++ b/src/app/components/iticket/ticket-view.ts @@ -1,4 +1,4 @@ -import { Ticket } from "src/app/dto/ticket-group"; +import { Ticket } from "src/app/data/ticket-group"; export interface TicketView extends Ticket { title: string; diff --git a/src/app/team/member-card/member-card.component.css b/src/app/components/member-card/member-card.component.css similarity index 100% rename from src/app/team/member-card/member-card.component.css rename to src/app/components/member-card/member-card.component.css diff --git a/src/app/team/member-card/member-card.component.html b/src/app/components/member-card/member-card.component.html similarity index 100% rename from src/app/team/member-card/member-card.component.html rename to src/app/components/member-card/member-card.component.html diff --git a/src/app/team/member-card/member-card.component.ts b/src/app/components/member-card/member-card.component.ts similarity index 95% rename from src/app/team/member-card/member-card.component.ts rename to src/app/components/member-card/member-card.component.ts index a0cae89e..540af7f2 100644 --- a/src/app/team/member-card/member-card.component.ts +++ b/src/app/components/member-card/member-card.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit, Input, ɵConsole } from '@angular/core'; import { Observable } from 'rxjs'; import { AngularFireStorage } from '@angular/fire/storage'; import { trigger, state, style, transition, animate } from '@angular/animations'; -import { Social } from 'src/app/dto/social'; -import { SocialIconsService } from 'src/app/shared/social-icons.service'; +import { Social } from 'src/app/data/social'; +import { SocialIconsService } from 'src/app/services/social-icons.service'; export enum PhotoVisibilityState { Visible = 'visible', @@ -60,6 +60,7 @@ export class MemberCardComponent implements OnInit { } ngOnInit() { + const photoUrlPromise = this.firestorage.ref(this.photoPath).getDownloadURL().toPromise(); const photoUrlCringePromise = this.firestorage.ref(this.photoPathCringe).getDownloadURL().toPromise(); Promise.all([photoUrlPromise, photoUrlCringePromise]).then(urls => { diff --git a/src/app/components/member-card/member-card.module.ts b/src/app/components/member-card/member-card.module.ts new file mode 100644 index 00000000..8b660d55 --- /dev/null +++ b/src/app/components/member-card/member-card.module.ts @@ -0,0 +1,30 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { AngularFirestoreModule } from '@angular/fire/firestore'; +import { MemberCardComponent } from './member-card.component'; +import { MatCardModule } from '@angular/material/card'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { SocialIconsService } from 'src/app/services/social-icons.service'; +import { SocialsPipe } from './socials.pipe'; + +@NgModule({ + imports: [ + CommonModule, + AngularFirestoreModule, + MatCardModule, + MatButtonModule, + MatIconModule + ], + declarations: [ + MemberCardComponent, + SocialsPipe + ], + exports: [ + MemberCardComponent + ], + providers: [ + SocialIconsService + ] +}) +export class MemberCardComponentModule { } diff --git a/src/app/team/member-card/socials.pipe.ts b/src/app/components/member-card/socials.pipe.ts similarity index 100% rename from src/app/team/member-card/socials.pipe.ts rename to src/app/components/member-card/socials.pipe.ts diff --git a/src/app/shared/navigation/navigation.component.css b/src/app/components/navigation/navigation.component.css similarity index 100% rename from src/app/shared/navigation/navigation.component.css rename to src/app/components/navigation/navigation.component.css diff --git a/src/app/shared/navigation/navigation.component.html b/src/app/components/navigation/navigation.component.html similarity index 100% rename from src/app/shared/navigation/navigation.component.html rename to src/app/components/navigation/navigation.component.html diff --git a/src/app/shared/navigation/navigation.component.ts b/src/app/components/navigation/navigation.component.ts similarity index 100% rename from src/app/shared/navigation/navigation.component.ts rename to src/app/components/navigation/navigation.component.ts diff --git a/src/app/components/navigation/navigation.module.ts b/src/app/components/navigation/navigation.module.ts new file mode 100644 index 00000000..778a0307 --- /dev/null +++ b/src/app/components/navigation/navigation.module.ts @@ -0,0 +1,28 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { NavigationComponent } from './navigation.component'; +import { MatToolbarModule } from '@angular/material/toolbar'; +import { MatButtonModule } from '@angular/material/button'; +import { MatTabsModule } from '@angular/material/tabs'; +import { NeonLogoComponentModule } from '../neon-logo/neon-logo.module'; +import { MatIconModule } from '@angular/material/icon'; +import { RouterModule } from '@angular/router'; + +@NgModule({ + imports: [ + CommonModule, + RouterModule, + MatToolbarModule, + MatButtonModule, + MatTabsModule, + MatIconModule, + NeonLogoComponentModule + ], + declarations: [ + NavigationComponent, + ], + exports: [ + NavigationComponent + ] +}) +export class NavigationComponentModule { } diff --git a/src/app/shared/neon-date/neon-date.component.css b/src/app/components/neon-date/neon-date.component.css similarity index 100% rename from src/app/shared/neon-date/neon-date.component.css rename to src/app/components/neon-date/neon-date.component.css diff --git a/src/app/shared/neon-date/neon-date.component.html b/src/app/components/neon-date/neon-date.component.html similarity index 100% rename from src/app/shared/neon-date/neon-date.component.html rename to src/app/components/neon-date/neon-date.component.html diff --git a/src/app/shared/neon-date/neon-date.component.ts b/src/app/components/neon-date/neon-date.component.ts similarity index 100% rename from src/app/shared/neon-date/neon-date.component.ts rename to src/app/components/neon-date/neon-date.component.ts diff --git a/src/app/components/neon-date/neon-date.module.ts b/src/app/components/neon-date/neon-date.module.ts new file mode 100644 index 00000000..7d1f93f4 --- /dev/null +++ b/src/app/components/neon-date/neon-date.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { NeonDateComponent } from './neon-date.component'; + +@NgModule({ + imports: [ + CommonModule, + ], + declarations: [ + NeonDateComponent, + ], + exports: [ + NeonDateComponent + ] +}) +export class NeonDateComponentModule { } diff --git a/src/app/shared/neon-logo/neon-logo.component.css b/src/app/components/neon-logo/neon-logo.component.css similarity index 100% rename from src/app/shared/neon-logo/neon-logo.component.css rename to src/app/components/neon-logo/neon-logo.component.css diff --git a/src/app/shared/neon-logo/neon-logo.component.html b/src/app/components/neon-logo/neon-logo.component.html similarity index 100% rename from src/app/shared/neon-logo/neon-logo.component.html rename to src/app/components/neon-logo/neon-logo.component.html diff --git a/src/app/shared/neon-logo/neon-logo.component.ts b/src/app/components/neon-logo/neon-logo.component.ts similarity index 100% rename from src/app/shared/neon-logo/neon-logo.component.ts rename to src/app/components/neon-logo/neon-logo.component.ts diff --git a/src/app/components/neon-logo/neon-logo.module.ts b/src/app/components/neon-logo/neon-logo.module.ts new file mode 100644 index 00000000..f3a1cc6a --- /dev/null +++ b/src/app/components/neon-logo/neon-logo.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { NeonLogoComponent } from './neon-logo.component'; + +@NgModule({ + imports: [ + CommonModule, + ], + declarations: [ + NeonLogoComponent, + ], + exports: [ + NeonLogoComponent + ] +}) +export class NeonLogoComponentModule { } diff --git a/src/app/shared/partner-logo/partner-logo.component.css b/src/app/components/partner-logo/partner-logo.component.css similarity index 100% rename from src/app/shared/partner-logo/partner-logo.component.css rename to src/app/components/partner-logo/partner-logo.component.css diff --git a/src/app/shared/partner-logo/partner-logo.component.html b/src/app/components/partner-logo/partner-logo.component.html similarity index 100% rename from src/app/shared/partner-logo/partner-logo.component.html rename to src/app/components/partner-logo/partner-logo.component.html diff --git a/src/app/shared/partner-logo/partner-logo.component.ts b/src/app/components/partner-logo/partner-logo.component.ts similarity index 100% rename from src/app/shared/partner-logo/partner-logo.component.ts rename to src/app/components/partner-logo/partner-logo.component.ts diff --git a/src/app/components/partner-logo/partner-logo.module.ts b/src/app/components/partner-logo/partner-logo.module.ts new file mode 100644 index 00000000..a5403bc4 --- /dev/null +++ b/src/app/components/partner-logo/partner-logo.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { PartnerLogoComponent } from './partner-logo.component'; + +@NgModule({ + imports: [ + CommonModule, + ], + declarations: [ + PartnerLogoComponent, + ], + exports: [ + PartnerLogoComponent + ] +}) +export class PartnerLogoComponentModule { } diff --git a/src/app/shared/partner-panel/partner-panel.component.css b/src/app/components/partner-panel/partner-panel.component.css similarity index 100% rename from src/app/shared/partner-panel/partner-panel.component.css rename to src/app/components/partner-panel/partner-panel.component.css diff --git a/src/app/shared/partner-panel/partner-panel.component.html b/src/app/components/partner-panel/partner-panel.component.html similarity index 100% rename from src/app/shared/partner-panel/partner-panel.component.html rename to src/app/components/partner-panel/partner-panel.component.html diff --git a/src/app/shared/partner-panel/partner-panel.component.ts b/src/app/components/partner-panel/partner-panel.component.ts similarity index 94% rename from src/app/shared/partner-panel/partner-panel.component.ts rename to src/app/components/partner-panel/partner-panel.component.ts index cc4f9b46..b05f2541 100644 --- a/src/app/shared/partner-panel/partner-panel.component.ts +++ b/src/app/components/partner-panel/partner-panel.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input } from '@angular/core'; -import { Company } from 'src/app/dto/partner'; +import { Company } from 'src/app/data/partner'; import { trigger, transition, style, animate } from '@angular/animations'; @Component({ diff --git a/src/app/components/partner-panel/partner-panel.module.ts b/src/app/components/partner-panel/partner-panel.module.ts new file mode 100644 index 00000000..09b0f369 --- /dev/null +++ b/src/app/components/partner-panel/partner-panel.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { PartnerLogoComponentModule } from '../partner-logo/partner-logo.module'; +import { PartnerPanelComponent } from './partner-panel.component'; + +@NgModule({ + imports: [ + CommonModule, + PartnerLogoComponentModule + ], + declarations: [ + PartnerPanelComponent, + ], + exports: [ + PartnerPanelComponent + ] +}) +export class PartnerPanelComponentModule { } diff --git a/src/app/home/photo-section/photo-section.component.css b/src/app/components/photo-section/photo-section.component.css similarity index 100% rename from src/app/home/photo-section/photo-section.component.css rename to src/app/components/photo-section/photo-section.component.css diff --git a/src/app/home/photo-section/photo-section.component.html b/src/app/components/photo-section/photo-section.component.html similarity index 100% rename from src/app/home/photo-section/photo-section.component.html rename to src/app/components/photo-section/photo-section.component.html diff --git a/src/app/home/photo-section/photo-section.component.ts b/src/app/components/photo-section/photo-section.component.ts similarity index 100% rename from src/app/home/photo-section/photo-section.component.ts rename to src/app/components/photo-section/photo-section.component.ts diff --git a/src/app/components/photo-section/photo-section.module.ts b/src/app/components/photo-section/photo-section.module.ts new file mode 100644 index 00000000..96134724 --- /dev/null +++ b/src/app/components/photo-section/photo-section.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { PhotoSectionComponent } from './photo-section.component'; +import {SlideshowModule} from 'ng-simple-slideshow'; + +@NgModule({ + imports: [ + CommonModule, + SlideshowModule + ], + declarations: [ + PhotoSectionComponent, + ], + exports: [ + PhotoSectionComponent + ] +}) +export class PhotoSectionComponentModule { } diff --git a/src/app/home/ticket-additional-info/ticket-additional-info.component.css b/src/app/components/ticket-additional-info/ticket-additional-info.component.css similarity index 100% rename from src/app/home/ticket-additional-info/ticket-additional-info.component.css rename to src/app/components/ticket-additional-info/ticket-additional-info.component.css diff --git a/src/app/home/ticket-additional-info/ticket-additional-info.component.html b/src/app/components/ticket-additional-info/ticket-additional-info.component.html similarity index 100% rename from src/app/home/ticket-additional-info/ticket-additional-info.component.html rename to src/app/components/ticket-additional-info/ticket-additional-info.component.html diff --git a/src/app/home/ticket-additional-info/ticket-additional-info.component.ts b/src/app/components/ticket-additional-info/ticket-additional-info.component.ts similarity index 100% rename from src/app/home/ticket-additional-info/ticket-additional-info.component.ts rename to src/app/components/ticket-additional-info/ticket-additional-info.component.ts diff --git a/src/app/components/ticket-additional-info/tickets-additional-info.module.ts b/src/app/components/ticket-additional-info/tickets-additional-info.module.ts new file mode 100644 index 00000000..06359da3 --- /dev/null +++ b/src/app/components/ticket-additional-info/tickets-additional-info.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { TicketAdditionalInfoComponent } from './ticket-additional-info.component'; +import { MatDialogModule } from '@angular/material/dialog'; + +@NgModule({ + imports: [ + CommonModule, + MatDialogModule + ], + declarations: [ + TicketAdditionalInfoComponent, + ], + exports: [ + TicketAdditionalInfoComponent + ] +}) +export class TicketAdditionalInfoComponentModule { } diff --git a/src/app/home/tickets/tickets.component.html b/src/app/components/tickets/tickets.component.html similarity index 100% rename from src/app/home/tickets/tickets.component.html rename to src/app/components/tickets/tickets.component.html diff --git a/src/app/home/tickets/tickets.component.scss b/src/app/components/tickets/tickets.component.scss similarity index 100% rename from src/app/home/tickets/tickets.component.scss rename to src/app/components/tickets/tickets.component.scss diff --git a/src/app/home/tickets/tickets.component.ts b/src/app/components/tickets/tickets.component.ts similarity index 97% rename from src/app/home/tickets/tickets.component.ts rename to src/app/components/tickets/tickets.component.ts index dfdd03b1..b9ee94cd 100644 --- a/src/app/home/tickets/tickets.component.ts +++ b/src/app/components/tickets/tickets.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { AngularFireFunctions } from '@angular/fire/functions'; import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore'; -import { TicketGroup } from 'src/app/dto/ticket-group'; +import { TicketGroup } from 'src/app/data/ticket-group'; import { trigger, transition, style, animate } from '@angular/animations'; import { InvoiceFormComponent } from '../invoice-form/invoice-form.component'; import { MatDialog } from '@angular/material/dialog'; diff --git a/src/app/components/tickets/tickets.module.ts b/src/app/components/tickets/tickets.module.ts new file mode 100644 index 00000000..2bd8c8e1 --- /dev/null +++ b/src/app/components/tickets/tickets.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { TicketsComponent } from './tickets.component'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatButtonModule } from '@angular/material/button'; +import { MatDialogModule } from '@angular/material/dialog'; + +@NgModule({ + imports: [ + CommonModule, + MatProgressSpinnerModule, + MatButtonModule, + MatDialogModule + ], + declarations: [ + TicketsComponent, + ], + exports: [ + TicketsComponent + ] +}) +export class TicketsComponentModule { } diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts deleted file mode 100644 index eb912ef0..00000000 --- a/src/app/core/core.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { AngularFireModule } from '@angular/fire'; -import { environment } from '../../environments/environment'; -import { AngularFirestoreModule } from '@angular/fire/firestore'; -import { AngularFireStorageModule } from '@angular/fire/storage'; -import { AngularFireFunctionsModule } from '@angular/fire/functions'; - -@NgModule({ - imports: [ - CommonModule, - AngularFireModule.initializeApp(environment.firebase), - AngularFirestoreModule.enablePersistence({experimentalTabSynchronization: true}), - AngularFireStorageModule, - AngularFireFunctionsModule - ], - declarations: [] -}) -export class CoreModule { } diff --git a/src/app/dto/new-invoice.ts b/src/app/data/new-invoice.ts similarity index 100% rename from src/app/dto/new-invoice.ts rename to src/app/data/new-invoice.ts diff --git a/src/app/dto/partner.ts b/src/app/data/partner.ts similarity index 100% rename from src/app/dto/partner.ts rename to src/app/data/partner.ts diff --git a/src/app/dto/social.ts b/src/app/data/social.ts similarity index 100% rename from src/app/dto/social.ts rename to src/app/data/social.ts diff --git a/src/app/dto/team-member.ts b/src/app/data/team-member.ts similarity index 100% rename from src/app/dto/team-member.ts rename to src/app/data/team-member.ts diff --git a/src/app/dto/ticket-group.ts b/src/app/data/ticket-group.ts similarity index 100% rename from src/app/dto/ticket-group.ts rename to src/app/data/ticket-group.ts diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts deleted file mode 100644 index da291b66..00000000 --- a/src/app/home/home.module.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { HomeComponent } from './home.component'; -import { HomeRoutingModule } from './home-routing.module'; -import { SharedModule } from '../shared/shared.module'; - -import { MatButtonModule } from '@angular/material/button'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { TicketsComponent } from './tickets/tickets.component'; -import { AngularFireFunctionsModule } from '@angular/fire/functions'; -import { AngularFirestoreModule } from '@angular/fire/firestore'; -import { MatDialogModule } from '@angular/material/dialog'; -import { InvoiceFormComponent } from './invoice-form/invoice-form.component'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MatOptionModule } from '@angular/material/core'; -import { MatSelectModule } from '@angular/material/select'; -import { MatInputModule } from '@angular/material/input'; -import { TicketAdditionalInfoComponent } from './ticket-additional-info/ticket-additional-info.component'; -import { MatSnackBarModule } from '@angular/material/snack-bar'; -import { PhotoSectionComponent } from './photo-section/photo-section.component'; -import {SlideshowModule} from 'ng-simple-slideshow'; -import { SocialIconsService } from '../shared/social-icons.service'; -import { MatIconModule } from '@angular/material/icon'; - -@NgModule({ - imports: [ - FormsModule, - ReactiveFormsModule, - CommonModule, - HomeRoutingModule, - SharedModule, - MatButtonModule, - MatProgressSpinnerModule, - AngularFireFunctionsModule, - AngularFirestoreModule, - MatDialogModule, - MatFormFieldModule, - MatOptionModule, - MatSelectModule, - MatInputModule, - MatSnackBarModule, - SlideshowModule, - MatIconModule - ], - declarations: [ - HomeComponent, - TicketsComponent, - InvoiceFormComponent, - TicketAdditionalInfoComponent, - PhotoSectionComponent - ], - entryComponents: [ - InvoiceFormComponent, - TicketAdditionalInfoComponent - ], - providers: [ - SocialIconsService - ] -}) -export class HomeModule { } diff --git a/src/app/home/home-routing.module.ts b/src/app/pages/home/home-routing.module.ts similarity index 100% rename from src/app/home/home-routing.module.ts rename to src/app/pages/home/home-routing.module.ts diff --git a/src/app/home/home.component.css b/src/app/pages/home/home.component.css similarity index 100% rename from src/app/home/home.component.css rename to src/app/pages/home/home.component.css diff --git a/src/app/home/home.component.html b/src/app/pages/home/home.component.html similarity index 100% rename from src/app/home/home.component.html rename to src/app/pages/home/home.component.html diff --git a/src/app/home/home.component.ts b/src/app/pages/home/home.component.ts similarity index 87% rename from src/app/home/home.component.ts rename to src/app/pages/home/home.component.ts index c8c18d6a..e9483e9e 100644 --- a/src/app/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore'; -import { Partner } from '../dto/partner'; import { Observable } from 'rxjs'; import { environment } from 'src/environments/environment'; -import { SocialIconsService } from '../shared/social-icons.service'; +import { SocialIconsService } from 'src/app/services/social-icons.service'; +import { Partner } from 'src/app/data/partner'; @Component({ selector: 'app-home', diff --git a/src/app/pages/home/home.module.ts b/src/app/pages/home/home.module.ts new file mode 100644 index 00000000..cb8ddedd --- /dev/null +++ b/src/app/pages/home/home.module.ts @@ -0,0 +1,40 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { HomeRoutingModule } from './home-routing.module'; +import { InvoiceFormComponentModule } from 'src/app/components/invoice-form/invoice-form.module'; +import { TicketAdditionalInfoComponentModule } from 'src/app/components/ticket-additional-info/tickets-additional-info.module'; +import { InvoiceFormComponent } from 'src/app/components/invoice-form/invoice-form.component'; +import { TicketAdditionalInfoComponent } from 'src/app/components/ticket-additional-info/ticket-additional-info.component'; +import { HomeComponent } from './home.component'; +import { NeonDateComponentModule } from 'src/app/components/neon-date/neon-date.module'; +import { NeonLogoComponentModule } from 'src/app/components/neon-logo/neon-logo.module'; +import { MatIconModule } from '@angular/material/icon'; +import { TicketsComponentModule } from 'src/app/components/tickets/tickets.module'; +import { PartnerPanelComponentModule } from 'src/app/components/partner-panel/partner-panel.module'; +import { PhotoSectionComponentModule } from 'src/app/components/photo-section/photo-section.module'; +import { MatButtonModule } from '@angular/material/button'; + +@NgModule({ + imports: [ + CommonModule, + HomeRoutingModule, + InvoiceFormComponentModule, + TicketAdditionalInfoComponentModule, + NeonDateComponentModule, + NeonLogoComponentModule, + MatIconModule, + TicketsComponentModule, + PartnerPanelComponentModule, + PhotoSectionComponentModule, + InvoiceFormComponentModule, + MatButtonModule + ], + declarations: [ + HomeComponent + ], + entryComponents: [ + InvoiceFormComponent, + TicketAdditionalInfoComponent + ] +}) +export class HomeModule { } diff --git a/src/app/partners/partners-routing.module.ts b/src/app/pages/partners/partners-routing.module.ts similarity index 100% rename from src/app/partners/partners-routing.module.ts rename to src/app/pages/partners/partners-routing.module.ts diff --git a/src/app/partners/partners.component.css b/src/app/pages/partners/partners.component.css similarity index 100% rename from src/app/partners/partners.component.css rename to src/app/pages/partners/partners.component.css diff --git a/src/app/partners/partners.component.html b/src/app/pages/partners/partners.component.html similarity index 100% rename from src/app/partners/partners.component.html rename to src/app/pages/partners/partners.component.html diff --git a/src/app/partners/partners.component.ts b/src/app/pages/partners/partners.component.ts similarity index 94% rename from src/app/partners/partners.component.ts rename to src/app/pages/partners/partners.component.ts index 5a2ac642..854a9e10 100644 --- a/src/app/partners/partners.component.ts +++ b/src/app/pages/partners/partners.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore'; import { Observable } from 'rxjs'; -import { Partner } from '../dto/partner'; +import { Partner } from '../../data/partner'; @Component({ selector: 'app-partners', diff --git a/src/app/partners/partners.module.ts b/src/app/pages/partners/partners.module.ts similarity index 73% rename from src/app/partners/partners.module.ts rename to src/app/pages/partners/partners.module.ts index 1ee64e9d..05f1d67d 100644 --- a/src/app/partners/partners.module.ts +++ b/src/app/pages/partners/partners.module.ts @@ -1,9 +1,9 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { PartnersRoutingModule } from './partners-routing.module'; -import { SharedModule } from '../shared/shared.module'; import { PartnersComponent } from './partners.component'; import { AngularFirestoreModule } from '@angular/fire/firestore'; +import { PartnerPanelComponentModule } from 'src/app/components/partner-panel/partner-panel.module'; @NgModule({ declarations: [ @@ -12,8 +12,8 @@ import { AngularFirestoreModule } from '@angular/fire/firestore'; imports: [ PartnersRoutingModule, CommonModule, - SharedModule, - AngularFirestoreModule + AngularFirestoreModule, + PartnerPanelComponentModule ] }) export class PartnersModule { } diff --git a/src/app/team/team-routing.module.ts b/src/app/pages/team/team-routing.module.ts similarity index 100% rename from src/app/team/team-routing.module.ts rename to src/app/pages/team/team-routing.module.ts diff --git a/src/app/team/team.component.css b/src/app/pages/team/team.component.css similarity index 100% rename from src/app/team/team.component.css rename to src/app/pages/team/team.component.css diff --git a/src/app/team/team.component.html b/src/app/pages/team/team.component.html similarity index 100% rename from src/app/team/team.component.html rename to src/app/pages/team/team.component.html diff --git a/src/app/team/team.component.ts b/src/app/pages/team/team.component.ts similarity index 94% rename from src/app/team/team.component.ts rename to src/app/pages/team/team.component.ts index 6eee08fb..47b27c4f 100644 --- a/src/app/team/team.component.ts +++ b/src/app/pages/team/team.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore'; -import { TeamMember } from '../dto/team-member'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { TeamMember } from 'src/app/data/team-member'; interface TeamMemberId extends TeamMember { id: string;} diff --git a/src/app/pages/team/team.module.ts b/src/app/pages/team/team.module.ts new file mode 100644 index 00000000..26c05e69 --- /dev/null +++ b/src/app/pages/team/team.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { TeamComponent } from './team.component'; +import { TeamRoutingModule } from './team-routing.module'; +import { MemberCardComponentModule } from 'src/app/components/member-card/member-card.module'; + +@NgModule({ + imports: [ + CommonModule, + TeamRoutingModule, + MemberCardComponentModule, + ], + declarations: [ + TeamComponent + ] +}) +export class TeamModule { } diff --git a/src/app/shared/social-icons.service.ts b/src/app/services/social-icons.service.ts similarity index 99% rename from src/app/shared/social-icons.service.ts rename to src/app/services/social-icons.service.ts index 3cbb2fad..276f2da4 100644 --- a/src/app/shared/social-icons.service.ts +++ b/src/app/services/social-icons.service.ts @@ -41,4 +41,4 @@ export class SocialIconsService { sanitizer.bypassSecurityTrustResourceUrl('assets/icons/reddit.svg') ); } -} +} \ No newline at end of file diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts deleted file mode 100644 index feeae542..00000000 --- a/src/app/shared/shared.module.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { NeonLogoComponent } from './neon-logo/neon-logo.component'; -import { NeonDateComponent } from './neon-date/neon-date.component'; -import { FooterComponent } from './footer/footer.component'; -import { MatIconModule } from '@angular/material/icon'; -import { MatButtonModule } from '@angular/material/button'; -import { NavigationComponent } from './navigation/navigation.component'; -import { MatToolbarModule } from '@angular/material/toolbar'; -import { RouterModule } from '@angular/router'; -import { PartnerPanelComponent } from './partner-panel/partner-panel.component'; -import { AngularFireStorageModule } from '@angular/fire/storage'; -import { AngularFirestoreModule } from '@angular/fire/firestore'; -import { PartnerLogoComponent } from './partner-logo/partner-logo.component'; -import { MatTabsModule } from '@angular/material/tabs'; -import { ContributePanelComponent } from './contribute-panel/contribute-panel.component'; -import { SocialIconsService } from './social-icons.service'; - -@NgModule({ - imports: [ - CommonModule, - MatIconModule, - MatButtonModule, - MatToolbarModule, - RouterModule, - AngularFireStorageModule, - AngularFirestoreModule, - MatTabsModule - ], - declarations: [ - NeonLogoComponent, - NeonDateComponent, - FooterComponent, - NavigationComponent, - PartnerPanelComponent, - PartnerLogoComponent, - ContributePanelComponent, - ], - exports: [ - NeonLogoComponent, - NeonDateComponent, - FooterComponent, - NavigationComponent, - PartnerPanelComponent, - ContributePanelComponent - ], - providers: [ - SocialIconsService - ] -}) -export class SharedModule { } diff --git a/src/app/team/team.module.ts b/src/app/team/team.module.ts deleted file mode 100644 index 567f9cd8..00000000 --- a/src/app/team/team.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { TeamComponent } from './team.component'; -import { TeamRoutingModule } from './team-routing.module'; -import { MemberCardComponent } from './member-card/member-card.component'; -import { SharedModule } from '../shared/shared.module'; -import { MatCardModule } from '@angular/material/card'; -import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; -import { SocialIconsService } from '../shared/social-icons.service'; -import { SocialsPipe } from './member-card/socials.pipe'; - -@NgModule({ - imports: [ - CommonModule, - TeamRoutingModule, - SharedModule, - MatCardModule, - MatButtonModule, - MatIconModule - ], - declarations: [TeamComponent, MemberCardComponent, SocialsPipe], - providers: [ - SocialIconsService - ] -}) -export class TeamModule { } diff --git a/src/assets/projector.png b/src/assets/projector.png index dd2dc0a9efa5b5ce77986e7da100b8c629c1121e..db4d64e8d56645608d2159dcbfabc795fbc8439e 100644 GIT binary patch literal 20553 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 literal 98030 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�(LRd8*tKYEQ=ft$;7*6Xneje3#Ak1o*6 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

obOt`F|#Jq?xnZZHxVUWLbgw~2Za0L3Vi z$y&+P^n;<>Wsr{$4N8PjX~&qIi$h7N9%}+&*-0P~EP}2@)<}GFVTT|AZV-Dim<)DN zN&mk(36Y5t0OGi_6kgtNgQUyzG^}<&;X{3wbL(5!|3O&p;=$9biTQEP}AhLE`{OCOyv;g2odE|kH-L@;yqvmVn z&+q}i{t+acFhtbP$>An(XX-~dGT8s8@*l0dZioQmTyD{ABHXem-Rh2TNaFf@pAioW ziIB0qb?fE@@~NO9v1MlEeMojQEUa-W3`K|WH!H>wQ6o5a^m%*a$wy}d=2bjXHgc0R zugpXrtW3S!{tsHnl3{c>Zp$;4NFR|Q+DZ?0$gD{eQ!QDQgWVsyHOfwZ&uU`KT}Q7b zKG?0?dX}nmTp|PS~2 zx?KEabxS|p>&-(4I9fX+o3N>?`Sf^-3{rp^fxNUEdXPcH=h>CO zPxgd9WDSR;b38k+P0fiw>{=3gNapyZv4-0-t)Cz5nQ^iDZ?+W*gdHj3vF6HkI5?O; z!Iijwd+GQGe$ard+OnB}iT^=%l%`xbzp+is(s9e(BX@K0rYzN1`J#3y(ZYW|N`(t0 z&KUNsC-&thj&A_&1Vr6`)Ww#y;Vy^;|DvqLJ6T5Mvo<8?|v(L{TKk2hD>_T-CaQ~H{ z7*@8zZ(F$m(E-_#A)1MGTYji;l(~~r1pL002T-))x4-8B82WXwA}Aby{ocfNsx!%m z4|erIJ~EUFcDPN-+2FeYIfaD!t<3dqjexx(7%wTAqEC7tL3WA1(Z`*0iI4|lqG(6p z*m(GzB%=6|m&f;*UU*C~!ni3SNoW?*&R%Y4rZ9gI`WgsBD=jQcSLpGaJ_-mb;Y^4H zXWTUz#bkHCs9rnDCFR1-F&XSFPYWdEC@{^APhtU;Uc;!C??yUKy<4InwS{EQh#%#V zfQ4z$PmX^lXR%lI?X+=I6Y51iNZu8~o|IWn;%*f5Mmm9&=iAs@5X zB&4X$_9vq9FjCq6p(!T(zqZ0flrT;TU#&(wu^v^fK*E~UTJ1LjSb9}nKsVY2E0l)| zGy*b0ePTQatcli`51_Ls^MGChlW{lveZr#9L})HoalaDGi@K!nsQ?q{xAvxvX*C<~ z);{>bg=Bq{xsy$UCtk@qCvy+@0VxALL97iGw4{~6H;pEZ`<7E(S$Djb_PQdlNmGeE zpfF)aPu+CFxsG|2F37?=rW}5deGp6>h18_<`T2>Dasx5s;rzKQ`Q%~lrN*X-G#;sJ z^;Ry;2hK||{1XcA0T9R0of7Z_zYmxcQg-Cq=sz&XmVjcW#jW11m$`mAzZFhEMB6hN z{1n&@Lw%3^DyH(>Z6)Xw0vtIoAe-Y0%e diff --git a/src/main.ts b/src/main.ts index 28bfa9e1..c7b673cf 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,4 +10,3 @@ if (environment.production) { platformBrowserDynamic().bootstrapModule(AppModule) .catch(err => console.error(err)); - diff --git a/src/polyfills.ts b/src/polyfills.ts index d310405a..75d63939 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -11,70 +11,53 @@ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera), * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile. * - * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html + * Learn more in https://angular.io/guide/browser-support */ /*************************************************************************************************** * BROWSER POLYFILLS */ -/** IE9, IE10 and IE11 requires all of the following polyfills. **/ -// import 'core-js/es6/symbol'; -// import 'core-js/es6/object'; -// import 'core-js/es6/function'; -// import 'core-js/es6/parse-int'; -// import 'core-js/es6/parse-float'; -// import 'core-js/es6/number'; -// import 'core-js/es6/math'; -// import 'core-js/es6/string'; -// import 'core-js/es6/date'; -// import 'core-js/es6/array'; -// import 'core-js/es6/regexp'; -// import 'core-js/es6/map'; -// import 'core-js/es6/weak-map'; -// import 'core-js/es6/set'; - /** IE10 and IE11 requires the following for NgClass support on SVG elements */ // import 'classlist.js'; // Run `npm install --save classlist.js`. -/** IE10 and IE11 requires the following for the Reflect API. */ -// import 'core-js/es6/reflect'; - - -/** Evergreen browsers require these. **/ -// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove. -import 'core-js/es7/reflect'; - - /** * Web Animations `@angular/platform-browser/animations` * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari. * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0). - **/ + */ // import 'web-animations-js'; // Run `npm install --save web-animations-js`. /** * By default, zone.js will patch all possible macroTask and DomEvents * user can disable parts of macroTask/DomEvents patch by setting following flags + * because those flags need to be set before `zone.js` being loaded, and webpack + * will put import in the top of bundle, so user need to create a separate file + * in this directory (for example: zone-flags.ts), and put the following flags + * into that file, and then add the following code before importing zone.js. + * import './zone-flags.ts'; + * + * The flags allowed in zone-flags.ts are listed here. + * + * The following flags will work for all browsers. + * + * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame + * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick + * (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames + * + * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js + * with the following flag, it will bypass `zone.js` patch for IE/Edge + * + * (window as any).__Zone_enable_cross_context_check = true; + * */ - // (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame - // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick - // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames - - /* - * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js - * with the following flag, it will bypass `zone.js` patch for IE/Edge - */ -// (window as any).__Zone_enable_cross_context_check = true; - /*************************************************************************************************** * Zone JS is required by default for Angular itself. */ import 'zone.js/dist/zone'; // Included with Angular CLI. - /*************************************************************************************************** * APPLICATION IMPORTS */ diff --git a/src/tslint.json b/src/tslint.json index 52e2c1a5..aa7c3eeb 100644 --- a/src/tslint.json +++ b/src/tslint.json @@ -1,17 +1,17 @@ { - "extends": "../tslint.json", - "rules": { - "directive-selector": [ - true, - "attribute", - "app", - "camelCase" - ], - "component-selector": [ - true, - "element", - "app", - "kebab-case" - ] - } + "extends": "../tslint.json", + "rules": { + "directive-selector": [ + true, + "attribute", + "app", + "camelCase" + ], + "component-selector": [ + true, + "element", + "app", + "kebab-case" + ] + } } diff --git a/tslint.json b/tslint.json index 6ddb6b29..868ecba0 100644 --- a/tslint.json +++ b/tslint.json @@ -1,32 +1,20 @@ { + "extends": "tslint:recommended", "rulesDirectory": [ - "node_modules/codelyzer" + "codelyzer" ], "rules": { - "arrow-return-shorthand": true, - "callable-types": true, - "class-name": true, - "comment-format": [ - true, - "check-space" - ], - "curly": true, + "array-type": false, + "arrow-parens": false, "deprecation": { "severity": "warn" }, - "eofline": true, - "forin": true, "import-blacklist": [ true, "rxjs/Rx" ], - "import-spacing": true, - "indent": [ - true, - "spaces" - ], - "interface-over-type-literal": true, - "label-position": true, + "interface-name": false, + "max-classes-per-file": false, "max-line-length": [ true, 140 @@ -43,8 +31,7 @@ ] } ], - "no-arg": true, - "no-bitwise": true, + "no-consecutive-blank-lines": false, "no-console": [ true, "debug", @@ -53,70 +40,27 @@ "timeEnd", "trace" ], - "no-construct": true, - "no-debugger": true, - "no-duplicate-super": true, "no-empty": false, - "no-empty-interface": true, - "no-eval": true, "no-inferrable-types": [ true, "ignore-params" ], - "no-misused-new": true, "no-non-null-assertion": true, "no-redundant-jsdoc": true, - "no-shadowed-variable": true, - "no-string-literal": false, - "no-string-throw": true, "no-switch-case-fall-through": true, - "no-trailing-whitespace": true, - "no-unnecessary-initializer": true, - "no-unused-expression": true, "no-use-before-declare": true, - "no-var-keyword": true, - "object-literal-sort-keys": false, - "one-line": [ + "no-var-requires": false, + "object-literal-key-quotes": [ true, - "check-open-brace", - "check-catch", - "check-else", - "check-whitespace" + "as-needed" ], - "prefer-const": true, + "object-literal-sort-keys": false, + "ordered-imports": false, "quotemark": [ true, "single" ], - "radix": true, - "semicolon": [ - true, - "always" - ], - "triple-equals": [ - true, - "allow-null-check" - ], - "typedef-whitespace": [ - true, - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - } - ], - "unified-signatures": true, - "variable-name": false, - "whitespace": [ - true, - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type" - ], + "trailing-comma": false, "no-output-on-prefix": true, "use-input-property-decorator": true, "use-output-property-decorator": true,