From 618a8bc2e094bac3bb0141ec583846b504cba395 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 8 Nov 2024 17:26:41 +0800 Subject: [PATCH] update --- config/index.js | 2 +- package-lock.json | 549 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 550 insertions(+), 1 deletion(-) diff --git a/config/index.js b/config/index.js index 332a6e9..172ccbf 100644 --- a/config/index.js +++ b/config/index.js @@ -23,7 +23,7 @@ module.exports = { }, // Various Dev Server settings - host: '192.168.110.2', // can be overwritten by process.env.HOST + host: 'localhost', // can be overwritten by process.env.HOST port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/package-lock.json b/package-lock.json index 8a4cbca..6602df5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,11 @@ }, "color-convert": { "version": "2.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", +======= + "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", +>>>>>>> Stashed changes "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { @@ -41,13 +45,21 @@ }, "color-name": { "version": "1.1.4", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", +======= + "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", +>>>>>>> Stashed changes "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, "is-fullwidth-code-point": { "version": "3.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", +======= + "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", +>>>>>>> Stashed changes "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, @@ -64,7 +76,11 @@ }, "string-width-cjs": { "version": "npm:string-width@4.2.3", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", +======= + "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", +>>>>>>> Stashed changes "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { @@ -75,19 +91,31 @@ "dependencies": { "ansi-regex": { "version": "5.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", +======= + "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", +>>>>>>> Stashed changes "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "emoji-regex": { "version": "8.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", +======= + "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", +>>>>>>> Stashed changes "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "strip-ansi": { "version": "6.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", +======= + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", +>>>>>>> Stashed changes "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { @@ -107,7 +135,11 @@ }, "strip-ansi-cjs": { "version": "npm:strip-ansi@6.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", +======= + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", +>>>>>>> Stashed changes "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { @@ -116,7 +148,11 @@ "dependencies": { "ansi-regex": { "version": "5.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", +======= + "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", +>>>>>>> Stashed changes "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true } @@ -135,7 +171,11 @@ }, "wrap-ansi-cjs": { "version": "npm:wrap-ansi@7.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", +======= + "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz", +>>>>>>> Stashed changes "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "requires": { @@ -146,13 +186,21 @@ "dependencies": { "ansi-regex": { "version": "5.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", +======= + "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", +>>>>>>> Stashed changes "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { "version": "4.3.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", +======= + "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", +>>>>>>> Stashed changes "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { @@ -161,13 +209,21 @@ }, "emoji-regex": { "version": "8.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", +======= + "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", +>>>>>>> Stashed changes "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "string-width": { "version": "4.2.3", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", +======= + "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", +>>>>>>> Stashed changes "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { @@ -178,7 +234,11 @@ }, "strip-ansi": { "version": "6.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", +======= + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", +>>>>>>> Stashed changes "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { @@ -18906,18 +18966,33 @@ }, "fsevents": { "version": "1.1.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.1.tgz", "integrity": "sha512-ZeseH6alYYiwaLQRcZXToX6a2wjOpaToC/jjZNEhPvwrbhsDSckn27SGDkvbDy0CoOuTsw075QzbkPxbpYJepA==", "optional": true, "requires": { "nan": "^2.3.0", "node-pre-gyp": "^0.6.29" +======= + "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.11.tgz", + "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==", + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1", + "node-pre-gyp": "*" +>>>>>>> Stashed changes }, "dependencies": { "abbrev": { "version": "1.1.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=", +======= + "resolved": "https://registry.npmmirror.com/abbrev/-/abbrev-1.1.0.tgz", + "integrity": "sha512-c92Vmq5hfBgXyoUaHqF8P5+7THGjvxAlB64tm3PiFSAcDww34ndmrlSOd3AUaBZoutDwX0dHz9nUUFoD1jEw0Q==", +>>>>>>> Stashed changes "optional": true }, "ansi-regex": { @@ -18928,20 +19003,35 @@ }, "ansi-styles": { "version": "2.2.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", +======= + "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==", +>>>>>>> Stashed changes "optional": true }, "aproba": { "version": "1.1.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz", "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=", +======= + "resolved": "https://registry.npmmirror.com/aproba/-/aproba-1.1.1.tgz", + "integrity": "sha512-wddRlyVZ7n0ZClzsf0Aqf5vGke7/X8QT0GElKYr8qAuE80tlqbvKf4hlrDE0/zqI8Z6j4HjIIaB9gZ484kjjsw==", +>>>>>>> Stashed changes "optional": true }, "are-we-there-yet": { "version": "1.1.2", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz", "integrity": "sha1-gORw6VoIR5T+GJkmLFZnxuiN4bM=", +======= + "resolved": "https://registry.npmmirror.com/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz", + "integrity": "sha512-Ph/5XGGWoEy6z2VsZmELQW3qZtrITchV1zMNt1OonqoSoYo9acY23weZ67fLKTaRdMEGBYDx/jDJBGS8YlwPvg==", +>>>>>>> Stashed changes "optional": true, "requires": { "delegates": "^1.0.0", @@ -18950,44 +19040,79 @@ }, "asn1": { "version": "0.2.3", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", +======= + "resolved": "https://registry.npmmirror.com/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha512-6i37w/+EhlWlGUJff3T/Q8u1RGmP5wgbiwYnOnbOqvtrPxT63/sYFyP9RcpxtxGymtfA075IvmOnL7ycNOWl3w==", +>>>>>>> Stashed changes "optional": true }, "assert-plus": { "version": "0.2.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", +======= + "resolved": "https://registry.npmmirror.com/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha512-u1L0ZLywRziOVjUhRxI0Qg9G+4RnFB9H/Rq40YWn0dieDgO7vAYeJz6jKAO6t/aruzlDFLAPkQTT87e+f8Imaw==", +>>>>>>> Stashed changes "optional": true }, "asynckit": { "version": "0.4.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", +======= + "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", +>>>>>>> Stashed changes "optional": true }, "aws-sign2": { "version": "0.6.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", +======= + "resolved": "https://registry.npmmirror.com/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha512-JnJpAS0p9RmixkOvW2XwDxxzs1bd4/VAGIl6Q0EC5YOo+p+hqIhtDhn/nmFnB/xUNXbLkpE2mOjgVIBRKD4xYw==", +>>>>>>> Stashed changes "optional": true }, "aws4": { "version": "1.6.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", +======= + "resolved": "https://registry.npmmirror.com/aws4/-/aws4-1.6.0.tgz", + "integrity": "sha512-tkleq4Df8UWu/7xf/tfbo7t2vDa07bcONGnKhl0QXKQsh3fJ0yJ1M5wzpy8BtBSENQw/9VTsthMhLG+yXHfStQ==", +>>>>>>> Stashed changes "optional": true }, "balanced-match": { "version": "0.4.2", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", +======= + "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-0.4.2.tgz", + "integrity": "sha512-STw03mQKnGUYtoNjmowo4F2cRmIIxYEGiMsjjwla/u5P1lxadj/05WkNaFjNiKTgJkj8KiXbgAiRTmcQRwQNtg==", +>>>>>>> Stashed changes "optional": true }, "bcrypt-pbkdf": { "version": "1.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", +======= + "resolved": "https://registry.npmmirror.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha512-vY4sOrSlpwNZXsinfJ0HpbSkFft4nhSVLeUrQ4j2ydGmBOiVY83aMJStJATBy0C3+XdaYa990kIA1qkC2mUq6g==", +>>>>>>> Stashed changes "optional": true, "requires": { "tweetnacl": "^0.14.3" @@ -18995,8 +19120,13 @@ }, "block-stream": { "version": "0.0.9", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", +======= + "resolved": "https://registry.npmmirror.com/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha512-OorbnJVPII4DuUKbjARAe8u8EfqOmkEEaSFIyoQ7OjTHn6kafxWl0wLgoZ2rXaYd7MyLcDaU4TmhfxtwgcccMQ==", +>>>>>>> Stashed changes "optional": true, "requires": { "inherits": "~2.0.0" @@ -19004,8 +19134,13 @@ }, "boom": { "version": "2.10.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", +======= + "resolved": "https://registry.npmmirror.com/boom/-/boom-2.10.1.tgz", + "integrity": "sha512-KbiZEa9/vofNcVJXGwdWWn25reQ3V3dHBWbS07FTF3/TOehLnm9GEhJV4T6ZvGPkShRpmUqYwnaCrkj0mRnP6Q==", +>>>>>>> Stashed changes "optional": true, "requires": { "hoek": "2.x.x" @@ -19013,8 +19148,13 @@ }, "brace-expansion": { "version": "1.1.6", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", "integrity": "sha1-cZfX6qm4fmSDkOph/GbIRCdCDfk=", +======= + "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.6.tgz", + "integrity": "sha512-do+EUHPJZmz1wYWxOspwBMwgEqs0T5xSClPfYRwug3giEKZoiuMN9Ans1hjT8yZZ1Dkx1oaU4yRe540HKKHA0A==", +>>>>>>> Stashed changes "optional": true, "requires": { "balanced-match": "^0.4.1", @@ -19023,20 +19163,35 @@ }, "buffer-shims": { "version": "1.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=", +======= + "resolved": "https://registry.npmmirror.com/buffer-shims/-/buffer-shims-1.0.0.tgz", + "integrity": "sha512-Zy8ZXMyxIT6RMTeY7OP/bDndfj6bwCan7SS98CEndS6deHwWPpseeHlwarNcBim+etXnF9HBc1non5JgDaJU1g==", +>>>>>>> Stashed changes "optional": true }, "caseless": { "version": "0.11.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", +======= + "resolved": "https://registry.npmmirror.com/caseless/-/caseless-0.11.0.tgz", + "integrity": "sha512-ODLXH644w9C2fMPAm7bMDQ3GRvipZWZfKc+8As6hIadRIelE0n0xZuN38NS6kiK3KPEVrpymmQD8bvncAHWQkQ==", +>>>>>>> Stashed changes "optional": true }, "chalk": { "version": "1.1.3", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", +======= + "resolved": "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==", +>>>>>>> Stashed changes "optional": true, "requires": { "ansi-styles": "^2.2.1", @@ -19054,8 +19209,13 @@ }, "combined-stream": { "version": "1.0.5", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", +======= + "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.5.tgz", + "integrity": "sha512-JgSRe4l4UzPwpJuxfcPWEK1SCrL4dxNjp1uqrQLMop3QZUVo+hDU8w9BJKA4JPbulTWI+UzrI2UA3tK12yQ6bg==", +>>>>>>> Stashed changes "optional": true, "requires": { "delayed-stream": "~1.0.0" @@ -19063,8 +19223,13 @@ }, "commander": { "version": "2.9.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", +======= + "resolved": "https://registry.npmmirror.com/commander/-/commander-2.9.0.tgz", + "integrity": "sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A==", +>>>>>>> Stashed changes "optional": true, "requires": { "graceful-readlink": ">= 1.0.0" @@ -19090,8 +19255,13 @@ }, "cryptiles": { "version": "2.0.5", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", +======= + "resolved": "https://registry.npmmirror.com/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha512-FFN5KwpvvQTTS5hWPxrU8/QE4kQUc6uwZcrnlMBN82t1MgAtq8mnoDwINBly9Tdr02seeIIhtdF+UH1feBYGog==", +>>>>>>> Stashed changes "optional": true, "requires": { "boom": "2.x.x" @@ -19099,8 +19269,13 @@ }, "dashdash": { "version": "1.14.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", +======= + "resolved": "https://registry.npmmirror.com/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", +>>>>>>> Stashed changes "optional": true, "requires": { "assert-plus": "^1.0.0" @@ -19108,16 +19283,26 @@ "dependencies": { "assert-plus": { "version": "1.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", +======= + "resolved": "https://registry.npmmirror.com/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", +>>>>>>> Stashed changes "optional": true } } }, "debug": { "version": "2.2.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", +======= + "resolved": "https://registry.npmmirror.com/debug/-/debug-2.2.0.tgz", + "integrity": "sha512-X0rGvJcskG1c3TgSCPqHJ0XJgwlcvOC7elJ5Y0hYuKBZoVqWpAMfLOeIh2UI/DCQ5ruodIjvsugZtjUYUw2pUw==", +>>>>>>> Stashed changes "optional": true, "requires": { "ms": "0.7.1" @@ -19125,14 +19310,24 @@ }, "deep-extend": { "version": "0.4.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz", "integrity": "sha1-7+QRPQgIX05vlod1mBD4B0aeIlM=", +======= + "resolved": "https://registry.npmmirror.com/deep-extend/-/deep-extend-0.4.1.tgz", + "integrity": "sha512-td/IpUMQ7E0yjmU8s3orgl5+Fvv41C8p0zzf+IRYVuE3bM5Fc0G3hyln0mz9VOPt5T7KahPU3hMdR0B6t9cdhQ==", +>>>>>>> Stashed changes "optional": true }, "delayed-stream": { "version": "1.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", +======= + "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", +>>>>>>> Stashed changes "optional": true }, "delegates": { @@ -19143,8 +19338,13 @@ }, "ecc-jsbn": { "version": "0.1.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", +======= + "resolved": "https://registry.npmmirror.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "integrity": "sha512-8Pvg9QY16SYajEL9W1Lk+9yM7XCK/MOq2wibslLZYAAEEkbAIO6mLkW+GFYbvvw8qTuDFzFMg40rS9IxkNCWPg==", +>>>>>>> Stashed changes "optional": true, "requires": { "jsbn": "~0.1.0" @@ -19152,32 +19352,57 @@ }, "escape-string-regexp": { "version": "1.0.5", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", +======= + "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", +>>>>>>> Stashed changes "optional": true }, "extend": { "version": "3.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz", "integrity": "sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ=", +======= + "resolved": "https://registry.npmmirror.com/extend/-/extend-3.0.0.tgz", + "integrity": "sha512-5mYyg57hpD+sFaJmgNL9BidQ5C7dmJE3U5vzlRWbuqG+8dytvYEoxvKs6Tj5cm3LpMsFvRt20qz1ckezmsOUgQ==", +>>>>>>> Stashed changes "optional": true }, "extsprintf": { "version": "1.0.2", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=", +======= + "resolved": "https://registry.npmmirror.com/extsprintf/-/extsprintf-1.0.2.tgz", + "integrity": "sha512-g21Br4ELmVaKCVSUSSTXecKG+MiLcHFoby5RPPUmfZdhQTontXUOPf0QK/TvreRjgItRiyO928zxR4TCrnuwmA==", +>>>>>>> Stashed changes "optional": true }, "forever-agent": { "version": "0.6.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", +======= + "resolved": "https://registry.npmmirror.com/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", +>>>>>>> Stashed changes "optional": true }, "form-data": { "version": "2.1.2", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz", "integrity": "sha1-icNTQAi5fq2ky7FX1Y9vXfAl6uQ=", +======= + "resolved": "https://registry.npmmirror.com/form-data/-/form-data-2.1.2.tgz", + "integrity": "sha512-qJCdAGsMWKS90wemiAqqkz+sz4pKoffKqOeVkmV83xX619JRoYJzqsZjoQ1qzGW8ZzmuhvHv4qBHxpSfKSwvLg==", +>>>>>>> Stashed changes "optional": true, "requires": { "asynckit": "^0.4.0", @@ -19193,8 +19418,13 @@ }, "fstream": { "version": "1.0.10", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz", "integrity": "sha1-YE6Kkv4m/9n2+uMDmdSYThqyKCI=", +======= + "resolved": "https://registry.npmmirror.com/fstream/-/fstream-1.0.10.tgz", + "integrity": "sha512-c8PWyQzw0JRHCbK5H2c1IQJDuOm2ssGIsmtPsPmKbKETciucj8XYvsFVImrucP1rvlEYb2VF/WM/8Nc4VOK1tA==", +>>>>>>> Stashed changes "optional": true, "requires": { "graceful-fs": "^4.1.2", @@ -19205,8 +19435,13 @@ }, "fstream-ignore": { "version": "1.0.5", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=", +======= + "resolved": "https://registry.npmmirror.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz", + "integrity": "sha512-VVRuOs41VUqptEGiR0N5ZoWEcfGvbGRqLINyZAhHRnF3DH5wrqjNkYr3VbRoZnI41BZgO7zIVdiobc13TVI1ow==", +>>>>>>> Stashed changes "optional": true, "requires": { "fstream": "^1.0.0", @@ -19216,8 +19451,13 @@ }, "gauge": { "version": "2.7.3", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz", "integrity": "sha1-HCOFX5YvF7OtPQ3HRD8wRULt/gk=", +======= + "resolved": "https://registry.npmmirror.com/gauge/-/gauge-2.7.3.tgz", + "integrity": "sha512-UnvQ6VA8+dfvcUvrG1AR5ZUSQssn56AhL04kXJzvjBRLvTAAQmCT3V+nCkoiwNHY3dWsOMRbQVeZR4/eL83ReQ==", +>>>>>>> Stashed changes "optional": true, "requires": { "aproba": "^1.0.3", @@ -19232,14 +19472,24 @@ }, "generate-function": { "version": "2.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=", +======= + "resolved": "https://registry.npmmirror.com/generate-function/-/generate-function-2.0.0.tgz", + "integrity": "sha512-X46lB9wLCsgkyagCmX2Dev5od5j6niCr3UeMbXVDBVO4tlpXp3o4OFh+0gPTlkD3ZMixU8PCKxf0IMGQvPo8HQ==", +>>>>>>> Stashed changes "optional": true }, "generate-object-property": { "version": "1.2.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", +======= + "resolved": "https://registry.npmmirror.com/generate-object-property/-/generate-object-property-1.2.0.tgz", + "integrity": "sha512-TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ==", +>>>>>>> Stashed changes "optional": true, "requires": { "is-property": "^1.0.0" @@ -19247,8 +19497,13 @@ }, "getpass": { "version": "0.1.6", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", "integrity": "sha1-KD/9n8ElaECHUxHBtg6MQBhxEOY=", +======= + "resolved": "https://registry.npmmirror.com/getpass/-/getpass-0.1.6.tgz", + "integrity": "sha512-Uj295v1VGRPhKEty7IiEzGYf2rAIEbcGQ8dxK5QrQuwP7tCW8ftD5o8FUsGW4MLdws4P3eKRBzo+mFySYYcimA==", +>>>>>>> Stashed changes "optional": true, "requires": { "assert-plus": "^1.0.0" @@ -19256,16 +19511,26 @@ "dependencies": { "assert-plus": { "version": "1.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", +======= + "resolved": "https://registry.npmmirror.com/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", +>>>>>>> Stashed changes "optional": true } } }, "glob": { "version": "7.1.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", +======= + "resolved": "https://registry.npmmirror.com/glob/-/glob-7.1.1.tgz", + "integrity": "sha512-mRyN/EsN2SyNhKWykF3eEGhDpeNplMWaW18Bmh76tnOqk5TbELAVwFAYOCmKVssOYFrYvvLMguiA+NXO3ZTuVA==", +>>>>>>> Stashed changes "optional": true, "requires": { "fs.realpath": "^1.0.0", @@ -19278,20 +19543,35 @@ }, "graceful-fs": { "version": "4.1.11", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", +======= + "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha512-9x6DLUuW+ROFdMTII9ec9t/FK8va6kYcC8/LggumssLM8kNv7IdFl3VrNUqgir2tJuBVxBga1QBoRziZacO5Zg==", +>>>>>>> Stashed changes "optional": true }, "graceful-readlink": { "version": "1.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", +======= + "resolved": "https://registry.npmmirror.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==", +>>>>>>> Stashed changes "optional": true }, "har-validator": { "version": "2.0.6", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", +======= + "resolved": "https://registry.npmmirror.com/har-validator/-/har-validator-2.0.6.tgz", + "integrity": "sha512-P6tFV+wCcUL3nbyTDAvveDySfbhy0XkDtAIfZP6HITjM2WUsiPna/Eg1Yy93SFXvahqoX+kt0n+6xlXKDXYowA==", +>>>>>>> Stashed changes "optional": true, "requires": { "chalk": "^1.1.1", @@ -19302,8 +19582,13 @@ }, "has-ansi": { "version": "2.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", +======= + "resolved": "https://registry.npmmirror.com/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==", +>>>>>>> Stashed changes "optional": true, "requires": { "ansi-regex": "^2.0.0" @@ -19317,8 +19602,13 @@ }, "hawk": { "version": "3.1.3", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", +======= + "resolved": "https://registry.npmmirror.com/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha512-X8xbmTc1cbPXcQV4WkLcRMALuyoxhfpFATmyuCxJPOAvrDS4DNnsTAOmKUxMTOWU6TzrTOkxPKwIx5ZOpJVSrg==", +>>>>>>> Stashed changes "optional": true, "requires": { "boom": "2.x.x", @@ -19329,14 +19619,24 @@ }, "hoek": { "version": "2.16.3", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", +======= + "resolved": "https://registry.npmmirror.com/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha512-V6Yw1rIcYV/4JsnggjBU0l4Kr+EXhpwqXRusENU1Xx6ro00IHPHYNynCuBTOZAPlr3AAmLvchH9I7N/VUdvOwQ==", +>>>>>>> Stashed changes "optional": true }, "http-signature": { "version": "1.1.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", +======= + "resolved": "https://registry.npmmirror.com/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha512-iUn0NcRULlDGtqNLN1Jxmzayk8ogm7NToldASyZBpM2qggbphjXzNOiw3piN8tgz+e/DRs6X5gAzFwTI6BCRcg==", +>>>>>>> Stashed changes "optional": true, "requires": { "assert-plus": "^0.2.0", @@ -19356,14 +19656,24 @@ }, "inherits": { "version": "2.0.3", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", +======= + "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", +>>>>>>> Stashed changes "optional": true }, "ini": { "version": "1.3.4", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", +======= + "resolved": "https://registry.npmmirror.com/ini/-/ini-1.3.4.tgz", + "integrity": "sha512-VUA7WAWNCWfm6/8f9kAb8Y6iGBWnmCfgFS5dTrv2C38LLm1KUmpY388mCVCJCsMKQomvOQ1oW8/edXdChd9ZXQ==", +>>>>>>> Stashed changes "optional": true }, "is-fullwidth-code-point": { @@ -19377,8 +19687,13 @@ }, "is-my-json-valid": { "version": "2.15.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz", "integrity": "sha1-k27do8o8IR/ZjzstPgjaQ/eykVs=", +======= + "resolved": "https://registry.npmmirror.com/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz", + "integrity": "sha512-32CTy9FyiPq2qLVcb5Jh3pScUj5aLP0NRqACYT1bkJs5zIJsfzcsMs+W1sk4p5FEY5r5CuSjJ1VuYKZsA32ohg==", +>>>>>>> Stashed changes "optional": true, "requires": { "generate-function": "^2.0.0", @@ -19389,14 +19704,24 @@ }, "is-property": { "version": "1.0.2", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", +======= + "resolved": "https://registry.npmmirror.com/is-property/-/is-property-1.0.2.tgz", + "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==", +>>>>>>> Stashed changes "optional": true }, "is-typedarray": { "version": "1.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", +======= + "resolved": "https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", +>>>>>>> Stashed changes "optional": true }, "isarray": { @@ -19407,14 +19732,24 @@ }, "isstream": { "version": "0.1.2", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", +======= + "resolved": "https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", +>>>>>>> Stashed changes "optional": true }, "jodid25519": { "version": "1.0.2", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=", +======= + "resolved": "https://registry.npmmirror.com/jodid25519/-/jodid25519-1.0.2.tgz", + "integrity": "sha512-b2Zna/wGIyTzi0Gemg27JYUaRyTyBETw5GnqyVQMr71uojOYMrgkD2+Px3bG2ZFi7/zTUXJSDoGoBOhMixq7tg==", +>>>>>>> Stashed changes "optional": true, "requires": { "jsbn": "~0.1.0" @@ -19422,32 +19757,57 @@ }, "jsbn": { "version": "0.1.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", +======= + "resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==", +>>>>>>> Stashed changes "optional": true }, "json-schema": { "version": "0.2.3", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", +======= + "resolved": "https://registry.npmmirror.com/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha512-a3xHnILGMtk+hDOqNwHzF6e2fNbiMrXZvxKQiEv2MlgQP+pjIOzqAmKYD2mDpXYE/44M7g+n9p2bKkYWDUcXCQ==", +>>>>>>> Stashed changes "optional": true }, "json-stringify-safe": { "version": "5.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", +======= + "resolved": "https://registry.npmmirror.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", +>>>>>>> Stashed changes "optional": true }, "jsonpointer": { "version": "4.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", +======= + "resolved": "https://registry.npmmirror.com/jsonpointer/-/jsonpointer-4.0.1.tgz", + "integrity": "sha512-K7vR/jmvXsP04hvItAziqPeWmGceLWye9tkqbI+zFCvD4aDnL94BbGHggtQTfqRxbsgGWb4ospGQU8Rd7CEzPg==", +>>>>>>> Stashed changes "optional": true }, "jsprim": { "version": "1.3.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz", "integrity": "sha1-KnJW9wQSop7jZwqspiWZTE3P8lI=", +======= + "resolved": "https://registry.npmmirror.com/jsprim/-/jsprim-1.3.1.tgz", + "integrity": "sha512-bxYB8xe0/KIpYlNbZcA9e+lNquVmdPUGmZFNIQiAHPxkUDK2THIq3R+7VVgnv3UkZ63BrJ10+IeNZuew4Pso9Q==", +>>>>>>> Stashed changes "optional": true, "requires": { "extsprintf": "1.0.2", @@ -19457,14 +19817,24 @@ }, "mime-db": { "version": "1.26.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz", "integrity": "sha1-6v/NDk/Gk1z4E02iRuLmw1MFrf8=", +======= + "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.26.0.tgz", + "integrity": "sha512-Bn4lTeTH3qxeM+u71GQVrY4AxQlqDT9jkapmEby7o6X9giHAS4U4ar/bzjkCocKAEPjP+77GmVxiYScExkiHyA==", +>>>>>>> Stashed changes "optional": true }, "mime-types": { "version": "2.1.14", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz", "integrity": "sha1-9+99l1g/yvO30oK2+LVnnaselO4=", +======= + "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.14.tgz", + "integrity": "sha512-okJd888hr2XVzvoRxEOnEEgmlsOnLVoIOAKoBgYMLOQPNQFprAx970dULXC3ueiQMIiTsSxUFSpa2y3IlBefCg==", +>>>>>>> Stashed changes "optional": true, "requires": { "mime-db": "~1.26.0" @@ -19472,8 +19842,13 @@ }, "minimatch": { "version": "3.0.3", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=", +======= + "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-NyXjqu1IwcqH6nv5vmMtaG3iw7kdV3g6MwlUBZkc3Vn5b5AMIWYKfptvzipoyFfhlfOgBQ9zoTxQMravF1QTnw==", +>>>>>>> Stashed changes "optional": true, "requires": { "brace-expansion": "^1.0.0" @@ -19496,14 +19871,24 @@ }, "ms": { "version": "0.7.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", +======= + "resolved": "https://registry.npmmirror.com/ms/-/ms-0.7.1.tgz", + "integrity": "sha512-lRLiIR9fSNpnP6TC4v8+4OU7oStC01esuNowdQ34L+Gk8e5Puoc88IqJ+XAY/B3Mn2ZKis8l8HX90oU8ivzUHg==", +>>>>>>> Stashed changes "optional": true }, "node-pre-gyp": { "version": "0.6.33", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz", "integrity": "sha1-ZArFUZj2qSWXLgwWxKwmoDTV7Mk=", +======= + "resolved": "https://registry.npmmirror.com/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz", + "integrity": "sha512-42vnYyn2joGJA0lZmoiSEYnRuRhVdB/6+mIdcN6Ue9pIM8NBvTr2x603tSFen39dThxHFNN+BFHZ8G8+LA/V3A==", +>>>>>>> Stashed changes "optional": true, "requires": { "mkdirp": "~0.5.1", @@ -19519,8 +19904,13 @@ }, "nopt": { "version": "3.0.6", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", +======= + "resolved": "https://registry.npmmirror.com/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==", +>>>>>>> Stashed changes "optional": true, "requires": { "abbrev": "1" @@ -19528,8 +19918,13 @@ }, "npmlog": { "version": "4.0.2", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz", "integrity": "sha1-0DlQ4OeM4VJ7om0qdZLpNIrD518=", +======= + "resolved": "https://registry.npmmirror.com/npmlog/-/npmlog-4.0.2.tgz", + "integrity": "sha512-EoRXwMcIkbPu0ufHuR6xqtN+oFW7HiULHVWENwMClAbZpE93wa0sZ8w1YmdEyRAQ0wakKFNXLVb2f441uHyJTA==", +>>>>>>> Stashed changes "optional": true, "requires": { "are-we-there-yet": "~1.1.2", @@ -19546,8 +19941,13 @@ }, "oauth-sign": { "version": "0.8.2", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", +======= + "resolved": "https://registry.npmmirror.com/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha512-VlF07iu3VV3+BTXj43Nmp6Irt/G7j/NgEctUS6IweH1RGhURjjCc2NWtzXFPXXWWfc7hgbXQdtiQu2LGp6MxUg==", +>>>>>>> Stashed changes "optional": true }, "object-assign": { @@ -19573,14 +19973,24 @@ }, "pinkie": { "version": "2.0.4", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", +======= + "resolved": "https://registry.npmmirror.com/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", +>>>>>>> Stashed changes "optional": true }, "pinkie-promise": { "version": "2.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", +======= + "resolved": "https://registry.npmmirror.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", +>>>>>>> Stashed changes "optional": true, "requires": { "pinkie": "^2.0.0" @@ -19588,26 +19998,46 @@ }, "process-nextick-args": { "version": "1.0.7", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", +======= + "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==", +>>>>>>> Stashed changes "optional": true }, "punycode": { "version": "1.4.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", +======= + "resolved": "https://registry.npmmirror.com/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", +>>>>>>> Stashed changes "optional": true }, "qs": { "version": "6.3.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.1.tgz", "integrity": "sha1-kYwLO802Z5dyuvE1say0wWUe150=", +======= + "resolved": "https://registry.npmmirror.com/qs/-/qs-6.3.1.tgz", + "integrity": "sha512-A4Hf32qAqlFeW0jPKgO8CiwK8KMBl9dv0I45752gbWG938IPI/pY7yK6hbBL5L0Y3nh5XeRWJ0MrGlK0VOFT7g==", +>>>>>>> Stashed changes "optional": true }, "rc": { "version": "1.1.7", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz", "integrity": "sha1-xepWS7B6/5/TpbMukGwdOmWUD+o=", +======= + "resolved": "https://registry.npmmirror.com/rc/-/rc-1.1.7.tgz", + "integrity": "sha512-6O2HbJTSrysm7Fismxe1DVrEiJdN3DkbBH7SKbEqPnWhjoIG+giX5k9UezdopF86tdQTGwo5wKswMfWBX0wz5w==", +>>>>>>> Stashed changes "optional": true, "requires": { "deep-extend": "~0.4.0", @@ -19618,16 +20048,26 @@ "dependencies": { "minimist": { "version": "1.2.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", +======= + "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==", +>>>>>>> Stashed changes "optional": true } } }, "readable-stream": { "version": "2.2.2", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz", "integrity": "sha1-qeb+w8fdqF+LsbO6cChgRVb8gl4=", +======= + "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.2.2.tgz", + "integrity": "sha512-WVJE6ORa9FY7MZXXhjm70pLl1hfiB6gPQrmcRtPH7gZlQDSSE/bnuC/PLD6nNNRUU0oeGp1bwmjvN8h+PH0yDA==", +>>>>>>> Stashed changes "optional": true, "requires": { "buffer-shims": "^1.0.0", @@ -19641,8 +20081,13 @@ }, "request": { "version": "2.79.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", +======= + "resolved": "https://registry.npmmirror.com/request/-/request-2.79.0.tgz", + "integrity": "sha512-e7MIJshe1eZAmRqg4ryaO0N9G0fs+/gpDe5FlbnIFy6zZznRSwdRFrLp63if0Yt43vrI5wowOqHv1qJdVocdOQ==", +>>>>>>> Stashed changes "optional": true, "requires": { "aws-sign2": "~0.6.0", @@ -19669,8 +20114,13 @@ }, "rimraf": { "version": "2.5.4", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=", +======= + "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-2.5.4.tgz", + "integrity": "sha512-Lw7SHMjssciQb/rRz7JyPIy9+bbUshEucPoLRvWqy09vC5zQixl8Uet+Zl+SROBB/JMWHJRdCk1qdxNWHNMvlQ==", +>>>>>>> Stashed changes "optional": true, "requires": { "glob": "^7.0.5" @@ -19678,8 +20128,13 @@ }, "semver": { "version": "5.3.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", +======= + "resolved": "https://registry.npmmirror.com/semver/-/semver-5.3.0.tgz", + "integrity": "sha512-mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw==", +>>>>>>> Stashed changes "optional": true }, "set-blocking": { @@ -19696,8 +20151,13 @@ }, "sntp": { "version": "1.0.9", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", +======= + "resolved": "https://registry.npmmirror.com/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha512-7bgVOAnPj3XjrKY577S+puCKGCRlUrcrEdsMeRXlg9Ghf5df/xNi6sONUa43WrHUd3TjJBF7O04jYoiY0FVa0A==", +>>>>>>> Stashed changes "optional": true, "requires": { "hoek": "2.x.x" @@ -19705,8 +20165,13 @@ }, "sshpk": { "version": "1.10.2", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz", "integrity": "sha1-1agEziJpVRVjjnmNviMnPeBwpfo=", +======= + "resolved": "https://registry.npmmirror.com/sshpk/-/sshpk-1.10.2.tgz", + "integrity": "sha512-KQh7n9HiKvK33VUUAew1GE7GC0kaPyvVQk+bulVMVJdLsvrMsjFpk44qQASup2gm4ZxAWQmqPZV1AzhCzyk1AA==", +>>>>>>> Stashed changes "optional": true, "requires": { "asn1": "~0.2.3", @@ -19722,8 +20187,13 @@ "dependencies": { "assert-plus": { "version": "1.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", +======= + "resolved": "https://registry.npmmirror.com/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", +>>>>>>> Stashed changes "optional": true } } @@ -19741,14 +20211,24 @@ }, "string_decoder": { "version": "0.10.31", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", +======= + "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==", +>>>>>>> Stashed changes "optional": true }, "stringstream": { "version": "0.0.5", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", +======= + "resolved": "https://registry.npmmirror.com/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha512-QUQ1kThMjLRt4jA8lsn9lyIkE9bKafE7LDOL/nBBUY9Tfv2i3x1NAsVHG0uMCusFOWeeI6COhY/F20+avxRWSw==", +>>>>>>> Stashed changes "optional": true }, "strip-ansi": { @@ -19768,14 +20248,24 @@ }, "supports-color": { "version": "2.0.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", +======= + "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==", +>>>>>>> Stashed changes "optional": true }, "tar": { "version": "2.2.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", +======= + "resolved": "https://registry.npmmirror.com/tar/-/tar-2.2.1.tgz", + "integrity": "sha512-2Tw2uNtZqQTSHTIMbKHKFeAPmKcljrNKqKiIN7pu3V/CxYqRgS8DLXvMkFRrbtXlg6mTOQcuTX7DMj18Xi0dtg==", +>>>>>>> Stashed changes "optional": true, "requires": { "block-stream": "*", @@ -19785,8 +20275,13 @@ }, "tar-pack": { "version": "3.3.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz", "integrity": "sha1-MJMYFkGPVa/E0hd1r91nIM7kXa4=", +======= + "resolved": "https://registry.npmmirror.com/tar-pack/-/tar-pack-3.3.0.tgz", + "integrity": "sha512-TzWaE2N/74gAvse51R88QnxnPO/e7kDdTEzoSVLOhyBvEAwsHaGnb96tCgleRhG13dVYp2zunNt3w4j6v0rQ5g==", +>>>>>>> Stashed changes "optional": true, "requires": { "debug": "~2.2.0", @@ -19801,8 +20296,13 @@ "dependencies": { "once": { "version": "1.3.3", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", +======= + "resolved": "https://registry.npmmirror.com/once/-/once-1.3.3.tgz", + "integrity": "sha512-6vaNInhu+CHxtONf3zw3vq4SP2DOQhjBvIa3rNcG0+P7eKWlYH6Peu7rHizSloRU2EwMz6GraLieis9Ac9+p1w==", +>>>>>>> Stashed changes "optional": true, "requires": { "wrappy": "1" @@ -19810,8 +20310,13 @@ }, "readable-stream": { "version": "2.1.5", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz", "integrity": "sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA=", +======= + "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.1.5.tgz", + "integrity": "sha512-NkXT2AER7VKXeXtJNSaWLpWIhmtSE3K2PguaLEeWr4JILghcIKqoLt1A3wHrnpDC5+ekf8gfk1GKWkFXe4odMw==", +>>>>>>> Stashed changes "optional": true, "requires": { "buffer-shims": "^1.0.0", @@ -19827,8 +20332,13 @@ }, "tough-cookie": { "version": "2.3.2", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", +======= + "resolved": "https://registry.npmmirror.com/tough-cookie/-/tough-cookie-2.3.2.tgz", + "integrity": "sha512-42UXjmzk88F7URyg9wDV/dlQ7hXtl/SDV6xIMVdDq82cnDGQDyg8mI8xGBPOwpEfbhvrja6cJ8H1wr0xxykBKA==", +>>>>>>> Stashed changes "optional": true, "requires": { "punycode": "^1.4.1" @@ -19836,20 +20346,35 @@ }, "tunnel-agent": { "version": "0.4.3", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", +======= + "resolved": "https://registry.npmmirror.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz", + "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==", +>>>>>>> Stashed changes "optional": true }, "tweetnacl": { "version": "0.14.5", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", +======= + "resolved": "https://registry.npmmirror.com/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", +>>>>>>> Stashed changes "optional": true }, "uid-number": { "version": "0.0.6", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz", "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=", +======= + "resolved": "https://registry.npmmirror.com/uid-number/-/uid-number-0.0.6.tgz", + "integrity": "sha512-c461FXIljswCuscZn67xq9PpszkPT6RjheWFQTgCyabJrTUozElanb0YEqv2UGgk247YpcJkFBuSGNvBlpXM9w==", +>>>>>>> Stashed changes "optional": true }, "util-deprecate": { @@ -19860,14 +20385,24 @@ }, "uuid": { "version": "3.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz", "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=", +======= + "resolved": "https://registry.npmmirror.com/uuid/-/uuid-3.0.1.tgz", + "integrity": "sha512-tyhM7iisckwwmyHVFcjTzISz/R1ss/bRudNgHFYsgeu7j4JbhRvjE+Hbcpr9y5xh+b+HxeFjuToDT4i9kQNrtA==", +>>>>>>> Stashed changes "optional": true }, "verror": { "version": "1.3.6", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", +======= + "resolved": "https://registry.npmmirror.com/verror/-/verror-1.3.6.tgz", + "integrity": "sha512-i8GFYwImt5D5B8CPpi2jrDTy/faq4OEW+NkOTLSKcIdPfdYJvWv3VZddDKl0ByvBe6cJ2s5Mm2XDtv5c2pj/Eg==", +>>>>>>> Stashed changes "optional": true, "requires": { "extsprintf": "1.0.2" @@ -19875,8 +20410,13 @@ }, "wide-align": { "version": "1.1.0", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz", "integrity": "sha1-QO3egCpx/qHwcNo+YtzaLnrdlq0=", +======= + "resolved": "https://registry.npmmirror.com/wide-align/-/wide-align-1.1.0.tgz", + "integrity": "sha512-rlD2ELOb94L+t1gMHCObqlC3QvrHVF1V5ipWEGm4vb9OK2C6ZTvluPg1Mfp2O9POtGb/3aZNxBpKOmx0JNVHSQ==", +>>>>>>> Stashed changes "optional": true, "requires": { "string-width": "^1.0.1" @@ -19890,8 +20430,13 @@ }, "xtend": { "version": "4.0.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", +======= + "resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha512-iTwvhNBRetXWe81+VcIw5YeadVSWyze7uA7nVnpP13ulrpnJ3UfQm5ApGnrkmxDJFdrblRdZs0EvaTCIfei5oQ==", +>>>>>>> Stashed changes "optional": true } } @@ -20511,7 +21056,11 @@ }, "nan": { "version": "2.5.1", +<<<<<<< Updated upstream "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz", +======= + "resolved": "https://registry.npmmirror.com/nan/-/nan-2.5.1.tgz", +>>>>>>> Stashed changes "integrity": "sha512-Mvo2RwemW12NRql4qU21+Sdtu8CAfn2RaCp8+p6N+4oQQvAM1DfO9R/ZyJOJaLdsMLHw84WJEo2AKZar4KANXA==", "optional": true },