diff --git a/README.md b/README.md index 449738f56..8ac58478a 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # NgxOpenmrsPoc -This is the point of care system used by Ampath Clinics. It should be compatible with most openmrs versions but it is tested against platform 2.0.2 with the rest module. It also requires https://github.com/AMPATH/etl-rest-server for all features to work properly. +This is the point of care system used by Ampath Clinics. It should be compatible with most openmrs versions but it is tested against platform 2.0.2 with the REST module. It also requires https://github.com/AMPATH/etl-rest-server for all features to work properly. ## Development server -Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files. +Run `ng serve` for a dev server. Navigate to `http://localhost:3000/`. The app will automatically reload if you change any of the source files. ## Code scaffolding diff --git a/package-lock.json b/package-lock.json index 9af606af7..3cc14a13f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dev": true, "requires": { "@angular-devkit/core": "0.6.8", - "rxjs": "6.2.1" + "rxjs": "^6.0.0" } }, "@angular-devkit/build-angular": { @@ -25,48 +25,48 @@ "@angular-devkit/build-webpack": "0.7.2", "@angular-devkit/core": "0.7.2", "@ngtools/webpack": "6.1.2", - "ajv": "6.4.0", - "autoprefixer": "8.6.5", - "circular-dependency-plugin": "5.0.2", - "clean-css": "4.2.1", - "copy-webpack-plugin": "4.5.2", - "file-loader": "1.1.11", - "glob": "7.1.2", - "html-webpack-plugin": "3.2.0", - "istanbul": "0.4.5", - "istanbul-instrumenter-loader": "3.0.1", - "karma-source-map-support": "1.3.0", - "less": "3.8.1", - "less-loader": "4.1.0", - "license-webpack-plugin": "1.4.0", - "mini-css-extract-plugin": "0.4.1", - "minimatch": "3.0.4", - "node-sass": "4.9.3", - "opn": "5.3.0", - "parse5": "4.0.0", - "portfinder": "1.0.16", - "postcss": "6.0.23", - "postcss-import": "11.1.0", - "postcss-loader": "2.1.6", - "postcss-url": "7.3.2", - "raw-loader": "0.5.1", - "rxjs": "6.2.1", - "sass-loader": "6.0.7", - "source-map-loader": "0.2.3", - "source-map-support": "0.5.9", - "stats-webpack-plugin": "0.6.2", - "style-loader": "0.21.0", - "stylus": "0.54.5", - "stylus-loader": "3.0.2", - "tree-kill": "1.2.0", - "uglifyjs-webpack-plugin": "1.2.7", - "url-loader": "1.0.1", - "webpack": "4.9.2", - "webpack-dev-middleware": "3.1.3", - "webpack-dev-server": "3.1.5", - "webpack-merge": "4.1.4", - "webpack-sources": "1.1.0", - "webpack-subresource-integrity": "1.1.0-rc.4" + "ajv": "~6.4.0", + "autoprefixer": "^8.4.1", + "circular-dependency-plugin": "^5.0.2", + "clean-css": "^4.1.11", + "copy-webpack-plugin": "^4.5.2", + "file-loader": "^1.1.11", + "glob": "^7.0.3", + "html-webpack-plugin": "^3.0.6", + "istanbul": "^0.4.5", + "istanbul-instrumenter-loader": "^3.0.1", + "karma-source-map-support": "^1.2.0", + "less": "^3.0.4", + "less-loader": "^4.1.0", + "license-webpack-plugin": "^1.3.1", + "mini-css-extract-plugin": "~0.4.0", + "minimatch": "^3.0.4", + "node-sass": "^4.9.1", + "opn": "^5.1.0", + "parse5": "^4.0.0", + "portfinder": "^1.0.13", + "postcss": "^6.0.22", + "postcss-import": "^11.1.0", + "postcss-loader": "^2.1.5", + "postcss-url": "^7.3.2", + "raw-loader": "^0.5.1", + "rxjs": "^6.0.0", + "sass-loader": "~6.0.7", + "source-map-loader": "^0.2.3", + "source-map-support": "^0.5.0", + "stats-webpack-plugin": "^0.6.2", + "style-loader": "^0.21.0", + "stylus": "^0.54.5", + "stylus-loader": "^3.0.2", + "tree-kill": "^1.2.0", + "uglifyjs-webpack-plugin": "^1.2.5", + "url-loader": "^1.0.1", + "webpack": "~4.9.2", + "webpack-dev-middleware": "^3.1.3", + "webpack-dev-server": "^3.1.4", + "webpack-merge": "^4.1.2", + "webpack-sources": "^1.1.0", + "webpack-subresource-integrity": "^1.1.0-rc.4" }, "dependencies": { "@angular-devkit/architect": { @@ -76,7 +76,7 @@ "dev": true, "requires": { "@angular-devkit/core": "0.7.2", - "rxjs": "6.2.1" + "rxjs": "^6.0.0" } }, "@angular-devkit/core": { @@ -85,10 +85,10 @@ "integrity": "sha512-1Es9oNpabOukutBe+0txXUHyhI6ypuc7WrxTutZH7Lr3n3+CTG6oEv42rOcot1aXi1n97wNqcdY3lrENFu9vhQ==", "dev": true, "requires": { - "ajv": "6.4.0", - "chokidar": "2.0.4", - "rxjs": "6.2.1", - "source-map": "0.5.7" + "ajv": "~6.4.0", + "chokidar": "^2.0.3", + "rxjs": "^6.0.0", + "source-map": "^0.5.6" } } } @@ -99,10 +99,10 @@ "integrity": "sha512-qnD5W5arKefrWU+xYR1H6kSx/jvfbmDsEhAGzmgbGffKuXnMnQZtL3hVNqL2faLkCONdLCYa/f9JCPihqQfc6w==", "dev": true, "requires": { - "loader-utils": "1.1.0", - "source-map": "0.5.7", - "typescript": "2.9.2", - "webpack-sources": "1.1.0" + "loader-utils": "^1.1.0", + "source-map": "^0.5.6", + "typescript": "~2.9.1", + "webpack-sources": "^1.1.0" }, "dependencies": { "typescript": { @@ -121,7 +121,7 @@ "requires": { "@angular-devkit/architect": "0.7.2", "@angular-devkit/core": "0.7.2", - "rxjs": "6.2.1" + "rxjs": "^6.0.0" }, "dependencies": { "@angular-devkit/architect": { @@ -131,7 +131,7 @@ "dev": true, "requires": { "@angular-devkit/core": "0.7.2", - "rxjs": "6.2.1" + "rxjs": "^6.0.0" } }, "@angular-devkit/core": { @@ -140,10 +140,10 @@ "integrity": "sha512-1Es9oNpabOukutBe+0txXUHyhI6ypuc7WrxTutZH7Lr3n3+CTG6oEv42rOcot1aXi1n97wNqcdY3lrENFu9vhQ==", "dev": true, "requires": { - "ajv": "6.4.0", - "chokidar": "2.0.4", - "rxjs": "6.2.1", - "source-map": "0.5.7" + "ajv": "~6.4.0", + "chokidar": "^2.0.3", + "rxjs": "^6.0.0", + "source-map": "^0.5.6" } } } @@ -153,10 +153,10 @@ "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.6.8.tgz", "integrity": "sha1-OwnZe9JYjwCR3xGSH37XckMYBqo=", "requires": { - "ajv": "6.4.0", - "chokidar": "2.0.4", - "rxjs": "6.2.1", - "source-map": "0.5.7" + "ajv": "~6.4.0", + "chokidar": "^2.0.3", + "rxjs": "^6.0.0", + "source-map": "^0.5.6" } }, "@angular-devkit/schematics": { @@ -165,7 +165,7 @@ "integrity": "sha1-Y2CgJx8fQihiv5MqA7N0HnasX/A=", "requires": { "@angular-devkit/core": "0.6.8", - "rxjs": "6.2.1" + "rxjs": "^6.0.0" } }, "@angular/animations": { @@ -173,7 +173,7 @@ "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.1.2.tgz", "integrity": "sha512-E6eFwoRSKKEGPDsIF5AnecDid3ZoOczG5WUTpOYIGUfKtB1kqiisZCP/090RWN48xU3nDssxwPiN9dJ7a4Hf4w==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "@angular/cdk": { @@ -181,7 +181,7 @@ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.4.3.tgz", "integrity": "sha512-GRvBp0svHeA0Jg0wlGj1m6xRFbt1M6CuowD2ht/h0qe6NizxLPxxXC0RTOdL4YSvMK7Bkadcggb+el7HLDfwAA==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.7.1" } }, "@angular/cli": { @@ -195,13 +195,13 @@ "@angular-devkit/schematics": "0.6.8", "@schematics/angular": "0.6.8", "@schematics/update": "0.6.8", - "opn": "5.3.0", - "resolve": "1.8.1", - "rxjs": "6.2.1", - "semver": "5.5.0", - "silent-error": "1.1.0", - "symbol-observable": "1.2.0", - "yargs-parser": "10.0.0" + "opn": "~5.3.0", + "resolve": "^1.1.7", + "rxjs": "^6.0.0", + "semver": "^5.1.0", + "silent-error": "^1.0.0", + "symbol-observable": "^1.2.0", + "yargs-parser": "^10.0.0" }, "dependencies": { "camelcase": { @@ -216,7 +216,7 @@ "integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } @@ -226,7 +226,7 @@ "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.1.2.tgz", "integrity": "sha512-4nzMOIUmFCsAxToobIGXTgwhlX9ueqOzvhlYQYD+tHWV4udjBccaUROis7BQLU7r60WD4TLGt489xJUYZgFk2g==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "@angular/compiler": { @@ -234,7 +234,7 @@ "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.1.2.tgz", "integrity": "sha512-IMaqx1gIYMqrori41bITgm22patbde/SRINiSggeUqegVhX4b2wIZ6ALIyT6utD2CC9n7oHQgp/VpMVMOIg0yA==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "@angular/compiler-cli": { @@ -243,10 +243,10 @@ "integrity": "sha512-r3zSbXMc0Uv5kPau+AF7uxps3S8A02Bp2Rw18NnMY+2kXPPKXn/qfAplYidrRrlcW0Kwklt34TSMxd4cxerRuQ==", "dev": true, "requires": { - "chokidar": "1.7.0", - "minimist": "1.2.0", - "reflect-metadata": "0.1.12", - "tsickle": "0.32.1" + "chokidar": "^1.4.2", + "minimist": "^1.2.0", + "reflect-metadata": "^0.1.2", + "tsickle": "^0.32.1" }, "dependencies": { "anymatch": { @@ -255,8 +255,8 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" } }, "arr-diff": { @@ -265,7 +265,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "array-unique": { @@ -280,9 +280,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "chokidar": { @@ -291,15 +291,15 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.2.4", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" + "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" } }, "expand-brackets": { @@ -308,7 +308,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "extglob": { @@ -317,7 +317,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "glob-parent": { @@ -326,7 +326,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "is-extglob": { @@ -341,7 +341,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "kind-of": { @@ -350,7 +350,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "micromatch": { @@ -359,19 +359,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "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" } }, "minimist": { @@ -387,7 +387,7 @@ "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.1.2.tgz", "integrity": "sha512-ayHmUCBAbn0Rkd4SkUOi/qsN/EK/UorB1VPZeimYJSJUGWOQVyN7vneXn/zN1SQ+oj0KYz5u/mDsNqYh1kkCbw==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "@angular/forms": { @@ -395,7 +395,7 @@ "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.1.2.tgz", "integrity": "sha512-WiYZsiNdKUHAFJXbGmCbG6peUwQ6O68qTrUDBAaq4Ras4FMsFUOVOgwx+HSNLbyKJJYG45EGUtk9uwbNrnJi9w==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "@angular/http": { @@ -403,7 +403,7 @@ "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.1.2.tgz", "integrity": "sha512-xgot+cgDcYTIglRrzKBCMNn7K6zL7Isrn52h1dQ1+JkxwmznQ3ZATzZZwKALUD9JnG8xloZ6PO7EarBOUl/hDw==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "@angular/language-service": { @@ -417,8 +417,8 @@ "resolved": "https://registry.npmjs.org/@angular/material/-/material-6.4.3.tgz", "integrity": "sha512-ij4UBC/fUcTs+3P8rBzoNPy/doox2SLOLhjzh6M16c9JGPche3I1EInBfD2uCDVfwfh+NmTrR8inqMKroi4zuA==", "requires": { - "parse5": "5.0.0", - "tslib": "1.9.2" + "parse5": "^5.0.0", + "tslib": "^1.7.1" }, "dependencies": { "parse5": { @@ -430,11 +430,11 @@ } }, "@angular/material-moment-adapter": { - "version": "6.4.6", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-6.4.6.tgz", - "integrity": "sha512-Bvj/zwtEjF1bqOF1z/M0VcWYOwlRjmCBjvPVmNZ1Bxf7HE8yyRf8B+AAv46sn/EhhAv/eMNU9bzFcxrR/vEHAg==", + "version": "6.4.7", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-6.4.7.tgz", + "integrity": "sha512-OGdDtpu/yRioOQXhJFCNuiOF2OgiL9VUj8ewFPi1lDtFGUFfVwU2h3hWkKLn+yuPW+DBVYla11tCNsn5dLElmA==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.7.1" } }, "@angular/platform-browser": { @@ -442,7 +442,7 @@ "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.1.2.tgz", "integrity": "sha512-Rm8nkj2RTFqufbI4z1J4qxWgm7h+8uEAmg7Iied0kzjpY3RZ6rYBc92bW/gFHV42zTkyRT2nngZVG4MB3EcBBw==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { @@ -450,7 +450,7 @@ "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.2.tgz", "integrity": "sha512-l7/4/cFAnrZrhNrEQuF+HVZvLEmVTZcNUpq2GQFlZ9WDgFiZVaz2eOxdlrnKOTi4B7fKj9BXmU8si1K91u7LrA==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "@angular/pwa": { @@ -461,7 +461,7 @@ "@angular-devkit/core": "0.6.8", "@angular-devkit/schematics": "0.6.8", "@schematics/angular": "0.6.8", - "typescript": "2.6.2" + "typescript": "~2.6.2" }, "dependencies": { "typescript": { @@ -476,7 +476,7 @@ "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.1.2.tgz", "integrity": "sha512-LDOv4n/dZXFfUZDGUiBURWZQlXxjPIlsARe3bZw6p24JjRvCmaofhbliNu6oxBQCzKNYcuz009uiMkwpwTlH+g==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "@angular/service-worker": { @@ -484,7 +484,7 @@ "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-6.1.2.tgz", "integrity": "sha512-Z9OOB3KF/fWUd7tnP247uOW4Tp03GaThZjHoF3/tdL6pdoIbWf1kTbE+/pTjht1oLSztiSQvk/6qKuSBkcXhvA==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "@ionic/storage": { @@ -493,8 +493,8 @@ "integrity": "sha512-/i3Vn2jNBqteAm5FuGCNei5oJlFQB2JYFkH3nR5f5i7X4kRz17XAsAKXVQjyR9wiye8HmxglIz05JsC92nYUjQ==", "requires": { "@types/localforage": "0.0.30", - "localforage": "1.4.3", - "localforage-cordovasqlitedriver": "1.5.0" + "localforage": "~1.4.2", + "localforage-cordovasqlitedriver": "~1.5.0" } }, "@ng-bootstrap/ng-bootstrap": { @@ -507,7 +507,7 @@ "resolved": "https://registry.npmjs.org/@ng-select/ng-select/-/ng-select-1.5.2.tgz", "integrity": "sha1-5nEVcF+ZHLRNhZg/D7OzxvcJwu4=", "requires": { - "tslib": "1.9.2" + "tslib": "^1.7.1" } }, "@ngtools/webpack": { @@ -517,9 +517,9 @@ "dev": true, "requires": { "@angular-devkit/core": "0.7.2", - "rxjs": "6.2.1", - "tree-kill": "1.2.0", - "webpack-sources": "1.1.0" + "rxjs": "^6.0.0", + "tree-kill": "^1.0.0", + "webpack-sources": "^1.1.0" }, "dependencies": { "@angular-devkit/core": { @@ -528,10 +528,10 @@ "integrity": "sha512-1Es9oNpabOukutBe+0txXUHyhI6ypuc7WrxTutZH7Lr3n3+CTG6oEv42rOcot1aXi1n97wNqcdY3lrENFu9vhQ==", "dev": true, "requires": { - "ajv": "6.4.0", - "chokidar": "2.0.4", - "rxjs": "6.2.1", - "source-map": "0.5.7" + "ajv": "~6.4.0", + "chokidar": "^2.0.3", + "rxjs": "^6.0.0", + "source-map": "^0.5.6" } } } @@ -543,7 +543,7 @@ "requires": { "@angular-devkit/core": "0.6.8", "@angular-devkit/schematics": "0.6.8", - "typescript": "2.7.2" + "typescript": ">=2.6.2 <2.8" } }, "@schematics/update": { @@ -554,10 +554,10 @@ "requires": { "@angular-devkit/core": "0.6.8", "@angular-devkit/schematics": "0.6.8", - "npm-registry-client": "8.5.1", - "rxjs": "6.2.1", - "semver": "5.5.0", - "semver-intersect": "1.3.1" + "npm-registry-client": "^8.5.1", + "rxjs": "^6.0.0", + "semver": "^5.3.0", + "semver-intersect": "^1.1.2" } }, "@types/date-fns": { @@ -587,7 +587,7 @@ "resolved": "https://registry.npmjs.org/@types/highcharts/-/highcharts-4.2.57.tgz", "integrity": "sha512-8/RF3I2Zy4I8ll9Ksa+wTbHA7ne/OHilmaTBQTVpQdNtOX6dL7EWFXfcfwiXQAfL+0r48LifHjYDmqug0t8mQA==", "requires": { - "@types/geojson": "7946.0.4" + "@types/geojson": "*" } }, "@types/jasmine": { @@ -601,7 +601,7 @@ "integrity": "sha1-DSiGsMva5MDuulXjB5L1hL8ECpU=", "dev": true, "requires": { - "@types/jasmine": "2.8.8" + "@types/jasmine": "*" } }, "@types/jquery": { @@ -622,8 +622,8 @@ }, "@types/node": { "version": "8.9.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", - "integrity": "sha1-FiuGS8cL4Hfm2yErMidUkXkp6XY=", + "resolved": "http://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", + "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==", "dev": true }, "@types/pdf": { @@ -637,20 +637,20 @@ "integrity": "sha512-ZiBUj/DX2lxl2pADevFof4e/wUhen6XuN6qmKNINX6yrMi2+gMjJaK/IoIjpMAANB1opw1u5pUhvwv5uflzA/Q==", "dev": true, "requires": { - "@types/pouchdb-adapter-fruitdown": "6.1.2", - "@types/pouchdb-adapter-http": "6.1.2", - "@types/pouchdb-adapter-idb": "6.1.2", - "@types/pouchdb-adapter-leveldb": "6.1.2", - "@types/pouchdb-adapter-localstorage": "6.1.2", - "@types/pouchdb-adapter-memory": "6.1.2", - "@types/pouchdb-adapter-node-websql": "6.1.2", - "@types/pouchdb-adapter-websql": "6.1.2", - "@types/pouchdb-browser": "6.1.2", - "@types/pouchdb-core": "6.4.2", - "@types/pouchdb-http": "6.1.2", - "@types/pouchdb-mapreduce": "6.1.3", - "@types/pouchdb-node": "6.1.2", - "@types/pouchdb-replication": "6.4.0" + "@types/pouchdb-adapter-fruitdown": "*", + "@types/pouchdb-adapter-http": "*", + "@types/pouchdb-adapter-idb": "*", + "@types/pouchdb-adapter-leveldb": "*", + "@types/pouchdb-adapter-localstorage": "*", + "@types/pouchdb-adapter-memory": "*", + "@types/pouchdb-adapter-node-websql": "*", + "@types/pouchdb-adapter-websql": "*", + "@types/pouchdb-browser": "*", + "@types/pouchdb-core": "*", + "@types/pouchdb-http": "*", + "@types/pouchdb-mapreduce": "*", + "@types/pouchdb-node": "*", + "@types/pouchdb-replication": "*" } }, "@types/pouchdb-adapter-fruitdown": { @@ -659,7 +659,7 @@ "integrity": "sha512-Jec2SlofeKi2PIFIXdKtKg8CyFqYlOUIAV+LYtEw0F9izpQsvK1IcagTbl4yLu+X7EdoeDu0mLpveQ1BEiHXlw==", "dev": true, "requires": { - "@types/pouchdb-core": "6.4.2" + "@types/pouchdb-core": "*" } }, "@types/pouchdb-adapter-http": { @@ -668,7 +668,7 @@ "integrity": "sha512-qBOVja5q++gFu9322ZOYTnmPIn11jcMol0yq81I6ylq66vIG6qocA19IQIivDa04qKG6mBLObhGzknUaqypgNw==", "dev": true, "requires": { - "@types/pouchdb-core": "6.4.2" + "@types/pouchdb-core": "*" } }, "@types/pouchdb-adapter-idb": { @@ -677,7 +677,7 @@ "integrity": "sha512-qsfCkXKEjE0A/OtGumpGt6ODDmsLt/NOrMb0c0lI7c/vWtsDJC86Kk8dnNhkk1XOOKkopr2/L3stvTE/IfKTMg==", "dev": true, "requires": { - "@types/pouchdb-core": "6.4.2" + "@types/pouchdb-core": "*" } }, "@types/pouchdb-adapter-leveldb": { @@ -686,7 +686,7 @@ "integrity": "sha512-YZNGO2fKuqbj0o32fVdxOA8jhA4AQkjMU19Gm0ktAeBPvG4fQDKXvVZsQewCDS5i4pfy2OZZ/sOT9nxrB3gnbg==", "dev": true, "requires": { - "@types/pouchdb-core": "6.4.2" + "@types/pouchdb-core": "*" } }, "@types/pouchdb-adapter-localstorage": { @@ -695,7 +695,7 @@ "integrity": "sha512-mVp5naEHkHtPQiWDSIYaWyQmeYeBirRVJVj73i8oatAvJtdMYGZrWYSxZhxu+zohSX7GUoU0aFknFsGWbHMieQ==", "dev": true, "requires": { - "@types/pouchdb-core": "6.4.2" + "@types/pouchdb-core": "*" } }, "@types/pouchdb-adapter-memory": { @@ -704,7 +704,7 @@ "integrity": "sha512-qNRBLqOA+NMOHqsw2eHQDtb0PobiEOYPYWwjAgPTeM/5HLo+d7xuOiE9Br0PgnXTJnpu8D4KO6htOgnkEb7x0w==", "dev": true, "requires": { - "@types/pouchdb-core": "6.4.2" + "@types/pouchdb-core": "*" } }, "@types/pouchdb-adapter-node-websql": { @@ -713,8 +713,8 @@ "integrity": "sha512-GY0Zq92lkQtOoIFeMMPfXnhO0jAh3es/BlqB9vbPqxoTLTxC40oeVg8RPP4ODbGRI5nyMvhX7kvJr7HEMExZCA==", "dev": true, "requires": { - "@types/pouchdb-adapter-websql": "6.1.2", - "@types/pouchdb-core": "6.4.2" + "@types/pouchdb-adapter-websql": "*", + "@types/pouchdb-core": "*" } }, "@types/pouchdb-adapter-websql": { @@ -723,7 +723,7 @@ "integrity": "sha512-IjnRVo6u9fAiGl635wmmNXBioPBM66Z/bMeNcmLT71D5DdjK8bQMSWAXYQhL3iIh31qQsDPiR8tkrDSrNMJWIA==", "dev": true, "requires": { - "@types/pouchdb-core": "6.4.2" + "@types/pouchdb-core": "*" } }, "@types/pouchdb-browser": { @@ -732,12 +732,12 @@ "integrity": "sha512-SC/bapNNJOeUI0zeJ04N2l3SKHu6vDL8G/94HnGhLgOhqGnrGKWreoJv9E5piXjMvaLhdBHwA2y8VJEoqb03bA==", "dev": true, "requires": { - "@types/pouchdb-adapter-http": "6.1.2", - "@types/pouchdb-adapter-idb": "6.1.2", - "@types/pouchdb-adapter-websql": "6.1.2", - "@types/pouchdb-core": "6.4.2", - "@types/pouchdb-mapreduce": "6.1.3", - "@types/pouchdb-replication": "6.4.0" + "@types/pouchdb-adapter-http": "*", + "@types/pouchdb-adapter-idb": "*", + "@types/pouchdb-adapter-websql": "*", + "@types/pouchdb-core": "*", + "@types/pouchdb-mapreduce": "*", + "@types/pouchdb-replication": "*" } }, "@types/pouchdb-core": { @@ -746,8 +746,8 @@ "integrity": "sha512-lU0jB5LNkCCbDMtKjFcDeXZof5ZqXIRHqNvF+3ILz4K44+ODgescHROYtyoVzdYadGU3Y7I1TcLKNTrcXM7H+g==", "dev": true, "requires": { - "@types/debug": "0.0.30", - "@types/pouchdb-find": "6.3.3" + "@types/debug": "*", + "@types/pouchdb-find": "*" } }, "@types/pouchdb-find": { @@ -756,7 +756,7 @@ "integrity": "sha512-VF/t7JzoNxybPQCav0aWmb9TDuqXj7hYhOat/Ys8zITZ1o35FujJOKmBZdV5gtCC2aDQMBjaD6VVUxcwvF8NWA==", "dev": true, "requires": { - "@types/pouchdb-core": "6.4.2" + "@types/pouchdb-core": "*" } }, "@types/pouchdb-http": { @@ -765,8 +765,8 @@ "integrity": "sha512-M91m92r6K3LmjJ2dz4DN9jOUPfAccYGo4y6J3y6sseq5Rws5uxVA5felBUI04AOvW7V2Hyjnn0/UhBcVcZzX7g==", "dev": true, "requires": { - "@types/pouchdb-adapter-http": "6.1.2", - "@types/pouchdb-core": "6.4.2" + "@types/pouchdb-adapter-http": "*", + "@types/pouchdb-core": "*" } }, "@types/pouchdb-mapreduce": { @@ -775,7 +775,7 @@ "integrity": "sha512-ZXA5bZO/fHQgYfdTj04frxFEi6DWiflcfFoUAeyiBzyVeCsSIkdHS2UwBjbu9Szcci3jKT8U9d3mruLwsRmOaQ==", "dev": true, "requires": { - "@types/pouchdb-core": "6.4.2" + "@types/pouchdb-core": "*" } }, "@types/pouchdb-node": { @@ -784,11 +784,11 @@ "integrity": "sha512-A3zqpBoJLNSWHsiHnWr6dkI+nap/Ij+6loKKFqYwAi6PhNDH5yB+lKmgdq2cv8I2BUTlLDLO6dQ/wdVGt3WjYg==", "dev": true, "requires": { - "@types/pouchdb-adapter-http": "6.1.2", - "@types/pouchdb-adapter-leveldb": "6.1.2", - "@types/pouchdb-core": "6.4.2", - "@types/pouchdb-mapreduce": "6.1.3", - "@types/pouchdb-replication": "6.4.0" + "@types/pouchdb-adapter-http": "*", + "@types/pouchdb-adapter-leveldb": "*", + "@types/pouchdb-core": "*", + "@types/pouchdb-mapreduce": "*", + "@types/pouchdb-replication": "*" } }, "@types/pouchdb-replication": { @@ -797,8 +797,8 @@ "integrity": "sha512-+DEigPn5+Waoi9tL3EB4ES0Ry/3lNCRVzWsvWQNM3CiGWEwulBy8EnpeEbxIL8562XM2znv8+KaQzNy2psMvVQ==", "dev": true, "requires": { - "@types/pouchdb-core": "6.4.2", - "@types/pouchdb-find": "6.3.3" + "@types/pouchdb-core": "*", + "@types/pouchdb-find": "*" } }, "@types/q": { @@ -819,7 +819,7 @@ "integrity": "sha512-LrnsgZIfJaysFkv9rRJp4/uAyqw87oVed3s1hhF83nwbo9c7MG9g5DqR0seHP+lkX4ldmMrVolPjQSe2ZfD0yA==", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "*" } }, "@types/uglify-js": { @@ -828,7 +828,7 @@ "integrity": "sha512-LjcyGt6CHsgZ0AoofnMwhyxo9hUqz2mgl6IcF+S8B1zdSTxHAvTO/1RPvBAHG3C1ZeAc+AoWA5mb3lDJKtM9Zg==", "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "^0.6.1" }, "dependencies": { "source-map": { @@ -847,7 +847,7 @@ "requires": { "@webassemblyjs/helper-wasm-bytecode": "1.4.3", "@webassemblyjs/wast-parser": "1.4.3", - "debug": "3.1.0", + "debug": "^3.1.0", "webassemblyjs": "1.4.3" }, "dependencies": { @@ -874,7 +874,7 @@ "integrity": "sha1-BDS1WVhRm/UDaX04JIV7HeqAtyk=", "dev": true, "requires": { - "debug": "3.1.0" + "debug": "^3.1.0" }, "dependencies": { "debug": { @@ -919,7 +919,7 @@ "@webassemblyjs/helper-buffer": "1.4.3", "@webassemblyjs/helper-wasm-bytecode": "1.4.3", "@webassemblyjs/wasm-gen": "1.4.3", - "debug": "3.1.0" + "debug": "^3.1.0" }, "dependencies": { "debug": { @@ -939,7 +939,7 @@ "integrity": "sha1-Wl5ZSdu1rf466VZk0EOZJ6xVf7g=", "dev": true, "requires": { - "leb": "0.3.0" + "leb": "^0.3.0" } }, "@webassemblyjs/validation": { @@ -965,7 +965,7 @@ "@webassemblyjs/wasm-opt": "1.4.3", "@webassemblyjs/wasm-parser": "1.4.3", "@webassemblyjs/wast-printer": "1.4.3", - "debug": "3.1.0" + "debug": "^3.1.0" }, "dependencies": { "debug": { @@ -1000,7 +1000,7 @@ "@webassemblyjs/helper-buffer": "1.4.3", "@webassemblyjs/wasm-gen": "1.4.3", "@webassemblyjs/wasm-parser": "1.4.3", - "debug": "3.1.0" + "debug": "^3.1.0" }, "dependencies": { "debug": { @@ -1037,7 +1037,7 @@ "@webassemblyjs/floating-point-hex-parser": "1.4.3", "@webassemblyjs/helper-code-frame": "1.4.3", "@webassemblyjs/helper-fsm": "1.4.3", - "long": "3.2.0", + "long": "^3.2.0", "webassemblyjs": "1.4.3" } }, @@ -1049,7 +1049,7 @@ "requires": { "@webassemblyjs/ast": "1.4.3", "@webassemblyjs/wast-parser": "1.4.3", - "long": "3.2.0" + "long": "^3.2.0" } }, "@webpack-contrib/schema-utils": { @@ -1058,12 +1058,12 @@ "integrity": "sha512-LonryJP+FxQQHsjGBi6W786TQB1Oym+agTpY0c+Kj8alnIw+DLUJb6SI8Y1GHGhLCH1yPRrucjObUmxNICQ1pg==", "dev": true, "requires": { - "ajv": "6.4.0", - "ajv-keywords": "3.2.0", - "chalk": "2.4.1", - "strip-ansi": "4.0.0", - "text-table": "0.2.0", - "webpack-log": "1.2.0" + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0", + "chalk": "^2.3.2", + "strip-ansi": "^4.0.0", + "text-table": "^0.2.0", + "webpack-log": "^1.1.2" }, "dependencies": { "ansi-regex": { @@ -1078,7 +1078,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -1088,8 +1088,8 @@ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz", "integrity": "sha512-3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg==", "requires": { - "jsonparse": "1.3.1", - "through": "2.3.8" + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" } }, "abbrev": { @@ -1103,7 +1103,7 @@ "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-4.0.3.tgz", "integrity": "sha512-qsIHFQy0u17JqSY+3ZUT+ykqxYY17yOfvAsLkFkw8kSQqi05d1jyj0bCuSX6sjYlXuY9cKpgUt5EudQdP4aXyA==", "requires": { - "xtend": "4.0.1" + "xtend": "~4.0.0" } }, "accepts": { @@ -1112,7 +1112,7 @@ "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", "dev": true, "requires": { - "mime-types": "2.1.18", + "mime-types": "~2.1.18", "negotiator": "0.6.1" } }, @@ -1126,7 +1126,7 @@ "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz", "integrity": "sha1-kBzu5Mf6rvfgetKkfokGddpQong=", "requires": { - "acorn": "5.7.1" + "acorn": "^5.0.0" } }, "acorn-node": { @@ -1134,9 +1134,9 @@ "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz", "integrity": "sha512-krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg==", "requires": { - "acorn": "5.7.1", - "acorn-dynamic-import": "3.0.0", - "xtend": "4.0.1" + "acorn": "^5.7.1", + "acorn-dynamic-import": "^3.0.0", + "xtend": "^4.0.1" } }, "adm-zip": { @@ -1172,7 +1172,7 @@ "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", "dev": true, "requires": { - "es6-promisify": "5.0.0" + "es6-promisify": "^5.0.0" } }, "ajv": { @@ -1180,10 +1180,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz", "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=", "requires": { - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1", - "uri-js": "3.0.2" + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0", + "uri-js": "^3.0.2" } }, "ajv-keywords": { @@ -1197,9 +1197,9 @@ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" }, "dependencies": { "kind-of": { @@ -1208,7 +1208,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1218,25 +1218,25 @@ "resolved": "https://registry.npmjs.org/amazing-time-picker/-/amazing-time-picker-1.5.3.tgz", "integrity": "sha512-jlicMJ5EkwCfZYWOyy7dKgS7gm5uZJwj7XrFdoUp9elUvwLODPzfghQqiwzyFwwX17yfG2hbSMnlbrEJgYut/Q==", "requires": { - "@angular/animations": "6.1.2", - "@angular/common": "6.1.2", - "@angular/compiler": "6.1.2", - "@angular/core": "6.1.2", - "@angular/forms": "6.1.2", - "@angular/http": "6.1.2", - "@angular/platform-browser": "6.1.2", - "@angular/platform-browser-dynamic": "6.1.2", - "@angular/router": "6.1.2", - "core-js": "2.5.7", - "intl": "1.2.5", - "rxjs": "5.5.11", - "zone.js": "0.8.26" + "@angular/animations": ">=4.2.4", + "@angular/common": ">=2.4.5", + "@angular/compiler": ">=2.4.5", + "@angular/core": ">=2.4.5", + "@angular/forms": ">=2.4.5", + "@angular/http": ">=2.4.5", + "@angular/platform-browser": ">=2.4.5", + "@angular/platform-browser-dynamic": ">=2.4.5", + "@angular/router": ">=2.4.5", + "core-js": "^2.4.1", + "intl": "^1.2.5", + "rxjs": "^5.4.2", + "zone.js": "^0.8.14" }, "dependencies": { "rxjs": { - "version": "5.5.11", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz", - "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==", + "version": "5.5.12", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz", + "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==", "requires": { "symbol-observable": "1.0.1" } @@ -1258,12 +1258,12 @@ "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.25.2.tgz", "integrity": "sha512-sFzqwioLIEbRIpFcZq6Ap0tW8n8NNApwbbbs0DTmjnQjr6N1VZArlkKCecfqkYYG6dE496t7V616Ak7gTBa4QA==", "requires": { - "angular-draggable-droppable": "3.0.1", - "angular-resizable-element": "3.2.1", - "calendar-utils": "0.1.2", - "date-fns": "1.29.0", - "positioning": "1.4.0", - "tslib": "1.9.2" + "angular-draggable-droppable": "^3.0.0", + "angular-resizable-element": "^3.0.0", + "calendar-utils": "^0.1.2", + "date-fns": "^1.28.5", + "positioning": "^1.3.1", + "tslib": "^1.9.0" } }, "angular-draggable-droppable": { @@ -1271,7 +1271,7 @@ "resolved": "https://registry.npmjs.org/angular-draggable-droppable/-/angular-draggable-droppable-3.0.1.tgz", "integrity": "sha512-+GYYq4U5rPcoNwaCdoY3sNBBKd80JT7+R8n4QINJKvtToisyGpsXmX68SkKfHsNtXyTzoxX/h/37XJgE0y8KLw==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "angular-resizable-element": { @@ -1279,7 +1279,7 @@ "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-3.2.1.tgz", "integrity": "sha512-oQWK3VB6v/LAqaKjDmO4yoFDFBbbdB3KYh4PLWERiliRegHgnbvgnXgYDdXGV4O0ydqrn1EfPWwB+isjcZxCzw==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "angular2-calendar": { @@ -1287,10 +1287,10 @@ "resolved": "https://registry.npmjs.org/angular2-calendar/-/angular2-calendar-0.3.7.tgz", "integrity": "sha1-1hrZoQWNbjdrpOWs5C3QDaoNVb4=", "requires": { - "@ng-bootstrap/ng-bootstrap": "1.1.2", + "@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.0", "@types/date-fns": "0.0.2", "calendar-utils": "0.0.35", - "date-fns": "1.29.0" + "date-fns": "^1.3.0" }, "dependencies": { "calendar-utils": { @@ -1310,8 +1310,8 @@ "resolved": "https://registry.npmjs.org/angular2-highcharts/-/angular2-highcharts-0.5.5.tgz", "integrity": "sha1-9KGeqW1jUkQg/VxlE2rAJ7BSZv0=", "requires": { - "@types/highcharts": "4.2.57", - "highcharts": "5.0.15" + "@types/highcharts": "^4.2.47", + "highcharts": "^5.0.7" } }, "angular2-ladda": { @@ -1319,7 +1319,7 @@ "resolved": "https://registry.npmjs.org/angular2-ladda/-/angular2-ladda-2.0.0.tgz", "integrity": "sha512-ZhEuGMkTqr8bYqgNQn0UjFdMKO3uRBdXWbXGwxpnavBrjPSJUzoQrhTukfD8/LaW3qa1PnJDvnsoxFnMbSHzwQ==", "requires": { - "ladda": "2.0.1" + "ladda": "^2.0.0" } }, "angular2-materialize": { @@ -1327,7 +1327,7 @@ "resolved": "https://registry.npmjs.org/angular2-materialize/-/angular2-materialize-5.2.1.tgz", "integrity": "sha1-B4dxm3x9qFZ7Z35STUE2twfRta8=", "requires": { - "@angular/forms": "0.3.0" + "@angular/forms": "^0.3.0" }, "dependencies": { "@angular/forms": { @@ -1342,8 +1342,8 @@ "resolved": "https://registry.npmjs.org/angular2-multiselect-dropdown/-/angular2-multiselect-dropdown-1.3.6.tgz", "integrity": "sha1-m0mzl5G5r9+ZhcXNxl2WI73qR1c=", "requires": { - "bootstrap": "3.3.7", - "font-awesome": "4.7.0" + "bootstrap": "*", + "font-awesome": "*" } }, "angular2-select": { @@ -1356,7 +1356,7 @@ "resolved": "https://registry.npmjs.org/angulartics2/-/angulartics2-4.6.3.tgz", "integrity": "sha512-tRDVn2XLY5kDinu6Jov/7EvzNz0+4oHyRMoFnP07j97NKU3uRBxzPVV09X+LROoMYRutlU880/xZNjN5roy/Ng==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.7.1" } }, "ansi-html": { @@ -1376,7 +1376,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.2" + "color-convert": "^1.9.0" } }, "anymatch": { @@ -1384,8 +1384,8 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", "integrity": "sha1-vLJLTzeTTZqnrBe0ra+J58du8us=", "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" } }, "app-root-path": { @@ -1400,7 +1400,7 @@ "integrity": "sha1-BGpSrlgqIovXL1is++KWfGeHWas=", "dev": true, "requires": { - "default-require-extensions": "2.0.0" + "default-require-extensions": "^2.0.0" } }, "aproba": { @@ -1413,8 +1413,8 @@ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=", "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "argparse": { @@ -1422,7 +1422,7 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" } }, "argsarray": { @@ -1468,8 +1468,8 @@ "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", "dev": true, "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.12.0" + "define-properties": "^1.1.2", + "es-abstract": "^1.7.0" } }, "array-map": { @@ -1494,7 +1494,7 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { - "array-uniq": "1.0.3" + "array-uniq": "^1.0.1" } }, "array-uniq": { @@ -1538,9 +1538,9 @@ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", "integrity": "sha1-ucK/WAXx5kqt7tbfOiv6+1pz9aA=", "requires": { - "bn.js": "4.11.8", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1" + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" } }, "assert": { @@ -1582,9 +1582,9 @@ "resolved": "https://registry.npmjs.org/ast-transform/-/ast-transform-0.0.0.tgz", "integrity": "sha1-dJRAWIh9goPhidlUYAlHvJj+AGI=", "requires": { - "escodegen": "1.2.0", - "esprima": "1.0.4", - "through": "2.3.8" + "escodegen": "~1.2.0", + "esprima": "~1.0.4", + "through": "~2.3.4" }, "dependencies": { "escodegen": { @@ -1592,10 +1592,10 @@ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.2.0.tgz", "integrity": "sha1-Cd55Z3kcyVi3+Jot220jRRrzJ+E=", "requires": { - "esprima": "1.0.4", - "estraverse": "1.5.1", - "esutils": "1.0.0", - "source-map": "0.1.43" + "esprima": "~1.0.4", + "estraverse": "~1.5.0", + "esutils": "~1.0.0", + "source-map": "~0.1.30" } }, "esprima": { @@ -1619,7 +1619,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "optional": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -1634,7 +1634,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "requires": { - "lodash": "4.17.10" + "lodash": "^4.17.10" } }, "async-each": { @@ -1672,12 +1672,12 @@ "integrity": "sha512-PLWJN3Xo/rycNkx+mp8iBDMTm3FeWe4VmYaZDSqL5QQB9sLsQkG5k8n+LNDFnhh9kdq2K+egL/icpctOmDHwig==", "dev": true, "requires": { - "browserslist": "3.2.8", - "caniuse-lite": "1.0.30000874", - "normalize-range": "0.1.2", - "num2fraction": "1.2.2", - "postcss": "6.0.23", - "postcss-value-parser": "3.3.0" + "browserslist": "^3.2.8", + "caniuse-lite": "^1.0.30000864", + "normalize-range": "^0.1.2", + "num2fraction": "^1.2.2", + "postcss": "^6.0.23", + "postcss-value-parser": "^3.2.3" } }, "aws-sign2": { @@ -1698,9 +1698,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" }, "dependencies": { "ansi-styles": { @@ -1715,11 +1715,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "supports-color": { @@ -1736,14 +1736,14 @@ "integrity": "sha1-GERAjTuPDTWkBOp6wYDwh6YBvZA=", "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.10", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" } }, "babel-messages": { @@ -1752,7 +1752,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-runtime": { @@ -1760,8 +1760,8 @@ "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "requires": { - "core-js": "2.5.7", - "regenerator-runtime": "0.11.1" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { @@ -1770,11 +1770,11 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.10" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { @@ -1783,15 +1783,15 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.4", - "lodash": "4.17.10" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" } }, "babel-types": { @@ -1800,10 +1800,10 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.10", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { @@ -1833,13 +1833,13 @@ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=", "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { @@ -1847,7 +1847,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -1855,7 +1855,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -1863,7 +1863,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -1871,9 +1871,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -1913,7 +1913,7 @@ "dev": true, "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "better-assert": { @@ -1945,8 +1945,8 @@ "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", "requires": { - "readable-stream": "2.3.6", - "safe-buffer": "5.1.2" + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" } }, "blob": { @@ -1969,7 +1969,7 @@ "dev": true, "optional": true, "requires": { - "inherits": "2.0.3" + "inherits": "~2.0.0" } }, "blocking-proxy": { @@ -1978,7 +1978,7 @@ "integrity": "sha1-gdb9H+E6TA1pV99/kbdemNrEDLI=", "dev": true, "requires": { - "minimist": "1.2.0" + "minimist": "^1.2.0" }, "dependencies": { "minimist": { @@ -2007,15 +2007,15 @@ "dev": true, "requires": { "bytes": "3.0.0", - "content-type": "1.0.4", + "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "1.1.2", - "http-errors": "1.6.3", + "depd": "~1.1.1", + "http-errors": "~1.6.2", "iconv-lite": "0.4.19", - "on-finished": "2.3.0", + "on-finished": "~2.3.0", "qs": "6.5.1", "raw-body": "2.3.2", - "type-is": "1.6.16" + "type-is": "~1.6.15" }, "dependencies": { "qs": { @@ -2032,12 +2032,12 @@ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { - "array-flatten": "2.1.1", - "deep-equal": "1.0.1", - "dns-equal": "1.0.0", - "dns-txt": "2.0.2", - "multicast-dns": "6.2.3", - "multicast-dns-service-types": "1.1.0" + "array-flatten": "^2.1.0", + "deep-equal": "^1.0.1", + "dns-equal": "^1.0.0", + "dns-txt": "^2.0.2", + "multicast-dns": "^6.0.1", + "multicast-dns-service-types": "^1.1.0" } }, "boolbase": { @@ -2056,14 +2056,14 @@ "resolved": "https://registry.npmjs.org/bootstrap-loader/-/bootstrap-loader-1.3.3.tgz", "integrity": "sha1-WYS8zMwyZTFZwTYsTSZkT5y/XNI=", "requires": { - "chalk": "1.1.3", + "chalk": "^1.1.3", "escape-regexp": "0.0.1", - "exports-loader": "0.6.4", - "js-yaml": "3.12.0", - "loader-utils": "0.2.17", - "resolve": "1.8.1", - "semver": "5.5.0", - "strip-json-comments": "2.0.1" + "exports-loader": "^0.6.3", + "js-yaml": "^3.7.0", + "loader-utils": "^0.2.16", + "resolve": "^1.1.7", + "semver": "^5.3.0", + "strip-json-comments": "^2.0.1" }, "dependencies": { "ansi-styles": { @@ -2076,11 +2076,11 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "loader-utils": { @@ -2088,10 +2088,10 @@ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" + "big.js": "^3.1.3", + "emojis-list": "^2.0.0", + "json5": "^0.5.0", + "object-assign": "^4.0.1" } }, "supports-color": { @@ -2106,7 +2106,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -2115,16 +2115,16 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=", "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -2132,7 +2132,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -2142,10 +2142,10 @@ "resolved": "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz", "integrity": "sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==", "requires": { - "quote-stream": "1.0.2", - "resolve": "1.8.1", - "static-module": "2.2.5", - "through2": "2.0.3" + "quote-stream": "^1.0.1", + "resolve": "^1.1.5", + "static-module": "^2.2.0", + "through2": "^2.0.0" } }, "brorand": { @@ -2158,7 +2158,7 @@ "resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.2.tgz", "integrity": "sha1-UlqcrU/LqWR119OI9q7LE+7VL0Y=", "requires": { - "base64-js": "1.3.0" + "base64-js": "^1.1.2" } }, "browser-pack": { @@ -2166,12 +2166,12 @@ "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz", "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==", "requires": { - "JSONStream": "1.3.3", - "combine-source-map": "0.8.0", - "defined": "1.0.0", - "safe-buffer": "5.1.2", - "through2": "2.0.3", - "umd": "3.0.3" + "JSONStream": "^1.0.3", + "combine-source-map": "~0.8.0", + "defined": "^1.0.0", + "safe-buffer": "^5.1.1", + "through2": "^2.0.0", + "umd": "^3.0.0" } }, "browser-resolve": { @@ -2194,54 +2194,54 @@ "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.2.2.tgz", "integrity": "sha512-fMES05wq1Oukts6ksGUU2TMVHHp06LyQt0SIwbXIHm7waSrQmNBZePsU0iM/4f94zbvb/wHma+D1YrdzWYnF/A==", "requires": { - "JSONStream": "1.3.3", - "assert": "1.4.1", - "browser-pack": "6.1.0", - "browser-resolve": "1.11.3", - "browserify-zlib": "0.2.0", - "buffer": "5.2.0", - "cached-path-relative": "1.0.1", - "concat-stream": "1.6.2", - "console-browserify": "1.1.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "defined": "1.0.0", - "deps-sort": "2.0.0", - "domain-browser": "1.2.0", - "duplexer2": "0.1.4", - "events": "2.1.0", - "glob": "7.1.2", - "has": "1.0.3", - "htmlescape": "1.1.1", - "https-browserify": "1.0.0", - "inherits": "2.0.3", - "insert-module-globals": "7.2.0", - "labeled-stream-splicer": "2.0.1", - "mkdirp": "0.5.1", - "module-deps": "6.1.0", - "os-browserify": "0.3.0", - "parents": "1.0.1", - "path-browserify": "0.0.0", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "read-only-stream": "2.0.0", - "readable-stream": "2.3.6", - "resolve": "1.8.1", - "shasum": "1.0.2", - "shell-quote": "1.6.1", - "stream-browserify": "2.0.1", - "stream-http": "2.8.3", - "string_decoder": "1.1.1", - "subarg": "1.0.0", - "syntax-error": "1.4.0", - "through2": "2.0.3", - "timers-browserify": "1.4.2", + "JSONStream": "^1.0.3", + "assert": "^1.4.0", + "browser-pack": "^6.0.1", + "browser-resolve": "^1.11.0", + "browserify-zlib": "~0.2.0", + "buffer": "^5.0.2", + "cached-path-relative": "^1.0.0", + "concat-stream": "^1.6.0", + "console-browserify": "^1.1.0", + "constants-browserify": "~1.0.0", + "crypto-browserify": "^3.0.0", + "defined": "^1.0.0", + "deps-sort": "^2.0.0", + "domain-browser": "^1.2.0", + "duplexer2": "~0.1.2", + "events": "^2.0.0", + "glob": "^7.1.0", + "has": "^1.0.0", + "htmlescape": "^1.1.0", + "https-browserify": "^1.0.0", + "inherits": "~2.0.1", + "insert-module-globals": "^7.0.0", + "labeled-stream-splicer": "^2.0.0", + "mkdirp": "^0.5.0", + "module-deps": "^6.0.0", + "os-browserify": "~0.3.0", + "parents": "^1.0.1", + "path-browserify": "~0.0.0", + "process": "~0.11.0", + "punycode": "^1.3.2", + "querystring-es3": "~0.2.0", + "read-only-stream": "^2.0.0", + "readable-stream": "^2.0.2", + "resolve": "^1.1.4", + "shasum": "^1.0.0", + "shell-quote": "^1.6.1", + "stream-browserify": "^2.0.0", + "stream-http": "^2.0.0", + "string_decoder": "^1.1.1", + "subarg": "^1.0.0", + "syntax-error": "^1.1.1", + "through2": "^2.0.0", + "timers-browserify": "^1.0.1", "tty-browserify": "0.0.1", - "url": "0.11.0", - "util": "0.10.4", - "vm-browserify": "1.1.0", - "xtend": "4.0.1" + "url": "~0.11.0", + "util": "~0.10.1", + "vm-browserify": "^1.0.0", + "xtend": "^4.0.0" }, "dependencies": { "buffer": { @@ -2249,8 +2249,8 @@ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz", "integrity": "sha512-nUJyfChH7PMJy75eRDCCKtszSEFokUNXC1hNVSe+o+VdcgvDPLs20k3v8UXI8ruRYAJiYtyRea8mYyqPxoHWDw==", "requires": { - "base64-js": "1.3.0", - "ieee754": "1.1.12" + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" } }, "events": { @@ -2268,7 +2268,7 @@ "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz", "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=", "requires": { - "process": "0.11.10" + "process": "~0.11.0" } }, "tty-browserify": { @@ -2288,12 +2288,12 @@ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=", "requires": { - "buffer-xor": "1.0.3", - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "browserify-cipher": { @@ -2301,9 +2301,9 @@ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", "integrity": "sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=", "requires": { - "browserify-aes": "1.2.0", - "browserify-des": "1.0.1", - "evp_bytestokey": "1.0.3" + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" } }, "browserify-des": { @@ -2311,9 +2311,9 @@ "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz", "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==", "requires": { - "cipher-base": "1.0.4", - "des.js": "1.0.0", - "inherits": "2.0.3" + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1" } }, "browserify-optional": { @@ -2322,8 +2322,8 @@ "integrity": "sha1-HhNyLP3g2F8SFnbCpyztUzoBiGk=", "requires": { "ast-transform": "0.0.0", - "ast-types": "0.7.8", - "browser-resolve": "1.11.3" + "ast-types": "^0.7.0", + "browser-resolve": "^1.8.1" }, "dependencies": { "ast-types": { @@ -2338,8 +2338,8 @@ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "requires": { - "bn.js": "4.11.8", - "randombytes": "2.0.6" + "bn.js": "^4.1.0", + "randombytes": "^2.0.1" } }, "browserify-sign": { @@ -2347,13 +2347,13 @@ "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "elliptic": "6.4.0", - "inherits": "2.0.3", - "parse-asn1": "5.1.1" + "bn.js": "^4.1.1", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.2", + "elliptic": "^6.0.0", + "inherits": "^2.0.1", + "parse-asn1": "^5.0.0" } }, "browserify-zlib": { @@ -2361,7 +2361,7 @@ "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=", "requires": { - "pako": "1.0.6" + "pako": "~1.0.5" } }, "browserslist": { @@ -2370,8 +2370,8 @@ "integrity": "sha1-sABTYdZHHw9ZUnl6dvyYXx+Xj8Y=", "dev": true, "requires": { - "caniuse-lite": "1.0.30000874", - "electron-to-chromium": "1.3.56" + "caniuse-lite": "^1.0.30000844", + "electron-to-chromium": "^1.3.47" } }, "browserstack": { @@ -2380,7 +2380,7 @@ "integrity": "sha512-O8VMT64P9NOLhuIoD4YngyxBURefaSdR4QdhG8l6HZ9VxtU7jc3m6jLufFwKA5gaf7fetfB2TnRJnMxyob+heg==", "dev": true, "requires": { - "https-proxy-agent": "2.2.1" + "https-proxy-agent": "^2.2.1" } }, "buffer": { @@ -2389,9 +2389,9 @@ "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { - "base64-js": "1.3.0", - "ieee754": "1.1.12", - "isarray": "1.0.0" + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" } }, "buffer-alloc": { @@ -2399,8 +2399,8 @@ "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "requires": { - "buffer-alloc-unsafe": "1.1.0", - "buffer-fill": "1.0.0" + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" } }, "buffer-alloc-unsafe": { @@ -2463,19 +2463,19 @@ "integrity": "sha1-ZFI2eZnv+dQYiu/ZoU6dfGomNGA=", "dev": true, "requires": { - "bluebird": "3.5.1", - "chownr": "1.0.1", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "lru-cache": "4.1.3", - "mississippi": "2.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.6.2", - "ssri": "5.3.0", - "unique-filename": "1.1.0", - "y18n": "4.0.0" + "bluebird": "^3.5.1", + "chownr": "^1.0.1", + "glob": "^7.1.2", + "graceful-fs": "^4.1.11", + "lru-cache": "^4.1.1", + "mississippi": "^2.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.2", + "ssri": "^5.2.4", + "unique-filename": "^1.1.0", + "y18n": "^4.0.0" } }, "cache-base": { @@ -2483,15 +2483,15 @@ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=", "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, "cached-path-relative": { @@ -2516,8 +2516,8 @@ "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", "dev": true, "requires": { - "no-case": "2.3.2", - "upper-case": "1.1.3" + "no-case": "^2.2.0", + "upper-case": "^1.1.1" } }, "camelcase": { @@ -2533,8 +2533,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" }, "dependencies": { "camelcase": { @@ -2564,8 +2564,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "chalk": { @@ -2574,9 +2574,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "child_process": { @@ -2589,19 +2589,19 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", "integrity": "sha1-NW/04rDo5D4yLRijckYLvPOszSY=", "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.4", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "lodash.debounce": "4.0.8", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0", - "upath": "1.1.0" + "anymatch": "^2.0.0", + "async-each": "^1.0.0", + "braces": "^2.3.0", + "fsevents": "^1.2.2", + "glob-parent": "^3.1.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "lodash.debounce": "^4.0.8", + "normalize-path": "^2.1.1", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0", + "upath": "^1.0.5" } }, "chownr": { @@ -2620,8 +2620,8 @@ "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=", "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "circular-dependency-plugin": { @@ -2641,10 +2641,10 @@ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=", "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { @@ -2652,7 +2652,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -2668,7 +2668,7 @@ "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "~0.6.0" }, "dependencies": { "source-map": { @@ -2686,8 +2686,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" }, "dependencies": { @@ -2717,10 +2717,10 @@ "integrity": "sha1-ANs6Hhc2VnMNEYjD1qztbX6pdxM=", "dev": true, "requires": { - "for-own": "1.0.0", - "is-plain-object": "2.0.4", - "kind-of": "6.0.2", - "shallow-clone": "1.0.0" + "for-own": "^1.0.0", + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.0", + "shallow-clone": "^1.0.0" } }, "co": { @@ -2740,12 +2740,12 @@ "integrity": "sha1-1W6qzvyn6BOKrApjDkhL2wmYhUQ=", "dev": true, "requires": { - "app-root-path": "2.0.1", - "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" + "app-root-path": "^2.0.1", + "css-selector-tokenizer": "^0.7.0", + "cssauron": "^1.4.0", + "semver-dsl": "^1.0.1", + "source-map": "^0.5.6", + "sprintf-js": "^1.0.3" } }, "collection-visit": { @@ -2753,8 +2753,8 @@ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "color-convert": { @@ -2784,7 +2784,7 @@ "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "^4.5.0" } }, "combine-source-map": { @@ -2792,10 +2792,10 @@ "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz", "integrity": "sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=", "requires": { - "convert-source-map": "1.1.3", - "inline-source-map": "0.6.2", - "lodash.memoize": "3.0.4", - "source-map": "0.5.7" + "convert-source-map": "~1.1.0", + "inline-source-map": "~0.6.0", + "lodash.memoize": "~3.0.3", + "source-map": "~0.5.3" }, "dependencies": { "convert-source-map": { @@ -2811,7 +2811,7 @@ "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "dev": true, "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { @@ -2855,7 +2855,7 @@ "integrity": "sha1-MmxfUH+7BV9UEWeCuWmoG2einac=", "dev": true, "requires": { - "mime-db": "1.35.0" + "mime-db": ">= 1.34.0 < 2" }, "dependencies": { "mime-db": { @@ -2872,13 +2872,13 @@ "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==", "dev": true, "requires": { - "accepts": "1.3.5", + "accepts": "~1.3.5", "bytes": "3.0.0", - "compressible": "2.0.14", + "compressible": "~2.0.14", "debug": "2.6.9", - "on-headers": "1.0.1", + "on-headers": "~1.0.1", "safe-buffer": "5.1.2", - "vary": "1.1.2" + "vary": "~1.1.2" } }, "concat-map": { @@ -2891,10 +2891,10 @@ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=", "requires": { - "buffer-from": "1.1.0", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "typedarray": "0.0.6" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" } }, "connect": { @@ -2905,7 +2905,7 @@ "requires": { "debug": "2.6.9", "finalhandler": "1.1.0", - "parseurl": "1.3.2", + "parseurl": "~1.3.2", "utils-merge": "1.0.1" }, "dependencies": { @@ -2916,12 +2916,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.3.1", - "unpipe": "1.0.0" + "encodeurl": "~1.0.1", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.2", + "statuses": "~1.3.1", + "unpipe": "~1.0.0" } }, "statuses": { @@ -2943,7 +2943,7 @@ "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", "requires": { - "date-now": "0.1.4" + "date-now": "^0.1.4" } }, "console-control-strings": { @@ -2996,12 +2996,12 @@ "integrity": "sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=", "dev": true, "requires": { - "aproba": "1.2.0", - "fs-write-stream-atomic": "1.0.10", - "iferr": "0.1.5", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "run-queue": "1.0.3" + "aproba": "^1.1.1", + "fs-write-stream-atomic": "^1.0.8", + "iferr": "^0.1.5", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.0" } }, "copy-descriptor": { @@ -3015,14 +3015,14 @@ "integrity": "sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==", "dev": true, "requires": { - "cacache": "10.0.4", - "find-cache-dir": "1.0.0", - "globby": "7.1.1", - "is-glob": "4.0.0", - "loader-utils": "1.1.0", - "minimatch": "3.0.4", - "p-limit": "1.3.0", - "serialize-javascript": "1.5.0" + "cacache": "^10.0.4", + "find-cache-dir": "^1.0.0", + "globby": "^7.1.1", + "is-glob": "^4.0.0", + "loader-utils": "^1.1.0", + "minimatch": "^3.0.4", + "p-limit": "^1.0.0", + "serialize-javascript": "^1.4.0" } }, "core-js": { @@ -3041,10 +3041,10 @@ "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==", "dev": true, "requires": { - "is-directory": "0.3.1", - "js-yaml": "3.12.0", - "parse-json": "4.0.0", - "require-from-string": "2.0.2" + "is-directory": "^0.3.1", + "js-yaml": "^3.9.0", + "parse-json": "^4.0.0", + "require-from-string": "^2.0.1" }, "dependencies": { "parse-json": { @@ -3053,8 +3053,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "1.3.2", - "json-parse-better-errors": "1.0.2" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" } } } @@ -3064,8 +3064,8 @@ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", "integrity": "sha1-yREbbzMEXEaX8UR4f5JUzcd8Rf8=", "requires": { - "bn.js": "4.11.8", - "elliptic": "6.4.0" + "bn.js": "^4.1.0", + "elliptic": "^6.0.0" } }, "create-hash": { @@ -3073,11 +3073,11 @@ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=", "requires": { - "cipher-base": "1.0.4", - "inherits": "2.0.3", - "md5.js": "1.3.4", - "ripemd160": "2.0.2", - "sha.js": "2.4.11" + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" } }, "create-hmac": { @@ -3085,12 +3085,12 @@ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=", "requires": { - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "inherits": "2.0.3", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "cross-spawn": { @@ -3100,8 +3100,8 @@ "dev": true, "optional": true, "requires": { - "lru-cache": "4.1.3", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, "crypto-browserify": { @@ -3109,17 +3109,17 @@ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", "integrity": "sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=", "requires": { - "browserify-cipher": "1.0.1", - "browserify-sign": "4.0.4", - "create-ecdh": "4.0.3", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "diffie-hellman": "5.0.3", - "inherits": "2.0.3", - "pbkdf2": "3.0.16", - "public-encrypt": "4.0.2", - "randombytes": "2.0.6", - "randomfill": "1.0.4" + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" } }, "css-parse": { @@ -3134,10 +3134,10 @@ "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "dev": true, "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.0", + "boolbase": "~1.0.0", + "css-what": "2.1", "domutils": "1.5.1", - "nth-check": "1.0.1" + "nth-check": "~1.0.1" } }, "css-selector-tokenizer": { @@ -3146,9 +3146,9 @@ "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=", "dev": true, "requires": { - "cssesc": "0.1.0", - "fastparse": "1.1.1", - "regexpu-core": "1.0.0" + "cssesc": "^0.1.0", + "fastparse": "^1.1.1", + "regexpu-core": "^1.0.0" } }, "css-what": { @@ -3163,7 +3163,7 @@ "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", "dev": true, "requires": { - "through": "2.3.8" + "through": "X.X.X" } }, "cssesc": { @@ -3184,7 +3184,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "custom-event": { @@ -3205,7 +3205,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.45" + "es5-ext": "^0.10.9" } }, "dashdash": { @@ -3214,7 +3214,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "date-fns": { @@ -3257,7 +3257,7 @@ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "requires": { - "mimic-response": "1.0.1" + "mimic-response": "^1.0.0" } }, "deep-equal": { @@ -3281,7 +3281,7 @@ "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", "dev": true, "requires": { - "strip-bom": "3.0.0" + "strip-bom": "^3.0.0" }, "dependencies": { "strip-bom": { @@ -3297,7 +3297,7 @@ "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-3.0.0.tgz", "integrity": "sha512-ajbXqRPMXRlcdyt0TuWqknOJkp1JgQjGB7xOl2V+ebol7/U11E9h3/nCZAtN1M7djmAJEIhypCUc1tIWxdQAuQ==", "requires": { - "abstract-leveldown": "4.0.3" + "abstract-leveldown": "~4.0.0" } }, "define-properties": { @@ -3306,8 +3306,8 @@ "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", "dev": true, "requires": { - "foreach": "2.0.5", - "object-keys": "1.0.12" + "foreach": "^2.0.5", + "object-keys": "^1.0.8" } }, "define-property": { @@ -3315,8 +3315,8 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=", "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -3324,7 +3324,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -3332,7 +3332,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -3340,9 +3340,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -3358,12 +3358,12 @@ "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", "dev": true, "requires": { - "globby": "6.1.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.1", - "p-map": "1.2.0", - "pify": "3.0.0", - "rimraf": "2.6.2" + "globby": "^6.1.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "p-map": "^1.1.1", + "pify": "^3.0.0", + "rimraf": "^2.2.8" }, "dependencies": { "globby": { @@ -3372,11 +3372,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" }, "dependencies": { "pify": { @@ -3411,10 +3411,10 @@ "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz", "integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=", "requires": { - "JSONStream": "1.3.3", - "shasum": "1.0.2", - "subarg": "1.0.0", - "through2": "2.0.3" + "JSONStream": "^1.0.3", + "shasum": "^1.0.0", + "subarg": "^1.0.0", + "through2": "^2.0.0" } }, "des.js": { @@ -3422,8 +3422,8 @@ "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1" + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" } }, "destroy": { @@ -3438,7 +3438,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "detect-libc": { @@ -3457,9 +3457,9 @@ "resolved": "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz", "integrity": "sha512-TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ==", "requires": { - "acorn-node": "1.5.2", - "defined": "1.0.0", - "minimist": "1.2.0" + "acorn-node": "^1.3.0", + "defined": "^1.0.0", + "minimist": "^1.1.1" }, "dependencies": { "minimist": { @@ -3474,7 +3474,7 @@ "resolved": "https://registry.npmjs.org/dfa/-/dfa-1.1.0.tgz", "integrity": "sha1-0wIYvRDQMPpCHfPrvIIoVGOjF4E=", "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.11.6" } }, "di": { @@ -3494,9 +3494,9 @@ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=", "requires": { - "bn.js": "4.11.8", - "miller-rabin": "4.0.1", - "randombytes": "2.0.6" + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" } }, "dir-glob": { @@ -3505,8 +3505,8 @@ "integrity": "sha1-CyBdK2rvmCOMooZZioIE0p0KADQ=", "dev": true, "requires": { - "arrify": "1.0.1", - "path-type": "3.0.0" + "arrify": "^1.0.1", + "path-type": "^3.0.0" } }, "dns-equal": { @@ -3521,8 +3521,8 @@ "integrity": "sha1-EqpCaYEHW+UAuRDu3NC0fdfe2lo=", "dev": true, "requires": { - "ip": "1.1.5", - "safe-buffer": "5.1.2" + "ip": "^1.1.0", + "safe-buffer": "^5.0.1" } }, "dns-txt": { @@ -3531,7 +3531,7 @@ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { - "buffer-indexof": "1.1.1" + "buffer-indexof": "^1.0.0" } }, "dom-converter": { @@ -3540,7 +3540,7 @@ "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=", "dev": true, "requires": { - "utila": "0.3.3" + "utila": "~0.3" }, "dependencies": { "utila": { @@ -3557,10 +3557,10 @@ "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", "dev": true, "requires": { - "custom-event": "1.0.1", - "ent": "2.2.0", - "extend": "3.0.1", - "void-elements": "2.0.1" + "custom-event": "~1.0.0", + "ent": "~2.2.0", + "extend": "^3.0.0", + "void-elements": "^2.0.0" } }, "dom-serializer": { @@ -3569,8 +3569,8 @@ "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "dev": true, "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" + "domelementtype": "~1.1.1", + "entities": "~1.1.1" }, "dependencies": { "domelementtype": { @@ -3598,7 +3598,7 @@ "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=", "dev": true, "requires": { - "domelementtype": "1.3.0" + "domelementtype": "1" } }, "domhelper": { @@ -3606,9 +3606,9 @@ "resolved": "https://registry.npmjs.org/domhelper/-/domhelper-0.9.1.tgz", "integrity": "sha1-JlVOW6wsnpWF3KUAl431Bn1kvQA=", "requires": { - "browserify": "16.2.2", - "classie": "1.0.0", - "util-extend": "1.0.3" + "browserify": ">=3.46.0", + "classie": ">=0.0.1", + "util-extend": "^1.0.1" } }, "domutils": { @@ -3617,8 +3617,8 @@ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "dev": true, "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" + "dom-serializer": "0", + "domelementtype": "1" } }, "dotenv": { @@ -3641,7 +3641,7 @@ "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.2" } }, "duplexify": { @@ -3650,10 +3650,10 @@ "integrity": "sha1-WSkD9dgLONA3IgVBJk1poZj7NBA=", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "stream-shift": "1.0.0" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" } }, "ecc-jsbn": { @@ -3663,7 +3663,7 @@ "dev": true, "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "ee-first": { @@ -3689,13 +3689,13 @@ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0", - "hash.js": "1.1.4", - "hmac-drbg": "1.0.1", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" } }, "emojis-list": { @@ -3714,10 +3714,10 @@ "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-4.0.1.tgz", "integrity": "sha512-AlSE+ugBIpLL0i9if2SlnOZ4oWj/XvBb8tw2Ie/pFB73vdYs5O/6plRyqIgjbZbz8onaL20AAuMP87LWbP56IQ==", "requires": { - "abstract-leveldown": "4.0.3", - "level-codec": "8.0.0", - "level-errors": "1.1.2", - "xtend": "4.0.1" + "abstract-leveldown": "^4.0.0", + "level-codec": "^8.0.0", + "level-errors": "^1.0.4", + "xtend": "^4.0.1" }, "dependencies": { "level-codec": { @@ -3732,7 +3732,7 @@ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=", "requires": { - "once": "1.4.0" + "once": "^1.4.0" } }, "end-stream": { @@ -3740,7 +3740,7 @@ "resolved": "https://registry.npmjs.org/end-stream/-/end-stream-0.1.0.tgz", "integrity": "sha1-MgA/P0OKKwFDFoE3+PpumGbIHtU=", "requires": { - "write-stream": "0.4.3" + "write-stream": "~0.4.3" } }, "engine.io": { @@ -3749,12 +3749,12 @@ "integrity": "sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==", "dev": true, "requires": { - "accepts": "1.3.5", + "accepts": "~1.3.4", "base64id": "1.0.0", "cookie": "0.3.1", - "debug": "3.1.0", - "engine.io-parser": "2.1.2", - "ws": "3.3.3" + "debug": "~3.1.0", + "engine.io-parser": "~2.1.0", + "ws": "~3.3.1" }, "dependencies": { "debug": { @@ -3776,14 +3776,14 @@ "requires": { "component-emitter": "1.2.1", "component-inherit": "0.0.3", - "debug": "3.1.0", - "engine.io-parser": "2.1.2", + "debug": "~3.1.0", + "engine.io-parser": "~2.1.1", "has-cors": "1.1.0", "indexof": "0.0.1", "parseqs": "0.0.5", "parseuri": "0.0.5", - "ws": "3.3.3", - "xmlhttprequest-ssl": "1.5.5", + "ws": "~3.3.1", + "xmlhttprequest-ssl": "~1.5.4", "yeast": "0.1.2" }, "dependencies": { @@ -3805,10 +3805,10 @@ "dev": true, "requires": { "after": "0.8.2", - "arraybuffer.slice": "0.0.7", + "arraybuffer.slice": "~0.0.7", "base64-arraybuffer": "0.1.5", "blob": "0.0.4", - "has-binary2": "1.0.3" + "has-binary2": "~1.0.2" } }, "enhanced-resolve": { @@ -3817,9 +3817,9 @@ "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "memory-fs": "0.4.1", - "tapable": "1.0.0" + "graceful-fs": "^4.1.2", + "memory-fs": "^0.4.0", + "tapable": "^1.0.0" } }, "ent": { @@ -3839,7 +3839,7 @@ "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=", "requires": { - "prr": "1.0.1" + "prr": "~1.0.1" } }, "error-ex": { @@ -3848,7 +3848,7 @@ "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "es-abstract": { @@ -3857,11 +3857,11 @@ "integrity": "sha1-nbvdJ8aFbwABQhyhh4LXhr+KYWU=", "dev": true, "requires": { - "es-to-primitive": "1.1.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "is-callable": "1.1.4", - "is-regex": "1.0.4" + "es-to-primitive": "^1.1.1", + "function-bind": "^1.1.1", + "has": "^1.0.1", + "is-callable": "^1.1.3", + "is-regex": "^1.0.4" } }, "es-to-primitive": { @@ -3870,9 +3870,9 @@ "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", "dev": true, "requires": { - "is-callable": "1.1.4", - "is-date-object": "1.0.1", - "is-symbol": "1.0.1" + "is-callable": "^1.1.1", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.1" } }, "es3ify": { @@ -3880,9 +3880,9 @@ "resolved": "https://registry.npmjs.org/es3ify/-/es3ify-0.1.4.tgz", "integrity": "sha1-rZ+l3xrjTz8x4SEbWBiy1RB439E=", "requires": { - "esprima-fb": "3001.1.0-dev-harmony-fb", - "jstransform": "3.0.0", - "through": "2.3.8" + "esprima-fb": "~3001.0001.0000-dev-harmony-fb", + "jstransform": "~3.0.0", + "through": "~2.3.4" }, "dependencies": { "esprima-fb": { @@ -3898,9 +3898,9 @@ "integrity": "sha1-C/33tHPaWRnVrfO9Jc63VPzMNlM=", "dev": true, "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "next-tick": "1.0.0" + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.1", + "next-tick": "1" } }, "es6-denodeify": { @@ -3914,9 +3914,9 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" } }, "es6-promise": { @@ -3931,7 +3931,7 @@ "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", "dev": true, "requires": { - "es6-promise": "4.2.4" + "es6-promise": "^4.0.3" } }, "es6-symbol": { @@ -3940,8 +3940,8 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45" + "d": "1", + "es5-ext": "~0.10.14" } }, "escape-html": { @@ -3965,11 +3965,11 @@ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", "requires": { - "esprima": "2.7.3", - "estraverse": "1.9.3", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.2.0" + "esprima": "^2.7.1", + "estraverse": "^1.9.1", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.2.0" }, "dependencies": { "source-map": { @@ -3978,7 +3978,7 @@ "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", "optional": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -3989,8 +3989,8 @@ "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==", "dev": true, "requires": { - "esrecurse": "4.2.1", - "estraverse": "4.2.0" + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" }, "dependencies": { "estraverse": { @@ -4017,7 +4017,7 @@ "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.1.0" }, "dependencies": { "estraverse": { @@ -4049,13 +4049,13 @@ "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", "requires": { - "duplexer": "0.1.1", - "from": "0.1.7", - "map-stream": "0.1.0", + "duplexer": "~0.1.1", + "from": "~0", + "map-stream": "~0.1.0", "pause-stream": "0.0.11", - "split": "0.3.3", - "stream-combiner": "0.0.4", - "through": "2.3.8" + "split": "0.3", + "stream-combiner": "~0.0.4", + "through": "~2.3.1" } }, "eventemitter3": { @@ -4076,7 +4076,7 @@ "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", "dev": true, "requires": { - "original": "1.0.2" + "original": ">=0.0.5" } }, "evp_bytestokey": { @@ -4084,8 +4084,8 @@ "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=", "requires": { - "md5.js": "1.3.4", - "safe-buffer": "5.1.2" + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" } }, "execa": { @@ -4094,13 +4094,13 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "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" }, "dependencies": { "cross-spawn": { @@ -4109,9 +4109,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.3", - "shebang-command": "1.2.0", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } } } @@ -4128,9 +4128,9 @@ "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", "dev": true, "requires": { - "array-slice": "0.2.3", - "array-unique": "0.2.1", - "braces": "0.1.5" + "array-slice": "^0.2.3", + "array-unique": "^0.2.1", + "braces": "^0.1.2" }, "dependencies": { "array-unique": { @@ -4145,7 +4145,7 @@ "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", "dev": true, "requires": { - "expand-range": "0.1.1" + "expand-range": "^0.1.0" } }, "expand-range": { @@ -4154,8 +4154,8 @@ "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", "dev": true, "requires": { - "is-number": "0.1.1", - "repeat-string": "0.2.2" + "is-number": "^0.1.1", + "repeat-string": "^0.2.2" } }, "is-number": { @@ -4177,13 +4177,13 @@ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -4191,7 +4191,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -4199,7 +4199,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -4210,7 +4210,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.4" + "fill-range": "^2.1.0" }, "dependencies": { "fill-range": { @@ -4219,11 +4219,11 @@ "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "3.0.0", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "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": { @@ -4232,7 +4232,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "isobject": { @@ -4250,7 +4250,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -4265,8 +4265,8 @@ "resolved": "https://registry.npmjs.org/exports-loader/-/exports-loader-0.6.4.tgz", "integrity": "sha1-1w/GEhl1s1/BKDDPUnVL4nQPyIY=", "requires": { - "loader-utils": "1.1.0", - "source-map": "0.5.7" + "loader-utils": "^1.0.2", + "source-map": "0.5.x" } }, "express": { @@ -4275,36 +4275,36 @@ "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", "dev": true, "requires": { - "accepts": "1.3.5", + "accepts": "~1.3.5", "array-flatten": "1.1.1", "body-parser": "1.18.2", "content-disposition": "0.5.2", - "content-type": "1.0.4", + "content-type": "~1.0.4", "cookie": "0.3.1", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "1.1.2", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", "finalhandler": "1.1.1", "fresh": "0.5.2", "merge-descriptors": "1.0.1", - "methods": "1.1.2", - "on-finished": "2.3.0", - "parseurl": "1.3.2", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.2", "path-to-regexp": "0.1.7", - "proxy-addr": "2.0.4", + "proxy-addr": "~2.0.3", "qs": "6.5.1", - "range-parser": "1.2.0", + "range-parser": "~1.2.0", "safe-buffer": "5.1.1", "send": "0.16.2", "serve-static": "1.13.2", "setprototypeof": "1.1.0", - "statuses": "1.4.0", - "type-is": "1.6.16", + "statuses": "~1.4.0", + "type-is": "~1.6.16", "utils-merge": "1.0.1", - "vary": "1.1.2" + "vary": "~1.1.2" }, "dependencies": { "array-flatten": { @@ -4338,8 +4338,8 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -4347,7 +4347,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -4357,14 +4357,14 @@ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=", "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -4372,7 +4372,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -4380,7 +4380,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -4388,7 +4388,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -4396,7 +4396,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -4404,9 +4404,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -4422,10 +4422,10 @@ "resolved": "https://registry.npmjs.org/falafel/-/falafel-1.2.0.tgz", "integrity": "sha1-wY0k71CRF0pJfzGM0ksCaiXN2rQ=", "requires": { - "acorn": "1.2.2", - "foreach": "2.0.5", + "acorn": "^1.0.3", + "foreach": "^2.0.5", "isarray": "0.0.1", - "object-keys": "1.0.12" + "object-keys": "^1.0.6" }, "dependencies": { "acorn": { @@ -4472,7 +4472,7 @@ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { - "websocket-driver": "0.7.0" + "websocket-driver": ">=0.5.1" } }, "fetch-cookie": { @@ -4480,8 +4480,8 @@ "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.7.0.tgz", "integrity": "sha512-Mm5pGlT3agW6t71xVM7vMZPIvI7T4FaTuFW4jari6dVzYHFDb3WZZsGpN22r/o3XMdkM0E7sPd1EGeyVbH2Tgg==", "requires": { - "es6-denodeify": "0.1.5", - "tough-cookie": "2.3.4" + "es6-denodeify": "^0.1.1", + "tough-cookie": "^2.3.1" } }, "file-loader": { @@ -4490,8 +4490,8 @@ "integrity": "sha1-b+iGRJsPKpNuQ8q6rAzb+zaVBvg=", "dev": true, "requires": { - "loader-utils": "1.1.0", - "schema-utils": "0.4.5" + "loader-utils": "^1.0.2", + "schema-utils": "^0.4.5" } }, "filename-regex": { @@ -4506,8 +4506,8 @@ "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", "dev": true, "requires": { - "glob": "7.1.2", - "minimatch": "3.0.4" + "glob": "^7.0.3", + "minimatch": "^3.0.3" } }, "fill-range": { @@ -4515,10 +4515,10 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -4526,7 +4526,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -4538,12 +4538,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.4.0", - "unpipe": "1.0.0" + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.2", + "statuses": "~1.4.0", + "unpipe": "~1.0.0" } }, "find-cache-dir": { @@ -4552,9 +4552,9 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "1.3.0", - "pkg-dir": "2.0.0" + "commondir": "^1.0.1", + "make-dir": "^1.0.0", + "pkg-dir": "^2.0.0" } }, "find-insert-index": { @@ -4568,7 +4568,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "flush-write-stream": { @@ -4577,8 +4577,8 @@ "integrity": "sha1-xdWG7zivYJdlC0m8QbVfq7GfNb0=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "inherits": "^2.0.1", + "readable-stream": "^2.0.4" } }, "follow-redirects": { @@ -4587,7 +4587,7 @@ "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", "dev": true, "requires": { - "debug": "3.1.0" + "debug": "^3.1.0" }, "dependencies": { "debug": { @@ -4611,17 +4611,17 @@ "resolved": "https://registry.npmjs.org/fontkit/-/fontkit-1.7.7.tgz", "integrity": "sha1-668tjz/t8wKuPGS0vurdwkf827E=", "requires": { - "babel-runtime": "6.26.0", - "brfs": "1.6.1", - "brotli": "1.3.2", - "browserify-optional": "1.0.1", - "clone": "1.0.4", - "deep-equal": "1.0.1", - "dfa": "1.1.0", - "restructure": "0.5.4", - "tiny-inflate": "1.0.2", - "unicode-properties": "1.1.0", - "unicode-trie": "0.3.1" + "babel-runtime": "^6.11.6", + "brfs": "^1.4.0", + "brotli": "^1.2.0", + "browserify-optional": "^1.0.0", + "clone": "^1.0.1", + "deep-equal": "^1.0.0", + "dfa": "^1.0.0", + "restructure": "^0.5.3", + "tiny-inflate": "^1.0.2", + "unicode-properties": "^1.0.0", + "unicode-trie": "^0.3.0" }, "dependencies": { "clone": { @@ -4642,7 +4642,7 @@ "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "foreach": { @@ -4662,9 +4662,9 @@ "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "dev": true, "requires": { - "asynckit": "0.4.0", + "asynckit": "^0.4.0", "combined-stream": "1.0.6", - "mime-types": "2.1.18" + "mime-types": "^2.1.12" } }, "forwarded": { @@ -4678,7 +4678,7 @@ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "fresh": { @@ -4698,8 +4698,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" } }, "fs-access": { @@ -4708,7 +4708,7 @@ "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", "dev": true, "requires": { - "null-check": "1.0.0" + "null-check": "^1.0.0" } }, "fs-constants": { @@ -4722,9 +4722,9 @@ "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "fs-write-stream-atomic": { @@ -4733,10 +4733,10 @@ "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "iferr": "0.1.5", - "imurmurhash": "0.1.4", - "readable-stream": "2.3.6" + "graceful-fs": "^4.1.2", + "iferr": "^0.1.5", + "imurmurhash": "^0.1.4", + "readable-stream": "1 || 2" } }, "fs.realpath": { @@ -4750,8 +4750,8 @@ "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", "optional": true, "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.10.0" + "nan": "^2.9.2", + "node-pre-gyp": "^0.10.0" }, "dependencies": { "abbrev": { @@ -4773,8 +4773,8 @@ "bundled": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { @@ -4785,7 +4785,7 @@ "version": "1.1.11", "bundled": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -4839,7 +4839,7 @@ "bundled": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -4852,14 +4852,14 @@ "bundled": true, "optional": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { @@ -4867,12 +4867,12 @@ "bundled": true, "optional": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -4885,7 +4885,7 @@ "bundled": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "^2.1.0" } }, "ignore-walk": { @@ -4893,7 +4893,7 @@ "bundled": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -4901,8 +4901,8 @@ "bundled": true, "optional": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -4918,7 +4918,7 @@ "version": "1.0.0", "bundled": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -4930,7 +4930,7 @@ "version": "3.0.4", "bundled": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -4941,8 +4941,8 @@ "version": "2.2.4", "bundled": true, "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "safe-buffer": "^5.1.1", + "yallist": "^3.0.0" } }, "minizlib": { @@ -4950,7 +4950,7 @@ "bundled": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "mkdirp": { @@ -4970,9 +4970,9 @@ "bundled": true, "optional": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -4980,16 +4980,16 @@ "bundled": true, "optional": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { @@ -4997,8 +4997,8 @@ "bundled": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -5011,8 +5011,8 @@ "bundled": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -5020,10 +5020,10 @@ "bundled": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { @@ -5039,7 +5039,7 @@ "version": "1.4.0", "bundled": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -5057,8 +5057,8 @@ "bundled": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -5076,10 +5076,10 @@ "bundled": true, "optional": true, "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.5.1", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -5094,13 +5094,13 @@ "bundled": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -5108,7 +5108,7 @@ "bundled": true, "optional": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -5144,9 +5144,9 @@ "version": "1.0.2", "bundled": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -5154,14 +5154,14 @@ "bundled": true, "optional": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { "version": "3.0.1", "bundled": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -5174,13 +5174,13 @@ "bundled": true, "optional": true, "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.1", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -5193,7 +5193,7 @@ "bundled": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { @@ -5212,10 +5212,10 @@ "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.2" + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" } }, "function-bind": { @@ -5233,14 +5233,14 @@ "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.3" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "gaze": { @@ -5250,7 +5250,7 @@ "dev": true, "optional": true, "requires": { - "globule": "1.2.1" + "globule": "^1.0.0" } }, "get-assigned-identifiers": { @@ -5287,7 +5287,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "git-describe": { @@ -5295,8 +5295,8 @@ "resolved": "https://registry.npmjs.org/git-describe/-/git-describe-4.0.3.tgz", "integrity": "sha1-2BSCqK2nodgeBg1DisjhG0o5AzY=", "requires": { - "lodash": "4.17.10", - "semver": "5.5.0" + "lodash": "^4.16.6", + "semver": "^5.3.0" } }, "github-from-package": { @@ -5309,12 +5309,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-base": { @@ -5323,8 +5323,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "glob-parent": { @@ -5333,7 +5333,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "is-extglob": { @@ -5348,7 +5348,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -5358,8 +5358,8 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { "is-glob": { @@ -5367,7 +5367,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -5384,12 +5384,12 @@ "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", "dev": true, "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "glob": "7.1.2", - "ignore": "3.3.10", - "pify": "3.0.0", - "slash": "1.0.0" + "array-union": "^1.0.1", + "dir-glob": "^2.0.0", + "glob": "^7.1.2", + "ignore": "^3.3.5", + "pify": "^3.0.0", + "slash": "^1.0.0" } }, "globule": { @@ -5399,9 +5399,9 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.2", - "lodash": "4.17.10", - "minimatch": "3.0.4" + "glob": "~7.1.1", + "lodash": "~4.17.10", + "minimatch": "~3.0.2" } }, "graceful-fs": { @@ -5426,10 +5426,10 @@ "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" }, "dependencies": { "async": { @@ -5444,7 +5444,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } }, "uglify-js": { @@ -5454,9 +5454,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "source-map": { @@ -5482,8 +5482,8 @@ "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "dev": true, "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" + "ajv": "^5.1.0", + "har-schema": "^2.0.0" }, "dependencies": { "ajv": { @@ -5492,10 +5492,10 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } } } @@ -5505,7 +5505,7 @@ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=", "requires": { - "function-bind": "1.1.1" + "function-bind": "^1.1.1" } }, "has-ansi": { @@ -5513,7 +5513,7 @@ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-binary2": { @@ -5561,9 +5561,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { @@ -5571,8 +5571,8 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "kind-of": { @@ -5580,7 +5580,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -5590,8 +5590,8 @@ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "hash.js": { @@ -5599,8 +5599,8 @@ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz", "integrity": "sha512-A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw==", "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1" + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.0" } }, "he": { @@ -5619,9 +5619,9 @@ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "requires": { - "hash.js": "1.1.4", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" } }, "hosted-git-info": { @@ -5636,10 +5636,10 @@ "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, "requires": { - "inherits": "2.0.3", - "obuf": "1.1.2", - "readable-stream": "2.3.6", - "wbuf": "1.7.3" + "inherits": "^2.0.1", + "obuf": "^1.0.0", + "readable-stream": "^2.0.1", + "wbuf": "^1.1.0" } }, "html-entities": { @@ -5654,13 +5654,13 @@ "integrity": "sha512-Qr2JC9nsjK8oCrEmuB430ZIA8YWbF3D5LSjywD75FTuXmeqacwHgIM8wp3vHYzzPbklSjp53RdmDuzR4ub2HzA==", "dev": true, "requires": { - "camel-case": "3.0.0", - "clean-css": "4.1.11", - "commander": "2.16.0", - "he": "1.1.1", - "param-case": "2.1.1", - "relateurl": "0.2.7", - "uglify-js": "3.4.6" + "camel-case": "3.0.x", + "clean-css": "4.1.x", + "commander": "2.16.x", + "he": "1.1.x", + "param-case": "2.1.x", + "relateurl": "0.2.x", + "uglify-js": "3.4.x" }, "dependencies": { "clean-css": { @@ -5669,7 +5669,7 @@ "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "0.5.x" } }, "commander": { @@ -5686,12 +5686,12 @@ "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", "dev": true, "requires": { - "html-minifier": "3.5.19", - "loader-utils": "0.2.17", - "lodash": "4.17.10", - "pretty-error": "2.1.1", - "tapable": "1.0.0", - "toposort": "1.0.7", + "html-minifier": "^3.2.3", + "loader-utils": "^0.2.16", + "lodash": "^4.17.3", + "pretty-error": "^2.0.2", + "tapable": "^1.0.0", + "toposort": "^1.0.0", "util.promisify": "1.0.0" }, "dependencies": { @@ -5701,10 +5701,10 @@ "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", "dev": true, "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" + "big.js": "^3.1.3", + "emojis-list": "^2.0.0", + "json5": "^0.5.0", + "object-assign": "^4.0.1" } } } @@ -5720,10 +5720,10 @@ "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=", "dev": true, "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.1.0", - "domutils": "1.1.6", - "readable-stream": "1.0.34" + "domelementtype": "1", + "domhandler": "2.1", + "domutils": "1.1", + "readable-stream": "1.0" }, "dependencies": { "domutils": { @@ -5732,7 +5732,7 @@ "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=", "dev": true, "requires": { - "domelementtype": "1.3.0" + "domelementtype": "1" } }, "isarray": { @@ -5747,10 +5747,10 @@ "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -5773,10 +5773,10 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": "1.4.0" + "statuses": ">= 1.4.0 < 2" } }, "http-parser-js": { @@ -5791,9 +5791,9 @@ "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=", "dev": true, "requires": { - "eventemitter3": "3.1.0", - "follow-redirects": "1.5.0", - "requires-port": "1.0.0" + "eventemitter3": "^3.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" } }, "http-proxy-middleware": { @@ -5802,10 +5802,10 @@ "integrity": "sha1-CYfmu1pWBuWmkWjY+WeofxXdiqs=", "dev": true, "requires": { - "http-proxy": "1.17.0", - "is-glob": "4.0.0", - "lodash": "4.17.10", - "micromatch": "3.1.10" + "http-proxy": "^1.16.2", + "is-glob": "^4.0.0", + "lodash": "^4.17.5", + "micromatch": "^3.1.9" } }, "http-signature": { @@ -5814,9 +5814,9 @@ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.14.2" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "https-browserify": { @@ -5830,8 +5830,8 @@ "integrity": "sha1-UVUpcPoE1yPgTFbQQXjD+SWSu8A=", "dev": true, "requires": { - "agent-base": "4.2.1", - "debug": "3.1.0" + "agent-base": "^4.1.0", + "debug": "^3.1.0" }, "dependencies": { "debug": { @@ -5886,7 +5886,7 @@ "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", "dev": true, "requires": { - "import-from": "2.1.0" + "import-from": "^2.1.0" } }, "import-from": { @@ -5895,7 +5895,7 @@ "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "import-local": { @@ -5904,8 +5904,8 @@ "integrity": "sha1-Xk/9wD9P5sAJxnKb6yljHC+CJ7w=", "dev": true, "requires": { - "pkg-dir": "2.0.0", - "resolve-cwd": "2.0.0" + "pkg-dir": "^2.0.0", + "resolve-cwd": "^2.0.0" } }, "imurmurhash": { @@ -5927,7 +5927,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "indexof": { @@ -5941,8 +5941,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -5960,8 +5960,8 @@ "resolved": "https://registry.npmjs.org/inline-process-browser/-/inline-process-browser-1.0.0.tgz", "integrity": "sha1-RqYbFT3TybFiSxoAYm7bT39BTyI=", "requires": { - "falafel": "1.2.0", - "through2": "0.6.5" + "falafel": "^1.0.1", + "through2": "^0.6.5" }, "dependencies": { "isarray": { @@ -5974,10 +5974,10 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -5990,8 +5990,8 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "requires": { - "readable-stream": "1.0.34", - "xtend": "4.0.1" + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" } } } @@ -6001,7 +6001,7 @@ "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz", "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=", "requires": { - "source-map": "0.5.7" + "source-map": "~0.5.3" } }, "insert-module-globals": { @@ -6009,16 +6009,16 @@ "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz", "integrity": "sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw==", "requires": { - "JSONStream": "1.3.3", - "acorn-node": "1.5.2", - "combine-source-map": "0.8.0", - "concat-stream": "1.6.2", - "is-buffer": "1.1.6", - "path-is-absolute": "1.0.1", - "process": "0.11.10", - "through2": "2.0.3", - "undeclared-identifiers": "1.1.2", - "xtend": "4.0.1" + "JSONStream": "^1.0.3", + "acorn-node": "^1.5.2", + "combine-source-map": "^0.8.0", + "concat-stream": "^1.6.1", + "is-buffer": "^1.1.0", + "path-is-absolute": "^1.0.1", + "process": "~0.11.0", + "through2": "^2.0.0", + "undeclared-identifiers": "^1.1.2", + "xtend": "^4.0.0" } }, "internal-ip": { @@ -6027,7 +6027,7 @@ "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", "dev": true, "requires": { - "meow": "3.7.0" + "meow": "^3.3.0" } }, "interpret": { @@ -6046,7 +6046,7 @@ "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=", "dev": true, "requires": { - "loose-envify": "1.3.1" + "loose-envify": "^1.0.0" } }, "invert-kv": { @@ -6060,7 +6060,7 @@ "resolved": "https://registry.npmjs.org/ion-rangeslider/-/ion-rangeslider-2.2.0.tgz", "integrity": "sha1-OI8SzXBZOmGzNo+tbE8wpdqLl8k=", "requires": { - "jquery": "3.3.1" + "jquery": ">=1.8" } }, "ionic-cache": { @@ -6085,7 +6085,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6093,7 +6093,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6109,7 +6109,7 @@ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "requires": { - "binary-extensions": "1.11.0" + "binary-extensions": "^1.0.0" } }, "is-buffer": { @@ -6123,7 +6123,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-callable": { @@ -6137,7 +6137,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6145,7 +6145,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6161,9 +6161,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=", "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { @@ -6191,7 +6191,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-extendable": { @@ -6210,7 +6210,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -6218,7 +6218,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-glob": { @@ -6226,7 +6226,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.1" } }, "is-number": { @@ -6234,7 +6234,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6242,7 +6242,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6252,7 +6252,7 @@ "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", "requires": { - "is-number": "4.0.0" + "is-number": "^4.0.0" }, "dependencies": { "is-number": { @@ -6274,7 +6274,7 @@ "integrity": "sha1-WsSLNF72dTOb1sekipEhELJBz1I=", "dev": true, "requires": { - "is-path-inside": "1.0.1" + "is-path-inside": "^1.0.0" } }, "is-path-inside": { @@ -6283,7 +6283,7 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.1" } }, "is-plain-object": { @@ -6291,7 +6291,7 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "is-posix-bracket": { @@ -6312,7 +6312,7 @@ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "dev": true, "requires": { - "has": "1.0.3" + "has": "^1.0.1" } }, "is-stream": { @@ -6361,7 +6361,7 @@ "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", "dev": true, "requires": { - "buffer-alloc": "1.2.0" + "buffer-alloc": "^1.2.0" } }, "isexe": { @@ -6387,20 +6387,20 @@ "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", "dev": true, "requires": { - "abbrev": "1.0.9", - "async": "1.5.2", - "escodegen": "1.8.1", - "esprima": "2.7.3", - "glob": "5.0.15", - "handlebars": "4.0.11", - "js-yaml": "3.12.0", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "once": "1.4.0", - "resolve": "1.1.7", - "supports-color": "3.2.3", - "which": "1.3.1", - "wordwrap": "1.0.0" + "abbrev": "1.0.x", + "async": "1.x", + "escodegen": "1.8.x", + "esprima": "2.7.x", + "glob": "^5.0.15", + "handlebars": "^4.0.1", + "js-yaml": "3.x", + "mkdirp": "0.5.x", + "nopt": "3.x", + "once": "1.x", + "resolve": "1.1.x", + "supports-color": "^3.1.0", + "which": "^1.1.1", + "wordwrap": "^1.0.0" }, "dependencies": { "async": { @@ -6415,11 +6415,11 @@ "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "dev": true, "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-flag": { @@ -6440,7 +6440,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } @@ -6451,18 +6451,18 @@ "integrity": "sha1-TDsF0YwAFtECLgebmNyCxA9IiVQ=", "dev": true, "requires": { - "async": "2.6.1", - "compare-versions": "3.3.0", - "fileset": "2.0.3", - "istanbul-lib-coverage": "1.2.0", - "istanbul-lib-hook": "1.2.1", - "istanbul-lib-instrument": "1.10.1", - "istanbul-lib-report": "1.1.4", - "istanbul-lib-source-maps": "1.2.5", - "istanbul-reports": "1.3.0", - "js-yaml": "3.12.0", - "mkdirp": "0.5.1", - "once": "1.4.0" + "async": "^2.1.4", + "compare-versions": "^3.1.0", + "fileset": "^2.0.2", + "istanbul-lib-coverage": "^1.2.0", + "istanbul-lib-hook": "^1.2.0", + "istanbul-lib-instrument": "^1.10.1", + "istanbul-lib-report": "^1.1.4", + "istanbul-lib-source-maps": "^1.2.4", + "istanbul-reports": "^1.3.0", + "js-yaml": "^3.7.0", + "mkdirp": "^0.5.1", + "once": "^1.4.0" }, "dependencies": { "async": { @@ -6471,7 +6471,7 @@ "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "^4.17.10" } } } @@ -6482,10 +6482,10 @@ "integrity": "sha1-mVe9WSUrNz+uXFK3tRiOb94qCUk=", "dev": true, "requires": { - "convert-source-map": "1.5.1", - "istanbul-lib-instrument": "1.10.1", - "loader-utils": "1.1.0", - "schema-utils": "0.3.0" + "convert-source-map": "^1.5.0", + "istanbul-lib-instrument": "^1.7.3", + "loader-utils": "^1.1.0", + "schema-utils": "^0.3.0" }, "dependencies": { "ajv": { @@ -6494,10 +6494,10 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "schema-utils": { @@ -6506,7 +6506,7 @@ "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "dev": true, "requires": { - "ajv": "5.5.2" + "ajv": "^5.0.0" } } } @@ -6523,7 +6523,7 @@ "integrity": "sha1-9hTsRSh7Ko/E8H9WYK94dXVgGAU=", "dev": true, "requires": { - "append-transform": "1.0.0" + "append-transform": "^1.0.0" } }, "istanbul-lib-instrument": { @@ -6532,13 +6532,13 @@ "integrity": "sha1-cktLbKzrqGktPx+dByfiecQBr3s=", "dev": true, "requires": { - "babel-generator": "6.26.1", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.2.0", - "semver": "5.5.0" + "babel-generator": "^6.18.0", + "babel-template": "^6.16.0", + "babel-traverse": "^6.18.0", + "babel-types": "^6.18.0", + "babylon": "^6.18.0", + "istanbul-lib-coverage": "^1.2.0", + "semver": "^5.3.0" } }, "istanbul-lib-report": { @@ -6547,10 +6547,10 @@ "integrity": "sha1-6IbN9QXE672OCZ5DlqkNCijirLU=", "dev": true, "requires": { - "istanbul-lib-coverage": "1.2.0", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" + "istanbul-lib-coverage": "^1.2.0", + "mkdirp": "^0.5.1", + "path-parse": "^1.0.5", + "supports-color": "^3.1.2" }, "dependencies": { "has-flag": { @@ -6565,7 +6565,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } @@ -6576,11 +6576,11 @@ "integrity": "sha1-/+a+Tnq4bTYD5CkNVJkLFFBvybE=", "dev": true, "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.2.0", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "source-map": "0.5.7" + "debug": "^3.1.0", + "istanbul-lib-coverage": "^1.2.0", + "mkdirp": "^0.5.1", + "rimraf": "^2.6.1", + "source-map": "^0.5.3" }, "dependencies": { "debug": { @@ -6600,7 +6600,7 @@ "integrity": "sha1-LzIugeHZUgdnWX3KPCCgzOiaNVQ=", "dev": true, "requires": { - "handlebars": "4.0.11" + "handlebars": "^4.0.3" } }, "jasmine": { @@ -6609,9 +6609,9 @@ "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=", "dev": true, "requires": { - "exit": "0.1.2", - "glob": "7.1.2", - "jasmine-core": "2.8.0" + "exit": "^0.1.2", + "glob": "^7.0.6", + "jasmine-core": "~2.8.0" }, "dependencies": { "jasmine-core": { @@ -6634,7 +6634,7 @@ "integrity": "sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=", "dev": true, "requires": { - "diff": "3.5.0" + "diff": "^3.2.0" } }, "jasmine-spec-reporter": { @@ -6675,8 +6675,8 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", "integrity": "sha1-6u1lbsg0TxD1J8a/obbiJE3hZ9E=", "requires": { - "argparse": "1.0.10", - "esprima": "4.0.0" + "argparse": "^1.0.7", + "esprima": "^4.0.0" }, "dependencies": { "esprima": { @@ -6744,7 +6744,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "jsonify": { @@ -6775,7 +6775,7 @@ "integrity": "sha1-olkats7o2XvzvoMNv6IxO4fNZAs=", "requires": { "base62": "0.1.1", - "esprima-fb": "3001.1.0-dev-harmony-fb", + "esprima-fb": "~3001.1.0-dev-harmony-fb", "source-map": "0.1.31" }, "dependencies": { @@ -6789,7 +6789,7 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz", "integrity": "sha1-n3BNDWnZ4TioG63267T94z0VHGE=", "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -6800,11 +6800,11 @@ "integrity": "sha1-48KmxtcGrG5gMxQDbUPNQL7v3zc=", "dev": true, "requires": { - "core-js": "2.3.0", - "es6-promise": "3.0.2", - "lie": "3.1.1", - "pako": "1.0.6", - "readable-stream": "2.0.6" + "core-js": "~2.3.0", + "es6-promise": "~3.0.2", + "lie": "~3.1.0", + "pako": "~1.0.2", + "readable-stream": "~2.0.6" }, "dependencies": { "core-js": { @@ -6831,12 +6831,12 @@ "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "0.10.31", - "util-deprecate": "1.0.2" + "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": { @@ -6853,31 +6853,31 @@ "integrity": "sha512-ZTjyuDXVXhXsvJ1E4CnZzbCjSxD6sEdzEsFYogLuZM0yqvg/mgz+O+R1jb0J7uAQeuzdY8kJgx6hSNXLwFuHIQ==", "dev": true, "requires": { - "bluebird": "3.5.1", - "body-parser": "1.18.2", - "chokidar": "2.0.4", - "colors": "1.1.2", - "combine-lists": "1.0.1", - "connect": "3.6.6", - "core-js": "2.5.7", - "di": "0.0.1", - "dom-serialize": "2.2.1", - "expand-braces": "0.1.2", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "http-proxy": "1.17.0", - "isbinaryfile": "3.0.3", - "lodash": "4.17.10", - "log4js": "3.0.5", - "mime": "2.3.1", - "minimatch": "3.0.4", - "optimist": "0.6.1", - "qjobs": "1.2.0", - "range-parser": "1.2.0", - "rimraf": "2.6.2", - "safe-buffer": "5.1.2", + "bluebird": "^3.3.0", + "body-parser": "^1.16.1", + "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", + "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", + "mime": "^2.3.1", + "minimatch": "^3.0.2", + "optimist": "^0.6.1", + "qjobs": "^1.1.4", + "range-parser": "^1.2.0", + "rimraf": "^2.6.0", + "safe-buffer": "^5.0.1", "socket.io": "2.1.1", - "source-map": "0.6.1", + "source-map": "^0.6.1", "tmp": "0.0.33", "useragent": "2.2.1" }, @@ -6902,8 +6902,8 @@ "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", "dev": true, "requires": { - "fs-access": "1.0.1", - "which": "1.3.1" + "fs-access": "^1.0.0", + "which": "^1.2.1" } }, "karma-coverage-istanbul-reporter": { @@ -6912,8 +6912,8 @@ "integrity": "sha1-O13/RmT6W41RlrmInj9hwforgNk=", "dev": true, "requires": { - "istanbul-api": "1.3.1", - "minimatch": "3.0.4" + "istanbul-api": "^1.3.1", + "minimatch": "^3.0.4" } }, "karma-jasmine": { @@ -6928,7 +6928,7 @@ "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=", "dev": true, "requires": { - "karma-jasmine": "1.1.2" + "karma-jasmine": "^1.0.2" } }, "karma-mocha-reporter": { @@ -6937,9 +6937,9 @@ "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=", "dev": true, "requires": { - "chalk": "2.4.1", - "log-symbols": "2.2.0", - "strip-ansi": "4.0.0" + "chalk": "^2.1.0", + "log-symbols": "^2.1.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "ansi-regex": { @@ -6954,7 +6954,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -6965,7 +6965,7 @@ "integrity": "sha1-Nt1NjKFUtirOlWliNvrjfK8Kfd4=", "dev": true, "requires": { - "source-map-support": "0.5.9" + "source-map-support": "^0.5.5" } }, "killable": { @@ -6984,9 +6984,9 @@ "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz", "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==", "requires": { - "inherits": "2.0.3", - "isarray": "2.0.4", - "stream-splicer": "2.0.0" + "inherits": "^2.0.1", + "isarray": "^2.0.4", + "stream-splicer": "^2.0.0" }, "dependencies": { "isarray": { @@ -7001,7 +7001,7 @@ "resolved": "https://registry.npmjs.org/ladda/-/ladda-2.0.1.tgz", "integrity": "sha512-ynRaMdW9y9ABRdTUWa60HSQjtTkoEZMiQDzzYsX8yxIEm7mxL/sxpvoLutYox1XluRif3DxLDg+3Dl1wurjnJg==", "requires": { - "spin.js": "4.0.0" + "spin.js": "^4.0.0" } }, "lazy-cache": { @@ -7017,7 +7017,7 @@ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "leb": { @@ -7032,15 +7032,15 @@ "integrity": "sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==", "dev": true, "requires": { - "clone": "2.1.2", - "errno": "0.1.7", - "graceful-fs": "4.1.11", - "image-size": "0.5.5", - "mime": "1.6.0", - "mkdirp": "0.5.1", - "promise": "7.3.1", - "request": "2.87.0", - "source-map": "0.6.1" + "clone": "^2.1.2", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "mime": "^1.4.1", + "mkdirp": "^0.5.0", + "promise": "^7.1.1", + "request": "^2.83.0", + "source-map": "~0.6.0" }, "dependencies": { "source-map": { @@ -7058,9 +7058,9 @@ "integrity": "sha1-LBNSxbCaT4QQFJAnT9UWdN5BNj4=", "dev": true, "requires": { - "clone": "2.1.2", - "loader-utils": "1.1.0", - "pify": "3.0.0" + "clone": "^2.1.1", + "loader-utils": "^1.1.0", + "pify": "^3.0.0" } }, "level": { @@ -7068,9 +7068,9 @@ "resolved": "https://registry.npmjs.org/level/-/level-3.0.2.tgz", "integrity": "sha512-2qYbbiptPsPWGUI+AgB1gTNXqIjPpALRqrQyNx1zWYNZxhhuzEj/IE4Unu9weEBnsUEocfYe56xOGlAceb8/Fg==", "requires": { - "level-packager": "2.1.1", - "leveldown": "3.0.0", - "opencollective-postinstall": "2.0.0" + "level-packager": "^2.0.2", + "leveldown": "^3.0.0", + "opencollective-postinstall": "^2.0.0" } }, "level-codec": { @@ -7083,7 +7083,7 @@ "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.1.2.tgz", "integrity": "sha512-Sw/IJwWbPKF5Ai4Wz60B52yj0zYeqzObLh8k1Tk88jVmD51cJSKWSYpRyhVIvFzZdvsPqlH5wfhp/yxdsaQH4w==", "requires": { - "errno": "0.1.7" + "errno": "~0.1.1" } }, "level-iterator-stream": { @@ -7091,9 +7091,9 @@ "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.3.tgz", "integrity": "sha512-I6Heg70nfF+e5Y3/qfthJFexhRw/Gi3bIymCoXAlijZdAcLaPuWSJs3KXyTYf23ID6g0o2QF62Yh+grOXY3Rig==", "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "inherits": "^2.0.1", + "readable-stream": "^2.0.5", + "xtend": "^4.0.0" } }, "level-packager": { @@ -7101,8 +7101,8 @@ "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-2.1.1.tgz", "integrity": "sha512-6l3G6dVkmdvHwOJrEA9d9hL6SSFrzwjQoLP8HsvohOgfY/8Z9LyTKNCM5Gc84wtsUWCuIHu6r+S6WrCtTWUJCw==", "requires": { - "encoding-down": "4.0.1", - "levelup": "2.0.2" + "encoding-down": "~4.0.0", + "levelup": "^2.0.0" }, "dependencies": { "levelup": { @@ -7110,10 +7110,10 @@ "resolved": "https://registry.npmjs.org/levelup/-/levelup-2.0.2.tgz", "integrity": "sha512-us+nTLUyd/eLnclYYddOCdAVw1hnymGx/9p4Jr5ThohStsjLqMVmbYiz6/SYFZEPXNF+AKQSvh6fA2e2KZpC8w==", "requires": { - "deferred-leveldown": "3.0.0", - "level-errors": "1.1.2", - "level-iterator-stream": "2.0.3", - "xtend": "4.0.1" + "deferred-leveldown": "~3.0.0", + "level-errors": "~1.1.0", + "level-iterator-stream": "~2.0.0", + "xtend": "~4.0.0" } } } @@ -7123,7 +7123,7 @@ "resolved": "https://registry.npmjs.org/level-write-stream/-/level-write-stream-1.0.0.tgz", "integrity": "sha1-P3+7Z5pVE3wP6zA97nZuEu4Twdw=", "requires": { - "end-stream": "0.1.0" + "end-stream": "~0.1.0" } }, "leveldown": { @@ -7131,11 +7131,11 @@ "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-3.0.0.tgz", "integrity": "sha512-CA2mRUDTgVscTDOCvHSgYvksqj1VW7g3ss2idWfITSB7l201ahQJ81cwLTupW76idbjpx7zmmmpdttYnnHWWtA==", "requires": { - "abstract-leveldown": "4.0.3", - "bindings": "1.3.0", - "fast-future": "1.0.2", - "nan": "2.8.0", - "prebuild-install": "2.5.3" + "abstract-leveldown": "~4.0.0", + "bindings": "~1.3.0", + "fast-future": "~1.0.2", + "nan": "~2.8.0", + "prebuild-install": "^2.1.0" }, "dependencies": { "nan": { @@ -7150,10 +7150,10 @@ "resolved": "https://registry.npmjs.org/levelup/-/levelup-3.0.1.tgz", "integrity": "sha512-TrrLDPC/BfP35ei2uK+L6Cc7kpI1NxIChwp+BUB6jrHG3A8gtrr9jx1UZ9bi2w1O6VN7jYO4LUoq1iKRP5AREg==", "requires": { - "deferred-leveldown": "4.0.2", - "level-errors": "2.0.0", - "level-iterator-stream": "2.0.3", - "xtend": "4.0.1" + "deferred-leveldown": "~4.0.0", + "level-errors": "~2.0.0", + "level-iterator-stream": "~2.0.0", + "xtend": "~4.0.0" }, "dependencies": { "abstract-leveldown": { @@ -7161,7 +7161,7 @@ "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz", "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==", "requires": { - "xtend": "4.0.1" + "xtend": "~4.0.0" } }, "deferred-leveldown": { @@ -7169,8 +7169,8 @@ "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-4.0.2.tgz", "integrity": "sha512-5fMC8ek8alH16QiV0lTCis610D1Zt1+LA4MS4d63JgS32lrCjTFDUFz2ao09/j2I4Bqb5jL4FZYwu7Jz0XO1ww==", "requires": { - "abstract-leveldown": "5.0.0", - "inherits": "2.0.3" + "abstract-leveldown": "~5.0.0", + "inherits": "^2.0.3" } }, "level-errors": { @@ -7178,7 +7178,7 @@ "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.0.tgz", "integrity": "sha512-AmY4HCp9h3OiU19uG+3YWkdELgy05OTP/r23aNHaQKWv8DO787yZgsEuGVkoph40uwN+YdUKnANlrxSsoOaaxg==", "requires": { - "errno": "0.1.7" + "errno": "~0.1.1" } } } @@ -7188,8 +7188,8 @@ "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "license-webpack-plugin": { @@ -7198,7 +7198,7 @@ "integrity": "sha512-iwuNFMWbXS76WiQXJBTs8/7Tby4NQnY8AIkBMuJG5El79UT8zWrJQMfpW+KRXt4Y2Bs5uk+Myg/MO7ROSF8jzA==", "dev": true, "requires": { - "ejs": "2.6.1" + "ejs": "^2.5.7" } }, "lie": { @@ -7206,7 +7206,7 @@ "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=", "requires": { - "immediate": "3.0.6" + "immediate": "~3.0.5" } }, "linebreak": { @@ -7215,8 +7215,8 @@ "integrity": "sha1-BSZICmLAW9Z58+nZmDDgnGp9DtY=", "requires": { "base64-js": "0.0.8", - "brfs": "1.6.1", - "unicode-trie": "0.3.1" + "brfs": "^1.3.0", + "unicode-trie": "^0.3.0" }, "dependencies": { "base64-js": { @@ -7232,11 +7232,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" }, "dependencies": { "pify": { @@ -7258,9 +7258,9 @@ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1" + "big.js": "^3.1.3", + "emojis-list": "^2.0.0", + "json5": "^0.5.0" } }, "localforage": { @@ -7276,10 +7276,10 @@ "resolved": "https://registry.npmjs.org/lie/-/lie-3.0.2.tgz", "integrity": "sha1-/9oh17uibzd8rYZdNkmy/Izjn+o=", "requires": { - "es3ify": "0.1.4", - "immediate": "3.0.6", - "inline-process-browser": "1.0.0", - "unreachable-branch-transform": "0.3.0" + "es3ify": "^0.1.3", + "immediate": "~3.0.5", + "inline-process-browser": "^1.0.0", + "unreachable-branch-transform": "^0.3.0" } } } @@ -7290,7 +7290,7 @@ "integrity": "sha1-+TR4nmrZo5usBf3RFogS9DhTV2I=", "requires": { "@types/localforage": "0.0.30", - "localforage": "1.4.3" + "localforage": ">=1.4.0" } }, "locate-path": { @@ -7299,8 +7299,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" } }, "lodash": { @@ -7348,7 +7348,7 @@ "integrity": "sha1-V0Dhxdbw39pK2TI7UzIQfva0xAo=", "dev": true, "requires": { - "chalk": "2.4.1" + "chalk": "^2.0.1" } }, "log4js": { @@ -7357,10 +7357,10 @@ "integrity": "sha512-IX5c3G/7fuTtdr0JjOT2OIR12aTESVhsH6cEsijloYwKgcPRlO6DgOU72v0UFhWcoV1HN6+M3dwT89qVPLXm0w==", "dev": true, "requires": { - "circular-json": "0.5.5", - "date-format": "1.2.0", - "debug": "3.1.0", - "rfdc": "1.1.2", + "circular-json": "^0.5.5", + "date-format": "^1.2.0", + "debug": "^3.1.0", + "rfdc": "^1.1.2", "streamroller": "0.7.0" }, "dependencies": { @@ -7387,8 +7387,8 @@ "integrity": "sha1-NvxPWZbWZA9Tn/IDuoGWQWgNdaI=", "dev": true, "requires": { - "es6-symbol": "3.1.1", - "object.assign": "4.1.0" + "es6-symbol": "^3.1.1", + "object.assign": "^4.1.0" } }, "long": { @@ -7409,7 +7409,7 @@ "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { - "js-tokens": "3.0.2" + "js-tokens": "^3.0.0" } }, "loud-rejection": { @@ -7418,8 +7418,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "lower-case": { @@ -7434,8 +7434,8 @@ "integrity": "sha1-oRdc80lt/IQ2wVbDNLSVWZK85pw=", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "ltgt": { @@ -7448,7 +7448,7 @@ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz", "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==", "requires": { - "vlq": "0.2.3" + "vlq": "^0.2.2" } }, "make-dir": { @@ -7457,7 +7457,7 @@ "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "make-error": { @@ -7487,7 +7487,7 @@ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "math-random": { @@ -7501,8 +7501,8 @@ "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.3" + "hash-base": "^3.0.0", + "inherits": "^2.0.1" } }, "media-typer": { @@ -7517,7 +7517,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "memory-fs": { @@ -7526,8 +7526,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "0.1.7", - "readable-stream": "2.3.6" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" } }, "meow": { @@ -7536,16 +7536,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" }, "dependencies": { "minimist": { @@ -7567,7 +7567,7 @@ "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz", "integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=", "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } }, "mergesort": { @@ -7586,19 +7586,19 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=", "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "miller-rabin": { @@ -7606,8 +7606,8 @@ "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=", "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0" + "bn.js": "^4.0.0", + "brorand": "^1.0.1" } }, "mime": { @@ -7628,7 +7628,7 @@ "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "dev": true, "requires": { - "mime-db": "1.33.0" + "mime-db": "~1.33.0" } }, "mimic-fn": { @@ -7653,9 +7653,9 @@ "integrity": "sha512-XWuB3G61Rtasq/gLe7cp5cuozehE6hN+E4sxCamRR/WDiHTg+f7ZIAS024r8UJQffY+e2gGELXQZgQoFDfNDCg==", "dev": true, "requires": { - "@webpack-contrib/schema-utils": "1.0.0-beta.0", - "loader-utils": "1.1.0", - "webpack-sources": "1.1.0" + "@webpack-contrib/schema-utils": "^1.0.0-beta.0", + "loader-utils": "^1.1.0", + "webpack-sources": "^1.1.0" } }, "minimalistic-assert": { @@ -7673,7 +7673,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -7687,16 +7687,16 @@ "integrity": "sha1-NEKlCPr8KFAEhv7qmUCWduTuWm8=", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.6.0", - "end-of-stream": "1.4.1", - "flush-write-stream": "1.0.3", - "from2": "2.3.0", - "parallel-transform": "1.1.0", - "pump": "2.0.1", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.3" + "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": "^2.0.1", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" } }, "mixin-deep": { @@ -7704,8 +7704,8 @@ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", "integrity": "sha1-pJ5yaNzhoNlpjkUybFYm3zVD0P4=", "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -7713,7 +7713,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -7724,8 +7724,8 @@ "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", "dev": true, "requires": { - "for-in": "0.1.8", - "is-extendable": "0.1.1" + "for-in": "^0.1.3", + "is-extendable": "^0.1.1" }, "dependencies": { "for-in": { @@ -7749,21 +7749,21 @@ "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.1.0.tgz", "integrity": "sha512-NPs5N511VD1rrVJihSso/LiBShRbJALYBKzDW91uZYy7BpjnO4bGnZL3HjZ9yKcFdZUWwaYjDz9zxbuP7vKMuQ==", "requires": { - "JSONStream": "1.3.3", - "browser-resolve": "1.11.3", - "cached-path-relative": "1.0.1", - "concat-stream": "1.6.2", - "defined": "1.0.0", - "detective": "5.1.0", - "duplexer2": "0.1.4", - "inherits": "2.0.3", - "parents": "1.0.1", - "readable-stream": "2.3.6", - "resolve": "1.8.1", - "stream-combiner2": "1.1.1", - "subarg": "1.0.0", - "through2": "2.0.3", - "xtend": "4.0.1" + "JSONStream": "^1.0.3", + "browser-resolve": "^1.7.0", + "cached-path-relative": "^1.0.0", + "concat-stream": "~1.6.0", + "defined": "^1.0.0", + "detective": "^5.0.2", + "duplexer2": "^0.1.2", + "inherits": "^2.0.1", + "parents": "^1.0.0", + "readable-stream": "^2.0.2", + "resolve": "^1.4.0", + "stream-combiner2": "^1.1.1", + "subarg": "^1.0.0", + "through2": "^2.0.0", + "xtend": "^4.0.0" } }, "moment": { @@ -7777,12 +7777,12 @@ "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "dev": true, "requires": { - "aproba": "1.2.0", - "copy-concurrently": "1.0.5", - "fs-write-stream-atomic": "1.0.10", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "run-queue": "1.0.3" + "aproba": "^1.1.1", + "copy-concurrently": "^1.0.0", + "fs-write-stream-atomic": "^1.0.8", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.3" } }, "ms": { @@ -7796,8 +7796,8 @@ "integrity": "sha1-oOx72QVcQoL3kMPIL04o2zsxsik=", "dev": true, "requires": { - "dns-packet": "1.3.1", - "thunky": "1.0.2" + "dns-packet": "^1.3.1", + "thunky": "^1.0.2" } }, "multicast-dns-service-types": { @@ -7817,18 +7817,18 @@ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-odd": "2.0.0", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-odd": "^2.0.0", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" } }, "negotiator": { @@ -7854,7 +7854,7 @@ "resolved": "https://registry.npmjs.org/ng-busy/-/ng-busy-6.0.1.tgz", "integrity": "sha512-qFZpSYvoHzTFaVDyyGbZuMjxPLrBL+NL4NttWYBtzmSTORfybrV4Z8Pl2BpNP0yjIsBx6J8nM0W469CVQyic+A==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "ng-select": { @@ -7888,7 +7888,7 @@ "integrity": "sha1-Z/VQjyOvZEHwULHDkm0kZC7fz58=", "requires": { "@types/pdf": "0.0.31", - "pdfjs-dist": "1.10.100" + "pdfjs-dist": "^1.6.329" } }, "ngx-bootstrap": { @@ -7901,11 +7901,12 @@ "resolved": "https://registry.npmjs.org/ngx-cookie/-/ngx-cookie-4.0.2.tgz", "integrity": "sha512-YCak+Itql8EDkMfr9lzCNd2wEeV+uflbv2V1mi9LCzUyFcO+W53S/BbuZS5r9M8MZzUiBl4AmpEDEKYiXrb3Sw==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "ngx-file-uploader": { - "version": "git+https://github.com/enyachoke/ngx-file-uploader.git#b5e509fbff949f6ae0f1cd5dabc71eae53e33412" + "version": "git+https://github.com/enyachoke/ngx-file-uploader.git#b5e509fbff949f6ae0f1cd5dabc71eae53e33412", + "from": "git+https://github.com/enyachoke/ngx-file-uploader.git#0.0.9" }, "ngx-mydatepicker": { "version": "0.1.15", @@ -7913,38 +7914,39 @@ "integrity": "sha1-0dVmsb9rZm09Hv6LudPZnKLY0e4=" }, "ngx-openmrs-formentry": { - "version": "git+https://github.com/AMPATH/ngx-openmrs-formentry.git#477f1deeaa685d2c44df2dd9acd03e2c05e758c8", - "requires": { - "@angular/animations": "6.1.2", - "@angular/cdk": "6.4.3", - "@angular/common": "6.1.2", - "@angular/compiler": "6.1.2", - "@angular/core": "6.1.2", - "@angular/forms": "6.1.2", - "@angular/http": "6.1.2", - "@angular/material": "6.4.3", - "@angular/material-moment-adapter": "6.4.6", - "@angular/platform-browser": "6.1.2", - "@angular/platform-browser-dynamic": "6.1.2", - "@angular/router": "6.1.2", - "amazing-time-picker": "1.5.3", - "bootstrap": "3.3.7", - "core-js": "2.5.7", - "font-awesome": "4.7.0", - "hammerjs": "2.0.8", - "jquery": "3.3.1", - "lodash": "4.17.10", - "moment": "2.19.3", - "ngx-bootstrap": "3.0.1", - "ngx-cookie": "4.0.2", - "ngx-file-uploader": "git+https://github.com/Ampath/ngx-file-uploader.git#590321b7a62a2e91bac9355a1871fc713d29c3a3", - "reflect-metadata": "0.1.12", - "rxjs": "6.2.1", - "rxjs-compat": "6.2.2", - "shelljs": "0.7.8", - "slick-carousel": "1.8.1", - "tree-model": "1.0.7", - "zone.js": "0.8.26" + "version": "git+https://github.com/AMPATH/ngx-openmrs-formentry.git#6391e336d03991208ceceb1d139a15d927c6ee61", + "from": "git+https://github.com/AMPATH/ngx-openmrs-formentry.git#v2.9.7-alpha6", + "requires": { + "@angular/animations": "^6.1.0", + "@angular/cdk": "^6.1.0", + "@angular/common": "^6.1.0", + "@angular/compiler": "^6.1.0", + "@angular/core": "^6.1.0", + "@angular/forms": "^6.1.0", + "@angular/http": "^6.1.0", + "@angular/material": "^6.4.3", + "@angular/material-moment-adapter": "^6.3.0", + "@angular/platform-browser": "^6.1.0", + "@angular/platform-browser-dynamic": "^6.1.0", + "@angular/router": "^6.1.0", + "amazing-time-picker": "^1.5.3", + "bootstrap": "^3.3.7", + "core-js": "^2.5.4", + "font-awesome": "^4.7.0", + "hammerjs": "^2.0.8", + "jquery": "^3.1.1", + "lodash": "^4.17.4", + "moment": "^2.17.1", + "ngx-bootstrap": "^3.0.1", + "ngx-cookie": "^4.0.2", + "ngx-file-uploader": "git+https://github.com/Ampath/ngx-file-uploader.git#b5e509fbff949f6ae0f1cd5dabc71eae53e33412", + "reflect-metadata": "^0.1.9", + "rxjs": "^6.0.0", + "rxjs-compat": "^6.2.1", + "shelljs": "^0.7.0", + "slick-carousel": "^1.6.0", + "tree-model": "^1.0.5", + "zone.js": "^0.8.26" }, "dependencies": { "ngx-bootstrap": { @@ -7953,7 +7955,8 @@ "integrity": "sha512-ni91yYtn8ldgf/pxrlwl9lkVcLURGzopSpJnEbbgG1v1EZWTobI8y7J3mx4Kxptkn0EeiQwnLel67G7XJSox4A==" }, "ngx-file-uploader": { - "version": "git+https://github.com/Ampath/ngx-file-uploader.git#590321b7a62a2e91bac9355a1871fc713d29c3a3" + "version": "git+https://github.com/Ampath/ngx-file-uploader.git#b5e509fbff949f6ae0f1cd5dabc71eae53e33412", + "from": "git+https://github.com/Ampath/ngx-file-uploader.git#0.0.9" } } }, @@ -7978,7 +7981,7 @@ "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", "dev": true, "requires": { - "lower-case": "1.1.4" + "lower-case": "^1.1.1" } }, "node-abi": { @@ -7986,7 +7989,7 @@ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.4.3.tgz", "integrity": "sha512-b656V5C0628gOOA2kwcpNA/bxdlqYF9FvxJ+qqVX0ctdXNVZpS8J6xEUYir3WAKc7U0BH/NRlSpNbGsy+azjeg==", "requires": { - "semver": "5.5.0" + "semver": "^5.4.1" } }, "node-ensure": { @@ -8012,18 +8015,18 @@ "dev": true, "optional": true, "requires": { - "fstream": "1.0.11", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.5", - "request": "2.87.0", - "rimraf": "2.6.2", - "semver": "5.3.0", - "tar": "2.2.1", - "which": "1.3.1" + "fstream": "^1.0.0", + "glob": "^7.0.3", + "graceful-fs": "^4.1.2", + "mkdirp": "^0.5.0", + "nopt": "2 || 3", + "npmlog": "0 || 1 || 2 || 3 || 4", + "osenv": "0", + "request": "^2.87.0", + "rimraf": "2", + "semver": "~5.3.0", + "tar": "^2.0.0", + "which": "1" }, "dependencies": { "semver": { @@ -8041,28 +8044,28 @@ "integrity": "sha1-X5QmPUBPbkR2fXJpAf/wVHjWAN8=", "dev": true, "requires": { - "assert": "1.4.1", - "browserify-zlib": "0.2.0", - "buffer": "4.9.1", - "console-browserify": "1.1.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "domain-browser": "1.2.0", - "events": "1.1.1", - "https-browserify": "1.0.0", - "os-browserify": "0.3.0", + "assert": "^1.1.1", + "browserify-zlib": "^0.2.0", + "buffer": "^4.3.0", + "console-browserify": "^1.1.0", + "constants-browserify": "^1.0.0", + "crypto-browserify": "^3.11.0", + "domain-browser": "^1.1.1", + "events": "^1.0.0", + "https-browserify": "^1.0.0", + "os-browserify": "^0.3.0", "path-browserify": "0.0.0", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.6", - "stream-browserify": "2.0.1", - "stream-http": "2.8.3", - "string_decoder": "1.1.1", - "timers-browserify": "2.0.10", + "process": "^0.11.10", + "punycode": "^1.2.4", + "querystring-es3": "^0.2.0", + "readable-stream": "^2.3.3", + "stream-browserify": "^2.0.1", + "stream-http": "^2.7.2", + "string_decoder": "^1.0.0", + "timers-browserify": "^2.0.4", "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.10.4", + "url": "^0.11.0", + "util": "^0.10.3", "vm-browserify": "0.0.4" }, "dependencies": { @@ -8081,25 +8084,25 @@ "dev": true, "optional": true, "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.3", - "get-stdin": "4.0.1", - "glob": "7.1.2", - "in-publish": "2.0.0", - "lodash.assign": "4.2.0", - "lodash.clonedeep": "4.5.0", - "lodash.mergewith": "4.6.1", - "meow": "3.7.0", - "mkdirp": "0.5.1", - "nan": "2.10.0", - "node-gyp": "3.8.0", - "npmlog": "4.1.2", + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^3.0.0", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "in-publish": "^2.0.0", + "lodash.assign": "^4.2.0", + "lodash.clonedeep": "^4.3.2", + "lodash.mergewith": "^4.6.0", + "meow": "^3.7.0", + "mkdirp": "^0.5.1", + "nan": "^2.10.0", + "node-gyp": "^3.8.0", + "npmlog": "^4.0.0", "request": "2.87.0", - "sass-graph": "2.2.4", - "stdout-stream": "1.4.0", - "true-case-path": "1.0.2" + "sass-graph": "^2.2.4", + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" }, "dependencies": { "ansi-styles": { @@ -8116,11 +8119,11 @@ "dev": true, "optional": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "supports-color": { @@ -8143,7 +8146,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1.0.9" + "abbrev": "1" } }, "normalize-package-data": { @@ -8152,10 +8155,10 @@ "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "dev": true, "requires": { - "hosted-git-info": "2.6.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.3" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -8163,7 +8166,7 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "normalize-range": { @@ -8178,10 +8181,10 @@ "integrity": "sha1-Fa4eJ1ilAn77TCUFVLhac323/ME=", "dev": true, "requires": { - "hosted-git-info": "2.6.0", - "osenv": "0.1.5", - "semver": "5.5.0", - "validate-npm-package-name": "3.0.0" + "hosted-git-info": "^2.6.0", + "osenv": "^0.1.5", + "semver": "^5.5.0", + "validate-npm-package-name": "^3.0.0" } }, "npm-registry-client": { @@ -8190,18 +8193,18 @@ "integrity": "sha512-7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "graceful-fs": "4.1.11", - "normalize-package-data": "2.4.0", - "npm-package-arg": "6.1.0", - "npmlog": "4.1.2", - "once": "1.4.0", - "request": "2.87.0", - "retry": "0.10.1", - "safe-buffer": "5.1.2", - "semver": "5.5.0", - "slide": "1.1.6", - "ssri": "5.3.0" + "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" } }, "npm-run-path": { @@ -8210,7 +8213,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "npmlog": { @@ -8218,10 +8221,10 @@ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=", "requires": { - "are-we-there-yet": "1.1.5", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "nth-check": { @@ -8230,7 +8233,7 @@ "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", "dev": true, "requires": { - "boolbase": "1.0.0" + "boolbase": "~1.0.0" } }, "null-check": { @@ -8272,9 +8275,9 @@ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { @@ -8282,7 +8285,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "kind-of": { @@ -8290,7 +8293,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -8310,7 +8313,7 @@ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" } }, "object.assign": { @@ -8319,10 +8322,10 @@ "integrity": "sha1-lovxEA15Vrs8oIbwBvhGs7xACNo=", "dev": true, "requires": { - "define-properties": "1.1.2", - "function-bind": "1.1.1", - "has-symbols": "1.0.0", - "object-keys": "1.0.12" + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" } }, "object.getownpropertydescriptors": { @@ -8331,8 +8334,8 @@ "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", "dev": true, "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.12.0" + "define-properties": "^1.1.2", + "es-abstract": "^1.5.1" } }, "object.omit": { @@ -8341,8 +8344,8 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" }, "dependencies": { "for-own": { @@ -8351,7 +8354,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } } } @@ -8361,7 +8364,7 @@ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "obuf": { @@ -8390,7 +8393,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "opencollective-postinstall": { @@ -8404,7 +8407,7 @@ "integrity": "sha1-ZIcVZchjh18FLP31PT48ta21Oxw=", "dev": true, "requires": { - "is-wsl": "1.1.0" + "is-wsl": "^1.1.0" } }, "optimist": { @@ -8413,8 +8416,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" }, "dependencies": { "wordwrap": { @@ -8430,12 +8433,12 @@ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" } }, "original": { @@ -8444,7 +8447,7 @@ "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", "dev": true, "requires": { - "url-parse": "1.4.3" + "url-parse": "^1.4.3" } }, "os-browserify": { @@ -8464,7 +8467,7 @@ "dev": true, "optional": true, "requires": { - "lcid": "1.0.0" + "lcid": "^1.0.0" } }, "os-tmpdir": { @@ -8479,8 +8482,8 @@ "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "p-finally": { @@ -8495,7 +8498,7 @@ "integrity": "sha1-uGvV8MJWkJEcdZD8v8IBDVSzzLg=", "dev": true, "requires": { - "p-try": "1.0.0" + "p-try": "^1.0.0" } }, "p-locate": { @@ -8504,7 +8507,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "1.3.0" + "p-limit": "^1.1.0" } }, "p-map": { @@ -8530,9 +8533,9 @@ "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", "dev": true, "requires": { - "cyclist": "0.2.2", - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "cyclist": "~0.2.2", + "inherits": "^2.0.3", + "readable-stream": "^2.1.5" } }, "param-case": { @@ -8541,7 +8544,7 @@ "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", "dev": true, "requires": { - "no-case": "2.3.2" + "no-case": "^2.2.0" } }, "parents": { @@ -8549,7 +8552,7 @@ "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz", "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=", "requires": { - "path-platform": "0.11.15" + "path-platform": "~0.11.15" } }, "parse-asn1": { @@ -8557,11 +8560,11 @@ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", "integrity": "sha1-9r8pOBgzK9DatU77Fgh3JHRebKg=", "requires": { - "asn1.js": "4.10.1", - "browserify-aes": "1.2.0", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "pbkdf2": "3.0.16" + "asn1.js": "^4.0.0", + "browserify-aes": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3" } }, "parse-glob": { @@ -8570,10 +8573,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "is-extglob": { @@ -8588,7 +8591,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -8599,7 +8602,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.2" + "error-ex": "^1.2.0" } }, "parse5": { @@ -8614,7 +8617,7 @@ "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseuri": { @@ -8623,7 +8626,7 @@ "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseurl": { @@ -8692,7 +8695,7 @@ "integrity": "sha1-zvMdyOCho7sNEFwM2Xzzv0f0428=", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "pause-stream": { @@ -8700,7 +8703,7 @@ "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", "requires": { - "through": "2.3.8" + "through": "~2.3" } }, "pbkdf2": { @@ -8708,11 +8711,11 @@ "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz", "integrity": "sha1-dAQgjsawG2LYW/g4U6gGT42cKlw=", "requires": { - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "pdfjs-dist": { @@ -8720,8 +8723,8 @@ "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-1.10.100.tgz", "integrity": "sha512-aCfONGqlBeazYxik3rjd7xaoCKMRYECwZSCC3EC3weqibF2V1Bp/v9WZbF7Lyy5Q6UE4NqOYu126r7U+Le4Uhg==", "requires": { - "node-ensure": "0.0.0", - "worker-loader": "1.1.1" + "node-ensure": "^0.0.0", + "worker-loader": "^1.0.0" } }, "pdfkit": { @@ -8729,9 +8732,9 @@ "resolved": "https://registry.npmjs.org/pdfkit/-/pdfkit-0.8.3.tgz", "integrity": "sha1-7Jmlf8Vcowlyb4VkVtoUQY9TMOM=", "requires": { - "fontkit": "1.7.7", - "linebreak": "0.3.0", - "png-js": "0.1.1" + "fontkit": "^1.0.0", + "linebreak": "^0.3.0", + "png-js": ">=0.1.0" } }, "pdfmake": { @@ -8739,9 +8742,9 @@ "resolved": "https://registry.npmjs.org/pdfmake/-/pdfmake-0.1.25.tgz", "integrity": "sha1-A3gmBJSP2qVXzek0JgPMy7fn9jg=", "requires": { - "linebreak": "0.3.0", - "lodash": "4.17.10", - "pdfkit": "0.8.3" + "linebreak": "^0.3.0", + "lodash": "^4.17.4", + "pdfkit": "^0.8.0" } }, "performance-now": { @@ -8768,7 +8771,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { @@ -8777,7 +8780,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "2.1.0" + "find-up": "^2.1.0" } }, "png-js": { @@ -8791,9 +8794,9 @@ "integrity": "sha512-icBXCFQxzlK2PMepOM0QeEdPPFSLAaXXeuKOv5AClJlMy1oVCBrkDGJ12IZYesI/BF8mpeVco3vRCmgeBb4+hw==", "dev": true, "requires": { - "async": "1.5.2", - "debug": "2.6.9", - "mkdirp": "0.5.1" + "async": "^1.5.2", + "debug": "^2.2.0", + "mkdirp": "0.5.x" }, "dependencies": { "async": { @@ -8820,9 +8823,9 @@ "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", "dev": true, "requires": { - "chalk": "2.4.1", - "source-map": "0.6.1", - "supports-color": "5.4.0" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" }, "dependencies": { "source-map": { @@ -8839,10 +8842,10 @@ "integrity": "sha1-Vck2LJGSmU7GiGXSJEGd8dspgfA=", "dev": true, "requires": { - "postcss": "6.0.23", - "postcss-value-parser": "3.3.0", - "read-cache": "1.0.0", - "resolve": "1.8.1" + "postcss": "^6.0.1", + "postcss-value-parser": "^3.2.3", + "read-cache": "^1.0.0", + "resolve": "^1.1.7" } }, "postcss-load-config": { @@ -8851,8 +8854,8 @@ "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==", "dev": true, "requires": { - "cosmiconfig": "4.0.0", - "import-cwd": "2.1.0" + "cosmiconfig": "^4.0.0", + "import-cwd": "^2.0.0" } }, "postcss-loader": { @@ -8861,10 +8864,10 @@ "integrity": "sha512-hgiWSc13xVQAq25cVw80CH0l49ZKlAnU1hKPOdRrNj89bokRr/bZF2nT+hebPPF9c9xs8c3gw3Fr2nxtmXYnNg==", "dev": true, "requires": { - "loader-utils": "1.1.0", - "postcss": "6.0.23", - "postcss-load-config": "2.0.0", - "schema-utils": "0.4.5" + "loader-utils": "^1.1.0", + "postcss": "^6.0.0", + "postcss-load-config": "^2.0.0", + "schema-utils": "^0.4.0" } }, "postcss-url": { @@ -8873,11 +8876,11 @@ "integrity": "sha1-X+onOAf7hLOMRhw8mp6KvSNfcSA=", "dev": true, "requires": { - "mime": "1.6.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "postcss": "6.0.23", - "xxhashjs": "0.2.2" + "mime": "^1.4.1", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.0", + "postcss": "^6.0.1", + "xxhashjs": "^0.2.1" } }, "postcss-value-parser": { @@ -8904,7 +8907,7 @@ "leveldown": "3.0.0", "levelup": "3.0.1", "ltgt": "2.2.1", - "node-fetch": "2.2.0", + "node-fetch": "^2.0.0", "readable-stream": "1.0.33", "spark-md5": "3.0.0", "through2": "2.0.3", @@ -8922,10 +8925,10 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "integrity": "sha1-OjYN1mwbHX/UcFOJhg7aHQ9hEmw=", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -8982,7 +8985,7 @@ "integrity": "sha512-9XGEogHQcYZCJp2PvLE7oDgGzIsBy4Vh28EhDS26iJFwtDVpHYm7fIzJ//SDGcUNjnlR9WKTegFLg9p7jYIQWQ==", "requires": { "fetch-cookie": "0.7.0", - "node-fetch": "2.2.0" + "node-fetch": "^2.0.0" } }, "pouchdb-find": { @@ -9041,7 +9044,7 @@ "resolved": "https://registry.npmjs.org/pouchdb-upsert/-/pouchdb-upsert-2.2.0.tgz", "integrity": "sha1-QrFeQghI87KUw1BgWJ/bUc9/f18=", "requires": { - "pouchdb-promise": "6.4.3" + "pouchdb-promise": "^6.1.2" } }, "pouchdb-utils": { @@ -9064,21 +9067,21 @@ "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.3.tgz", "integrity": "sha512-/rI36cN2g7vDQnKWN8Uzupi++KjyqS9iS+/fpwG4Ea8d0Pip0PQ5bshUNzVwt+/D2MRfhVAplYMMvWLqWrCF/g==", "requires": { - "detect-libc": "1.0.3", - "expand-template": "1.1.1", + "detect-libc": "^1.0.3", + "expand-template": "^1.0.2", "github-from-package": "0.0.0", - "minimist": "1.2.0", - "mkdirp": "0.5.1", - "node-abi": "2.4.3", - "noop-logger": "0.1.1", - "npmlog": "4.1.2", - "os-homedir": "1.0.2", - "pump": "2.0.1", - "rc": "1.2.8", - "simple-get": "2.8.1", - "tar-fs": "1.16.3", - "tunnel-agent": "0.6.0", - "which-pm-runs": "1.0.0" + "minimist": "^1.2.0", + "mkdirp": "^0.5.1", + "node-abi": "^2.2.0", + "noop-logger": "^0.1.1", + "npmlog": "^4.0.1", + "os-homedir": "^1.0.1", + "pump": "^2.0.1", + "rc": "^1.1.6", + "simple-get": "^2.7.0", + "tar-fs": "^1.13.0", + "tunnel-agent": "^0.6.0", + "which-pm-runs": "^1.0.0" }, "dependencies": { "minimist": { @@ -9105,8 +9108,8 @@ "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", "dev": true, "requires": { - "renderkid": "2.0.1", - "utila": "0.4.0" + "renderkid": "^2.0.1", + "utila": "~0.4" } }, "primeicons": { @@ -9141,7 +9144,7 @@ "dev": true, "optional": true, "requires": { - "asap": "2.0.6" + "asap": "~2.0.3" } }, "promise-inflight": { @@ -9156,22 +9159,22 @@ "integrity": "sha512-6TSYqMhUUzxr4/wN0ttSISqPMKvcVRXF4k8jOEpGWD8OioLak4KLgfzHK9FJ49IrjzRrZ+Mx1q2Op8Rk0zEcnQ==", "dev": true, "requires": { - "@types/node": "6.0.116", - "@types/q": "0.0.32", - "@types/selenium-webdriver": "3.0.10", - "blocking-proxy": "1.0.1", - "browserstack": "1.5.1", - "chalk": "1.1.3", - "glob": "7.1.2", + "@types/node": "^6.0.46", + "@types/q": "^0.0.32", + "@types/selenium-webdriver": "^3.0.0", + "blocking-proxy": "^1.0.0", + "browserstack": "^1.5.1", + "chalk": "^1.1.3", + "glob": "^7.0.3", "jasmine": "2.8.0", - "jasminewd2": "2.2.0", - "optimist": "0.6.1", + "jasminewd2": "^2.1.0", + "optimist": "~0.6.0", "q": "1.4.1", - "saucelabs": "1.5.0", + "saucelabs": "^1.5.0", "selenium-webdriver": "3.6.0", - "source-map-support": "0.4.18", + "source-map-support": "~0.4.0", "webdriver-js-extender": "2.0.0", - "webdriver-manager": "12.1.0" + "webdriver-manager": "^12.0.6" }, "dependencies": { "@types/node": { @@ -9192,11 +9195,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "del": { @@ -9205,13 +9208,13 @@ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { - "globby": "5.0.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.1", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "rimraf": "2.6.2" + "globby": "^5.0.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "rimraf": "^2.2.8" } }, "globby": { @@ -9220,12 +9223,12 @@ "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "minimist": { @@ -9246,7 +9249,7 @@ "integrity": "sha1-Aoam3ovkJkEzhZTpfM6nXwosWF8=", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } }, "supports-color": { @@ -9261,17 +9264,17 @@ "integrity": "sha512-oEc5fmkpz6Yh6udhwir5m0eN5mgRPq9P/NU5YWuT3Up5slt6Zz+znhLU7q4+8rwCZz/Qq3Fgpr/4oao7NPCm2A==", "dev": true, "requires": { - "adm-zip": "0.4.11", - "chalk": "1.1.3", - "del": "2.2.2", - "glob": "7.1.2", - "ini": "1.3.5", - "minimist": "1.2.0", - "q": "1.4.1", - "request": "2.87.0", - "rimraf": "2.6.2", - "semver": "5.5.0", - "xml2js": "0.4.19" + "adm-zip": "^0.4.9", + "chalk": "^1.1.1", + "del": "^2.2.0", + "glob": "^7.0.3", + "ini": "^1.3.4", + "minimist": "^1.2.0", + "q": "^1.4.1", + "request": "^2.87.0", + "rimraf": "^2.5.2", + "semver": "^5.3.0", + "xml2js": "^0.4.17" } } } @@ -9282,7 +9285,7 @@ "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==", "dev": true, "requires": { - "forwarded": "0.1.2", + "forwarded": "~0.1.2", "ipaddr.js": "1.8.0" } }, @@ -9302,11 +9305,11 @@ "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz", "integrity": "sha1-RuuRByBr9zSJ+LhbadkTNMZhCZQ=", "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "parse-asn1": "5.1.1", - "randombytes": "2.0.6" + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1" } }, "pump": { @@ -9314,8 +9317,8 @@ "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", "integrity": "sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=", "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "pumpify": { @@ -9324,9 +9327,9 @@ "integrity": "sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=", "dev": true, "requires": { - "duplexify": "3.6.0", - "inherits": "2.0.3", - "pump": "2.0.1" + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" } }, "punycode": { @@ -9374,8 +9377,8 @@ "integrity": "sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=", "requires": { "buffer-equal": "0.0.1", - "minimist": "1.2.0", - "through2": "2.0.3" + "minimist": "^1.1.3", + "through2": "^2.0.0" }, "dependencies": { "minimist": { @@ -9391,9 +9394,9 @@ "integrity": "sha1-01SQAw6091eN4pLObfsEqRoSiSM=", "dev": true, "requires": { - "is-number": "4.0.0", - "kind-of": "6.0.2", - "math-random": "1.0.1" + "is-number": "^4.0.0", + "kind-of": "^6.0.0", + "math-random": "^1.0.1" }, "dependencies": { "is-number": { @@ -9409,7 +9412,7 @@ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", "integrity": "sha1-0wLFIpSFiISKjTAMkytEwkIx2oA=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.1.0" } }, "randomfill": { @@ -9417,8 +9420,8 @@ "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", "integrity": "sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=", "requires": { - "randombytes": "2.0.6", - "safe-buffer": "5.1.2" + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" } }, "range-parser": { @@ -9454,7 +9457,7 @@ "depd": "1.1.1", "inherits": "2.0.3", "setprototypeof": "1.0.3", - "statuses": "1.4.0" + "statuses": ">= 1.3.1 < 2" } }, "setprototypeof": { @@ -9476,10 +9479,10 @@ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "requires": { - "deep-extend": "0.6.0", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -9495,7 +9498,7 @@ "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", "dev": true, "requires": { - "pify": "2.3.0" + "pify": "^2.3.0" }, "dependencies": { "pify": { @@ -9511,7 +9514,7 @@ "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz", "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=", "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.2" } }, "read-pkg": { @@ -9520,9 +9523,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" }, "dependencies": { "path-type": { @@ -9531,9 +9534,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -9550,8 +9553,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" }, "dependencies": { "find-up": { @@ -9560,8 +9563,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "path-exists": { @@ -9570,7 +9573,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } } } @@ -9580,13 +9583,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -9594,10 +9597,10 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.6", - "set-immediate-shim": "1.0.1" + "graceful-fs": "^4.1.2", + "minimatch": "^3.0.2", + "readable-stream": "^2.0.2", + "set-immediate-shim": "^1.0.1" } }, "recast": { @@ -9606,9 +9609,9 @@ "integrity": "sha1-uV1Q9tYHYaX2JS4V2AZ4FoSRzn8=", "requires": { "ast-types": "0.8.15", - "esprima-fb": "15001.1001.0-dev-harmony-fb", - "private": "0.1.8", - "source-map": "0.5.7" + "esprima-fb": "~15001.1001.0-dev-harmony-fb", + "private": "~0.1.5", + "source-map": "~0.5.0" }, "dependencies": { "esprima-fb": { @@ -9623,7 +9626,7 @@ "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "requires": { - "resolve": "1.8.1" + "resolve": "^1.1.6" } }, "redent": { @@ -9632,8 +9635,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" } }, "reflect-metadata": { @@ -9658,7 +9661,7 @@ "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=", "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "regex-not": { @@ -9666,8 +9669,8 @@ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=", "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, "regexpu-core": { @@ -9676,9 +9679,9 @@ "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "dev": true, "requires": { - "regenerate": "1.4.0", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" } }, "regjsgen": { @@ -9693,7 +9696,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "0.5.0" + "jsesc": "~0.5.0" }, "dependencies": { "jsesc": { @@ -9721,11 +9724,11 @@ "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=", "dev": true, "requires": { - "css-select": "1.2.0", - "dom-converter": "0.1.4", - "htmlparser2": "3.3.0", - "strip-ansi": "3.0.1", - "utila": "0.3.3" + "css-select": "^1.1.0", + "dom-converter": "~0.1", + "htmlparser2": "~3.3.0", + "strip-ansi": "^3.0.0", + "utila": "~0.3" }, "dependencies": { "utila": { @@ -9752,7 +9755,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "request": { @@ -9761,26 +9764,26 @@ "integrity": "sha1-MvACNc0I1IK00NaNuTqCnA7VdW4=", "dev": true, "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.7.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.0.3", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "aws-sign2": "~0.7.0", + "aws4": "^1.6.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.1", + "forever-agent": "~0.6.1", + "form-data": "~2.3.1", + "har-validator": "~5.0.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.17", + "oauth-sign": "~0.8.2", + "performance-now": "^2.1.0", + "qs": "~6.5.1", + "safe-buffer": "^5.1.1", + "tough-cookie": "~2.3.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.1.0" } }, "require-directory": { @@ -9812,7 +9815,7 @@ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", "integrity": "sha1-gvHsGaQjrB+9CAsLqwa6NuhKeiY=", "requires": { - "path-parse": "1.0.5" + "path-parse": "^1.0.5" } }, "resolve-cwd": { @@ -9821,7 +9824,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "resolve-from": { @@ -9840,7 +9843,7 @@ "resolved": "https://registry.npmjs.org/restructure/-/restructure-0.5.4.tgz", "integrity": "sha1-9U591WNZD7NP1r9Vh2EJrsyyjeg=", "requires": { - "browserify-optional": "1.0.1" + "browserify-optional": "^1.0.0" } }, "ret": { @@ -9867,7 +9870,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { @@ -9876,7 +9879,7 @@ "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "ripemd160": { @@ -9884,8 +9887,8 @@ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", "integrity": "sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=", "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.3" + "hash-base": "^3.0.0", + "inherits": "^2.0.1" } }, "rison-node": { @@ -9899,7 +9902,7 @@ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { - "aproba": "1.2.0" + "aproba": "^1.1.1" } }, "rxjs": { @@ -9907,7 +9910,7 @@ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.1.tgz", "integrity": "sha512-OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g==", "requires": { - "tslib": "1.9.2" + "tslib": "^1.9.0" } }, "rxjs-compat": { @@ -9921,10 +9924,10 @@ "integrity": "sha512-odvEAx6VoZSJs5o9gWZ7SxgTuS8ldq0mr4qnprbr6flNtIt4DtNJSYJpBK0WEy0o+f1oe92XVHrmgco1e7Cpdw==", "dev": true, "requires": { - "chalk": "2.4.1", - "optimist": "0.6.1", - "tslint": "5.9.1", - "tsutils": "2.27.1" + "chalk": "^2.4.0", + "optimist": "^0.6.1", + "tslint": "^5.9.1", + "tsutils": "^2.25.0" }, "dependencies": { "chalk": { @@ -9933,9 +9936,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -9950,7 +9953,7 @@ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "safer-buffer": { @@ -9966,10 +9969,10 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.2", - "lodash": "4.17.10", - "scss-tokenizer": "0.2.3", - "yargs": "7.1.0" + "glob": "^7.0.0", + "lodash": "^4.0.0", + "scss-tokenizer": "^0.2.3", + "yargs": "^7.0.0" }, "dependencies": { "camelcase": { @@ -9986,9 +9989,9 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" } }, "y18n": { @@ -10005,19 +10008,19 @@ "dev": true, "optional": true, "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.3", - "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" + "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" } } } @@ -10028,11 +10031,11 @@ "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==", "dev": true, "requires": { - "clone-deep": "2.0.2", - "loader-utils": "1.1.0", - "lodash.tail": "4.1.1", - "neo-async": "2.5.1", - "pify": "3.0.0" + "clone-deep": "^2.0.1", + "loader-utils": "^1.0.1", + "lodash.tail": "^4.1.1", + "neo-async": "^2.5.0", + "pify": "^3.0.0" } }, "saucelabs": { @@ -10041,7 +10044,7 @@ "integrity": "sha1-lAWnPDYNRJsjKDmRmobDltN5/Z0=", "dev": true, "requires": { - "https-proxy-agent": "2.2.1" + "https-proxy-agent": "^2.2.1" } }, "save": { @@ -10049,10 +10052,10 @@ "resolved": "https://registry.npmjs.org/save/-/save-2.3.2.tgz", "integrity": "sha1-hZJnS1VlzE4SvG3dnLCfgo4+z30=", "requires": { - "async": "2.6.1", - "event-stream": "3.3.4", - "lodash.assign": "4.2.0", - "mingo": "1.3.3" + "async": "^2.4.1", + "event-stream": "^3.3.4", + "lodash.assign": "^4.2.0", + "mingo": "^1.3.1" } }, "sax": { @@ -10066,8 +10069,8 @@ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz", "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", "requires": { - "ajv": "6.4.0", - "ajv-keywords": "3.2.0" + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0" } }, "scss-tokenizer": { @@ -10077,8 +10080,8 @@ "dev": true, "optional": true, "requires": { - "js-base64": "2.4.8", - "source-map": "0.4.4" + "js-base64": "^2.1.8", + "source-map": "^0.4.2" }, "dependencies": { "source-map": { @@ -10088,7 +10091,7 @@ "dev": true, "optional": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -10105,10 +10108,10 @@ "integrity": "sha1-K6h6FmLAILiYjJga5iyyoBKY6vw=", "dev": true, "requires": { - "jszip": "3.1.5", - "rimraf": "2.6.2", + "jszip": "^3.1.3", + "rimraf": "^2.5.4", "tmp": "0.0.30", - "xml2js": "0.4.19" + "xml2js": "^0.4.17" }, "dependencies": { "tmp": { @@ -10117,7 +10120,7 @@ "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.1" } } } @@ -10142,7 +10145,7 @@ "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", "dev": true, "requires": { - "semver": "5.5.0" + "semver": "^5.3.0" } }, "semver-intersect": { @@ -10151,7 +10154,7 @@ "integrity": "sha1-j6hKnhAovSOeRTDRo+GB5pjYhLo=", "dev": true, "requires": { - "semver": "5.5.0" + "semver": "^5.0.0" } }, "send": { @@ -10161,18 +10164,18 @@ "dev": true, "requires": { "debug": "2.6.9", - "depd": "1.1.2", - "destroy": "1.0.4", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.6.3", + "http-errors": "~1.6.2", "mime": "1.4.1", "ms": "2.0.0", - "on-finished": "2.3.0", - "range-parser": "1.2.0", - "statuses": "1.4.0" + "on-finished": "~2.3.0", + "range-parser": "~1.2.0", + "statuses": "~1.4.0" }, "dependencies": { "mime": { @@ -10195,13 +10198,13 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { - "accepts": "1.3.5", + "accepts": "~1.3.4", "batch": "0.6.1", "debug": "2.6.9", - "escape-html": "1.0.3", - "http-errors": "1.6.3", - "mime-types": "2.1.18", - "parseurl": "1.3.2" + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" } }, "serve-static": { @@ -10210,9 +10213,9 @@ "integrity": "sha1-CV6Ecv1bRiN9tQzkhqQ/S4bGzsE=", "dev": true, "requires": { - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "parseurl": "1.3.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.2", "send": "0.16.2" } }, @@ -10231,10 +10234,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=", "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -10242,7 +10245,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -10264,8 +10267,8 @@ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=", "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "shallow-clone": { @@ -10274,9 +10277,9 @@ "integrity": "sha1-RIDNBuiC72iyrYij6lSDLixItXE=", "dev": true, "requires": { - "is-extendable": "0.1.1", - "kind-of": "5.1.0", - "mixin-object": "2.0.1" + "is-extendable": "^0.1.1", + "kind-of": "^5.0.0", + "mixin-object": "^2.0.1" }, "dependencies": { "kind-of": { @@ -10297,8 +10300,8 @@ "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz", "integrity": "sha1-5wEjENj0F/TetXEhUOVni4euVl8=", "requires": { - "json-stable-stringify": "0.0.1", - "sha.js": "2.4.11" + "json-stable-stringify": "~0.0.0", + "sha.js": "~2.4.4" }, "dependencies": { "json-stable-stringify": { @@ -10306,7 +10309,7 @@ "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz", "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=", "requires": { - "jsonify": "0.0.0" + "jsonify": "~0.0.0" } } } @@ -10317,7 +10320,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -10331,10 +10334,10 @@ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", "requires": { - "array-filter": "0.0.1", - "array-map": "0.0.0", - "array-reduce": "0.0.0", - "jsonify": "0.0.0" + "array-filter": "~0.0.0", + "array-map": "~0.0.0", + "array-reduce": "~0.0.0", + "jsonify": "~0.0.0" } }, "shelljs": { @@ -10342,9 +10345,9 @@ "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz", "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", "requires": { - "glob": "7.1.2", - "interpret": "1.1.0", - "rechoir": "0.6.2" + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" } }, "signal-exit": { @@ -10358,7 +10361,7 @@ "integrity": "sha1-IglwbxyFCp8dENDYQJGLRvJuG8k=", "dev": true, "requires": { - "debug": "2.6.9" + "debug": "^2.2.0" } }, "simple-concat": { @@ -10371,9 +10374,9 @@ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz", "integrity": "sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==", "requires": { - "decompress-response": "3.3.0", - "once": "1.4.0", - "simple-concat": "1.0.0" + "decompress-response": "^3.3.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" } }, "slash": { @@ -10398,10 +10401,10 @@ "resolved": "https://registry.npmjs.org/slimscroll/-/slimscroll-0.9.1.tgz", "integrity": "sha1-9nXNxgHYCtog8WAE0ifRVv0Rh7I=", "requires": { - "browserify": "16.2.2", - "classie": "1.0.0", - "domhelper": "0.9.1", - "util-extend": "1.0.3" + "browserify": ">=3.46.0", + "classie": ">=0.0.1", + "domhelper": "~0.9.0", + "util-extend": "^1.0.1" } }, "snapdragon": { @@ -10409,14 +10412,14 @@ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=", "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.2", - "use": "3.1.0" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { "define-property": { @@ -10424,7 +10427,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -10432,7 +10435,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -10442,9 +10445,9 @@ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=", "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { @@ -10452,7 +10455,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -10460,7 +10463,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -10468,7 +10471,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -10476,9 +10479,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -10488,7 +10491,7 @@ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" }, "dependencies": { "kind-of": { @@ -10496,7 +10499,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -10507,12 +10510,12 @@ "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", "dev": true, "requires": { - "debug": "3.1.0", - "engine.io": "3.2.0", - "has-binary2": "1.0.3", - "socket.io-adapter": "1.1.1", + "debug": "~3.1.0", + "engine.io": "~3.2.0", + "has-binary2": "~1.0.2", + "socket.io-adapter": "~1.1.0", "socket.io-client": "2.1.1", - "socket.io-parser": "3.2.0" + "socket.io-parser": "~3.2.0" }, "dependencies": { "debug": { @@ -10542,15 +10545,15 @@ "base64-arraybuffer": "0.1.5", "component-bind": "1.0.0", "component-emitter": "1.2.1", - "debug": "3.1.0", - "engine.io-client": "3.2.1", - "has-binary2": "1.0.3", + "debug": "~3.1.0", + "engine.io-client": "~3.2.0", + "has-binary2": "~1.0.2", "has-cors": "1.1.0", "indexof": "0.0.1", "object-component": "0.0.3", "parseqs": "0.0.5", "parseuri": "0.0.5", - "socket.io-parser": "3.2.0", + "socket.io-parser": "~3.2.0", "to-array": "0.1.4" }, "dependencies": { @@ -10572,7 +10575,7 @@ "dev": true, "requires": { "component-emitter": "1.2.1", - "debug": "3.1.0", + "debug": "~3.1.0", "isarray": "2.0.1" }, "dependencies": { @@ -10599,8 +10602,8 @@ "integrity": "sha1-2Xa76ACve9IK4IWY1YI5NQiZPA0=", "dev": true, "requires": { - "faye-websocket": "0.10.0", - "uuid": "3.2.1" + "faye-websocket": "^0.10.0", + "uuid": "^3.0.1" } }, "sockjs-client": { @@ -10609,12 +10612,12 @@ "integrity": "sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=", "dev": true, "requires": { - "debug": "2.6.9", + "debug": "^2.6.6", "eventsource": "0.1.6", - "faye-websocket": "0.11.1", - "inherits": "2.0.3", - "json3": "3.3.2", - "url-parse": "1.4.3" + "faye-websocket": "~0.11.0", + "inherits": "^2.0.1", + "json3": "^3.3.2", + "url-parse": "^1.1.8" }, "dependencies": { "faye-websocket": { @@ -10623,7 +10626,7 @@ "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", "dev": true, "requires": { - "websocket-driver": "0.7.0" + "websocket-driver": ">=0.5.1" } } } @@ -10645,9 +10648,9 @@ "integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==", "dev": true, "requires": { - "async": "2.6.1", - "loader-utils": "0.2.17", - "source-map": "0.6.1" + "async": "^2.5.0", + "loader-utils": "~0.2.2", + "source-map": "~0.6.1" }, "dependencies": { "loader-utils": { @@ -10656,10 +10659,10 @@ "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", "dev": true, "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" + "big.js": "^3.1.3", + "emojis-list": "^2.0.0", + "json5": "^0.5.0", + "object-assign": "^4.0.1" } }, "source-map": { @@ -10675,11 +10678,11 @@ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", "integrity": "sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk=", "requires": { - "atob": "2.1.1", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-support": { @@ -10688,8 +10691,8 @@ "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==", "dev": true, "requires": { - "buffer-from": "1.1.0", - "source-map": "0.6.1" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" }, "dependencies": { "source-map": { @@ -10716,8 +10719,8 @@ "integrity": "sha1-BaW01xU6GVvJLDxCW2nzsqlSTII=", "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -10732,8 +10735,8 @@ "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=", "dev": true, "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -10748,12 +10751,12 @@ "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=", "dev": true, "requires": { - "debug": "2.6.9", - "handle-thing": "1.2.5", - "http-deceiver": "1.2.7", - "safe-buffer": "5.1.2", - "select-hose": "2.0.0", - "spdy-transport": "2.1.0" + "debug": "^2.6.8", + "handle-thing": "^1.2.5", + "http-deceiver": "^1.2.7", + "safe-buffer": "^5.0.1", + "select-hose": "^2.0.0", + "spdy-transport": "^2.0.18" } }, "spdy-transport": { @@ -10762,13 +10765,13 @@ "integrity": "sha1-S7sVqv/tC+791WrWHb3Iuj4st6E=", "dev": true, "requires": { - "debug": "2.6.9", - "detect-node": "2.0.3", - "hpack.js": "2.1.6", - "obuf": "1.1.2", - "readable-stream": "2.3.6", - "safe-buffer": "5.1.2", - "wbuf": "1.7.3" + "debug": "^2.6.8", + "detect-node": "^2.0.3", + "hpack.js": "^2.1.6", + "obuf": "^1.1.1", + "readable-stream": "^2.2.9", + "safe-buffer": "^5.0.1", + "wbuf": "^1.7.2" } }, "spin.js": { @@ -10781,7 +10784,7 @@ "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", "requires": { - "through": "2.3.8" + "through": "2" } }, "split-string": { @@ -10789,7 +10792,7 @@ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=", "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" } }, "sprintf-js": { @@ -10803,15 +10806,15 @@ "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", "dev": true, "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "safer-buffer": "2.1.2", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" } }, "ssri": { @@ -10820,7 +10823,7 @@ "integrity": "sha1-ujhyycbTOgcEp9cf8EXl7EiZnQY=", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.1.1" } }, "static-eval": { @@ -10828,7 +10831,7 @@ "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.0.tgz", "integrity": "sha512-6flshd3F1Gwm+Ksxq463LtFd1liC77N/PX1FVVc3OzL3hAmo2fwHFbuArkcfi7s9rTNsLEhcRmXGFZhlgy40uw==", "requires": { - "escodegen": "1.8.1" + "escodegen": "^1.8.1" } }, "static-extend": { @@ -10836,8 +10839,8 @@ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { @@ -10845,7 +10848,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -10855,20 +10858,20 @@ "resolved": "https://registry.npmjs.org/static-module/-/static-module-2.2.5.tgz", "integrity": "sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==", "requires": { - "concat-stream": "1.6.2", - "convert-source-map": "1.5.1", - "duplexer2": "0.1.4", - "escodegen": "1.9.1", - "falafel": "2.1.0", - "has": "1.0.3", - "magic-string": "0.22.5", + "concat-stream": "~1.6.0", + "convert-source-map": "^1.5.1", + "duplexer2": "~0.1.4", + "escodegen": "~1.9.0", + "falafel": "^2.1.0", + "has": "^1.0.1", + "magic-string": "^0.22.4", "merge-source-map": "1.0.4", - "object-inspect": "1.4.1", - "quote-stream": "1.0.2", - "readable-stream": "2.3.6", - "shallow-copy": "0.0.1", - "static-eval": "2.0.0", - "through2": "2.0.3" + "object-inspect": "~1.4.0", + "quote-stream": "~1.0.2", + "readable-stream": "~2.3.3", + "shallow-copy": "~0.0.1", + "static-eval": "^2.0.0", + "through2": "~2.0.3" }, "dependencies": { "escodegen": { @@ -10876,11 +10879,11 @@ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.6.1" + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" } }, "esprima": { @@ -10898,10 +10901,10 @@ "resolved": "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz", "integrity": "sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=", "requires": { - "acorn": "5.7.1", - "foreach": "2.0.5", + "acorn": "^5.0.0", + "foreach": "^2.0.5", "isarray": "0.0.1", - "object-keys": "1.0.12" + "object-keys": "^1.0.6" } }, "isarray": { @@ -10923,7 +10926,7 @@ "integrity": "sha1-LFlJtTHgf4eojm6k3PrFOqjHWis=", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "^4.17.4" } }, "statuses": { @@ -10939,7 +10942,7 @@ "dev": true, "optional": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.1" } }, "stream-browserify": { @@ -10947,8 +10950,8 @@ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" } }, "stream-combiner": { @@ -10956,7 +10959,7 @@ "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", "requires": { - "duplexer": "0.1.1" + "duplexer": "~0.1.1" } }, "stream-combiner2": { @@ -10964,8 +10967,8 @@ "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz", "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=", "requires": { - "duplexer2": "0.1.4", - "readable-stream": "2.3.6" + "duplexer2": "~0.1.0", + "readable-stream": "^2.0.2" } }, "stream-each": { @@ -10974,8 +10977,8 @@ "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "stream-shift": "1.0.0" + "end-of-stream": "^1.1.0", + "stream-shift": "^1.0.0" } }, "stream-http": { @@ -10983,11 +10986,11 @@ "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", "integrity": "sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=", "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.1" + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.3.6", + "to-arraybuffer": "^1.0.0", + "xtend": "^4.0.0" } }, "stream-shift": { @@ -11001,8 +11004,8 @@ "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz", "integrity": "sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=", "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" } }, "streamroller": { @@ -11011,10 +11014,10 @@ "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==", "dev": true, "requires": { - "date-format": "1.2.0", - "debug": "3.1.0", - "mkdirp": "0.5.1", - "readable-stream": "2.3.6" + "date-format": "^1.2.0", + "debug": "^3.1.0", + "mkdirp": "^0.5.1", + "readable-stream": "^2.3.0" }, "dependencies": { "debug": { @@ -11033,9 +11036,9 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -11043,7 +11046,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -11051,7 +11054,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -11060,7 +11063,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-eof": { @@ -11075,7 +11078,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "strip-json-comments": { @@ -11089,8 +11092,8 @@ "integrity": "sha1-aMUuXrKvycqStidL4nfuWa6jqFI=", "dev": true, "requires": { - "loader-utils": "1.1.0", - "schema-utils": "0.4.5" + "loader-utils": "^1.1.0", + "schema-utils": "^0.4.5" } }, "stylus": { @@ -11099,12 +11102,12 @@ "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", "dev": true, "requires": { - "css-parse": "1.7.0", - "debug": "2.6.9", - "glob": "7.0.6", - "mkdirp": "0.5.1", - "sax": "0.5.8", - "source-map": "0.1.43" + "css-parse": "1.7.x", + "debug": "*", + "glob": "7.0.x", + "mkdirp": "0.5.x", + "sax": "0.5.x", + "source-map": "0.1.x" }, "dependencies": { "glob": { @@ -11113,12 +11116,12 @@ "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "source-map": { @@ -11127,7 +11130,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -11138,9 +11141,9 @@ "integrity": "sha1-J6cGQgsFo44DjnyssVNXjUUFE8Y=", "dev": true, "requires": { - "loader-utils": "1.1.0", - "lodash.clonedeep": "4.5.0", - "when": "3.6.4" + "loader-utils": "^1.0.2", + "lodash.clonedeep": "^4.5.0", + "when": "~3.6.x" } }, "subarg": { @@ -11148,7 +11151,7 @@ "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=", "requires": { - "minimist": "1.2.0" + "minimist": "^1.1.0" }, "dependencies": { "minimist": { @@ -11164,7 +11167,7 @@ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "symbol-observable": { @@ -11178,7 +11181,7 @@ "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz", "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==", "requires": { - "acorn-node": "1.5.2" + "acorn-node": "^1.2.0" } }, "tapable": { @@ -11194,9 +11197,9 @@ "dev": true, "optional": true, "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" + "block-stream": "*", + "fstream": "^1.0.2", + "inherits": "2" } }, "tar-fs": { @@ -11204,10 +11207,10 @@ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz", "integrity": "sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==", "requires": { - "chownr": "1.0.1", - "mkdirp": "0.5.1", - "pump": "1.0.3", - "tar-stream": "1.6.1" + "chownr": "^1.0.1", + "mkdirp": "^0.5.1", + "pump": "^1.0.0", + "tar-stream": "^1.1.2" }, "dependencies": { "pump": { @@ -11215,8 +11218,8 @@ "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==", "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } } } @@ -11226,13 +11229,13 @@ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz", "integrity": "sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==", "requires": { - "bl": "1.2.2", - "buffer-alloc": "1.2.0", - "end-of-stream": "1.4.1", - "fs-constants": "1.0.0", - "readable-stream": "2.3.6", - "to-buffer": "1.1.1", - "xtend": "4.0.1" + "bl": "^1.0.0", + "buffer-alloc": "^1.1.0", + "end-of-stream": "^1.0.0", + "fs-constants": "^1.0.0", + "readable-stream": "^2.3.0", + "to-buffer": "^1.1.0", + "xtend": "^4.0.0" } }, "tether": { @@ -11256,8 +11259,8 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } }, "thunky": { @@ -11272,7 +11275,7 @@ "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", "dev": true, "requires": { - "setimmediate": "1.0.5" + "setimmediate": "^1.0.4" } }, "tiny-inflate": { @@ -11286,7 +11289,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.2" } }, "to-array": { @@ -11316,7 +11319,7 @@ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -11324,7 +11327,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -11334,10 +11337,10 @@ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=", "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { @@ -11345,8 +11348,8 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "toposort": { @@ -11360,7 +11363,7 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "requires": { - "punycode": "1.4.1" + "punycode": "^1.4.1" }, "dependencies": { "punycode": { @@ -11404,7 +11407,7 @@ "dev": true, "optional": true, "requires": { - "glob": "6.0.4" + "glob": "^6.0.4" }, "dependencies": { "glob": { @@ -11414,11 +11417,11 @@ "dev": true, "optional": true, "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -11429,14 +11432,14 @@ "integrity": "sha1-eOXRyz9wTeG2QeQ7dr4tQJTwb4E=", "dev": true, "requires": { - "arrify": "1.0.1", - "chalk": "2.4.1", - "diff": "3.5.0", - "make-error": "1.3.4", - "minimist": "1.2.0", - "mkdirp": "0.5.1", - "source-map-support": "0.5.9", - "yn": "2.0.0" + "arrify": "^1.0.0", + "chalk": "^2.3.0", + "diff": "^3.1.0", + "make-error": "^1.1.1", + "minimist": "^1.2.0", + "mkdirp": "^0.5.1", + "source-map-support": "^0.5.3", + "yn": "^2.0.0" }, "dependencies": { "chalk": { @@ -11445,9 +11448,9 @@ "integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "minimist": { @@ -11464,11 +11467,11 @@ "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.1", - "source-map-support": "0.5.9" + "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": { @@ -11496,18 +11499,18 @@ "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "builtin-modules": "1.1.1", - "chalk": "2.4.1", - "commander": "2.15.1", - "diff": "3.5.0", - "glob": "7.1.2", - "js-yaml": "3.12.0", - "minimatch": "3.0.4", - "resolve": "1.8.1", - "semver": "5.5.0", - "tslib": "1.9.2", - "tsutils": "2.27.1" + "babel-code-frame": "^6.22.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^3.2.0", + "glob": "^7.1.1", + "js-yaml": "^3.7.0", + "minimatch": "^3.0.4", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.12.1" }, "dependencies": { "chalk": { @@ -11516,9 +11519,9 @@ "integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -11529,7 +11532,7 @@ "integrity": "sha512-AE/7uzp32MmaHvNNFES85hhUDHFdFZp6OAiZcd6y4ZKKIg6orJTm8keYWBhIhrJQH3a4LzNKat7ZPXZt5aTf6w==", "dev": true, "requires": { - "tslib": "1.9.2" + "tslib": "^1.8.1" } }, "tty-browserify": { @@ -11543,7 +11546,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -11558,7 +11561,7 @@ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } }, "type-is": { @@ -11568,7 +11571,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.18" + "mime-types": "~2.1.18" } }, "typedarray": { @@ -11587,8 +11590,8 @@ "integrity": "sha512-O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==", "dev": true, "requires": { - "commander": "2.16.0", - "source-map": "0.6.1" + "commander": "~2.16.0", + "source-map": "~0.6.1" }, "dependencies": { "commander": { @@ -11618,14 +11621,14 @@ "integrity": "sha512-1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA==", "dev": true, "requires": { - "cacache": "10.0.4", - "find-cache-dir": "1.0.0", - "schema-utils": "0.4.5", - "serialize-javascript": "1.5.0", - "source-map": "0.6.1", - "uglify-es": "3.3.9", - "webpack-sources": "1.1.0", - "worker-farm": "1.6.0" + "cacache": "^10.0.4", + "find-cache-dir": "^1.0.0", + "schema-utils": "^0.4.5", + "serialize-javascript": "^1.4.0", + "source-map": "^0.6.1", + "uglify-es": "^3.3.4", + "webpack-sources": "^1.1.0", + "worker-farm": "^1.5.2" }, "dependencies": { "commander": { @@ -11646,8 +11649,8 @@ "integrity": "sha1-DBxPBwC+2NvBJM2zBNJZLKID5nc=", "dev": true, "requires": { - "commander": "2.13.0", - "source-map": "0.6.1" + "commander": "~2.13.0", + "source-map": "~0.6.1" } } } @@ -11668,10 +11671,10 @@ "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz", "integrity": "sha512-13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ==", "requires": { - "acorn-node": "1.5.2", - "get-assigned-identifiers": "1.2.0", - "simple-concat": "1.0.0", - "xtend": "4.0.1" + "acorn-node": "^1.3.0", + "get-assigned-identifiers": "^1.2.0", + "simple-concat": "^1.0.0", + "xtend": "^4.0.1" } }, "underscore": { @@ -11684,8 +11687,8 @@ "resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.1.0.tgz", "integrity": "sha1-epbu9J91aC6mnSMV7smsQ//fAME=", "requires": { - "brfs": "1.6.1", - "unicode-trie": "0.3.1" + "brfs": "^1.4.0", + "unicode-trie": "^0.3.0" } }, "unicode-trie": { @@ -11693,8 +11696,8 @@ "resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-0.3.1.tgz", "integrity": "sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=", "requires": { - "pako": "0.2.9", - "tiny-inflate": "1.0.2" + "pako": "^0.2.5", + "tiny-inflate": "^1.0.0" }, "dependencies": { "pako": { @@ -11709,10 +11712,10 @@ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" }, "dependencies": { "extend-shallow": { @@ -11720,7 +11723,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "set-value": { @@ -11728,10 +11731,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" } } } @@ -11742,7 +11745,7 @@ "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", "dev": true, "requires": { - "unique-slug": "2.0.0" + "unique-slug": "^2.0.0" } }, "unique-slug": { @@ -11751,7 +11754,7 @@ "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", "dev": true, "requires": { - "imurmurhash": "0.1.4" + "imurmurhash": "^0.1.4" } }, "universalify": { @@ -11771,9 +11774,9 @@ "resolved": "https://registry.npmjs.org/unreachable-branch-transform/-/unreachable-branch-transform-0.3.0.tgz", "integrity": "sha1-2ZzExudG0mSSiEW2EdtUsPNHTKo=", "requires": { - "esmangle-evaluator": "1.0.1", - "recast": "0.10.43", - "through2": "0.6.5" + "esmangle-evaluator": "^1.0.0", + "recast": "^0.10.1", + "through2": "^0.6.2" }, "dependencies": { "isarray": { @@ -11786,10 +11789,10 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -11802,8 +11805,8 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "requires": { - "readable-stream": "1.0.34", - "xtend": "4.0.1" + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" } } } @@ -11813,8 +11816,8 @@ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { @@ -11822,9 +11825,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { @@ -11860,7 +11863,7 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz", "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=", "requires": { - "punycode": "2.1.1" + "punycode": "^2.1.0" } }, "urix": { @@ -11896,9 +11899,9 @@ "integrity": "sha1-YbxT8fGE1zQ9onKKEonvhyLqRe4=", "dev": true, "requires": { - "loader-utils": "1.1.0", - "mime": "2.3.1", - "schema-utils": "0.4.5" + "loader-utils": "^1.1.0", + "mime": "^2.0.3", + "schema-utils": "^0.4.3" }, "dependencies": { "mime": { @@ -11915,8 +11918,8 @@ "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==", "dev": true, "requires": { - "querystringify": "2.0.0", - "requires-port": "1.0.0" + "querystringify": "^2.0.0", + "requires-port": "^1.0.0" } }, "use": { @@ -11924,7 +11927,7 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.2" } }, "useragent": { @@ -11933,8 +11936,8 @@ "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=", "dev": true, "requires": { - "lru-cache": "2.2.4", - "tmp": "0.0.33" + "lru-cache": "2.2.x", + "tmp": "0.0.x" }, "dependencies": { "lru-cache": { @@ -11969,8 +11972,8 @@ "integrity": "sha1-RA9xZaRZyaFtwUXrjnLzVocJcDA=", "dev": true, "requires": { - "define-properties": "1.1.2", - "object.getownpropertydescriptors": "2.0.3" + "define-properties": "^1.1.2", + "object.getownpropertydescriptors": "^2.0.3" } }, "utila": { @@ -11996,8 +11999,8 @@ "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "validate-npm-package-name": { @@ -12006,7 +12009,7 @@ "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", "dev": true, "requires": { - "builtins": "1.0.3" + "builtins": "^1.0.3" } }, "vary": { @@ -12021,9 +12024,9 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "vlq": { @@ -12057,9 +12060,9 @@ "integrity": "sha1-S8EsLr6KonenHx0/FNaFx7RGzQA=", "dev": true, "requires": { - "chokidar": "2.0.4", - "graceful-fs": "4.1.11", - "neo-async": "2.5.1" + "chokidar": "^2.0.2", + "graceful-fs": "^4.1.2", + "neo-async": "^2.5.0" } }, "wbuf": { @@ -12068,7 +12071,7 @@ "integrity": "sha1-wdjRSTFtPqhShIiVy2oL/oh7h98=", "dev": true, "requires": { - "minimalistic-assert": "1.0.1" + "minimalistic-assert": "^1.0.0" } }, "web-animations-js": { @@ -12086,7 +12089,7 @@ "@webassemblyjs/validation": "1.4.3", "@webassemblyjs/wasm-parser": "1.4.3", "@webassemblyjs/wast-parser": "1.4.3", - "long": "3.2.0" + "long": "^3.2.0" } }, "webdriver-js-extender": { @@ -12095,8 +12098,8 @@ "integrity": "sha512-fbyKiVu3azzIc5d4+26YfuPQcFTlgFQV5yQ/0OQj4Ybkl4g1YQuIPskf5v5wqwRJhHJnPHthB6tqCjWHOKLWag==", "dev": true, "requires": { - "@types/selenium-webdriver": "3.0.10", - "selenium-webdriver": "3.6.0" + "@types/selenium-webdriver": "^3.0.0", + "selenium-webdriver": "^3.0.1" } }, "webfont-medical-icons2": { @@ -12113,26 +12116,26 @@ "@webassemblyjs/ast": "1.4.3", "@webassemblyjs/wasm-edit": "1.4.3", "@webassemblyjs/wasm-parser": "1.4.3", - "acorn": "5.7.1", - "acorn-dynamic-import": "3.0.0", - "ajv": "6.4.0", - "ajv-keywords": "3.2.0", - "chrome-trace-event": "0.1.3", - "enhanced-resolve": "4.1.0", - "eslint-scope": "3.7.3", - "json-parse-better-errors": "1.0.2", - "loader-runner": "2.3.0", - "loader-utils": "1.1.0", - "memory-fs": "0.4.1", - "micromatch": "3.1.10", - "mkdirp": "0.5.1", - "neo-async": "2.5.1", - "node-libs-browser": "2.1.0", - "schema-utils": "0.4.5", - "tapable": "1.0.0", - "uglifyjs-webpack-plugin": "1.2.7", - "watchpack": "1.6.0", - "webpack-sources": "1.1.0" + "acorn": "^5.0.0", + "acorn-dynamic-import": "^3.0.0", + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0", + "chrome-trace-event": "^0.1.1", + "enhanced-resolve": "^4.0.0", + "eslint-scope": "^3.7.1", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^2.3.0", + "loader-utils": "^1.1.0", + "memory-fs": "~0.4.1", + "micromatch": "^3.1.8", + "mkdirp": "~0.5.0", + "neo-async": "^2.5.0", + "node-libs-browser": "^2.0.0", + "schema-utils": "^0.4.4", + "tapable": "^1.0.0", + "uglifyjs-webpack-plugin": "^1.2.4", + "watchpack": "^1.5.0", + "webpack-sources": "^1.0.1" } }, "webpack-core": { @@ -12141,8 +12144,8 @@ "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", "dev": true, "requires": { - "source-list-map": "0.1.8", - "source-map": "0.4.4" + "source-list-map": "~0.1.7", + "source-map": "~0.4.1" }, "dependencies": { "source-list-map": { @@ -12157,7 +12160,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -12168,13 +12171,13 @@ "integrity": "sha1-izKqQ9qa55Nowb8Rg/K2z14fOe0=", "dev": true, "requires": { - "loud-rejection": "1.6.0", - "memory-fs": "0.4.1", - "mime": "2.3.1", - "path-is-absolute": "1.0.1", - "range-parser": "1.2.0", - "url-join": "4.0.0", - "webpack-log": "1.2.0" + "loud-rejection": "^1.6.0", + "memory-fs": "~0.4.1", + "mime": "^2.1.0", + "path-is-absolute": "^1.0.0", + "range-parser": "^1.0.3", + "url-join": "^4.0.0", + "webpack-log": "^1.0.1" }, "dependencies": { "mime": { @@ -12192,32 +12195,32 @@ "dev": true, "requires": { "ansi-html": "0.0.7", - "array-includes": "3.0.3", - "bonjour": "3.5.0", - "chokidar": "2.0.4", - "compression": "1.7.3", - "connect-history-api-fallback": "1.5.0", - "debug": "3.1.0", - "del": "3.0.0", - "express": "4.16.3", - "html-entities": "1.2.1", - "http-proxy-middleware": "0.18.0", - "import-local": "1.0.0", + "array-includes": "^3.0.3", + "bonjour": "^3.5.0", + "chokidar": "^2.0.0", + "compression": "^1.5.2", + "connect-history-api-fallback": "^1.3.0", + "debug": "^3.1.0", + "del": "^3.0.0", + "express": "^4.16.2", + "html-entities": "^1.2.0", + "http-proxy-middleware": "~0.18.0", + "import-local": "^1.0.0", "internal-ip": "1.2.0", - "ip": "1.1.5", - "killable": "1.0.0", - "loglevel": "1.6.1", - "opn": "5.3.0", - "portfinder": "1.0.16", - "selfsigned": "1.10.3", - "serve-index": "1.9.1", + "ip": "^1.1.5", + "killable": "^1.0.0", + "loglevel": "^1.4.1", + "opn": "^5.1.0", + "portfinder": "^1.0.9", + "selfsigned": "^1.9.1", + "serve-index": "^1.7.2", "sockjs": "0.3.19", "sockjs-client": "1.1.5", - "spdy": "3.4.7", - "strip-ansi": "3.0.1", - "supports-color": "5.4.0", + "spdy": "^3.4.1", + "strip-ansi": "^3.0.0", + "supports-color": "^5.1.0", "webpack-dev-middleware": "3.1.3", - "webpack-log": "1.2.0", + "webpack-log": "^1.1.2", "yargs": "11.0.0" }, "dependencies": { @@ -12239,9 +12242,9 @@ "integrity": "sha1-NIQi2+gtgAswIu709qwQvy5NG0k=", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" }, "dependencies": { "strip-ansi": { @@ -12250,7 +12253,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -12276,9 +12279,9 @@ "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "string-width": { @@ -12287,8 +12290,8 @@ "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "strip-ansi": { @@ -12297,7 +12300,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -12320,18 +12323,18 @@ "integrity": "sha1-wFKTEAbF7udGEOX8A1S+39CKIBs=", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.3", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "9.0.2" + "cliui": "^4.0.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^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": "^9.0.2" } }, "yargs-parser": { @@ -12340,7 +12343,7 @@ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } @@ -12351,10 +12354,10 @@ "integrity": "sha1-pLNM2msitRjbsKsy5WeWLVxypD0=", "dev": true, "requires": { - "chalk": "2.4.1", - "log-symbols": "2.2.0", - "loglevelnext": "1.0.5", - "uuid": "3.2.1" + "chalk": "^2.1.0", + "log-symbols": "^2.1.0", + "loglevelnext": "^1.0.1", + "uuid": "^3.1.0" } }, "webpack-merge": { @@ -12363,7 +12366,7 @@ "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "^4.17.5" } }, "webpack-sources": { @@ -12372,8 +12375,8 @@ "integrity": "sha1-oQHrrlnWUHNU1x2AE5UKOot6WlQ=", "dev": true, "requires": { - "source-list-map": "2.0.0", - "source-map": "0.6.1" + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" }, "dependencies": { "source-map": { @@ -12390,7 +12393,7 @@ "integrity": "sha1-xcTj1pD50vZKlVDgeodn+Xlqpdg=", "dev": true, "requires": { - "webpack-core": "0.6.9" + "webpack-core": "^0.6.8" } }, "websocket-driver": { @@ -12399,8 +12402,8 @@ "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "dev": true, "requires": { - "http-parser-js": "0.4.13", - "websocket-extensions": "0.1.3" + "http-parser-js": ">=0.4.0", + "websocket-extensions": ">=0.1.1" } }, "websocket-extensions": { @@ -12421,7 +12424,7 @@ "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -12441,7 +12444,7 @@ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=", "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2 || 2" } }, "window-size": { @@ -12462,7 +12465,7 @@ "integrity": "sha1-rsxAWXb6talVJhgIRvDboojzpKA=", "dev": true, "requires": { - "errno": "0.1.7" + "errno": "~0.1.7" } }, "worker-loader": { @@ -12470,8 +12473,8 @@ "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-1.1.1.tgz", "integrity": "sha512-qJZLVS/jMCBITDzPo/RuweYSIG8VJP5P67mP/71alGyTZRe1LYJFdwLjLalY3T5ifx0bMDRD3OB6P2p1escvlg==", "requires": { - "loader-utils": "1.1.0", - "schema-utils": "0.4.5" + "loader-utils": "^1.0.0", + "schema-utils": "^0.4.0" } }, "wrap-ansi": { @@ -12480,8 +12483,8 @@ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" } }, "wrappy": { @@ -12494,7 +12497,7 @@ "resolved": "https://registry.npmjs.org/write-stream/-/write-stream-0.4.3.tgz", "integrity": "sha1-g8yMA0fQr2BXqThitOOuAd5cgcE=", "requires": { - "readable-stream": "0.0.4" + "readable-stream": "~0.0.2" }, "dependencies": { "readable-stream": { @@ -12510,9 +12513,9 @@ "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", "dev": true, "requires": { - "async-limiter": "1.0.0", - "safe-buffer": "5.1.2", - "ultron": "1.1.1" + "async-limiter": "~1.0.0", + "safe-buffer": "~5.1.0", + "ultron": "~1.1.0" } }, "xml2js": { @@ -12521,8 +12524,8 @@ "integrity": "sha1-aGwg8hMgnpSr8NG88e+qKRx4J6c=", "dev": true, "requires": { - "sax": "1.2.4", - "xmlbuilder": "9.0.7" + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" }, "dependencies": { "sax": { @@ -12556,7 +12559,7 @@ "integrity": "sha1-imJRVnYhocRqWuIE2gJJx/jKqdg=", "dev": true, "requires": { - "cuint": "0.2.2" + "cuint": "^0.2.2" } }, "y18n": { @@ -12578,9 +12581,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } }, @@ -12591,7 +12594,7 @@ "dev": true, "optional": true, "requires": { - "camelcase": "3.0.0" + "camelcase": "^3.0.0" }, "dependencies": { "camelcase": { diff --git a/package.json b/package.json index 2f387e448..2c2ad3b9f 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "@types/jasmine": "~2.8.6", "@types/jasminewd2": "~2.0.3", "@types/jquery": "^3.3.4", - "@types/node": "~8.9.4", + "@types/node": "^8.9.5", "@types/pouchdb": "^6.3.0", "@types/source-map": "^0.5.0", "@types/uglify-js": "^2.6.28", diff --git a/src/app/app-settings/app-settings.service.ts b/src/app/app-settings/app-settings.service.ts index b590d330d..cfb2a8d54 100644 --- a/src/app/app-settings/app-settings.service.ts +++ b/src/app/app-settings/app-settings.service.ts @@ -15,16 +15,19 @@ export class AppSettingsService { private _openmrsServerUrls = [ 'http://localhost:8080/openmrs', - 'https://test2.ampath.or.ke:8443/amrs', - 'https://amrs.ampath.or.ke:8443/amrs' + // 'https://test2.ampath.or.ke:8443/amrs', + // 'https://amrs.ampath.or.ke:8443/amrs' + 'https://ngx.ampath.or.ke/amrs', + 'https://ngx.ampath.or.ke/test-amrs' ]; private _etlServerUrls = [ 'http://localhost:8002/etl', - 'https://test1.ampath.or.ke:8002/etl', - 'https://test2.ampath.or.ke:8002/etl', - 'https://amrsreporting.ampath.or.ke:8002/etl', - 'https://amrsreporting.ampath.or.ke:8003/etl' + // 'https://test1.ampath.or.ke:8002/etl', + // 'https://test2.ampath.or.ke:8002/etl', + // 'https://amrsreporting.ampath.or.ke:8002/etl', + '/etl-server-test-worcester/etl', + 'https://ngx.ampath.or.ke/etl-latest/etl' ]; private templates = [ @@ -40,8 +43,8 @@ export class AppSettingsService { }, { name: 'AMRS Test', - amrsUrl: '/amrs-test', - etlUrl: '/etl-server-test/etl' + amrsUrl: '/test-amrs', + etlUrl: '/etl-server-test-worcester/etl' } ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 513113c11..2b23ba09f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -4,8 +4,7 @@ import { CommonModule } from '@angular/common'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { FormsModule } from '@angular/forms'; -import { HttpModule, Http, XHRBackend, RequestOptions } from '@angular/http'; -import { RouterModule, Router } from '@angular/router'; +import { RouterModule } from '@angular/router'; import { AuthGuard } from './shared/guards/auth.guard'; import { LoginGuard } from './shared/guards/login.guard'; @@ -24,27 +23,24 @@ import { AppState, InternalStateType } from './app.service'; import { NoContentComponent } from './no-content'; import { DynamicRoutesService } from './shared/dynamic-route/dynamic-routes.service'; import { AppFeatureAnalytics } from './shared/app-analytics/app-feature-analytics.service'; -import { HttpClient } from './shared/services/http-client.service'; import { TitleCasePipe } from './shared/pipes/title-case.pipe'; import { LocalStorageService } from './utils/local-storage.service'; -import { SessionStorageService } from './utils/session-storage.service'; import { CacheService } from 'ionic-cache'; import { DataCacheService } from './shared/services/data-cache.service'; import { FeedBackComponent } from './feedback'; -import { FormVisitTypeSearchModule } from - './patient-dashboard/common/form-visit-type-search/form-visit-type-search.module'; +import { FormVisitTypeSearchModule } from './patient-dashboard/common/form-visit-type-search/form-visit-type-search.module'; import { LabOrderSearchModule } from './lab-order-search/lab-order-search.module'; import { ModalModule } from 'ngx-bootstrap/modal'; import { CookieModule } from 'ngx-cookie'; import { OnlineTrackerService } from './online-tracker/online-tracker.service'; import { PouchdbService } from './pouchdb-service/pouchdb.service'; -import { - DepartmentProgramsConfigService -} from './etl-api/department-programs-config.service'; +import { DepartmentProgramsConfigService } from './etl-api/department-programs-config.service'; import { BrowserModule } from '@angular/platform-browser'; import { ServiceWorkerModule } from '@angular/service-worker'; import { environment } from '../environments/environment'; +import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; +import { PocHttpInteceptor } from './shared/services/poc-http-interceptor'; // Application wide providers const APP_PROVIDERS = [ @@ -57,10 +53,6 @@ interface StoreType { restoreInputValues: () => void; disposeOldHosts: () => void; } -export function httpClient(xhrBackend: XHRBackend, requestOptions: RequestOptions, - router: Router, sessionStorageService: SessionStorageService) { - return new HttpClient(xhrBackend, requestOptions, router, sessionStorageService); -} /** * `AppModule` is the main entry point into Angular2's bootstraping process */ @@ -81,7 +73,7 @@ export function httpClient(xhrBackend: XHRBackend, requestOptions: RequestOption ModalModule.forRoot(), NgamrsSharedModule.forRoot(), FormsModule, - HttpModule, + HttpClientModule, RouterModule.forRoot(ROUTES, { useHash: true, enableTracing: false }), Angulartics2Module.forRoot([Angulartics2Piwik]), ServiceWorkerModule.register('/combined-worker.js', { enabled: environment.production }), @@ -98,9 +90,9 @@ export function httpClient(xhrBackend: XHRBackend, requestOptions: RequestOption DepartmentProgramsConfigService, PouchdbService, { - provide: Http, - useFactory: httpClient, - deps: [XHRBackend, RequestOptions, Router, SessionStorageService] + provide: HTTP_INTERCEPTORS, + useClass: PocHttpInteceptor, + multi: true }, CacheService, DataCacheService diff --git a/src/app/authentication/login.component.ts b/src/app/authentication/login.component.ts index a00805964..4358e848c 100644 --- a/src/app/authentication/login.component.ts +++ b/src/app/authentication/login.component.ts @@ -3,7 +3,6 @@ import { ViewEncapsulation } from '@angular/core'; import { Router } from '@angular/router'; -import { Response } from '@angular/http'; import { AuthenticationService } from '../openmrs-api/authentication.service'; import { Messages } from '../utils/messages'; import { Subscription , Observable } from 'rxjs'; @@ -79,8 +78,8 @@ export class LoginComponent implements OnInit { this.busy = this.authenticationService.authenticate(username, password) .take(1).subscribe( - (response: Response) => { - let data = response.json(); + (response: any) => { + let data = response; if (data.authenticated) { diff --git a/src/app/data-analytics-dashboard/services/data-analytics-dashboard.services.ts b/src/app/data-analytics-dashboard/services/data-analytics-dashboard.services.ts index 24dc24d1f..e1b9c2c64 100644 --- a/src/app/data-analytics-dashboard/services/data-analytics-dashboard.services.ts +++ b/src/app/data-analytics-dashboard/services/data-analytics-dashboard.services.ts @@ -1,8 +1,6 @@ import { Injectable } from '@angular/core'; -import { Http, Response } from '@angular/http'; import { BehaviorSubject, Subject, ReplaySubject } from 'rxjs'; -import * as Moment from 'moment'; @Injectable() export class DataAnalyticsDashboardService { public dataIsLoading = true; diff --git a/src/app/etl-api/cdm-summary-resource.service.ts b/src/app/etl-api/cdm-summary-resource.service.ts index ca9d64d50..dde70238f 100644 --- a/src/app/etl-api/cdm-summary-resource.service.ts +++ b/src/app/etl-api/cdm-summary-resource.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; -import { Observable, Subject } from 'rxjs/Rx'; +import { Observable } from 'rxjs'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class CdmSummaryResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { } + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -18,18 +18,18 @@ export class CdmSummaryResourceService { let url = this.getUrl(); url += '/' + patientUuid + '/cdm-summary'; - let params: URLSearchParams = new URLSearchParams(); + let params: HttpParams = new HttpParams() + .set('limit', limit.toString()) + .set('startIndex', startIndex.toString()); if (includeNonClinicalEncounter !== undefined) { - params.set('includeNonClinicalEncounter', includeNonClinicalEncounter.toString()); + params = params.set('includeNonClinicalEncounter', includeNonClinicalEncounter.toString()); } - params.set('startIndex', startIndex.toString()); - params.set('limit', limit.toString()); - return this.http.get(url, { - search: params - }).map((response: Response) => { - return response.json().result; + return this.http.get(url, { + params: params + }).map((response) => { + return response.result; }); } } diff --git a/src/app/etl-api/clinic-lab-orders-resource.service.ts b/src/app/etl-api/clinic-lab-orders-resource.service.ts index 9e9619184..7ef781721 100644 --- a/src/app/etl-api/clinic-lab-orders-resource.service.ts +++ b/src/app/etl-api/clinic-lab-orders-resource.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { Observable } from 'rxjs'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class ClinicLabOrdersResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { } + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(reportName): string { return this.appSettingsService.getEtlRestbaseurl().trim() + `${reportName}`; @@ -14,28 +14,28 @@ export class ClinicLabOrdersResourceService { } public getClinicLabOrders(params): Observable { - let url = this.getUrl('clinic-lab-orders'); - let urlParams: URLSearchParams = new URLSearchParams(); - urlParams.set('locationUuids', params.locationUuids); - urlParams.set('endDate', params.endDate); - urlParams.set('startDate', params.startDate); - return this.http.get(url , { - search: urlParams + const url = this.getUrl('clinic-lab-orders'); + const urlParams: HttpParams = new HttpParams() + .set('locationUuids', params.locationUuids) + .set('endDate', params.endDate) + .set('startDate', params.startDate); + return this.http.get(url , { + params: urlParams }) - .map((response: Response) => { - return response.json().result; + .map((response) => { + return response.result; }); // return this.dataCache.cacheRequest(url, urlParams, request); } public getLabOrdersByPatientUuid(patientUuid): Observable { let url = this.getUrls(); - let urlParams: URLSearchParams = new URLSearchParams(); - urlParams.set('patientUuid', patientUuid); - return this.http.get(url , { - search: urlParams + let urlParams: HttpParams = new HttpParams() + .set('patientUuid', patientUuid); + return this.http.get(url , { + params: urlParams }) - .map((response: Response) => { - return response.json().result; + .map((response) => { + return response.result; }); // return this.dataCache.cacheRequest(url, urlParams, request); } diff --git a/src/app/etl-api/clinical-notes-resource.service.ts b/src/app/etl-api/clinical-notes-resource.service.ts index e0d919ad6..e763d3962 100644 --- a/src/app/etl-api/clinical-notes-resource.service.ts +++ b/src/app/etl-api/clinical-notes-resource.service.ts @@ -1,14 +1,15 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, URLSearchParams } from '@angular/http'; +import { URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class ClinicalNotesResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { } + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public getClinicalNotes(patientUuid: string, startIndex: number, limit: number) { @@ -22,11 +23,10 @@ export class ClinicalNotesResourceService { limit = 10; } - let params: URLSearchParams = new URLSearchParams(); + let params: HttpParams = new HttpParams() + .set('startIndex', startIndex as any as string) + .set('limit', limit as any as string); - params.set('startIndex', startIndex as any as string); - params.set('limit', limit as any as string); - - return this.http.get(api, {search: params}).pipe(map((data) => data.json())); + return this.http.get(api, {params: params}); } } diff --git a/src/app/etl-api/clinical-summary-visualization-resource.service.ts b/src/app/etl-api/clinical-summary-visualization-resource.service.ts index f7148146d..c6a88e5eb 100644 --- a/src/app/etl-api/clinical-summary-visualization-resource.service.ts +++ b/src/app/etl-api/clinical-summary-visualization-resource.service.ts @@ -1,13 +1,13 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; import * as _ from 'lodash'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class ClinicalSummaryVisualizationResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } public getUrl(reportName): string { @@ -18,23 +18,23 @@ export class ClinicalSummaryVisualizationResourceService { return this.appSettingsService.getEtlRestbaseurl().trim() + `${reportName}/patient-list`; } - public getUrlRequestParams(params): URLSearchParams { - let urlParams: URLSearchParams = new URLSearchParams(); + public getUrlRequestParams(params): HttpParams { if (!params.startIndex) { params.startIndex = '0'; } if (!params.limit) { params.limit = '300'; } - urlParams.set('startIndex', params.startIndex); - urlParams.set('endDate', params.endDate); - urlParams.set('gender', params.gender); - urlParams.set('startDate', params.startDate); - urlParams.set('groupBy', params.groupBy); - urlParams.set('indicator', params.indicator || params.indicators); - urlParams.set('order', params.order); - urlParams.set('locationUuids', params.locationUuids); - urlParams.set('limit', params.limit); + let urlParams: HttpParams = new HttpParams() + .set('startIndex', params.startIndex) + .set('endDate', params.endDate) + .set('gender', params.gender) + .set('startDate', params.startDate) + .set('groupBy', params.groupBy) + .set('indicator', params.indicator || params.indicators) + .set('order', params.order) + .set('locationUuids', params.locationUuids) + .set('limit', params.limit); return urlParams; } @@ -42,11 +42,8 @@ export class ClinicalSummaryVisualizationResourceService { let urlParams = this.getUrlRequestParams(params); let url = this.getUrl('clinical-hiv-comparative-overview'); let request = this.http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json(); - })); + params: urlParams + }); return this.cacheService.cacheRequest(url, urlParams, request); @@ -55,13 +52,11 @@ export class ClinicalSummaryVisualizationResourceService { public getReportOverviewPatientList(reportName: string, params: any) { let urlParams = this.getUrlRequestParams(params); let url = this.getPatientListUrl(reportName); - let request = this.http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json().result; - })); - + let request = this.http.get(url, { + params: urlParams + }).pipe(map((response) => { + return response.result; + })); return this.cacheService.cacheRequest(url, urlParams, request); } @@ -69,10 +64,10 @@ export class ClinicalSummaryVisualizationResourceService { let urlParams = this.getUrlRequestParams(params); let url = this.getPatientListUrl('clinical-hiv-comparative-overview'); let request = this.http.get(url, { - search: urlParams + params: urlParams }).pipe( - map((response: Response) => { - return response.json().result; + map((response: any) => { + return response.result; })); this.cacheService.cacheRequest(url, urlParams, request); @@ -83,11 +78,8 @@ export class ClinicalSummaryVisualizationResourceService { let urlParams = this.getUrlRequestParams(params); let url = this.getUrl('clinical-art-overview'); let request = this.http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json(); - })); + params: urlParams + }); return this.cacheService.cacheRequest(url, urlParams, request); } @@ -95,11 +87,11 @@ export class ClinicalSummaryVisualizationResourceService { public getArtOverviewReportPatientList(params) { let urlParams = this.getUrlRequestParams(params); let url = this.getPatientListUrl('clinical-art-overview'); - let request = this.http.get(url, { - search: urlParams + let request = this.http.get(url, { + params: urlParams }).pipe( - map((response: Response) => { - return response.json().result; + map((response) => { + return response.result; })); return this.cacheService.cacheRequest(url, urlParams, request); @@ -109,11 +101,8 @@ export class ClinicalSummaryVisualizationResourceService { let urlParams = this.getUrlRequestParams(params); let url = this.getUrl('clinical-patient-care-status-overview'); let request = this.http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json(); - })); + params: urlParams + }); return this.cacheService.cacheRequest(url, urlParams, request); } @@ -121,11 +110,11 @@ export class ClinicalSummaryVisualizationResourceService { public getPatientCareStatusReportList(params) { let urlParams = this.getUrlRequestParams(params); let url = this.getPatientListUrl('clinical-patient-care-status-overview'); - let request = this.http.get(url, { - search: urlParams + let request = this.http.get(url, { + params: urlParams }).pipe( - map((response: Response) => { - return response.json().result; + map((response) => { + return response.result; })); return this.cacheService.cacheRequest(url, urlParams, request); diff --git a/src/app/etl-api/cohort-list-user-resource.service.ts b/src/app/etl-api/cohort-list-user-resource.service.ts index 9a8ef36c9..0b3d38180 100644 --- a/src/app/etl-api/cohort-list-user-resource.service.ts +++ b/src/app/etl-api/cohort-list-user-resource.service.ts @@ -1,16 +1,12 @@ - -import {map} from 'rxjs/operators'; - import { Injectable } from '@angular/core'; -import { Http, URLSearchParams, Response, Headers, RequestOptions } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; import { Observable } from 'rxjs'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class CohortUserResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { } + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public getUrl(): string { return this.appSettingsService.getEtlRestbaseurl().trim() + 'cohort'; @@ -21,44 +17,26 @@ export class CohortUserResourceService { } let url = this.getUrl(); url += '/' + cohortUuid + '/cohort-users'; - let params: URLSearchParams = new URLSearchParams(); - - return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json(); - })); + return this.http.get(url); } public voidCohortUser(cohortUserId) { let url = this.appSettingsService.getEtlRestbaseurl().trim() + 'cohort-user'; url += '/' + cohortUserId ; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.delete(url, options).pipe( - map(( response) => { - return response; - })); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.delete(url, {headers}); } public createCohortUser(payload) { let url = this.appSettingsService.getEtlRestbaseurl().trim() + 'cohort-user'; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - })); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}) } public updateCohortUser(cohortUserId, payload) { let url = this.appSettingsService.getEtlRestbaseurl().trim() + 'cohort-user'; url += '/' + cohortUserId ; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - })); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}); } } diff --git a/src/app/etl-api/daily-scheduled-resource.service.ts b/src/app/etl-api/daily-scheduled-resource.service.ts index 92f88409b..4c26afc9d 100644 --- a/src/app/etl-api/daily-scheduled-resource.service.ts +++ b/src/app/etl-api/daily-scheduled-resource.service.ts @@ -1,14 +1,13 @@ -import {map} from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Observable } from 'rxjs'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class DailyScheduleResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } public getUrl(reportName, selectedDate): string { @@ -16,74 +15,72 @@ export class DailyScheduleResourceService { } public getDailyVisits(params) { - let urlParams: URLSearchParams = new URLSearchParams(); if (!params.startIndex) { params.startIndex = '0'; } if (!params.limit) { params.limit = '300'; } - urlParams.set('startIndex', params.startIndex); - urlParams.set('startDate', params.startDate); - urlParams.set('locationUuids', params.locationUuids); - urlParams.set('programVisitEncounter', params.programVisitEncounter); - urlParams.set('limit', params.limit); + let urlParams: HttpParams = new HttpParams() + .set('startIndex', params.startIndex) + .set('startDate', params.startDate) + .set('locationUuids', params.locationUuids) + .set('programVisitEncounter', params.programVisitEncounter) + .set('limit', params.limit); let url = this.getUrl('daily-visits', params.startDate); - let request = this.http.get(url, { - search: urlParams + let request = this.http.get(url, { + params: urlParams }).pipe( - map((response: Response) => { - return response.json().result; + map((response) => { + return response.result; })); return this.cacheService.cacheRequest(url, urlParams, request); } public getDailyAppointments(params) { - let urlParams: URLSearchParams = new URLSearchParams(); - if (!params.startIndex) { params.startIndex = '0'; } if (!params.limit) { params.limit = '300'; } - - urlParams.set('startIndex', params.startIndex); - urlParams.set('startDate', params.startDate); - urlParams.set('locationUuids', params.locationUuids); - urlParams.set('programVisitEncounter', params.programVisitEncounter); - urlParams.set('limit', params.limit); + let urlParams: HttpParams = new HttpParams() + .set('startIndex', params.startIndex) + .set('startDate', params.startDate) + .set('locationUuids', params.locationUuids) + .set('programVisitEncounter', params.programVisitEncounter) + .set('limit', params.limit); let url = this.getUrl('daily-appointments', params.startDate); - let request = this.http.get(url, { - search: urlParams + let request = this.http.get(url, { + params: urlParams }).pipe( - map((response: Response) => { - return response.json().result; + map((response) => { + return response.result; })); return this.cacheService.cacheRequest(url, urlParams, request); } public getDailyHasNotReturned(params) { - let urlParams: URLSearchParams = new URLSearchParams(); if (!params.startIndex) { params.startIndex = '0'; } if (!params.limit) { params.limit = '300'; } - urlParams.set('startIndex', params.startIndex); - urlParams.set('startDate', params.startDate); - urlParams.set('locationUuids', params.locationUuids); - urlParams.set('programVisitEncounter', params.programVisitEncounter); - urlParams.set('limit', params.limit); + let urlParams: HttpParams = new HttpParams() + .set('startIndex', params.startIndex) + .set('startDate', params.startDate) + .set('locationUuids', params.locationUuids) + .set('programVisitEncounter', params.programVisitEncounter) + .set('limit', params.limit); let url = this.getUrl('daily-has-not-returned', params.startDate); - let request = this.http.get(url, { - search: urlParams + let request = this.http.get(url, { + params: urlParams }).pipe( - map((response: Response) => { - return response.json().result; + map((response) => { + return response.result; })); return this.cacheService.cacheRequest(url, urlParams, request); } diff --git a/src/app/etl-api/data-entry-statistics-resource.service.ts b/src/app/etl-api/data-entry-statistics-resource.service.ts index b232865c9..a01ade018 100644 --- a/src/app/etl-api/data-entry-statistics-resource.service.ts +++ b/src/app/etl-api/data-entry-statistics-resource.service.ts @@ -2,12 +2,12 @@ import { throwError as observableThrowError, Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class DataEntryStatisticsService { - constructor(protected http: Http, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } @@ -38,16 +38,17 @@ export class DataEntryStatisticsService { if (payload && payload.subType && payload.startDate && payload.endDate && payload.groupBy) { - let urlParams: URLSearchParams = new URLSearchParams(); + let baseUrl = this.getBaseUrl(); let params: any = this.getDataEntryStatisticsQueryParam(payload); let dataEntryStatsUrl = 'data-entry-statistics/' + params.subType; let url = baseUrl + dataEntryStatsUrl; - urlParams.set('startDate', params.startDate); - urlParams.set('endDate', params.endDate); - urlParams.set('groupBy', params.groupBy); + let urlParams: HttpParams = new HttpParams() + .set('startDate', params.startDate) + .set('endDate', params.endDate) + .set('groupBy', params.groupBy); if (params.locationUuids) { urlParams.set('locationUuids', params.locationUuids); } @@ -61,9 +62,9 @@ export class DataEntryStatisticsService { urlParams.set('creatorUuid', params.creatorUuid); } - let request = this.http.get(url, {search : urlParams}).pipe( - map((response) => { - return response.json().result; + let request = this.http.get(url, {params : urlParams}).pipe( + map((response: any) => { + return response.result; })); return this.cacheService.cacheRequest(url, urlParams, request); @@ -128,14 +129,13 @@ export class DataEntryStatisticsService { public getDataEntrySatisticsPatientList(params) { - let urlParams: URLSearchParams = new URLSearchParams(); - let baseUrl = this.getBaseUrl(); let dataEntryStatsPatientListUrl = 'data-entry-statistics/patientList' ; let url = baseUrl + dataEntryStatsPatientListUrl; - urlParams.set('startDate', params.startDate); - urlParams.set('endDate', params.endDate); - urlParams.set('groupBy', 'groupByLocationId,groupByPatientId'); + let urlParams: HttpParams = new HttpParams() + .set('startDate', params.startDate) + .set('endDate', params.endDate) + .set('groupBy', 'groupByLocationId,groupByPatientId'); if (params.encounterTypeUuids && params.encounterTypeUuids.length > 0) { urlParams.set('encounterTypeUuids', params.encounterTypeUuids); @@ -150,9 +150,9 @@ export class DataEntryStatisticsService { urlParams.set('locationUuids', params.locationUuids); } - let request = this.http.get(url, {search : urlParams}).pipe( - map((response) => { - return response.json().result; + let request = this.http.get(url, {params : urlParams}).pipe( + map((response: any) => { + return response.result; })); return this.cacheService.cacheRequest(url, urlParams, request); diff --git a/src/app/etl-api/defaulter-list-resource.service.ts b/src/app/etl-api/defaulter-list-resource.service.ts index e2e77d9dd..a95a427c1 100644 --- a/src/app/etl-api/defaulter-list-resource.service.ts +++ b/src/app/etl-api/defaulter-list-resource.service.ts @@ -1,13 +1,12 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Observable } from 'rxjs'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class DefaulterListResourceService { - constructor(protected http: Http, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } @@ -17,25 +16,22 @@ export class DefaulterListResourceService { } public getDefaulterList(params) { - let urlParams: URLSearchParams = new URLSearchParams(); if (!params.startIndex) { params.startIndex = '0'; } if (!params.limit) { params.limit = '300'; } - urlParams.set('startIndex', params.startIndex); - urlParams.set('defaulterPeriod', params.defaulterPeriod); - urlParams.set('maxDefaultPeriod', params.maxDefaultPeriod); - urlParams.set('locationUuids', params.locationUuids); - urlParams.set('limit', params.limit); + let urlParams: HttpParams = new HttpParams() + .set('startIndex', params.startIndex) + .set('defaulterPeriod', params.defaulterPeriod) + .set('maxDefaultPeriod', params.maxDefaultPeriod) + .set('locationUuids', params.locationUuids) + .set('limit', params.limit); let url = this.getUrl('defaulter-list'); - let request = this.http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json().result; - })); + let request = this.http.get(url, { + params: urlParams + }); return this.cacheService.cacheRequest(url, urlParams, request); } diff --git a/src/app/etl-api/department-programs-config.service.ts b/src/app/etl-api/department-programs-config.service.ts index aa7ee13e4..b9bc64884 100644 --- a/src/app/etl-api/department-programs-config.service.ts +++ b/src/app/etl-api/department-programs-config.service.ts @@ -1,13 +1,12 @@ -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { Observable } from 'rxjs'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpClient } from '@angular/common/http'; @Injectable() export class DepartmentProgramsConfigService { - constructor(protected http: Http, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } @@ -19,10 +18,7 @@ export class DepartmentProgramsConfigService { public getDartmentProgramsConfig(): Observable { let url = this.getBaseUrl() + 'departments-programs-config'; - let request = this.http.get(url).pipe( - map((response: Response) => { - return response.json(); - })); + let request = this.http.get(url); return this.cacheService.cacheRequest(url, '' , request); diff --git a/src/app/etl-api/error-log-resource.service.ts b/src/app/etl-api/error-log-resource.service.ts index 7f96da9dd..528fe1ce4 100644 --- a/src/app/etl-api/error-log-resource.service.ts +++ b/src/app/etl-api/error-log-resource.service.ts @@ -1,16 +1,13 @@ -import {map} from 'rxjs/operators'; - -import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; -import { ReplaySubject } from 'rxjs'; +import { Injectable } from '@angular/core';import { Response } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class ErrorLogResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } /** * @param {*} param @@ -23,12 +20,8 @@ export class ErrorLogResourceService { if (!payload) { return null; } - let url = this.appSettingsService.getEtlRestbaseurl().trim() + 'forms/error'; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - })); + const url = this.appSettingsService.getEtlRestbaseurl().trim() + 'forms/error'; + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}); } } diff --git a/src/app/etl-api/file-upload-resource.service.ts b/src/app/etl-api/file-upload-resource.service.ts index fdc697b1b..1ac998e36 100644 --- a/src/app/etl-api/file-upload-resource.service.ts +++ b/src/app/etl-api/file-upload-resource.service.ts @@ -1,35 +1,31 @@ - -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, ResponseContentType, Headers } from '@angular/http'; import { Observable , Subscriber } from 'rxjs'; import { AppSettingsService } from '../app-settings/app-settings.service'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class FileUploadResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { } + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public getUrl(): string { return this.appSettingsService.getEtlRestbaseurl().trim() + 'fileupload'; } public upload(formData) { const url = this.getUrl(); - return this.http.post(url, formData).pipe( - map((x) => x.json() - )); + return this.http.post(url, formData); } public getFile(url: string): Observable { let fullUrl = this.appSettingsService.getEtlRestbaseurl().trim() + 'files/' + url; return new Observable((observer: Subscriber) => { let objectUrl: string = null; - let headers = new Headers({ 'Accept': 'image/png,image/jpeg,image/gif' }); + let headers = new HttpHeaders({ 'Accept': 'image/png,image/jpeg,image/gif' }); this.http .get(fullUrl, { headers, - responseType: ResponseContentType.Blob + responseType: 'blob' }) .take(1).subscribe((m) => { - objectUrl = URL.createObjectURL(m.blob()); + objectUrl = URL.createObjectURL(m); observer.next(objectUrl); }); diff --git a/src/app/etl-api/hiv-clinic-flow-resource.service.mock.ts b/src/app/etl-api/hiv-clinic-flow-resource.service.mock.ts index c5e1e994f..711b09314 100644 --- a/src/app/etl-api/hiv-clinic-flow-resource.service.mock.ts +++ b/src/app/etl-api/hiv-clinic-flow-resource.service.mock.ts @@ -1,7 +1,5 @@ import { Injectable } from '@angular/core'; -import { MockBackend } from '@angular/http/testing'; import { ClinicFlowResource } from '../etl-api/clinic-flow-resource-interface'; -import { ResponseOptions, Response } from '@angular/http'; import { Observable, of } from 'rxjs'; @Injectable() export class MockHivClinicFlowResourceService implements ClinicFlowResource { diff --git a/src/app/etl-api/hiv-clinic-flow-resource.service.ts b/src/app/etl-api/hiv-clinic-flow-resource.service.ts index c91edd8af..481334a35 100644 --- a/src/app/etl-api/hiv-clinic-flow-resource.service.ts +++ b/src/app/etl-api/hiv-clinic-flow-resource.service.ts @@ -1,13 +1,10 @@ -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, URLSearchParams } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; - import { DataCacheService } from '../shared/services/data-cache.service'; import { ClinicFlowResource } from './clinic-flow-resource-interface'; import { BehaviorSubject } from 'rxjs'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class HivClinicFlowResourceService implements ClinicFlowResource { @@ -15,7 +12,7 @@ export class HivClinicFlowResourceService implements ClinicFlowResource { public result = new BehaviorSubject(null); private requestUrl = ''; - constructor(protected http: Http, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } @@ -25,16 +22,13 @@ export class HivClinicFlowResourceService implements ClinicFlowResource { } public getClinicFlow(dateStarted, locations) { - let urlParams: URLSearchParams = new URLSearchParams(); - urlParams.set('dateStarted', dateStarted); - urlParams.set('locationUuids', locations); + let urlParams: HttpParams = new HttpParams() + .set('dateStarted', dateStarted) + .set('locationUuids', locations); let url = this.getUrl('patient-flow-data'); let request = this.http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json(); - })); + params: urlParams + }); let key = url + '?' + urlParams.toString(); /** This is a workaround to avoid multiple calls to server by the respective * clinic flow components diff --git a/src/app/etl-api/hiv-monthly-summary-indicators-resource.service.ts b/src/app/etl-api/hiv-monthly-summary-indicators-resource.service.ts index df2c2cecf..fd9d94127 100644 --- a/src/app/etl-api/hiv-monthly-summary-indicators-resource.service.ts +++ b/src/app/etl-api/hiv-monthly-summary-indicators-resource.service.ts @@ -1,12 +1,12 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class HivMonthlySummaryIndicatorsResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService, + constructor(private http: HttpClient, private appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } public getUrl(): string { @@ -20,23 +20,22 @@ export class HivMonthlySummaryIndicatorsResourceService { + `hiv-summary-monthly-indicators/patient-list`; } - public getUrlRequestParams(params): URLSearchParams { - let urlParams: URLSearchParams = new URLSearchParams(); - + public getUrlRequestParams(params): HttpParams { + let urlParams: HttpParams = new HttpParams(); if (params.indicators) { - urlParams.set('indicators', params.indicators); + urlParams = urlParams.set('indicators', params.indicators); } if (params.indicator) { - urlParams.set('indicator', params.indicator); + urlParams = urlParams.set('indicator', params.indicator); } - urlParams.set('endDate', params.endDate); - urlParams.set('gender', params.gender); - urlParams.set('startDate', params.startDate); - urlParams.set('locationUuids', params.locationUuids); - urlParams.set('startAge', params.startAge); - urlParams.set('endAge', params.endAge); + urlParams.set('endDate', params.endDate) + .set('gender', params.gender) + .set('startDate', params.startDate) + .set('locationUuids', params.locationUuids) + .set('startAge', params.startAge) + .set('endAge', params.endAge); return urlParams; } @@ -45,32 +44,29 @@ export class HivMonthlySummaryIndicatorsResourceService { let urlParams = this.getUrlRequestParams(params); let url = this.getUrl(); let request = this.http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json(); - })); + params: urlParams + }); return this.cacheService.cacheRequest(url, urlParams, request); } public getHivSummaryMonthlyIndicatorsPatientList(params) { - let urlParams = this.getUrlRequestParams(params); if (!params.startIndex) { params.startIndex = '0'; } if (!params.limit) { params.limit = '300'; } - urlParams.set('startIndex', params.startIndex); - urlParams.set('limit', params.limit); + let urlParams = this.getUrlRequestParams(params) + .set('startIndex', params.startIndex) + .set('limit', params.limit); let url = this.getPatientListUrl(); let request = this.http.get(url, { - search: urlParams + params: urlParams }).pipe( - map((response: Response) => { - return response.json().result; + map((response: any) => { + return response.result; })); this.cacheService.cacheRequest(url, urlParams, request); diff --git a/src/app/etl-api/hiv-patient-clinical-summary-resource.service.ts b/src/app/etl-api/hiv-patient-clinical-summary-resource.service.ts index bd76e4459..de94a9604 100644 --- a/src/app/etl-api/hiv-patient-clinical-summary-resource.service.ts +++ b/src/app/etl-api/hiv-patient-clinical-summary-resource.service.ts @@ -1,27 +1,23 @@ -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { Observable } from 'rxjs'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class HivPatientClinicalSummaryResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public fetchPatientSummary(patientUuid: string): Observable { let api: string = this.appSettingsService.getEtlServer() + '/patient/' + patientUuid + '/hiv-patient-clinical-summary'; - let params: URLSearchParams = new URLSearchParams(); + let params: HttpParams = new HttpParams() + .set('startIndex', 0 as any as string) + .set('limit', 10 as any as string); - params.set('startIndex', 0 as any as string); - params.set('limit', 10 as any as string); - - return this.http.get(api, {search: params}).pipe(map((data) => { - return data.json(); - })); + return this.http.get(api, {params: params}); } } diff --git a/src/app/etl-api/hiv-summary-indicators-resource.service.ts b/src/app/etl-api/hiv-summary-indicators-resource.service.ts index 9f95d377a..35b78c90c 100644 --- a/src/app/etl-api/hiv-summary-indicators-resource.service.ts +++ b/src/app/etl-api/hiv-summary-indicators-resource.service.ts @@ -1,12 +1,12 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class HivSummaryIndicatorsResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } public getUrl(): string { @@ -18,23 +18,23 @@ export class HivSummaryIndicatorsResourceService { + `hiv-summary-indicators/patient-list`; } - public getUrlRequestParams(params): URLSearchParams { - let urlParams: URLSearchParams = new URLSearchParams(); + public getUrlRequestParams(params): HttpParams { + let urlParams: HttpParams = new HttpParams(); if (params.indicators) { - urlParams.set('indicators', params.indicators); + urlParams = urlParams.set('indicators', params.indicators); } if (params.indicator) { - urlParams.set('indicator', params.indicator); + urlParams = urlParams.set('indicator', params.indicator); } - urlParams.set('endDate', params.endDate); - urlParams.set('gender', params.gender); - urlParams.set('startDate', params.startDate); - urlParams.set('locationUuids', params.locationUuids); - urlParams.set('startAge', params.startAge); - urlParams.set('endAge', params.endAge); + urlParams.set('endDate', params.endDate) + .set('gender', params.gender) + .set('startDate', params.startDate) + .set('locationUuids', params.locationUuids) + .set('startAge', params.startAge) + .set('endAge', params.endAge); return urlParams; } @@ -43,11 +43,8 @@ export class HivSummaryIndicatorsResourceService { let urlParams = this.getUrlRequestParams(params); let url = this.getUrl(); let request = this.http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json(); - })); + params: urlParams + }); return this.cacheService.cacheRequest(url, urlParams, request); @@ -64,11 +61,11 @@ export class HivSummaryIndicatorsResourceService { urlParams.set('startIndex', params.startIndex); urlParams.set('limit', params.limit); let url = this.getPatientListUrl(); - let request = this.http.get(url, { - search: urlParams + let request = this.http.get(url, { + params: urlParams }).pipe( - map((response: Response) => { - return response.json().result; + map((response) => { + return response.result; })); this.cacheService.cacheRequest(url, urlParams, request); diff --git a/src/app/etl-api/hiv-summary-resource.service.ts b/src/app/etl-api/hiv-summary-resource.service.ts index 979b2463f..19654994a 100644 --- a/src/app/etl-api/hiv-summary-resource.service.ts +++ b/src/app/etl-api/hiv-summary-resource.service.ts @@ -2,13 +2,13 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; -import { Observable, Subject } from 'rxjs'; +import { Observable } from 'rxjs'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class HivSummaryResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { } + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -20,19 +20,19 @@ export class HivSummaryResourceService { let url = this.getUrl(); url += '/' + patientUuid + '/hiv-summary'; - let params: URLSearchParams = new URLSearchParams(); + let params: HttpParams = new HttpParams(); if (includeNonClinicalEncounter !== undefined) { - params.set('includeNonClinicalEncounter', includeNonClinicalEncounter.toString()); + params = params.set('includeNonClinicalEncounter', includeNonClinicalEncounter.toString()); } - params.set('startIndex', startIndex.toString()); - params.set('limit', limit.toString()); + params.set('startIndex', startIndex.toString()) + .set('limit', limit.toString()); - return this.http.get(url, { - search: params + return this.http.get(url, { + params: params }).pipe( - map((response: Response) => { - return response.json().result; + map((response) => { + return response.result; })); } } diff --git a/src/app/etl-api/indicator-resource.service.ts b/src/app/etl-api/indicator-resource.service.ts index b779122f4..45ec11ebd 100644 --- a/src/app/etl-api/indicator-resource.service.ts +++ b/src/app/etl-api/indicator-resource.service.ts @@ -1,18 +1,16 @@ import {map} from 'rxjs/operators'; - import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; import { ReplaySubject } from 'rxjs'; - import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class IndicatorResourceService { private reportIndicators = new ReplaySubject(1); - constructor(private http: Http, private appSettingsService: AppSettingsService, + constructor(private http: HttpClient, private appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } /** @@ -27,22 +25,20 @@ export class IndicatorResourceService { return this.appSettingsService.getEtlRestbaseurl().trim() + `indicators-schema`; } - public getUrlRequestParams(params): URLSearchParams { - let urlParams: URLSearchParams = new URLSearchParams(); - - urlParams.set('report', params.report); - + public getUrlRequestParams(params): HttpParams { + let urlParams: HttpParams = new HttpParams() + .set('report', params.report); return urlParams; } public getReportIndicators(params) { let urlParams = this.getUrlRequestParams(params); let url = this.getUrl(); - let request = this.http.get(url, { - search: urlParams + let request = this.http.get(url, { + params: urlParams }).pipe( - map((response: Response) => { - return response.json().result; + map((response) => { + return response.result; })); return this.cacheService.cacheRequest(url, urlParams, request); diff --git a/src/app/etl-api/lab-order-resource.service.ts b/src/app/etl-api/lab-order-resource.service.ts index aaf795ea1..59d2c576d 100644 --- a/src/app/etl-api/lab-order-resource.service.ts +++ b/src/app/etl-api/lab-order-resource.service.ts @@ -1,28 +1,19 @@ -import {map} from 'rxjs/operators'; - import { Injectable } from '@angular/core'; -import { Http, Response, Headers, RequestOptions } from '@angular/http'; -import { ReplaySubject } from 'rxjs'; - import { AppSettingsService } from '../app-settings/app-settings.service'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class LabOrderResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public postOrderToEid(location, payload: any) { let url = this.appSettingsService.getEtlRestbaseurl().trim() + 'eid/order/'; url = url + location; - - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - })); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}); } } diff --git a/src/app/etl-api/labs-resource.service.ts b/src/app/etl-api/labs-resource.service.ts index 590b986a2..03de05da1 100644 --- a/src/app/etl-api/labs-resource.service.ts +++ b/src/app/etl-api/labs-resource.service.ts @@ -1,26 +1,23 @@ import {throwError as observableThrowError, Observable } from 'rxjs'; - import {catchError, map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, URLSearchParams } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class LabsResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { } + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public getNewPatientLabResults(params: { startDate: string, endDate: string, patientUuId: string }) { - let urlParams: URLSearchParams = new URLSearchParams(); - - urlParams.set('startDate', params.startDate); - urlParams.set('endDate', params.endDate); - urlParams.set('patientUuId', params.patientUuId); + let urlParams: HttpParams = new HttpParams() + .set('startDate', params.startDate) + .set('endDate', params.endDate) + .set('patientUuId', params.patientUuId); return this.http.get(this.getUrl(), - { search: urlParams }).pipe(map(this.parseNewLabResults), - catchError(this.handleError),); + { params: urlParams }).pipe(map(this.parseNewLabResults), + catchError(this.handleError)); } public getHistoricalPatientLabResults(patientUuId, @@ -34,14 +31,13 @@ export class LabsResourceService { if (!params.limit) { params.limit = '20'; } - let urlParams: URLSearchParams = new URLSearchParams(); - - urlParams.set('startIndex', params.startIndex); - urlParams.set('limit', params.limit); + let urlParams: HttpParams = new HttpParams() + .set('startIndex', params.startIndex) + .set('limit', params.limit); return this.http.get(this.appSettingsService.getEtlRestbaseurl().trim() + `patient/${patientUuId}/data`, - { search: urlParams }).pipe(map(this.parseHistoricalLabResults), - catchError(this.handleError),); + { params: urlParams }).pipe(map(this.parseHistoricalLabResults), + catchError(this.handleError)); } private getUrl() { @@ -49,11 +45,11 @@ export class LabsResourceService { } private parseHistoricalLabResults(res) { - const body = res.json(); + const body = res; return body.result; } private parseNewLabResults(res) { - const body = res.json(); + const body = res; if (body.errors) { return body; diff --git a/src/app/etl-api/medication-history-resource.service.ts b/src/app/etl-api/medication-history-resource.service.ts index 15c6769ad..cd31efad8 100644 --- a/src/app/etl-api/medication-history-resource.service.ts +++ b/src/app/etl-api/medication-history-resource.service.ts @@ -1,15 +1,11 @@ - -import {map} from 'rxjs/operators'; - import { Injectable } from '@angular/core'; -import { Http, URLSearchParams, Response } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class MedicationHistoryResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { } + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public getUrl(): string { return this.appSettingsService.getEtlRestbaseurl().trim() + 'patient'; @@ -24,23 +20,21 @@ export class MedicationHistoryResourceService { report = 'medical-history-report'; } - let params: URLSearchParams = new URLSearchParams(); + let params: HttpParams = new HttpParams(); - return this.http.get(api, { search: params }).pipe(map((response: Response) => { - return response.json(); - })); + return this.http.get(api, { params: params }); } public getCdmMedicationHistory(patientUuid) { let url = this.getUrl(); url += '/' + patientUuid + '/medication-change'; - let params: URLSearchParams = new URLSearchParams(); + let params: HttpParams = new HttpParams(); - return this.http.get(url, { - search: params - }).map((response: Response) => { - return response.json().result; + return this.http.get(url, { + params: params + }).map((response: any) => { + return response.result; }); } diff --git a/src/app/etl-api/moh-731-patientlist-resource.service.ts b/src/app/etl-api/moh-731-patientlist-resource.service.ts index f4d1ac7ca..06f530420 100644 --- a/src/app/etl-api/moh-731-patientlist-resource.service.ts +++ b/src/app/etl-api/moh-731-patientlist-resource.service.ts @@ -1,12 +1,11 @@ -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class Moh731PatientListResourceService { - constructor(private http: Http, + constructor(private http: HttpClient, private appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } @@ -14,33 +13,31 @@ export class Moh731PatientListResourceService { return this.appSettingsService.getEtlRestbaseurl().trim() + `${reportName}/patient-list`; } - public getUrlRequestParams(params): URLSearchParams { - let urlParams: URLSearchParams = new URLSearchParams(); + public getUrlRequestParams(params): HttpParams { + if (!params.startIndex) { params.startIndex = '0'; } if (!params.limit) { params.limit = '300'; } - urlParams.set('startIndex', params.startIndex); - urlParams.set('endDate', params.endDate); - urlParams.set('startDate', params.startDate); - urlParams.set('reportName', (params.isLegacy ? params.reportName : 'MOH-731-report-2017')); - urlParams.set('indicator', params.indicator); - urlParams.set('locationUuids', params.locationUuids); - urlParams.set('limit', params.limit); + let urlParams: HttpParams = new HttpParams() + .set('startIndex', params.startIndex) + .set('endDate', params.endDate) + .set('startDate', params.startDate) + .set('reportName', (params.isLegacy ? params.reportName : 'MOH-731-report-2017')) + .set('indicator', params.indicator) + .set('locationUuids', params.locationUuids) + .set('limit', params.limit); return urlParams; } public getMoh731PatientListReport(params) { let urlParams = this.getUrlRequestParams(params); let url = this.getPatientListUrl('MOH-731-report'); - let request = this.http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json(); - })); + let request = this.http.get(url, { + params: urlParams + }); return request; } diff --git a/src/app/etl-api/moh-731-resource.service.ts b/src/app/etl-api/moh-731-resource.service.ts index 6b7b536d5..5f22594f3 100644 --- a/src/app/etl-api/moh-731-resource.service.ts +++ b/src/app/etl-api/moh-731-resource.service.ts @@ -1,12 +1,9 @@ -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; -import { DatePipe } from '@angular/common'; -import { Observable, Subject } from 'rxjs'; - +import { Observable } from 'rxjs'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpParams, HttpClient } from '@angular/common/http'; @Injectable() export class Moh731ResourceService { @@ -16,7 +13,7 @@ export class Moh731ResourceService { return this.appSettingsService.getEtlRestbaseurl().trim() + this._url; } - constructor(public http: Http, + constructor(public http: HttpClient, public appSettingsService: AppSettingsService, public cacheService: DataCacheService) { } @@ -25,11 +22,10 @@ export class Moh731ResourceService { isLegacyReport: boolean, isAggregated: boolean, cacheTtl: number = 0): Observable { - let urlParams: URLSearchParams = new URLSearchParams(); - - urlParams.set('locationUuids', locationUuids); - urlParams.set('startDate', startDate); - urlParams.set('endDate', endDate); + let urlParams: HttpParams = new HttpParams() + .set('locationUuids', locationUuids) + .set('startDate', startDate) + .set('endDate', endDate); if (isLegacyReport) { urlParams.set('reportName', 'MOH-731-report'); @@ -39,11 +35,8 @@ export class Moh731ResourceService { urlParams.set('isAggregated', isAggregated ? 'true' : 'false'); let request = this.http.get(this.url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json(); - })); + params: urlParams + }); return cacheTtl === 0 ? request : this.cacheService.cacheSingleRequest(this.url, urlParams, request, cacheTtl); diff --git a/src/app/etl-api/monthly-scheduled-resource.service.ts b/src/app/etl-api/monthly-scheduled-resource.service.ts index efe3be40c..c99c82c21 100644 --- a/src/app/etl-api/monthly-scheduled-resource.service.ts +++ b/src/app/etl-api/monthly-scheduled-resource.service.ts @@ -1,13 +1,13 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; import { CacheService } from 'ionic-cache'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class MonthlyScheduleResourceService { - constructor(protected http: Http, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, protected dataCache: DataCacheService, protected cacheService: CacheService) { @@ -16,19 +16,18 @@ export class MonthlyScheduleResourceService { public getMonthlySchedule(params) { let url = this.getUrl(); - let urlParams: URLSearchParams = new URLSearchParams(); - - urlParams.set('endDate', params.endDate); - urlParams.set('startDate', params.startDate); - urlParams.set('locationUuids', params.locationUuids); - urlParams.set('programVisitEncounter', params.programVisitEncounter); - urlParams.set('limit', params.limit); - urlParams.set('groupBy', 'groupByPerson,groupByAttendedDate,groupByRtcDate'); - let request = this.http.get(url, { - search: urlParams + let urlParams: HttpParams = new HttpParams() + .set('endDate', params.endDate) + .set('startDate', params.startDate) + .set('locationUuids', params.locationUuids) + .set('programVisitEncounter', params.programVisitEncounter) + .set('limit', params.limit) + .set('groupBy', 'groupByPerson,groupByAttendedDate,groupByRtcDate'); + let request = this.http.get(url, { + params: urlParams }).pipe( - map((response: Response) => { - return response.json().results; + map((response) => { + return response.results; })); return this.dataCache.cacheRequest(url, urlParams, request); diff --git a/src/app/etl-api/motd.notification.service.ts b/src/app/etl-api/motd.notification.service.ts index 661939eb0..b399ac494 100644 --- a/src/app/etl-api/motd.notification.service.ts +++ b/src/app/etl-api/motd.notification.service.ts @@ -1,15 +1,12 @@ - -import {map} from 'rxjs/operators'; import { Observable } from 'rxjs'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, RequestOptions } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class MOTDNotificationService { - constructor(private _http: Http, private appSettingsService: AppSettingsService) { + constructor(private _http: HttpClient, private appSettingsService: AppSettingsService) { } public geturl(): string { @@ -18,12 +15,11 @@ export class MOTDNotificationService { public getMotdNotification(): Observable { - let url = this.geturl(); - let url2 = url + 'motdNotifications'; - let headers = new Headers({'Content-Type': 'application/json'}); - let options = new RequestOptions({headers: headers}); + const url = this.geturl(); + const url2 = url + 'motdNotifications'; + const headers = new HttpHeaders({'Content-Type': 'application/json'}); - return this._http.get(url2, options).pipe(map((res) => res.json())); + return this._http.get(url2, {headers}); } diff --git a/src/app/etl-api/oncology-reports.service.ts b/src/app/etl-api/oncology-reports.service.ts index e83ac0a27..3f356718e 100644 --- a/src/app/etl-api/oncology-reports.service.ts +++ b/src/app/etl-api/oncology-reports.service.ts @@ -6,6 +6,7 @@ import { AppSettingsService } from '../app-settings/app-settings.service'; import { Observable, of } from 'rxjs'; import { DataCacheService } from '../shared/services/data-cache.service'; import * as _ from 'lodash'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class OncologyReportService { @@ -149,7 +150,7 @@ export class OncologyReportService { } ] }]; - constructor(protected http: Http, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } @@ -161,10 +162,7 @@ export class OncologyReportService { public getOncologyReports(): Observable { let url = this.getBaseUrl() + 'oncology-reports'; - let request = this.http.get(url).pipe( - map((response: Response) => { - return response.json(); - })); + let request = this.http.get(url); return this.cacheService.cacheRequest(url, '' , request); @@ -173,19 +171,16 @@ export class OncologyReportService { public getSpecificOncologyReport(reportUuid): Observable { let url = this.getBaseUrl() + 'oncology-report'; - let urlParams: URLSearchParams = new URLSearchParams(); + let urlParams: HttpParams = new HttpParams(); if (reportUuid && reportUuid !== '') { - urlParams.set('reportUuid', reportUuid); + urlParams = urlParams.set('reportUuid', reportUuid); } else { return of({ 'error': 'Null ReportUuid' }); } - let request = this.http.get(url, { search: urlParams }).pipe( - map((response: Response) => { - return response.json(); - })); + let request = this.http.get(url, { params: urlParams }); return this.cacheService.cacheRequest(url, '' , request); diff --git a/src/app/etl-api/oncology-summary-indicators-resource.service.ts b/src/app/etl-api/oncology-summary-indicators-resource.service.ts index 7048b3b52..966b2f819 100644 --- a/src/app/etl-api/oncology-summary-indicators-resource.service.ts +++ b/src/app/etl-api/oncology-summary-indicators-resource.service.ts @@ -1,12 +1,11 @@ -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class OncolgyMonthlySummaryIndicatorsResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } public getUrl(params: any): string { @@ -20,29 +19,29 @@ export class OncolgyMonthlySummaryIndicatorsResourceService { + params.type + '-patient-list'; } - public getUrlRequestParams(params): URLSearchParams { - let urlParams: URLSearchParams = new URLSearchParams(); + public getUrlRequestParams(params): HttpParams { + let urlParams: HttpParams = new HttpParams(); if (params.indicators && params.indicators !== '') { - urlParams.set('indicators', params.indicators); + urlParams = urlParams.set('indicators', params.indicators); } if (params.endDate && params.endDate !== '') { - urlParams.set('endDate', params.endDate); + urlParams = urlParams.set('endDate', params.endDate); } if (params.startDate && params.startDate !== '') { - urlParams.set('startDate', params.startDate); + urlParams = urlParams.set('startDate', params.startDate); } if (params.gender && params.gender.length > 0) { - urlParams.set('genders', params.gender); + urlParams = urlParams.set('genders', params.gender); } if (params.startAge && params.startAge !== '') { - urlParams.set('startAge', params.startAge); + urlParams = urlParams.set('startAge', params.startAge); } if (params.endAge && params.endAge !== '') { - urlParams.set('endAge', params.endAge); + urlParams = urlParams.set('endAge', params.endAge); } if (params.locationUuids && params.locationUuids !== '') { - urlParams.set('locationUuids', params.locationUuids); + urlParams = urlParams.set('locationUuids', params.locationUuids); } return urlParams; @@ -52,11 +51,8 @@ export class OncolgyMonthlySummaryIndicatorsResourceService { let urlParams = this.getUrlRequestParams(params); let url = this.getUrl(params); let request = this.http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json(); - })); + params: urlParams + }); return this.cacheService.cacheRequest(url, urlParams, request); @@ -74,11 +70,8 @@ export class OncolgyMonthlySummaryIndicatorsResourceService { urlParams.set('limit', params.limit); let url = this.getPatientListUrl(params); let request = this.http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json(); - })); + params: urlParams + }); return this.cacheService.cacheRequest(url, urlParams, request); } diff --git a/src/app/etl-api/patient-care-status-resource.service.ts b/src/app/etl-api/patient-care-status-resource.service.ts index 57f1700c1..89e4dca90 100644 --- a/src/app/etl-api/patient-care-status-resource.service.ts +++ b/src/app/etl-api/patient-care-status-resource.service.ts @@ -1,22 +1,20 @@ -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; - import { Observable } from 'rxjs'; +import { HttpParams, HttpClient } from '@angular/common/http'; @Injectable() export class PatientCareStatusResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { } + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public getMonthlyPatientCareStatus(options: { startDate: string, endDate: string, patient_uuid: string }): Observable { let api: string = this.appSettingsService.getEtlServer() + '/patient/' + options.patient_uuid + '/monthly-care-status'; - let params: URLSearchParams = this.getUrlRequestParams(options); - return this.http.get(api, { search: params }).pipe(map((data) => data.json())); + let params: HttpParams = this.getUrlRequestParams(options); + return this.http.get(api, { params: params }); } public getDailyPatientCareStatus(options: { @@ -24,17 +22,17 @@ export class PatientCareStatusResourceService { }): Observable { let api: string = this.appSettingsService.getEtlServer() + '/patient/' + options.patient_uuid + '/daily-care-status'; - let urlParams: URLSearchParams = new URLSearchParams(); - urlParams.set('referenceDate', options.referenceDate); - return this.http.get(api, { search: urlParams }).pipe(map((data) => data.json())); + let urlParams: HttpParams = new HttpParams() + .set('referenceDate', options.referenceDate); + return this.http.get(api, { params: urlParams }); } private getUrlRequestParams(options: { startDate: string, endDate: string, patient_uuid: string - }): URLSearchParams { - let urlParams: URLSearchParams = new URLSearchParams(); - urlParams.set('startDate', options.startDate); - urlParams.set('endDate', options.endDate); + }): HttpParams { + let urlParams: HttpParams = new HttpParams() + .set('startDate', options.startDate) + .set('endDate', options.endDate); return urlParams; } } diff --git a/src/app/etl-api/patient-program-enrollment.service.ts b/src/app/etl-api/patient-program-enrollment.service.ts index 9b536781e..84596b655 100644 --- a/src/app/etl-api/patient-program-enrollment.service.ts +++ b/src/app/etl-api/patient-program-enrollment.service.ts @@ -1,17 +1,15 @@ -import {map} from 'rxjs/operators'; import { Observable , ReplaySubject } from 'rxjs'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpParams, HttpClient } from '@angular/common/http'; @Injectable() export class PatientProgramEnrollmentService { constructor( - private _http: Http, + private _http: HttpClient, private _appSettingsService: AppSettingsService, private _cacheService: DataCacheService) { } @@ -29,27 +27,23 @@ export class PatientProgramEnrollmentService { if (!payload) { return null; } - let urlParams: URLSearchParams = new URLSearchParams(); - - urlParams.set('endDate', payload.endDate); - urlParams.set('startDate', payload.startDate); + let urlParams: HttpParams = new HttpParams() + .set('endDate', payload.endDate) + .set('startDate', payload.startDate); if (payload.locationUuids) { if (payload.locationUuids.length > 0) { - urlParams.set('locationUuids', payload.locationUuids); + urlParams = urlParams.set('locationUuids', payload.locationUuids); } } if (payload.programType) { if (payload.programType.length > 0 ) { - urlParams.set('programType', payload.programType); + urlParams = urlParams.set('programType', payload.programType); } } let url = this.getBaseUrl() + 'patient-program-enrollments'; let request = this._http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json(); - })); + params: urlParams + }); return this._cacheService.cacheRequest(url, urlParams, request); } @@ -60,27 +54,23 @@ export class PatientProgramEnrollmentService { return null; } - let urlParams: URLSearchParams = new URLSearchParams(); - - urlParams.set('endDate', payload.endDate); - urlParams.set('startDate', payload.startDate); + let urlParams: HttpParams = new HttpParams() + .set('endDate', payload.endDate) + .set('startDate', payload.startDate); if (payload.locationUuids) { if (payload.locationUuids.length > 0) { - urlParams.set('locationUuids', payload.locationUuids); + urlParams = urlParams.set('locationUuids', payload.locationUuids); } } if (payload.programType) { if (payload.programType.length > 0 ) { - urlParams.set('programType', payload.programType); + urlParams = urlParams.set('programType', payload.programType); } } let url = this.getBaseUrl() + 'program-enrollment/patient-list'; let request = this._http.get(url, { - search: urlParams - }).pipe( - map((response: Response) => { - return response.json(); - })); + params: urlParams + }); return this._cacheService.cacheRequest(url, urlParams, request); } diff --git a/src/app/etl-api/patient-program-resource.service.ts b/src/app/etl-api/patient-program-resource.service.ts index 0d9d34148..67f041f27 100644 --- a/src/app/etl-api/patient-program-resource.service.ts +++ b/src/app/etl-api/patient-program-resource.service.ts @@ -1,33 +1,26 @@ -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, URLSearchParams, Response } from '@angular/http'; -import { Observable, Subject } from 'rxjs'; +import { Observable } from 'rxjs'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Program } from '../models/program.model'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class PatientProgramResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public getAllProgramVisitConfigs(ttl?: number): Observable { let url = this.appSettingsService.getEtlRestbaseurl().trim(); url += 'program-visit-configs'; - return this.http.get(url).pipe(map((response: Response) => { - return response.json(); - })); + return this.http.get(url); } public getPatientProgramVisitConfigs(patientUuid: string): Observable { let url = this.appSettingsService.getEtlRestbaseurl().trim(); url += 'patient-program-config?patientUuid=' + patientUuid; - return this.http.get(url).pipe(map((response: Response) => { - return response.json(); - })); + return this.http.get(url); } - /** * * @@ -45,11 +38,9 @@ export class PatientProgramResourceService { let url = this.appSettingsService.getEtlRestbaseurl().trim() + 'patient/' + patientUuid + '/program/' + programUuid + '/enrollment/' + enrollmentUuid; - let params: URLSearchParams = new URLSearchParams(); - params.set('intendedLocationUuid', (locationUuid && locationUuid.length > 0) + let params: HttpParams = new HttpParams() + .set('intendedLocationUuid', (locationUuid && locationUuid.length > 0) ? locationUuid : locationUuid); - return this.http.get(url, { search: params }).pipe(map((response: Response) => { - return response.json(); - })); + return this.http.get(url, { params: params }); } } diff --git a/src/app/etl-api/patient-referral-resource.service.ts b/src/app/etl-api/patient-referral-resource.service.ts index 0194e700e..e7e06c89a 100644 --- a/src/app/etl-api/patient-referral-resource.service.ts +++ b/src/app/etl-api/patient-referral-resource.service.ts @@ -1,19 +1,17 @@ -import {throwError as observableThrowError, Observable, Subject } from 'rxjs'; - -import {map, catchError} from 'rxjs/operators'; +import {throwError as observableThrowError } from 'rxjs'; +import { map, catchError } from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, RequestOptions, Headers, Response, URLSearchParams } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http'; @Injectable() export class PatientReferralResourceService { public cache; private requestUrl = ''; - constructor(protected http: Http, protected appSettingsService: AppSettingsService, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } @@ -35,34 +33,34 @@ export class PatientReferralResourceService { + 'patient-referral'; } - public getUrlRequestParams(params): URLSearchParams { - let urlParams: URLSearchParams = new URLSearchParams(); + public getUrlRequestParams(params): HttpParams { + let urlParams: HttpParams = new HttpParams() + .set('endDate', params.endDate) + .set('startDate', params.startDate); - urlParams.set('endDate', params.endDate); if (params.gender && params.gender !== 'undefined') { - urlParams.set('gender', params.gender); + urlParams = urlParams.set('gender', params.gender); } - urlParams.set('startDate', params.startDate); if (params.locationUuids && params.locationUuids !== 'undefined') { - urlParams.set('locationUuids', params.locationUuids); + urlParams = urlParams.set('locationUuids', params.locationUuids); } if (params.startAge && params.startAge !== 'undefined') { - urlParams.set('startAge', params.startAge); + urlParams = urlParams.set('startAge', params.startAge); } if (params.endAge && params.endAge !== 'undefined') { - urlParams.set('endAge', params.endAge); + urlParams = urlParams.set('endAge', params.endAge); } if (params.programUuids && params.programUuids !== 'undefined') { - urlParams.set('programUuids', params.programUuids); + urlParams = urlParams.set('programUuids', params.programUuids); } if (params.stateUuids && params.stateUuids !== 'undefined') { - urlParams.set('stateUuids', params.stateUuids); + urlParams = urlParams.set('stateUuids', params.stateUuids); } if (params.providerUuids && params.providerUuids !== 'undefined') { - urlParams.set('providerUuids', params.providerUuids); + urlParams = urlParams.set('providerUuids', params.providerUuids); } if (params.notificationStatus && params.notificationStatus !== 'undefined') { - urlParams.set('notificationStatus', params.notificationStatus); + urlParams = urlParams.set('notificationStatus', params.notificationStatus); } return urlParams; } @@ -72,22 +70,17 @@ export class PatientReferralResourceService { return null; } let url = this.getReferralNotificationUrl() + '/' + payload.patient_referral_id; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers}); - return this.http.post(url, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - }),catchError(this.handleError),); + const headers = new HttpHeaders({'Content-Type': 'application/json'}); + return this.http.post(url, JSON.stringify(payload), {headers}).pipe( + catchError(this.handleError)); } public getPatientReferralReport(params) { let urlParams = this.getUrlRequestParams(params); let url: string = this.getUrl(); let request = this.http.get(url, { - search: urlParams - }).pipe(map((response: Response) => { - return response.json(); - })); + params: urlParams + }); let key = url + '?' + urlParams.toString(); if (key !== this.requestUrl) { @@ -113,10 +106,10 @@ export class PatientReferralResourceService { urlParams.set('limit', params.limit); let url = this.getPatientListUrl(); let request = this.http.get(url, { - search: urlParams + params: urlParams }).pipe( - map((response: Response) => { - return response.json().result; + map((response: any) => { + return response.result; })); let key = url + '?' + urlParams.toString(); @@ -136,9 +129,7 @@ export class PatientReferralResourceService { public getReferralLocationByEnrollmentUuid(uuid: string) { let url = this.getReferralLocationUrl() + '/' + uuid; - return this.http.get(url).pipe(map((response: Response) => { - return response.json(); - })); + return this.http.get(url); } private handleError(error: any) { diff --git a/src/app/etl-api/patient-reminder-resource.service.ts b/src/app/etl-api/patient-reminder-resource.service.ts index ee7e6fff2..670e1fe46 100644 --- a/src/app/etl-api/patient-reminder-resource.service.ts +++ b/src/app/etl-api/patient-reminder-resource.service.ts @@ -1,19 +1,16 @@ - import {map} from 'rxjs/operators'; - import { Injectable } from '@angular/core'; -import { Http, URLSearchParams, Response } from '@angular/http'; -import { Observable, Subject } from 'rxjs'; - +import { Observable } from 'rxjs'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { DatePipe } from '@angular/common'; +import { HttpClient } from '@angular/common/http'; @Injectable() export class PatientReminderResourceService { public referenceDate: string; private _datePipe: DatePipe; - constructor(private http: Http, private appSettingsService: AppSettingsService) { + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { this._datePipe = new DatePipe('en-US'); this.referenceDate = this._datePipe.transform(new Date(), 'yyyy-MM-dd'); } @@ -25,8 +22,8 @@ export class PatientReminderResourceService { public getPatientLevelReminders(patientUuid: string): Observable { let url = this.getUrl(patientUuid) + '/' + this.referenceDate; - return this.http.get(url).pipe(map((response: Response) => { - return response.json().result; + return this.http.get(url).pipe(map((response) => { + return response.result; })); } } diff --git a/src/app/etl-api/patient-status-change-visualization-resource.service.ts b/src/app/etl-api/patient-status-change-visualization-resource.service.ts index 42652a49c..ab003531f 100644 --- a/src/app/etl-api/patient-status-change-visualization-resource.service.ts +++ b/src/app/etl-api/patient-status-change-visualization-resource.service.ts @@ -1,14 +1,13 @@ -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, URLSearchParams } from '@angular/http'; import { Observable } from 'rxjs'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpParams, HttpClient } from '@angular/common/http'; @Injectable() export class PatientStatusVisualizationResourceService { - constructor(private http: Http, protected appSettingsService: AppSettingsService, + constructor(private http: HttpClient, protected appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } @@ -17,10 +16,10 @@ export class PatientStatusVisualizationResourceService { startDate: string, endDate: string, locationUuids: string, analysis: string }): Observable { - let api: string = this.appSettingsService.getEtlServer() + + const api: string = this.appSettingsService.getEtlServer() + '/patient-status-change-tracking'; - let params: URLSearchParams = this.getUrlRequestParams(options); - let request = this.http.get(api, { search: params }).pipe(map((data) => data.json())); + const params: HttpParams = this.getUrlRequestParams(options); + const request = this.http.get(api, { params: params }); return this.cacheService.cacheRequest(api, params, request); } @@ -29,11 +28,11 @@ export class PatientStatusVisualizationResourceService { startIndex?: string, limit?: string, analysis: string, startDate: string, endDate: string, locationUuids: string, indicator: string }): Observable { - let api: string = this.appSettingsService.getEtlServer() + + const api: string = this.appSettingsService.getEtlServer() + '/patient-status-change-tracking/patient-list'; - let params: URLSearchParams = this.getUrlPatientListRequestParams(options); - let request = this.http.get(api, { search: params }).pipe(map((data) => data.json())); + const params: HttpParams = this.getUrlPatientListRequestParams(options); + const request = this.http.get(api, { params: params }); return this.cacheService.cacheRequest(api, params, request); } @@ -41,18 +40,18 @@ export class PatientStatusVisualizationResourceService { private getUrlRequestParams(options: { startIndex?: string, limit?: string, analysis: string, startDate: string, endDate: string, locationUuids: string - }): URLSearchParams { - let urlParams: URLSearchParams = new URLSearchParams(); + }): HttpParams { if (!options.startIndex) { options.startIndex = '0'; } if (!options.limit) { options.limit = '300'; } - urlParams.set('startDate', options.startDate); - urlParams.set('analysis', options.analysis); - urlParams.set('endDate', options.endDate); - urlParams.set('locationUuids', options.locationUuids); + const urlParams: HttpParams = new HttpParams() + .set('startDate', options.startDate) + .set('analysis', options.analysis) + .set('endDate', options.endDate) + .set('locationUuids', options.locationUuids); return urlParams; } @@ -60,21 +59,21 @@ export class PatientStatusVisualizationResourceService { startIndex?: string, limit?: string, analysis: string, startDate: string, endDate: string, locationUuids: string, indicator: string - }): URLSearchParams { - let urlParams: URLSearchParams = new URLSearchParams(); + }): HttpParams { if (!options.startIndex) { options.startIndex = '0'; } if (!options.limit) { options.limit = '300'; } - urlParams.set('startDate', options.startDate); - urlParams.set('endDate', options.endDate); - urlParams.set('locationUuids', options.locationUuids); - urlParams.set('indicator', options.indicator); - urlParams.set('startIndex', options.startIndex); - urlParams.set('analysis', options.analysis); - urlParams.set('limit', options.limit); + const urlParams: HttpParams = new HttpParams() + .set('startDate', options.startDate) + .set('endDate', options.endDate) + .set('locationUuids', options.locationUuids) + .set('indicator', options.indicator) + .set('startIndex', options.startIndex) + .set('analysis', options.analysis) + .set('limit', options.limit); return urlParams; } } diff --git a/src/app/etl-api/patients-requiring-vl-resource.service.ts b/src/app/etl-api/patients-requiring-vl-resource.service.ts index 6cbdc96cc..f8d1a9981 100644 --- a/src/app/etl-api/patients-requiring-vl-resource.service.ts +++ b/src/app/etl-api/patients-requiring-vl-resource.service.ts @@ -1,16 +1,14 @@ -import {map} from 'rxjs/operators'; import { Observable } from 'rxjs'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, RequestOptions, URLSearchParams } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpParams, HttpClient } from '@angular/common/http'; @Injectable() export class PatientsRequiringVLResourceService { - constructor(private _http: Http, private appSettingsService: AppSettingsService, + constructor(private _http: HttpClient, private appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } @@ -20,22 +18,22 @@ export class PatientsRequiringVLResourceService { public getPatientList(startDate: string, endDate: string, locationUuids: string, startIndex?: string, limit?: string): Observable { - let api: string = this.geturl() + 'patients-requiring-viral-load-order'; - - let urlParams: URLSearchParams = new URLSearchParams(); + const api: string = this.geturl() + 'patients-requiring-viral-load-order'; if (!startIndex) { startIndex = '0'; } if (!limit) { limit = '100000'; } - urlParams.set('startDate', startDate); - urlParams.set('endDate', endDate); - urlParams.set('locationUuids', locationUuids); - urlParams.set('startIndex', startIndex); - urlParams.set('limit', limit); - let request = this._http.get(api, { search: urlParams }).pipe(map((data) => data.json())); + const urlParams: HttpParams = new HttpParams() + .set('startDate', startDate) + .set('endDate', endDate) + .set('locationUuids', locationUuids) + .set('startIndex', startIndex) + .set('limit', limit); + + const request = this._http.get(api, { params: urlParams }); return this.cacheService.cacheRequest(api, urlParams, request); } diff --git a/src/app/etl-api/program-referral-resource.service.ts b/src/app/etl-api/program-referral-resource.service.ts index 456e798c3..2580424bb 100644 --- a/src/app/etl-api/program-referral-resource.service.ts +++ b/src/app/etl-api/program-referral-resource.service.ts @@ -1,15 +1,13 @@ -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Headers, Response, RequestOptions } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; import { Observable , from} from 'rxjs'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class ProgramReferralResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { } + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public getUrl(): string { return this.appSettingsService.getEtlRestbaseurl().trim() + 'patient-referral'; @@ -18,12 +16,7 @@ export class ProgramReferralResourceService { if (!payload) { return from(null); } - - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(this.getUrl(), JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - })); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(this.getUrl(), JSON.stringify(payload), {headers}); } } diff --git a/src/app/etl-api/radiology-imaging-resource.service.ts b/src/app/etl-api/radiology-imaging-resource.service.ts index 837d128c3..07e381026 100644 --- a/src/app/etl-api/radiology-imaging-resource.service.ts +++ b/src/app/etl-api/radiology-imaging-resource.service.ts @@ -1,67 +1,59 @@ import { Injectable } from '@angular/core'; -import { Http, URLSearchParams, Response, Headers, - RequestOptions, ResponseContentType } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; import { Observable, Subscriber } from 'rxjs'; import { DomSanitizer } from '@angular/platform-browser'; +import { HttpParams, HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class RadiologyImagingResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService, - private domSanitizer: DomSanitizer, ) { } + constructor(private http: HttpClient, private appSettingsService: AppSettingsService, + private domSanitizer: DomSanitizer ) { } public getUrl(): string { return this.appSettingsService.getEtlRestbaseurl().trim() ; } public getPatientImagingReport(patientIdentifier: string): Observable { - let url = this.getUrl(); - let params: URLSearchParams = new URLSearchParams(); + const url = this.getUrl(); + const params: HttpParams = new HttpParams(); params.set('patient', patientIdentifier); return this.http.get(url + 'radiology-diagnostic-report', { - search: params - }).map((response: Response) => { - return response.json(); + params: params }); } public getWadoImageUrl(patientIdentifier: string, id): Observable { - let url = this.getUrl(); - let params: URLSearchParams = new URLSearchParams(); - params.set('patient', patientIdentifier); - params.set('id', id); + const url = this.getUrl(); + const params: HttpParams = new HttpParams() + .set('patient', patientIdentifier) + .set('id', id); return this.http.get(url + 'radiology-images', { - search: params - }).map((response: any) => { - return response._body; + params: params }); } public getAllPatientImageResult(patientIdentifier: string): Observable { - let url = this.getUrl(); - let params: URLSearchParams = new URLSearchParams(); - params.set('patient', patientIdentifier); + const url = this.getUrl(); + const params: HttpParams = new HttpParams() + .set('patient', patientIdentifier); return this.http.get(url + 'radiology-all-patient-images', { - search: params - }).map((response: any) => { - return response.json(); + params: params }); } public getPatientImages(url): Observable { return new Observable((observer: Subscriber) => { let objectUrl: string = null; - let headers = new Headers({ 'Accept': 'image/jpeg' }); + const headers = new HttpHeaders({ 'Accept': 'image/jpeg' }); this.http .get(url, { headers, - responseType: ResponseContentType.Blob + responseType: 'blob' }) .take(1).subscribe((m) => { - objectUrl = URL.createObjectURL(m.blob()); + objectUrl = URL.createObjectURL(m); observer.next(objectUrl); }); @@ -75,13 +67,9 @@ export class RadiologyImagingResourceService { } public createRadiologyComments(payload) { - let url = this.appSettingsService.getEtlRestbaseurl().trim() + 'radiology-comments'; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options) - .map((response: Response) => { - return response.json(); - }); + const url = this.appSettingsService.getEtlRestbaseurl().trim() + 'radiology-comments'; + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}); } diff --git a/src/app/etl-api/user-cohort-resource.service.ts b/src/app/etl-api/user-cohort-resource.service.ts index b76bed87e..5e5d25315 100644 --- a/src/app/etl-api/user-cohort-resource.service.ts +++ b/src/app/etl-api/user-cohort-resource.service.ts @@ -1,29 +1,22 @@ - -import {map} from 'rxjs/operators'; - import { Injectable } from '@angular/core'; -import { Http, URLSearchParams, Response } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; import { Observable } from 'rxjs'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class UserCohortResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { } + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public getUrl(): string { return this.appSettingsService.getEtlRestbaseurl().trim() + 'user-cohorts'; } public getUserCohorts(userUuid: string): Observable { let url = this.getUrl(); - let params: URLSearchParams = new URLSearchParams(); - params.set('userUuid', userUuid); - + let params: HttpParams = new HttpParams() + .set('userUuid', userUuid); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json(); - })); + params: params + }); } } diff --git a/src/app/etl-api/vitals-resource.service.mock.ts b/src/app/etl-api/vitals-resource.service.mock.ts index 89db1c456..62b1a8c9d 100644 --- a/src/app/etl-api/vitals-resource.service.mock.ts +++ b/src/app/etl-api/vitals-resource.service.mock.ts @@ -1,9 +1,6 @@ import { Injectable } from '@angular/core'; -import { TestBed, async, inject } from '@angular/core/testing'; -import { MockBackend, MockConnection } from '@angular/http/testing'; -import { Http, BaseRequestOptions, ResponseOptions, Response, RequestMethod } from '@angular/http'; -import { Observable } from 'rxjs'; -import { Mock } from 'protractor/built/driverProviders'; +import { MockBackend } from '@angular/http/testing'; +import { ResponseOptions, Response } from '@angular/http'; @Injectable() export class MockVitalsResourceService { diff --git a/src/app/etl-api/vitals-resource.service.ts b/src/app/etl-api/vitals-resource.service.ts index daa589425..1b80c5200 100644 --- a/src/app/etl-api/vitals-resource.service.ts +++ b/src/app/etl-api/vitals-resource.service.ts @@ -1,15 +1,14 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, URLSearchParams, Response } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; import { Observable } from 'rxjs'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class VitalsResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { } + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public getUrl(): string { return this.appSettingsService.getEtlRestbaseurl().trim() + 'patient'; @@ -17,15 +16,14 @@ export class VitalsResourceService { public getVitals(patientUuid: string, startIndex: number, limit: number): Observable { let url = this.getUrl(); url += '/' + patientUuid + '/vitals'; - let params: URLSearchParams = new URLSearchParams(); - - params.set('startIndex', startIndex.toString()); - params.set('limit', limit.toString()); + let params: HttpParams = new HttpParams() + .set('startIndex', startIndex.toString()) + .set('limit', limit.toString()); - return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json().result; + return this.http.get(url, { + params: params + }).pipe(map((response) => { + return response.result; })); } } diff --git a/src/app/feedback/feedback.service.ts b/src/app/feedback/feedback.service.ts index c3e24e9a2..8e876421e 100644 --- a/src/app/feedback/feedback.service.ts +++ b/src/app/feedback/feedback.service.ts @@ -1,19 +1,17 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { LocalStorageService } from '../utils/local-storage.service'; -import { UserDefaultPropertiesService } - from '../user-default-properties/user-default-properties.service'; +import { UserDefaultPropertiesService } from '../user-default-properties/user-default-properties.service'; +import { HttpClient } from '@angular/common/http'; @Injectable() export class FeedBackService { - constructor(private http: Http, private appSettingsService: AppSettingsService, + constructor(private http: HttpClient, private appSettingsService: AppSettingsService, private userDefaultPropertiesService: UserDefaultPropertiesService) { } public postFeedback(payload) { let url = this.appSettingsService.getEtlServer() + '/user-feedback'; - return this.http.post(url, payload).pipe(map((data) => data.json())); + return this.http.post(url, payload); } } diff --git a/src/app/lab-order-search/lab-order-search.component.css b/src/app/lab-order-search/lab-order-search.component.css index 105bc3966..dca28dc3a 100644 --- a/src/app/lab-order-search/lab-order-search.component.css +++ b/src/app/lab-order-search/lab-order-search.component.css @@ -41,4 +41,7 @@ } #search-textbox{ margin-bottom: 5px; +} +.btn { + margin-right: 7px; } \ No newline at end of file diff --git a/src/app/lab-order-search/lab-order-search.component.html b/src/app/lab-order-search/lab-order-search.component.html index 24e01ae14..1f63d0fdf 100644 --- a/src/app/lab-order-search/lab-order-search.component.html +++ b/src/app/lab-order-search/lab-order-search.component.html @@ -4,22 +4,22 @@
-
+
-
+
diff --git a/src/app/main-dashboard/main-dashboard.component.ts b/src/app/main-dashboard/main-dashboard.component.ts index 2b9861ac6..c63395fe7 100644 --- a/src/app/main-dashboard/main-dashboard.component.ts +++ b/src/app/main-dashboard/main-dashboard.component.ts @@ -1,8 +1,6 @@ import { Component, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core'; -import { Response } from '@angular/http'; import { Router, NavigationEnd } from '@angular/router'; -import { Subject , Subscription } from 'rxjs'; - +import {Subscription } from 'rxjs'; import { DynamicRoutesService } from '../shared/dynamic-route/dynamic-routes.service'; import { DynamicRouteModel } from '../shared/dynamic-route/dynamic-route.model'; import { AuthenticationService } from '../openmrs-api/authentication.service'; @@ -13,9 +11,6 @@ import { AppState } from '../app.service'; import { UserDefaultPropertiesService } from '../user-default-properties/user-default-properties.service'; -import { MOTDNotificationComponent } from './../Motd/motd-notification.component'; - -declare let jQuery: any; @Component({ selector: 'app-dashboard', diff --git a/src/app/openmrs-api/authentication.service.ts b/src/app/openmrs-api/authentication.service.ts index 98bc4d6dd..e5048e07b 100644 --- a/src/app/openmrs-api/authentication.service.ts +++ b/src/app/openmrs-api/authentication.service.ts @@ -1,11 +1,9 @@ import { Injectable } from '@angular/core'; -import { Http, Response, Headers } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { SessionService } from './session.service'; import { LocalStorageService } from '../utils/local-storage.service'; import { SessionStorageService } from '../utils/session-storage.service'; import { Constants } from '../utils/constants'; -import { Observable } from 'rxjs'; import { CookieService } from 'ngx-cookie'; @Injectable() @@ -29,9 +27,9 @@ export class AuthenticationService { request .take(1).subscribe( - (response: Response) => { + (response: any) => { - let data = response.json(); + let data = response; if (data.authenticated) { diff --git a/src/app/openmrs-api/cohort-member-resource.service.ts b/src/app/openmrs-api/cohort-member-resource.service.ts index f7b843c32..0e7ad7eb0 100644 --- a/src/app/openmrs-api/cohort-member-resource.service.ts +++ b/src/app/openmrs-api/cohort-member-resource.service.ts @@ -2,16 +2,15 @@ import {map} from 'rxjs/operators'; import { Observable } from 'rxjs'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class CohortMemberResourceService { public baseOpenMrsUrl: string = this.getOpenMrsBaseUrl(); - constructor(private _http: Http , private _appSettingsService: AppSettingsService) { + constructor(private _http: HttpClient , private _appSettingsService: AppSettingsService) { } public getOpenMrsBaseUrl(): string { @@ -27,11 +26,11 @@ export class CohortMemberResourceService { return null; } - let allCohortMembersUrl: string = this.baseOpenMrsUrl + 'cohort/' + parentUuid + '/member'; + const allCohortMembersUrl: string = this.baseOpenMrsUrl + 'cohort/' + parentUuid + '/member'; - return this._http.get(allCohortMembersUrl).pipe( + return this._http.get(allCohortMembersUrl).pipe( map((response) => { - return response.json().results; + return response.results; })); } @@ -43,15 +42,9 @@ export class CohortMemberResourceService { return null; } - let cohortUrl = this.baseOpenMrsUrl + 'cohort/' + parentUuid + '/member/' + uuid; - - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this._http.get(cohortUrl , options).pipe( - map((response: Response) => { - return response.json(); - })); - + const cohortUrl = this.baseOpenMrsUrl + 'cohort/' + parentUuid + '/member/' + uuid; + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this._http.get(cohortUrl, {headers}); } // Add Cohort member @@ -61,14 +54,10 @@ export class CohortMemberResourceService { return null; } - let addCohortUrl: string = this.baseOpenMrsUrl + 'cohort/' + parentUuid + '/member'; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this._http.post(addCohortUrl , JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - })); + const addCohortUrl: string = this.baseOpenMrsUrl + 'cohort/' + parentUuid + '/member'; + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this._http.post(addCohortUrl , JSON.stringify(payload), {headers}); } // Retire/Void Cohort @@ -79,17 +68,12 @@ export class CohortMemberResourceService { return null; } - let retireRestUrl = 'cohort/' + parentUuid + '/member/' + uuid + '?!purge'; - - let retireCohortUrl: string = this.baseOpenMrsUrl + retireRestUrl; + const retireRestUrl = 'cohort/' + parentUuid + '/member/' + uuid + '?!purge'; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); + const retireCohortUrl: string = this.baseOpenMrsUrl + retireRestUrl; + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); - return this._http.delete(retireCohortUrl , options).pipe( - map((response) => { - return response.json(); - })); + return this._http.delete(retireCohortUrl, {headers}); } diff --git a/src/app/openmrs-api/cohort-resource.service.ts b/src/app/openmrs-api/cohort-resource.service.ts index 88137ec2f..f6e6bf55b 100644 --- a/src/app/openmrs-api/cohort-resource.service.ts +++ b/src/app/openmrs-api/cohort-resource.service.ts @@ -1,19 +1,16 @@ -import {map} from 'rxjs/operators'; import { Observable } from 'rxjs'; import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; -import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpParams, HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class CohortResourceService { public baseOpenMrsUrl: string = this.getOpenMrsBaseUrl(); - private v: string = 'full'; + private v = 'full'; - constructor(private _http: Http, private _appSettingsService: AppSettingsService) { + constructor(private _http: HttpClient, private _appSettingsService: AppSettingsService) { } public getOpenMrsBaseUrl(): string { @@ -22,20 +19,17 @@ export class CohortResourceService { } public getAllCohorts(): Observable { - let params = new URLSearchParams(); - params.set('v', 'full'); + const params = new HttpParams() + .set('v', 'full'); - let allCohortsUrl: string = this.baseOpenMrsUrl + 'cohort'; + const allCohortsUrl: string = this.baseOpenMrsUrl + 'cohort'; // let request = return this._http.get(allCohortsUrl, { - search: params - }).pipe( - map((response) => { - return response.json(); - })); - // return this.cacheService.cacheRequest(allCohortsUrl, params, request); + params: params + }); + // return this.cacheService.cacheRequest(allCohortsUrl, params, request); } // Fetch specific Cohort @@ -51,12 +45,8 @@ export class CohortResourceService { if (v) { cohortUrl = cohortUrl + '?v=' + v; } - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this._http.get(cohortUrl, options).pipe( - map((response: Response) => { - return response.json(); - })); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this._http.get(cohortUrl, {headers}); } @@ -67,15 +57,10 @@ export class CohortResourceService { return null; } - let addCohortUrl: string = this.baseOpenMrsUrl + 'cohort'; - - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this._http.post(addCohortUrl, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - })); + const addCohortUrl: string = this.baseOpenMrsUrl + 'cohort'; + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this._http.post(addCohortUrl, JSON.stringify(payload), {headers}); } // Edit Cohort @@ -86,14 +71,9 @@ export class CohortResourceService { return null; } - let editCohortUrl: string = this.baseOpenMrsUrl + 'cohort/' + uuid; + const editCohortUrl: string = this.baseOpenMrsUrl + 'cohort/' + uuid; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this._http.post(editCohortUrl, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - })); + return this._http.post(editCohortUrl, JSON.stringify(payload)); } @@ -105,15 +85,11 @@ export class CohortResourceService { return null; } - let deleteCohortUrl: string = this.baseOpenMrsUrl + 'cohort/' + uuid + '?!purge'; + const deleteCohortUrl: string = this.baseOpenMrsUrl + 'cohort/' + uuid + '?!purge'; + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this._http.delete(deleteCohortUrl, options).pipe( - map((response) => { - return response.json(); - })); + return this._http.delete(deleteCohortUrl, {headers}); } diff --git a/src/app/openmrs-api/concept-resource.service.ts b/src/app/openmrs-api/concept-resource.service.ts index 43017823a..f5b6ea7c2 100644 --- a/src/app/openmrs-api/concept-resource.service.ts +++ b/src/app/openmrs-api/concept-resource.service.ts @@ -2,16 +2,16 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; -import { Observable, Subject, ReplaySubject } from 'rxjs'; +import { Observable } from 'rxjs'; import * as _ from 'lodash'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class ConceptResourceService { public v: string = 'custom:(uuid,name,conceptClass,answers)'; - constructor(protected http: Http, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } @@ -24,17 +24,15 @@ export class ConceptResourceService { Observable { let url = this.getUrl(); - let params: URLSearchParams = new URLSearchParams(); + let params: HttpParams = new HttpParams() + .set('q', searchText) + .set('v', (v && v.length > 0) ? v : this.v); - params.set('q', searchText); - - params.set('v', (v && v.length > 0) ? v : this.v); - - return this.http.get(url, { - search: params + return this.http.get(url, { + params: params }).pipe( - map((response: Response) => { - return response.json().results; + map((response) => { + return response.results; })); } @@ -43,14 +41,11 @@ export class ConceptResourceService { let url = this.getUrl(); url += '/' + uuid; - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', (v && v.length > 0) ? v : this.v); + let params: HttpParams = new HttpParams() + .set('v', (v && v.length > 0) ? v : this.v); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json(); - })); + params: params + }); } public getConceptByConceptClassesUuid(searchText, conceptClassesUuidArray) { let filteredConceptResults = []; diff --git a/src/app/openmrs-api/encounter-resource.service.ts b/src/app/openmrs-api/encounter-resource.service.ts index 691a8ebc6..26ac6a481 100644 --- a/src/app/openmrs-api/encounter-resource.service.ts +++ b/src/app/openmrs-api/encounter-resource.service.ts @@ -1,10 +1,9 @@ import {of as observableOf, Observable, Subject } from 'rxjs'; - import {map, flatMap } from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; +import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http'; @Injectable() export class EncounterResourceService { @@ -14,7 +13,7 @@ export class EncounterResourceService { ',visitType:(uuid,name)),' + 'location:ref,encounterType:ref,encounterProviders:(uuid,display,provider:(uuid,display)))'; - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { } + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { return this.appSettingsService.getOpenmrsRestbaseurl().trim(); @@ -26,22 +25,21 @@ export class EncounterResourceService { return null; } let url = this.getUrl() + 'encounter'; - const params = new URLSearchParams(); - params.set('patient', patientUuid); - params.set('v', this.v); + let params = new HttpParams() + .set('patient', patientUuid) + .set('v', this.v); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => - response.json())).pipe(flatMap((encounters: any) => { + params: params + }).pipe(flatMap((encounters: any) => { if (encounters.results.length >= 500) { - params.set('startIndex', '500'); - return this.http.get(url, { - search: params - }).pipe(map((res: Response) => { + params = params.set('startIndex', '500'); + return this.http.get(url, { + params: params + }).pipe(map((res) => { - return encounters.results.concat(res.json().results); + return encounters.results.concat(res.results); })); @@ -62,20 +60,18 @@ export class EncounterResourceService { 'location:ref,encounterType:ref,' + 'encounterProviders:(uuid,display,provider:(uuid,display)),orders:full,' + 'obs:(uuid,obsDatetime,concept:(uuid,uuid,name:(display)),value:ref,groupMembers))'; - let params = new URLSearchParams(); - params.set('v', _customDefaultRep); + let params = new HttpParams() + .set('v', _customDefaultRep); let url = this.getUrl() + 'encounter/' + uuid; - return this.http.get(url, { search: params }).pipe(map((response: Response) => { - return response.json(); - })); + return this.http.get(url, { params: params }); } public getEncounterTypes(v: string) { if (!v) { return null; } let url = this.getUrl() + 'encountertype'; - return this.http.get(url).pipe(map((response: Response) => { - return response.json().results; + return this.http.get(url).pipe(map((response: any) => { + return response.results; })); } @@ -85,12 +81,8 @@ export class EncounterResourceService { return null; } let url = this.getUrl() + 'encounter'; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - })); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}); } public updateEncounter(uuid, payload) { @@ -98,12 +90,8 @@ export class EncounterResourceService { return null; } let url = this.getUrl() + 'encounter/' + uuid; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - })); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}); } public voidEncounter(uuid) { @@ -111,11 +99,8 @@ export class EncounterResourceService { return null; } let url = this.getUrl() + 'encounter/' + uuid + '?!purge'; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.delete(url, new RequestOptions({ - headers: headers - })); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.delete(url, {headers}); } } diff --git a/src/app/openmrs-api/fake-encounter-resource.service.ts b/src/app/openmrs-api/fake-encounter-resource.service.ts index 0f38e708b..943814eed 100644 --- a/src/app/openmrs-api/fake-encounter-resource.service.ts +++ b/src/app/openmrs-api/fake-encounter-resource.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http } from '@angular/http'; import { Observable, of } from 'rxjs'; +import { HttpClient } from '@angular/common/http'; @Injectable() export class FakeEncounterResourceService { @@ -9,7 +9,7 @@ export class FakeEncounterResourceService { 'patient:(uuid,uuid),form:(uuid,name),' + 'location:ref,encounterType:ref,provider:ref)'; - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { } + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { return ''; diff --git a/src/app/openmrs-api/fake-patient-resource.ts b/src/app/openmrs-api/fake-patient-resource.ts index 8c38a0934..1c2f64d79 100644 --- a/src/app/openmrs-api/fake-patient-resource.ts +++ b/src/app/openmrs-api/fake-patient-resource.ts @@ -1,15 +1,15 @@ import { PatientResourceService } from './patient-resource.service'; -import { Observable, Subject, BehaviorSubject } from 'rxjs'; -import { Http } from '@angular/http'; +import { Observable, BehaviorSubject } from 'rxjs'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { Patient } from '../models/patient.model'; +import { HttpClient } from '@angular/common/http'; /** * FakePatientResourceService */ export class FakePatientResourceService extends PatientResourceService { public returnErrorOnNext: boolean = false; - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { super(http, appSettingsService); } diff --git a/src/app/openmrs-api/forms-resource.service.ts b/src/app/openmrs-api/forms-resource.service.ts index 6116cd909..26f6dab37 100644 --- a/src/app/openmrs-api/forms-resource.service.ts +++ b/src/app/openmrs-api/forms-resource.service.ts @@ -1,16 +1,14 @@ -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, URLSearchParams } from '@angular/http'; import { ReplaySubject, Observable } from 'rxjs'; - import { AppSettingsService } from '../app-settings/app-settings.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class FormsResourceService { private forms = new ReplaySubject(1); - constructor(private http: Http, private appSettingsService: AppSettingsService) { + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } /** @@ -24,20 +22,18 @@ export class FormsResourceService { public getForms(forceRefresh?: boolean) { // If the Subject was NOT subscribed before OR if forceRefresh is requested - let params = new URLSearchParams(); - params.set('v', 'custom:(uuid,name,encounterType:(uuid,name),version,' + - 'published,retired,resources:(uuid,name,dataType,valueReference))'); - params.set('q', 'POC'); + const params = new HttpParams() + .set('v', 'custom:(uuid,name,encounterType:(uuid,name),version,' + + 'published,retired,resources:(uuid,name,dataType,valueReference))') + .set('q', 'POC'); if (!this.forms.observers.length || forceRefresh) { - this.http.get( + this.http.get( this.appSettingsService.getOpenmrsRestbaseurl().trim() + 'form', { - search: params + params: params } - ).pipe( - map((res: Response) => res.json())) - .take(1).subscribe( + ).take(1).subscribe( (data) => this.forms.next(data.results), (error) => this.forms.error(error) ); @@ -51,15 +47,12 @@ export class FormsResourceService { let url = this.appSettingsService.getOpenmrsRestbaseurl().trim() + 'clobdata'; url += '/' + uuid; - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', (v && v.length > 0) ? v : 'full'); + let params: HttpParams = new HttpParams() + .set('v', (v && v.length > 0) ? v : 'full'); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json(); - })); + params: params + }); } public getFormMetaDataByUuid(uuid: string, v: string = null): Observable { @@ -67,15 +60,12 @@ export class FormsResourceService { let url = this.appSettingsService.getOpenmrsRestbaseurl().trim() + 'form'; url += '/' + uuid; - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', (v && v.length > 0) ? v : 'full'); + let params: HttpParams = new HttpParams() + .set('v', (v && v.length > 0) ? v : 'full'); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json(); - })); + params: params + }); } } diff --git a/src/app/openmrs-api/location-resource.service.ts b/src/app/openmrs-api/location-resource.service.ts index 5e68ec8a2..4c9b08ef3 100644 --- a/src/app/openmrs-api/location-resource.service.ts +++ b/src/app/openmrs-api/location-resource.service.ts @@ -1,18 +1,17 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, URLSearchParams } from '@angular/http'; import { ReplaySubject, Observable } from 'rxjs'; - import { AppSettingsService } from '../app-settings/app-settings.service'; import { DataCacheService } from '../shared/services/data-cache.service'; +import { HttpClient, HttpParams } from '@angular/common/http'; +import * as locationIds from '../shared/locations/location_data.json'; @Injectable() export class LocationResourceService { private locations = new ReplaySubject(1); - private locationIds = require('../shared/locations/location_data.json'); private v: string = 'full'; - constructor(protected http: Http, protected appSettingsService: AppSettingsService, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, private cacheService: DataCacheService) { } @@ -27,18 +26,15 @@ export class LocationResourceService { public getLocations(forceRefresh?: boolean) { // If the Subject was NOT subscribed before OR if forceRefresh is requested - let params = new URLSearchParams(); - params.set('v', 'full'); + let params = new HttpParams().set('v', 'full'); if (!this.locations.observers.length || forceRefresh) { - this.http.get( + this.http.get( this.appSettingsService.getOpenmrsRestbaseurl().trim() + 'location', { - search: params + params: params } - ).pipe( - map((res: Response) => res.json())) - .take(1).subscribe( + ).take(1).subscribe( (data) => this.locations.next(data.results), (error) => this.locations.error(error) ); @@ -53,18 +49,14 @@ export class LocationResourceService { let url = this.appSettingsService.getOpenmrsRestbaseurl().trim() + 'location'; url += '/' + uuid; - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', (v && v.length > 0) ? v : this.v); - let request = this.http.get(url, { search: params }).pipe(map((response: Response) => { - return response.json(); - })); - + let params: HttpParams = new HttpParams() + .set('v', (v && v.length > 0) ? v : this.v); + let request = this.http.get(url, { params: params }); return this.cacheService.cacheRequest(url, params, request); } public getLocationIdByUuid(uuid: string): any { - let _location = this.locationIds.locations.filter((location) => { + let _location = locationIds.locations.filter((location) => { return location.uuid === uuid; }); if (_location.length > 0) { @@ -77,17 +69,15 @@ export class LocationResourceService { Observable { let url = this.appSettingsService.getOpenmrsRestbaseurl().trim() + 'location'; - let params: URLSearchParams = new URLSearchParams(); - - params.set('q', searchText); - - params.set('v', (v && v.length > 0) ? v : this.v); + let params: HttpParams = new HttpParams() + .set('q', searchText) + .set('v', (v && v.length > 0) ? v : this.v); - return this.http.get(url, { - search: params + return this.http.get(url, { + params: params }).pipe( - map((response: Response) => { - return response.json().results; + map((response) => { + return response.results; })); } diff --git a/src/app/openmrs-api/obs-resource.service.ts b/src/app/openmrs-api/obs-resource.service.ts index 1ea58df27..891d4b7cc 100644 --- a/src/app/openmrs-api/obs-resource.service.ts +++ b/src/app/openmrs-api/obs-resource.service.ts @@ -1,12 +1,11 @@ import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; -import { Observable, Subject } from 'rxjs'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class ObsResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { } + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { return this.appSettingsService.getOpenmrsRestbaseurl().trim(); @@ -18,12 +17,8 @@ export class ObsResourceService { return null; } let url = this.getUrl() + 'obs'; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options) - .map((response: Response) => { - return response.json(); - }); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}); } public updateObs(uuid, payload) { @@ -31,12 +26,8 @@ export class ObsResourceService { return null; } let url = this.getUrl() + 'obs/' + uuid; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options) - .map((response: Response) => { - return response.json(); - }); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}); } public voidObs(uuid) { @@ -44,11 +35,8 @@ export class ObsResourceService { return null; } let url = this.getUrl() + 'obs/' + uuid + '?!purge'; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.delete(url, new RequestOptions({ - headers: headers - })); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.delete(url, {headers}); } } diff --git a/src/app/openmrs-api/order-resource.service.ts b/src/app/openmrs-api/order-resource.service.ts index 6ece101da..914c4e041 100644 --- a/src/app/openmrs-api/order-resource.service.ts +++ b/src/app/openmrs-api/order-resource.service.ts @@ -2,9 +2,9 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; -import { Observable, Subject, ReplaySubject } from 'rxjs'; +import { Observable } from 'rxjs'; import * as _ from 'lodash'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class OrderResourceService { @@ -14,7 +14,7 @@ export class OrderResourceService { 'commentToFulfiller,dateActivated,instructions,orderer:default,' + 'encounter:full,patient:full,concept:ref)'; - constructor(protected http: Http, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } @@ -28,13 +28,13 @@ export class OrderResourceService { let url = this.getUrl(); url += '/' + orderId; - let params: URLSearchParams = new URLSearchParams(); - params.set('v', (v && v.length > 0) ? v : this.v); + let params: HttpParams = new HttpParams() + .set('v', (v && v.length > 0) ? v : this.v); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return this._excludeVoidedOrder(response.json()); + params: params + }).pipe(map((response) => { + return this._excludeVoidedOrder(response); })); } @@ -42,14 +42,13 @@ export class OrderResourceService { Observable { let url = this.getUrl(); - let params: URLSearchParams = new URLSearchParams(); - params.set('patient', patientUuid); - - params.set('v', (v && v.length > 0) ? v : this.v); + let params: HttpParams = new HttpParams() + .set('patient', patientUuid) + .set('v', (v && v.length > 0) ? v : this.v); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json(); + params: params + }).pipe(map((response) => { + return response; })); } public getOrderByUuid(uuid: string, cached: boolean = false, v: string = null): Observable { @@ -58,13 +57,12 @@ export class OrderResourceService { url += '/' + uuid; // console.log('url', url) - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', (v && v.length > 0) ? v : this.v); + let params: HttpParams = new HttpParams() + .set('v', (v && v.length > 0) ? v : this.v); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json(); + params: params + }).pipe(map((response) => { + return response; })); } diff --git a/src/app/openmrs-api/patient-creation-resource.service.ts b/src/app/openmrs-api/patient-creation-resource.service.ts index b99336c1c..910ce59f3 100644 --- a/src/app/openmrs-api/patient-creation-resource.service.ts +++ b/src/app/openmrs-api/patient-creation-resource.service.ts @@ -2,15 +2,14 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; -import { Observable, Subject } from 'rxjs'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class PatientCreationResourceService { private idgenUrl = 'https://ngx.ampath.or.ke/amrs-id-generator'; - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -28,38 +27,27 @@ export class PatientCreationResourceService { public getPatientIdentifierTypes() { const url = this.getResourceUrl(); - return this.http.get(url).pipe(map((results) => { - return results.json().results; + return this.http.get(url).pipe(map((results: any) => { + return results.results; })); } public generatePatientIdentifier(source) { - const getUrl = this.getUrl() + source; - - return this.http.get(getUrl).pipe(map((res) => { - return res.json(); - })); + return this.http.get(getUrl); } public generateIdentifier(user) { - let url = this.idgenUrl + '/generateidentifier'; - return this.http.post(url, user).pipe(map((res) => { - return res.json(); - })); + const url = this.idgenUrl + '/generateidentifier'; + return this.http.post(url, user); } public savePatient(payload) { - let url = this.url(); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - - return this.http.post(url, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - })); + const url = this.url(); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}); } } diff --git a/src/app/openmrs-api/patient-identifierTypes-resource.service.ts b/src/app/openmrs-api/patient-identifierTypes-resource.service.ts index 31ea5a040..aff768fd2 100644 --- a/src/app/openmrs-api/patient-identifierTypes-resource.service.ts +++ b/src/app/openmrs-api/patient-identifierTypes-resource.service.ts @@ -2,17 +2,17 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; -import { Observable, Subject } from 'rxjs'; +import { Observable } from 'rxjs'; +import { HttpClient, HttpParams } from '@angular/common/http'; // TODO inject service @Injectable() export class PatientIdentifierTypeResService { - public v: string = 'full'; + public v = 'full'; - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -22,15 +22,15 @@ export class PatientIdentifierTypeResService { public getPatientIdentifierTypes(v: string = null): Observable { - let url = this.getUrl(); - let params: URLSearchParams = new URLSearchParams(); - params.set('v', (v && v.length > 0) ? v : this.v); + const url = this.getUrl(); + const params: HttpParams = new HttpParams() + .set('v', (v && v.length > 0) ? v : this.v); - return this.http.get(url, { - search: params + return this.http.get(url, { + params: params }).pipe( - map((response: Response) => { - return response.json().results; + map((response) => { + return response.results; })); } diff --git a/src/app/openmrs-api/patient-relationship-resource.service.ts b/src/app/openmrs-api/patient-relationship-resource.service.ts index 8068a665d..897c15837 100644 --- a/src/app/openmrs-api/patient-relationship-resource.service.ts +++ b/src/app/openmrs-api/patient-relationship-resource.service.ts @@ -2,13 +2,13 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; -import { Observable, Subject } from 'rxjs'; +import { Observable } from 'rxjs'; +import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http'; @Injectable() export class PatientRelationshipResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -25,15 +25,14 @@ export class PatientRelationshipResourceService { return null; } - let params: URLSearchParams = new URLSearchParams(); + let params: HttpParams = new HttpParams() + .set('v', v) + .set('person', uuid); - params.set('v', v); - params.set('person', uuid); - - return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json().results; + return this.http.get(url, { + params: params + }).pipe(map((response) => { + return response.results; })); } @@ -42,12 +41,8 @@ export class PatientRelationshipResourceService { return null; } let url = this.getUrl(); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, payload, options).pipe( - map((response: Response) => { - return response.json(); - })); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, payload, {headers}); } public updateRelationship(uuid, payload) { @@ -55,12 +50,8 @@ export class PatientRelationshipResourceService { return null; } let url = this.getUrl() + '/' + uuid; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, payload, options).pipe( - map((response: Response) => { - return response.json(); - })); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, payload, {headers}); } public deleteRelationship(uuid) { diff --git a/src/app/openmrs-api/patient-relationship-type-resource.service.ts b/src/app/openmrs-api/patient-relationship-type-resource.service.ts index cef02fa17..9d15691ae 100644 --- a/src/app/openmrs-api/patient-relationship-type-resource.service.ts +++ b/src/app/openmrs-api/patient-relationship-type-resource.service.ts @@ -2,13 +2,14 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; -import { Observable, Subject } from 'rxjs'; +import { Response } from '@angular/http'; +import { Observable } from 'rxjs'; +import { HttpClient, HttpParams } from '@angular/common/http'; @Injectable() export class PatientRelationshipTypeResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -20,13 +21,12 @@ export class PatientRelationshipTypeResourceService { let url = this.getUrl(); let v: string = 'full'; - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', v); - return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json().results; + let params: HttpParams = new HttpParams() + .set('v', v); + return this.http.get(url, { + params: params + }).pipe(map((response) => { + return response.results; })); } } diff --git a/src/app/openmrs-api/patient-resource.service.ts b/src/app/openmrs-api/patient-resource.service.ts index 8094933c0..da28c52be 100644 --- a/src/app/openmrs-api/patient-resource.service.ts +++ b/src/app/openmrs-api/patient-resource.service.ts @@ -2,8 +2,8 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; -import { Observable, Subject } from 'rxjs'; +import { Observable } from 'rxjs'; +import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http'; // TODO inject service @@ -18,7 +18,7 @@ export class PatientResourceService { + 'attributes,preferredAddress:(uuid,preferred,address1,address2,cityVillage,' + 'stateProvince,country,postalCode,countyDistrict,address3,address4,address5,address6)))'; - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -30,17 +30,14 @@ export class PatientResourceService { Observable { let url = this.getUrl(); - let params: URLSearchParams = new URLSearchParams(); - - params.set('q', searchText); - - params.set('v', (v && v.length > 0) ? v : this.v); - + let params: HttpParams = new HttpParams() + .set('q', searchText) + .set('v', (v && v.length > 0) ? v : this.v); return this.http.get(url, { - search: params + params: params }).pipe( - map((response: Response) => { - return response.json().results; + map((response: any) => { + return response.results; })); } @@ -50,14 +47,13 @@ export class PatientResourceService { let url = this.getUrl(); url += '/' + uuid; - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', (v && v.length > 0) ? v : this.v); + let params: HttpParams = new HttpParams() + .set('v', (v && v.length > 0) ? v : this.v); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json(); + params: params + }).pipe(map((response) => { + return response; })); } public saveUpdatePatientIdentifier(uuid, identifierUuid, payload): Observable { @@ -65,11 +61,10 @@ export class PatientResourceService { return null; } let url = this.getUrl() + '/' + uuid + '/' + 'identifier' + '/' + identifierUuid; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json().patient; + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}).pipe( + map((response: any) => { + return response.patient; })); } } diff --git a/src/app/openmrs-api/person-resource.service.ts b/src/app/openmrs-api/person-resource.service.ts index c7b43fca2..4b46331ac 100644 --- a/src/app/openmrs-api/person-resource.service.ts +++ b/src/app/openmrs-api/person-resource.service.ts @@ -2,14 +2,14 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; -import { Observable, Subject } from 'rxjs'; +import { Observable } from 'rxjs'; +import { HttpParams, HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class PersonResourceService { public v: string = 'full'; - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -21,14 +21,11 @@ export class PersonResourceService { let url = this.getUrl(); url += '/' + uuid; - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', (v && v.length > 0) ? v : this.v); + let params: HttpParams = new HttpParams() + .set('v', (v && v.length > 0) ? v : this.v); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json(); - })); + params: params + }); } public saveUpdatePerson(uuid, payload) { @@ -36,11 +33,10 @@ export class PersonResourceService { return null; } let url = this.getUrl() + '/' + uuid; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json().person; + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}).pipe( + map((response: any) => { + return response.person; })); } } diff --git a/src/app/openmrs-api/program-enrollment-resource.service.mock.ts b/src/app/openmrs-api/program-enrollment-resource.service.mock.ts index 2a723a308..d27c81f83 100644 --- a/src/app/openmrs-api/program-enrollment-resource.service.mock.ts +++ b/src/app/openmrs-api/program-enrollment-resource.service.mock.ts @@ -1,14 +1,14 @@ -import { Observable, Subject, BehaviorSubject } from 'rxjs'; -import { Http } from '@angular/http'; +import { Observable, BehaviorSubject } from 'rxjs'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { ProgramEnrollmentResourceService } from './program-enrollment-resource.service'; +import { HttpClient } from '@angular/common/http'; /** * FakeProgramEnrollmentResourceService */ export class FakeProgramEnrollmentResourceService extends ProgramEnrollmentResourceService { public returnErrorOnNext: boolean = false; - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { super(http, appSettingsService); } diff --git a/src/app/openmrs-api/program-enrollment-resource.service.ts b/src/app/openmrs-api/program-enrollment-resource.service.ts index 5b0d9042c..43a756d39 100644 --- a/src/app/openmrs-api/program-enrollment-resource.service.ts +++ b/src/app/openmrs-api/program-enrollment-resource.service.ts @@ -1,17 +1,16 @@ -import {throwError as observableThrowError, Observable, Subject } from 'rxjs'; - +import {throwError as observableThrowError, Observable } from 'rxjs'; import {catchError, map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; +import { HttpParams, HttpClient, HttpHeaders } from '@angular/common/http'; // TODO inject service @Injectable() export class ProgramEnrollmentResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -30,15 +29,14 @@ export class ProgramEnrollmentResourceService { return null; } - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', v); - params.set('patient', uuid); + let params: HttpParams = new HttpParams() + .set('v', v) + .set('patient', uuid); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json().results; + params: params + }).pipe(map((response: any) => { + return response.results; })); } @@ -52,14 +50,14 @@ export class ProgramEnrollmentResourceService { return null; } - let params: URLSearchParams = new URLSearchParams(); + let params: HttpParams = new HttpParams() + .set('v', v); url = url + '/' + uuid; - params.set('v', v); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json().results; + params: params + }).pipe(map((response: any) => { + return response.results; })); } @@ -72,12 +70,9 @@ export class ProgramEnrollmentResourceService { url = url + '/' + payload.uuid; } delete payload['uuid']; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - }),catchError(this.handleError),); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}).pipe( + catchError(this.handleError)); } public updateProgramEnrollmentState(programEnrollmentUuid, payload) { @@ -92,12 +87,9 @@ export class ProgramEnrollmentResourceService { url = url + '/' + programEnrollmentUuid + '/' + 'state' + '/' + payload.uuid; delete payload['uuid']; - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, JSON.stringify(payload), options).pipe( - map((response: Response) => { - return response.json(); - }),catchError(this.handleError),); + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(url, JSON.stringify(payload), {headers}).pipe( + catchError(this.handleError)); } private handleError(error: any) { diff --git a/src/app/openmrs-api/program-resource.service.ts b/src/app/openmrs-api/program-resource.service.ts index cc0ff993b..0ebdb9b62 100644 --- a/src/app/openmrs-api/program-resource.service.ts +++ b/src/app/openmrs-api/program-resource.service.ts @@ -2,15 +2,15 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; -import { Observable, Subject } from 'rxjs'; +import { Observable } from 'rxjs'; +import { HttpParams, HttpClient } from '@angular/common/http'; // TODO inject service @Injectable() export class ProgramResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -23,22 +23,18 @@ export class ProgramResourceService { let url = this.getUrl(); let v: string = 'custom:(uuid,display,allWorkflows,concept:(uuid,display))'; - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', v); - return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json().results; + let params: HttpParams = new HttpParams() + .set('v', v); + return this.http.get(url, { + params: params + }).pipe(map((response) => { + return response.results; })); } // get proggram incompatibilities public getProgramsIncompatibilities() { - return this.http.get('../patient-dashboard/programs/programs.json').pipe( - map((response) => { - return response.json(); - })); + return this.http.get('../patient-dashboard/programs/programs.json'); } } diff --git a/src/app/openmrs-api/program-workflow-resource.service.ts b/src/app/openmrs-api/program-workflow-resource.service.ts index e54a234f5..1b2f9c346 100644 --- a/src/app/openmrs-api/program-workflow-resource.service.ts +++ b/src/app/openmrs-api/program-workflow-resource.service.ts @@ -1,16 +1,15 @@ -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; import { Observable, Subject } from 'rxjs'; +import { HttpClient, HttpParams } from '@angular/common/http'; // TODO inject service @Injectable() export class ProgramWorkFlowResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -28,14 +27,11 @@ export class ProgramWorkFlowResourceService { let v: string = 'custom:(uuid,display,allWorkflows:(uuid,retired,concept:(uuid,display)' + ',states:(uuid,initial,terminal,concept:(uuid,display))))'; - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', v); + let params: HttpParams = new HttpParams() + .set('v', v); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json(); - })); + params: params + }); } } diff --git a/src/app/openmrs-api/program-workflow-state-resource.service.ts b/src/app/openmrs-api/program-workflow-state-resource.service.ts index 8564147a3..66bb69f62 100644 --- a/src/app/openmrs-api/program-workflow-state-resource.service.ts +++ b/src/app/openmrs-api/program-workflow-state-resource.service.ts @@ -1,17 +1,16 @@ import {throwError as observableThrowError, Observable, Subject } from 'rxjs'; - import {catchError, map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; +import { HttpParams, HttpClient } from '@angular/common/http'; // TODO inject service @Injectable() export class ProgramWorkFlowStateResourceService { - constructor(protected http: Http, protected appSettingsService: AppSettingsService) { + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -28,14 +27,13 @@ export class ProgramWorkFlowStateResourceService { let url = this.getUrl() + '/' + workFlowUuid + '/' + 'state'; let v: string = 'custom:(uuid,initial,terminal,concept:(uuid,retired,display))'; - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', v); - return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json().results; - }),catchError(this.handleError),); + let params: HttpParams = new HttpParams() + .set('v', v); + return this.http.get(url, { + params: params + }).pipe(map((response) => { + return response.results; + }), catchError(this.handleError)); } private handleError(error: any) { diff --git a/src/app/openmrs-api/provider-resource.service.mock.ts b/src/app/openmrs-api/provider-resource.service.mock.ts index 7e17995b4..9aca46286 100644 --- a/src/app/openmrs-api/provider-resource.service.mock.ts +++ b/src/app/openmrs-api/provider-resource.service.mock.ts @@ -3,13 +3,14 @@ import { Http } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; import { ProviderResourceService } from './provider-resource.service'; import { PersonResourceService } from './person-resource.service'; +import { HttpClient } from '@angular/common/http'; /** * FakeProgramEnrollmentResourceService */ export class FakeProviderResourceService { public returnErrorOnNext: boolean = false; - constructor(protected http: Http, protected appSettingsService: AppSettingsService, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, protected personService: PersonResourceService) { } diff --git a/src/app/openmrs-api/provider-resource.service.ts b/src/app/openmrs-api/provider-resource.service.ts index 2d4fbb2fa..4a944ea22 100644 --- a/src/app/openmrs-api/provider-resource.service.ts +++ b/src/app/openmrs-api/provider-resource.service.ts @@ -2,17 +2,17 @@ import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; -import { Observable, Subject , ReplaySubject } from 'rxjs'; +import { Observable , ReplaySubject } from 'rxjs'; import { PersonResourceService } from './person-resource.service'; import * as _ from 'lodash'; +import { HttpParams, HttpClient } from '@angular/common/http'; @Injectable() export class ProviderResourceService { public v: string = 'full'; - constructor(protected http: Http, + constructor(protected http: HttpClient, protected appSettingsService: AppSettingsService, protected personService: PersonResourceService) { } @@ -26,17 +26,15 @@ export class ProviderResourceService { Observable { let url = this.getUrl() ; - let params: URLSearchParams = new URLSearchParams(); + let params: HttpParams = new HttpParams() + .set('q', searchText) + .set('v', (v && v.length > 0) ? v : this.v); - params.set('q', searchText); - - params.set('v', (v && v.length > 0) ? v : this.v); - - return this.http.get(url, { - search: params + return this.http.get(url, { + params: params }).pipe( - map((response: Response) => { - return response.json().results; + map((response) => { + return response.results; })); } @@ -46,14 +44,11 @@ export class ProviderResourceService { let url = this.getUrl(); url += '/' + uuid; - let params: URLSearchParams = new URLSearchParams(); - - params.set('v', (v && v.length > 0) ? v : this.v); + let params: HttpParams = new HttpParams() + .set('v', (v && v.length > 0) ? v : this.v); return this.http.get(url, { - search: params - }).pipe(map((response: Response) => { - return response.json(); - })); + params: params + }); } public getProviderByPersonUuid(uuid) { let providerResults = new ReplaySubject(1); diff --git a/src/app/openmrs-api/session.service.ts b/src/app/openmrs-api/session.service.ts index 51a269b9a..539ce50ee 100644 --- a/src/app/openmrs-api/session.service.ts +++ b/src/app/openmrs-api/session.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; import { AppSettingsService } from '../app-settings/app-settings.service'; -import { Http, Response, Headers } from '@angular/http'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; // TODO inject service @Injectable() export class SessionService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public getUrl(): string { @@ -17,25 +17,20 @@ export class SessionService { public getSession(credentials: any = null) { - let headers = new Headers(); + let headers = new HttpHeaders(); if (credentials && credentials.username) { - let base64 = btoa(credentials.username + ':' + credentials.password); - - headers.append('Authorization', 'Basic ' + base64); + const base64 = btoa(credentials.username + ':' + credentials.password); + headers = headers.append('Authorization', 'Basic ' + base64); } let url = this.getUrl(); - - return this.http.get(url, { - headers: headers - }); + return this.http.get(url, {headers: headers}); } public deleteSession() { let url = this.getUrl(); - return this.http.delete(url, {}); } } diff --git a/src/app/openmrs-api/user.service.ts b/src/app/openmrs-api/user.service.ts index 617c607bd..65550fe9a 100644 --- a/src/app/openmrs-api/user.service.ts +++ b/src/app/openmrs-api/user.service.ts @@ -1,14 +1,12 @@ import {map} from 'rxjs/operators'; -// import { AppSettingsService } from './../app-settings/app-settings.service'; import { Observable } from 'rxjs'; import { Injectable } from '@angular/core'; -import { Http , Response , Headers, RequestOptions } from '@angular/http'; import { SessionStorageService } from '../utils/session-storage.service'; import { Constants } from '../utils/constants'; import { User } from '../models/user.model'; -import { URLSearchParams } from '@angular/http'; import { AppSettingsService } from '../app-settings/app-settings.service'; +import { HttpParams, HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class UserService { @@ -17,7 +15,7 @@ export class UserService { constructor( private sessionStorageService: SessionStorageService, - private _http: Http, + private _http: HttpClient, protected appSettingsService: AppSettingsService) { } public getLoggedInUser(): User { @@ -30,13 +28,10 @@ export class UserService { let baseUrl = this.getOpenMrsBaseUrl(); let url = baseUrl + 'user?v=custom:(uuid,display,person)'; - - let headers = new Headers({'Content-Type': 'application/json'}); - let options = new RequestOptions({headers: headers}); - - return this._http.get(url, options).pipe( + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this._http.get(url, {headers}).pipe( map((response) => { - return response.json().results; + return response.results; })); } public getOpenMrsBaseUrl(): string { @@ -45,17 +40,17 @@ export class UserService { } public searchUsers(searchText: string) { - let params: URLSearchParams = new URLSearchParams(); - params.set('q', searchText); - params.set('v', 'default'); + let params: HttpParams = new HttpParams() + .set('q', searchText) + .set('v', 'default'); let allCohortMembersUrl: string = this.baseOpenMrsUrl + 'user' ; - return this._http.get(allCohortMembersUrl, { - search: params + return this._http.get(allCohortMembersUrl, { + params: params }).pipe( map((response) => { - return response.json().results; + return response.results; })); } @@ -67,16 +62,13 @@ export class UserService { } let c = 'custom:(uuid,display,person)'; console.log('getUserByUuid', uuid); - let params: URLSearchParams = new URLSearchParams(); - params.set('v', c); + let params: HttpParams = new HttpParams() + .set('v', c); let userUrl: string = this.baseOpenMrsUrl + 'user/' + uuid ; - return this._http.get(userUrl, { - search: params - }).pipe( - map((response) => { - return response.json(); - })); + return this._http.get(userUrl, { + params: params + }); } } diff --git a/src/app/openmrs-api/visit-resource.service.ts b/src/app/openmrs-api/visit-resource.service.ts index 2fad7e077..3342e2421 100644 --- a/src/app/openmrs-api/visit-resource.service.ts +++ b/src/app/openmrs-api/visit-resource.service.ts @@ -1,29 +1,27 @@ import {throwError as observableThrowError, Observable } from 'rxjs'; - import {catchError, map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, URLSearchParams, Headers, RequestOptions } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; +import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http'; @Injectable() export class VisitResourceService { - constructor(private http: Http, private appSettingsService: AppSettingsService) { } + constructor(private http: HttpClient, private appSettingsService: AppSettingsService) { } public getVisitByUuid(uuid: string, searchParams): Observable { if (!uuid || !searchParams) { return null; } - const params = new URLSearchParams(); - params.set('v', searchParams.v); + const params = new HttpParams() + .set('v', searchParams.v); return this.http .get(`${this.getUrl()}/${uuid}`, { - search: params + params: params }).pipe( map(this.parseVisitResponse), - catchError(this.handleError),); + catchError(this.handleError)); } public getPatientVisits(searchParams) { @@ -36,15 +34,15 @@ export class VisitResourceService { 'provider:(uuid,display))),patient:(uuid,uuid),' + 'visitType:(uuid,name),attributes:(uuid,display,value),location:ref,startDatetime,' + 'stopDatetime)'; - const params = new URLSearchParams(); - params.set('v', searchParams.v || custom); - params.set('patient', searchParams.patientUuid); + const params = new HttpParams() + .set('v', searchParams.v || custom) + .set('patient', searchParams.patientUuid); return this.http .get(`${this.getUrl()}`, { - search: params + params: params }).pipe( map(this.parseVisitsResponse), - catchError(this.handleError),); + catchError(this.handleError)); } public getVisitTypes(searchParams) { @@ -62,22 +60,20 @@ export class VisitResourceService { if (!payload) { return null; } - const headers = new Headers({ 'Content-Type': 'application/json' }); - const options = new RequestOptions({ headers }); - return this.http.post(`${this.getUrl()}`, payload, options).pipe( + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(`${this.getUrl()}`, payload, {headers}).pipe( map(this.parseVisitResponse), - catchError(this.handleError),); + catchError(this.handleError)); } public updateVisit(uuid, payload) { if (!payload || !uuid) { return null; } - const headers = new Headers({ 'Content-Type': 'application/json' }); - const options = new RequestOptions({ headers }); - return this.http.post(`${this.getUrl()}/${uuid}`, payload, options).pipe( + const headers = new HttpHeaders({ 'Content-Type': 'application/json' }); + return this.http.post(`${this.getUrl()}/${uuid}`, payload, {headers}).pipe( map(this.parseVisitResponse), - catchError(this.handleError),); + catchError(this.handleError)); } public getVisitEncounters(uuid) { @@ -89,11 +85,11 @@ export class VisitResourceService { 'encounterProviders:(uuid,uuid,provider:(uuid,name),' + 'encounterRole:(uuid,name)),location:(uuid,name),' + 'visit:(uuid,visitType:(uuid,name))))'; - const params = new URLSearchParams(); - params.set('v', custom); + const params = new HttpParams() + .set('v', custom); return this.http .get(`${this.getUrl()}/${uuid}`, { - search: params + params: params }).pipe( map(this.parseVisitEncounters), catchError(this.handleError),); @@ -102,25 +98,25 @@ export class VisitResourceService { return this.appSettingsService.getOpenmrsRestbaseurl().trim() + 'visit'; } private parseVisitResponse(res: any): any { - const body = res.json(); + const body = res; const result: any = body; return result; } private parseVisitEncounters(res: any): any { - const body = res.json(); + const body = res; const result = body.encounters; return result; } private parseVisitTypesResponse(res: any): any { - const body = res.json(); + const body = res; const result = body.results; return result; } private parseVisitsResponse(res: any): any { - const body = res.json(); + const body = res; const result = body.results; return result; } diff --git a/src/app/patient-creation/patient-creation.component.ts b/src/app/patient-creation/patient-creation.component.ts index 702144c9c..519707d2b 100644 --- a/src/app/patient-creation/patient-creation.component.ts +++ b/src/app/patient-creation/patient-creation.component.ts @@ -523,7 +523,7 @@ export class PatientCreationComponent implements OnInit, OnDestroy { } }, (err) => { this.loaderStatus = false; - const error = err.json(); + const error = err; this.errorAlert = error.error.globalErrors[0].code; }); @@ -559,7 +559,7 @@ export class PatientCreationComponent implements OnInit, OnDestroy { } public generatePatientIdentifier() { - this.patientCreationService.generateIdentifier(this.userId).take(1).subscribe((data) => { + this.patientCreationService.generateIdentifier(this.userId).take(1).subscribe((data: any) => { this.patientIdentifier = data.identifier; this.generate = false; this.editText = true; diff --git a/src/app/patient-creation/patient-creation.service.ts b/src/app/patient-creation/patient-creation.service.ts index 9acbed7ec..468f50be6 100644 --- a/src/app/patient-creation/patient-creation.service.ts +++ b/src/app/patient-creation/patient-creation.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; import { Observable, Subject, BehaviorSubject } from 'rxjs/Rx'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; import { PatientResourceService } from '../openmrs-api/patient-resource.service'; import { PatientCreationResourceService } from '../openmrs-api/patient-creation-resource.service'; import { Patient } from '../models/patient.model'; import * as _ from 'lodash'; +import { HttpClient } from '@angular/common/http'; @Injectable() export class PatientCreationService { @@ -16,7 +16,7 @@ export class PatientCreationService { constructor(private resouceService: PatientResourceService, private patientCreationResourceService: PatientCreationResourceService, - private http: Http + private http: HttpClient ) {} public searchPatient(searchText: string, cached: boolean): Observable { diff --git a/src/app/patient-dashboard/common/clinical-notes/clinical-notes.component.ts b/src/app/patient-dashboard/common/clinical-notes/clinical-notes.component.ts index bfcf3b9e4..b374c2934 100644 --- a/src/app/patient-dashboard/common/clinical-notes/clinical-notes.component.ts +++ b/src/app/patient-dashboard/common/clinical-notes/clinical-notes.component.ts @@ -106,7 +106,7 @@ export class ClinicalNotesComponent implements OnInit, OnDestroy { this.patientUuid, startIndex, limit - ).take(1).subscribe((data) => { + ).take(1).subscribe((data:any) => { let _notes = data.notes; diff --git a/src/app/patient-dashboard/common/formentry/form-submission.service.ts b/src/app/patient-dashboard/common/formentry/form-submission.service.ts index c339f5a36..d5710c985 100644 --- a/src/app/patient-dashboard/common/formentry/form-submission.service.ts +++ b/src/app/patient-dashboard/common/formentry/form-submission.service.ts @@ -74,9 +74,9 @@ export class FormSubmissionService { catchError((res: any) => of({ hasError: true, payloadType: [payloadType], - response: res.json(), + response: res, errorMessages: this.processFormSubmissionErrors( - res.json(), payloadType, encounterPayload) + res, payloadType, encounterPayload) }))) ); } @@ -91,9 +91,9 @@ export class FormSubmissionService { catchError((res: any) => of({ hasError: true, payloadType: [payloadType], - response: res.json(), + response: res, errorMessages: this.processFormSubmissionErrors( - res.json(), payloadType, personAttrPayload) + res, payloadType, personAttrPayload) }))) ); } diff --git a/src/app/patient-dashboard/common/formentry/formentry.component.ts b/src/app/patient-dashboard/common/formentry/formentry.component.ts index ff796ee85..01bd4e4a0 100644 --- a/src/app/patient-dashboard/common/formentry/formentry.component.ts +++ b/src/app/patient-dashboard/common/formentry/formentry.component.ts @@ -1,13 +1,10 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Http, Response, ResponseContentType, Headers } from '@angular/http'; import { forkJoin , Observable, Subject, Subscription , BehaviorSubject, of } from 'rxjs'; import { flatMap, first } from 'rxjs/operators'; - import * as moment from 'moment'; -import * as _ from 'lodash'; +import * as _ from 'lodash'; import { format } from 'date-fns'; - import { AppFeatureAnalytics } from '../../../shared/app-analytics/app-feature-analytics.service'; import { DraftedFormsService } from './drafted-forms.service'; import { @@ -24,7 +21,6 @@ import { FileUploadResourceService } from '../../../etl-api/file-upload-resource import { PatientReminderResourceService } from '../../../etl-api/patient-reminder-resource.service'; import { ConfirmationService } from 'primeng/primeng'; import { FormentryHelperService } from './formentry-helper.service'; - import { UserService } from '../../../openmrs-api/user.service'; import { UserDefaultPropertiesService @@ -40,7 +36,6 @@ import { ProgramsTransferCareService } from '../../programs/transfer-care/transf import { ConceptResourceService } from '../../../openmrs-api/concept-resource.service'; import { PatientReferralService } from '../../../referral-module/services/patient-referral-service'; -import { EncounterType } from '../../../models/encounter-type.model'; import { RetrospectiveDataEntryService } from '../../../retrospective-data-entry/services/retrospective-data-entry.service'; import { PersonResourceService } from '../../../openmrs-api/person-resource.service'; diff --git a/src/app/patient-dashboard/common/forms/form-order-metadata.service.ts b/src/app/patient-dashboard/common/forms/form-order-metadata.service.ts index fe706538b..5807082c3 100644 --- a/src/app/patient-dashboard/common/forms/form-order-metadata.service.ts +++ b/src/app/patient-dashboard/common/forms/form-order-metadata.service.ts @@ -1,23 +1,20 @@ import {throwError as observableThrowError, ReplaySubject, Observable } from 'rxjs'; - -import {map} from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { Http, Response, URLSearchParams } from '@angular/http'; import * as _ from 'lodash'; - import { LocalStorageService } from '../../../utils/local-storage.service'; +import { HttpClient } from '@angular/common/http'; @Injectable() export class FormOrderMetaDataService { private formsOrder = new ReplaySubject(1); - constructor(private http: Http, private localStorageService: LocalStorageService) { } + constructor(private http: HttpClient, private localStorageService: LocalStorageService) { } public getDefaultFormOrder(forceRefresh?: boolean) { if (!this.formsOrder.observers.length || forceRefresh) { this.http.get( './assets/schemas/form-order.json' - ).pipe(map((res: Response) => res.json())) + ) .subscribe( - (data) => this.formsOrder.next(data), + (data) => {console.log(data); this.formsOrder.next(data); }, (error) => this.formsOrder.error(error) ); } diff --git a/src/app/patient-dashboard/common/lab-orders/lab-test-orders.html b/src/app/patient-dashboard/common/lab-orders/lab-test-orders.html index 92cba4ab5..45533e625 100644 --- a/src/app/patient-dashboard/common/lab-orders/lab-test-orders.html +++ b/src/app/patient-dashboard/common/lab-orders/lab-test-orders.html @@ -142,7 +142,7 @@ - +
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map.component.ts b/src/app/patient-dashboard/common/locator-map/locator-map.component.ts index c4e3aca42..34e98f588 100644 --- a/src/app/patient-dashboard/common/locator-map/locator-map.component.ts +++ b/src/app/patient-dashboard/common/locator-map/locator-map.component.ts @@ -46,7 +46,7 @@ export class LocatorMapComponent implements OnInit, OnDestroy { } public onFileChange(file) { - this.subscriptions.push(this.fileUploadResourceService.upload(file).pipe(flatMap((result) => { + this.subscriptions.push(this.fileUploadResourceService.upload(file).pipe(flatMap((result: any) => { let updatePayload = { attributes: [{ attributeType: this.attributeType, diff --git a/src/app/patient-dashboard/common/patient-identifier/edit-patient-identifier.component.ts b/src/app/patient-dashboard/common/patient-identifier/edit-patient-identifier.component.ts index ac73470a7..48979ac7c 100644 --- a/src/app/patient-dashboard/common/patient-identifier/edit-patient-identifier.component.ts +++ b/src/app/patient-dashboard/common/patient-identifier/edit-patient-identifier.component.ts @@ -252,11 +252,11 @@ export class EditPatientIdentifierComponent implements OnInit, OnDestroy { } public generatePatientIdentifier() { - this.patientCreationResourceService.generateIdentifier(this.userId).subscribe((data) => { + this.patientCreationResourceService.generateIdentifier(this.userId).subscribe((data: any) => { this.patientIdentifier = data.identifier; this.checkUniversal = false; }, ((err) => { - console.log(err.json()); + console.log(err); })); } diff --git a/src/app/patient-dashboard/general-landing-page/landing-page.component.ts b/src/app/patient-dashboard/general-landing-page/landing-page.component.ts index 8cf3a4cc7..747b3d436 100644 --- a/src/app/patient-dashboard/general-landing-page/landing-page.component.ts +++ b/src/app/patient-dashboard/general-landing-page/landing-page.component.ts @@ -182,8 +182,7 @@ export class GeneralLandingPageComponent implements OnInit, OnDestroy { this.isReferral = true; this.selectedProgram = row; this.program = { value: row.programUuid }; - this.userDefaultPropertiesService.getLocations().pipe( - map((response: Response) => response.json())).take(1).subscribe((locations: any) => { + this.userDefaultPropertiesService.getLocations().take(1).subscribe((locations: any) => { let location = _.find(locations.results, (_location: any) => { return _location.display.trim() === row.referred_from_location.trim(); }); diff --git a/src/app/patient-list-cohort/cohort-list.component.ts b/src/app/patient-list-cohort/cohort-list.component.ts index f4f9171b0..caee31dbf 100644 --- a/src/app/patient-list-cohort/cohort-list.component.ts +++ b/src/app/patient-list-cohort/cohort-list.component.ts @@ -1,6 +1,5 @@ -import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { Response } from '@angular/http'; -import { Router, ActivatedRoute, Params } from '@angular/router'; +import { Component, OnInit } from '@angular/core'; +import { Router, ActivatedRoute } from '@angular/router'; import { UserService } from '../openmrs-api/user.service'; import { CohortResourceService } from '../openmrs-api/cohort-resource.service'; import { CohortListService } from './cohort-list.service'; diff --git a/src/app/provider-dashboard/services/provider-dashboard.services.ts b/src/app/provider-dashboard/services/provider-dashboard.services.ts index 57cab2d86..a35b968a1 100644 --- a/src/app/provider-dashboard/services/provider-dashboard.services.ts +++ b/src/app/provider-dashboard/services/provider-dashboard.services.ts @@ -1,8 +1,6 @@ import { Injectable } from '@angular/core'; -import { Http, Response } from '@angular/http'; import { BehaviorSubject, Subject, ReplaySubject } from 'rxjs'; -import * as Moment from 'moment'; @Injectable() export class ProviderDashboardService { public dataIsLoading: boolean = true; diff --git a/src/app/referral-module/components/enrollment-manager/enrollment-manager.component.ts b/src/app/referral-module/components/enrollment-manager/enrollment-manager.component.ts index 07be6a3f4..9b0b6512e 100644 --- a/src/app/referral-module/components/enrollment-manager/enrollment-manager.component.ts +++ b/src/app/referral-module/components/enrollment-manager/enrollment-manager.component.ts @@ -310,8 +310,8 @@ export class EnrollmentManagerComponent implements OnInit, OnDestroy { private _filterLocationByLocationName(name) { return new Promise((resolve, reject) => { - this.userDefaultPropertiesService.getLocations().pipe( - map((response: Response) => response.json())).take(1).subscribe((locations: any) => { + this.userDefaultPropertiesService.getLocations() + .take(1).subscribe((locations: any) => { let location = _.filter(locations.results, (_location: any) => { return _location.display.trim() === name.trim(); }); diff --git a/src/app/retrospective-data-entry/components/settings/settings.component.ts b/src/app/retrospective-data-entry/components/settings/settings.component.ts index 342b6299d..2cd6ca3a1 100644 --- a/src/app/retrospective-data-entry/components/settings/settings.component.ts +++ b/src/app/retrospective-data-entry/components/settings/settings.component.ts @@ -71,9 +71,8 @@ export class RetrospectiveSettingsComponent implements OnInit, OnDestroy { } public fetchLocationOptions() { - this.propertyLocationService.getLocations().map((response: Response) => { - return response.json(); - }).take(1).subscribe((locations: any) => { + this.propertyLocationService.getLocations() + .take(1).subscribe((locations: any) => { this.locations = locations.results.map((location: any) => { if (!_.isNil(location.display)) { return this.retrospectiveDataEntryService.mappedLocation(location); diff --git a/src/app/shared/ngamrs-shared.module.ts b/src/app/shared/ngamrs-shared.module.ts index 0a74d4b51..0720ffd09 100644 --- a/src/app/shared/ngamrs-shared.module.ts +++ b/src/app/shared/ngamrs-shared.module.ts @@ -6,11 +6,10 @@ import { LaddaModule } from 'angular2-ladda'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { NgxPaginationModule } from 'ngx-pagination'; - import { SelectModule } from 'ngx-select'; - import { - MatProgressSpinnerModule, MatProgressBarModule, MatTabsModule, MatSnackBarModule, MatSlideToggleModule + MatProgressSpinnerModule, MatProgressBarModule, MatTabsModule, MatSnackBarModule, MatSlideToggleModule, MatCardModule, MatRadioModule, + MatExpansionModule, MatMenuModule, MatIconModule, MatButtonModule, MatTooltipModule } from '@angular/material'; import { CacheService } from 'ionic-cache'; import { DateTimePickerModule } from 'ngx-openmrs-formentry/dist/ngx-formentry/'; @@ -114,21 +113,25 @@ import { RetrospectiveDataEntryModule ModalModule.forRoot(), // BrowserAnimationsModule CacheModule, + MatExpansionModule, // SelectModule, NgSelectModule, MatTabsModule, MatProgressBarModule, MatProgressSpinnerModule, MatTabsModule, + MatCardModule, MatSnackBarModule, MatSlideToggleModule, FormEntryModule, RetrospectiveDataEntryModule, ConfirmDialogModule, DialogModule, - MatSnackBarModule, NgxPaginationModule + MatSnackBarModule, NgxPaginationModule, + MatRadioModule, MatMenuModule, MatIconModule, + MatExpansionModule, MatButtonModule, MatTooltipModule ], exports: [NgBusyModule, LaddaModule, NgSelectModule, DisplayErrorComponent, - RetrospectiveDataEntryModule, + RetrospectiveDataEntryModule, MatCardModule, PatientReferralContainerComponent, PatientEncounterObservationsComponent, StringToDatePipe, Ng2FilterPipe, OnlineTrackerComponent, HivProgramSnapshotComponent, BuildVersionComponent, UnenrollPatientProgramsComponent, @@ -138,7 +141,8 @@ import { RetrospectiveDataEntryModule DateSelectorComponent, PdfViewerComponent, NgxMyDatePickerModule, GeneralLandingPageComponent, OpenmrsApi, EtlApi, Ng2Bs3ModalModule, ModalModule, BsDropdownModule, TooltipModule, LocationFilterComponent, ToastComponent, Angulartics2Module, MatSnackBarModule, MatTabsModule, - MatProgressBarModule, MatProgressSpinnerModule, MatSlideToggleModule, NgxPaginationModule, CdmProgramSnapshotComponent], + MatProgressBarModule, MatProgressSpinnerModule, MatSlideToggleModule, NgxPaginationModule, MatButtonModule, + CdmProgramSnapshotComponent, MatRadioModule, FormsModule, MatMenuModule, MatIconModule, MatExpansionModule, MatTooltipModule], declarations: [ DisplayErrorComponent, StringToDatePipe, ZeroVlPipe, Ng2FilterPipe, HivProgramSnapshotComponent, GeneralLandingPageComponent, ProgramsComponent, EnrollmentManagerFormWizardComponent, diff --git a/src/app/shared/services/poc-http-interceptor.ts b/src/app/shared/services/poc-http-interceptor.ts new file mode 100644 index 000000000..6e4c39fea --- /dev/null +++ b/src/app/shared/services/poc-http-interceptor.ts @@ -0,0 +1,28 @@ +import { Injectable } from '@angular/core'; +import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent, HttpResponse, HttpErrorResponse } from '@angular/common/http'; +import { Observable, throwError as observableThrowError } from 'rxjs'; +import { Constants } from '../../utils/constants'; +import { SessionStorageService } from '../../utils/session-storage.service'; + +@Injectable() +export class PocHttpInteceptor implements HttpInterceptor { + constructor(private sessionStorageService: SessionStorageService) {} + + intercept(req: HttpRequest, next: HttpHandler): Observable> { + const credentials = this.sessionStorageService.getItem(Constants.CREDENTIALS_KEY); + let modifiedReq = req; + if (credentials) { + const authHeader = { Authorization : 'Basic ' + credentials}; + modifiedReq = req.clone({setHeaders: authHeader}); + } + return next.handle(modifiedReq).do((event: HttpEvent) => { + if (event instanceof HttpResponse) { + // do stuff with response here + } + }, (err: any) => { + if (err instanceof HttpErrorResponse) { + return observableThrowError(err); + } + }); + } +} diff --git a/src/app/user-default-properties/user-default-properties.component.ts b/src/app/user-default-properties/user-default-properties.component.ts index b89642052..b9cd4254f 100644 --- a/src/app/user-default-properties/user-default-properties.component.ts +++ b/src/app/user-default-properties/user-default-properties.component.ts @@ -1,7 +1,5 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { Response } from '@angular/http'; +import { Component, OnInit } from '@angular/core'; import { Router, ActivatedRoute, Params } from '@angular/router'; - import { UserService } from '../openmrs-api/user.service'; import { User } from '../models/user.model'; import { UserDefaultPropertiesService } from './user-default-properties.service'; @@ -56,8 +54,8 @@ export class UserDefaultPropertiesComponent implements OnInit { } }); - this.propertyLocationService.getLocations().take(1).subscribe((response: Response) => { - this.locations = response.json().results.map((location: any) => { + this.propertyLocationService.getLocations().take(1).subscribe((response) => { + this.locations = response.results.map((location: any) => { if (!_.isNil(location.display)) { return this.retrospectiveDataEntryService.mappedLocation(location); } diff --git a/src/app/user-default-properties/user-default-properties.service.mock.ts b/src/app/user-default-properties/user-default-properties.service.mock.ts index e1ea8c838..3fbb4b689 100644 --- a/src/app/user-default-properties/user-default-properties.service.mock.ts +++ b/src/app/user-default-properties/user-default-properties.service.mock.ts @@ -6,6 +6,7 @@ import { UserService } from '../openmrs-api/user.service'; import { User } from '../models/user.model'; import { LocalStorageService } from '../utils/local-storage.service'; import { Observable } from 'rxjs'; +import { HttpClient } from '@angular/common/http'; @Injectable() export class UserDefaultPropertiesMockService { @@ -14,7 +15,7 @@ export class UserDefaultPropertiesMockService { constructor(private userService: UserService , private localStorage: LocalStorageService - , private http: Http + , private http: HttpClient , private appSettingsService: AppSettingsService) { } public getLocations(): Observable { diff --git a/src/app/user-default-properties/user-default-properties.service.ts b/src/app/user-default-properties/user-default-properties.service.ts index 8759dba50..236ddf0ed 100644 --- a/src/app/user-default-properties/user-default-properties.service.ts +++ b/src/app/user-default-properties/user-default-properties.service.ts @@ -1,11 +1,10 @@ import { Injectable } from '@angular/core'; -import { Http } from '@angular/http'; - import { AppSettingsService } from '../app-settings/app-settings.service'; import { UserService } from '../openmrs-api/user.service'; import { User } from '../models/user.model'; import { LocalStorageService } from '../utils/local-storage.service'; import { Observable, BehaviorSubject } from 'rxjs'; +import { HttpClient } from '@angular/common/http'; @Injectable() export class UserDefaultPropertiesService { @@ -15,7 +14,7 @@ export class UserDefaultPropertiesService { constructor(private userService: UserService , private localStorage: LocalStorageService - , private http: Http + , private http: HttpClient , private appSettingsService: AppSettingsService) { } public getLocations(): Observable { diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json index 722c370d5..d9787ca0d 100755 --- a/src/tsconfig.app.json +++ b/src/tsconfig.app.json @@ -3,7 +3,8 @@ "compilerOptions": { "outDir": "../out-tsc/app", "module": "es2015", - "types": [] + "types": [ "node" ], + "typeRoots": [ "../node_modules/@types" ] }, "exclude": [ "src/test.ts",