diff --git a/CHANGELOG.md b/CHANGELOG.md index 292c98d..9068192 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ### 1.1.0 (2017-07-10) +<<<<<<< HEAD * ([@101100](https://github.com/101100)) Added configuration options for different formats * Added CHANGELOG.md +======= +* [[101100](https://github.com/101100)] Added configuration options for different formats +* Added CHANGELOG.md +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 diff --git a/package-lock.json b/package-lock.json index 33eef41..76d1c26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,10 @@ { "name": "vscode-guid", +<<<<<<< HEAD "version": "1.0.0", +======= + "version": "1.1.0", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "lockfileVersion": 1, "requires": true, "dependencies": { @@ -12,9 +16,15 @@ "requires": { "acorn": "5.1.1", "css": "2.2.1", +<<<<<<< HEAD "normalize-path": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz" +======= + "normalize-path": "2.1.1", + "source-map": "0.5.6", + "through2": "2.0.3" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 }, "dependencies": { "acorn": { @@ -31,8 +41,13 @@ "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=", "dev": true, "requires": { +<<<<<<< HEAD "normalize-path": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz" +======= + "normalize-path": "2.1.1", + "through2": "2.0.3" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "acorn": { @@ -41,6 +56,7 @@ "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", "dev": true }, +<<<<<<< HEAD "ajv": { "version": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", @@ -52,25 +68,46 @@ }, "amdefine": { "version": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", +======= + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, "ansi-regex": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", +======= + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, "ansi-styles": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", +======= + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, "archy": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", "dev": true }, "argparse": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/argparse/-/argparse-1.0.9.tgz", "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", "dev": true, @@ -93,56 +130,151 @@ }, "array-differ": { "version": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", +======= + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + } + }, + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "dev": true + }, + "array-differ": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", "dev": true }, "array-each": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=", "dev": true }, "array-find-index": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/array-find-index/-/array-find-index-1.0.2.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", "dev": true }, "array-slice": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz", "integrity": "sha1-5zA08A3MH0CHYAj9IP6ud71LfC8=", "dev": true }, "array-uniq": { "version": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz", + "integrity": "sha1-5zA08A3MH0CHYAj9IP6ud71LfC8=", + "dev": true + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { + "array-uniq": "1.0.3" + } + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", "dev": true }, "array-unique": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", "dev": true }, "asn1": { "version": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", +======= + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true + }, + "asn1": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", "dev": true }, "assert-plus": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", +======= + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", "dev": true }, "assertion-error": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-x/hUOP3UZrx8oWq5DIFRN5el0js=", "dev": true }, "async": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", +======= + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", "dev": true }, "asynckit": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", +======= + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, @@ -153,35 +285,65 @@ "dev": true }, "aws-sign2": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", +======= + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", "dev": true }, "aws4": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", +======= + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", "dev": true }, "balanced-match": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, "bcrypt-pbkdf": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "tweetnacl": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz" } }, "beeper": { "version": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", +======= + "tweetnacl": "0.14.5" + } + }, + "beeper": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", "dev": true }, "bl": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz", "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=", "dev": true, @@ -198,16 +360,52 @@ "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "isarray": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/isarray/upstream/isarray-0.0.1.tgz", "string_decoder": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/string_decoder/upstream/string_decoder-0.10.31.tgz" +======= + "version": "0.9.5", + "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz", + "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=", + "dev": true, + "requires": { + "readable-stream": "1.0.34" + }, + "dependencies": { + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, +<<<<<<< HEAD "bluebird": { "version": "https://registry.npmjs.org/bluebird/-/bluebird-1.2.4.tgz", +======= + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "dev": true, + "requires": { + "inherits": "2.0.3" + } + }, + "bluebird": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-1.2.4.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-WYXsI8tv8aWDTMZEezxe8BD9Mho=", "dev": true }, "boom": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "dev": true, @@ -236,20 +434,65 @@ }, "buffer-crc32": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/buffer-crc32/upstream/buffer-crc32-0.2.13.tgz", +======= + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", "dev": true }, "builtin-modules": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/builtin-modules/upstream/builtin-modules-1.1.1.tgz", +======= + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, "camelcase": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", +======= + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", "dev": true }, "camelcase-keys": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, @@ -273,6 +516,34 @@ "has-ansi": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "strip-ansi": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/strip-ansi/upstream/strip-ansi-3.0.1.tgz", "supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" +======= + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "dev": true, + "requires": { + "camelcase": "2.1.1", + "map-obj": "1.0.1" + } + }, + "caseless": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", + "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "cliui": { @@ -282,26 +553,46 @@ "dev": true, "requires": { "string-width": "1.0.2", +<<<<<<< HEAD "strip-ansi": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/strip-ansi/upstream/strip-ansi-3.0.1.tgz", +======= + "strip-ansi": "3.0.1", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "wrap-ansi": "2.1.0" } }, "clone": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=", "dev": true }, "clone-buffer": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=", "dev": true }, "clone-stats": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", +======= + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", "dev": true }, "cloneable-readable": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz", "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=", "dev": true, @@ -316,6 +607,18 @@ "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "dev": true }, +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz", + "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "process-nextick-args": "1.0.7", + "through2": "2.0.3" + } + }, +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", @@ -323,11 +626,17 @@ "dev": true }, "colors": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/colors/-/colors-1.1.2.tgz", +======= + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", "dev": true }, "combined-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", "dev": true, @@ -342,6 +651,25 @@ }, "concat-map": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/concat-map/upstream/concat-map-0.0.1.tgz", +======= + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "dev": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "commander": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, @@ -351,7 +679,11 @@ "integrity": "sha1-U/fUPFHF5D+ByP3QMyHGMb5o1hE=", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", +======= + "inherits": "2.0.3", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "readable-stream": "2.0.6", "typedarray": "0.0.6" }, @@ -368,17 +700,27 @@ "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", "dev": true, "requires": { +<<<<<<< HEAD "core-util-is": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/core-util-is/upstream/core-util-is-1.0.2.tgz", "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "isarray": "1.0.0", "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", "string_decoder": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/string_decoder/upstream/string_decoder-0.10.31.tgz", "util-deprecate": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/util-deprecate/upstream/util-deprecate-1.0.2.tgz" +======= + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "0.10.31", + "util-deprecate": "1.0.2" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "configstore": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz", "integrity": "sha1-JeTBbDdoq/dcWmW8YXYfSVBVtFk=", "dev": true, @@ -403,25 +745,75 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", "dev": true +======= + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz", + "integrity": "sha1-JeTBbDdoq/dcWmW8YXYfSVBVtFk=", + "dev": true, + "requires": { + "graceful-fs": "3.0.11", + "js-yaml": "3.9.0", + "mkdirp": "0.5.1", + "object-assign": "2.1.1", + "osenv": "0.1.4", + "user-home": "1.1.1", + "uuid": "2.0.3", + "xdg-basedir": "1.0.1" + }, + "dependencies": { + "graceful-fs": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", + "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", + "dev": true, + "requires": { + "natives": "1.1.0" + } + }, + "object-assign": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", + "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=", + "dev": true +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } }, "convert-source-map": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/convert-source-map/-/convert-source-map-1.5.0.tgz", +======= + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=", "dev": true }, "core-util-is": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/core-util-is/upstream/core-util-is-1.0.2.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, "cryptiles": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", "dev": true, "requires": { "boom": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" +======= + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "dev": true, + "requires": { + "boom": "2.10.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "css": { @@ -430,7 +822,11 @@ "integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", +======= + "inherits": "2.0.3", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "source-map": "0.1.43", "source-map-resolve": "0.3.1", "urix": "0.1.0" @@ -442,12 +838,17 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { +<<<<<<< HEAD "amdefine": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz" +======= + "amdefine": "1.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "currently-unhandled": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, @@ -465,22 +866,58 @@ "dependencies": { "assert-plus": { "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", +======= + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "dev": true, + "requires": { + "array-find-index": "1.0.2" + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", "dev": true } } }, "dateformat": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz", +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=", "dev": true }, "debug": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/debug/upstream/debug-2.2.0.tgz", "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", "dev": true, "requires": { "ms": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/ms/upstream/ms-0.7.1.tgz" +======= + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "dev": true, + "requires": { + "ms": "2.0.0" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "debug-fabulous": { @@ -489,7 +926,11 @@ "integrity": "sha1-rQ6gel1RkyT7VYQqjzTuWcf4/2w=", "dev": true, "requires": { +<<<<<<< HEAD "debug": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/debug/upstream/debug-2.2.0.tgz", +======= + "debug": "2.6.8", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "object-assign": "4.1.0" }, "dependencies": { @@ -502,21 +943,47 @@ } }, "decamelize": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/decamelize/upstream/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", "dev": true }, "deep-extend": { "version": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", +======= + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, + "deep-assign": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-1.0.0.tgz", + "integrity": "sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=", + "dev": true, + "requires": { + "is-obj": "1.0.1" + } + }, + "deep-extend": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", "dev": true }, "deep-freeze": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz", +======= + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ=", "dev": true }, "defaults": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", "dev": true, @@ -537,15 +1004,46 @@ }, "delayed-stream": { "version": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", +======= + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "dev": true, + "requires": { + "clone": "1.0.2" + } + }, + "definition-header": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/definition-header/-/definition-header-0.1.0.tgz", + "integrity": "sha1-AURf9MpmMRTL8sWhEx8Tu1ROtd0=", + "dev": true, + "requires": { + "joi": "4.9.0", + "joi-assert": "0.0.3", + "parsimmon": "0.5.1", + "xregexp": "2.0.0" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, "deprecated": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", +======= + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=", "dev": true }, "detect-file": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz", "integrity": "sha1-STXe39lIhkjgBrASlWbpOGcR6mM=", "dev": true, @@ -564,11 +1062,39 @@ "dependencies": { "get-stdin": { "version": "https://registry.npmjs.org/get-stdin/-/get-stdin-0.1.0.tgz", +======= + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz", + "integrity": "sha1-STXe39lIhkjgBrASlWbpOGcR6mM=", + "dev": true, + "requires": { + "fs-exists-sync": "0.1.0" + } + }, + "detect-indent": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-0.2.0.tgz", + "integrity": "sha1-BCkUSYl5rC2fPHPk/z5od9O8krY=", + "dev": true, + "requires": { + "get-stdin": "0.1.0", + "minimist": "0.1.0" + }, + "dependencies": { + "get-stdin": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-0.1.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-WZivJKr8gC0VyCxoVlfuuLENSpE=", "dev": true }, "minimist": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz", +======= + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-md9lelJXTCHJBXSX33QnkLK0wN4=", "dev": true } @@ -581,16 +1107,27 @@ "dev": true }, "diff": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/diff/-/diff-1.4.0.tgz", +======= + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=", "dev": true }, "duplexer": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/duplexer/-/duplexer-0.1.1.tgz", +======= + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", "dev": true }, "duplexer2": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/duplexer2/upstream/duplexer2-0.0.2.tgz", "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", "dev": true, @@ -619,10 +1156,45 @@ }, "isarray": { "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +======= + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "dev": true, + "requires": { + "readable-stream": "1.1.14" + } + }, + "duplexify": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz", + "integrity": "sha1-GqdzAC4VeEV+nZ1KULDMquvL1gQ=", + "dev": true, + "requires": { + "end-of-stream": "1.0.0", + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "stream-shift": "1.0.0" + }, + "dependencies": { + "end-of-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz", + "integrity": "sha1-1FlucCc0qT5A6a+GQxnqvZn/Lw4=", + "dev": true, + "requires": { + "once": "1.3.3" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, "readable-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=", "dev": true, @@ -642,16 +1214,45 @@ "dev": true, "requires": { "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" +======= + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "ecc-jsbn": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", +======= + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "jsbn": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz" } }, @@ -669,6 +1270,27 @@ "dev": true, "requires": { "is-arrayish": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/is-arrayish/upstream/is-arrayish-0.2.1.tgz" +======= + "jsbn": "0.1.1" + } + }, + "end-of-stream": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", + "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", + "dev": true, + "requires": { + "once": "1.3.3" + } + }, + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "dev": true, + "requires": { + "is-arrayish": "0.2.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "es6-promise": { @@ -678,11 +1300,17 @@ "dev": true }, "escape-string-regexp": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", +======= + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, "esprima": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/esprima/-/esprima-2.7.3.tgz", "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", "dev": true @@ -703,10 +1331,44 @@ }, "exit": { "version": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", +======= + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true + }, + "event-stream": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz", + "integrity": "sha1-tMVAAS0P4UmEIPPYlGAI22OTw3o=", + "dev": true, + "requires": { + "duplexer": "0.1.1", + "from": "0.1.7", + "map-stream": "0.1.0", + "pause-stream": "0.0.11", + "split": "0.2.10", + "stream-combiner": "0.0.4", + "through": "2.3.8" + }, + "dependencies": { + "map-stream": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", + "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", + "dev": true + } + } + }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", "dev": true }, "expand-brackets": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, @@ -732,23 +1394,72 @@ }, "extend": { "version": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", - "dev": true - }, - "extend-shallow": { - "version": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", +======= + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-extendable": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz" + "is-posix-bracket": "0.1.1" } }, - "extglob": { - "version": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "expand-range": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "dev": true, + "requires": { + "fill-range": "2.2.3" + } + }, + "expand-tilde": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz", + "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=", + "dev": true, + "requires": { + "os-homedir": "1.0.2" + } + }, + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", + "dev": true + }, + "extend-shallow": { +<<<<<<< HEAD + "version": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz" + } + }, + "extglob": { + "version": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { "is-extglob": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz" +======= + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "extract-zip": { @@ -783,6 +1494,7 @@ "requires": { "minimist": "0.0.8" } +<<<<<<< HEAD }, "yauzl": { "version": "2.4.1", @@ -792,15 +1504,23 @@ "requires": { "fd-slicer": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/fd-slicer/-/fd-slicer-1.0.1.tgz" } +======= +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } }, "extsprintf": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/extsprintf/-/extsprintf-1.0.2.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=", "dev": true }, "fancy-log": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=", "dev": true, @@ -815,6 +1535,24 @@ "dev": true, "requires": { "pend": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/pend/-/pend-1.2.0.tgz" +======= + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", + "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "time-stamp": "1.1.0" + } + }, + "fd-slicer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", + "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "dev": true, + "requires": { + "pend": "1.2.0" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "file-url": { @@ -823,15 +1561,25 @@ "integrity": "sha1-oPnPPraQTJsdOmeQuDqXb8QCF7s=", "dev": true, "requires": { +<<<<<<< HEAD "meow": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz" } }, "filename-regex": { "version": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", +======= + "meow": "3.7.0" + } + }, + "filename-regex": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", "dev": true }, "fill-range": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", "dev": true, @@ -845,10 +1593,28 @@ }, "find-index": { "version": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", +======= + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "dev": true, + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + } + }, + "find-index": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=", "dev": true }, "find-up": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/find-up/upstream/find-up-1.1.2.tgz", "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, @@ -886,26 +1652,85 @@ "dev": true, "requires": { "homedir-polyfill": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz" +======= + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "findup-sync": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz", + "integrity": "sha1-QAQ5Kee8YK3wt/SCfExudaDeyhI=", + "dev": true, + "requires": { + "detect-file": "0.1.0", + "is-glob": "2.0.1", + "micromatch": "2.3.11", + "resolve-dir": "0.1.1" + } + }, + "fined": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz", + "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=", + "dev": true, + "requires": { + "expand-tilde": "2.0.2", + "is-plain-object": "2.0.3", + "object.defaults": "1.1.0", + "object.pick": "1.2.0", + "parse-filepath": "1.0.1" + }, + "dependencies": { + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "dev": true, + "requires": { + "homedir-polyfill": "1.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "first-chunk-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=", "dev": true }, "flagged-respawn": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz", +======= + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-/xke3c1wiKZ1smEP/8l2vpuAdLU=", "dev": true }, "for-in": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, "for-own": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, @@ -915,15 +1740,34 @@ }, "foreach": { "version": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", +======= + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", "dev": true }, "forever-agent": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", +======= + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", "dev": true }, "form-data": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", "dev": true, @@ -935,11 +1779,31 @@ }, "from": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/from/-/from-0.1.7.tgz", +======= + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "dev": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.15" + } + }, + "from": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=", "dev": true }, "fs-exists-sync": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz", +======= + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=", "dev": true }, @@ -952,6 +1816,7 @@ "graceful-fs": "4.1.11", "jsonfile": "2.4.0", "klaw": "1.3.1" +<<<<<<< HEAD }, "dependencies": { "graceful-fs": { @@ -977,15 +1842,69 @@ }, "generate-function": { "version": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", +======= + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "fstream": { + "version": "0.1.31", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz", + "integrity": "sha1-czfwWPu7vvqMn1YaKMqwhJICyYg=", + "dev": true, + "requires": { + "graceful-fs": "3.0.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.1" + }, + "dependencies": { + "graceful-fs": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", + "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", + "dev": true, + "requires": { + "natives": "1.1.0" + } + } + } + }, + "gaze": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", + "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", + "dev": true, + "requires": { + "globule": "0.1.0" + } + }, + "generate-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=", "dev": true }, "generate-object-property": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", "dev": true, "requires": { "is-property": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz" +======= + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", + "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", + "dev": true, + "requires": { + "is-property": "1.0.2" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "get-caller-file": { @@ -995,11 +1914,17 @@ "dev": true }, "get-stdin": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", +======= + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", "dev": true }, "getpass": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, @@ -1009,12 +1934,26 @@ "dependencies": { "assert-plus": { "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", +======= + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", "dev": true } } }, "glob": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", "dev": true, @@ -1073,11 +2012,98 @@ "requires": { "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" +======= + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", + "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "2.0.10", + "once": "1.3.3" + }, + "dependencies": { + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + } + } + }, + "glob-base": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "dev": true, + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + } + }, + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "glob-stream": { + "version": "3.1.18", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", + "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", + "dev": true, + "requires": { + "glob": "4.5.3", + "glob2base": "0.0.12", + "minimatch": "2.0.10", + "ordered-read-streams": "0.1.0", + "through2": "0.6.5", + "unique-stream": "1.0.0" + }, + "dependencies": { + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "glob-watcher": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", "dev": true, @@ -1135,26 +2161,108 @@ }, "graceful-fs": { "version": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", +======= + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", + "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", + "dev": true, + "requires": { + "gaze": "0.5.2" + } + }, + "glob2base": { + "version": "0.0.12", + "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", + "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", + "dev": true, + "requires": { + "find-index": "0.1.1" + } + }, + "global-modules": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz", + "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=", + "dev": true, + "requires": { + "global-prefix": "0.1.5", + "is-windows": "0.2.0" + } + }, + "global-prefix": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz", + "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=", + "dev": true, + "requires": { + "homedir-polyfill": "1.0.1", + "ini": "1.3.4", + "is-windows": "0.2.0", + "which": "1.2.14" + } + }, + "globule": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", + "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", + "dev": true, + "requires": { + "glob": "3.1.21", + "lodash": "1.0.2", + "minimatch": "0.2.14" + }, + "dependencies": { + "glob": { + "version": "3.1.21", + "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", + "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", + "dev": true, + "requires": { + "graceful-fs": "1.2.3", + "inherits": "1.0.2", + "minimatch": "0.2.14" + } + }, + "graceful-fs": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=", "dev": true }, "inherits": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=", "dev": true }, "minimatch": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", "dev": true, "requires": { "lru-cache": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", "sigmund": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" +======= + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", + "dev": true, + "requires": { + "lru-cache": "2.7.3", + "sigmund": "1.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "glogg": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=", "dev": true, @@ -1189,10 +2297,48 @@ }, "growl": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/growl/-/growl-1.9.2.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", + "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=", + "dev": true, + "requires": { + "sparkles": "1.0.0" + } + }, + "got": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/got/-/got-3.3.1.tgz", + "integrity": "sha1-5dDtSvVfw+701WAHdp2YGSvLLso=", + "dev": true, + "requires": { + "duplexify": "3.5.0", + "infinity-agent": "2.0.3", + "is-redirect": "1.0.0", + "is-stream": "1.1.0", + "lowercase-keys": "1.0.0", + "nested-error-stacks": "1.0.2", + "object-assign": "3.0.0", + "prepend-http": "1.0.4", + "read-all-stream": "3.1.0", + "timed-out": "2.0.0" + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true + }, + "growl": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", "dev": true }, "gulp": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz", "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=", "dev": true, @@ -1224,15 +2370,68 @@ "dependencies": { "ansi-regex": { "version": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", +======= + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz", + "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=", + "dev": true, + "requires": { + "archy": "1.0.0", + "chalk": "1.1.3", + "deprecated": "0.0.1", + "gulp-util": "3.0.8", + "interpret": "1.0.3", + "liftoff": "2.3.0", + "minimist": "1.2.0", + "orchestrator": "0.3.8", + "pretty-hrtime": "1.0.3", + "semver": "4.3.6", + "tildify": "1.2.0", + "v8flags": "2.1.1", + "vinyl-fs": "0.3.14" + } + }, + "gulp-chmod": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/gulp-chmod/-/gulp-chmod-1.3.0.tgz", + "integrity": "sha1-i7bowRiV3L+bQlIMh0NHpQIryw0=", + "dev": true, + "requires": { + "deep-assign": "1.0.0", + "stat-mode": "0.2.2", + "through2": "2.0.3" + } + }, + "gulp-clean": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.3.2.tgz", + "integrity": "sha1-o0fUc6zqQBgvk1WHpFGUFnGSgQI=", + "dev": true, + "requires": { + "gulp-util": "2.2.20", + "rimraf": "2.6.1", + "through2": "0.4.2" + }, + "dependencies": { + "ansi-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=", "dev": true }, "ansi-styles": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", +======= + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=", "dev": true }, "chalk": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", "dev": true, @@ -1275,11 +2474,60 @@ "requires": { "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "xtend": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" - } - } +======= + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", + "dev": true, + "requires": { + "ansi-styles": "1.1.0", + "escape-string-regexp": "1.0.5", + "has-ansi": "0.1.0", + "strip-ansi": "0.3.0", + "supports-color": "0.2.0" + } + }, + "dateformat": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", + "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", + "dev": true, + "requires": { + "get-stdin": "4.0.1", + "meow": "3.7.0" + } + }, + "gulp-util": { + "version": "2.2.20", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", + "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=", + "dev": true, + "requires": { + "chalk": "0.5.1", + "dateformat": "1.0.12", + "lodash._reinterpolate": "2.4.1", + "lodash.template": "2.4.1", + "minimist": "0.2.0", + "multipipe": "0.1.2", + "through2": "0.5.1", + "vinyl": "0.2.3" + }, + "dependencies": { + "through2": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", + "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "3.0.0" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 + } + } } }, "has-ansi": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", "dev": true, @@ -1289,10 +2537,24 @@ }, "lodash._reinterpolate": { "version": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz", +======= + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", + "dev": true, + "requires": { + "ansi-regex": "0.2.1" + } + }, + "lodash._reinterpolate": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=", "dev": true }, "lodash.escape": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=", "dev": true, @@ -1337,10 +2599,62 @@ }, "minimist": { "version": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz", +======= + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", + "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=", + "dev": true, + "requires": { + "lodash._escapehtmlchar": "2.4.1", + "lodash._reunescapedhtml": "2.4.1", + "lodash.keys": "2.4.1" + } + }, + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" + } + }, + "lodash.template": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz", + "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=", + "dev": true, + "requires": { + "lodash._escapestringchar": "2.4.1", + "lodash._reinterpolate": "2.4.1", + "lodash.defaults": "2.4.1", + "lodash.escape": "2.4.1", + "lodash.keys": "2.4.1", + "lodash.templatesettings": "2.4.1", + "lodash.values": "2.4.1" + } + }, + "lodash.templatesettings": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz", + "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=", + "dev": true, + "requires": { + "lodash._reinterpolate": "2.4.1", + "lodash.escape": "2.4.1" + } + }, + "minimist": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=", "dev": true }, "readable-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, @@ -1361,10 +2675,36 @@ }, "supports-color": { "version": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", +======= + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "strip-ansi": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", + "dev": true, + "requires": { + "ansi-regex": "0.2.1" + } + }, + "supports-color": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=", "dev": true }, "through2": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=", "dev": true, @@ -1379,11 +2719,30 @@ "dev": true, "requires": { "object-keys": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/object-keys/upstream/object-keys-0.4.0.tgz" +======= + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", + "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "2.1.2" + }, + "dependencies": { + "xtend": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", + "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", + "dev": true, + "requires": { + "object-keys": "0.4.0" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "vinyl": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=", "dev": true, @@ -1393,11 +2752,25 @@ }, "xtend": { "version": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", +======= + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", + "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=", + "dev": true, + "requires": { + "clone-stats": "0.0.1" + } + }, + "xtend": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=", "dev": true } } }, +<<<<<<< HEAD "gulp-merge": { "version": "https://registry.npmjs.org/gulp-merge/-/gulp-merge-0.1.1.tgz", "integrity": "sha1-pGLuARd6jqfEYPDqia1ULsdSujc=", @@ -1413,11 +2786,92 @@ "requires": { "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" +======= + "gulp-filter": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-4.0.0.tgz", + "integrity": "sha1-OV9YolbFWc254NFX8cqvUkijjcs=", + "dev": true, + "requires": { + "gulp-util": "3.0.8", + "multimatch": "2.1.0", + "streamfilter": "1.0.5" + } + }, + "gulp-gunzip": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/gulp-gunzip/-/gulp-gunzip-0.0.3.tgz", + "integrity": "sha1-e24HsPWP09QlFcSOrVpj3wVy9i8=", + "dev": true, + "requires": { + "through2": "0.6.5", + "vinyl": "0.4.6" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "dev": true, + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } + } + } + }, + "gulp-merge": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/gulp-merge/-/gulp-merge-0.1.1.tgz", + "integrity": "sha1-pGLuARd6jqfEYPDqia1ULsdSujc=", + "dev": true, + "requires": { + "through2": "1.1.1" + }, + "dependencies": { + "through2": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz", + "integrity": "sha1-CEfLxESfNAVXTb3M2buEG4OsNUU=", + "dev": true, + "requires": { + "readable-stream": "1.1.14", + "xtend": "4.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "gulp-remote-src": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/gulp-remote-src/-/gulp-remote-src-0.4.2.tgz", "integrity": "sha1-zrN3DjREMo1hOG+6qrIAvBHNmKg=", "dev": true, @@ -1436,10 +2890,28 @@ }, "clone-stats": { "version": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", +======= + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/gulp-remote-src/-/gulp-remote-src-0.4.2.tgz", + "integrity": "sha1-zrN3DjREMo1hOG+6qrIAvBHNmKg=", + "dev": true, + "requires": { + "event-stream": "3.3.4", + "node.extend": "1.1.6", + "request": "2.79.0", + "through2": "2.0.3", + "vinyl": "2.0.2" + }, + "dependencies": { + "clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", "dev": true }, "event-stream": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/event-stream/upstream/event-stream-3.3.4.tgz", "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", "dev": true, @@ -1531,6 +3003,56 @@ "is-stream": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-stream/-/is-stream-1.1.0.tgz", "remove-trailing-separator": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", "replace-ext": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz" +======= + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", + "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", + "dev": true, + "requires": { + "duplexer": "0.1.1", + "from": "0.1.7", + "map-stream": "0.1.0", + "pause-stream": "0.0.11", + "split": "0.3.3", + "stream-combiner": "0.0.4", + "through": "2.3.8" + } + }, + "map-stream": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", + "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", + "dev": true + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + }, + "split": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", + "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", + "dev": true, + "requires": { + "through": "2.3.8" + } + }, + "vinyl": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.0.2.tgz", + "integrity": "sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=", + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-buffer": "1.0.0", + "clone-stats": "1.0.0", + "cloneable-readable": "1.0.0", + "is-stream": "1.1.0", + "remove-trailing-separator": "1.0.2", + "replace-ext": "1.0.0" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } @@ -1544,11 +3066,16 @@ "@gulp-sourcemaps/identity-map": "1.0.1", "@gulp-sourcemaps/map-sources": "1.0.0", "acorn": "4.0.13", +<<<<<<< HEAD "convert-source-map": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/convert-source-map/-/convert-source-map-1.5.0.tgz", +======= + "convert-source-map": "1.5.0", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "css": "2.2.1", "debug-fabulous": "0.1.0", "detect-newline": "2.1.0", "graceful-fs": "4.1.11", +<<<<<<< HEAD "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", "strip-bom-string": "1.0.0", "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", @@ -1561,15 +3088,29 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, +======= + "source-map": "0.5.6", + "strip-bom-string": "1.0.0", + "through2": "2.0.3", + "vinyl": "1.2.0" + }, + "dependencies": { +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "vinyl": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", "dev": true, "requires": { +<<<<<<< HEAD "clone": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", "clone-stats": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", "replace-ext": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/replace-ext/upstream/replace-ext-0.0.1.tgz" +======= + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } @@ -1580,6 +3121,7 @@ "integrity": "sha1-3JOTgC1BAhHpzFbbOs+FQA2SkUQ=", "dev": true, "requires": { +<<<<<<< HEAD "gulp-util": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", "map-stream": "0.0.6", "map-stream-limit": "1.1.0", @@ -1657,10 +3199,88 @@ "dependencies": { "isarray": { "version": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", +======= + "gulp-util": "3.0.8", + "map-stream": "0.0.6", + "map-stream-limit": "1.1.0", + "svg2png": "3.1.1" + } + }, + "gulp-symdest": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/gulp-symdest/-/gulp-symdest-1.1.0.tgz", + "integrity": "sha1-wWUyBzLRks5W/ZQnH/oSMjS/KuA=", + "dev": true, + "requires": { + "event-stream": "3.3.4", + "mkdirp": "0.5.1", + "queue": "3.1.0", + "vinyl-fs": "2.4.4" + }, + "dependencies": { + "event-stream": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", + "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", + "dev": true, + "requires": { + "duplexer": "0.1.1", + "from": "0.1.7", + "map-stream": "0.1.0", + "pause-stream": "0.0.11", + "split": "0.3.3", + "stream-combiner": "0.0.4", + "through": "2.3.8" + } + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.3.3", + "path-is-absolute": "1.0.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + } + }, + "glob-stream": { + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", + "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", + "dev": true, + "requires": { + "extend": "3.0.1", + "glob": "5.0.15", + "glob-parent": "3.1.0", + "micromatch": "2.3.11", + "ordered-read-streams": "0.3.0", + "through2": "0.6.5", + "to-absolute-glob": "0.1.1", + "unique-stream": "2.2.1" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, "readable-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, @@ -1673,31 +3293,61 @@ }, "string_decoder": { "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", +======= + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true }, "through2": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "dev": true, "requires": { "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" +======= + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, +<<<<<<< HEAD "graceful-fs": { "version": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, +======= +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "gulp-sourcemaps": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz", "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", "dev": true, "requires": { +<<<<<<< HEAD "convert-source-map": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/convert-source-map/-/convert-source-map-1.5.0.tgz", "graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "strip-bom": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/strip-bom/upstream/strip-bom-2.0.0.tgz", @@ -1707,10 +3357,23 @@ }, "is-extglob": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-extglob/upstream/is-extglob-2.1.1.tgz", +======= + "convert-source-map": "1.5.0", + "graceful-fs": "4.1.11", + "strip-bom": "2.0.0", + "through2": "2.0.3", + "vinyl": "1.2.0" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, "is-glob": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-glob/upstream/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, @@ -1725,10 +3388,36 @@ }, "object-assign": { "version": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", +======= + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "map-stream": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", + "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true }, "ordered-read-streams": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", "dev": true, @@ -1816,37 +3505,135 @@ "through2-filter": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", "vali-date": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", "vinyl": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/vinyl/-/vinyl-1.2.0.tgz" - } - } - } - }, - "gulp-typescript": { - "version": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-2.14.1.tgz", - "integrity": "sha1-vADt8u5x8JvaU/0dC4c7VxNx1N4=", - "dev": true, - "requires": { - "gulp-util": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", - "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "typescript": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/typescript/-/typescript-1.8.10.tgz", - "vinyl-fs": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz" - }, - "dependencies": { - "glob": { - "version": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", +======= + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", + "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", "dev": true, "requires": { - "inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "once": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/once/upstream/once-1.3.3.tgz", - "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + "is-stream": "1.1.0", + "readable-stream": "2.3.3" } }, - "glob-parent": { - "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/glob-parent/upstream/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "split": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", + "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", + "dev": true, + "requires": { + "through": "2.3.8" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "unique-stream": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", + "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", + "dev": true, + "requires": { + "json-stable-stringify": "1.0.1", + "through2-filter": "2.0.0" + } + }, + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + }, + "vinyl-fs": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", + "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", + "dev": true, + "requires": { + "duplexify": "3.5.0", + "glob-stream": "5.3.5", + "graceful-fs": "4.1.11", + "gulp-sourcemaps": "1.6.0", + "is-valid-glob": "0.3.0", + "lazystream": "1.0.0", + "lodash.isequal": "4.5.0", + "merge-stream": "1.0.1", + "mkdirp": "0.5.1", + "object-assign": "4.1.1", + "readable-stream": "2.3.3", + "strip-bom": "2.0.0", + "strip-bom-stream": "1.0.0", + "through2": "2.0.3", + "through2-filter": "2.0.0", + "vali-date": "1.0.0", + "vinyl": "1.2.0" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 + } + } + } + }, + "gulp-typescript": { +<<<<<<< HEAD + "version": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-2.14.1.tgz", + "integrity": "sha1-vADt8u5x8JvaU/0dC4c7VxNx1N4=", + "dev": true, + "requires": { + "gulp-util": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", + "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "typescript": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/typescript/-/typescript-1.8.10.tgz", + "vinyl-fs": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz" + }, + "dependencies": { + "glob": { + "version": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "once": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/once/upstream/once-1.3.3.tgz", + "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + } + }, + "glob-parent": { + "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/glob-parent/upstream/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, "requires": { "is-glob": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-glob/upstream/is-glob-3.1.0.tgz", @@ -1870,10 +3657,67 @@ "dependencies": { "isarray": { "version": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", +======= + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-2.14.1.tgz", + "integrity": "sha1-vADt8u5x8JvaU/0dC4c7VxNx1N4=", + "dev": true, + "requires": { + "gulp-util": "3.0.8", + "source-map": "0.5.6", + "through2": "2.0.3", + "typescript": "1.8.10", + "vinyl-fs": "2.4.4" + }, + "dependencies": { + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.3.3", + "path-is-absolute": "1.0.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + } + }, + "glob-stream": { + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", + "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", + "dev": true, + "requires": { + "extend": "3.0.1", + "glob": "5.0.15", + "glob-parent": "3.1.0", + "micromatch": "2.3.11", + "ordered-read-streams": "0.3.0", + "through2": "0.6.5", + "to-absolute-glob": "0.1.1", + "unique-stream": "2.2.1" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, "readable-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, @@ -1886,31 +3730,61 @@ }, "string_decoder": { "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", +======= + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true }, "through2": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "dev": true, "requires": { "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" +======= + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, +<<<<<<< HEAD "graceful-fs": { "version": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, +======= +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "gulp-sourcemaps": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz", "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", "dev": true, "requires": { +<<<<<<< HEAD "convert-source-map": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/convert-source-map/-/convert-source-map-1.5.0.tgz", "graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "strip-bom": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/strip-bom/upstream/strip-bom-2.0.0.tgz", @@ -1920,10 +3794,23 @@ }, "is-extglob": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-extglob/upstream/is-extglob-2.1.1.tgz", +======= + "convert-source-map": "1.5.0", + "graceful-fs": "4.1.11", + "strip-bom": "2.0.0", + "through2": "2.0.3", + "vinyl": "1.2.0" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, "is-glob": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-glob/upstream/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, @@ -1933,15 +3820,34 @@ }, "isarray": { "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +======= + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, "object-assign": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", +======= + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true }, "ordered-read-streams": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", "dev": true, @@ -1990,42 +3896,341 @@ } }, "vinyl": { - "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/vinyl/-/vinyl-1.2.0.tgz", - "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", + "clone-stats": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "replace-ext": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/replace-ext/upstream/replace-ext-0.0.1.tgz" + } + }, + "vinyl-fs": { + "version": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", + "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", + "dev": true, + "requires": { + "duplexify": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz", + "glob-stream": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", + "graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "gulp-sourcemaps": "1.6.0", + "is-valid-glob": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz", + "lazystream": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", + "lodash.isequal": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "merge-stream": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "strip-bom": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/strip-bom/upstream/strip-bom-2.0.0.tgz", + "strip-bom-stream": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz", + "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "through2-filter": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", + "vali-date": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", + "vinyl": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/vinyl/-/vinyl-1.2.0.tgz" + } +======= + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", + "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", + "dev": true, + "requires": { + "is-stream": "1.1.0", + "readable-stream": "2.3.3" + } + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "unique-stream": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", + "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", + "dev": true, + "requires": { + "json-stable-stringify": "1.0.1", + "through2-filter": "2.0.0" + } + }, + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + }, + "vinyl-fs": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", + "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", + "dev": true, + "requires": { + "duplexify": "3.5.0", + "glob-stream": "5.3.5", + "graceful-fs": "4.1.11", + "gulp-sourcemaps": "1.6.0", + "is-valid-glob": "0.3.0", + "lazystream": "1.0.0", + "lodash.isequal": "4.5.0", + "merge-stream": "1.0.1", + "mkdirp": "0.5.1", + "object-assign": "4.1.1", + "readable-stream": "2.3.3", + "strip-bom": "2.0.0", + "strip-bom-stream": "1.0.0", + "through2": "2.0.3", + "through2-filter": "2.0.0", + "vali-date": "1.0.0", + "vinyl": "1.2.0" + } + } + } + }, + "gulp-untar": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/gulp-untar/-/gulp-untar-0.0.4.tgz", + "integrity": "sha1-Y1zH1n09SK7A28aYImI/x8M/fTc=", + "dev": true, + "requires": { + "event-stream": "3.1.7", + "gulp-util": "2.2.20", + "streamifier": "0.1.1", + "tar": "0.1.20", + "through2": "0.4.2" + }, + "dependencies": { + "ansi-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", + "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=", + "dev": true + }, + "ansi-styles": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", + "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=", + "dev": true + }, + "chalk": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", + "dev": true, + "requires": { + "ansi-styles": "1.1.0", + "escape-string-regexp": "1.0.5", + "has-ansi": "0.1.0", + "strip-ansi": "0.3.0", + "supports-color": "0.2.0" + } + }, + "dateformat": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", + "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", + "dev": true, + "requires": { + "get-stdin": "4.0.1", + "meow": "3.7.0" + } + }, + "gulp-util": { + "version": "2.2.20", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", + "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=", + "dev": true, + "requires": { + "chalk": "0.5.1", + "dateformat": "1.0.12", + "lodash._reinterpolate": "2.4.1", + "lodash.template": "2.4.1", + "minimist": "0.2.0", + "multipipe": "0.1.2", + "through2": "0.5.1", + "vinyl": "0.2.3" + }, + "dependencies": { + "through2": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", + "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "3.0.0" + } + } + } + }, + "has-ansi": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", + "dev": true, + "requires": { + "ansi-regex": "0.2.1" + } + }, + "lodash._reinterpolate": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz", + "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=", + "dev": true + }, + "lodash.escape": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", + "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=", + "dev": true, + "requires": { + "lodash._escapehtmlchar": "2.4.1", + "lodash._reunescapedhtml": "2.4.1", + "lodash.keys": "2.4.1" + } + }, + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" + } + }, + "lodash.template": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz", + "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=", + "dev": true, + "requires": { + "lodash._escapestringchar": "2.4.1", + "lodash._reinterpolate": "2.4.1", + "lodash.defaults": "2.4.1", + "lodash.escape": "2.4.1", + "lodash.keys": "2.4.1", + "lodash.templatesettings": "2.4.1", + "lodash.values": "2.4.1" + } + }, + "lodash.templatesettings": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz", + "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=", + "dev": true, + "requires": { + "lodash._reinterpolate": "2.4.1", + "lodash.escape": "2.4.1" + } + }, + "minimist": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz", + "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "strip-ansi": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", + "dev": true, + "requires": { + "ansi-regex": "0.2.1" + } + }, + "supports-color": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", + "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=", + "dev": true + }, + "through2": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", + "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "2.1.2" + }, + "dependencies": { + "xtend": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", + "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", + "dev": true, + "requires": { + "object-keys": "0.4.0" + } + } + } + }, + "vinyl": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", + "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=", "dev": true, "requires": { - "clone": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "clone-stats": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "replace-ext": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/replace-ext/upstream/replace-ext-0.0.1.tgz" + "clone-stats": "0.0.1" } }, - "vinyl-fs": { - "version": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", - "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", - "dev": true, - "requires": { - "duplexify": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz", - "glob-stream": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", - "graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "gulp-sourcemaps": "1.6.0", - "is-valid-glob": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz", - "lazystream": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", - "lodash.isequal": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "merge-stream": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", - "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "strip-bom": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/strip-bom/upstream/strip-bom-2.0.0.tgz", - "strip-bom-stream": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz", - "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "through2-filter": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", - "vali-date": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", - "vinyl": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/vinyl/-/vinyl-1.2.0.tgz" - } + "xtend": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", + "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=", + "dev": true +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } }, "gulp-util": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", "dev": true, @@ -2066,10 +4271,56 @@ "dependencies": { "clone": { "version": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", +======= + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", + "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", + "dev": true, + "requires": { + "array-differ": "1.0.0", + "array-uniq": "1.0.3", + "beeper": "1.1.1", + "chalk": "1.1.3", + "dateformat": "2.0.0", + "fancy-log": "1.3.0", + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash._reescape": "3.0.0", + "lodash._reevaluate": "3.0.0", + "lodash._reinterpolate": "3.0.0", + "lodash.template": "3.6.2", + "minimist": "1.2.0", + "multipipe": "0.1.2", + "object-assign": "3.0.0", + "replace-ext": "0.0.1", + "through2": "2.0.3", + "vinyl": "0.5.3" + } + }, + "gulp-vinyl-zip": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-1.4.0.tgz", + "integrity": "sha1-VjgvLMtXIxuwR4x4c3zNVylzvuE=", + "dev": true, + "requires": { + "event-stream": "3.3.4", + "queue": "3.1.0", + "through2": "0.6.5", + "vinyl": "0.4.6", + "vinyl-fs": "2.4.4", + "yauzl": "2.4.1", + "yazl": "2.4.2" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", "dev": true }, "event-stream": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/event-stream/upstream/event-stream-3.3.4.tgz", "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", "dev": true, @@ -2124,15 +4375,76 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, +======= + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", + "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", + "dev": true, + "requires": { + "duplexer": "0.1.1", + "from": "0.1.7", + "map-stream": "0.1.0", + "pause-stream": "0.0.11", + "split": "0.3.3", + "stream-combiner": "0.0.4", + "through": "2.3.8" + } + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.3.3", + "path-is-absolute": "1.0.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + } + }, + "glob-stream": { + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", + "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", + "dev": true, + "requires": { + "extend": "3.0.1", + "glob": "5.0.15", + "glob-parent": "3.1.0", + "micromatch": "2.3.11", + "ordered-read-streams": "0.3.0", + "through2": "0.6.5", + "to-absolute-glob": "0.1.1", + "unique-stream": "2.2.1" + } + }, +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "gulp-sourcemaps": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz", "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", "dev": true, "requires": { +<<<<<<< HEAD "convert-source-map": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/convert-source-map/-/convert-source-map-1.5.0.tgz", "graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "strip-bom": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/strip-bom/upstream/strip-bom-2.0.0.tgz", +======= + "convert-source-map": "1.5.0", + "graceful-fs": "4.1.11", + "strip-bom": "2.0.0", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "through2": "2.0.3", "vinyl": "1.2.0" }, @@ -2155,6 +4467,7 @@ "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", "dev": true, "requires": { +<<<<<<< HEAD "core-util-is": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/core-util-is/upstream/core-util-is-1.0.2.tgz", "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "isarray": "1.0.0", @@ -2162,6 +4475,15 @@ "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", "string_decoder": "1.0.3", "util-deprecate": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/util-deprecate/upstream/util-deprecate-1.0.2.tgz" +======= + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "string_decoder": { @@ -2170,7 +4492,11 @@ "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", "dev": true, "requires": { +<<<<<<< HEAD "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" +======= + "safe-buffer": "5.1.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "through2": { @@ -2180,7 +4506,11 @@ "dev": true, "requires": { "readable-stream": "2.3.3", +<<<<<<< HEAD "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" +======= + "xtend": "4.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "vinyl": { @@ -2190,18 +4520,29 @@ "dev": true, "requires": { "clone": "1.0.2", +<<<<<<< HEAD "clone-stats": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", "replace-ext": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/replace-ext/upstream/replace-ext-0.0.1.tgz" +======= + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "is-extglob": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-extglob/upstream/is-extglob-2.1.1.tgz", +======= + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, "is-glob": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-glob/upstream/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, @@ -2211,10 +4552,30 @@ }, "object-assign": { "version": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", +======= + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "map-stream": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", + "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true }, "ordered-read-streams": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", "dev": true, @@ -2225,10 +4586,25 @@ "dependencies": { "isarray": { "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +======= + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", + "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", + "dev": true, + "requires": { + "is-stream": "1.1.0", + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, "readable-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=", "dev": true, @@ -2248,11 +4624,35 @@ "dev": true, "requires": { "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" +======= + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "readable-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, @@ -2332,15 +4732,110 @@ "dependencies": { "clone": { "version": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", +======= + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "split": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", + "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", + "dev": true, + "requires": { + "through": "2.3.8" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, + "unique-stream": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", + "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", + "dev": true, + "requires": { + "json-stable-stringify": "1.0.1", + "through2-filter": "2.0.0" + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "dev": true, + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } + }, + "vinyl-fs": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", + "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", + "dev": true, + "requires": { + "duplexify": "3.5.0", + "glob-stream": "5.3.5", + "graceful-fs": "4.1.11", + "gulp-sourcemaps": "1.6.0", + "is-valid-glob": "0.3.0", + "lazystream": "1.0.0", + "lodash.isequal": "4.5.0", + "merge-stream": "1.0.1", + "mkdirp": "0.5.1", + "object-assign": "4.1.1", + "readable-stream": "2.3.3", + "strip-bom": "2.0.0", + "strip-bom-stream": "1.0.0", + "through2": "2.0.3", + "through2-filter": "2.0.0", + "vali-date": "1.0.0", + "vinyl": "1.2.0" + }, + "dependencies": { + "clone": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=", "dev": true }, "isarray": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, "readable-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=", "dev": true, @@ -2379,6 +4874,50 @@ "clone": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", "clone-stats": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", "replace-ext": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/replace-ext/upstream/replace-ext-0.0.1.tgz" +======= + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "dev": true, + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + } + }, + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } @@ -2386,6 +4925,7 @@ } }, "gulplog": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", "dev": true, @@ -2421,6 +4961,44 @@ "dev": true, "requires": { "sparkles": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz" +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", + "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", + "dev": true, + "requires": { + "glogg": "1.0.0" + } + }, + "har-validator": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", + "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "commander": "2.11.0", + "is-my-json-valid": "2.16.0", + "pinkie-promise": "2.0.1" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-gulplog": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", + "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", + "dev": true, + "requires": { + "sparkles": "1.0.0" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "hasha": { @@ -2429,6 +5007,7 @@ "integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=", "dev": true, "requires": { +<<<<<<< HEAD "is-stream": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-stream/-/is-stream-1.1.0.tgz", "pinkie-promise": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/pinkie-promise/upstream/pinkie-promise-2.0.1.tgz" } @@ -2446,10 +5025,32 @@ }, "hoek": { "version": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", +======= + "is-stream": "1.1.0", + "pinkie-promise": "2.0.1" + } + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "dev": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", "dev": true }, "homedir-polyfill": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", "dev": true, @@ -2482,10 +5083,50 @@ }, "infinity-agent": { "version": "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz", +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", + "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", + "dev": true, + "requires": { + "parse-passwd": "1.0.0" + } + }, + "hosted-git-info": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "dev": true + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "dev": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.0", + "sshpk": "1.13.1" + } + }, + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "dev": true, + "requires": { + "repeating": "2.0.1" + } + }, + "infinity-agent": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-ReDi/3qesDCyfWK3SzdEt6esQhY=", "dev": true }, "inflight": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, @@ -2496,16 +5137,40 @@ }, "inherits": { "version": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", +======= + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.3.3", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, "ini": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", +======= + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", "dev": true }, "interpret": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", +======= + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=", "dev": true }, @@ -2516,11 +5181,17 @@ "dev": true }, "is": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", +======= + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=", "dev": true }, "is-absolute": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", "integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=", "dev": true, @@ -2531,15 +5202,35 @@ }, "is-arrayish": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/is-arrayish/upstream/is-arrayish-0.2.1.tgz", +======= + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", + "integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=", + "dev": true, + "requires": { + "is-relative": "0.2.1", + "is-windows": "0.2.0" + } + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", "dev": true }, "is-buffer": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", +======= + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=", "dev": true }, "is-builtin-module": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/is-builtin-module/upstream/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, @@ -2549,10 +5240,24 @@ }, "is-dotfile": { "version": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "dev": true, + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-dotfile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", "dev": true }, "is-equal-shallow": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, @@ -2562,20 +5267,47 @@ }, "is-extendable": { "version": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", +======= + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "dev": true, + "requires": { + "is-primitive": "2.0.0" + } + }, + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", "dev": true }, "is-extglob": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", "dev": true }, "is-finite": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-finite/-/is-finite-1.0.2.tgz", "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { "number-is-nan": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "dev": true, + "requires": { + "number-is-nan": "1.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "is-fullwidth-code-point": { @@ -2584,6 +5316,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { +<<<<<<< HEAD "number-is-nan": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" } }, @@ -2608,10 +5341,40 @@ }, "is-npm": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-npm/-/is-npm-1.0.0.tgz", +======= + "number-is-nan": "1.0.1" + } + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "is-my-json-valid": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz", + "integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=", + "dev": true, + "requires": { + "generate-function": "2.0.0", + "generate-object-property": "1.2.0", + "jsonpointer": "4.0.1", + "xtend": "4.0.1" + } + }, + "is-npm": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=", "dev": true }, "is-number": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, @@ -2629,32 +5392,81 @@ "dependencies": { "isobject": { "version": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", +======= + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "dev": true + }, + "is-plain-object": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.3.tgz", + "integrity": "sha1-wVvz5LZrYtcu+vKSWEhmPsvGGbY=", + "dev": true, + "requires": { + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true } } }, "is-posix-bracket": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", +======= + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", "dev": true }, "is-primitive": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", "dev": true }, "is-property": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", "dev": true }, "is-redirect": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-redirect/-/is-redirect-1.0.0.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", "dev": true }, "is-relative": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", "integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=", "dev": true, @@ -2664,15 +5476,34 @@ }, "is-stream": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/is-stream/-/is-stream-1.1.0.tgz", +======= + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", + "integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=", + "dev": true, + "requires": { + "is-unc-path": "0.1.2" + } + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", "dev": true }, "is-typedarray": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, "is-unc-path": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", "integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=", "dev": true, @@ -2682,35 +5513,74 @@ }, "is-utf8": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/is-utf8/upstream/is-utf8-0.2.1.tgz", +======= + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", + "integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=", + "dev": true, + "requires": { + "unc-path-regex": "0.1.2" + } + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", "dev": true }, "is-valid-glob": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz", +======= + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=", "dev": true }, "is-windows": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", +======= + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=", "dev": true }, "isarray": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/isarray/upstream/isarray-0.0.1.tgz", +======= + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, "isemail": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz", +======= + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=", "dev": true }, "isexe": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, "isobject": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", "dev": true, @@ -2720,17 +5590,36 @@ "dependencies": { "isarray": { "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +======= + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, + "requires": { + "isarray": "1.0.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true } } }, "isstream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", +======= + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", "dev": true }, "jade": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=", "dev": true, @@ -2741,17 +5630,37 @@ "dependencies": { "commander": { "version": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz", +======= + "version": "0.26.3", + "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", + "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=", + "dev": true, + "requires": { + "commander": "0.6.1", + "mkdirp": "0.3.0" + }, + "dependencies": { + "commander": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=", "dev": true }, "mkdirp": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", +======= + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=", "dev": true } } }, "joi": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/joi/-/joi-4.9.0.tgz", "integrity": "sha1-I1UCM2MInKAbwf0HnnKUn5d7qto=", "dev": true, @@ -2781,16 +5690,57 @@ }, "jsbn": { "version": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", +======= + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/joi/-/joi-4.9.0.tgz", + "integrity": "sha1-I1UCM2MInKAbwf0HnnKUn5d7qto=", + "dev": true, + "requires": { + "hoek": "2.16.3", + "isemail": "1.2.0", + "moment": "2.18.1", + "topo": "1.1.0" + } + }, + "joi-assert": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/joi-assert/-/joi-assert-0.0.3.tgz", + "integrity": "sha1-dykTdqw/CxJPQz+Y23S08g9ob9Y=", + "dev": true, + "requires": { + "assertion-error": "1.0.0" + } + }, + "js-yaml": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz", + "integrity": "sha512-0LoUNELX4S+iofCT8f4uEHIiRBR+c2AINyC8qRWfC6QNruLtxVZRJaPcu/xwMgFIgDxF25tGHaDjvxzJCNE9yw==", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "dev": true, "optional": true }, "jsesc": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", +======= + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true }, "json-pointer": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/json-pointer/-/json-pointer-0.2.2.tgz", "integrity": "sha1-GngoXUZQxQsQR19/WZGamduKFks=", "dev": true, @@ -2800,10 +5750,24 @@ }, "json-schema": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/json-schema/-/json-schema-0.2.3.tgz", +======= + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/json-pointer/-/json-pointer-0.2.2.tgz", + "integrity": "sha1-GngoXUZQxQsQR19/WZGamduKFks=", + "dev": true, + "requires": { + "foreach": "2.0.5" + } + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", "dev": true }, "json-stable-stringify": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", "dev": true, @@ -2813,6 +5777,19 @@ }, "json-stringify-safe": { "version": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, @@ -2823,6 +5800,7 @@ "dev": true, "requires": { "graceful-fs": "4.1.11" +<<<<<<< HEAD }, "dependencies": { "graceful-fs": { @@ -2836,15 +5814,28 @@ }, "jsonify": { "version": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", +======= + } + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", "dev": true }, "jsonpointer": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", +======= + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", "dev": true }, "jsprim": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=", "dev": true, @@ -2867,6 +5858,24 @@ "requires": { "extsprintf": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/extsprintf/-/extsprintf-1.0.2.tgz" } +======= + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", + "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=", + "dev": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.0.2", + "json-schema": "0.2.3", + "verror": "1.3.6" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } }, @@ -2877,11 +5886,20 @@ "dev": true }, "kind-of": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { "is-buffer": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz" +======= + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.5" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "klaw": { @@ -2891,6 +5909,7 @@ "dev": true, "requires": { "graceful-fs": "4.1.11" +<<<<<<< HEAD }, "dependencies": { "graceful-fs": { @@ -2912,10 +5931,27 @@ }, "lazy.js": { "version": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.3.2.tgz", +======= + } + }, + "latest-version": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz", + "integrity": "sha1-cs/Ebj6NG+ZR4eu1Tqn26pbzdLs=", + "dev": true, + "requires": { + "package-json": "1.2.0" + } + }, + "lazy.js": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.3.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-fMEQfl+AmucEmPUR3RgOH4C076k=", "dev": true }, "lazystream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", "dev": true, @@ -2925,10 +5961,24 @@ "dependencies": { "isarray": { "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", + "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, "readable-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=", "dev": true, @@ -2948,6 +5998,29 @@ "dev": true, "requires": { "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" +======= + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } @@ -2962,6 +6035,7 @@ } }, "liftoff": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz", "integrity": "sha1-qY8v9nGD2Lp8+soQVIvX/wVQs4U=", "dev": true, @@ -3000,31 +6074,90 @@ "dev": true, "requires": { "is-utf8": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/is-utf8/upstream/is-utf8-0.2.1.tgz" +======= + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz", + "integrity": "sha1-qY8v9nGD2Lp8+soQVIvX/wVQs4U=", + "dev": true, + "requires": { + "extend": "3.0.1", + "findup-sync": "0.4.3", + "fined": "1.1.0", + "flagged-respawn": "0.3.2", + "lodash.isplainobject": "4.0.6", + "lodash.isstring": "4.0.1", + "lodash.mapvalues": "4.6.0", + "rechoir": "0.6.2", + "resolve": "1.3.3" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "lodash": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=", "dev": true }, "lodash._basecopy": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", +======= + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", "dev": true }, "lodash._basetostring": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", +======= + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", "dev": true }, "lodash._basevalues": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", +======= + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", "dev": true }, "lodash._escapehtmlchar": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=", "dev": true, @@ -3034,50 +6167,104 @@ }, "lodash._escapestringchar": { "version": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz", +======= + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", + "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=", + "dev": true, + "requires": { + "lodash._htmlescapes": "2.4.1" + } + }, + "lodash._escapestringchar": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=", "dev": true }, "lodash._getnative": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", +======= + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", "dev": true }, "lodash._htmlescapes": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz", +======= + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=", "dev": true }, "lodash._isiterateecall": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", +======= + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", "dev": true }, "lodash._isnative": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", +======= + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=", "dev": true }, "lodash._objecttypes": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz", +======= + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=", "dev": true }, "lodash._reescape": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", +======= + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", "dev": true }, "lodash._reevaluate": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", +======= + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", "dev": true }, "lodash._reinterpolate": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", +======= + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", "dev": true }, "lodash._reunescapedhtml": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz", "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=", "dev": true, @@ -3094,21 +6281,55 @@ "lodash._isnative": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", "lodash._shimkeys": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", "lodash.isobject": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz" +======= + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz", + "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=", + "dev": true, + "requires": { + "lodash._htmlescapes": "2.4.1", + "lodash.keys": "2.4.1" + }, + "dependencies": { + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "lodash._root": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", +======= + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", "dev": true }, "lodash._shimkeys": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=", "dev": true, "requires": { "lodash._objecttypes": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz" +======= + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", + "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=", + "dev": true, + "requires": { + "lodash._objecttypes": "2.4.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "lodash.assign": { @@ -3118,6 +6339,7 @@ "dev": true }, "lodash.defaults": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz", "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=", "dev": true, @@ -3134,11 +6356,32 @@ "lodash._isnative": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", "lodash._shimkeys": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", "lodash.isobject": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz" +======= + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz", + "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=", + "dev": true, + "requires": { + "lodash._objecttypes": "2.4.1", + "lodash.keys": "2.4.1" + }, + "dependencies": { + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "lodash.escape": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", "dev": true, @@ -3148,20 +6391,44 @@ }, "lodash.isarguments": { "version": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", +======= + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", + "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", + "dev": true, + "requires": { + "lodash._root": "3.0.1" + } + }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", "dev": true }, "lodash.isarray": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", +======= + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", "dev": true }, "lodash.isequal": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", +======= + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", "dev": true }, "lodash.isobject": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", "dev": true, @@ -3171,15 +6438,34 @@ }, "lodash.isplainobject": { "version": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", +======= + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", + "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", + "dev": true, + "requires": { + "lodash._objecttypes": "2.4.1" + } + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", "dev": true }, "lodash.isstring": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", +======= + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", "dev": true }, "lodash.keys": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", "dev": true, @@ -3191,15 +6477,36 @@ }, "lodash.mapvalues": { "version": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz", +======= + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "dev": true, + "requires": { + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" + } + }, + "lodash.mapvalues": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=", "dev": true }, "lodash.restparam": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", +======= + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", "dev": true }, "lodash.template": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", "dev": true, @@ -3240,11 +6547,58 @@ "lodash._isnative": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", "lodash._shimkeys": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", "lodash.isobject": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz" +======= + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "dev": true, + "requires": { + "lodash._basecopy": "3.0.1", + "lodash._basetostring": "3.0.1", + "lodash._basevalues": "3.0.0", + "lodash._isiterateecall": "3.0.9", + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0", + "lodash.keys": "3.1.2", + "lodash.restparam": "3.6.1", + "lodash.templatesettings": "3.1.1" + } + }, + "lodash.templatesettings": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", + "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", + "dev": true, + "requires": { + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0" + } + }, + "lodash.values": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz", + "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=", + "dev": true, + "requires": { + "lodash.keys": "2.4.1" + }, + "dependencies": { + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "loud-rejection": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, @@ -3255,27 +6609,62 @@ }, "lowercase-keys": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/lowercase-keys/-/lowercase-keys-1.0.0.tgz", +======= + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "dev": true, + "requires": { + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" + } + }, + "lowercase-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", "dev": true }, "lru-cache": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", +======= + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=", "dev": true }, "map-cache": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", +======= + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "dev": true }, "map-obj": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", "dev": true }, "map-stream": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/map-stream/-/map-stream-0.1.0.tgz", "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", +======= + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz", + "integrity": "sha1-0u9OuBGihkTHqJiZhcacL91JaCc=", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "dev": true }, "map-stream-limit": { @@ -3285,7 +6674,11 @@ "dev": true, "requires": { "map-stream": "0.0.3", +<<<<<<< HEAD "through": "https://registry.npmjs.org/through/-/through-2.3.8.tgz" +======= + "through": "2.3.8" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 }, "dependencies": { "map-stream": { @@ -3297,6 +6690,7 @@ } }, "meow": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, @@ -3315,12 +6709,35 @@ "dependencies": { "object-assign": { "version": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", +======= + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "dev": true, + "requires": { + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" + }, + "dependencies": { + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true } } }, "merge-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", "dev": true, @@ -3330,10 +6747,24 @@ "dependencies": { "isarray": { "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, "readable-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=", "dev": true, @@ -3353,11 +6784,35 @@ "dev": true, "requires": { "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" +======= + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "micromatch": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, @@ -3379,10 +6834,36 @@ }, "mime-db": { "version": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", +======= + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.3" + } + }, + "mime-db": { + "version": "1.27.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=", "dev": true }, "mime-types": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", "dev": true, @@ -3409,15 +6890,53 @@ }, "minimist": { "version": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +======= + "version": "2.1.15", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", + "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", + "dev": true, + "requires": { + "mime-db": "1.27.0" + } + }, + "minichain": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/minichain/-/minichain-0.0.1.tgz", + "integrity": "sha1-C65Jd0Fw2JMUAcJxu27W05kqn1I=", + "dev": true, + "requires": { + "ministyle": "0.1.4", + "miniwrite": "0.1.4" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, "ministyle": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz", +======= + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-sQSB6xaqj3ts2YOBc5OkTaDloM0=", "dev": true }, "minitable": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/minitable/-/minitable-0.0.4.tgz", "integrity": "sha1-jWHLePrm83HYBRznfop4Mc49U5Y=", "dev": true, @@ -3437,12 +6956,37 @@ "dependencies": { "mkdirp": { "version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", +======= + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/minitable/-/minitable-0.0.4.tgz", + "integrity": "sha1-jWHLePrm83HYBRznfop4Mc49U5Y=", + "dev": true, + "requires": { + "minichain": "0.0.1", + "ministyle": "0.1.4", + "miniwrite": "0.1.4" + } + }, + "miniwrite": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz", + "integrity": "sha1-cvAjhcCsN9VC7+J9xnZLMZCHJc4=", + "dev": true, + "requires": { + "mkdirp": "0.3.5" + }, + "dependencies": { + "mkdirp": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=", "dev": true } } }, "mkdirp": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, @@ -3452,12 +6996,26 @@ "dependencies": { "minimist": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/minimist/-/minimist-0.0.8.tgz", +======= + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true } } }, "mocha": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz", "integrity": "sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=", "dev": true, @@ -3481,10 +7039,48 @@ }, "escape-string-regexp": { "version": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz", +======= + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz", + "integrity": "sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=", + "dev": true, + "requires": { + "commander": "2.3.0", + "debug": "2.2.0", + "diff": "1.4.0", + "escape-string-regexp": "1.0.2", + "glob": "3.2.11", + "growl": "1.9.2", + "jade": "0.26.3", + "mkdirp": "0.5.1", + "supports-color": "1.2.0", + "to-iso-string": "0.0.2" + }, + "dependencies": { + "commander": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz", + "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=", + "dev": true + }, + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "dev": true, + "requires": { + "ms": "0.7.1" + } + }, + "escape-string-regexp": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=", "dev": true }, "glob": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=", "dev": true, @@ -3504,17 +7100,53 @@ }, "supports-color": { "version": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz", +======= + "version": "3.2.11", + "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", + "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "minimatch": "0.3.0" + } + }, + "minimatch": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz", + "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=", + "dev": true, + "requires": { + "lru-cache": "2.7.3", + "sigmund": "1.0.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "dev": true + }, + "supports-color": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=", "dev": true } } }, "moment": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", +======= + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=", "dev": true }, "ms": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/ms/upstream/ms-0.7.1.tgz", "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", "dev": true @@ -3529,10 +7161,42 @@ }, "natives": { "version": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz", +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "multimatch": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", + "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", + "dev": true, + "requires": { + "array-differ": "1.0.0", + "array-union": "1.0.2", + "arrify": "1.0.1", + "minimatch": "3.0.4" + } + }, + "multipipe": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", + "dev": true, + "requires": { + "duplexer2": "0.0.2" + } + }, + "natives": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=", "dev": true }, "nested-error-stacks": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz", "integrity": "sha1-GfYZWRUZ8JZ2mlupqG5u7sgjw88=", "dev": true, @@ -3573,25 +7237,89 @@ }, "number-is-nan": { "version": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz", + "integrity": "sha1-GfYZWRUZ8JZ2mlupqG5u7sgjw88=", + "dev": true, + "requires": { + "inherits": "2.0.3" + } + }, + "node-uuid": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz", + "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=" + }, + "node.extend": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz", + "integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=", + "dev": true, + "requires": { + "is": "3.2.1" + } + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "dev": true, + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "4.3.6", + "validate-npm-package-license": "3.0.1" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "1.0.2" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, "oauth-sign": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", +======= + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", "dev": true }, "object-assign": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", +======= + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", "dev": true }, "object-keys": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/object-keys/upstream/object-keys-0.4.0.tgz", +======= + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=", "dev": true }, "object.defaults": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", "dev": true, @@ -3612,12 +7340,38 @@ }, "isobject": { "version": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", +======= + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", + "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", + "dev": true, + "requires": { + "array-each": "1.0.1", + "array-slice": "1.0.0", + "for-own": "1.0.0", + "isobject": "3.0.1" + }, + "dependencies": { + "for-own": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true } } }, "object.omit": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, @@ -3644,10 +7398,43 @@ }, "open": { "version": "https://registry.npmjs.org/open/-/open-0.0.5.tgz", +======= + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "dev": true, + "requires": { + "for-own": "0.1.5", + "is-extendable": "0.1.1" + } + }, + "object.pick": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz", + "integrity": "sha1-tTkr7peC2m2ft9avr1OXefEjTCs=", + "dev": true, + "requires": { + "isobject": "2.1.0" + } + }, + "once": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "open": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=", "dev": true }, "orchestrator": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", "dev": true, @@ -3659,11 +7446,31 @@ }, "ordered-read-streams": { "version": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", +======= + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", + "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", + "dev": true, + "requires": { + "end-of-stream": "0.1.5", + "sequencify": "0.0.7", + "stream-consume": "0.1.0" + } + }, + "ordered-read-streams": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=", "dev": true }, "os-homedir": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, @@ -3677,11 +7484,17 @@ } }, "os-tmpdir": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, "osenv": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", "dev": true, @@ -3730,10 +7543,67 @@ }, "parse-passwd": { "version": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", +======= + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", + "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", + "dev": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "package-json": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz", + "integrity": "sha1-yOysCUInzfdqMWh07QXifMk5oOA=", + "dev": true, + "requires": { + "got": "3.3.1", + "registry-url": "3.1.0" + } + }, + "parse-filepath": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz", + "integrity": "sha1-FZ1hVdQ5BNFsEO9piRHaHpGWm3M=", + "dev": true, + "requires": { + "is-absolute": "0.2.6", + "map-cache": "0.2.2", + "path-root": "0.1.1" + } + }, + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true, + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "1.3.1" + } + }, + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", "dev": true }, "parsimmon": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/parsimmon/-/parsimmon-0.5.1.tgz", "integrity": "sha1-JHyXDX1emaURFbFqEG3pbw65MDs=", "dev": true, @@ -3743,10 +7613,24 @@ }, "path-dirname": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/path-dirname/upstream/path-dirname-1.0.2.tgz", +======= + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/parsimmon/-/parsimmon-0.5.1.tgz", + "integrity": "sha1-JHyXDX1emaURFbFqEG3pbw65MDs=", + "dev": true, + "requires": { + "pjs": "5.1.1" + } + }, + "path-dirname": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", "dev": true }, "path-exists": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/path-exists/upstream/path-exists-2.1.0.tgz", "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, @@ -3756,15 +7640,34 @@ }, "path-is-absolute": { "version": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", +======= + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, "path-parse": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", +======= + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", "dev": true }, "path-root": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", "dev": true, @@ -3774,10 +7677,24 @@ }, "path-root-regex": { "version": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", +======= + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", + "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", + "dev": true, + "requires": { + "path-root-regex": "0.1.2" + } + }, + "path-root-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=", "dev": true }, "path-type": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/path-type/upstream/path-type-1.1.0.tgz", "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, @@ -3812,6 +7729,33 @@ "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", "dev": true }, +======= + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pause-stream": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", + "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", + "dev": true, + "requires": { + "through": "2.3.8" + } + }, + "pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", + "dev": true + }, +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "phantomjs-prebuilt": { "version": "2.1.14", "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz", @@ -3826,6 +7770,7 @@ "progress": "1.1.8", "request": "2.79.0", "request-progress": "2.0.1", +<<<<<<< HEAD "which": "https://registry.npmjs.org/which/-/which-1.2.14.tgz" }, "dependencies": { @@ -3897,15 +7842,29 @@ }, "pify": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/pify/upstream/pify-2.3.0.tgz", +======= + "which": "1.2.14" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, "pinkie": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/pinkie/upstream/pinkie-2.0.4.tgz", +======= + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", "dev": true }, "pinkie-promise": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/pinkie-promise/upstream/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, @@ -3915,6 +7874,19 @@ }, "pjs": { "version": "https://registry.npmjs.org/pjs/-/pjs-5.1.1.tgz", +======= + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + }, + "pjs": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/pjs/-/pjs-5.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-nfxGc7sB3v/WkV+x3sdYJ6ukKr8=", "dev": true }, @@ -3925,22 +7897,42 @@ "dev": true }, "prepend-http": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/prepend-http/-/prepend-http-1.0.4.tgz", +======= + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", "dev": true }, "preserve": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", +======= + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", "dev": true }, "pretty-hrtime": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", +======= + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=", "dev": true }, "process-nextick-args": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", +======= + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", "dev": true }, @@ -3951,11 +7943,17 @@ "dev": true }, "punycode": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", +======= + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", "dev": true }, "qs": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", "dev": true @@ -3991,21 +7989,73 @@ "dev": true, "requires": { "is-buffer": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz" +======= + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", + "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", + "dev": true + }, + "queue": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz", + "integrity": "sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=", + "dev": true, + "requires": { + "inherits": "2.0.3" + } + }, + "randomatic": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "dev": true, + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.5" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "kind-of": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { "is-buffer": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz" +======= + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, + "requires": { + "is-buffer": "1.1.5" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "rc": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", "dev": true, @@ -4027,10 +8077,37 @@ "dependencies": { "isarray": { "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +======= + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", + "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", + "dev": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + } + }, + "read-all-stream": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz", + "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=", + "dev": true, + "requires": { + "pinkie-promise": "2.0.1", + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, "readable-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=", "dev": true, @@ -4050,11 +8127,35 @@ "dev": true, "requires": { "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" +======= + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "read-pkg": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/read-pkg/upstream/read-pkg-1.1.0.tgz", "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, @@ -4120,20 +8221,106 @@ }, "remove-trailing-separator": { "version": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", +======= + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, + "requires": { + "resolve": "1.3.3" + } + }, + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "dev": true, + "requires": { + "indent-string": "2.1.0", + "strip-indent": "1.0.1" + } + }, + "regex-cache": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", + "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=", + "dev": true, + "requires": { + "is-equal-shallow": "0.1.3", + "is-primitive": "2.0.0" + } + }, + "registry-url": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", + "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", + "dev": true, + "requires": { + "rc": "1.2.1" + } + }, + "remove-trailing-separator": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=", "dev": true }, "repeat-element": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", +======= + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", "dev": true }, "repeat-string": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", +======= + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, "repeating": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, @@ -4143,10 +8330,24 @@ }, "replace-ext": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/replace-ext/upstream/replace-ext-0.0.1.tgz", +======= + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "requires": { + "is-finite": "1.0.2" + } + }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", "dev": true }, "request": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", "dev": true, @@ -4178,6 +8379,39 @@ "uuid": { "version": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=", +======= + "version": "2.79.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", + "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", + "dev": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.11.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "2.0.6", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.15", + "oauth-sign": "0.8.2", + "qs": "6.3.2", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.4.3", + "uuid": "3.1.0" + }, + "dependencies": { + "uuid": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", + "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "dev": true } } @@ -4204,6 +8438,7 @@ "dev": true }, "resolve": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz", "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=", "dev": true, @@ -4218,6 +8453,24 @@ "requires": { "expand-tilde": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz", "global-modules": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz" +======= + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz", + "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=", + "dev": true, + "requires": { + "path-parse": "1.0.5" + } + }, + "resolve-dir": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz", + "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=", + "dev": true, + "requires": { + "expand-tilde": "1.2.2", + "global-modules": "0.2.3" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "resolve-url": { @@ -4227,6 +8480,7 @@ "dev": true }, "rimraf": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", "dev": true, @@ -4253,21 +8507,55 @@ "dev": true, "requires": { "brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz" +======= + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", + "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "dev": true, + "requires": { + "glob": "7.1.2" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.3.3", + "path-is-absolute": "1.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "safe-buffer": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=", "dev": true }, "semver": { "version": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", +======= + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "dev": true + }, + "semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", "dev": true }, "semver-diff": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/semver-diff/-/semver-diff-2.1.0.tgz", "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", "dev": true, @@ -4277,13 +8565,31 @@ "dependencies": { "semver": { "version": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", +======= + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", + "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", + "dev": true, + "requires": { + "semver": "5.3.0" + }, + "dependencies": { + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "dev": true } } }, "sequencify": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", +======= + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=", "dev": true }, @@ -4294,16 +8600,27 @@ "dev": true }, "sigmund": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=", "dev": true }, "signal-exit": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", +======= + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, "sntp": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", "dev": true, @@ -4313,6 +8630,19 @@ }, "source-map": { "version": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", +======= + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "source-map": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", "dev": true }, @@ -4329,6 +8659,7 @@ } }, "source-map-support": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz", "integrity": "sha1-NJAJd9W6PwfHdX7nLnO7GptTdU8=", "dev": true, @@ -4342,6 +8673,23 @@ "dev": true, "requires": { "amdefine": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz" +======= + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz", + "integrity": "sha1-NJAJd9W6PwfHdX7nLnO7GptTdU8=", + "dev": true, + "requires": { + "source-map": "0.1.32" + }, + "dependencies": { + "source-map": { + "version": "0.1.32", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz", + "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=", + "dev": true, + "requires": { + "amdefine": "1.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } @@ -4353,11 +8701,17 @@ "dev": true }, "sparkles": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", "dev": true }, "spdx-correct": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/spdx-correct/upstream/spdx-correct-1.0.2.tgz", "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", "dev": true, @@ -4367,15 +8721,34 @@ }, "spdx-expression-parse": { "version": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "dev": true, + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", "dev": true }, "spdx-license-ids": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/spdx-license-ids/upstream/spdx-license-ids-1.2.2.tgz", +======= + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", "dev": true }, "split": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/split/-/split-0.2.10.tgz", "integrity": "sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc=", "dev": true, @@ -4385,10 +8758,24 @@ }, "sprintf-js": { "version": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", +======= + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz", + "integrity": "sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc=", + "dev": true, + "requires": { + "through": "2.3.8" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, "sshpk": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", "dev": true, @@ -4405,11 +8792,32 @@ "dependencies": { "assert-plus": { "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", +======= + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", + "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "dev": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", "dev": true } } }, +<<<<<<< HEAD "stream-combiner": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/stream-combiner/-/stream-combiner-0.0.4.tgz", "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", @@ -4420,25 +8828,112 @@ }, "stream-consume": { "version": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz", +======= + "stat-mode": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz", + "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=", + "dev": true + }, + "stream-combiner": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", + "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", + "dev": true, + "requires": { + "duplexer": "0.1.1" + } + }, + "stream-consume": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=", "dev": true }, "stream-shift": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/stream-shift/upstream/stream-shift-1.0.0.tgz", "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", "dev": true }, "string_decoder": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/string_decoder/upstream/string_decoder-0.10.31.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", + "dev": true + }, + "streamfilter": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.5.tgz", + "integrity": "sha1-h1BxEb644phFFxe1Ec/tjwAqv1M=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "streamifier": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/streamifier/-/streamifier-0.1.1.tgz", + "integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=", + "dev": true + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true }, "string-length": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz", "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w=", "dev": true, "requires": { "strip-ansi": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/strip-ansi/upstream/strip-ansi-3.0.1.tgz" +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz", + "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w=", + "dev": true, + "requires": { + "strip-ansi": "3.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "string-width": { @@ -4449,15 +8944,25 @@ "requires": { "code-point-at": "1.1.0", "is-fullwidth-code-point": "1.0.0", +<<<<<<< HEAD "strip-ansi": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/strip-ansi/upstream/strip-ansi-3.0.1.tgz" } }, "stringstream": { "version": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", +======= + "strip-ansi": "3.0.1" + } + }, + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", "dev": true }, "strip-ansi": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/strip-ansi/upstream/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, @@ -4488,7 +8993,44 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/is-utf8/upstream/is-utf8-0.2.1.tgz" + "is-utf8": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/is-utf8/upstream/is-utf8-0.2.1.tgz" +======= + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", + "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", + "dev": true, + "requires": { + "first-chunk-stream": "1.0.0", + "is-utf8": "0.2.1" + } + }, + "strip-bom-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz", + "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=", + "dev": true, + "requires": { + "first-chunk-stream": "1.0.0", + "strip-bom": "2.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } @@ -4500,6 +9042,7 @@ "dev": true }, "strip-indent": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, @@ -4509,11 +9052,29 @@ }, "strip-json-comments": { "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/strip-json-comments/-/strip-json-comments-2.0.1.tgz", +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "dev": true, + "requires": { + "get-stdin": "4.0.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true }, "supports-color": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true }, @@ -4529,6 +9090,20 @@ "yargs": "5.0.0" } }, +<<<<<<< HEAD +======= + "tar": { + "version": "0.1.20", + "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz", + "integrity": "sha1-QpQLrltfIsdEg2mRJvnz8nRJyxM=", + "dev": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "0.1.31", + "inherits": "2.0.3" + } + }, +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "throttleit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", @@ -4536,11 +9111,17 @@ "dev": true }, "through": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", +======= + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, "through2": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, @@ -4551,10 +9132,25 @@ "dependencies": { "isarray": { "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +======= + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "dev": true, + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, "readable-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=", "dev": true, @@ -4574,11 +9170,35 @@ "dev": true, "requires": { "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" +======= + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, "through2-filter": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", "dev": true, @@ -4597,15 +9217,44 @@ }, "time-stamp": { "version": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", + "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", + "dev": true, + "requires": { + "through2": "2.0.3", + "xtend": "4.0.1" + } + }, + "tildify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", + "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", + "dev": true, + "requires": { + "os-homedir": "1.0.2" + } + }, + "time-stamp": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", "dev": true }, "timed-out": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz", +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-84sK6B03R9YoAB9B2vxlKs5nHAo=", "dev": true }, "to-absolute-glob": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=", "dev": true, @@ -4615,10 +9264,24 @@ }, "to-iso-string": { "version": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz", +======= + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", + "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1" + } + }, + "to-iso-string": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=", "dev": true }, "topo": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz", "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=", "dev": true, @@ -4636,10 +9299,33 @@ }, "trim-newlines": { "version": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", +======= + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz", + "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=", + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "tough-cookie": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", + "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", + "dev": true, + "requires": { + "punycode": "1.4.1" + } + }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", "dev": true }, "tsd": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/tsd/-/tsd-0.6.5.tgz", "integrity": "sha1-NKC2TB22pws4YP5PVXHZ0TV0Ia0=", "dev": true, @@ -4682,10 +9368,63 @@ "dependencies": { "lru-cache": { "version": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz", +======= + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/tsd/-/tsd-0.6.5.tgz", + "integrity": "sha1-NKC2TB22pws4YP5PVXHZ0TV0Ia0=", + "dev": true, + "requires": { + "assertion-error": "1.0.0", + "bl": "0.9.5", + "bluebird": "1.2.4", + "chalk": "1.1.3", + "colors": "1.1.2", + "deep-freeze": "0.0.1", + "definition-header": "0.1.0", + "detect-indent": "0.2.0", + "diff": "1.4.0", + "event-stream": "3.1.7", + "exit": "0.1.2", + "glob": "4.5.3", + "joi": "4.9.0", + "joi-assert": "0.0.3", + "jsesc": "0.5.0", + "json-pointer": "0.2.2", + "lazy.js": "0.3.2", + "lru-cache": "2.5.2", + "minimatch": "1.0.0", + "minimist": "1.2.0", + "ministyle": "0.1.4", + "minitable": "0.0.4", + "miniwrite": "0.1.4", + "mkdirp": "0.5.1", + "open": "0.0.5", + "request": "2.79.0", + "rimraf": "2.2.8", + "semver": "4.3.6", + "type-detect": "0.1.2", + "universal-analytics": "0.3.11", + "update-notifier": "0.2.2", + "uri-templates": "0.1.9", + "uuid": "2.0.3", + "verror": "1.4.0" + }, + "dependencies": { + "extsprintf": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.3.tgz", + "integrity": "sha1-MxDKjO1SBeUjR2awsnROpbJ4jWc=", + "dev": true + }, + "lru-cache": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-H92tk4quEmPOE4aAvhs/WRwKtBw=", "dev": true }, "minimatch": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz", "integrity": "sha1-4N0hILSeG3JM6NcUxSCCKpQ4V20=", "dev": true, @@ -4704,10 +9443,36 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", "dev": true +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz", + "integrity": "sha1-4N0hILSeG3JM6NcUxSCCKpQ4V20=", + "dev": true, + "requires": { + "lru-cache": "2.5.2", + "sigmund": "1.0.1" + } + }, + "rimraf": { + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz", + "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=", + "dev": true + }, + "verror": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.4.0.tgz", + "integrity": "sha1-XY/fWHUUHDGDt8a8I6CqPj5spOI=", + "dev": true, + "requires": { + "extsprintf": "1.0.3" + } +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } }, "tunnel-agent": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, @@ -4717,12 +9482,27 @@ }, "tweetnacl": { "version": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", +======= + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", + "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", + "dev": true + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "dev": true, "optional": true }, "type-detect": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.2.tgz", +======= + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-yI6FPlTlq9iPG/MZS0d8hTyU+FQ=", "dev": true }, @@ -4733,26 +9513,47 @@ "dev": true }, "typescript": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/typescript/-/typescript-1.8.10.tgz", +======= + "version": "1.8.10", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-tHXW4N/wv1DyluXKbvn7tccyDx4=", "dev": true }, "unc-path-regex": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", +======= + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", "dev": true }, "underscore": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/underscore/-/underscore-1.8.3.tgz", +======= + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", "dev": true }, "unique-stream": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=", "dev": true }, "universal-analytics": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.3.11.tgz", "integrity": "sha1-USh5GToSpm3L2RhRITibq5E81LY=", "dev": true, @@ -4778,15 +9579,51 @@ "dependencies": { "ansi-regex": { "version": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", +======= + "version": "0.3.11", + "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.3.11.tgz", + "integrity": "sha1-USh5GToSpm3L2RhRITibq5E81LY=", + "dev": true, + "requires": { + "async": "0.2.10", + "node-uuid": "1.4.8", + "request": "2.79.0", + "underscore": "1.8.3" + } + }, + "update-notifier": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.2.2.tgz", + "integrity": "sha1-5ps6eEtOaGoqzZj15mlEWRmW4Yc=", + "dev": true, + "requires": { + "chalk": "0.5.1", + "configstore": "0.3.2", + "is-npm": "1.0.0", + "latest-version": "1.0.1", + "semver-diff": "2.1.0", + "string-length": "1.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=", "dev": true }, "ansi-styles": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", +======= + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=", "dev": true }, "chalk": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", "dev": true, @@ -4816,13 +9653,53 @@ }, "supports-color": { "version": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", +======= + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", + "dev": true, + "requires": { + "ansi-styles": "1.1.0", + "escape-string-regexp": "1.0.5", + "has-ansi": "0.1.0", + "strip-ansi": "0.3.0", + "supports-color": "0.2.0" + } + }, + "has-ansi": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", + "dev": true, + "requires": { + "ansi-regex": "0.2.1" + } + }, + "strip-ansi": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", + "dev": true, + "requires": { + "ansi-regex": "0.2.1" + } + }, + "supports-color": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=", "dev": true } } }, "uri-templates": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/uri-templates/-/uri-templates-0.1.9.tgz", +======= + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/uri-templates/-/uri-templates-0.1.9.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-xW96VzGzoxAiZpX25WORgP0aokk=", "dev": true }, @@ -4833,11 +9710,17 @@ "dev": true }, "user-home": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", +======= + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", "dev": true }, "util-deprecate": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/util-deprecate/upstream/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true @@ -4852,10 +9735,36 @@ }, "vali-date": { "version": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, + "uuid": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", + "dev": true + }, + "v8flags": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", + "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", + "dev": true, + "requires": { + "user-home": "1.1.1" + } + }, + "vali-date": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=", "dev": true }, "validate-npm-package-license": { +<<<<<<< HEAD "version": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/validate-npm-package-license/upstream/validate-npm-package-license-3.0.1.tgz", "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", "dev": true, @@ -4936,10 +9845,103 @@ "requires": { "clone": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", "clone-stats": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz" +======= + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "dev": true, + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "verror": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", + "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", + "dev": true, + "requires": { + "extsprintf": "1.0.2" + } + }, + "vinyl": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + }, + "vinyl-fs": { + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", + "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", + "dev": true, + "requires": { + "defaults": "1.0.3", + "glob-stream": "3.1.18", + "glob-watcher": "0.0.6", + "graceful-fs": "3.0.11", + "mkdirp": "0.5.1", + "strip-bom": "1.0.0", + "through2": "0.6.5", + "vinyl": "0.4.6" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "dev": true + }, + "graceful-fs": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", + "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", + "dev": true, + "requires": { + "natives": "1.1.0" + } + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "dev": true, + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } }, +<<<<<<< HEAD "vscode": { "version": "https://registry.npmjs.org/vscode/-/vscode-0.10.7.tgz", "integrity": "sha1-9dKJcI7nmmbC4zREy4MY2mJgt40=", @@ -4964,15 +9966,115 @@ "once": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/once/upstream/once-1.3.3.tgz", "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" } +======= + "vinyl-source-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/vinyl-source-stream/-/vinyl-source-stream-1.1.0.tgz", + "integrity": "sha1-RMvlEIIFJ53rDFZTwJSiiHk4sas=", + "dev": true, + "requires": { + "through2": "0.6.5", + "vinyl": "0.4.6" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "dev": true, + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } + } + } + }, + "vscode": { + "version": "0.11.18", + "resolved": "https://registry.npmjs.org/vscode/-/vscode-0.11.18.tgz", + "integrity": "sha1-BK2rgSenw/ezRY0cqWSFH9+gB2g=", + "dev": true, + "requires": { + "glob": "5.0.15", + "gulp-chmod": "1.3.0", + "gulp-filter": "4.0.0", + "gulp-gunzip": "0.0.3", + "gulp-remote-src": "0.4.2", + "gulp-symdest": "1.1.0", + "gulp-untar": "0.0.4", + "gulp-vinyl-zip": "1.4.0", + "mocha": "2.5.3", + "request": "2.79.0", + "semver": "5.3.0", + "source-map-support": "0.3.3", + "vinyl-source-stream": "1.1.0" + }, + "dependencies": { + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.3.3", + "path-is-absolute": "1.0.1" + } + }, + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "dev": true +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } }, "which": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=", "dev": true, "requires": { "isexe": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" +======= + "version": "1.2.14", + "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", + "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=", + "dev": true, + "requires": { + "isexe": "2.0.0" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } }, "which-module": { @@ -4994,15 +10096,25 @@ "dev": true, "requires": { "string-width": "1.0.2", +<<<<<<< HEAD "strip-ansi": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/strip-ansi/upstream/strip-ansi-3.0.1.tgz" } }, "wrappy": { "version": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", +======= + "strip-ansi": "3.0.1" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "xdg-basedir": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz", "integrity": "sha1-FP+PY6T9vLBdW27qIrNvMDO58E4=", "dev": true, @@ -5012,11 +10124,29 @@ }, "xregexp": { "version": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz", +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz", + "integrity": "sha1-FP+PY6T9vLBdW27qIrNvMDO58E4=", + "dev": true, + "requires": { + "user-home": "1.1.1" + } + }, + "xregexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=", "dev": true }, "xtend": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", +======= + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", "dev": true }, @@ -5033,11 +10163,19 @@ "dev": true, "requires": { "cliui": "3.2.0", +<<<<<<< HEAD "decamelize": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/decamelize/upstream/decamelize-1.2.0.tgz", "get-caller-file": "1.0.2", "lodash.assign": "4.2.0", "os-locale": "1.4.0", "read-pkg-up": "https://devdiv.pkgs.visualstudio.com/_packaging/4d09cffa-6ad6-42b7-bc9e-63dad85ed260/npm/registry/read-pkg-up/upstream/read-pkg-up-1.0.1.tgz", +======= + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "lodash.assign": "4.2.0", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 "require-directory": "2.1.1", "require-main-filename": "1.0.1", "set-blocking": "2.0.0", @@ -5067,6 +10205,7 @@ } }, "yauzl": { +<<<<<<< HEAD "version": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz", "integrity": "sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI=", "dev": true, @@ -5081,6 +10220,23 @@ "dev": true, "requires": { "buffer-crc32": "https://devdiv.pkgs.visualstudio.com/_packaging/NodeRepos/npm/registry/buffer-crc32/upstream/buffer-crc32-0.2.13.tgz" +======= + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", + "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=", + "dev": true, + "requires": { + "fd-slicer": "1.0.1" + } + }, + "yazl": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.2.tgz", + "integrity": "sha1-FMsZCD4eJacAksFYiqvg9OTdTYg=", + "dev": true, + "requires": { + "buffer-crc32": "0.2.13" +>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0 } } } diff --git a/package.json b/package.json index aa9f0f1..f30dfe1 100644 --- a/package.json +++ b/package.json @@ -59,21 +59,23 @@ "compile": "gulp watch" }, "engines": { - "vscode": "^0.10.1" + "vscode": "^0.11.18" }, "dependencies": { "node-uuid": "^1.4.7" }, "devDependencies": { + "graceful-fs": "^4.1.11", "gulp": "^3.9.0", "gulp-clean": "^0.3.1", "gulp-merge": "^0.1.1", "gulp-sourcemaps": "^2.6.0", "gulp-svg2png": "^2.0.2", "gulp-typescript": "^2.10.0", + "minimatch": "^3.0.2", "tsd": "^0.6.5", "typescript": "^1.6.2", - "vscode": "0.10.x" + "vscode": "^0.11.18" }, "repository": { "type": "git",