From f218a432ec8383e17a358b11e1399254d0a96b86 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 16 Dec 2018 20:42:43 +0000 Subject: [PATCH 01/25] chore(package): update nightwatch to version 1.0.16 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f948da1b9f..871c744aa6 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ "lcov-result-merger": "^3.0.0", "mocha": "^5.1.1", "monk": "^6.0.6", - "nightwatch": "^0.9.21", + "nightwatch": "^1.0.16", "puppeteer": "^1.5.0", "require-again": "^2.0.0", "selenium-server": "^3.12.0", From fad59b9a8d468a864356dd6d6c0fc5f468ead29f Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 16 Dec 2018 20:42:47 +0000 Subject: [PATCH 02/25] chore(package): update lockfile package-lock.json --- package-lock.json | 508 ++++++++++++++++++++++++---------------------- 1 file changed, 265 insertions(+), 243 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6def2558b..a2ef7cd074 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4924,7 +4924,8 @@ "get-stream": { "version": "3.0.0", "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "optional": true }, "got": { "version": "8.3.2", @@ -5004,6 +5005,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", + "optional": true, "requires": { "p-finally": "^1.0.0" } @@ -5508,6 +5510,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz", "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==", + "optional": true, "requires": { "get-proxy": "^2.0.0", "isurl": "^1.0.0-alpha5", @@ -5519,6 +5522,7 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "optional": true, "requires": { "safe-buffer": "^5.0.1" } @@ -5575,9 +5579,9 @@ "dev": true }, "chai-nightwatch": { - "version": "0.1.1", - "resolved": "http://registry.npmjs.org/chai-nightwatch/-/chai-nightwatch-0.1.1.tgz", - "integrity": "sha1-HKVt52jTwIaP5/wvTTLC/olOa+k=", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/chai-nightwatch/-/chai-nightwatch-0.2.1.tgz", + "integrity": "sha512-2lprSMi72sHq2ZGyPTYUDQNsd2O4z81SicascbI4bkU54Xzk5Ofunn2CbrExADGC7jBH2D8r66X/aSEl+/agXQ==", "dev": true, "requires": { "assertion-error": "1.0.0", @@ -6643,6 +6647,7 @@ "version": "1.1.12", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "optional": true, "requires": { "ini": "^1.3.4", "proto-list": "~1.2.1" @@ -6878,7 +6883,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" } } @@ -6979,7 +6984,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -7878,6 +7883,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz", "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=", + "optional": true, "requires": { "decompress-tar": "^4.0.0", "decompress-tarbz2": "^4.0.0", @@ -7892,7 +7898,8 @@ "pify": { "version": "2.3.0", "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "optional": true } } }, @@ -7925,6 +7932,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", + "optional": true, "requires": { "decompress-tar": "^4.1.0", "file-type": "^6.1.0", @@ -7936,7 +7944,8 @@ "file-type": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", - "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==" + "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==", + "optional": true } } }, @@ -7944,6 +7953,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz", "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", + "optional": true, "requires": { "decompress-tar": "^4.1.1", "file-type": "^5.2.0", @@ -7953,7 +7963,8 @@ "file-type": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", - "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=" + "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=", + "optional": true } } }, @@ -7961,6 +7972,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=", + "optional": true, "requires": { "file-type": "^3.8.0", "get-stream": "^2.2.0", @@ -7971,12 +7983,14 @@ "file-type": { "version": "3.9.0", "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", - "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "optional": true }, "get-stream": { "version": "2.3.1", "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", + "optional": true, "requires": { "object-assign": "^4.0.1", "pinkie-promise": "^2.0.0" @@ -7985,7 +7999,8 @@ "pify": { "version": "2.3.0", "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "optional": true } } }, @@ -8435,7 +8450,8 @@ "get-stream": { "version": "3.0.0", "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "optional": true }, "got": { "version": "7.1.0", @@ -10116,6 +10132,7 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz", "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==", + "optional": true, "requires": { "mime-db": "^1.28.0" } @@ -10124,6 +10141,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz", "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==", + "optional": true, "requires": { "ext-list": "^2.0.0", "sort-keys-length": "^1.0.0" @@ -10369,6 +10387,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "optional": true, "requires": { "pend": "~1.2.0" } @@ -10970,12 +10989,14 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "optional": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -10990,17 +11011,20 @@ "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "optional": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "optional": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -11117,7 +11141,8 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "optional": true }, "ini": { "version": "1.3.5", @@ -11129,6 +11154,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -11143,6 +11169,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -11150,12 +11177,14 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "optional": true }, "minipass": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz", "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -11174,6 +11203,7 @@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "optional": true, "requires": { "minimist": "0.0.8" } @@ -11254,7 +11284,8 @@ "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "optional": true }, "object-assign": { "version": "4.1.1", @@ -11266,6 +11297,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "optional": true, "requires": { "wrappy": "1" } @@ -11387,6 +11419,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -11608,6 +11641,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz", "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==", + "optional": true, "requires": { "npm-conf": "^1.1.0" } @@ -12459,7 +12493,8 @@ "has-symbol-support-x": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", + "optional": true }, "has-symbols": { "version": "1.0.0", @@ -12470,6 +12505,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", + "optional": true, "requires": { "has-symbol-support-x": "^1.4.1" } @@ -12760,14 +12796,33 @@ } }, "http-proxy-agent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz", - "integrity": "sha1-zBzjjkU7+YSg93AtLdWcc9CBKEo=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", + "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", "dev": true, "requires": { - "agent-base": "2", - "debug": "2", - "extend": "3" + "agent-base": "4", + "debug": "3.1.0" + }, + "dependencies": { + "agent-base": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", + "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } } }, "http-proxy-middleware": { @@ -13300,9 +13355,9 @@ "integrity": "sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc=" }, "ip": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.0.1.tgz", - "integrity": "sha1-x+NWzeoiWucbNtcPLnGpK6TkJZA=", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", + "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", "dev": true }, "ip-regex": { @@ -13584,7 +13639,8 @@ "is-natural-number": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", - "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=" + "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=", + "optional": true }, "is-negated-glob": { "version": "1.0.0", @@ -13622,7 +13678,8 @@ "is-object": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=" + "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", + "optional": true }, "is-path-cwd": { "version": "1.0.0", @@ -14068,6 +14125,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", + "optional": true, "requires": { "has-to-string-tag-x": "^1.2.0", "is-object": "^1.0.1" @@ -15372,12 +15430,6 @@ "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=" }, - "lodash._stack": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/lodash._stack/-/lodash._stack-4.1.3.tgz", - "integrity": "sha1-dRqnbBuWSwR+dtFPxyoJP8teLdA=", - "dev": true - }, "lodash.assign": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", @@ -15430,26 +15482,10 @@ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" }, "lodash.defaultsdeep": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.3.2.tgz", - "integrity": "sha1-bBpYbmxWR7DmTi15gUG4g2FYvoo=", - "dev": true, - "requires": { - "lodash._baseclone": "^4.0.0", - "lodash._stack": "^4.0.0", - "lodash.isplainobject": "^4.0.0", - "lodash.keysin": "^4.0.0", - "lodash.mergewith": "^4.0.0", - "lodash.rest": "^4.0.0" - }, - "dependencies": { - "lodash._baseclone": { - "version": "4.5.7", - "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz", - "integrity": "sha1-zkKt4IOE711i+nfDD2GkbmhvhDQ=", - "dev": true - } - } + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz", + "integrity": "sha1-vsECT4WxvZbL6kBbI8FK1kQ6b4E=", + "dev": true }, "lodash.filter": { "version": "4.6.0", @@ -15536,12 +15572,6 @@ "lodash.isarray": "^3.0.0" } }, - "lodash.keysin": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-4.2.0.tgz", - "integrity": "sha1-jMP7NcLZSsxEOhhj4C+kB5nqbyg=", - "dev": true - }, "lodash.last": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/lodash.last/-/lodash.last-3.0.0.tgz", @@ -15557,6 +15587,12 @@ "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" }, + "lodash.merge": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz", + "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==", + "dev": true + }, "lodash.mergewith": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", @@ -15575,12 +15611,6 @@ "lodash.keys": "^3.0.0" } }, - "lodash.rest": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.5.tgz", - "integrity": "sha1-lU73UEkmIDjJbR/Jiyj9r58Hcqo=", - "dev": true - }, "lodash.restparam": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", @@ -16503,7 +16533,7 @@ }, "minimist": { "version": "0.0.8", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" }, "mixin-deep": { @@ -16543,7 +16573,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { "minimist": "0.0.8" @@ -16638,86 +16668,6 @@ } } }, - "mocha-nightwatch": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/mocha-nightwatch/-/mocha-nightwatch-3.2.2.tgz", - "integrity": "sha1-kby5s73gV912d8eBJeSR5Y1mZHw=", - "dev": true, - "requires": { - "browser-stdout": "1.3.0", - "commander": "2.9.0", - "debug": "2.2.0", - "diff": "1.4.0", - "escape-string-regexp": "1.0.5", - "glob": "7.0.5", - "growl": "1.9.2", - "json3": "3.3.2", - "lodash.create": "3.1.1", - "mkdirp": "0.5.1", - "supports-color": "3.1.2" - }, - "dependencies": { - "commander": { - "version": "2.9.0", - "resolved": "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", - "dev": true, - "requires": { - "graceful-readlink": ">= 1.0.0" - } - }, - "debug": { - "version": "2.2.0", - "resolved": "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "dev": true, - "requires": { - "ms": "0.7.1" - } - }, - "diff": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz", - "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=", - "dev": true - }, - "glob": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", - "integrity": "sha1-tCAqaQmbu00pKnwblbZoK2fr3JU=", - "dev": true, - "requires": { - "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" - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "ms": { - "version": "0.7.1", - "resolved": "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", - "dev": true - }, - "supports-color": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", - "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", - "dev": true, - "requires": { - "has-flag": "^1.0.0" - } - } - } - }, "modify-filename": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/modify-filename/-/modify-filename-1.1.0.tgz", @@ -17124,23 +17074,30 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, "nightwatch": { - "version": "0.9.21", - "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-0.9.21.tgz", - "integrity": "sha1-nnlKdRS0/V9GYC02jlBRUjKrnpA=", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-1.0.16.tgz", + "integrity": "sha512-nqn+349qw88dbS/PCGbrDt1+PEtNV05brZOHilUnfZZ3Txpbmuhb9Z88tiNsNKv5pKxvWorUZz+B76eXH0EuEQ==", "dev": true, "requires": { - "chai-nightwatch": "~0.1.x", - "ejs": "2.5.7", - "lodash.clone": "3.0.3", - "lodash.defaultsdeep": "4.3.2", + "assertion-error": "^1.1.0", + "chai-nightwatch": "0.2.1", + "ejs": "^2.5.9", + "lodash.clone": "^3.0.3", + "lodash.defaultsdeep": "^4.6.0", + "lodash.merge": "^4.6.1", "minimatch": "3.0.3", "mkpath": "1.0.0", - "mocha-nightwatch": "3.2.2", - "optimist": "0.6.1", - "proxy-agent": "2.0.0", - "q": "1.4.1" + "mocha": "^5.1.1", + "optimist": "^0.6.1", + "proxy-agent": "^3.0.0" }, "dependencies": { + "ejs": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz", + "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==", + "dev": true + }, "minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", @@ -17149,12 +17106,6 @@ "requires": { "brace-expansion": "^1.0.0" } - }, - "q": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", - "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=", - "dev": true } } }, @@ -17859,6 +17810,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", + "optional": true, "requires": { "config-chain": "^1.1.11", "pify": "^3.0.0" @@ -18373,7 +18325,7 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "os-locale": { @@ -18386,7 +18338,7 @@ }, "os-tmpdir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, "osenv": { @@ -18468,6 +18420,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", + "optional": true, "requires": { "p-finally": "^1.0.0" } @@ -18478,41 +18431,68 @@ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" }, "pac-proxy-agent": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz", - "integrity": "sha512-QBELCWyLYPgE2Gj+4wUEiMscHrQ8nRPBzYItQNOHWavwBt25ohZHQC4qnd5IszdVVrFbLsQ+dPkm6eqdjJAmwQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz", + "integrity": "sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==", "dev": true, "requires": { - "agent-base": "2", - "debug": "2", - "extend": "3", - "get-uri": "2", - "http-proxy-agent": "1", - "https-proxy-agent": "1", - "pac-resolver": "~2.0.0", - "raw-body": "2", - "socks-proxy-agent": "2" + "agent-base": "^4.2.0", + "debug": "^3.1.0", + "get-uri": "^2.0.0", + "http-proxy-agent": "^2.1.0", + "https-proxy-agent": "^2.2.1", + "pac-resolver": "^3.0.0", + "raw-body": "^2.2.0", + "socks-proxy-agent": "^4.0.1" + }, + "dependencies": { + "agent-base": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", + "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } + }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "https-proxy-agent": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz", + "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==", + "dev": true, + "requires": { + "agent-base": "^4.1.0", + "debug": "^3.1.0" + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + } } }, "pac-resolver": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-2.0.0.tgz", - "integrity": "sha1-mbiNLxk/ve78HJpSnB8yYKtSd80=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz", + "integrity": "sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==", "dev": true, "requires": { - "co": "~3.0.6", - "degenerator": "~1.0.2", - "ip": "1.0.1", - "netmask": "~1.0.4", - "thunkify": "~2.1.1" - }, - "dependencies": { - "co": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/co/-/co-3.0.6.tgz", - "integrity": "sha1-FEXyJsXrlWE45oyawwFn6n0ua9o=", - "dev": true - } + "co": "^4.6.0", + "degenerator": "^1.0.4", + "ip": "^1.1.5", + "netmask": "^1.0.6", + "thunkify": "^2.1.2" } }, "package-json": { @@ -18881,7 +18861,7 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-is-inside": { @@ -21218,7 +21198,8 @@ "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", + "optional": true }, "protocolify": { "version": "2.0.0", @@ -21239,25 +21220,53 @@ } }, "proxy-agent": { - "version": "2.0.0", - "resolved": "http://registry.npmjs.org/proxy-agent/-/proxy-agent-2.0.0.tgz", - "integrity": "sha1-V+tTR6qAXXTsaByyVknbo5yTNJk=", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.3.tgz", + "integrity": "sha512-PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA==", "dev": true, "requires": { - "agent-base": "2", - "debug": "2", - "extend": "3", - "http-proxy-agent": "1", - "https-proxy-agent": "1", - "lru-cache": "~2.6.5", - "pac-proxy-agent": "1", - "socks-proxy-agent": "2" + "agent-base": "^4.2.0", + "debug": "^3.1.0", + "http-proxy-agent": "^2.1.0", + "https-proxy-agent": "^2.2.1", + "lru-cache": "^4.1.2", + "pac-proxy-agent": "^3.0.0", + "proxy-from-env": "^1.0.0", + "socks-proxy-agent": "^4.0.1" }, "dependencies": { - "lru-cache": { - "version": "2.6.5", - "resolved": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz", - "integrity": "sha1-5W1jVBSO3o13B7WNFDIg/QjfD9U=", + "agent-base": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", + "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } + }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "https-proxy-agent": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz", + "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==", + "dev": true, + "requires": { + "agent-base": "^4.1.0", + "debug": "^3.1.0" + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true } } @@ -21958,7 +21967,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "~1.0.0", @@ -22861,6 +22870,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", + "optional": true, "requires": { "commander": "~2.8.1" }, @@ -22869,6 +22879,7 @@ "version": "2.8.1", "resolved": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz", "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "optional": true, "requires": { "graceful-readlink": ">= 1.0.0" } @@ -23165,9 +23176,9 @@ "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=" }, "smart-buffer": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz", - "integrity": "sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.1.tgz", + "integrity": "sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==", "dev": true }, "smartbanner.js": { @@ -23378,32 +23389,34 @@ } }, "socks": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz", - "integrity": "sha1-W4t/x8jzQcU+0FbpKbe/Tei6e1o=", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.2.2.tgz", + "integrity": "sha512-g6wjBnnMOZpE0ym6e0uHSddz9p3a+WsBaaYQaBaSCJYvrC4IXykQR9MNGjLQf38e9iIIhp3b1/Zk8YZI3KGJ0Q==", "dev": true, "requires": { - "ip": "^1.1.4", - "smart-buffer": "^1.0.13" - }, - "dependencies": { - "ip": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", - "dev": true - } + "ip": "^1.1.5", + "smart-buffer": "^4.0.1" } }, "socks-proxy-agent": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz", - "integrity": "sha512-sFtmYqdUK5dAMh85H0LEVFUCO7OhJJe1/z2x/Z6mxp3s7/QPf1RkZmpZy+BpuU0bEjcV9npqKjq9Y3kwFUjnxw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz", + "integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==", "dev": true, "requires": { - "agent-base": "2", - "extend": "3", - "socks": "~1.1.5" + "agent-base": "~4.2.0", + "socks": "~2.2.0" + }, + "dependencies": { + "agent-base": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", + "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } + } } }, "sort-keys": { @@ -23418,6 +23431,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz", "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=", + "optional": true, "requires": { "sort-keys": "^1.0.0" } @@ -23951,7 +23965,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" @@ -23969,7 +23983,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { "ansi-regex": "^2.0.0" @@ -24015,6 +24029,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz", "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", + "optional": true, "requires": { "is-natural-number": "^4.0.1" } @@ -24411,12 +24426,14 @@ "temp-dir": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", - "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=" + "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=", + "optional": true }, "tempfile": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz", "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=", + "optional": true, "requires": { "temp-dir": "^1.0.0", "uuid": "^3.0.1" @@ -25256,6 +25273,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.1.tgz", "integrity": "sha512-fIZnvdjblYs7Cru/xC6tCPVhz7JkYcVQQkePwMLyQELzYTds2Xn8QefPVnvdVhhZqubxNA1cASXEH5wcK0Bucw==", + "optional": true, "requires": { "buffer": "^3.0.1", "through": "^2.3.6" @@ -25264,12 +25282,14 @@ "base64-js": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", - "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=" + "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=", + "optional": true }, "buffer": { "version": "3.6.0", "resolved": "http://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz", "integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=", + "optional": true, "requires": { "base64-js": "0.0.8", "ieee754": "^1.1.4", @@ -25807,7 +25827,8 @@ "url-to-options": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", - "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=" + "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", + "optional": true }, "url2": { "version": "1.0.4", @@ -27019,6 +27040,7 @@ "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "optional": true, "requires": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" From c47874843623b44ae6877737d770ce8a063aec90 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 8 Jan 2019 11:19:52 +0000 Subject: [PATCH 03/25] fix(package): update image-size to version 0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a6669c531..a400b59ca0 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "habitica-markdown": "^1.3.0", "hellojs": "^1.15.1", "html-webpack-plugin": "^3.2.0", - "image-size": "^0.6.2", + "image-size": "^0.7.0", "in-app-purchase": "^1.10.2", "intro.js": "^2.9.3", "jquery": ">=3.0.0", From ee09c76c085e85447e8e7640d7b68d873c48cb9b Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 8 Jan 2019 11:19:57 +0000 Subject: [PATCH 04/25] chore(package): update lockfile package-lock.json --- package-lock.json | 121 +++++++++++++++++++++++++++++++++------------- 1 file changed, 87 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index e5c0d05db1..81f9a39aca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4924,7 +4924,8 @@ "get-stream": { "version": "3.0.0", "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "optional": true }, "got": { "version": "8.3.2", @@ -5004,6 +5005,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", + "optional": true, "requires": { "p-finally": "^1.0.0" } @@ -5508,6 +5510,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz", "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==", + "optional": true, "requires": { "get-proxy": "^2.0.0", "isurl": "^1.0.0-alpha5", @@ -5519,6 +5522,7 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "optional": true, "requires": { "safe-buffer": "^5.0.1" } @@ -6643,6 +6647,7 @@ "version": "1.1.12", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "optional": true, "requires": { "ini": "^1.3.4", "proto-list": "~1.2.1" @@ -6878,7 +6883,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" } } @@ -6979,7 +6984,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -7878,6 +7883,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz", "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=", + "optional": true, "requires": { "decompress-tar": "^4.0.0", "decompress-tarbz2": "^4.0.0", @@ -7892,7 +7898,8 @@ "pify": { "version": "2.3.0", "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "optional": true } } }, @@ -7925,6 +7932,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", + "optional": true, "requires": { "decompress-tar": "^4.1.0", "file-type": "^6.1.0", @@ -7936,7 +7944,8 @@ "file-type": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", - "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==" + "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==", + "optional": true } } }, @@ -7944,6 +7953,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz", "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", + "optional": true, "requires": { "decompress-tar": "^4.1.1", "file-type": "^5.2.0", @@ -7953,7 +7963,8 @@ "file-type": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", - "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=" + "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=", + "optional": true } } }, @@ -7961,6 +7972,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=", + "optional": true, "requires": { "file-type": "^3.8.0", "get-stream": "^2.2.0", @@ -7971,12 +7983,14 @@ "file-type": { "version": "3.9.0", "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", - "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "optional": true }, "get-stream": { "version": "2.3.1", "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", + "optional": true, "requires": { "object-assign": "^4.0.1", "pinkie-promise": "^2.0.0" @@ -7985,7 +7999,8 @@ "pify": { "version": "2.3.0", "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "optional": true } } }, @@ -8435,7 +8450,8 @@ "get-stream": { "version": "3.0.0", "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "optional": true }, "got": { "version": "7.1.0", @@ -10116,6 +10132,7 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz", "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==", + "optional": true, "requires": { "mime-db": "^1.28.0" } @@ -10124,6 +10141,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz", "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==", + "optional": true, "requires": { "ext-list": "^2.0.0", "sort-keys-length": "^1.0.0" @@ -10369,6 +10387,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "optional": true, "requires": { "pend": "~1.2.0" } @@ -10970,12 +10989,14 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "optional": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -10990,17 +11011,20 @@ "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "optional": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "optional": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -11117,7 +11141,8 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "optional": true }, "ini": { "version": "1.3.5", @@ -11129,6 +11154,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -11143,6 +11169,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -11150,12 +11177,14 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "optional": true }, "minipass": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz", "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -11174,6 +11203,7 @@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "optional": true, "requires": { "minimist": "0.0.8" } @@ -11254,7 +11284,8 @@ "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "optional": true }, "object-assign": { "version": "4.1.1", @@ -11266,6 +11297,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "optional": true, "requires": { "wrappy": "1" } @@ -11387,6 +11419,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -11608,6 +11641,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz", "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==", + "optional": true, "requires": { "npm-conf": "^1.1.0" } @@ -12459,7 +12493,8 @@ "has-symbol-support-x": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", + "optional": true }, "has-symbols": { "version": "1.0.0", @@ -12470,6 +12505,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", + "optional": true, "requires": { "has-symbol-support-x": "^1.4.1" } @@ -12862,9 +12898,9 @@ "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=" }, "image-size": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.6.3.tgz", - "integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA==" + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.7.0.tgz", + "integrity": "sha512-oWhJUMBxKQhmdSUPw+bcU+JC9pUMBbLnDPIZCFxZWGajV2HCRA5n+fHCCT3qDPGbGVEwP2cYTP2efsSk8j0YKA==" }, "imagemin": { "version": "6.0.0", @@ -13584,7 +13620,8 @@ "is-natural-number": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", - "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=" + "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=", + "optional": true }, "is-negated-glob": { "version": "1.0.0", @@ -13622,7 +13659,8 @@ "is-object": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=" + "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", + "optional": true }, "is-path-cwd": { "version": "1.0.0", @@ -14068,6 +14106,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", + "optional": true, "requires": { "has-to-string-tag-x": "^1.2.0", "is-object": "^1.0.1" @@ -16503,7 +16542,7 @@ }, "minimist": { "version": "0.0.8", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" }, "mixin-deep": { @@ -16543,7 +16582,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { "minimist": "0.0.8" @@ -17859,6 +17898,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", + "optional": true, "requires": { "config-chain": "^1.1.11", "pify": "^3.0.0" @@ -18373,7 +18413,7 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "os-locale": { @@ -18386,7 +18426,7 @@ }, "os-tmpdir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, "osenv": { @@ -18468,6 +18508,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", + "optional": true, "requires": { "p-finally": "^1.0.0" } @@ -18881,7 +18922,7 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-is-inside": { @@ -21218,7 +21259,8 @@ "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", + "optional": true }, "protocolify": { "version": "2.0.0", @@ -21958,7 +22000,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "~1.0.0", @@ -22861,6 +22903,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", + "optional": true, "requires": { "commander": "~2.8.1" }, @@ -22869,6 +22912,7 @@ "version": "2.8.1", "resolved": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz", "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "optional": true, "requires": { "graceful-readlink": ">= 1.0.0" } @@ -23418,6 +23462,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz", "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=", + "optional": true, "requires": { "sort-keys": "^1.0.0" } @@ -23951,7 +23996,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" @@ -23969,7 +24014,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { "ansi-regex": "^2.0.0" @@ -24015,6 +24060,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz", "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", + "optional": true, "requires": { "is-natural-number": "^4.0.1" } @@ -24411,12 +24457,14 @@ "temp-dir": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", - "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=" + "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=", + "optional": true }, "tempfile": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz", "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=", + "optional": true, "requires": { "temp-dir": "^1.0.0", "uuid": "^3.0.1" @@ -25256,6 +25304,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.1.tgz", "integrity": "sha512-fIZnvdjblYs7Cru/xC6tCPVhz7JkYcVQQkePwMLyQELzYTds2Xn8QefPVnvdVhhZqubxNA1cASXEH5wcK0Bucw==", + "optional": true, "requires": { "buffer": "^3.0.1", "through": "^2.3.6" @@ -25264,12 +25313,14 @@ "base64-js": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", - "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=" + "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=", + "optional": true }, "buffer": { "version": "3.6.0", "resolved": "http://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz", "integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=", + "optional": true, "requires": { "base64-js": "0.0.8", "ieee754": "^1.1.4", @@ -25807,7 +25858,8 @@ "url-to-options": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", - "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=" + "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", + "optional": true }, "url2": { "version": "1.0.4", @@ -27019,6 +27071,7 @@ "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "optional": true, "requires": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" From 446154b97fb158ce3e32a2043c3b63b895734ef3 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 18 Feb 2019 15:44:58 +0000 Subject: [PATCH 05/25] chore(package): update sinon to version 7.2.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ce7f2005f9..8ce9ccaad6 100644 --- a/package.json +++ b/package.json @@ -184,7 +184,7 @@ "puppeteer": "^1.5.0", "require-again": "^2.0.0", "selenium-server": "^3.12.0", - "sinon": "^6.3.5", + "sinon": "^7.2.4", "sinon-chai": "^3.0.0", "sinon-stub-promise": "^4.0.0", "webpack-bundle-analyzer": "^2.12.0", From e956bbdf79df12333115dc05334e39ba0d5032da Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 18 Feb 2019 15:45:04 +0000 Subject: [PATCH 06/25] chore(package): update lockfile package-lock.json --- package-lock.json | 161 +++++++++++++++++++++++++++++++++------------- 1 file changed, 115 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index 86bf9d4c3d..8b768d5aba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -187,9 +187,20 @@ } }, "@sinonjs/samsam": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-2.1.3.tgz", - "integrity": "sha512-8zNeBkSKhU9a5cRNbpCKau2WWPfan+Q2zDlcXvXyhn9EsMqgYs4qzo0XHNVlXC6ABQL8fT6nV+zzo5RTHJzyXw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.1.1.tgz", + "integrity": "sha512-ILlwvQUwAiaVBzr3qz8oT1moM7AIUHqUc2UmEjQcH9lLe+E+BZPwUMuc9FFojMswRK4r96x5zDTTrowMLw/vuA==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.0.2", + "array-from": "^2.1.1", + "lodash": "^4.17.11" + } + }, + "@sinonjs/text-encoding": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", + "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", "dev": true }, "@slack/client": { @@ -568,6 +579,12 @@ "lodash": "^4.17.4", "query-string": "5", "ua-parser-js": "github:amplitude/ua-parser-js#ed538f16f5c6ecd8357da989b617d4f156dcf35d" + }, + "dependencies": { + "ua-parser-js": { + "version": "github:amplitude/ua-parser-js#ed538f16f5c6ecd8357da989b617d4f156dcf35d", + "from": "github:amplitude/ua-parser-js#ed538f16f5c6ecd8357da989b617d4f156dcf35d" + } } }, "ansi-align": { @@ -1066,6 +1083,12 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, + "array-from": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", + "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", + "dev": true + }, "array-initial": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz", @@ -4878,7 +4901,8 @@ "get-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "optional": true }, "got": { "version": "8.3.2", @@ -4958,6 +4982,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", + "optional": true, "requires": { "p-finally": "^1.0.0" } @@ -5451,6 +5476,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz", "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==", + "optional": true, "requires": { "get-proxy": "^2.0.0", "isurl": "^1.0.0-alpha5", @@ -5462,6 +5488,7 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "optional": true, "requires": { "safe-buffer": "^5.0.1" } @@ -6592,6 +6619,7 @@ "version": "1.1.12", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "optional": true, "requires": { "ini": "^1.3.4", "proto-list": "~1.2.1" @@ -7827,6 +7855,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz", "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=", + "optional": true, "requires": { "decompress-tar": "^4.0.0", "decompress-tarbz2": "^4.0.0", @@ -7841,7 +7870,8 @@ "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "optional": true } } }, @@ -7874,6 +7904,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", + "optional": true, "requires": { "decompress-tar": "^4.1.0", "file-type": "^6.1.0", @@ -7885,7 +7916,8 @@ "file-type": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", - "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==" + "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==", + "optional": true } } }, @@ -7893,6 +7925,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz", "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", + "optional": true, "requires": { "decompress-tar": "^4.1.1", "file-type": "^5.2.0", @@ -7902,7 +7935,8 @@ "file-type": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", - "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=" + "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=", + "optional": true } } }, @@ -7910,6 +7944,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=", + "optional": true, "requires": { "file-type": "^3.8.0", "get-stream": "^2.2.0", @@ -7920,12 +7955,14 @@ "file-type": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", - "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "optional": true }, "get-stream": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", + "optional": true, "requires": { "object-assign": "^4.0.1", "pinkie-promise": "^2.0.0" @@ -7934,7 +7971,8 @@ "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "optional": true } } }, @@ -8377,7 +8415,8 @@ "get-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "optional": true }, "got": { "version": "7.1.0", @@ -10061,6 +10100,7 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz", "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==", + "optional": true, "requires": { "mime-db": "^1.28.0" } @@ -10069,6 +10109,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz", "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==", + "optional": true, "requires": { "ext-list": "^2.0.0", "sort-keys-length": "^1.0.0" @@ -10314,6 +10355,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "optional": true, "requires": { "pend": "~1.2.0" } @@ -10915,11 +10957,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -10932,15 +10976,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -11043,7 +11090,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -11053,6 +11101,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -11065,17 +11114,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -11092,6 +11144,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -11164,7 +11217,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -11174,6 +11228,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -11279,6 +11334,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -11492,6 +11548,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz", "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==", + "optional": true, "requires": { "npm-conf": "^1.1.0" } @@ -12372,7 +12429,8 @@ "has-symbol-support-x": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", + "optional": true }, "has-symbols": { "version": "1.0.0", @@ -12383,6 +12441,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", + "optional": true, "requires": { "has-symbol-support-x": "^1.4.1" } @@ -13486,7 +13545,8 @@ "is-natural-number": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", - "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=" + "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=", + "optional": true }, "is-negated-glob": { "version": "1.0.0", @@ -13524,7 +13584,8 @@ "is-object": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=" + "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", + "optional": true }, "is-path-cwd": { "version": "1.0.0", @@ -13970,6 +14031,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", + "optional": true, "requires": { "has-to-string-tag-x": "^1.2.0", "is-object": "^1.0.1" @@ -17061,16 +17123,16 @@ } }, "nise": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.8.tgz", - "integrity": "sha512-kGASVhuL4tlAV0tvA34yJYZIVihrUt/5bDwpp4tTluigxUr2bBlJeDXmivb6NuEdFkqvdv/Ybb9dm16PSKUhtw==", + "version": "1.4.10", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.10.tgz", + "integrity": "sha512-sa0RRbj53dovjc7wombHmVli9ZihXbXCQ2uH3TNm03DyvOSIQbxg+pbqDKrk2oxMK1rtLGVlKxcB9rrc6X5YjA==", "dev": true, "requires": { "@sinonjs/formatio": "^3.1.0", + "@sinonjs/text-encoding": "^0.7.1", "just-extend": "^4.0.2", "lolex": "^2.3.2", - "path-to-regexp": "^1.7.0", - "text-encoding": "^0.6.4" + "path-to-regexp": "^1.7.0" }, "dependencies": { "isarray": { @@ -17777,6 +17839,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", + "optional": true, "requires": { "config-chain": "^1.1.11", "pify": "^3.0.0" @@ -18386,6 +18449,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", + "optional": true, "requires": { "p-finally": "^1.0.0" } @@ -21137,7 +21201,8 @@ "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", + "optional": true }, "protocolify": { "version": "2.0.0", @@ -22782,6 +22847,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", + "optional": true, "requires": { "commander": "~2.8.1" }, @@ -22790,6 +22856,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "optional": true, "requires": { "graceful-readlink": ">= 1.0.0" } @@ -23015,20 +23082,18 @@ } }, "sinon": { - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-6.3.5.tgz", - "integrity": "sha512-xgoZ2gKjyVRcF08RrIQc+srnSyY1JDJtxu3Nsz07j1ffjgXoY6uPLf/qja6nDBZgzYYEovVkFryw2+KiZz11xQ==", + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.2.4.tgz", + "integrity": "sha512-FGlcfrkiBRfaEIKRw8s/9mk4nP4AMGswvKFixLo+AzsOhskjaBCHAHGLMd8pCJpQGS+9ZI71px6qoQUyvADeyA==", "dev": true, "requires": { - "@sinonjs/commons": "^1.0.2", - "@sinonjs/formatio": "^3.0.0", - "@sinonjs/samsam": "^2.1.2", + "@sinonjs/commons": "^1.3.0", + "@sinonjs/formatio": "^3.1.0", + "@sinonjs/samsam": "^3.1.1", "diff": "^3.5.0", - "lodash.get": "^4.4.2", - "lolex": "^2.7.5", - "nise": "^1.4.5", - "supports-color": "^5.5.0", - "type-detect": "^4.0.8" + "lolex": "^3.1.0", + "nise": "^1.4.10", + "supports-color": "^5.5.0" }, "dependencies": { "diff": { @@ -23038,9 +23103,9 @@ "dev": true }, "lolex": { - "version": "2.7.5", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz", - "integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-3.1.0.tgz", + "integrity": "sha512-zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw==", "dev": true }, "supports-color": { @@ -23339,6 +23404,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz", "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=", + "optional": true, "requires": { "sort-keys": "^1.0.0" } @@ -23936,6 +24002,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz", "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", + "optional": true, "requires": { "is-natural-number": "^4.0.1" } @@ -24351,12 +24418,14 @@ "temp-dir": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", - "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=" + "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=", + "optional": true }, "tempfile": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz", "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=", + "optional": true, "requires": { "temp-dir": "^1.0.0", "uuid": "^3.0.1" @@ -25097,10 +25166,6 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, - "ua-parser-js": { - "version": "github:amplitude/ua-parser-js#ed538f16f5c6ecd8357da989b617d4f156dcf35d", - "from": "github:amplitude/ua-parser-js#ed538f1" - }, "uc.micro": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", @@ -25200,6 +25265,7 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz", "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==", + "optional": true, "requires": { "buffer": "^5.2.1", "through": "^2.3.8" @@ -25209,6 +25275,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz", "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==", + "optional": true, "requires": { "base64-js": "^1.0.2", "ieee754": "^1.1.4" @@ -25749,7 +25816,8 @@ "url-to-options": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", - "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=" + "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", + "optional": true }, "url2": { "version": "1.0.4", @@ -26961,6 +27029,7 @@ "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "optional": true, "requires": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" From ef4d761e0c5003e697e56e5d254a8505630d4ccc Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 28 Feb 2019 17:23:04 +0000 Subject: [PATCH 07/25] chore(package): update karma to version 4.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e84cdce9fd..9f4a2e9b8a 100644 --- a/package.json +++ b/package.json @@ -166,7 +166,7 @@ "expect.js": "^0.3.1", "http-proxy-middleware": "^0.19.0", "istanbul": "^1.1.0-alpha.1", - "karma": "^3.1.3", + "karma": "^4.0.1", "karma-babel-preprocessor": "^7.0.0", "karma-chai-plugins": "^0.9.0", "karma-chrome-launcher": "^2.2.0", From 4004887ddd7ebfc8dfd47457c7b4cd6be476c9ae Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 28 Feb 2019 17:23:10 +0000 Subject: [PATCH 08/25] chore(package): update lockfile package-lock.json --- package-lock.json | 216 ++++++++++++++++++++++------------------------ 1 file changed, 103 insertions(+), 113 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8d133aec65..2d9022032a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5021,7 +5021,8 @@ "get-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "optional": true }, "got": { "version": "8.3.2", @@ -5101,6 +5102,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", + "optional": true, "requires": { "p-finally": "^1.0.0" } @@ -5597,6 +5599,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz", "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==", + "optional": true, "requires": { "get-proxy": "^2.0.0", "isurl": "^1.0.0-alpha5", @@ -5608,6 +5611,7 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "optional": true, "requires": { "safe-buffer": "^5.0.1" } @@ -6303,15 +6307,6 @@ "text-hex": "1.0.x" } }, - "combine-lists": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz", - "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", - "dev": true, - "requires": { - "lodash": "^4.5.0" - } - }, "combined-stream": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", @@ -6740,6 +6735,7 @@ "version": "1.1.12", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "optional": true, "requires": { "ini": "^1.3.4", "proto-list": "~1.2.1" @@ -7979,9 +7975,9 @@ "integrity": "sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo=" }, "date-format": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz", - "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz", + "integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==", "dev": true }, "date-now": { @@ -8031,6 +8027,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz", "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=", + "optional": true, "requires": { "decompress-tar": "^4.0.0", "decompress-tarbz2": "^4.0.0", @@ -8045,7 +8042,8 @@ "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "optional": true } } }, @@ -8078,6 +8076,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", + "optional": true, "requires": { "decompress-tar": "^4.1.0", "file-type": "^6.1.0", @@ -8089,7 +8088,8 @@ "file-type": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", - "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==" + "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==", + "optional": true } } }, @@ -8097,6 +8097,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz", "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", + "optional": true, "requires": { "decompress-tar": "^4.1.1", "file-type": "^5.2.0", @@ -8106,7 +8107,8 @@ "file-type": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", - "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=" + "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=", + "optional": true } } }, @@ -8114,6 +8116,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=", + "optional": true, "requires": { "file-type": "^3.8.0", "get-stream": "^2.2.0", @@ -8124,12 +8127,14 @@ "file-type": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", - "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "optional": true }, "get-stream": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", + "optional": true, "requires": { "object-assign": "^4.0.1", "pinkie-promise": "^2.0.0" @@ -8138,7 +8143,8 @@ "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "optional": true } } }, @@ -8581,7 +8587,8 @@ "get-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "optional": true }, "got": { "version": "7.1.0", @@ -9934,62 +9941,6 @@ } } }, - "expand-braces": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", - "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", - "dev": true, - "requires": { - "array-slice": "^0.2.3", - "array-unique": "^0.2.1", - "braces": "^0.1.2" - }, - "dependencies": { - "array-slice": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", - "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", - "dev": true - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "braces": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz", - "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", - "dev": true, - "requires": { - "expand-range": "^0.1.0" - } - }, - "expand-range": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz", - "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", - "dev": true, - "requires": { - "is-number": "^0.1.1", - "repeat-string": "^0.2.2" - } - }, - "is-number": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz", - "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=", - "dev": true - }, - "repeat-string": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz", - "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=", - "dev": true - } - } - }, "expand-brackets": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", @@ -10273,6 +10224,7 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz", "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==", + "optional": true, "requires": { "mime-db": "^1.28.0" } @@ -10281,6 +10233,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz", "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==", + "optional": true, "requires": { "ext-list": "^2.0.0", "sort-keys-length": "^1.0.0" @@ -10532,6 +10485,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "optional": true, "requires": { "pend": "~1.2.0" } @@ -11133,11 +11087,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -11150,15 +11106,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -11261,7 +11220,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -11271,6 +11231,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -11283,17 +11244,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -11310,6 +11274,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -11382,7 +11347,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -11392,6 +11358,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -11497,6 +11464,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -11762,6 +11730,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz", "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==", + "optional": true, "requires": { "npm-conf": "^1.1.0" } @@ -12748,7 +12717,8 @@ "has-symbol-support-x": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", + "optional": true }, "has-symbols": { "version": "1.0.0", @@ -12759,6 +12729,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", + "optional": true, "requires": { "has-symbol-support-x": "^1.4.1" } @@ -13874,7 +13845,8 @@ "is-natural-number": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", - "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=" + "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=", + "optional": true }, "is-negated-glob": { "version": "1.0.0", @@ -13912,7 +13884,8 @@ "is-object": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=" + "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", + "optional": true }, "is-path-cwd": { "version": "1.0.0", @@ -14358,6 +14331,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", + "optional": true, "requires": { "has-to-string-tag-x": "^1.2.0", "is-object": "^1.0.1" @@ -14588,28 +14562,27 @@ "integrity": "sha512-6hHxsp9e6zQU8nXsP+02HGWXwTkOEw6IROhF2ZA28cYbUk4eJ6QbtZvdqZOdD9YPKghG3apk5eOCvs+tLl3lRg==" }, "karma": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/karma/-/karma-3.1.4.tgz", - "integrity": "sha512-31Vo8Qr5glN+dZEVIpnPCxEGleqE0EY6CtC2X9TagRV3rRQ3SNrvfhddICkJgUK3AgqpeKSZau03QumTGhGoSw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/karma/-/karma-4.0.1.tgz", + "integrity": "sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==", "dev": true, "requires": { "bluebird": "^3.3.0", "body-parser": "^1.16.1", + "braces": "^2.3.2", "chokidar": "^2.0.3", "colors": "^1.1.0", - "combine-lists": "^1.0.0", "connect": "^3.6.0", "core-js": "^2.2.0", "di": "^0.0.1", "dom-serialize": "^2.2.0", - "expand-braces": "^0.1.1", "flatted": "^2.0.0", "glob": "^7.1.1", "graceful-fs": "^4.1.2", "http-proxy": "^1.13.0", "isbinaryfile": "^3.0.0", - "lodash": "^4.17.5", - "log4js": "^3.0.0", + "lodash": "^4.17.11", + "log4js": "^4.0.0", "mime": "^2.3.1", "minimatch": "^3.0.2", "optimist": "^0.6.1", @@ -16001,24 +15974,18 @@ } }, "log4js": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz", - "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.0.2.tgz", + "integrity": "sha512-KE7HjiieVDPPdveA3bJZSuu0n8chMkFl8mIoisBFxwEJ9FmXe4YzNuiqSwYUiR1K8q8/5/8Yd6AClENY1RA9ww==", "dev": true, "requires": { - "circular-json": "^0.5.5", - "date-format": "^1.2.0", + "date-format": "^2.0.0", "debug": "^3.1.0", + "flatted": "^2.0.0", "rfdc": "^1.1.2", - "streamroller": "0.7.0" + "streamroller": "^1.0.1" }, "dependencies": { - "circular-json": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz", - "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==", - "dev": true - }, "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", @@ -18170,6 +18137,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", + "optional": true, "requires": { "config-chain": "^1.1.11", "pify": "^3.0.0" @@ -18723,6 +18691,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", + "optional": true, "requires": { "p-finally": "^1.0.0" } @@ -21474,7 +21443,8 @@ "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", + "optional": true }, "protocolify": { "version": "2.0.0", @@ -23138,6 +23108,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", + "optional": true, "requires": { "commander": "~2.8.1" }, @@ -23146,6 +23117,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "optional": true, "requires": { "graceful-readlink": ">= 1.0.0" } @@ -23700,6 +23672,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz", "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=", + "optional": true, "requires": { "sort-keys": "^1.0.0" } @@ -24182,17 +24155,27 @@ "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" }, "streamroller": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz", - "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.3.tgz", + "integrity": "sha512-P7z9NwP51EltdZ81otaGAN3ob+/F88USJE546joNq7bqRNTe6jc74fTBDyynxP4qpIfKlt/CesEYicuMzI0yJg==", "dev": true, "requires": { - "date-format": "^1.2.0", + "async": "^2.6.1", + "date-format": "^2.0.0", "debug": "^3.1.0", - "mkdirp": "^0.5.1", - "readable-stream": "^2.3.0" + "fs-extra": "^7.0.0", + "lodash": "^4.17.10" }, "dependencies": { + "async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", + "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", + "dev": true, + "requires": { + "lodash": "^4.17.11" + } + }, "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", @@ -24305,6 +24288,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz", "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", + "optional": true, "requires": { "is-natural-number": "^4.0.1" } @@ -24762,12 +24746,14 @@ "temp-dir": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", - "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=" + "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=", + "optional": true }, "tempfile": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz", "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=", + "optional": true, "requires": { "temp-dir": "^1.0.0", "uuid": "^3.0.1" @@ -25607,6 +25593,7 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz", "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==", + "optional": true, "requires": { "buffer": "^5.2.1", "through": "^2.3.8" @@ -25616,6 +25603,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz", "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==", + "optional": true, "requires": { "base64-js": "^1.0.2", "ieee754": "^1.1.4" @@ -26156,7 +26144,8 @@ "url-to-options": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", - "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=" + "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", + "optional": true }, "url2": { "version": "1.0.4", @@ -27368,6 +27357,7 @@ "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "optional": true, "requires": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" From 01281b6414c9c469b12d38681fe249fc502f41ad Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sun, 31 Mar 2019 19:38:34 +0200 Subject: [PATCH 09/25] fix(markdown): make sure to only render strings, fix #11080 --- website/client/components/chat/chatCard.vue | 3 ++- website/client/directives/markdown.js | 4 +++- website/client/mixins/notifications.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/website/client/components/chat/chatCard.vue b/website/client/components/chat/chatCard.vue index a9ccae3fb9..fac207d5c0 100644 --- a/website/client/components/chat/chatCard.vue +++ b/website/client/components/chat/chatCard.vue @@ -269,7 +269,8 @@ export default { return highlightUsers(text, this.user.auth.local.username, this.user.profile.name); }, parseMarkdown (text) { - return habiticaMarkdown.render(text); + if (!text) return; + return habiticaMarkdown.render(String(text)); }, }, }; diff --git a/website/client/directives/markdown.js b/website/client/directives/markdown.js index 1b50190271..98c174f431 100644 --- a/website/client/directives/markdown.js +++ b/website/client/directives/markdown.js @@ -3,6 +3,8 @@ import habiticaMarkdown from 'habitica-markdown'; export default function markdown (el, {value, oldValue}) { if (value === oldValue) return; - el.innerHTML = habiticaMarkdown.render(value); + if (value) { + el.innerHTML = habiticaMarkdown.render(String(value)); + } el.classList.add('markdown'); } \ No newline at end of file diff --git a/website/client/mixins/notifications.js b/website/client/mixins/notifications.js index 6e15c2c39f..26a121dfdc 100644 --- a/website/client/mixins/notifications.js +++ b/website/client/mixins/notifications.js @@ -46,7 +46,7 @@ export default { }, markdown (val) { if (!val) return; - let parsedMarkdown = habiticaMarkdown.render(val); + let parsedMarkdown = habiticaMarkdown.render(String(val)); this.notify(parsedMarkdown, 'info'); }, mp (val) { From e1b08e3a20b28add0f9a256020bef6192de7342d Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 31 Mar 2019 19:44:42 +0200 Subject: [PATCH 10/25] fix(package): update autoprefixer to version 9.4.0 (#10887) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e8f105efaf..61462accd0 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "amplitude-js": "^4.6.0-beta.2", "apidoc": "^0.17.5", "apn": "^2.2.0", - "autoprefixer": "^8.5.0", + "autoprefixer": "^9.4.0", "aws-sdk": "^2.400.0", "axios": "^0.18.0", "axios-progress-bar": "^1.2.0", From 3e365f2b4e6500c828c8e7397cda0a0bde25d558 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 31 Mar 2019 19:50:52 +0200 Subject: [PATCH 11/25] =?UTF-8?q?Update=20csv-stringify=20to=20the=20lates?= =?UTF-8?q?t=20version=20=F0=9F=9A=80=20(#10893)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(package): update csv-stringify to version 5.1.0 * chore(package): update lockfile package-lock.json --- package-lock.json | 53 +++++++++++++++++++++++++++++++++++++---------- package.json | 2 +- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb52241297..f486923cfa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5101,6 +5101,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", + "optional": true, "requires": { "p-finally": "^1.0.0" } @@ -5597,6 +5598,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz", "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==", + "optional": true, "requires": { "get-proxy": "^2.0.0", "isurl": "^1.0.0-alpha5", @@ -5608,6 +5610,7 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "optional": true, "requires": { "safe-buffer": "^5.0.1" } @@ -6740,6 +6743,7 @@ "version": "1.1.12", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "optional": true, "requires": { "ini": "^1.3.4", "proto-list": "~1.2.1" @@ -7566,9 +7570,9 @@ } }, "csv-stringify": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-4.3.1.tgz", - "integrity": "sha512-VRjPYIUzex5kfbsOY7LaJcNE2qMWGQQAanb3/Vv85WbOgA+dAfDNfwntRvv335icJgGYrnTX403WxJxRVpLDFA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-5.1.0.tgz", + "integrity": "sha512-sAXlGnGHfF5k3W2IiZNx56on8HuFLTbX1HLp86wD67LRyVMkWU6IF+WH8lo4ayguOEQ/NDp/af83B13tXGcuow==", "requires": { "lodash.get": "~4.4.2" } @@ -8031,6 +8035,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz", "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=", + "optional": true, "requires": { "decompress-tar": "^4.0.0", "decompress-tarbz2": "^4.0.0", @@ -8078,6 +8083,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", + "optional": true, "requires": { "decompress-tar": "^4.1.0", "file-type": "^6.1.0", @@ -8089,7 +8095,8 @@ "file-type": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", - "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==" + "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==", + "optional": true } } }, @@ -8097,6 +8104,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz", "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", + "optional": true, "requires": { "decompress-tar": "^4.1.1", "file-type": "^5.2.0", @@ -8106,7 +8114,8 @@ "file-type": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", - "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=" + "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=", + "optional": true } } }, @@ -8114,6 +8123,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=", + "optional": true, "requires": { "file-type": "^3.8.0", "get-stream": "^2.2.0", @@ -8130,6 +8140,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", + "optional": true, "requires": { "object-assign": "^4.0.1", "pinkie-promise": "^2.0.0" @@ -10273,6 +10284,7 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz", "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==", + "optional": true, "requires": { "mime-db": "^1.28.0" } @@ -10281,6 +10293,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz", "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==", + "optional": true, "requires": { "ext-list": "^2.0.0", "sort-keys-length": "^1.0.0" @@ -10532,6 +10545,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "optional": true, "requires": { "pend": "~1.2.0" } @@ -11762,6 +11776,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz", "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==", + "optional": true, "requires": { "npm-conf": "^1.1.0" } @@ -12748,7 +12763,8 @@ "has-symbol-support-x": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", + "optional": true }, "has-symbols": { "version": "1.0.0", @@ -12759,6 +12775,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", + "optional": true, "requires": { "has-symbol-support-x": "^1.4.1" } @@ -13874,7 +13891,8 @@ "is-natural-number": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", - "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=" + "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=", + "optional": true }, "is-negated-glob": { "version": "1.0.0", @@ -13912,7 +13930,8 @@ "is-object": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=" + "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", + "optional": true }, "is-path-cwd": { "version": "1.0.0", @@ -14358,6 +14377,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", + "optional": true, "requires": { "has-to-string-tag-x": "^1.2.0", "is-object": "^1.0.1" @@ -18170,6 +18190,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", + "optional": true, "requires": { "config-chain": "^1.1.11", "pify": "^3.0.0" @@ -18723,6 +18744,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", + "optional": true, "requires": { "p-finally": "^1.0.0" } @@ -21474,7 +21496,8 @@ "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", + "optional": true }, "protocolify": { "version": "2.0.0", @@ -23138,6 +23161,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", + "optional": true, "requires": { "commander": "~2.8.1" }, @@ -23146,6 +23170,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "optional": true, "requires": { "graceful-readlink": ">= 1.0.0" } @@ -23700,6 +23725,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz", "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=", + "optional": true, "requires": { "sort-keys": "^1.0.0" } @@ -24305,6 +24331,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz", "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", + "optional": true, "requires": { "is-natural-number": "^4.0.1" } @@ -24762,12 +24789,14 @@ "temp-dir": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", - "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=" + "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=", + "optional": true }, "tempfile": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz", "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=", + "optional": true, "requires": { "temp-dir": "^1.0.0", "uuid": "^3.0.1" @@ -26156,7 +26185,8 @@ "url-to-options": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", - "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=" + "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", + "optional": true }, "url2": { "version": "1.0.4", @@ -27368,6 +27398,7 @@ "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "optional": true, "requires": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" diff --git a/package.json b/package.json index 61462accd0..30765478ce 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "coupon-code": "^0.4.5", "cross-env": "^5.2.0", "css-loader": "^0.28.11", - "csv-stringify": "^4.3.1", + "csv-stringify": "^5.1.0", "cwait": "^1.1.1", "domain-middleware": "~0.1.0", "express": "^4.16.3", From 352b8143f3d9dd35b05f63a6a7d84b8ce1b33720 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 31 Mar 2019 20:06:12 +0200 Subject: [PATCH 12/25] =?UTF-8?q?Update=20amplitude-js=20to=20the=20latest?= =?UTF-8?q?=20version=20=F0=9F=9A=80=20(#11073)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(package): update amplitude-js to version 5.0.0 * chore(package): update lockfile package-lock.json --- package-lock.json | 65 ++++++++++++++++++++++++++++++----------------- package.json | 2 +- 2 files changed, 43 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5aade551a4..7f30e90e7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,11 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@amplitude/ua-parser-js": { + "version": "0.7.20", + "resolved": "https://registry.npmjs.org/@amplitude/ua-parser-js/-/ua-parser-js-0.7.20.tgz", + "integrity": "sha512-bmW++BLt1Hg+4HCExLXP+0Jhgy2eTsEevqkVc5o4yYbgwdP/gV3gEQXzyVrMVlWWNLgph/tFIkf5PVlSpCELEg==" + }, "@babel/code-frame": { "version": "7.0.0-beta.44", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz", @@ -676,20 +681,13 @@ } }, "amplitude-js": { - "version": "4.6.0-beta.2", - "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-4.6.0-beta.2.tgz", - "integrity": "sha512-9uEhwpVpxFZBd1wGQJTluTswZA3Dn9/hVstpUN+TR7qvc/feaM5t4NwRBURMjzH5omFlf68mEr9s3+7AqoTl3w==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-5.0.0.tgz", + "integrity": "sha512-tAW8bpRnOl3TDPjpZZWfiCnjLXQ/O/n6vpnCugRx+Ybwr4b3FdOa8inkM2N1CpmPBCOh447tbU2FJD6JhImBFg==", "requires": { + "@amplitude/ua-parser-js": "0.7.20", "blueimp-md5": "^2.10.0", - "json3": "^3.3.2", - "lodash": "^4.17.4", "query-string": "5" - }, - "dependencies": { - "ua-parser-js": { - "version": "github:amplitude/ua-parser-js#ed538f16f5c6ecd8357da989b617d4f156dcf35d", - "from": "github:amplitude/ua-parser-js#ed538f16f5c6ecd8357da989b617d4f156dcf35d" - } } }, "ansi-align": { @@ -5021,7 +5019,8 @@ "get-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "optional": true }, "got": { "version": "8.3.2", @@ -8050,7 +8049,8 @@ "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "optional": true } } }, @@ -8134,7 +8134,8 @@ "file-type": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", - "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "optional": true }, "get-stream": { "version": "2.3.1", @@ -8149,7 +8150,8 @@ "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "optional": true } } }, @@ -8592,7 +8594,8 @@ "get-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "optional": true }, "got": { "version": "7.1.0", @@ -11147,11 +11150,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -11164,15 +11169,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -11275,7 +11283,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -11285,6 +11294,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -11297,17 +11307,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -11324,6 +11337,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -11396,7 +11410,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -11406,6 +11421,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -11511,6 +11527,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -25605,6 +25622,7 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz", "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==", + "optional": true, "requires": { "buffer": "^5.2.1", "through": "^2.3.8" @@ -25614,6 +25632,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz", "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==", + "optional": true, "requires": { "base64-js": "^1.0.2", "ieee754": "^1.1.4" diff --git a/package.json b/package.json index f1d46db061..8055797d5b 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "accepts": "^1.3.5", "amazon-payments": "^0.2.7", "amplitude": "^3.5.0", - "amplitude-js": "^4.6.0-beta.2", + "amplitude-js": "^5.0.0", "apidoc": "^0.17.5", "apn": "^2.2.0", "autoprefixer": "^9.4.0", From 85880d6bb57991db254f6ca6550020b2e107e7f4 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 31 Mar 2019 20:06:45 +0200 Subject: [PATCH 13/25] =?UTF-8?q?Update=20nodemailer=20to=20the=20latest?= =?UTF-8?q?=20version=20=F0=9F=9A=80=20(#11084)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(package): update nodemailer to version 6.0.0 * chore(package): update lockfile package-lock.json --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f30e90e7b..ed1c833b3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17938,9 +17938,9 @@ } }, "nodemailer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-5.1.1.tgz", - "integrity": "sha512-hKGCoeNdFL2W7S76J/Oucbw0/qRlfG815tENdhzcqTpSjKgAN91mFOqU2lQUflRRxFM7iZvCyaFcAR9noc/CqQ==" + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.0.0.tgz", + "integrity": "sha512-PMQJyLhoNAMoBU1hEh5aaUkpa/tcDNwzS7s7zow/myKfoEoZewMxUuWZqQ5yjYsAnvE484KSkYH5s6iPvcjhCg==" }, "nodemon": { "version": "1.18.10", diff --git a/package.json b/package.json index 8055797d5b..52c7cebdfb 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "nconf": "^0.10.0", "node-gcm": "^1.0.2", "node-sass": "^4.9.0", - "nodemailer": "^5.0.0", + "nodemailer": "^6.0.0", "ora": "^3.0.0", "pageres": "^4.1.1", "passport": "^0.4.0", From b2368e78042ee794cd0d0d3ef8d04adc7d0b01b5 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 31 Mar 2019 20:07:42 +0200 Subject: [PATCH 14/25] =?UTF-8?q?Update=20superagent=20to=20the=20latest?= =?UTF-8?q?=20version=20=F0=9F=9A=80=20(#11090)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(package): update superagent to version 5.0.2 * chore(package): update lockfile package-lock.json --- package-lock.json | 36 +++++++++++++++++++++--------------- package.json | 2 +- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index ed1c833b3e..7e646f3d99 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24376,19 +24376,20 @@ "integrity": "sha1-JAIuSG878c3KCUKDt2nEctO3KJc=" }, "superagent": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-4.1.0.tgz", - "integrity": "sha512-FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.0.2.tgz", + "integrity": "sha512-CqeqvwByDJuLwhcO6NOSuPatyQOIZX/TlvD5GJnXg5tzBTth2xQGZGdAZdo/kX+BtzvwJFX2IGGczTZgEIT7Wg==", "requires": { - "component-emitter": "^1.2.0", + "component-emitter": "^1.2.1", "cookiejar": "^2.1.2", - "debug": "^4.1.0", + "debug": "^4.1.1", "form-data": "^2.3.3", - "formidable": "^1.2.0", - "methods": "^1.1.1", + "formidable": "^1.2.1", + "methods": "^1.1.2", "mime": "^2.4.0", - "qs": "^6.6.0", - "readable-stream": "^3.0.6" + "qs": "^6.7.0", + "readable-stream": "^3.2.0", + "semver": "^6.0.0" }, "dependencies": { "debug": { @@ -24420,19 +24421,24 @@ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" }, "qs": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.6.0.tgz", - "integrity": "sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==" + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" }, "readable-stream": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz", - "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz", + "integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } + }, + "semver": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz", + "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==" } } }, diff --git a/package.json b/package.json index 52c7cebdfb..0ab3a2b12c 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "short-uuid": "^3.0.0", "smartbanner.js": "^1.9.1", "stripe": "^5.9.0", - "superagent": "^4.0.0", + "superagent": "^5.0.2", "svg-inline-loader": "^0.8.0", "svg-url-loader": "^2.3.2", "svgo": "^1.0.5", From 1e3d7acf069a1d1581f25693e55e48e7a12cae06 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sun, 31 Mar 2019 20:17:10 +0200 Subject: [PATCH 15/25] update deps --- package-lock.json | 1008 ++++++++++++++------------------------------- package.json | 34 +- 2 files changed, 332 insertions(+), 710 deletions(-) diff --git a/package-lock.json b/package-lock.json index 07510052a2..c735b8a296 100644 --- a/package-lock.json +++ b/package-lock.json @@ -155,12 +155,12 @@ } }, "@google-cloud/common": { - "version": "0.30.2", - "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.30.2.tgz", - "integrity": "sha512-JLIaSpMhhUetiwS30iC2SwNP51mayuSbyhRVdagqFC6rDVcqMHHsN8QJwUhCjOoHyfQ04n9SinfMCQzJTR9Liw==", + "version": "0.31.1", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.31.1.tgz", + "integrity": "sha512-MgaF8VmDaoyIqzZUXIbcohTb5sQn+PYlYmcpb0/E8psUpVe+kaBwLq/Z8pcFtACCr6PNT36n+a6s1kG35bAuCA==", "requires": { "@google-cloud/projectify": "^0.3.2", - "@google-cloud/promisify": "^0.3.0", + "@google-cloud/promisify": "^0.4.0", "@types/duplexify": "^3.5.0", "@types/request": "^2.47.0", "arrify": "^1.0.1", @@ -180,26 +180,26 @@ } }, "@google-cloud/projectify": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-0.3.2.tgz", - "integrity": "sha512-t1bs5gE105IpgikX7zPCJZzVyXM5xZ/1kJomUPim2E2pNp4OUUFNyvKm/T2aM6GBP2F30o8abCD+/wbOhHWYYA==" + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-0.3.3.tgz", + "integrity": "sha512-7522YHQ4IhaafgSunsFF15nG0TGVmxgXidy9cITMe+256RgqfcrfWphiMufW+Ou4kqagW/u3yxwbzVEW3dk2Uw==" }, "@google-cloud/promisify": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.3.1.tgz", - "integrity": "sha512-QzB0/IMvB0eFxFK7Eqh+bfC8NLv3E9ScjWQrPOk6GgfNroxcVITdTlT8NRsRrcp5+QQJVPLkRqKG0PUdaWXmHw==" + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.4.0.tgz", + "integrity": "sha512-4yAHDC52TEMCNcMzVC8WlqnKKKq+Ssi2lXoUg9zWWkZ6U6tq9ZBRYLHHCRdfU+EU9YJsVmivwGcKYCjRGjnf4Q==" }, "@google-cloud/trace-agent": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-3.5.2.tgz", - "integrity": "sha512-pmrNEIvITep9pGQfzSYpFjdfcEYqin0F8WvftNEc2dURt645WxMmDD3/dm6edVU6R8E86vQBPgCyEUvyAdW4dQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-3.6.0.tgz", + "integrity": "sha512-3ytV2NDwh6IZ+Xp+VH9RsaQQGuLHCPZnPb/qyCcGLe6qX+s/WzeTiYHUSfEVs0PHi3qpCL0Zf194xxSTGgxbPQ==", "requires": { - "@google-cloud/common": "^0.30.0", + "@google-cloud/common": "^0.31.0", "builtin-modules": "^3.0.0", "console-log-level": "^1.4.0", "continuation-local-storage": "^3.2.1", "extend": "^3.0.0", - "gcp-metadata": "^0.9.0", + "gcp-metadata": "^1.0.0", "hex2dec": "^1.0.1", "is": "^3.2.0", "methods": "^1.1.1", @@ -211,9 +211,9 @@ }, "dependencies": { "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" } } }, @@ -323,9 +323,9 @@ } }, "@types/caseless": { - "version": "0.12.1", - "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz", - "integrity": "sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A==" + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz", + "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==" }, "@types/duplexify": { "version": "3.6.0", @@ -349,9 +349,9 @@ "integrity": "sha512-RRSjdwz63kS4u7edIwJUn8NqKLLQ6LyqF/X4+4jp38MBT3Vwetewi2N4dgJEshLbDwNgOJXNYoOwzVZUSSLhkQ==" }, "@types/q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz", - "integrity": "sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA==" + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz", + "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==" }, "@types/request": { "version": "2.48.1", @@ -385,9 +385,9 @@ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "abort-controller": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-2.0.2.tgz", - "integrity": "sha512-JXEYGxxMwiNl9EUdLysK0K0DwB7ENw6KeeaLHgofijTfJYPB/vOer3Mb+IcP913dCfWiQsd05MmVNl0H5PanrQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", "requires": { "event-target-shim": "^5.0.0" } @@ -1895,9 +1895,9 @@ }, "dependencies": { "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" } } }, @@ -1953,9 +1953,9 @@ } }, "aws-sdk": { - "version": "2.403.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.403.0.tgz", - "integrity": "sha512-ftLAVadIjlLQiMWwbFgjaL2u5vmFCP5IDrJ+aIkrmfbzQsxTq2ze7slxgFpXP5eRtRF4/HVspzr0PS2MnsZMRA==", + "version": "2.432.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.432.0.tgz", + "integrity": "sha512-1Ly0chGU8K+r/8zM5iBiCC5MHOc4h/xReTv1VlRpemL5Fq2ndY6R5/uEEJ8ioqyd2UNban/w6LKwtOB1NF9IWg==", "requires": { "buffer": "4.9.1", "events": "1.1.1", @@ -4436,501 +4436,18 @@ } }, "bcrypt": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.4.tgz", - "integrity": "sha512-XqmCym97kT6l+jFEKeFvGuNE9aVEFDGsLMv+tIBTXkJI1sHS0g8s7VQEPJagSMPwWiB5Vpr2kVzVKc/YfwWthA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.5.tgz", + "integrity": "sha512-m4o91nB+Ce8696Ao4R3B/WtVWTc1Lszgd098/OIjU9D/URmdYwT3ooBs9uv1b97J5YhZweTq9lldPefTYZ0TwA==", "requires": { - "nan": "2.12.1", + "nan": "2.13.1", "node-pre-gyp": "0.12.0" }, "dependencies": { - "abbrev": { - "version": "1.1.1", - "resolved": false, - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": false, - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "aproba": { - "version": "1.2.0", - "resolved": false, - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" - }, - "are-we-there-yet": { - "version": "1.1.5", - "resolved": false, - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "resolved": false, - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": false, - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.1.1", - "resolved": false, - "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==" - }, - "code-point-at": { - "version": "1.1.0", - "resolved": false, - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, - "concat-map": { - "version": "0.0.1", - "resolved": false, - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": false, - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" - }, - "core-util-is": { - "version": "1.0.2", - "resolved": false, - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "debug": { - "version": "2.6.9", - "resolved": false, - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.6.0", - "resolved": false, - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" - }, - "delegates": { - "version": "1.0.0", - "resolved": false, - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" - }, - "detect-libc": { - "version": "1.0.3", - "resolved": false, - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" - }, - "fs-minipass": { - "version": "1.2.5", - "resolved": false, - "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": false, - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "gauge": { - "version": "2.7.4", - "resolved": false, - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.2", - "resolved": false, - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "resolved": false, - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": false, - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.1", - "resolved": false, - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": false, - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": false, - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "ini": { - "version": "1.3.5", - "resolved": false, - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": false, - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "resolved": false, - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "minimatch": { - "version": "3.0.4", - "resolved": false, - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": false, - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" - }, - "minipass": { - "version": "2.3.4", - "resolved": false, - "integrity": "sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==", - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": false, - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "yallist": { - "version": "3.0.2", - "resolved": false, - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" - } - } - }, - "minizlib": { - "version": "1.1.1", - "resolved": false, - "integrity": "sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==", - "requires": { - "minipass": "^2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": false, - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "resolved": false, - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "needle": { - "version": "2.2.4", - "resolved": false, - "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==", - "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.12.0", - "resolved": false, - "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "nopt": { - "version": "4.0.1", - "resolved": false, - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.0.5", - "resolved": false, - "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==" - }, - "npm-packlist": { - "version": "1.1.12", - "resolved": false, - "integrity": "sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==", - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "resolved": false, - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "requires": { - "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": { - "version": "1.0.1", - "resolved": false, - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "object-assign": { - "version": "4.1.1", - "resolved": false, - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, - "once": { - "version": "1.4.0", - "resolved": false, - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "resolved": false, - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": false, - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" - }, - "osenv": { - "version": "0.1.5", - "resolved": false, - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": false, - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" - }, - "process-nextick-args": { - "version": "2.0.0", - "resolved": false, - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" - }, - "rc": { - "version": "1.2.8", - "resolved": false, - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": false, - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - } - } - }, - "readable-stream": { - "version": "2.3.5", - "resolved": false, - "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.0.3", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.6.2", - "resolved": false, - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", - "requires": { - "glob": "^7.0.5" - } - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": false, - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": false, - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "sax": { - "version": "1.2.4", - "resolved": false, - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" - }, - "semver": { - "version": "5.6.0", - "resolved": false, - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" - }, - "set-blocking": { - "version": "2.0.0", - "resolved": false, - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "signal-exit": { - "version": "3.0.2", - "resolved": false, - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" - }, - "string-width": { - "version": "1.0.2", - "resolved": false, - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.0.3", - "resolved": false, - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": false, - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": false, - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" - }, - "tar": { - "version": "4.4.8", - "resolved": false, - "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": false, - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "yallist": { - "version": "3.0.2", - "resolved": false, - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": false, - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "wide-align": { - "version": "1.1.3", - "resolved": false, - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": false, - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "nan": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.1.tgz", + "integrity": "sha512-I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA==" } } }, @@ -5327,9 +4844,9 @@ "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==" }, "bootstrap-vue": { - "version": "2.0.0-rc.13", - "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.0.0-rc.13.tgz", - "integrity": "sha512-XKCHeb3vzdbw3tD7jMOBOA0YuK+1PZo2s5+Vl0uglZKKPIN0V9DljnUv+10xJve6yr88WX0sFWInYObRGFiC/Q==", + "version": "2.0.0-rc.16", + "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.0.0-rc.16.tgz", + "integrity": "sha512-fhiyqG6i3ITF7fAzAjMexikGUgBZ/GTKQi0mCK48FacB5tiq2KUXE0Qilb/CW090PkqEw2W+7AP2/k5/dAa/MQ==", "requires": { "@nuxt/opencollective": "^0.2.1", "bootstrap": "^4.3.1", @@ -5995,6 +5512,11 @@ } } }, + "chownr": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==" + }, "chromedriver": { "version": "2.46.0", "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.46.0.tgz", @@ -6204,9 +5726,9 @@ } }, "cli-spinners": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz", - "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.0.0.tgz", + "integrity": "sha512-yiEBmhaKPPeBj7wWm4GEdtPZK940p9pl3EANIrnJ3JnvWyrPjcFcsEq6qRUuQ7fzB0+Y82ld3p6B34xo95foWw==" }, "cli-width": { "version": "2.2.0", @@ -6803,25 +6325,39 @@ } }, "compressible": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz", - "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz", + "integrity": "sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==", "requires": { - "mime-db": ">= 1.36.0 < 2" + "mime-db": ">= 1.38.0 < 2" + }, + "dependencies": { + "mime-db": { + "version": "1.38.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz", + "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==" + } } }, "compression": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz", - "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "requires": { "accepts": "~1.3.5", "bytes": "3.0.0", - "compressible": "~2.0.14", + "compressible": "~2.0.16", "debug": "2.6.9", - "on-headers": "~1.0.1", + "on-headers": "~1.0.2", "safe-buffer": "5.1.2", "vary": "~1.1.2" + }, + "dependencies": { + "on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + } } }, "concat-map": { @@ -6904,41 +6440,9 @@ "dev": true }, "consola": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/consola/-/consola-2.4.1.tgz", - "integrity": "sha512-j6bIzpmyRGY2TDZVkAi3DM95CgC8hWx1A7AiJdyn4X5gls1bbpXIMpn3p8QsfaNu+ycNLXP+2DwKb47FXjw1ww==", - "requires": { - "chalk": "^2.4.2", - "dayjs": "^1.8.3", - "figures": "^2.0.0", - "std-env": "^2.2.1", - "string-width": "^3.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz", - "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==" - }, - "string-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz", - "integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==", - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.0.0" - } - }, - "strip-ansi": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz", - "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==", - "requires": { - "ansi-regex": "^4.0.0" - } - } - } + "version": "2.5.8", + "resolved": "https://registry.npmjs.org/consola/-/consola-2.5.8.tgz", + "integrity": "sha512-fYv1M0rNJw4h0CZUx8PX02Px7xQhA+vNHpV8DBCGMoozp2Io/vrSXhhEothaRnSt7VMR0rj2pt9KKLXa5amrCw==" }, "console-browserify": { "version": "1.1.0", @@ -6954,9 +6458,9 @@ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "console-log-level": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.4.0.tgz", - "integrity": "sha1-QDWBi+6jflhQoMA8jUUMpfLNEhc=" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.4.1.tgz", + "integrity": "sha512-VZzbIORbP+PPcN/gg3DXClTLPLg5Slwd5fL2MIc+o1qZ4BXBvWyc6QxPk6T/Mkr6IVjRpoAGf32XxP3ZWMVRcQ==" }, "console-stream": { "version": "0.1.1", @@ -7057,13 +6561,20 @@ "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" }, "cookie-session": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-1.3.2.tgz", - "integrity": "sha1-Rp26djCMAQtSnpp8+dh7ZJvgGQs=", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-1.3.3.tgz", + "integrity": "sha512-GrMdrU1YTQWtmVTo0Rj3peeZRMc2xJrBslFYtZcYTo+hrSLmrcf69OrRkDi84xTfylgCy2wgpRHyY4le6lE5+A==", "requires": { - "cookies": "0.7.1", + "cookies": "0.7.3", "debug": "2.6.9", - "on-headers": "~1.0.1" + "on-headers": "~1.0.2" + }, + "dependencies": { + "on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + } } }, "cookie-signature": { @@ -7077,12 +6588,12 @@ "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==" }, "cookies": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.7.1.tgz", - "integrity": "sha1-fIphX1SBxhq58WyDNzG8uPZjuZs=", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.7.3.tgz", + "integrity": "sha512-+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A==", "requires": { - "depd": "~1.1.1", - "keygrip": "~1.0.2" + "depd": "~1.1.2", + "keygrip": "~1.0.3" } }, "copy-descriptor": { @@ -7144,9 +6655,9 @@ } }, "coveralls": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.2.tgz", - "integrity": "sha512-Tv0LKe/MkBOilH2v7WBiTBdudg2ChfGbdXafc/s330djpF3zKOmuehTeRwjXWc7pzfj9FrDUTA7tEx6Div8NFw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.3.tgz", + "integrity": "sha512-viNfeGlda2zJr8Gj1zqXpDMRjw9uM54p7wzZdvLRyOgnAfCe974Dq4veZkjJdxQXbmdppu6flEajFYseHYaUhg==", "dev": true, "requires": { "growl": "~> 1.10.0", @@ -7154,7 +6665,7 @@ "lcov-parse": "^0.0.10", "log-driver": "^1.2.7", "minimist": "^1.2.0", - "request": "^2.85.0" + "request": "^2.86.0" }, "dependencies": { "assert-plus": { @@ -7220,9 +6731,9 @@ } }, "js-yaml": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz", - "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", + "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -8103,11 +7614,6 @@ "meow": "^3.3.0" } }, - "dayjs": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.6.tgz", - "integrity": "sha512-NLhaSS1/wWLRFy0Kn/VmsAExqll2zxRUPmPbqJoeMKQrFxG+RT94VMSE+cVljB6A76/zZkR0Xub4ihTHQ5HgGg==" - }, "de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", @@ -8518,6 +8024,11 @@ "repeating": "^2.0.0" } }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + }, "di": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", @@ -8918,11 +8429,6 @@ "shimmer": "^1.2.0" } }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" - }, "emojis-list": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", @@ -10593,6 +10099,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, "requires": { "escape-string-regexp": "^1.0.5" } @@ -11121,6 +10628,14 @@ } } }, + "fs-minipass": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", + "requires": { + "minipass": "^2.2.1" + } + }, "fs-mkdirp-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", @@ -11768,14 +11283,14 @@ } }, "gaxios": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.7.0.tgz", - "integrity": "sha512-2SaZTtaEgnSMgRrBVnPA5O9Tc8xWfnL48fuxFL7zOHZwnam3HiNOkoosnRgnkNBZoEZrH1Aja3wMCrrDtOEqUw==", + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.8.3.tgz", + "integrity": "sha512-6Lc1P0NjbPNQ2FGgTRurz32P6FktNJbwLqXvrUNhfwzKb9iizcWuAJiHoSG2W186K9ZL0X6ST5xD9gJWhHI1sg==", "requires": { - "abort-controller": "^2.0.2", + "abort-controller": "^3.0.0", "extend": "^3.0.2", "https-proxy-agent": "^2.2.1", - "node-fetch": "^2.2.0" + "node-fetch": "^2.3.0" }, "dependencies": { "agent-base": { @@ -11819,9 +11334,9 @@ } }, "gcp-metadata": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.9.3.tgz", - "integrity": "sha512-caV4S84xAjENtpezLCT/GILEAF5h/bC4cNqZFmt/tjTn8t+JBtTkQrgBrJu3857YdsnlM8rxX/PMcKGtE8hUlw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-1.0.0.tgz", + "integrity": "sha512-Q6HrgfrCQeEircnNP3rCcEgiDv7eF9+1B+1MMgpE190+/+0mjQR8PxeOaRgxZWmdDAF9EIryHB9g1moPiw1SbQ==", "requires": { "gaxios": "^1.0.2", "json-bigint": "^0.3.0" @@ -12240,14 +11755,14 @@ } }, "google-auth-library": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-3.1.0.tgz", - "integrity": "sha512-EntjrOgSffw5EhZGoV8+ROPwEK/aQpoMZaULw3bKailEGdjaUI25PmmFc4AN6vG/Q24YEUiuLxtTXa1Usar5Eg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-3.1.2.tgz", + "integrity": "sha512-cDQMzTotwyWMrg5jRO7q0A4TL/3GWBgO7I7q5xGKNiiFf9SmGY/OJ1YsLMgI2MVHHsEGyrqYnbnmV1AE+Z6DnQ==", "requires": { "base64-js": "^1.3.0", "fast-text-encoding": "^1.0.0", "gaxios": "^1.2.1", - "gcp-metadata": "^0.9.3", + "gcp-metadata": "^1.0.0", "gtoken": "^2.3.2", "https-proxy-agent": "^2.2.1", "jws": "^3.1.5", @@ -12294,9 +11809,9 @@ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" }, "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" }, "yallist": { "version": "3.0.3", @@ -12306,14 +11821,19 @@ } }, "google-p12-pem": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.3.tgz", - "integrity": "sha512-KGnAiMMWaJp4j4tYVvAjfP3wCKZRLv9M1Nir2wRRNWUYO7j1aX8O9Qgz+a8/EQ5rAvuo4SIu79n6SIdkNl7Msg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.4.tgz", + "integrity": "sha512-SwLAUJqUfTB2iS+wFfSS/G9p7bt4eWcc2LyfvmUXe7cWp6p3mpxDo6LLI29MXdU6wvPcQ/up298X7GMC5ylAlA==", "requires": { - "node-forge": "^0.7.5", + "node-forge": "^0.8.0", "pify": "^4.0.0" }, "dependencies": { + "node-forge": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.8.2.tgz", + "integrity": "sha512-mXQ9GBq1N3uDCyV1pdSzgIguwgtVpM7f5/5J4ipz12PKWElmPpVWLDuWl8iXmhysr21+WmX/OJ5UKx82wjomgg==" + }, "pify": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", @@ -12469,9 +11989,9 @@ "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=" }, "gtoken": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.2.tgz", - "integrity": "sha512-F8EObUGyC8Qd3WXTloNULZBwfUsOABoHElihB1F6zGhT/cy38iPL09wGLRY712I+hQnOyA+sYlgPFX2cOKz0qg==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.3.tgz", + "integrity": "sha512-EaB49bu/TCoNeQjhCYKI/CurooBKkGxIqFHsWABW0b25fobBYVTMe84A8EBVVZhl8emiUdNypil9huMOTmyAnw==", "requires": { "gaxios": "^1.0.4", "google-p12-pem": "^1.0.0", @@ -12960,9 +12480,9 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" }, "hellojs": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/hellojs/-/hellojs-1.18.0.tgz", - "integrity": "sha512-K4+3GkD7x37rz7fsncB2l/+FR88rlXaXF5mG+aVDTYhmhEYiU2n7YsBjDPA61UYpriAHnKGSzGNGpzDp0JTUdA==" + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/hellojs/-/hellojs-1.18.1.tgz", + "integrity": "sha512-T673GW3RSuM4xzYfJpp/wNPDbUG9FlNSNkQn0thII8DOpl3NphcmtmNrHrmv8hyk1fosJHkgzDfbcpJvmeq5Gw==" }, "helper-cache": { "version": "0.7.2", @@ -13293,6 +12813,14 @@ "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=" }, + "ignore-walk": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "requires": { + "minimatch": "^3.0.4" + } + }, "image-size": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.7.2.tgz", @@ -13384,9 +12912,9 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, "in-app-purchase": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/in-app-purchase/-/in-app-purchase-1.11.1.tgz", - "integrity": "sha512-rVDbE5QyKj8POzXqay/yRgrWJ8KJdAu6U8TPL8Uy5QfsmGXDSUDdNPeN1lTv6bUja6KDqAgX8riOUVIVYLZw8w==", + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/in-app-purchase/-/in-app-purchase-1.11.3.tgz", + "integrity": "sha512-0nd8xsB4vDsHGitGEsWl1HocMhUV+uQux6y9AaihxmFHnEnMS//3g2YLN4EtEn6aEcstjXv6w0G9LojD6JpXTw==", "requires": { "jwt-simple": "0.5.1", "request": "2.88.0", @@ -16893,6 +16421,30 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" }, + "minipass": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + }, + "dependencies": { + "yallist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" + } + } + }, + "minizlib": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", + "requires": { + "minipass": "^2.2.1" + } + }, "mixin-deep": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", @@ -17069,9 +16621,9 @@ } }, "mongoose": { - "version": "5.4.19", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.4.19.tgz", - "integrity": "sha512-paRU3nbCrPIUVw1GAlxo11uIIqrYORctUx1kcLj7i2NhkxPQuy5OK2/FYj8+tglsaixycmONSyop2HQp1IUQSA==", + "version": "5.4.20", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.4.20.tgz", + "integrity": "sha512-CyybxMQbCaq6jvbroamS5mPfFbxTOLLpdpkQrk1cj7Az1TX+mBbcCVhz+7XElfTMIOb58ah9O+EXmZJsLPD3Lg==", "requires": { "async": "2.6.1", "bson": "~1.1.0", @@ -17414,6 +16966,23 @@ "ndarray": "^1.0.13" } }, + "needle": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz", + "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==", + "requires": { + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + }, + "dependencies": { + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + } + } + }, "negotiator": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", @@ -17851,6 +17420,58 @@ "request": ">=2.76.0 <3.0.0" } }, + "node-pre-gyp": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz", + "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", + "requires": { + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" + }, + "dependencies": { + "nopt": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, + "semver": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" + }, + "tar": { + "version": "4.4.8", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.4", + "minizlib": "^1.1.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" + } + }, + "yallist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" + } + } + }, "node-releases": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.12.tgz", @@ -18191,6 +17812,11 @@ "once": "^1.3.2" } }, + "npm-bundled": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", + "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==" + }, "npm-conf": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", @@ -18200,6 +17826,15 @@ "pify": "^3.0.0" } }, + "npm-packlist": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz", + "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" + } + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -18602,29 +18237,29 @@ } }, "ora": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ora/-/ora-3.1.0.tgz", - "integrity": "sha512-vRBPaNCclUi8pUxRF/G8+5qEQkc6EgzKK1G2ZNJUIGu088Un5qIxFXeDgymvPRM9nmrcUOGzQgS1Vmtz+NtlMw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ora/-/ora-3.2.0.tgz", + "integrity": "sha512-XHMZA5WieCbtg+tu0uPF8CjvwQdNzKCX6BVh3N6GFsEXH40mTk5dsw/ya1lBTUGJslcEFJFQ8cBhOgkkZXQtMA==", "requires": { "chalk": "^2.4.2", "cli-cursor": "^2.1.0", - "cli-spinners": "^1.3.1", + "cli-spinners": "^2.0.0", "log-symbols": "^2.2.0", "strip-ansi": "^5.0.0", "wcwidth": "^1.0.1" }, "dependencies": { "ansi-regex": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz", - "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, "strip-ansi": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz", - "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "requires": { - "ansi-regex": "^4.0.0" + "ansi-regex": "^4.1.0" } } } @@ -21843,9 +21478,9 @@ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "puppeteer": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.12.2.tgz", - "integrity": "sha512-xWSyCeD6EazGlfnQweMpM+Hs6X6PhUYhNTHKFj/axNZDq4OmrVERf70isBf7HsnFgB3zOC1+23/8+wCAZYg+Pg==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.14.0.tgz", + "integrity": "sha512-SayS2wUX/8LF8Yo2Rkpc5nkAu4Jg3qu+OLTDSOZtisVQMB2Z5vjlY2TdPi/5CgZKiZroYIiyUN3sRX63El9iaw==", "dev": true, "requires": { "debug": "^4.1.0", @@ -21916,9 +21551,9 @@ "dev": true }, "ws": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.3.tgz", - "integrity": "sha512-tbSxiT+qJI223AP4iLfQbkbxkwdFcneYinM2+x46Gx2wgvbaOMO36czfdfVUBRTHvzAMRhDd98sA5d/BuWbQdg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", + "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", "dev": true, "requires": { "async-limiter": "~1.0.0" @@ -23531,9 +23166,9 @@ "dev": true }, "smartbanner.js": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/smartbanner.js/-/smartbanner.js-1.10.1.tgz", - "integrity": "sha512-niG8DX3oHWnHCAZJm4GyXylj7PFulS3vfpqD8JTBjKtVW52zyNLszm6PMfeQJlWeRmoEA1WHaTkBfrt0fXve6A==" + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/smartbanner.js/-/smartbanner.js-1.11.0.tgz", + "integrity": "sha512-65F9EbfHn8NanDVliVX1xgc+EeW4h3lBRUlRz2uCi9bdKlnGsGnFkAmiQE7UOqkpi0wVEyWXvuWDmESCnfm7FQ==" }, "snapdragon": { "version": "0.8.2", @@ -23803,9 +23438,9 @@ } }, "sortablejs": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.8.3.tgz", - "integrity": "sha512-AftvD4hdKcR5QlGi7L/JST506zGNGrysE8/QohDpwKXJarHWqCt+TUlrtoMk/wkECB607Q019/OZlJViyWiD6A==" + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.8.4.tgz", + "integrity": "sha512-Brqnzelu1AhFuc0Fn3N/qFex1tlIiuQIUsfu2J8luJ4cRgXYkWrByxa+y5mWEBlj8A0YoABukflIJwvHyrwJ6Q==" }, "source-list-map": { "version": "2.0.1", @@ -24206,14 +23841,6 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, - "std-env": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-2.2.1.tgz", - "integrity": "sha512-IjYQUinA3lg5re/YMlwlfhqNRTzMZMqE+pezevdcTaHceqx8ngEi1alX9nNCk9Sc81fy1fLDeQoaCzeiW1yBOQ==", - "requires": { - "ci-info": "^1.6.0" - } - }, "stdout-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", @@ -24588,22 +24215,22 @@ } }, "svgo": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.1.1.tgz", - "integrity": "sha512-GBkJbnTuFpM4jFbiERHDWhZc/S/kpHToqmZag3aEBjPYK44JAN2QBjvrGIxLOoCyMZjuFQIfTO2eJd8uwLY/9g==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz", + "integrity": "sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw==", "requires": { - "coa": "~2.0.1", - "colors": "~1.1.2", + "chalk": "^2.4.1", + "coa": "^2.0.2", "css-select": "^2.0.0", - "css-select-base-adapter": "~0.1.0", + "css-select-base-adapter": "^0.1.1", "css-tree": "1.0.0-alpha.28", "css-url-regex": "^1.1.0", - "csso": "^3.5.0", + "csso": "^3.5.1", "js-yaml": "^3.12.0", "mkdirp": "~0.5.1", - "object.values": "^1.0.4", + "object.values": "^1.1.0", "sax": "~1.2.4", - "stable": "~0.1.6", + "stable": "^0.1.8", "unquote": "~1.1.1", "util.promisify": "~1.0.0" }, @@ -24618,11 +24245,6 @@ "q": "^1.1.2" } }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=" - }, "csso": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz", @@ -24648,9 +24270,9 @@ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "js-yaml": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz", - "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", + "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -26760,9 +26382,9 @@ "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=" }, "vue": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.6.tgz", - "integrity": "sha512-Y2DdOZD8sxApS+iUlwv1v8U1qN41kq6Kw45lM6nVZKhygeWA49q7VCCXkjXqeDBXgurrKWkYQ9cJeEJwAq0b9Q==" + "version": "2.6.10", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz", + "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==" }, "vue-functional-data-merge": { "version": "2.0.7", @@ -26817,9 +26439,9 @@ } }, "vue-template-compiler": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.6.tgz", - "integrity": "sha512-OakxDGyrmMQViCjkakQFbDZlG0NibiOzpLauOfyCUVRQc9yPmTqpiz9nF0VeA+dFkXegetw0E5x65BFhhLXO0A==", + "version": "2.6.10", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz", + "integrity": "sha512-jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg==", "requires": { "de-indent": "^1.0.2", "he": "^1.1.0" @@ -26831,11 +26453,11 @@ "integrity": "sha512-cliV19VHLJqFUYbz/XeWXe5CO6guzwd0yrrqqp0bmjlMP3ZZULY7fu8RTC4+3lmHwo6ESVDHFDsvjB15hcR5IA==" }, "vuedraggable": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.17.0.tgz", - "integrity": "sha512-TAC5tJTSbHSINQCSB59qHnuzT0Ad+E3IgvSWuA1e9UaebD8DxKaY1tCdvL3XvuLoaM3wc1dhpP/NbjpdxYsrng==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.20.0.tgz", + "integrity": "sha512-mrSWGkzY40nkgLDuuoxrs6/0u+A7VwXtQRruLQYOVjwd8HcT3BZatRvzw4qVCwJczsAYPbaMubkGOEtzDOzhsQ==", "requires": { - "sortablejs": "^1.7.0" + "sortablejs": "^1.8.4" } }, "vuejs-datepicker": { diff --git a/package.json b/package.json index 382160dded..7e5812938a 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "4.90.2", "main": "./website/server/index.js", "dependencies": { - "@google-cloud/trace-agent": "^3.5.2", + "@google-cloud/trace-agent": "^3.6.0", "@slack/client": "^3.8.1", "accepts": "^1.3.5", "amazon-payments": "^0.2.7", @@ -13,7 +13,7 @@ "apidoc": "^0.17.5", "apn": "^2.2.0", "autoprefixer": "^9.4.0", - "aws-sdk": "^2.400.0", + "aws-sdk": "^2.432.0", "axios": "^0.18.0", "axios-progress-bar": "^1.2.0", "babel-core": "^6.26.3", @@ -28,12 +28,12 @@ "babel-preset-es2015": "^6.6.0", "babel-register": "^6.6.0", "babel-runtime": "^6.11.6", - "bcrypt": "^3.0.1", + "bcrypt": "^3.0.5", "body-parser": "^1.18.3", "bootstrap": "^4.1.1", - "bootstrap-vue": "^2.0.0-rc.13", - "compression": "^1.7.2", - "cookie-session": "^1.2.0", + "bootstrap-vue": "^2.0.0-rc.16", + "compression": "^1.7.4", + "cookie-session": "^1.3.3", "coupon-code": "^0.4.5", "cross-env": "^5.2.0", "css-loader": "^0.28.11", @@ -52,10 +52,10 @@ "gulp-nodemon": "^2.4.1", "gulp.spritesmith": "^6.9.0", "habitica-markdown": "^1.3.0", - "hellojs": "^1.15.1", + "hellojs": "^1.18.1", "html-webpack-plugin": "^3.2.0", "image-size": "^0.7.0", - "in-app-purchase": "^1.10.2", + "in-app-purchase": "^1.11.3", "intro.js": "^2.9.3", "jquery": ">=3.0.0", "js2xmlparser": "^3.0.0", @@ -64,13 +64,13 @@ "method-override": "^3.0.0", "moment": "^2.22.1", "moment-recur": "^1.0.7", - "mongoose": "^5.4.11", + "mongoose": "^5.4.20", "morgan": "^1.7.0", "nconf": "^0.10.0", "node-gcm": "^1.0.2", "node-sass": "^4.9.0", "nodemailer": "^6.0.0", - "ora": "^3.0.0", + "ora": "^3.2.0", "pageres": "^4.1.1", "passport": "^0.4.0", "passport-facebook": "^2.0.0", @@ -85,12 +85,12 @@ "sass-loader": "^7.0.3", "shelljs": "^0.8.2", "short-uuid": "^3.0.0", - "smartbanner.js": "^1.9.1", + "smartbanner.js": "^1.11.0", "stripe": "^5.9.0", "superagent": "^5.0.2", "svg-inline-loader": "^0.8.0", "svg-url-loader": "^2.3.2", - "svgo": "^1.0.5", + "svgo": "^1.2.0", "svgo-loader": "^2.1.0", "universal-analytics": "^0.4.17", "update": "^0.7.4", @@ -100,13 +100,13 @@ "uuid": "^3.0.1", "validator": "^10.5.0", "vinyl-buffer": "^1.0.1", - "vue": "^2.6.4", + "vue": "^2.6.10", "vue-loader": "^14.2.2", "vue-mugen-scroll": "^0.2.1", "vue-router": "^3.0.0", "vue-style-loader": "^4.1.0", - "vue-template-compiler": "^2.6.4", - "vuedraggable": "^2.15.0", + "vue-template-compiler": "^2.6.10", + "vuedraggable": "^2.20.0", "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#5d237615463a84a23dd6f3f77c6ab577d68593ec", "webpack": "^3.12.0", "webpack-merge": "^4.1.3", @@ -154,7 +154,7 @@ "chalk": "^2.4.1", "chromedriver": "^2.40.0", "connect-history-api-fallback": "^1.1.0", - "coveralls": "^3.0.1", + "coveralls": "^3.0.3", "cross-spawn": "^6.0.5", "eslint": "^4.19.1", "eslint-config-habitrpg": "^4.0.0", @@ -182,7 +182,7 @@ "mocha": "^5.1.1", "monk": "^6.0.6", "nightwatch": "^1.0.16", - "puppeteer": "^1.5.0", + "puppeteer": "^1.14.0", "require-again": "^2.0.0", "selenium-server": "^3.12.0", "sinon": "^7.2.4", From 5656b9c6ca470ce51b8d0cc23455d7d01cd88926 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sun, 31 Mar 2019 20:36:06 +0200 Subject: [PATCH 16/25] fix(challenge): allow members to be loaded correctly, fix #11091 --- website/client/components/challenges/challengeDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/client/components/challenges/challengeDetail.vue b/website/client/components/challenges/challengeDetail.vue index b3a7b1230f..8355449575 100644 --- a/website/client/components/challenges/challengeDetail.vue +++ b/website/client/components/challenges/challengeDetail.vue @@ -347,7 +347,7 @@ export default { this.$root.$emit('habitica:show-member-modal', { challengeId: this.challenge._id, groupId: 'challenge', // @TODO: change these terrible settings - group: this.group, + group: this.challenge.group, memberCount: this.challenge.memberCount, viewingMembers: this.members, fetchMoreMembers: this.loadMembers, From f35ef3a04621ef7c5e25fb66b9d1e7381f22795e Mon Sep 17 00:00:00 2001 From: negue Date: Sun, 31 Mar 2019 20:41:37 +0200 Subject: [PATCH 17/25] Multiple checks for pinnedItems (#11031) * remove null/undefined entries from pinnedItems when an item is toggled - more inner checks + test * drawer: fix when there isn't a page available * rollback cleaning up pinnedEntries on item-toggle * remove "re-setting" pinnedItems * remove the filter --- test/common/libs/inAppRewards.js | 12 ++++++++++++ test/common/ops/pinnedGearUtils.js | 18 ++++++++++++++++++ website/client/components/ui/drawer.vue | 4 +++- website/client/store/actions/shops.js | 3 --- website/common/script/libs/inAppRewards.js | 12 ++++++++---- website/common/script/libs/shops.js | 3 ++- website/common/script/ops/pinnedGearUtils.js | 13 +++++++++++-- 7 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 test/common/ops/pinnedGearUtils.js diff --git a/test/common/libs/inAppRewards.js b/test/common/libs/inAppRewards.js index d7634c72b0..43369f4307 100644 --- a/test/common/libs/inAppRewards.js +++ b/test/common/libs/inAppRewards.js @@ -62,6 +62,18 @@ describe('inAppRewards', () => { expect(result[9].path).to.eql('potion'); }); + it('ignores null/undefined entries', () => { + user.pinnedItems = testPinnedItems; + user.pinnedItems.push(null); + user.pinnedItems.push(undefined); + user.pinnedItemsOrder = testPinnedItemsOrder; + + let result = inAppRewards(user); + + expect(result[2].path).to.eql('armoire'); + expect(result[9].path).to.eql('potion'); + }); + it('does not return seasonal items which have been unpinned', () => { if (officialPinnedItems.length === 0) { return; // if no seasonal items, this test is not applicable diff --git a/test/common/ops/pinnedGearUtils.js b/test/common/ops/pinnedGearUtils.js new file mode 100644 index 0000000000..e45e60a729 --- /dev/null +++ b/test/common/ops/pinnedGearUtils.js @@ -0,0 +1,18 @@ +import { + generateUser, +} from '../../helpers/common.helper'; +import {addPinnedGear} from '../../../website/common/script/ops/pinnedGearUtils'; + +describe('shared.ops.pinnedGearUtils.addPinnedGear', () => { + let user; + + beforeEach(() => { + user = generateUser(); + }); + + it('not adds an item with empty properties to pinnedItems', () => { + addPinnedGear(user, undefined, undefined); + + expect(user.pinnedItems.length).to.be.eql(0); + }); +}); diff --git a/website/client/components/ui/drawer.vue b/website/client/components/ui/drawer.vue index 7d8924ae28..b7afbcb458 100644 --- a/website/client/components/ui/drawer.vue +++ b/website/client/components/ui/drawer.vue @@ -174,7 +174,9 @@ export default { let minPaddingBottom = 20; let drawerHeight = this.$el.offsetHeight; let standardPage = document.getElementsByClassName('standard-page')[0]; - standardPage.style.paddingBottom = `${drawerHeight + minPaddingBottom}px`; + if (standardPage) { + standardPage.style.paddingBottom = `${drawerHeight + minPaddingBottom}px`; + } }, toggle () { this.open = !this.isOpen; diff --git a/website/client/store/actions/shops.js b/website/client/store/actions/shops.js index 0d8359ef95..43b9f03b22 100644 --- a/website/client/store/actions/shops.js +++ b/website/client/store/actions/shops.js @@ -20,9 +20,6 @@ function buyItem (store, params) { let opResult = buyOp(user, {params, quantity}); - user.pinnedItems = opResult[0].pinnedItems; - - return { result: opResult, httpCall: axios.post(`/api/v4/user/buy/${params.key}`), diff --git a/website/common/script/libs/inAppRewards.js b/website/common/script/libs/inAppRewards.js index 939925af52..203df6cf7c 100644 --- a/website/common/script/libs/inAppRewards.js +++ b/website/common/script/libs/inAppRewards.js @@ -4,6 +4,7 @@ import getOfficialPinnedItems from './getOfficialPinnedItems'; import compactArray from 'lodash/compact'; import getItemByPathAndType from './getItemByPathAndType'; +import {checkPinnedAreasForNullEntries} from '../ops/pinnedGearUtils'; /** * Orders the pinned items so we always get our inAppRewards in the order @@ -32,6 +33,8 @@ function sortInAppRewards (user, items) { } module.exports = function getPinnedItems (user) { + checkPinnedAreasForNullEntries(user); + let officialPinnedItems = getOfficialPinnedItems(user); const officialPinnedItemsNotUnpinned = officialPinnedItems.filter(officialPin => { @@ -41,11 +44,12 @@ module.exports = function getPinnedItems (user) { const pinnedItems = officialPinnedItemsNotUnpinned.concat(user.pinnedItems); - let items = pinnedItems.map(({type, path}) => { - let item = getItemByPathAndType(type, path); + let items = pinnedItems + .map(({type, path}) => { + let item = getItemByPathAndType(type, path); - return getItemInfo(user, type, item, officialPinnedItems); - }); + return getItemInfo(user, type, item, officialPinnedItems); + }); shops.checkMarketGearLocked(user, items); diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js index f781512e3b..b9c9c9df61 100644 --- a/website/common/script/libs/shops.js +++ b/website/common/script/libs/shops.js @@ -107,7 +107,8 @@ function getClassName (classType, language) { // TODO Refactor the `.locked` logic shops.checkMarketGearLocked = function checkMarketGearLocked (user, items) { let result = filter(items, ['pinType', 'marketGear']); - let availableGear = map(updateStore(user), (item) => getItemInfo(user, 'marketGear', item).path); + const officialPinnedItems = getOfficialPinnedItems(user); + let availableGear = map(updateStore(user), (item) => getItemInfo(user, 'marketGear', item, officialPinnedItems).path); for (let gear of result) { if (gear.klass !== user.stats.class) { gear.locked = true; diff --git a/website/common/script/ops/pinnedGearUtils.js b/website/common/script/ops/pinnedGearUtils.js index 2ec133509b..bc96ad2be3 100644 --- a/website/common/script/ops/pinnedGearUtils.js +++ b/website/common/script/ops/pinnedGearUtils.js @@ -27,6 +27,15 @@ function pathExistsInArray (array, path) { }); } +function checkForNullEntries (array) { + return array.filter(e => Boolean(e)); +} + +function checkPinnedAreasForNullEntries (user) { + user.pinnedItems = checkForNullEntries(user.pinnedItems); + user.unpinnedItems = checkForNullEntries(user.unpinnedItems); +} + function selectGearToPin (user) { let changes = []; @@ -41,11 +50,10 @@ function selectGearToPin (user) { return sortBy(changes, (change) => sortOrder[change.type]); } - function addPinnedGear (user, type, path) { const foundIndex = pathExistsInArray(user.pinnedItems, path); - if (foundIndex === -1) { + if (foundIndex === -1 && type && path) { user.pinnedItems.push({ type, path, @@ -176,5 +184,6 @@ module.exports = { togglePinnedItem, removeItemByPath, selectGearToPin, + checkPinnedAreasForNullEntries, isPinned, }; From 0b82722d27b8cea506ec654207240e5e4f811a39 Mon Sep 17 00:00:00 2001 From: negue Date: Sun, 31 Mar 2019 20:52:53 +0200 Subject: [PATCH 18/25] performance: private messages - API (#11077) * paging for inbox * clean up --- .../inbox/GET-inbox_messages.test.js | 19 ++++++++++++-- website/server/controllers/api-v3/inbox.js | 7 +++++- website/server/controllers/api-v3/user.js | 2 +- .../controllers/top-level/dataexport.js | 2 +- website/server/libs/inbox/index.js | 25 ++++++++++++++----- website/server/models/user/methods.js | 2 +- 6 files changed, 45 insertions(+), 12 deletions(-) diff --git a/test/api/v3/integration/inbox/GET-inbox_messages.test.js b/test/api/v3/integration/inbox/GET-inbox_messages.test.js index 188b961a10..39e5e37c37 100644 --- a/test/api/v3/integration/inbox/GET-inbox_messages.test.js +++ b/test/api/v3/integration/inbox/GET-inbox_messages.test.js @@ -27,8 +27,6 @@ describe('GET /inbox/messages', () => { toUserId: user.id, message: 'fourth', }); - - await user.sync(); }); it('returns the user inbox messages as an array of ordered messages (from most to least recent)', async () => { @@ -45,4 +43,21 @@ describe('GET /inbox/messages', () => { expect(messages[2].text).to.equal('second'); expect(messages[3].text).to.equal('first'); }); + + it('returns four messages when using page-query ', async () => { + const promises = []; + + for (let i = 0; i < 10; i++) { + promises.push(user.post('/members/send-private-message', { + toUserId: user.id, + message: 'fourth', + })); + } + + await Promise.all(promises); + + const messages = await user.get('/inbox/messages?page=1'); + + expect(messages.length).to.equal(4); + }); }); diff --git a/website/server/controllers/api-v3/inbox.js b/website/server/controllers/api-v3/inbox.js index 54a577de46..be32148a12 100644 --- a/website/server/controllers/api-v3/inbox.js +++ b/website/server/controllers/api-v3/inbox.js @@ -11,6 +11,8 @@ let api = {}; * @apiGroup Inbox * @apiDescription Get inbox messages for a user * + * @apiParam (Query) {Number} page Load the messages of the selected Page - 10 Messages per Page + * * @apiSuccess {Array} data An array of inbox messages */ api.getInboxMessages = { @@ -19,8 +21,11 @@ api.getInboxMessages = { middlewares: [authWithHeaders()], async handler (req, res) { const user = res.locals.user; + const page = req.query.page; - const userInbox = await inboxLib.getUserInbox(user); + const userInbox = await inboxLib.getUserInbox(user, { + page, + }); res.respond(200, userInbox); }, diff --git a/website/server/controllers/api-v3/user.js b/website/server/controllers/api-v3/user.js index 641adf93c8..839c7cd06f 100644 --- a/website/server/controllers/api-v3/user.js +++ b/website/server/controllers/api-v3/user.js @@ -1421,7 +1421,7 @@ api.deleteMessage = { await inboxLib.deleteMessage(user, req.params.id); - res.respond(200, ...[await inboxLib.getUserInbox(user, false)]); + res.respond(200, ...[await inboxLib.getUserInbox(user, {asArray: false})]); }, }; diff --git a/website/server/controllers/top-level/dataexport.js b/website/server/controllers/top-level/dataexport.js index 710f620fa2..e9f4448a3f 100644 --- a/website/server/controllers/top-level/dataexport.js +++ b/website/server/controllers/top-level/dataexport.js @@ -95,7 +95,7 @@ async function _getUserDataForExport (user, xmlMode = false) { userId: user._id, }).exec(), - inboxLib.getUserInbox(user, false), + inboxLib.getUserInbox(user, { asArray: false }), ]); userData.inbox.messages = messages; diff --git a/website/server/libs/inbox/index.js b/website/server/libs/inbox/index.js index 26524ecac0..c131d11fa4 100644 --- a/website/server/libs/inbox/index.js +++ b/website/server/libs/inbox/index.js @@ -1,12 +1,25 @@ import { inboxModel as Inbox } from '../../models/message'; -export async function getUserInbox (user, asArray = true) { - const messages = (await Inbox - .find({ownerId: user._id}) - .sort({timestamp: -1}) - .exec()).map(msg => msg.toJSON()); +const PM_PER_PAGE = 10; - if (asArray) { +export async function getUserInbox (user, options = {asArray: true, page: 0}) { + if (typeof options.asArray === 'undefined') { + options.asArray = true; + } + + let query = Inbox + .find({ownerId: user._id}) + .sort({timestamp: -1}); + + if (typeof options.page !== 'undefined') { + query = query + .limit(PM_PER_PAGE) + .skip(PM_PER_PAGE * Number(options.page)); + } + + const messages = (await query.exec()).map(msg => msg.toJSON()); + + if (options.asArray) { return messages; } else { const messagesObj = {}; diff --git a/website/server/models/user/methods.js b/website/server/models/user/methods.js index 9bf3a5e975..2be8135fa1 100644 --- a/website/server/models/user/methods.js +++ b/website/server/models/user/methods.js @@ -408,7 +408,7 @@ schema.methods.toJSONWithInbox = async function userToJSONWithInbox () { const toJSON = user.toJSON(); if (toJSON.inbox) { - toJSON.inbox.messages = await inboxLib.getUserInbox(user, false); + toJSON.inbox.messages = await inboxLib.getUserInbox(user, {asArray: false}); } return toJSON; From 0b8ce63c760838cd56e94ceea0a1df554ff72c0a Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Mon, 1 Apr 2019 19:24:18 +0200 Subject: [PATCH 19/25] WIP: Improve User model performances (#10832) * wip: define items as mixed objects * add default owned gear * mark modified * more mark modified * more mark modified * more mark modified * more mark modified * fix common tests * fix common tests * update mongoose * add itemsUtils * use new util function in hall controller * add tests for items utils * update website/server to mark all items as modified * start updating common code * update login incentives * update unlock * remove changes to package-lock.json * remove changes to package.json --- test/api/unit/libs/items/utils.test.js | 67 +++++++++++++++++++ test/common/ops/buy/buy.js | 6 +- test/common/ops/buy/buyMarketGear.js | 6 +- test/helpers/common.helper.js | 1 + .../common/script/content/loginIncentives.js | 53 +++++++++++++++ website/common/script/fns/randomDrop.js | 8 +++ website/common/script/fns/resetGear.js | 4 +- website/common/script/fns/ultimateGear.js | 2 +- website/common/script/fns/updateStats.js | 10 ++- website/common/script/libs/statsComputed.js | 2 +- website/common/script/ops/buy/buyArmoire.js | 3 + .../common/script/ops/buy/buyMysterySet.js | 2 + website/common/script/ops/buy/buyQuest.js | 1 + website/common/script/ops/buy/buyQuestGem.js | 1 + .../script/ops/buy/hourglassPurchase.js | 2 + website/common/script/ops/buy/purchase.js | 3 + website/common/script/ops/changeClass.js | 3 +- website/common/script/ops/equip.js | 4 ++ website/common/script/ops/feed.js | 8 +++ website/common/script/ops/hatch.js | 5 ++ website/common/script/ops/openMysteryItem.js | 5 +- website/common/script/ops/pinnedGearUtils.js | 3 + website/common/script/ops/releaseBoth.js | 4 ++ website/common/script/ops/releaseMounts.js | 1 + website/common/script/ops/releasePets.js | 1 + website/common/script/ops/revive.js | 1 + website/common/script/ops/sell.js | 2 + website/common/script/ops/unlock.js | 2 + website/server/controllers/api-v3/auth.js | 2 + website/server/controllers/api-v3/debug.js | 2 + website/server/controllers/api-v3/groups.js | 2 + website/server/controllers/api-v3/hall.js | 11 +-- website/server/libs/items/utils.js | 57 ++++++++++++++++ website/server/libs/payments/groupPayments.js | 1 + website/server/libs/payments/subscriptions.js | 1 + website/server/models/coupon.js | 2 + website/server/models/user/hooks.js | 3 + website/server/models/user/schema.js | 55 ++++++++------- 38 files changed, 304 insertions(+), 42 deletions(-) create mode 100644 test/api/unit/libs/items/utils.test.js create mode 100644 website/server/libs/items/utils.js diff --git a/test/api/unit/libs/items/utils.test.js b/test/api/unit/libs/items/utils.test.js new file mode 100644 index 0000000000..029d26a07c --- /dev/null +++ b/test/api/unit/libs/items/utils.test.js @@ -0,0 +1,67 @@ +/* eslint-disable camelcase */ +import { + validateItemPath, + getDefaultOwnedGear, +} from '../../../../../website/server/libs/items/utils'; + +describe('Items Utils', () => { + describe('getDefaultOwnedGear', () => { + it('clones the result object', () => { + const res1 = getDefaultOwnedGear(); + res1.extraProperty = true; + + const res2 = getDefaultOwnedGear(); + expect(res2).not.to.have.property('extraProperty'); + }); + }); + + describe('validateItemPath', () => { + it('returns false if not an item path', () => { + expect(validateItemPath('notitems.gear.owned.item')).to.equal(false); + }); + + it('returns true if a valid schema path', () => { + expect(validateItemPath('items.gear.equipped.weapon')).to.equal(true); + expect(validateItemPath('items.currentPet')).to.equal(true); + expect(validateItemPath('items.special.snowball')).to.equal(true); + }); + + it('works with owned gear paths', () => { + expect(validateItemPath('items.gear.owned.head_armoire_crownOfHearts')).to.equal(true); + expect(validateItemPath('items.gear.owned.head_invalid')).to.equal(false); + }); + + it('works with pets paths', () => { + expect(validateItemPath('items.pets.Wolf-CottonCandyPink')).to.equal(true); + expect(validateItemPath('items.pets.Wolf-Invalid')).to.equal(false); + }); + + it('works with eggs paths', () => { + expect(validateItemPath('items.eggs.LionCub')).to.equal(true); + expect(validateItemPath('items.eggs.Armadillo')).to.equal(true); + expect(validateItemPath('items.eggs.NotAnArmadillo')).to.equal(false); + }); + + it('works with hatching potions paths', () => { + expect(validateItemPath('items.hatchingPotions.Base')).to.equal(true); + expect(validateItemPath('items.hatchingPotions.StarryNight')).to.equal(true); + expect(validateItemPath('items.hatchingPotions.Invalid')).to.equal(false); + }); + + it('works with food paths', () => { + expect(validateItemPath('items.food.Cake_Base')).to.equal(true); + expect(validateItemPath('items.food.Cake_Invalid')).to.equal(false); + }); + + it('works with mounts paths', () => { + expect(validateItemPath('items.mounts.Cactus-Base')).to.equal(true); + expect(validateItemPath('items.mounts.Aether-Invisible')).to.equal(true); + expect(validateItemPath('items.mounts.Aether-Invalid')).to.equal(false); + }); + + it('works with quests paths', () => { + expect(validateItemPath('items.quests.atom3')).to.equal(true); + expect(validateItemPath('items.quests.invalid')).to.equal(false); + }); + }); +}); diff --git a/test/common/ops/buy/buy.js b/test/common/ops/buy/buy.js index 478a2cae86..5ec36dfd3a 100644 --- a/test/common/ops/buy/buy.js +++ b/test/common/ops/buy/buy.js @@ -9,6 +9,7 @@ import { import i18n from '../../../../website/common/script/i18n'; import content from '../../../../website/common/script/content/index'; import errorMessage from '../../../../website/common/script/libs/errorMessage'; +import { defaultsDeep } from 'lodash'; describe('shared.ops.buy', () => { let user; @@ -16,6 +17,10 @@ describe('shared.ops.buy', () => { beforeEach(() => { user = generateUser({ + stats: { gp: 200 }, + }); + + defaultsDeep(user, { items: { gear: { owned: { @@ -26,7 +31,6 @@ describe('shared.ops.buy', () => { }, }, }, - stats: { gp: 200 }, }); sinon.stub(analytics, 'track'); diff --git a/test/common/ops/buy/buyMarketGear.js b/test/common/ops/buy/buyMarketGear.js index f546331215..602975f6a6 100644 --- a/test/common/ops/buy/buyMarketGear.js +++ b/test/common/ops/buy/buyMarketGear.js @@ -11,6 +11,7 @@ import { } from '../../../../website/common/script/libs/errors'; import i18n from '../../../../website/common/script/i18n'; import errorMessage from '../../../../website/common/script/libs/errorMessage'; +import { defaultsDeep } from 'lodash'; function buyGear (user, req, analytics) { let buyOp = new BuyMarketGearOperation(user, req, analytics); @@ -24,6 +25,10 @@ describe('shared.ops.buyMarketGear', () => { beforeEach(() => { user = generateUser({ + stats: { gp: 200 }, + }); + + defaultsDeep(user, { items: { gear: { owned: { @@ -34,7 +39,6 @@ describe('shared.ops.buyMarketGear', () => { }, }, }, - stats: { gp: 200 }, }); sinon.stub(shared, 'randomVal'); diff --git a/test/helpers/common.helper.js b/test/helpers/common.helper.js index 12e4efdaec..f594e15cd0 100644 --- a/test/helpers/common.helper.js +++ b/test/helpers/common.helper.js @@ -9,6 +9,7 @@ import { } from '../../website/server/models/task'; export {translate} from './translate'; + export function generateUser (options = {}) { let user = new User(options).toObject(); diff --git a/website/common/script/content/loginIncentives.js b/website/common/script/content/loginIncentives.js index b61b639c80..091f9b108f 100644 --- a/website/common/script/content/loginIncentives.js +++ b/website/common/script/content/loginIncentives.js @@ -10,6 +10,7 @@ module.exports = function getLoginIncentives (api) { reward: [api.gear.flat.armor_special_bardRobes], assignReward: function assignReward (user) { user.items.gear.owned.armor_special_bardRobes = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 2: { @@ -30,6 +31,7 @@ module.exports = function getLoginIncentives (api) { reward: [api.gear.flat.head_special_bardHat], assignReward: function assignReward (user) { user.items.gear.owned.head_special_bardHat = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 4: { @@ -38,6 +40,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 5: { @@ -50,6 +53,7 @@ module.exports = function getLoginIncentives (api) { user.items.food.Meat += 1; if (!user.items.food.CottonCandyPink) user.items.food.CottonCandyPink = 0; user.items.food.CottonCandyPink += 1; + if (user.markModified) user.markModified('items.food'); }, }, 7: { @@ -58,6 +62,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.quests.moon1) user.items.quests.moon1 = 0; user.items.quests.moon1 += 1; + if (user.markModified) user.markModified('items.quests'); }, }, 10: { @@ -66,6 +71,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 14: { @@ -78,6 +84,7 @@ module.exports = function getLoginIncentives (api) { user.items.food.Potatoe += 1; if (!user.items.food.CottonCandyBlue) user.items.food.CottonCandyBlue = 0; user.items.food.CottonCandyBlue += 1; + if (user.markModified) user.markModified('items.food'); }, }, 18: { @@ -85,6 +92,7 @@ module.exports = function getLoginIncentives (api) { reward: [api.gear.flat.weapon_special_bardInstrument], assignReward: function assignReward (user) { user.items.gear.owned.weapon_special_bardInstrument = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 22: { @@ -93,6 +101,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.quests.moon2) user.items.quests.moon2 = 0; user.items.quests.moon2 += 1; + if (user.markModified) user.markModified('items.quests'); }, }, 26: { @@ -101,6 +110,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 30: { @@ -115,6 +125,7 @@ module.exports = function getLoginIncentives (api) { user.items.food.RottenMeat += 1; if (!user.items.food.Honey) user.items.food.Honey = 0; user.items.food.Honey += 1; + if (user.markModified) user.markModified('items.food'); }, }, 35: { @@ -123,6 +134,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 40: { @@ -131,6 +143,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.quests.moon3) user.items.quests.moon3 = 0; user.items.quests.moon3 += 1; + if (user.markModified) user.markModified('items.quests'); }, }, 45: { @@ -139,6 +152,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 50: { @@ -147,6 +161,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.food.Saddle) user.items.food.Saddle = 0; user.items.food.Saddle += 1; + if (user.markModified) user.markModified('items.food'); }, }, 55: { @@ -155,6 +170,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 60: { @@ -162,6 +178,7 @@ module.exports = function getLoginIncentives (api) { reward: [api.gear.flat.armor_special_pageArmor], assignReward: function assignReward (user) { user.items.gear.owned.armor_special_pageArmor = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 65: { @@ -170,6 +187,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 70: { @@ -177,6 +195,7 @@ module.exports = function getLoginIncentives (api) { reward: [api.gear.flat.head_special_pageHelm], assignReward: function assignReward (user) { user.items.gear.owned.head_special_pageHelm = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 75: { @@ -185,6 +204,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 80: { @@ -192,6 +212,7 @@ module.exports = function getLoginIncentives (api) { reward: [api.gear.flat.weapon_special_pageBanner], assignReward: function assignReward (user) { user.items.gear.owned.weapon_special_pageBanner = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 85: { @@ -200,6 +221,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 90: { @@ -207,6 +229,7 @@ module.exports = function getLoginIncentives (api) { reward: [api.gear.flat.shield_special_diamondStave], assignReward: function assignReward (user) { user.items.gear.owned.shield_special_diamondStave = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 95: { @@ -215,6 +238,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 100: { @@ -223,6 +247,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.food.Saddle) user.items.food.Saddle = 0; user.items.food.Saddle += 1; + if (user.markModified) user.markModified('items.food'); }, }, 105: { @@ -231,6 +256,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 110: { @@ -256,6 +282,7 @@ module.exports = function getLoginIncentives (api) { user.items.eggs.TigerCub += 1; if (!user.items.eggs.Wolf) user.items.eggs.Wolf = 0; user.items.eggs.Wolf += 1; + if (user.markModified) user.markModified('items.eggs'); }, }, 115: { @@ -264,6 +291,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 120: { @@ -291,6 +319,7 @@ module.exports = function getLoginIncentives (api) { user.items.hatchingPotions.White += 1; if (!user.items.hatchingPotions.Zombie) user.items.hatchingPotions.Zombie = 0; user.items.hatchingPotions.Zombie += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 125: { @@ -299,6 +328,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 130: { @@ -326,6 +356,7 @@ module.exports = function getLoginIncentives (api) { user.items.food.Milk += 3; if (!user.items.food.RottenMeat) user.items.food.RottenMeat = 0; user.items.food.RottenMeat += 3; + if (user.markModified) user.markModified('items.food'); }, }, 135: { @@ -334,6 +365,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 140: { @@ -342,6 +374,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { user.items.gear.owned.weapon_special_skeletonKey = true; // eslint-disable-line camelcase user.items.gear.owned.shield_special_lootBag = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 145: { @@ -350,6 +383,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 150: { @@ -358,6 +392,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { user.items.gear.owned.head_special_clandestineCowl = true; // eslint-disable-line camelcase user.items.gear.owned.armor_special_sneakthiefRobes = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 160: { @@ -366,6 +401,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 170: { @@ -374,6 +410,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { user.items.gear.owned.head_special_snowSovereignCrown = true; // eslint-disable-line camelcase user.items.gear.owned.armor_special_snowSovereignRobes = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 180: { @@ -382,6 +419,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 190: { @@ -390,6 +428,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { user.items.gear.owned.shield_special_wintryMirror = true; // eslint-disable-line camelcase user.items.gear.owned.back_special_snowdriftVeil = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 200: { @@ -398,6 +437,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0; user.items.hatchingPotions.RoyalPurple += 1; + if (user.markModified) user.markModified('items.hatchingPotions'); }, }, 220: { @@ -406,6 +446,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.food.Saddle) user.items.food.Saddle = 0; user.items.food.Saddle += 1; + if (user.markModified) user.markModified('items.food'); }, }, 240: { @@ -414,6 +455,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { user.items.gear.owned.weapon_special_nomadsScimitar = true; // eslint-disable-line camelcase user.items.gear.owned.armor_special_nomadsCuirass = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 260: { @@ -421,6 +463,7 @@ module.exports = function getLoginIncentives (api) { reward: [api.gear.flat.head_special_spikedHelm], assignReward: function assignReward (user) { user.items.gear.owned.head_special_spikedHelm = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 280: { @@ -448,6 +491,7 @@ module.exports = function getLoginIncentives (api) { user.items.food.Milk += 3; if (!user.items.food.RottenMeat) user.items.food.RottenMeat = 0; user.items.food.RottenMeat += 3; + if (user.markModified) user.markModified('items.food'); }, }, 300: { @@ -473,6 +517,7 @@ module.exports = function getLoginIncentives (api) { user.items.eggs.TigerCub += 2; if (!user.items.eggs.Wolf) user.items.eggs.Wolf = 0; user.items.eggs.Wolf += 2; + if (user.markModified) user.markModified('items.eggs'); }, }, 320: { @@ -480,6 +525,7 @@ module.exports = function getLoginIncentives (api) { reward: [api.gear.flat.head_special_dandyHat], assignReward: function assignReward (user) { user.items.gear.owned.head_special_dandyHat = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 340: { @@ -488,6 +534,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { user.items.gear.owned.weapon_special_fencingFoil = true; // eslint-disable-line camelcase user.items.gear.owned.armor_special_dandySuit = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 360: { @@ -497,6 +544,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.food.Saddle) user.items.food.Saddle = 0; user.items.food.Saddle += 2; + if (user.markModified) user.markModified('items.food'); }, }, 380: { @@ -522,6 +570,7 @@ module.exports = function getLoginIncentives (api) { user.items.eggs.TigerCub += 3; if (!user.items.eggs.Wolf) user.items.eggs.Wolf = 0; user.items.eggs.Wolf += 3; + if (user.markModified) user.markModified('items.eggs'); }, }, 400: { @@ -549,6 +598,7 @@ module.exports = function getLoginIncentives (api) { user.items.food.Milk += 4; if (!user.items.food.RottenMeat) user.items.food.RottenMeat = 0; user.items.food.RottenMeat += 4; + if (user.markModified) user.markModified('items.food'); }, }, 425: { @@ -558,6 +608,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { if (!user.items.food.Saddle) user.items.food.Saddle = 0; user.items.food.Saddle += 3; + if (user.markModified) user.markModified('items.food'); }, }, 450: { @@ -566,6 +617,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { user.items.gear.owned.weapon_special_tachi = true; // eslint-disable-line camelcase user.items.gear.owned.armor_special_samuraiArmor = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 475: { @@ -574,6 +626,7 @@ module.exports = function getLoginIncentives (api) { assignReward: function assignReward (user) { user.items.gear.owned.head_special_kabuto = true; // eslint-disable-line camelcase user.items.gear.owned.shield_special_wakizashi = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); }, }, 500: { diff --git a/website/common/script/fns/randomDrop.js b/website/common/script/fns/randomDrop.js index deaf0127b3..6061b3f83f 100644 --- a/website/common/script/fns/randomDrop.js +++ b/website/common/script/fns/randomDrop.js @@ -75,6 +75,8 @@ module.exports = function randomDrop (user, options, req = {}, analytics) { user.items.food[drop.key] = user.items.food[drop.key] || 0; user.items.food[drop.key] += 1; + if (user.markModified) user.markModified('items.food'); + drop.type = 'Food'; drop.dialog = i18n.t('messageDropFood', { dropText: drop.textA(req.language), @@ -82,8 +84,11 @@ module.exports = function randomDrop (user, options, req = {}, analytics) { }, req.language); } else if (rarity > 0.3) { // eggs 30% chance drop = cloneDropItem(randomVal(content.dropEggs)); + user.items.eggs[drop.key] = user.items.eggs[drop.key] || 0; user.items.eggs[drop.key]++; + if (user.markModified) user.markModified('items.eggs'); + drop.type = 'Egg'; drop.dialog = i18n.t('messageDropEgg', { dropText: drop.text(req.language), @@ -102,8 +107,11 @@ module.exports = function randomDrop (user, options, req = {}, analytics) { drop = cloneDropItem(randomVal(pickBy(content.hatchingPotions, (v, k) => { return acceptableDrops.indexOf(k) >= 0; }))); + user.items.hatchingPotions[drop.key] = user.items.hatchingPotions[drop.key] || 0; user.items.hatchingPotions[drop.key]++; + if (user.markModified) user.markModified('items.hatchingPotions'); + drop.type = 'HatchingPotion'; drop.dialog = i18n.t('messageDropPotion', { dropText: drop.text(req.language), diff --git a/website/common/script/fns/resetGear.js b/website/common/script/fns/resetGear.js index d92df37da8..0a60635676 100644 --- a/website/common/script/fns/resetGear.js +++ b/website/common/script/fns/resetGear.js @@ -12,7 +12,7 @@ module.exports = function resetGear (user) { gear[type].shield = 'shield_base_0'; }); - // Gear.owned is a Mongo object so the _.each function iterates over hidden properties. + // Gear.owned is (was) a Mongo object so the _.each function iterates over hidden properties. // The content.gear.flat[k] check should prevent this causing an error each(gear.owned, function resetOwnedGear (v, k) { if (gear.owned[k] && content.gear.flat[k] && content.gear.flat[k].value) { @@ -21,5 +21,7 @@ module.exports = function resetGear (user) { }); gear.owned.weapon_warrior_0 = true; // eslint-disable-line camelcase + if (user.markModified) user.markModified('items.gear.owned'); + user.preferences.costume = false; }; diff --git a/website/common/script/fns/ultimateGear.js b/website/common/script/fns/ultimateGear.js index 3c9251fb6f..ea5101bb97 100644 --- a/website/common/script/fns/ultimateGear.js +++ b/website/common/script/fns/ultimateGear.js @@ -4,7 +4,7 @@ import reduce from 'lodash/reduce'; import includes from 'lodash/includes'; module.exports = function ultimateGear (user) { - let owned = typeof window !== 'undefined' ? user.items.gear.owned : user.items.gear.owned.toObject(); + let owned = user.items.gear.owned.toObject ? user.items.gear.owned.toObject() : user.items.gear.owned; content.classes.forEach((klass) => { if (user.achievements.ultimateGearSets[klass] !== true) { diff --git a/website/common/script/fns/updateStats.js b/website/common/script/fns/updateStats.js index 65d466f1b0..669fb46fd2 100644 --- a/website/common/script/fns/updateStats.js +++ b/website/common/script/fns/updateStats.js @@ -75,6 +75,8 @@ module.exports = function updateStats (user, stats, req = {}, analytics) { } else { user.items.eggs.Wolf = 1; } + + if (user.markModified) user.markModified('items.eggs'); } each({ vice1: 30, @@ -84,10 +86,12 @@ module.exports = function updateStats (user, stats, req = {}, analytics) { }, (lvl, k) => { if (user.stats.lvl >= lvl && !user.flags.levelDrops[k]) { user.flags.levelDrops[k] = true; - if (!user.items.quests[k]) - user.items.quests[k] = 0; - user.items.quests[k]++; if (user.markModified) user.markModified('flags.levelDrops'); + + if (!user.items.quests[k]) user.items.quests[k] = 0; + user.items.quests[k]++; + if (user.markModified) user.markModified('items.quests'); + if (analytics) { analytics.track('acquire item', { uuid: user._id, diff --git a/website/common/script/libs/statsComputed.js b/website/common/script/libs/statsComputed.js index 0997cae007..1239b6d9d5 100644 --- a/website/common/script/libs/statsComputed.js +++ b/website/common/script/libs/statsComputed.js @@ -10,7 +10,7 @@ function equipmentStatBonusComputed (stat, user) { let classBonus = 0; // toObject is required here due to lodash values not working well with mongoose doc objects. - // if toObject doesn't exist, we're on the client side and can assume the object is already plain JSON + // if toObject doesn't exist, we can assume the object is already plain JSON // see http://stackoverflow.com/questions/25767334/underscore-js-keys-and-omit-not-working-as-expected let equipped = user.items.gear.equipped; let equippedKeys = values(!equipped.toObject ? equipped : equipped.toObject()); diff --git a/website/common/script/ops/buy/buyArmoire.js b/website/common/script/ops/buy/buyArmoire.js index 6416815841..cd4eb796af 100644 --- a/website/common/script/ops/buy/buyArmoire.js +++ b/website/common/script/ops/buy/buyArmoire.js @@ -90,6 +90,8 @@ export class BuyArmoireOperation extends AbstractGoldItemOperation { } user.items.gear.owned[drop.key] = true; + if (user.markModified) user.markModified('items.gear.owned'); + user.flags.armoireOpened = true; let message = this.i18n('armoireEquipment', { image: ``, @@ -125,6 +127,7 @@ export class BuyArmoireOperation extends AbstractGoldItemOperation { user.items.food[drop.key] = user.items.food[drop.key] || 0; user.items.food[drop.key] += 1; + if (user.markModified) user.markModified('items.food'); if (this.analytics) { this._trackDropAnalytics(user._id, drop.key); diff --git a/website/common/script/ops/buy/buyMysterySet.js b/website/common/script/ops/buy/buyMysterySet.js index 7e0bf0c83a..db9ca557f2 100644 --- a/website/common/script/ops/buy/buyMysterySet.js +++ b/website/common/script/ops/buy/buyMysterySet.js @@ -38,6 +38,8 @@ module.exports = function buyMysterySet (user, req = {}, analytics) { } }); + if (user.markModified) user.markModified('items.gear.owned'); + user.purchased.plan.consecutive.trinkets--; return [ diff --git a/website/common/script/ops/buy/buyQuest.js b/website/common/script/ops/buy/buyQuest.js index c9fb3985fb..09f04dcb59 100644 --- a/website/common/script/ops/buy/buyQuest.js +++ b/website/common/script/ops/buy/buyQuest.js @@ -68,6 +68,7 @@ export class BuyQuestWithGoldOperation extends AbstractGoldItemOperation { executeChanges (user, item, req) { if (!user.items.quests[item.key] || user.items.quests[item.key] < 0) user.items.quests[item.key] = 0; user.items.quests[item.key] += this.quantity; + if (user.markModified) user.markModified('items.quests'); this.subtractCurrency(user, item, this.quantity); diff --git a/website/common/script/ops/buy/buyQuestGem.js b/website/common/script/ops/buy/buyQuestGem.js index 90cf0190e8..1a1a24d90a 100644 --- a/website/common/script/ops/buy/buyQuestGem.js +++ b/website/common/script/ops/buy/buyQuestGem.js @@ -48,6 +48,7 @@ export class BuyQuestWithGemOperation extends AbstractGemItemOperation { executeChanges (user, item, req) { user.items.quests[item.key] = user.items.quests[item.key] || 0; user.items.quests[item.key] += this.quantity; + if (user.markModified) user.markModified('items.quests'); this.subtractCurrency(user, item, this.quantity); diff --git a/website/common/script/ops/buy/hourglassPurchase.js b/website/common/script/ops/buy/hourglassPurchase.js index 5354ee20bd..44f6e1a6f4 100644 --- a/website/common/script/ops/buy/hourglassPurchase.js +++ b/website/common/script/ops/buy/hourglassPurchase.js @@ -36,10 +36,12 @@ module.exports = function purchaseHourglass (user, req = {}, analytics) { if (type === 'pets') { user.items.pets[key] = 5; + if (user.markModified) user.markModified('items.pets'); } if (type === 'mounts') { user.items.mounts[key] = true; + if (user.markModified) user.markModified('items.mounts'); } if (analytics) { diff --git a/website/common/script/ops/buy/purchase.js b/website/common/script/ops/buy/purchase.js index bd07248590..752ffed231 100644 --- a/website/common/script/ops/buy/purchase.js +++ b/website/common/script/ops/buy/purchase.js @@ -47,6 +47,7 @@ function purchaseItem (user, item, price, type, key) { if (type === 'gear') { user.items.gear.owned[key] = true; + if (user.markModified) user.markModified('items.gear.owned'); } else if (type === 'bundles') { let subType = item.type; forEach(item.bundleKeys, function addBundledItems (bundledKey) { @@ -55,11 +56,13 @@ function purchaseItem (user, item, price, type, key) { } user.items[subType][bundledKey]++; }); + if (user.markModified) user.markModified(`items.${subType}`); } else { if (!user.items[type][key] || user.items[type][key] < 0) { user.items[type][key] = 0; } user.items[type][key]++; + if (user.markModified) user.markModified(`items.${type}`); } } diff --git a/website/common/script/ops/changeClass.js b/website/common/script/ops/changeClass.js index 618a617619..49af6f481a 100644 --- a/website/common/script/ops/changeClass.js +++ b/website/common/script/ops/changeClass.js @@ -53,7 +53,8 @@ module.exports = function changeClass (user, req = {}, analytics) { addPinnedGearByClass(user); user.items.gear.owned[`weapon_${klass}_0`] = true; - if (klass === 'rogue') user.items.gear.owned[`shield_${klass}_0`] = true; + if (klass === 'rogue') user.items.gear.owned[`shield_${klass}_0`] = true; + if (user.markModified) user.markModified('items.gear.owned'); removePinnedItemsByOwnedGear(user); diff --git a/website/common/script/ops/equip.js b/website/common/script/ops/equip.js index 679a5aa4a2..329eb46a8b 100644 --- a/website/common/script/ops/equip.js +++ b/website/common/script/ops/equip.js @@ -52,6 +52,8 @@ module.exports = function equip (user, req = {}) { user.items.gear[type].toObject ? user.items.gear[type].toObject() : user.items.gear[type], {[item.type]: `${item.type}_base_0`} ); + if (user.markModified && type === 'owned') user.markModified('items.gear.owned'); + message = i18n.t('messageUnEquipped', { itemText: item.text(req.language), }, req.language); @@ -61,6 +63,8 @@ module.exports = function equip (user, req = {}) { user.items.gear[type].toObject ? user.items.gear[type].toObject() : user.items.gear[type], {[item.type]: item.key} ); + if (user.markModified && type === 'owned') user.markModified('items.gear.owned'); + message = handleTwoHanded(user, item, type, req); } break; diff --git a/website/common/script/ops/feed.js b/website/common/script/ops/feed.js index 9e4582b71b..1a66770d28 100644 --- a/website/common/script/ops/feed.js +++ b/website/common/script/ops/feed.js @@ -12,6 +12,11 @@ function evolve (user, pet, req) { user.items.pets[pet.key] = -1; user.items.mounts[pet.key] = true; + if (user.markModified) { + user.markModified('items.pets'); + user.markModified('items.mounts'); + } + if (pet.key === user.items.currentPet) { user.items.currentPet = ''; } @@ -74,12 +79,15 @@ module.exports = function feed (user, req = {}) { message = i18n.t('messageDontEnjoyFood', messageParams, req.language); } + if (user.markModified) user.markModified('items.pets'); + if (userPets[pet.key] >= 50 && !user.items.mounts[pet.key]) { message = evolve(user, pet, req); } } user.items.food[food.key]--; + if (user.markModified) user.markModified('items.food'); return [ userPets[pet.key], diff --git a/website/common/script/ops/hatch.js b/website/common/script/ops/hatch.js index eacb1c0e49..121e45647e 100644 --- a/website/common/script/ops/hatch.js +++ b/website/common/script/ops/hatch.js @@ -33,6 +33,11 @@ module.exports = function hatch (user, req = {}) { user.items.pets[pet] = 5; user.items.eggs[egg]--; user.items.hatchingPotions[hatchingPotion]--; + if (user.markModified) { + user.markModified('items.pets'); + user.markModified('items.eggs'); + user.markModified('items.hatchingPotions'); + } return [ user.items, diff --git a/website/common/script/ops/openMysteryItem.js b/website/common/script/ops/openMysteryItem.js index 4773565b89..c45d63e925 100644 --- a/website/common/script/ops/openMysteryItem.js +++ b/website/common/script/ops/openMysteryItem.js @@ -26,7 +26,10 @@ module.exports = function openMysteryItem (user, req = {}, analytics) { item = cloneDeep(content.gear.flat[item]); user.items.gear.owned[item.key] = true; - if (user.markModified) user.markModified('purchased.plan.mysteryItems'); + if (user.markModified) { + user.markModified('purchased.plan.mysteryItems'); + user.markModified('items.gear.owned'); + } if (analytics) { analytics.track('open mystery item', { diff --git a/website/common/script/ops/pinnedGearUtils.js b/website/common/script/ops/pinnedGearUtils.js index bc96ad2be3..e3deed562c 100644 --- a/website/common/script/ops/pinnedGearUtils.js +++ b/website/common/script/ops/pinnedGearUtils.js @@ -98,7 +98,10 @@ function removePinnedGearAddPossibleNewOnes (user, itemPath, newItemKey) { // an item of the users current "new" gear was bought // remove the old pinned gear items and add the new gear back removePinnedGearByClass(user); + user.items.gear.owned[newItemKey] = true; + if (user.markModified) user.markModified('items.gear.owned'); + addPinnedGearByClass(user); // update the version, so that vue can refresh the seasonal shop diff --git a/website/common/script/ops/releaseBoth.js b/website/common/script/ops/releaseBoth.js index c306d92793..75aa65abd7 100644 --- a/website/common/script/ops/releaseBoth.js +++ b/website/common/script/ops/releaseBoth.js @@ -62,6 +62,10 @@ module.exports = function releaseBoth (user, req = {}) { user.items.pets[animal] = 0; user.items.mounts[animal] = null; } + if (user.markModified) { + user.markModified('items.pets'); + user.markModified('items.mounts'); + } if (giveBeastMasterAchievement) { if (!user.achievements.beastMasterCount) { diff --git a/website/common/script/ops/releaseMounts.js b/website/common/script/ops/releaseMounts.js index 4462d11f44..adb9d96dfd 100644 --- a/website/common/script/ops/releaseMounts.js +++ b/website/common/script/ops/releaseMounts.js @@ -30,6 +30,7 @@ module.exports = function releaseMounts (user, req = {}, analytics) { } user.items.mounts[mount] = null; } + if (user.markModified) user.markModified('items.mounts'); if (giveMountMasterAchievement) { if (!user.achievements.mountMasterCount) { diff --git a/website/common/script/ops/releasePets.js b/website/common/script/ops/releasePets.js index 0124474a37..0764fddb62 100644 --- a/website/common/script/ops/releasePets.js +++ b/website/common/script/ops/releasePets.js @@ -30,6 +30,7 @@ module.exports = function releasePets (user, req = {}, analytics) { } user.items.pets[pet] = 0; } + if (user.markModified) user.markModified('items.pets'); if (giveBeastMasterAchievement) { if (!user.achievements.beastMasterCount) { diff --git a/website/common/script/ops/revive.js b/website/common/script/ops/revive.js index b8ddb0b637..14ad3d1ddd 100644 --- a/website/common/script/ops/revive.js +++ b/website/common/script/ops/revive.js @@ -87,6 +87,7 @@ module.exports = function revive (user, req = {}, analytics) { removePinnedGearByClass(user); user.items.gear.owned[lostItem] = false; + if (user.markModified) user.markModified('items.gear.owned'); addPinnedGearByClass(user); diff --git a/website/common/script/ops/sell.js b/website/common/script/ops/sell.js index b777a32e76..796ed929c2 100644 --- a/website/common/script/ops/sell.js +++ b/website/common/script/ops/sell.js @@ -44,6 +44,8 @@ module.exports = function sell (user, req = {}) { } user.items[type][key] -= amount; + if (user.markModified) user.markModified(`items.${type}`); + user.stats.gp += content[type][key].value * amount; return [ diff --git a/website/common/script/ops/unlock.js b/website/common/script/ops/unlock.js index bbf59c7b2a..7adbac48de 100644 --- a/website/common/script/ops/unlock.js +++ b/website/common/script/ops/unlock.js @@ -75,6 +75,7 @@ module.exports = function unlock (user, req = {}, analytics) { setWith(user, pathPart, true, Object); let itemName = pathPart.split('.').pop(); removeItemByPath(user, `gear.flat.${itemName}`); + if (user.markModified && path.indexOf('gear.owned') !== -1) user.markModified('items.gear.owned'); } // Using Object so path[1] won't create an array but an object {path: {1: value}} @@ -96,6 +97,7 @@ module.exports = function unlock (user, req = {}, analytics) { if (path.indexOf('gear.') !== -1) { // Using Object so path[1] won't create an array but an object {path: {1: value}} setWith(user, path, true, Object); + if (user.markModified && path.indexOf('gear.owned') !== -1) user.markModified('items.gear.owned'); } // Using Object so path[1] won't create an array but an object {path: {1: value}} setWith(user, `purchased.${path}`, true, Object); diff --git a/website/server/controllers/api-v3/auth.js b/website/server/controllers/api-v3/auth.js index 84c5485fe6..bdf8c17a72 100644 --- a/website/server/controllers/api-v3/auth.js +++ b/website/server/controllers/api-v3/auth.js @@ -204,6 +204,8 @@ api.updateUsername = { } else { user.items.pets['Wolf-Veteran'] = 5; } + + user.markModified('items.pets'); } await user.save(); diff --git a/website/server/controllers/api-v3/debug.js b/website/server/controllers/api-v3/debug.js index 27b7156d68..eb2cd31260 100644 --- a/website/server/controllers/api-v3/debug.js +++ b/website/server/controllers/api-v3/debug.js @@ -135,6 +135,7 @@ api.modifyInventory = { if (gear) { user.items.gear.owned = gear; + user.markModified('items.gear.owned'); } [ @@ -148,6 +149,7 @@ api.modifyInventory = { ].forEach((type) => { if (req.body[type]) { user.items[type] = req.body[type]; + user.markModified(`items.${type}`); } }); diff --git a/website/server/controllers/api-v3/groups.js b/website/server/controllers/api-v3/groups.js index 9eef5108e9..eed4aff4cb 100644 --- a/website/server/controllers/api-v3/groups.js +++ b/website/server/controllers/api-v3/groups.js @@ -595,6 +595,7 @@ api.joinGroup = { inviter.items.quests.basilist = 0; } inviter.items.quests.basilist++; + inviter.markModified('items.quests'); } promises.push(inviter.save()); } @@ -890,6 +891,7 @@ api.removeGroupMember = { if (group.quest && group.quest.active && group.quest.leader === member._id) { member.items.quests[group.quest.key] += 1; + member.markModified('items.quests'); } } else if (isInvited) { if (isInvited === 'guild') { diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js index 2073962af0..5309b56e4f 100644 --- a/website/server/controllers/api-v3/hall.js +++ b/website/server/controllers/api-v3/hall.js @@ -7,6 +7,8 @@ import { import _ from 'lodash'; import apiError from '../../libs/apiError'; import validator from 'validator'; +import { validateItemPath } from '../../libs/items/utils'; + let api = {}; @@ -264,10 +266,11 @@ api.updateHero = { if (updateData.purchased && updateData.purchased.ads) hero.purchased.ads = updateData.purchased.ads; // give them the Dragon Hydra pet if they're above level 6 - if (hero.contributor.level >= 6) hero.items.pets['Dragon-Hydra'] = 5; - if (updateData.itemPath && updateData.itemVal && - updateData.itemPath.indexOf('items.') === 0 && - User.schema.paths[updateData.itemPath]) { + if (hero.contributor.level >= 6) { + hero.items.pets['Dragon-Hydra'] = 5; + hero.markModified('items.pets'); + } + if (updateData.itemPath && updateData.itemVal && validateItemPath(updateData.itemPath)) { _.set(hero, updateData.itemPath, updateData.itemVal); // Sanitization at 5c30944 (deemed unnecessary) } diff --git a/website/server/libs/items/utils.js b/website/server/libs/items/utils.js new file mode 100644 index 0000000000..0c0d9adf2f --- /dev/null +++ b/website/server/libs/items/utils.js @@ -0,0 +1,57 @@ +import shared from '../../../common'; +import { model as User } from '../../models/user'; +import { last } from 'lodash'; + +// Build a list of gear items owned by default +const defaultOwnedGear = {}; + +Object.keys(shared.content.gear.flat).forEach(key => { + const item = shared.content.gear.flat[key]; + if (item.key.match(/(armor|head|shield)_warrior_0/) || item.gearSet === 'glasses' || item.gearSet === 'headband') { + defaultOwnedGear[item.key] = true; + } +}); + +export function getDefaultOwnedGear () { + // Clone to avoid modifications to the original object + return Object.assign({}, defaultOwnedGear); +} + +// When passed a path to an item in the user object it'll return true if +// it's valid, false otherwsie +// Example of an item path: `items.gear.owned.head_warrior_0` +export function validateItemPath (itemPath) { + // The item path must start with `items.` + if (itemPath.indexOf('items.') !== 0) return false; + if (User.schema.paths[itemPath]) return true; + + const key = last(itemPath.split('.')); + + if (itemPath.indexOf('items.gear.owned') === 0) { + return Boolean(shared.content.gear.flat[key]); + } + + if (itemPath.indexOf('items.pets') === 0) { + return Boolean(shared.content.petInfo[key]); + } + + if (itemPath.indexOf('items.eggs') === 0) { + return Boolean(shared.content.eggs[key]); + } + + if (itemPath.indexOf('items.hatchingPotions') === 0) { + return Boolean(shared.content.hatchingPotions[key]); + } + + if (itemPath.indexOf('items.food') === 0) { + return Boolean(shared.content.food[key]); + } + + if (itemPath.indexOf('items.mounts') === 0) { + return Boolean(shared.content.mountInfo[key]); + } + + if (itemPath.indexOf('items.quests') === 0) { + return Boolean(shared.content.quests[key]); + } +} \ No newline at end of file diff --git a/website/server/libs/payments/groupPayments.js b/website/server/libs/payments/groupPayments.js index b632667284..5da9309f1f 100644 --- a/website/server/libs/payments/groupPayments.js +++ b/website/server/libs/payments/groupPayments.js @@ -170,6 +170,7 @@ async function addSubToGroupUser (member, group) { member.purchased.plan = plan; member.items.mounts['Jackalope-RoyalPurple'] = true; + member.markModified('items.mounts'); data.user = member; await this.createSubscription(data); diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js index 549b41d1dc..fe0119e09a 100644 --- a/website/server/libs/payments/subscriptions.js +++ b/website/server/libs/payments/subscriptions.js @@ -140,6 +140,7 @@ async function createSubscription (data) { if (recipient !== group) { recipient.items.pets['Jackalope-RoyalPurple'] = 5; + recipient.markModified('items.pets'); revealMysteryItems(recipient); } diff --git a/website/server/models/coupon.js b/website/server/models/coupon.js index 2d99143b68..f08a8135eb 100644 --- a/website/server/models/coupon.js +++ b/website/server/models/coupon.js @@ -46,6 +46,8 @@ schema.statics.apply = async function applyCoupon (user, req, code) { user.items.gear.owned.body_special_wondercon_red = true; user.items.gear.owned.body_special_wondercon_black = true; user.items.gear.owned.body_special_wondercon_gold = true; + user.markModified('items.gear.owned'); + user.extra = {signupEvent: 'wondercon'}; } diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js index 75bee4d71d..ed3a7514b5 100644 --- a/website/server/models/user/hooks.js +++ b/website/server/models/user/hooks.js @@ -125,6 +125,8 @@ function _setUpNewUser (user) { let iterableFlags = user.flags.toObject(); user.items.quests.dustbunnies = 1; + user.markModified('items.quests'); + user.purchased.background.violet = true; user.preferences.background = 'violet'; @@ -217,6 +219,7 @@ schema.pre('save', true, function preSaveUser (next, done) { // automatically granted an item during a certain time period: // if (!this.items.pets['JackOLantern-Base'] && moment().isBefore('2014-11-01')) // this.items.pets['JackOLantern-Base'] = 5; + // this.markModified('items.pets'); } // Filter notifications, remove unvalid and not necessary, handle the ones that have special requirements diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index 42871628c8..e411bfb437 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -1,6 +1,5 @@ import mongoose from 'mongoose'; import shared from '../../../common'; -import _ from 'lodash'; import validator from 'validator'; import { schema as TagSchema } from '../tag'; import { schema as PushDeviceSchema } from '../pushDevice'; @@ -11,6 +10,9 @@ import { import { schema as SubscriptionPlanSchema, } from '../subscriptionPlan'; +import { + getDefaultOwnedGear, +} from '../../libs/items/utils'; const Schema = mongoose.Schema; @@ -251,12 +253,12 @@ let schema = new Schema({ items: { gear: { - owned: _.transform(shared.content.gear.flat, (m, v) => { - m[v.key] = {$type: Boolean}; - if (v.key.match(/(armor|head|shield)_warrior_0/) || v.gearSet === 'glasses' || v.gearSet === 'headband') { - m[v.key].default = true; - } - }), + owned: { + $type: Schema.Types.Mixed, + default: () => { + return getDefaultOwnedGear(); + }, + }, equipped: { weapon: String, @@ -310,55 +312,52 @@ let schema = new Schema({ // 'PandaCub-Red': 10, // Number represents "Growth Points" // etc... // } - pets: _.defaults( - // First transform to a 1D eggs/potions mapping - _.transform(shared.content.pets, (m, v, k) => m[k] = Number), - // Then add additional pets (quest, backer, contributor, premium) - _.transform(shared.content.questPets, (m, v, k) => m[k] = Number), - _.transform(shared.content.specialPets, (m, v, k) => m[k] = Number), - _.transform(shared.content.premiumPets, (m, v, k) => m[k] = Number) - ), + pets: {$type: Schema.Types.Mixed, default: () => { + return {}; + }}, currentPet: String, // Cactus-Desert // eggs: { // 'PandaCub': 0, // 0 indicates "doesn't own" // 'Wolf': 5 // Number indicates "stacking" // } - eggs: _.transform(shared.content.eggs, (m, v, k) => m[k] = Number), + eggs: {$type: Schema.Types.Mixed, default: () => { + return {}; + }}, // hatchingPotions: { // 'Desert': 0, // 0 indicates "doesn't own" // 'CottonCandyBlue': 5 // Number indicates "stacking" // } - hatchingPotions: _.transform(shared.content.hatchingPotions, (m, v, k) => m[k] = Number), + hatchingPotions: {$type: Schema.Types.Mixed, default: () => { + return {}; + }}, // Food: { // 'Watermelon': 0, // 0 indicates "doesn't own" // 'RottenMeat': 5 // Number indicates "stacking" // } - food: _.transform(shared.content.food, (m, v, k) => m[k] = Number), + food: {$type: Schema.Types.Mixed, default: () => { + return {}; + }}, // mounts: { // 'Wolf-Desert': true, // 'PandaCub-Red': false, // etc... // } - mounts: _.defaults( - // First transform to a 1D eggs/potions mapping - _.transform(shared.content.pets, (m, v, k) => m[k] = Boolean), - // Then add quest and premium pets - _.transform(shared.content.questPets, (m, v, k) => m[k] = Boolean), - _.transform(shared.content.premiumPets, (m, v, k) => m[k] = Boolean), - // Then add additional mounts (backer, contributor) - _.transform(shared.content.specialMounts, (m, v, k) => m[k] = Boolean) - ), + mounts: {$type: Schema.Types.Mixed, default: () => { + return {}; + }}, currentMount: String, // Quests: { // 'boss_0': 0, // 0 indicates "doesn't own" // 'collection_honey': 5 // Number indicates "stacking" // } - quests: _.transform(shared.content.quests, (m, v, k) => m[k] = Number), + quests: {$type: Schema.Types.Mixed, default: () => { + return {}; + }}, lastDrop: { date: {$type: Date, default: Date.now}, From 58a43f51d8feb2fba564435581e1e05ff757e556 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Tue, 2 Apr 2019 23:04:59 +0200 Subject: [PATCH 20/25] downgrade mongoose --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 191a221bc0..96565fe398 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16621,9 +16621,9 @@ } }, "mongoose": { - "version": "5.4.20", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.4.20.tgz", - "integrity": "sha512-CyybxMQbCaq6jvbroamS5mPfFbxTOLLpdpkQrk1cj7Az1TX+mBbcCVhz+7XElfTMIOb58ah9O+EXmZJsLPD3Lg==", + "version": "5.4.19", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.4.19.tgz", + "integrity": "sha512-paRU3nbCrPIUVw1GAlxo11uIIqrYORctUx1kcLj7i2NhkxPQuy5OK2/FYj8+tglsaixycmONSyop2HQp1IUQSA==", "requires": { "async": "2.6.1", "bson": "~1.1.0", diff --git a/package.json b/package.json index 5559c70666..a6c0b81709 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "method-override": "^3.0.0", "moment": "^2.22.1", "moment-recur": "^1.0.7", - "mongoose": "^5.4.20", + "mongoose": "^5.4.19", "morgan": "^1.7.0", "nconf": "^0.10.0", "node-gcm": "^1.0.2", From e10655a5b42200f2a58fe5cf2a2ffa1efc4fcd3d Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Tue, 2 Apr 2019 23:19:01 +0200 Subject: [PATCH 21/25] fix(logs): fix FCM logging --- website/server/libs/pushNotifications.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/server/libs/pushNotifications.js b/website/server/libs/pushNotifications.js index 0dc2db8018..4cd4a1d82f 100644 --- a/website/server/libs/pushNotifications.js +++ b/website/server/libs/pushNotifications.js @@ -49,7 +49,7 @@ function sendNotification (user, details = {}) { fcmSender.send(message, { registrationTokens: [pushDevice.regId], - }, 10, (err) => logger.error('FCM Error', err)); + }, 10, (err) => logger.error(err, 'FCM Error')); } break; From a0f42b0e3e46891815d375865e95f680e692ab1d Mon Sep 17 00:00:00 2001 From: Randi Miller Date: Tue, 2 Apr 2019 17:22:23 -0400 Subject: [PATCH 22/25] Add min-width to PM for wrapping fixes #11060 (#11081) --- website/client/components/chat/chatMessages.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/client/components/chat/chatMessages.vue b/website/client/components/chat/chatMessages.vue index 845e3a8bec..6ee84b98d8 100644 --- a/website/client/components/chat/chatMessages.vue +++ b/website/client/components/chat/chatMessages.vue @@ -93,6 +93,10 @@ padding: 0rem; width: 90%; } + + .message-scroll .d-flex { + min-width: 1px; + }