aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranika-ahluwalia <anika.ahluwalia@gmail.com>2020-05-18 21:19:06 -0500
committeranika-ahluwalia <anika.ahluwalia@gmail.com>2020-05-18 21:19:06 -0500
commit18f166edfe42a4856a6fea659cb65fd79f00599f (patch)
treeb58f7b3bff1f7efd2284f59084701f68eb5460bc
parentbcb3106513b5a7ddc1aac8b7e6a448de4c4ded21 (diff)
parent3f97c632bc13075a4c13a6485d2e53e6694b36fa (diff)
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into script_documents
Diffstat
-rw-r--r--package-lock.json2742
-rw-r--r--src/client/views/collections/CollectionStackingView.tsx5
-rw-r--r--src/client/views/collections/CollectionView.tsx10
-rw-r--r--src/client/views/collections/collectionFreeForm/MarqueeView.tsx104
-rw-r--r--src/client/views/nodes/DocumentView.tsx2
-rw-r--r--src/client/views/nodes/VideoBox.tsx41
-rw-r--r--src/server/ApiManagers/UploadManager.ts56
7 files changed, 2865 insertions, 95 deletions
diff --git a/package-lock.json b/package-lock.json
index a622bcb0e..fe80430ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3016,6 +3016,574 @@
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
},
+<<<<<<< HEAD
+=======
+ "fsevents": {
+ "version": "1.2.12",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz",
+ "integrity": "sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==",
+ "optional": true,
+ "requires": {
+ "bindings": "^1.5.0",
+ "nan": "^2.12.1",
+ "node-pre-gyp": "*"
+ },
+ "dependencies": {
+ "abbrev": {
+ "version": "1.1.1",
+ "bundled": true,
+ "optional": true
+ },
+ "ansi-regex": {
+ "version": "2.1.1",
+ "bundled": true
+ },
+ "aproba": {
+ "version": "1.2.0",
+ "bundled": true,
+ "optional": true
+ },
+ "are-we-there-yet": {
+ "version": "1.1.5",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "delegates": "^1.0.0",
+ "readable-stream": "^2.0.6"
+ }
+ },
+ "balanced-match": {
+ "version": "1.0.0",
+ "bundled": true
+ },
+ "brace-expansion": {
+ "version": "1.1.11",
+ "bundled": true,
+ "requires": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "chownr": {
+ "version": "1.1.4",
+ "bundled": true,
+ "optional": true
+ },
+ "code-point-at": {
+ "version": "1.1.0",
+ "bundled": true
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "bundled": true
+ },
+ "console-control-strings": {
+ "version": "1.1.0",
+ "bundled": true
+ },
+ "core-util-is": {
+ "version": "1.0.2",
+ "bundled": true,
+ "optional": true
+ },
+ "debug": {
+ "version": "3.2.6",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "deep-extend": {
+ "version": "0.6.0",
+ "bundled": true,
+ "optional": true
+ },
+ "delegates": {
+ "version": "1.0.0",
+ "bundled": true,
+ "optional": true
+ },
+ "detect-libc": {
+ "version": "1.0.3",
+ "bundled": true,
+ "optional": true
+ },
+ "fs-minipass": {
+ "version": "1.2.7",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "minipass": "^2.6.0"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "bundled": true,
+ "optional": true
+ },
+ "gauge": {
+ "version": "2.7.4",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "aproba": "^1.0.3",
+ "console-control-strings": "^1.0.0",
+ "has-unicode": "^2.0.0",
+ "object-assign": "^4.1.0",
+ "signal-exit": "^3.0.0",
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wide-align": "^1.1.0"
+ }
+ },
+ "glob": {
+ "version": "7.1.6",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ }
+ },
+ "has-unicode": {
+ "version": "2.0.1",
+ "bundled": true,
+ "optional": true
+ },
+ "iconv-lite": {
+ "version": "0.4.24",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "safer-buffer": ">= 2.1.2 < 3"
+ }
+ },
+ "ignore-walk": {
+ "version": "3.0.3",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "minimatch": "^3.0.4"
+ }
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "inherits": {
+ "version": "2.0.4",
+ "bundled": true
+ },
+ "ini": {
+ "version": "1.3.5",
+ "bundled": true,
+ "optional": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "bundled": true,
+ "requires": {
+ "number-is-nan": "^1.0.0"
+ }
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "bundled": true,
+ "optional": true
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "bundled": true,
+ "requires": {
+ "brace-expansion": "^1.1.7"
+ }
+ },
+ "minimist": {
+ "version": "1.2.5",
+ "bundled": true
+ },
+ "minipass": {
+ "version": "2.9.0",
+ "bundled": true,
+ "requires": {
+ "safe-buffer": "^5.1.2",
+ "yallist": "^3.0.0"
+ }
+ },
+ "minizlib": {
+ "version": "1.3.3",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "minipass": "^2.9.0"
+ }
+ },
+ "mkdirp": {
+ "version": "0.5.3",
+ "bundled": true,
+ "requires": {
+ "minimist": "^1.2.5"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "bundled": true,
+ "optional": true
+ },
+ "needle": {
+ "version": "2.3.3",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "debug": "^3.2.6",
+ "iconv-lite": "^0.4.4",
+ "sax": "^1.2.4"
+ }
+ },
+ "node-pre-gyp": {
+ "version": "0.14.0",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "detect-libc": "^1.0.2",
+ "mkdirp": "^0.5.1",
+ "needle": "^2.2.1",
+ "nopt": "^4.0.1",
+ "npm-packlist": "^1.1.6",
+ "npmlog": "^4.0.2",
+ "rc": "^1.2.7",
+ "rimraf": "^2.6.1",
+ "semver": "^5.3.0",
+ "tar": "^4.4.2"
+ }
+ },
+ "nopt": {
+ "version": "4.0.3",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "abbrev": "1",
+ "osenv": "^0.1.4"
+ }
+ },
+ "npm-bundled": {
+ "version": "1.1.1",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "npm-normalize-package-bin": "^1.0.1"
+ }
+ },
+ "npm-normalize-package-bin": {
+ "version": "1.0.1",
+ "bundled": true
+ },
+ "npm-packlist": {
+ "version": "1.4.8",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "ignore-walk": "^3.0.1",
+ "npm-bundled": "^1.0.1",
+ "npm-normalize-package-bin": "^1.0.1"
+ }
+ },
+ "npmlog": {
+ "version": "4.1.2",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "are-we-there-yet": "~1.1.2",
+ "console-control-strings": "~1.1.0",
+ "gauge": "~2.7.3",
+ "set-blocking": "~2.0.0"
+ }
+ },
+ "number-is-nan": {
+ "version": "1.0.1",
+ "bundled": true
+ },
+ "object-assign": {
+ "version": "4.1.1",
+ "bundled": true,
+ "optional": true
+ },
+ "once": {
+ "version": "1.4.0",
+ "bundled": true,
+ "requires": {
+ "wrappy": "1"
+ }
+ },
+ "os-homedir": {
+ "version": "1.0.2",
+ "bundled": true,
+ "optional": true
+ },
+ "os-tmpdir": {
+ "version": "1.0.2",
+ "bundled": true,
+ "optional": true
+ },
+ "osenv": {
+ "version": "0.1.5",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "os-homedir": "^1.0.0",
+ "os-tmpdir": "^1.0.0"
+ }
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "bundled": true,
+ "optional": true
+ },
+ "process-nextick-args": {
+ "version": "2.0.1",
+ "bundled": true,
+ "optional": true
+ },
+ "rc": {
+ "version": "1.2.8",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "deep-extend": "^0.6.0",
+ "ini": "~1.3.0",
+ "minimist": "^1.2.0",
+ "strip-json-comments": "~2.0.1"
+ }
+ },
+ "readable-stream": {
+ "version": "2.3.7",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "rimraf": {
+ "version": "2.7.1",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "glob": "^7.1.3"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "bundled": true
+ },
+ "safer-buffer": {
+ "version": "2.1.2",
+ "bundled": true,
+ "optional": true
+ },
+ "sax": {
+ "version": "1.2.4",
+ "bundled": true,
+ "optional": true
+ },
+ "semver": {
+ "version": "5.7.1",
+ "bundled": true,
+ "optional": true
+ },
+ "set-blocking": {
+ "version": "2.0.0",
+ "bundled": true,
+ "optional": true
+ },
+ "signal-exit": {
+ "version": "3.0.2",
+ "bundled": true,
+ "optional": true
+ },
+ "string-width": {
+ "version": "1.0.2",
+ "bundled": true,
+ "requires": {
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+ }
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "bundled": true,
+ "requires": {
+ "ansi-regex": "^2.0.0"
+ }
+ },
+ "strip-json-comments": {
+ "version": "2.0.1",
+ "bundled": true,
+ "optional": true
+ },
+ "tar": {
+ "version": "4.4.13",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "chownr": "^1.1.1",
+ "fs-minipass": "^1.2.5",
+ "minipass": "^2.8.6",
+ "minizlib": "^1.2.1",
+ "mkdirp": "^0.5.0",
+ "safe-buffer": "^5.1.2",
+ "yallist": "^3.0.3"
+ }
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "bundled": true,
+ "optional": true
+ },
+ "wide-align": {
+ "version": "1.1.3",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "string-width": "^1.0.2 || 2"
+ }
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "bundled": true
+ },
+ "yallist": {
+ "version": "3.1.1",
+ "bundled": true
+ }
+ }
+ }
+ }
+ },
+ "chownr": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+ },
+ "chrome-trace-event": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+ "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+ "dev": true,
+ "requires": {
+ "tslib": "^1.9.0"
+ }
+ },
+ "ci-info": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+ "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="
+ },
+ "cipher-base": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+ "requires": {
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "class-transformer": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.2.3.tgz",
+ "integrity": "sha512-qsP+0xoavpOlJHuYsQJsN58HXSl8Jvveo+T37rEvCEeRfMWoytAyR0Ua/YsFgpM6AZYZ/og2PJwArwzJl1aXtQ=="
+ },
+ "class-utils": {
+ "version": "0.3.6",
+ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+ "requires": {
+ "arr-union": "^3.1.0",
+ "define-property": "^0.2.5",
+ "isobject": "^3.0.0",
+ "static-extend": "^0.1.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "requires": {
+ "is-descriptor": "^0.1.0"
+ }
+ }
+ }
+ },
+ "classnames": {
+ "version": "2.2.6",
+ "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
+ "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+ },
+ "clean-css": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
+ "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+ "requires": {
+ "source-map": "~0.6.0"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ }
+ }
+ },
+ "cli-boxes": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
+ "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM="
+ },
+ "cliss": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/cliss/-/cliss-0.0.2.tgz",
+ "integrity": "sha512-6rj9pgdukjT994Md13JCUAgTk91abAKrygL9sAvmHY4F6AKMOV8ccGaxhUUfcBuyg3sundWnn3JE0Mc9W6ZYqw==",
+ "requires": {
+ "command-line-usage": "^4.0.1",
+ "deepmerge": "^2.0.0",
+ "get-stdin": "^5.0.1",
+ "inspect-parameters-declaration": "0.0.9",
+ "object-to-arguments": "0.0.8",
+ "pipe-functions": "^1.3.0",
+ "strip-ansi": "^4.0.0",
+ "yargs-parser": "^7.0.0"
+ },
+ "dependencies": {
+ "camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+ },
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"yargs-parser": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
@@ -9128,7 +9696,12 @@
"dependencies": {
"JSONStream": {
"version": "1.3.5",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"jsonparse": "^1.2.0",
"through": ">=2.2.7 <3"
@@ -9136,25 +9709,45 @@
},
"abbrev": {
"version": "1.1.1",
+<<<<<<< HEAD
"bundled": true
},
"agent-base": {
"version": "4.3.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+ },
+ "agent-base": {
+ "version": "4.3.0",
+ "resolved": false,
+ "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"es6-promisify": "^5.0.0"
}
},
"agentkeepalive": {
"version": "3.5.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"humanize-ms": "^1.2.1"
}
},
"ajv": {
"version": "5.5.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"co": "^4.6.0",
"fast-deep-equal": "^1.0.0",
@@ -9164,24 +9757,40 @@
},
"ansi-align": {
"version": "2.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"string-width": "^2.0.0"
}
},
"ansi-regex": {
"version": "2.1.1",
+<<<<<<< HEAD
"bundled": true
},
"ansi-styles": {
"version": "3.2.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": false,
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"color-convert": "^1.9.0"
}
},
"ansicolors": {
"version": "0.3.2",
+<<<<<<< HEAD
"bundled": true
},
"ansistyles": {
@@ -9199,6 +9808,30 @@
"are-we-there-yet": {
"version": "1.1.4",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk="
+ },
+ "ansistyles": {
+ "version": "0.1.3",
+ "resolved": false,
+ "integrity": "sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk="
+ },
+ "aproba": {
+ "version": "2.0.0",
+ "resolved": false,
+ "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
+ },
+ "archy": {
+ "version": "1.0.0",
+ "resolved": false,
+ "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA="
+ },
+ "are-we-there-yet": {
+ "version": "1.1.4",
+ "resolved": false,
+ "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"delegates": "^1.0.0",
"readable-stream": "^2.0.6"
@@ -9206,7 +9839,12 @@
"dependencies": {
"readable-stream": {
"version": "2.3.6",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -9219,7 +9857,12 @@
},
"string_decoder": {
"version": "1.1.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -9228,17 +9871,28 @@
},
"asap": {
"version": "2.0.6",
+<<<<<<< HEAD
"bundled": true
},
"asn1": {
"version": "0.2.4",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+ },
+ "asn1": {
+ "version": "0.2.4",
+ "resolved": false,
+ "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safer-buffer": "~2.1.0"
}
},
"assert-plus": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"asynckit": {
@@ -9260,6 +9914,35 @@
"bcrypt-pbkdf": {
"version": "1.0.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+ },
+ "asynckit": {
+ "version": "0.4.0",
+ "resolved": false,
+ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+ },
+ "aws-sign2": {
+ "version": "0.7.0",
+ "resolved": false,
+ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+ },
+ "aws4": {
+ "version": "1.8.0",
+ "resolved": false,
+ "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
+ },
+ "balanced-match": {
+ "version": "1.0.0",
+ "resolved": false,
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+ },
+ "bcrypt-pbkdf": {
+ "version": "1.0.2",
+ "resolved": false,
+ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"optional": true,
"requires": {
"tweetnacl": "^0.14.3"
@@ -9267,7 +9950,12 @@
},
"bin-links": {
"version": "1.1.7",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-/eaLaTu7G7/o7PV04QPy1HRT65zf+1tFkPGv0sPTV0tRwufooYBQO3zrcyGgm+ja+ZtBf2GEuKjDRJ2pPG+yqA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"bluebird": "^3.5.3",
"cmd-shim": "^3.0.0",
@@ -9279,11 +9967,21 @@
},
"bluebird": {
"version": "3.5.5",
+<<<<<<< HEAD
"bundled": true
},
"boxen": {
"version": "1.3.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
+ },
+ "boxen": {
+ "version": "1.3.0",
+ "resolved": false,
+ "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ansi-align": "^2.0.0",
"camelcase": "^4.0.0",
@@ -9296,7 +9994,12 @@
},
"brace-expansion": {
"version": "1.1.11",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -9304,6 +10007,7 @@
},
"buffer-from": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"builtins": {
@@ -9321,6 +10025,30 @@
"cacache": {
"version": "12.0.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA=="
+ },
+ "builtins": {
+ "version": "1.0.3",
+ "resolved": false,
+ "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og="
+ },
+ "byline": {
+ "version": "5.0.0",
+ "resolved": false,
+ "integrity": "sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE="
+ },
+ "byte-size": {
+ "version": "5.0.1",
+ "resolved": false,
+ "integrity": "sha512-/XuKeqWocKsYa/cBY1YbSJSWWqTi4cFgr9S6OyM7PBaPbr9zvNGwWP33vt0uqGhwDdN+y3yhbXVILEUpnwEWGw=="
+ },
+ "cacache": {
+ "version": "12.0.3",
+ "resolved": false,
+ "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"bluebird": "^3.5.5",
"chownr": "^1.1.1",
@@ -9341,6 +10069,7 @@
},
"call-limit": {
"version": "1.1.1",
+<<<<<<< HEAD
"bundled": true
},
"camelcase": {
@@ -9358,6 +10087,30 @@
"chalk": {
"version": "2.4.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-5twvci5b9eRBw2wCfPtN0GmlR2/gadZqyFpPhOK6CvMFoFgA+USnZ6Jpu1lhG9h85pQ3Ouil3PfXWRD4EUaRiQ=="
+ },
+ "camelcase": {
+ "version": "4.1.0",
+ "resolved": false,
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+ },
+ "capture-stack-trace": {
+ "version": "1.0.0",
+ "resolved": false,
+ "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0="
+ },
+ "caseless": {
+ "version": "0.12.0",
+ "resolved": false,
+ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": false,
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
@@ -9366,6 +10119,7 @@
},
"chownr": {
"version": "1.1.4",
+<<<<<<< HEAD
"bundled": true
},
"ci-info": {
@@ -9375,17 +10129,41 @@
"cidr-regex": {
"version": "2.0.10",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+ },
+ "ci-info": {
+ "version": "2.0.0",
+ "resolved": false,
+ "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+ },
+ "cidr-regex": {
+ "version": "2.0.10",
+ "resolved": false,
+ "integrity": "sha512-sB3ogMQXWvreNPbJUZMRApxuRYd+KoIo4RGQ81VatjmMW6WJPo+IJZ2846FGItr9VzKo5w7DXzijPLGtSd0N3Q==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ip-regex": "^2.1.0"
}
},
"cli-boxes": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"cli-columns": {
"version": "3.1.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM="
+ },
+ "cli-columns": {
+ "version": "3.1.2",
+ "resolved": false,
+ "integrity": "sha1-ZzLZcpee/CrkRKHwjgj6E5yWoY4=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"string-width": "^2.0.0",
"strip-ansi": "^3.0.1"
@@ -9393,7 +10171,12 @@
},
"cli-table3": {
"version": "0.5.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"colors": "^1.1.2",
"object-assign": "^4.1.0",
@@ -9402,7 +10185,12 @@
},
"cliui": {
"version": "4.1.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"string-width": "^2.1.1",
"strip-ansi": "^4.0.0",
@@ -9411,11 +10199,21 @@
"dependencies": {
"ansi-regex": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true
},
"strip-ansi": {
"version": "4.0.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "resolved": false,
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ansi-regex": "^3.0.0"
}
@@ -9424,11 +10222,21 @@
},
"clone": {
"version": "1.0.4",
+<<<<<<< HEAD
"bundled": true
},
"cmd-shim": {
"version": "3.0.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
+ },
+ "cmd-shim": {
+ "version": "3.0.3",
+ "resolved": false,
+ "integrity": "sha512-DtGg+0xiFhQIntSBRzL2fRQBnmtAVwXIDo4Qq46HPpObYquxMaZS4sb82U9nH91qJrlosC1wa9gwr0QyL/HypA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"graceful-fs": "^4.1.2",
"mkdirp": "~0.5.0"
@@ -9436,6 +10244,7 @@
},
"co": {
"version": "4.6.0",
+<<<<<<< HEAD
"bundled": true
},
"code-point-at": {
@@ -9445,22 +10254,51 @@
"color-convert": {
"version": "1.9.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+ },
+ "code-point-at": {
+ "version": "1.1.0",
+ "resolved": false,
+ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+ },
+ "color-convert": {
+ "version": "1.9.1",
+ "resolved": false,
+ "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"color-name": "^1.1.1"
}
},
"color-name": {
"version": "1.1.3",
+<<<<<<< HEAD
"bundled": true
},
"colors": {
"version": "1.3.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+ },
+ "colors": {
+ "version": "1.3.3",
+ "resolved": false,
+ "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"optional": true
},
"columnify": {
"version": "1.5.4",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"strip-ansi": "^3.0.0",
"wcwidth": "^1.0.0"
@@ -9468,18 +10306,33 @@
},
"combined-stream": {
"version": "1.0.6",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"delayed-stream": "~1.0.0"
}
},
"concat-map": {
"version": "0.0.1",
+<<<<<<< HEAD
"bundled": true
},
"concat-stream": {
"version": "1.6.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+ },
+ "concat-stream": {
+ "version": "1.6.2",
+ "resolved": false,
+ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"buffer-from": "^1.0.0",
"inherits": "^2.0.3",
@@ -9489,7 +10342,12 @@
"dependencies": {
"readable-stream": {
"version": "2.3.6",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -9502,7 +10360,12 @@
},
"string_decoder": {
"version": "1.1.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -9511,7 +10374,12 @@
},
"config-chain": {
"version": "1.1.12",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ini": "^1.3.4",
"proto-list": "~1.2.1"
@@ -9519,7 +10387,12 @@
},
"configstore": {
"version": "3.1.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"dot-prop": "^4.1.0",
"graceful-fs": "^4.1.2",
@@ -9531,11 +10404,21 @@
},
"console-control-strings": {
"version": "1.1.0",
+<<<<<<< HEAD
"bundled": true
},
"copy-concurrently": {
"version": "1.0.5",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+ },
+ "copy-concurrently": {
+ "version": "1.0.5",
+ "resolved": false,
+ "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"aproba": "^1.1.1",
"fs-write-stream-atomic": "^1.0.8",
@@ -9547,28 +10430,53 @@
"dependencies": {
"aproba": {
"version": "1.2.0",
+<<<<<<< HEAD
"bundled": true
},
"iferr": {
"version": "0.1.5",
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+ },
+ "iferr": {
+ "version": "0.1.5",
+ "resolved": false,
+ "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"core-util-is": {
"version": "1.0.2",
+<<<<<<< HEAD
"bundled": true
},
"create-error-class": {
"version": "3.0.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+ },
+ "create-error-class": {
+ "version": "3.0.2",
+ "resolved": false,
+ "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"capture-stack-trace": "^1.0.0"
}
},
"cross-spawn": {
"version": "5.1.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"lru-cache": "^4.0.1",
"shebang-command": "^1.2.0",
@@ -9577,7 +10485,12 @@
"dependencies": {
"lru-cache": {
"version": "4.1.5",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"pseudomap": "^1.0.2",
"yallist": "^2.1.2"
@@ -9585,12 +10498,18 @@
},
"yallist": {
"version": "2.1.2",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"crypto-random-string": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"cyclist": {
@@ -9600,25 +10519,50 @@
"dashdash": {
"version": "1.14.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
+ },
+ "cyclist": {
+ "version": "0.2.2",
+ "resolved": false,
+ "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA="
+ },
+ "dashdash": {
+ "version": "1.14.1",
+ "resolved": false,
+ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"assert-plus": "^1.0.0"
}
},
"debug": {
"version": "3.1.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ms": "2.0.0"
},
"dependencies": {
"ms": {
"version": "2.0.0",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"debuglog": {
"version": "1.0.1",
+<<<<<<< HEAD
"bundled": true
},
"decamelize": {
@@ -9636,19 +10580,49 @@
"defaults": {
"version": "1.0.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI="
+ },
+ "decamelize": {
+ "version": "1.2.0",
+ "resolved": false,
+ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+ },
+ "decode-uri-component": {
+ "version": "0.2.0",
+ "resolved": false,
+ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+ },
+ "deep-extend": {
+ "version": "0.6.0",
+ "resolved": false,
+ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+ },
+ "defaults": {
+ "version": "1.0.3",
+ "resolved": false,
+ "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"clone": "^1.0.2"
}
},
"define-properties": {
"version": "1.1.3",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"object-keys": "^1.0.12"
}
},
"delayed-stream": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"delegates": {
@@ -9666,6 +10640,30 @@
"dezalgo": {
"version": "1.0.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+ },
+ "delegates": {
+ "version": "1.0.0",
+ "resolved": false,
+ "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+ },
+ "detect-indent": {
+ "version": "5.0.0",
+ "resolved": false,
+ "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50="
+ },
+ "detect-newline": {
+ "version": "2.1.0",
+ "resolved": false,
+ "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I="
+ },
+ "dezalgo": {
+ "version": "1.0.3",
+ "resolved": false,
+ "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"asap": "^2.0.0",
"wrappy": "1"
@@ -9673,13 +10671,19 @@
},
"dot-prop": {
"version": "4.2.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"is-obj": "^1.0.0"
}
},
"dotenv": {
"version": "5.0.1",
+<<<<<<< HEAD
"bundled": true
},
"duplexer3": {
@@ -9689,6 +10693,20 @@
"duplexify": {
"version": "3.6.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow=="
+ },
+ "duplexer3": {
+ "version": "0.1.4",
+ "resolved": false,
+ "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
+ },
+ "duplexify": {
+ "version": "3.6.0",
+ "resolved": false,
+ "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"end-of-stream": "^1.0.0",
"inherits": "^2.0.1",
@@ -9698,7 +10716,12 @@
"dependencies": {
"readable-stream": {
"version": "2.3.6",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -9711,7 +10734,12 @@
},
"string_decoder": {
"version": "1.1.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -9720,7 +10748,12 @@
},
"ecc-jsbn": {
"version": "0.1.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"optional": true,
"requires": {
"jsbn": "~0.1.0",
@@ -9729,24 +10762,40 @@
},
"editor": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"encoding": {
"version": "0.1.12",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-YMf4e9YrzGqJT6jM1q+3gjok90I="
+ },
+ "encoding": {
+ "version": "0.1.12",
+ "resolved": false,
+ "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"iconv-lite": "~0.4.13"
}
},
"end-of-stream": {
"version": "1.4.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"once": "^1.4.0"
}
},
"env-paths": {
"version": "2.2.0",
+<<<<<<< HEAD
"bundled": true
},
"err-code": {
@@ -9756,13 +10805,32 @@
"errno": {
"version": "0.1.7",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA=="
+ },
+ "err-code": {
+ "version": "1.1.2",
+ "resolved": false,
+ "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA="
+ },
+ "errno": {
+ "version": "0.1.7",
+ "resolved": false,
+ "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"prr": "~1.0.1"
}
},
"es-abstract": {
"version": "1.12.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"es-to-primitive": "^1.1.1",
"function-bind": "^1.1.1",
@@ -9773,7 +10841,12 @@
},
"es-to-primitive": {
"version": "1.2.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"is-callable": "^1.1.4",
"is-date-object": "^1.0.1",
@@ -9782,22 +10855,42 @@
},
"es6-promise": {
"version": "4.2.8",
+<<<<<<< HEAD
"bundled": true
},
"es6-promisify": {
"version": "5.0.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+ },
+ "es6-promisify": {
+ "version": "5.0.0",
+ "resolved": false,
+ "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"es6-promise": "^4.0.3"
}
},
"escape-string-regexp": {
"version": "1.0.5",
+<<<<<<< HEAD
"bundled": true
},
"execa": {
"version": "0.7.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+ },
+ "execa": {
+ "version": "0.7.0",
+ "resolved": false,
+ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"cross-spawn": "^5.0.1",
"get-stream": "^3.0.0",
@@ -9810,12 +10903,18 @@
"dependencies": {
"get-stream": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"extend": {
"version": "3.0.2",
+<<<<<<< HEAD
"bundled": true
},
"extsprintf": {
@@ -9841,13 +10940,52 @@
"find-up": {
"version": "2.1.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+ },
+ "extsprintf": {
+ "version": "1.3.0",
+ "resolved": false,
+ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+ },
+ "fast-deep-equal": {
+ "version": "1.1.0",
+ "resolved": false,
+ "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+ },
+ "fast-json-stable-stringify": {
+ "version": "2.0.0",
+ "resolved": false,
+ "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+ },
+ "figgy-pudding": {
+ "version": "3.5.1",
+ "resolved": false,
+ "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w=="
+ },
+ "find-npm-prefix": {
+ "version": "1.0.2",
+ "resolved": false,
+ "integrity": "sha512-KEftzJ+H90x6pcKtdXZEPsQse8/y/UnvzRKrOSQFprnrGaFuJ62fVkP34Iu2IYuMvyauCyoLTNkJZgrrGA2wkA=="
+ },
+ "find-up": {
+ "version": "2.1.0",
+ "resolved": false,
+ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"locate-path": "^2.0.0"
}
},
"flush-write-stream": {
"version": "1.0.3",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"inherits": "^2.0.1",
"readable-stream": "^2.0.4"
@@ -9855,7 +10993,12 @@
"dependencies": {
"readable-stream": {
"version": "2.3.6",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -9868,7 +11011,12 @@
},
"string_decoder": {
"version": "1.1.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -9877,11 +11025,21 @@
},
"forever-agent": {
"version": "0.6.1",
+<<<<<<< HEAD
"bundled": true
},
"form-data": {
"version": "2.3.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+ },
+ "form-data": {
+ "version": "2.3.2",
+ "resolved": false,
+ "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "1.0.6",
@@ -9890,7 +11048,12 @@
},
"from2": {
"version": "2.3.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"inherits": "^2.0.1",
"readable-stream": "^2.0.0"
@@ -9898,7 +11061,12 @@
"dependencies": {
"readable-stream": {
"version": "2.3.6",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -9911,7 +11079,12 @@
},
"string_decoder": {
"version": "1.1.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -9920,14 +11093,24 @@
},
"fs-minipass": {
"version": "1.2.7",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"minipass": "^2.6.0"
},
"dependencies": {
"minipass": {
"version": "2.9.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -9937,7 +11120,12 @@
},
"fs-vacuum": {
"version": "1.2.10",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-t2Kb7AekAxolSP35n17PHMizHjY=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"graceful-fs": "^4.1.2",
"path-is-inside": "^1.0.1",
@@ -9946,7 +11134,12 @@
},
"fs-write-stream-atomic": {
"version": "1.0.10",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"graceful-fs": "^4.1.2",
"iferr": "^0.1.5",
@@ -9956,11 +11149,21 @@
"dependencies": {
"iferr": {
"version": "0.1.5",
+<<<<<<< HEAD
"bundled": true
},
"readable-stream": {
"version": "2.3.6",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
+ },
+ "readable-stream": {
+ "version": "2.3.6",
+ "resolved": false,
+ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -9973,7 +11176,12 @@
},
"string_decoder": {
"version": "1.1.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -9982,6 +11190,7 @@
},
"fs.realpath": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"function-bind": {
@@ -9991,6 +11200,20 @@
"gauge": {
"version": "2.7.4",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+ },
+ "function-bind": {
+ "version": "1.1.1",
+ "resolved": false,
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+ },
+ "gauge": {
+ "version": "2.7.4",
+ "resolved": false,
+ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"aproba": "^1.0.3",
"console-control-strings": "^1.0.0",
@@ -10004,11 +11227,21 @@
"dependencies": {
"aproba": {
"version": "1.2.0",
+<<<<<<< HEAD
"bundled": true
},
"string-width": {
"version": "1.0.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+ },
+ "string-width": {
+ "version": "1.0.2",
+ "resolved": false,
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -10019,11 +11252,21 @@
},
"genfun": {
"version": "5.0.0",
+<<<<<<< HEAD
"bundled": true
},
"gentle-fs": {
"version": "2.3.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA=="
+ },
+ "gentle-fs": {
+ "version": "2.3.0",
+ "resolved": false,
+ "integrity": "sha512-3k2CgAmPxuz7S6nKK+AqFE2AdM1QuwqKLPKzIET3VRwK++3q96MsNFobScDjlCrq97ZJ8y5R725MOlm6ffUCjg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"aproba": "^1.1.2",
"chownr": "^1.1.2",
@@ -10040,35 +11283,65 @@
"dependencies": {
"aproba": {
"version": "1.2.0",
+<<<<<<< HEAD
"bundled": true
},
"iferr": {
"version": "0.1.5",
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+ },
+ "iferr": {
+ "version": "0.1.5",
+ "resolved": false,
+ "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"get-caller-file": {
"version": "1.0.3",
+<<<<<<< HEAD
"bundled": true
},
"get-stream": {
"version": "4.1.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+ },
+ "get-stream": {
+ "version": "4.1.0",
+ "resolved": false,
+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"pump": "^3.0.0"
}
},
"getpass": {
"version": "0.1.7",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"assert-plus": "^1.0.0"
}
},
"glob": {
"version": "7.1.6",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -10080,14 +11353,24 @@
},
"global-dirs": {
"version": "0.1.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ini": "^1.3.4"
}
},
"got": {
"version": "6.7.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"create-error-class": "^3.0.0",
"duplexer3": "^0.1.4",
@@ -10104,11 +11387,17 @@
"dependencies": {
"get-stream": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"graceful-fs": {
+<<<<<<< HEAD
"version": "4.2.4",
"bundled": true
},
@@ -10119,6 +11408,21 @@
"har-validator": {
"version": "5.1.0",
"bundled": true,
+=======
+ "version": "4.2.3",
+ "resolved": false,
+ "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
+ },
+ "har-schema": {
+ "version": "2.0.0",
+ "resolved": false,
+ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+ },
+ "har-validator": {
+ "version": "5.1.0",
+ "resolved": false,
+ "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ajv": "^5.3.0",
"har-schema": "^2.0.0"
@@ -10126,13 +11430,19 @@
},
"has": {
"version": "1.0.3",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"function-bind": "^1.1.1"
}
},
"has-flag": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true
},
"has-symbols": {
@@ -10154,6 +11464,35 @@
"http-proxy-agent": {
"version": "2.1.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+ },
+ "has-symbols": {
+ "version": "1.0.0",
+ "resolved": false,
+ "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+ },
+ "has-unicode": {
+ "version": "2.0.1",
+ "resolved": false,
+ "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+ },
+ "hosted-git-info": {
+ "version": "2.8.8",
+ "resolved": false,
+ "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+ },
+ "http-cache-semantics": {
+ "version": "3.8.1",
+ "resolved": false,
+ "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="
+ },
+ "http-proxy-agent": {
+ "version": "2.1.0",
+ "resolved": false,
+ "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"agent-base": "4",
"debug": "3.1.0"
@@ -10161,7 +11500,12 @@
},
"http-signature": {
"version": "1.2.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"assert-plus": "^1.0.0",
"jsprim": "^1.2.2",
@@ -10170,7 +11514,12 @@
},
"https-proxy-agent": {
"version": "2.2.4",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"agent-base": "^4.3.0",
"debug": "^3.1.0"
@@ -10178,31 +11527,52 @@
},
"humanize-ms": {
"version": "1.2.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ms": "^2.0.0"
}
},
"iconv-lite": {
"version": "0.4.23",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safer-buffer": ">= 2.1.2 < 3"
}
},
"iferr": {
"version": "1.0.2",
+<<<<<<< HEAD
"bundled": true
},
"ignore-walk": {
"version": "3.0.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-9AfeLfji44r5TKInjhz3W9DyZI1zR1JAf2hVBMGhddAKPqBsupb89jGfbCTHIGZd6fGZl9WlHdn4AObygyMKwg=="
+ },
+ "ignore-walk": {
+ "version": "3.0.3",
+ "resolved": false,
+ "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"minimatch": "^3.0.4"
}
},
"import-lazy": {
"version": "2.1.0",
+<<<<<<< HEAD
"bundled": true
},
"imurmurhash": {
@@ -10216,6 +11586,25 @@
"inflight": {
"version": "1.0.6",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM="
+ },
+ "imurmurhash": {
+ "version": "0.1.4",
+ "resolved": false,
+ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+ },
+ "infer-owner": {
+ "version": "1.0.4",
+ "resolved": false,
+ "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "resolved": false,
+ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"once": "^1.3.0",
"wrappy": "1"
@@ -10223,6 +11612,7 @@
},
"inherits": {
"version": "2.0.4",
+<<<<<<< HEAD
"bundled": true
},
"ini": {
@@ -10232,6 +11622,20 @@
"init-package-json": {
"version": "1.10.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "ini": {
+ "version": "1.3.5",
+ "resolved": false,
+ "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+ },
+ "init-package-json": {
+ "version": "1.10.3",
+ "resolved": false,
+ "integrity": "sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"glob": "^7.1.1",
"npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
@@ -10245,6 +11649,7 @@
},
"invert-kv": {
"version": "2.0.0",
+<<<<<<< HEAD
"bundled": true
},
"ip": {
@@ -10262,37 +11667,86 @@
"is-ci": {
"version": "1.2.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
+ },
+ "ip": {
+ "version": "1.1.5",
+ "resolved": false,
+ "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+ },
+ "ip-regex": {
+ "version": "2.1.0",
+ "resolved": false,
+ "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
+ },
+ "is-callable": {
+ "version": "1.1.4",
+ "resolved": false,
+ "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+ },
+ "is-ci": {
+ "version": "1.2.1",
+ "resolved": false,
+ "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ci-info": "^1.5.0"
},
"dependencies": {
"ci-info": {
"version": "1.6.0",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"is-cidr": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-8Xnnbjsb0x462VoYiGlhEi+drY8SFwrHiSYuzc/CEwco55vkehTaxAyIjEdpi3EMvLPPJAJi9FlzP+h+03gp0Q==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"cidr-regex": "^2.0.10"
}
},
"is-date-object": {
"version": "1.0.1",
+<<<<<<< HEAD
"bundled": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+ },
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "resolved": false,
+ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"number-is-nan": "^1.0.0"
}
},
"is-installed-globally": {
"version": "0.1.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"global-dirs": "^0.1.0",
"is-path-inside": "^1.0.0"
@@ -10300,6 +11754,7 @@
},
"is-npm": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"is-obj": {
@@ -10309,23 +11764,48 @@
"is-path-inside": {
"version": "1.0.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ="
+ },
+ "is-obj": {
+ "version": "1.0.1",
+ "resolved": false,
+ "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+ },
+ "is-path-inside": {
+ "version": "1.0.1",
+ "resolved": false,
+ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"path-is-inside": "^1.0.1"
}
},
"is-redirect": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"is-regex": {
"version": "1.0.4",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
+ },
+ "is-regex": {
+ "version": "1.0.4",
+ "resolved": false,
+ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"has": "^1.0.1"
}
},
"is-retry-allowed": {
"version": "1.2.0",
+<<<<<<< HEAD
"bundled": true
},
"is-stream": {
@@ -10335,12 +11815,27 @@
"is-symbol": {
"version": "1.0.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="
+ },
+ "is-stream": {
+ "version": "1.1.0",
+ "resolved": false,
+ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+ },
+ "is-symbol": {
+ "version": "1.0.2",
+ "resolved": false,
+ "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"has-symbols": "^1.0.0"
}
},
"is-typedarray": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"isarray": {
@@ -10358,10 +11853,35 @@
"jsbn": {
"version": "0.1.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "resolved": false,
+ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+ },
+ "isexe": {
+ "version": "2.0.0",
+ "resolved": false,
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+ },
+ "isstream": {
+ "version": "0.1.2",
+ "resolved": false,
+ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+ },
+ "jsbn": {
+ "version": "0.1.1",
+ "resolved": false,
+ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"optional": true
},
"json-parse-better-errors": {
"version": "1.0.2",
+<<<<<<< HEAD
"bundled": true
},
"json-schema": {
@@ -10383,6 +11903,35 @@
"jsprim": {
"version": "1.4.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+ },
+ "json-schema": {
+ "version": "0.2.3",
+ "resolved": false,
+ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+ },
+ "json-schema-traverse": {
+ "version": "0.3.1",
+ "resolved": false,
+ "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+ },
+ "json-stringify-safe": {
+ "version": "5.0.1",
+ "resolved": false,
+ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+ },
+ "jsonparse": {
+ "version": "1.3.1",
+ "resolved": false,
+ "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
+ },
+ "jsprim": {
+ "version": "1.4.1",
+ "resolved": false,
+ "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"assert-plus": "1.0.0",
"extsprintf": "1.3.0",
@@ -10392,25 +11941,45 @@
},
"latest-version": {
"version": "3.1.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"package-json": "^4.0.0"
}
},
"lazy-property": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"lcid": {
"version": "2.0.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-hN3Es3Bnm6i9TNz6TAa0PVcREUc="
+ },
+ "lcid": {
+ "version": "2.0.0",
+ "resolved": false,
+ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"invert-kv": "^2.0.0"
}
},
"libcipm": {
"version": "4.0.7",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-fTq33otU3PNXxxCTCYCYe7V96o59v/o7bvtspmbORXpgFk+wcWrGf5x6tBgui5gCed/45/wtPomBsZBYm5KbIw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"bin-links": "^1.1.2",
"bluebird": "^3.5.1",
@@ -10431,7 +12000,12 @@
},
"libnpm": {
"version": "3.0.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-d7jU5ZcMiTfBqTUJVZ3xid44fE5ERBm9vBnmhp2ECD2Ls+FNXWxHSkO7gtvrnbLO78gwPdNPz1HpsF3W4rjkBQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"bin-links": "^1.1.2",
"bluebird": "^3.5.3",
@@ -10457,7 +12031,12 @@
},
"libnpmaccess": {
"version": "3.0.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-01512AK7MqByrI2mfC7h5j8N9V4I7MHJuk9buo8Gv+5QgThpOgpjB7sQBDDkeZqRteFb1QM/6YNdHfG7cDvfAQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"aproba": "^2.0.0",
"get-stream": "^4.0.0",
@@ -10467,7 +12046,12 @@
},
"libnpmconfig": {
"version": "1.2.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"figgy-pudding": "^3.5.1",
"find-up": "^3.0.0",
@@ -10476,14 +12060,24 @@
"dependencies": {
"find-up": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"locate-path": "^3.0.0"
}
},
"locate-path": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"p-locate": "^3.0.0",
"path-exists": "^3.0.0"
@@ -10491,27 +12085,47 @@
},
"p-limit": {
"version": "2.2.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"p-try": "^2.0.0"
}
},
"p-locate": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"p-limit": "^2.0.0"
}
},
"p-try": {
"version": "2.2.0",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"libnpmhook": {
"version": "5.0.3",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-UdNLMuefVZra/wbnBXECZPefHMGsVDTq5zaM/LgKNE9Keyl5YXQTnGAzEo+nFOpdRqTWI9LYi4ApqF9uVCCtuA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"aproba": "^2.0.0",
"figgy-pudding": "^3.4.1",
@@ -10521,7 +12135,12 @@
},
"libnpmorg": {
"version": "1.0.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-0sRUXLh+PLBgZmARvthhYXQAWn0fOsa6T5l3JSe2n9vKG/lCVK4nuG7pDsa7uMq+uTt2epdPK+a2g6btcY11Ww==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"aproba": "^2.0.0",
"figgy-pudding": "^3.4.1",
@@ -10531,7 +12150,12 @@
},
"libnpmpublish": {
"version": "1.1.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-2yIwaXrhTTcF7bkJKIKmaCV9wZOALf/gsTDxVSu/Gu/6wiG3fA8ce8YKstiWKTxSFNC0R7isPUb6tXTVFZHt2g==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"aproba": "^2.0.0",
"figgy-pudding": "^3.5.1",
@@ -10546,7 +12170,12 @@
},
"libnpmsearch": {
"version": "2.0.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-VTBbV55Q6fRzTdzziYCr64+f8AopQ1YZ+BdPOv16UegIEaE8C0Kch01wo4s3kRTFV64P121WZJwgmBwrq68zYg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"figgy-pudding": "^3.5.1",
"get-stream": "^4.0.0",
@@ -10555,7 +12184,12 @@
},
"libnpmteam": {
"version": "1.0.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-p420vM28Us04NAcg1rzgGW63LMM6rwe+6rtZpfDxCcXxM0zUTLl7nPFEnRF3JfFBF5skF/yuZDUthTsHgde8QA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"aproba": "^2.0.0",
"figgy-pudding": "^3.4.1",
@@ -10565,7 +12199,12 @@
},
"libnpx": {
"version": "10.2.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-ujaYToga1SAX5r7FU5ShMFi88CWpY75meNZtr6RtEyv4l2ZK3+Wgvxq2IqlwWBiDZOqhumdeiocPS1aKrCMe3A==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"dotenv": "^5.0.1",
"npm-package-arg": "^6.0.0",
@@ -10579,7 +12218,12 @@
},
"locate-path": {
"version": "2.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"p-locate": "^2.0.0",
"path-exists": "^3.0.0"
@@ -10587,7 +12231,12 @@
},
"lock-verify": {
"version": "2.1.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-vcLpxnGvrqisKvLQ2C2v0/u7LVly17ak2YSgoK4PrdsYBXQIax19vhKiLfvKNFx7FRrpTnitrpzF/uuCMuorIg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"npm-package-arg": "^6.1.0",
"semver": "^5.4.1"
@@ -10595,18 +12244,33 @@
},
"lockfile": {
"version": "1.0.4",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"signal-exit": "^3.0.2"
}
},
"lodash._baseindexof": {
"version": "3.1.0",
+<<<<<<< HEAD
"bundled": true
},
"lodash._baseuniq": {
"version": "4.6.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw="
+ },
+ "lodash._baseuniq": {
+ "version": "4.6.0",
+ "resolved": false,
+ "integrity": "sha1-DrtE5FaBSveQXGIS+iybLVG4Qeg=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"lodash._createset": "~4.0.0",
"lodash._root": "~3.0.0"
@@ -10614,6 +12278,7 @@
},
"lodash._bindcallback": {
"version": "3.0.1",
+<<<<<<< HEAD
"bundled": true
},
"lodash._cacheindexof": {
@@ -10623,12 +12288,27 @@
"lodash._createcache": {
"version": "3.1.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
+ },
+ "lodash._cacheindexof": {
+ "version": "3.0.2",
+ "resolved": false,
+ "integrity": "sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI="
+ },
+ "lodash._createcache": {
+ "version": "3.1.2",
+ "resolved": false,
+ "integrity": "sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"lodash._getnative": "^3.0.0"
}
},
"lodash._createset": {
"version": "4.0.3",
+<<<<<<< HEAD
"bundled": true
},
"lodash._getnative": {
@@ -10666,20 +12346,79 @@
"lru-cache": {
"version": "5.1.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY="
+ },
+ "lodash._getnative": {
+ "version": "3.9.1",
+ "resolved": false,
+ "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
+ },
+ "lodash._root": {
+ "version": "3.0.1",
+ "resolved": false,
+ "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
+ },
+ "lodash.clonedeep": {
+ "version": "4.5.0",
+ "resolved": false,
+ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
+ },
+ "lodash.restparam": {
+ "version": "3.6.1",
+ "resolved": false,
+ "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
+ },
+ "lodash.union": {
+ "version": "4.6.0",
+ "resolved": false,
+ "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg="
+ },
+ "lodash.uniq": {
+ "version": "4.5.0",
+ "resolved": false,
+ "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
+ },
+ "lodash.without": {
+ "version": "4.4.0",
+ "resolved": false,
+ "integrity": "sha1-PNRXSgC2e643OpS3SHcmQFB7eqw="
+ },
+ "lowercase-keys": {
+ "version": "1.0.1",
+ "resolved": false,
+ "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+ },
+ "lru-cache": {
+ "version": "5.1.1",
+ "resolved": false,
+ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"yallist": "^3.0.2"
}
},
"make-dir": {
"version": "1.3.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"pify": "^3.0.0"
}
},
"make-fetch-happen": {
"version": "5.0.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"agentkeepalive": "^3.4.1",
"cacache": "^12.0.0",
@@ -10696,18 +12435,33 @@
},
"map-age-cleaner": {
"version": "0.1.3",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"p-defer": "^1.0.0"
}
},
"meant": {
"version": "1.0.1",
+<<<<<<< HEAD
"bundled": true
},
"mem": {
"version": "4.3.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-UakVLFjKkbbUwNWJ2frVLnnAtbb7D7DsloxRd3s/gDpI8rdv8W5Hp3NaDb+POBI1fQdeussER6NB8vpcRURvlg=="
+ },
+ "mem": {
+ "version": "4.3.0",
+ "resolved": false,
+ "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"map-age-cleaner": "^0.1.1",
"mimic-fn": "^2.0.0",
@@ -10716,38 +12470,68 @@
"dependencies": {
"mimic-fn": {
"version": "2.1.0",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"mime-db": {
"version": "1.35.0",
+<<<<<<< HEAD
"bundled": true
},
"mime-types": {
"version": "2.1.19",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="
+ },
+ "mime-types": {
+ "version": "2.1.19",
+ "resolved": false,
+ "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"mime-db": "~1.35.0"
}
},
"minimatch": {
"version": "3.0.4",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minizlib": {
"version": "1.3.3",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"minipass": "^2.9.0"
},
"dependencies": {
"minipass": {
"version": "2.9.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -10757,7 +12541,12 @@
},
"mississippi": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"concat-stream": "^1.5.0",
"duplexify": "^3.4.2",
@@ -10772,21 +12561,37 @@
}
},
"mkdirp": {
+<<<<<<< HEAD
"version": "0.5.5",
"bundled": true,
+=======
+ "version": "0.5.4",
+ "resolved": false,
+ "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"minimist": "^1.2.5"
},
"dependencies": {
"minimist": {
"version": "1.2.5",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"move-concurrently": {
"version": "1.0.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"aproba": "^1.1.1",
"copy-concurrently": "^1.0.0",
@@ -10798,12 +12603,18 @@
"dependencies": {
"aproba": {
"version": "1.2.0",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"ms": {
"version": "2.1.1",
+<<<<<<< HEAD
"bundled": true
},
"mute-stream": {
@@ -10817,6 +12628,25 @@
"node-fetch-npm": {
"version": "2.0.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+ },
+ "mute-stream": {
+ "version": "0.0.7",
+ "resolved": false,
+ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+ },
+ "nice-try": {
+ "version": "1.0.5",
+ "resolved": false,
+ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+ },
+ "node-fetch-npm": {
+ "version": "2.0.2",
+ "resolved": false,
+ "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"encoding": "^0.1.11",
"json-parse-better-errors": "^1.0.0",
@@ -10825,7 +12655,12 @@
},
"node-gyp": {
"version": "5.1.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"env-paths": "^2.2.0",
"glob": "^7.1.4",
@@ -10841,8 +12676,14 @@
}
},
"nopt": {
+<<<<<<< HEAD
"version": "4.0.3",
"bundled": true,
+=======
+ "version": "4.0.1",
+ "resolved": false,
+ "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"abbrev": "1",
"osenv": "^0.1.4"
@@ -10850,7 +12691,12 @@
},
"normalize-package-data": {
"version": "2.5.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"hosted-git-info": "^2.1.4",
"resolve": "^1.10.0",
@@ -10860,7 +12706,12 @@
"dependencies": {
"resolve": {
"version": "1.10.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"path-parse": "^1.0.6"
}
@@ -10869,7 +12720,12 @@
},
"npm-audit-report": {
"version": "1.3.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-abeqS5ONyXNaZJPGAf6TOUMNdSe1Y6cpc9MLBRn+CuUoYbfdca6AxOyXVlfIv9OgKX+cacblbG5w7A6ccwoTPw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"cli-table3": "^0.5.0",
"console-control-strings": "^1.1.0"
@@ -10877,25 +12733,45 @@
},
"npm-bundled": {
"version": "1.1.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"npm-normalize-package-bin": "^1.0.1"
}
},
"npm-cache-filename": {
"version": "1.0.2",
+<<<<<<< HEAD
"bundled": true
},
"npm-install-checks": {
"version": "3.0.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-3tMGxbC/yHCp6fr4I7xfKD4FrhE="
+ },
+ "npm-install-checks": {
+ "version": "3.0.2",
+ "resolved": false,
+ "integrity": "sha512-E4kzkyZDIWoin6uT5howP8VDvkM+E8IQDcHAycaAxMbwkqhIg5eEYALnXOl3Hq9MrkdQB/2/g1xwBINXdKSRkg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"semver": "^2.3.0 || 3.x || 4 || 5"
}
},
"npm-lifecycle": {
"version": "3.1.4",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"byline": "^5.0.0",
"graceful-fs": "^4.1.15",
@@ -10909,6 +12785,7 @@
},
"npm-logical-tree": {
"version": "1.2.1",
+<<<<<<< HEAD
"bundled": true
},
"npm-normalize-package-bin": {
@@ -10918,6 +12795,20 @@
"npm-package-arg": {
"version": "6.1.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-AJI/qxDB2PWI4LG1CYN579AY1vCiNyWfkiquCsJWqntRu/WwimVrC8yXeILBFHDwxfOejxewlmnvW9XXjMlYIg=="
+ },
+ "npm-normalize-package-bin": {
+ "version": "1.0.1",
+ "resolved": false,
+ "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
+ },
+ "npm-package-arg": {
+ "version": "6.1.1",
+ "resolved": false,
+ "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"hosted-git-info": "^2.7.1",
"osenv": "^0.1.5",
@@ -10927,7 +12818,12 @@
},
"npm-packlist": {
"version": "1.4.8",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ignore-walk": "^3.0.1",
"npm-bundled": "^1.0.1",
@@ -10936,7 +12832,12 @@
},
"npm-pick-manifest": {
"version": "3.0.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"figgy-pudding": "^3.5.1",
"npm-package-arg": "^6.0.0",
@@ -10945,7 +12846,12 @@
},
"npm-profile": {
"version": "4.0.4",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-Ta8xq8TLMpqssF0H60BXS1A90iMoM6GeKwsmravJ6wYjWwSzcYBTdyWa3DZCYqPutacBMEm7cxiOkiIeCUAHDQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"aproba": "^1.1.2 || 2",
"figgy-pudding": "^3.4.1",
@@ -10953,8 +12859,14 @@
}
},
"npm-registry-fetch": {
+<<<<<<< HEAD
"version": "4.0.4",
"bundled": true,
+=======
+ "version": "4.0.3",
+ "resolved": false,
+ "integrity": "sha512-WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"JSONStream": "^1.3.4",
"bluebird": "^3.5.1",
@@ -10967,24 +12879,44 @@
"dependencies": {
"safe-buffer": {
"version": "5.2.0",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"npm-run-path": {
"version": "2.0.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"path-key": "^2.0.0"
}
},
"npm-user-validate": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"npmlog": {
"version": "4.1.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-jOyg9c6gTU6TUZ73LQVXp1Ei6VE="
+ },
+ "npmlog": {
+ "version": "4.1.2",
+ "resolved": false,
+ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"are-we-there-yet": "~1.1.2",
"console-control-strings": "~1.1.0",
@@ -10994,6 +12926,7 @@
},
"number-is-nan": {
"version": "1.0.1",
+<<<<<<< HEAD
"bundled": true
},
"oauth-sign": {
@@ -11011,6 +12944,30 @@
"object.getownpropertydescriptors": {
"version": "2.0.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+ },
+ "oauth-sign": {
+ "version": "0.9.0",
+ "resolved": false,
+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+ },
+ "object-assign": {
+ "version": "4.1.1",
+ "resolved": false,
+ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+ },
+ "object-keys": {
+ "version": "1.0.12",
+ "resolved": false,
+ "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="
+ },
+ "object.getownpropertydescriptors": {
+ "version": "2.0.3",
+ "resolved": false,
+ "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"define-properties": "^1.1.2",
"es-abstract": "^1.5.1"
@@ -11018,13 +12975,19 @@
},
"once": {
"version": "1.4.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"wrappy": "1"
}
},
"opener": {
"version": "1.5.1",
+<<<<<<< HEAD
"bundled": true
},
"os-homedir": {
@@ -11034,6 +12997,20 @@
"os-locale": {
"version": "3.1.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="
+ },
+ "os-homedir": {
+ "version": "1.0.2",
+ "resolved": false,
+ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+ },
+ "os-locale": {
+ "version": "3.1.0",
+ "resolved": false,
+ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"execa": "^1.0.0",
"lcid": "^2.0.0",
@@ -11042,7 +13019,12 @@
"dependencies": {
"cross-spawn": {
"version": "6.0.5",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"nice-try": "^1.0.4",
"path-key": "^2.0.1",
@@ -11053,7 +13035,12 @@
},
"execa": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"cross-spawn": "^6.0.0",
"get-stream": "^4.0.0",
@@ -11068,11 +13055,21 @@
},
"os-tmpdir": {
"version": "1.0.2",
+<<<<<<< HEAD
"bundled": true
},
"osenv": {
"version": "0.1.5",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+ },
+ "osenv": {
+ "version": "0.1.5",
+ "resolved": false,
+ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0"
@@ -11080,6 +13077,7 @@
},
"p-defer": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"p-finally": {
@@ -11093,24 +13091,58 @@
"p-limit": {
"version": "1.2.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
+ },
+ "p-finally": {
+ "version": "1.0.0",
+ "resolved": false,
+ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+ },
+ "p-is-promise": {
+ "version": "2.1.0",
+ "resolved": false,
+ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
+ },
+ "p-limit": {
+ "version": "1.2.0",
+ "resolved": false,
+ "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"p-try": "^1.0.0"
}
},
"p-locate": {
"version": "2.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"p-limit": "^1.1.0"
}
},
"p-try": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"package-json": {
"version": "4.0.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+ },
+ "package-json": {
+ "version": "4.0.1",
+ "resolved": false,
+ "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"got": "^6.7.1",
"registry-auth-token": "^3.0.1",
@@ -11120,7 +13152,12 @@
},
"pacote": {
"version": "9.5.12",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"bluebird": "^3.5.3",
"cacache": "^12.0.2",
@@ -11156,7 +13193,12 @@
"dependencies": {
"minipass": {
"version": "2.9.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -11166,7 +13208,12 @@
},
"parallel-transform": {
"version": "1.1.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"cyclist": "~0.2.2",
"inherits": "^2.0.3",
@@ -11175,7 +13222,12 @@
"dependencies": {
"readable-stream": {
"version": "2.3.6",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -11188,7 +13240,12 @@
},
"string_decoder": {
"version": "1.1.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -11197,6 +13254,7 @@
},
"path-exists": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true
},
"path-is-absolute": {
@@ -11238,6 +13296,60 @@
"promise-retry": {
"version": "1.1.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "resolved": false,
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+ },
+ "path-is-inside": {
+ "version": "1.0.2",
+ "resolved": false,
+ "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+ },
+ "path-key": {
+ "version": "2.0.1",
+ "resolved": false,
+ "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+ },
+ "path-parse": {
+ "version": "1.0.6",
+ "resolved": false,
+ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+ },
+ "performance-now": {
+ "version": "2.1.0",
+ "resolved": false,
+ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+ },
+ "pify": {
+ "version": "3.0.0",
+ "resolved": false,
+ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+ },
+ "prepend-http": {
+ "version": "1.0.4",
+ "resolved": false,
+ "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
+ },
+ "process-nextick-args": {
+ "version": "2.0.0",
+ "resolved": false,
+ "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+ },
+ "promise-inflight": {
+ "version": "1.0.1",
+ "resolved": false,
+ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
+ },
+ "promise-retry": {
+ "version": "1.1.1",
+ "resolved": false,
+ "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"err-code": "^1.0.0",
"retry": "^0.10.0"
@@ -11245,30 +13357,51 @@
"dependencies": {
"retry": {
"version": "0.10.1",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"promzard": {
"version": "0.3.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"read": "1"
}
},
"proto-list": {
"version": "1.2.4",
+<<<<<<< HEAD
"bundled": true
},
"protoduck": {
"version": "5.0.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk="
+ },
+ "protoduck": {
+ "version": "5.0.1",
+ "resolved": false,
+ "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"genfun": "^5.0.0"
}
},
"prr": {
"version": "1.0.1",
+<<<<<<< HEAD
"bundled": true
},
"pseudomap": {
@@ -11282,6 +13415,25 @@
"pump": {
"version": "3.0.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
+ },
+ "pseudomap": {
+ "version": "1.0.2",
+ "resolved": false,
+ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+ },
+ "psl": {
+ "version": "1.1.29",
+ "resolved": false,
+ "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="
+ },
+ "pump": {
+ "version": "3.0.0",
+ "resolved": false,
+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"end-of-stream": "^1.1.0",
"once": "^1.3.1"
@@ -11289,7 +13441,12 @@
},
"pumpify": {
"version": "1.5.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"duplexify": "^3.6.0",
"inherits": "^2.0.3",
@@ -11298,7 +13455,12 @@
"dependencies": {
"pump": {
"version": "2.0.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"end-of-stream": "^1.1.0",
"once": "^1.3.1"
@@ -11308,6 +13470,7 @@
},
"punycode": {
"version": "1.4.1",
+<<<<<<< HEAD
"bundled": true
},
"qrcode-terminal": {
@@ -11321,6 +13484,25 @@
"query-string": {
"version": "6.8.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+ },
+ "qrcode-terminal": {
+ "version": "0.12.0",
+ "resolved": false,
+ "integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ=="
+ },
+ "qs": {
+ "version": "6.5.2",
+ "resolved": false,
+ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+ },
+ "query-string": {
+ "version": "6.8.2",
+ "resolved": false,
+ "integrity": "sha512-J3Qi8XZJXh93t2FiKyd/7Ec6GNifsjKXUsVFkSBj/kjLsDylWhnCz4NT1bkPcKotttPW+QbKGqqPH8OoI2pdqw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"decode-uri-component": "^0.2.0",
"split-on-first": "^1.0.0",
@@ -11329,11 +13511,21 @@
},
"qw": {
"version": "1.0.1",
+<<<<<<< HEAD
"bundled": true
},
"rc": {
"version": "1.2.8",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-77/cdA+a0FQwRCassYNBLMi5ltQ="
+ },
+ "rc": {
+ "version": "1.2.8",
+ "resolved": false,
+ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"deep-extend": "^0.6.0",
"ini": "~1.3.0",
@@ -11343,27 +13535,47 @@
"dependencies": {
"minimist": {
"version": "1.2.5",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"read": {
"version": "1.0.7",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"mute-stream": "~0.0.4"
}
},
"read-cmd-shim": {
"version": "1.0.5",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"graceful-fs": "^4.1.2"
}
},
"read-installed": {
"version": "4.0.3",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"debuglog": "^1.0.1",
"graceful-fs": "^4.1.2",
@@ -11376,7 +13588,12 @@
},
"read-package-json": {
"version": "2.1.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"glob": "^7.1.1",
"graceful-fs": "^4.1.2",
@@ -11387,7 +13604,12 @@
},
"read-package-tree": {
"version": "5.3.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"read-package-json": "^2.0.0",
"readdir-scoped-modules": "^1.0.0",
@@ -11396,7 +13618,12 @@
},
"readable-stream": {
"version": "3.6.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
@@ -11405,7 +13632,12 @@
},
"readdir-scoped-modules": {
"version": "1.1.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"debuglog": "^1.0.1",
"dezalgo": "^1.0.0",
@@ -11415,7 +13647,12 @@
},
"registry-auth-token": {
"version": "3.4.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"rc": "^1.1.6",
"safe-buffer": "^5.0.1"
@@ -11423,14 +13660,24 @@
},
"registry-url": {
"version": "3.1.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"rc": "^1.0.1"
}
},
"request": {
"version": "2.88.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"aws-sign2": "~0.7.0",
"aws4": "^1.8.0",
@@ -11456,6 +13703,7 @@
},
"require-directory": {
"version": "2.1.1",
+<<<<<<< HEAD
"bundled": true
},
"require-main-filename": {
@@ -11473,25 +13721,60 @@
"rimraf": {
"version": "2.7.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+ },
+ "require-main-filename": {
+ "version": "1.0.1",
+ "resolved": false,
+ "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+ },
+ "resolve-from": {
+ "version": "4.0.0",
+ "resolved": false,
+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+ },
+ "retry": {
+ "version": "0.12.0",
+ "resolved": false,
+ "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
+ },
+ "rimraf": {
+ "version": "2.7.1",
+ "resolved": false,
+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"glob": "^7.1.3"
}
},
"run-queue": {
"version": "1.0.3",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"aproba": "^1.1.1"
},
"dependencies": {
"aproba": {
"version": "1.2.0",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"safe-buffer": {
"version": "5.1.2",
+<<<<<<< HEAD
"bundled": true
},
"safer-buffer": {
@@ -11505,30 +13788,65 @@
"semver-diff": {
"version": "2.1.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
+ "safer-buffer": {
+ "version": "2.1.2",
+ "resolved": false,
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+ },
+ "semver": {
+ "version": "5.7.1",
+ "resolved": false,
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+ },
+ "semver-diff": {
+ "version": "2.1.0",
+ "resolved": false,
+ "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"semver": "^5.0.3"
}
},
"set-blocking": {
"version": "2.0.0",
+<<<<<<< HEAD
"bundled": true
},
"sha": {
"version": "3.0.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+ },
+ "sha": {
+ "version": "3.0.0",
+ "resolved": false,
+ "integrity": "sha512-DOYnM37cNsLNSGIG/zZWch5CKIRNoLdYUQTQlcgkRkoYIUwDYjqDyye16YcDZg/OPdcbUgTKMjc4SY6TB7ZAPw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"graceful-fs": "^4.1.2"
}
},
"shebang-command": {
"version": "1.2.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"shebang-regex": "^1.0.0"
}
},
"shebang-regex": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"signal-exit": {
@@ -11546,6 +13864,30 @@
"socks": {
"version": "2.3.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+ },
+ "signal-exit": {
+ "version": "3.0.2",
+ "resolved": false,
+ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+ },
+ "slide": {
+ "version": "1.1.6",
+ "resolved": false,
+ "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc="
+ },
+ "smart-buffer": {
+ "version": "4.1.0",
+ "resolved": false,
+ "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw=="
+ },
+ "socks": {
+ "version": "2.3.3",
+ "resolved": false,
+ "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ip": "1.1.5",
"smart-buffer": "^4.1.0"
@@ -11553,7 +13895,12 @@
},
"socks-proxy-agent": {
"version": "4.0.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"agent-base": "~4.2.1",
"socks": "~2.3.2"
@@ -11561,7 +13908,12 @@
"dependencies": {
"agent-base": {
"version": "4.2.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"es6-promisify": "^5.0.0"
}
@@ -11570,11 +13922,21 @@
},
"sorted-object": {
"version": "2.0.1",
+<<<<<<< HEAD
"bundled": true
},
"sorted-union-stream": {
"version": "2.1.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-fWMfS9OnmKJK8d/8+/6DM3pd9fw="
+ },
+ "sorted-union-stream": {
+ "version": "2.1.3",
+ "resolved": false,
+ "integrity": "sha1-x3lMfgd4gAUv9xqNSi27Sppjisc=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"from2": "^1.3.0",
"stream-iterate": "^1.1.0"
@@ -11582,7 +13944,12 @@
"dependencies": {
"from2": {
"version": "1.3.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-iEE7qqX5pZfP3pIh2GmGzTwGHf0=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"inherits": "~2.0.1",
"readable-stream": "~1.1.10"
@@ -11590,11 +13957,21 @@
},
"isarray": {
"version": "0.0.1",
+<<<<<<< HEAD
"bundled": true
},
"readable-stream": {
"version": "1.1.14",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+ },
+ "readable-stream": {
+ "version": "1.1.14",
+ "resolved": false,
+ "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.1",
@@ -11604,13 +13981,23 @@
},
"string_decoder": {
"version": "0.10.31",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"spdx-correct": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"spdx-expression-parse": "^3.0.0",
"spdx-license-ids": "^3.0.0"
@@ -11618,11 +14005,21 @@
},
"spdx-exceptions": {
"version": "2.1.0",
+<<<<<<< HEAD
"bundled": true
},
"spdx-expression-parse": {
"version": "3.0.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="
+ },
+ "spdx-expression-parse": {
+ "version": "3.0.0",
+ "resolved": false,
+ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"spdx-exceptions": "^2.1.0",
"spdx-license-ids": "^3.0.0"
@@ -11630,6 +14027,7 @@
},
"spdx-license-ids": {
"version": "3.0.3",
+<<<<<<< HEAD
"bundled": true
},
"split-on-first": {
@@ -11639,6 +14037,20 @@
"sshpk": {
"version": "1.14.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+ },
+ "split-on-first": {
+ "version": "1.1.0",
+ "resolved": false,
+ "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="
+ },
+ "sshpk": {
+ "version": "1.14.2",
+ "resolved": false,
+ "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"asn1": "~0.2.3",
"assert-plus": "^1.0.0",
@@ -11653,14 +14065,24 @@
},
"ssri": {
"version": "6.0.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"figgy-pudding": "^3.5.1"
}
},
"stream-each": {
"version": "1.2.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"end-of-stream": "^1.1.0",
"stream-shift": "^1.0.0"
@@ -11668,7 +14090,12 @@
},
"stream-iterate": {
"version": "1.2.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-K9fHcpbBcCpGSIuK1B95hl7s1OE=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"readable-stream": "^2.1.5",
"stream-shift": "^1.0.0"
@@ -11676,7 +14103,12 @@
"dependencies": {
"readable-stream": {
"version": "2.3.6",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -11689,7 +14121,12 @@
},
"string_decoder": {
"version": "1.1.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -11698,6 +14135,7 @@
},
"stream-shift": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"strict-uri-encode": {
@@ -11707,6 +14145,20 @@
"string-width": {
"version": "2.1.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
+ },
+ "strict-uri-encode": {
+ "version": "2.0.0",
+ "resolved": false,
+ "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY="
+ },
+ "string-width": {
+ "version": "2.1.1",
+ "resolved": false,
+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"is-fullwidth-code-point": "^2.0.0",
"strip-ansi": "^4.0.0"
@@ -11714,6 +14166,7 @@
"dependencies": {
"ansi-regex": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true
},
"is-fullwidth-code-point": {
@@ -11723,6 +14176,20 @@
"strip-ansi": {
"version": "4.0.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+ },
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": false,
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "resolved": false,
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ansi-regex": "^3.0.0"
}
@@ -11731,30 +14198,51 @@
},
"string_decoder": {
"version": "1.3.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "~5.2.0"
},
"dependencies": {
"safe-buffer": {
"version": "5.2.0",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"stringify-package": {
"version": "1.0.1",
+<<<<<<< HEAD
"bundled": true
},
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg=="
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "resolved": false,
+ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"ansi-regex": "^2.0.0"
}
},
"strip-eof": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"strip-json-comments": {
@@ -11764,13 +14252,32 @@
"supports-color": {
"version": "5.4.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+ },
+ "strip-json-comments": {
+ "version": "2.0.1",
+ "resolved": false,
+ "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+ },
+ "supports-color": {
+ "version": "5.4.0",
+ "resolved": false,
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"has-flag": "^3.0.0"
}
},
"tar": {
"version": "4.4.13",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"chownr": "^1.1.1",
"fs-minipass": "^1.2.5",
@@ -11783,7 +14290,12 @@
"dependencies": {
"minipass": {
"version": "2.9.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -11793,13 +14305,19 @@
},
"term-size": {
"version": "1.2.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"execa": "^0.7.0"
}
},
"text-table": {
"version": "0.2.0",
+<<<<<<< HEAD
"bundled": true
},
"through": {
@@ -11809,6 +14327,20 @@
"through2": {
"version": "2.0.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+ },
+ "through": {
+ "version": "2.3.8",
+ "resolved": false,
+ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+ },
+ "through2": {
+ "version": "2.0.3",
+ "resolved": false,
+ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"readable-stream": "^2.1.5",
"xtend": "~4.0.1"
@@ -11816,7 +14348,12 @@
"dependencies": {
"readable-stream": {
"version": "2.3.6",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -11829,7 +14366,12 @@
},
"string_decoder": {
"version": "1.1.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -11838,6 +14380,7 @@
},
"timed-out": {
"version": "4.0.1",
+<<<<<<< HEAD
"bundled": true
},
"tiny-relative-date": {
@@ -11847,6 +14390,20 @@
"tough-cookie": {
"version": "2.4.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
+ },
+ "tiny-relative-date": {
+ "version": "1.3.0",
+ "resolved": false,
+ "integrity": "sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A=="
+ },
+ "tough-cookie": {
+ "version": "2.4.3",
+ "resolved": false,
+ "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"psl": "^1.1.24",
"punycode": "^1.4.1"
@@ -11854,18 +14411,29 @@
},
"tunnel-agent": {
"version": "0.6.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"safe-buffer": "^5.0.1"
}
},
"tweetnacl": {
"version": "0.14.5",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"optional": true
},
"typedarray": {
"version": "0.0.6",
+<<<<<<< HEAD
"bundled": true
},
"uid-number": {
@@ -11879,26 +14447,56 @@
"unique-filename": {
"version": "1.1.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+ },
+ "uid-number": {
+ "version": "0.0.6",
+ "resolved": false,
+ "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
+ },
+ "umask": {
+ "version": "1.1.0",
+ "resolved": false,
+ "integrity": "sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0="
+ },
+ "unique-filename": {
+ "version": "1.1.1",
+ "resolved": false,
+ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"unique-slug": "^2.0.0"
}
},
"unique-slug": {
"version": "2.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"imurmurhash": "^0.1.4"
}
},
"unique-string": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"crypto-random-string": "^1.0.0"
}
},
"unpipe": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true
},
"unzip-response": {
@@ -11908,6 +14506,20 @@
"update-notifier": {
"version": "2.5.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+ },
+ "unzip-response": {
+ "version": "2.0.1",
+ "resolved": false,
+ "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c="
+ },
+ "update-notifier": {
+ "version": "2.5.0",
+ "resolved": false,
+ "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"boxen": "^1.2.1",
"chalk": "^2.0.1",
@@ -11923,13 +14535,19 @@
},
"url-parse-lax": {
"version": "1.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"prepend-http": "^1.0.1"
}
},
"util-deprecate": {
"version": "1.0.2",
+<<<<<<< HEAD
"bundled": true
},
"util-extend": {
@@ -11939,17 +14557,41 @@
"util-promisify": {
"version": "2.1.0",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+ },
+ "util-extend": {
+ "version": "1.0.3",
+ "resolved": false,
+ "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8="
+ },
+ "util-promisify": {
+ "version": "2.1.0",
+ "resolved": false,
+ "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"object.getownpropertydescriptors": "^2.0.3"
}
},
"uuid": {
"version": "3.3.3",
+<<<<<<< HEAD
"bundled": true
},
"validate-npm-package-license": {
"version": "3.0.4",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
+ },
+ "validate-npm-package-license": {
+ "version": "3.0.4",
+ "resolved": false,
+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"spdx-correct": "^3.0.0",
"spdx-expression-parse": "^3.0.0"
@@ -11957,14 +14599,24 @@
},
"validate-npm-package-name": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"builtins": "^1.0.3"
}
},
"verror": {
"version": "1.10.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"assert-plus": "^1.0.0",
"core-util-is": "1.0.2",
@@ -11973,32 +14625,57 @@
},
"wcwidth": {
"version": "1.0.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"defaults": "^1.0.3"
}
},
"which": {
"version": "1.3.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"isexe": "^2.0.0"
}
},
"which-module": {
"version": "2.0.0",
+<<<<<<< HEAD
"bundled": true
},
"wide-align": {
"version": "1.1.2",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+ },
+ "wide-align": {
+ "version": "1.1.2",
+ "resolved": false,
+ "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"string-width": "^1.0.2"
},
"dependencies": {
"string-width": {
"version": "1.0.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -12009,21 +14686,36 @@
},
"widest-line": {
"version": "2.0.1",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"string-width": "^2.1.1"
}
},
"worker-farm": {
"version": "1.7.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"errno": "~0.1.7"
}
},
"wrap-ansi": {
"version": "2.1.0",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"string-width": "^1.0.1",
"strip-ansi": "^3.0.1"
@@ -12031,7 +14723,12 @@
"dependencies": {
"string-width": {
"version": "1.0.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -12042,11 +14739,21 @@
},
"wrappy": {
"version": "1.0.2",
+<<<<<<< HEAD
"bundled": true
},
"write-file-atomic": {
"version": "2.4.3",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+ },
+ "write-file-atomic": {
+ "version": "2.4.3",
+ "resolved": false,
+ "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"graceful-fs": "^4.1.11",
"imurmurhash": "^0.1.4",
@@ -12055,6 +14762,7 @@
},
"xdg-basedir": {
"version": "3.0.0",
+<<<<<<< HEAD
"bundled": true
},
"xtend": {
@@ -12072,6 +14780,30 @@
"yargs": {
"version": "11.1.1",
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
+ },
+ "xtend": {
+ "version": "4.0.1",
+ "resolved": false,
+ "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+ },
+ "y18n": {
+ "version": "4.0.0",
+ "resolved": false,
+ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+ },
+ "yallist": {
+ "version": "3.0.3",
+ "resolved": false,
+ "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
+ },
+ "yargs": {
+ "version": "11.1.1",
+ "resolved": false,
+ "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"cliui": "^4.0.0",
"decamelize": "^1.1.1",
@@ -12089,13 +14821,23 @@
"dependencies": {
"y18n": {
"version": "3.2.1",
+<<<<<<< HEAD
"bundled": true
+=======
+ "resolved": false,
+ "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
}
}
},
"yargs-parser": {
"version": "9.0.2",
+<<<<<<< HEAD
"bundled": true,
+=======
+ "resolved": false,
+ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
+>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa
"requires": {
"camelcase": "^4.1.0"
}
diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx
index 421bf90c1..6949670d6 100644
--- a/src/client/views/collections/CollectionStackingView.tsx
+++ b/src/client/views/collections/CollectionStackingView.tsx
@@ -26,6 +26,7 @@ import { CollectionStackingViewFieldColumn } from "./CollectionStackingViewField
import { CollectionSubView } from "./CollectionSubView";
import { CollectionViewType } from "./CollectionView";
import { SnappingManager } from "../../util/SnappingManager";
+import { CollectionFreeFormDocumentView } from "../nodes/CollectionFreeFormDocumentView";
const _global = (window /* browser */ || global /* node */) as any;
type StackingDocument = makeInterface<[typeof collectionSchema, typeof documentSchema]>;
@@ -191,8 +192,8 @@ export class CollectionStackingView extends CollectionSubView(StackingDocument)
}
getDisplayDoc(doc: Doc, dataDoc: Doc | undefined, dxf: () => Transform, width: () => number) {
- const layoutDoc = Doc.Layout(doc, this.props.ChildLayoutTemplate?.());
const height = () => this.getDocHeight(doc);
+ const opacity = () => this.Document.currentTimecode === undefined ? this.props.childOpacity?.() : CollectionFreeFormDocumentView.getValues(doc, this.Document.currentTimecode || 0)?.opacity;
return <ContentFittingDocumentView
Document={doc}
DataDoc={dataDoc || (doc[DataSym] !== doc && doc[DataSym])}
@@ -213,7 +214,7 @@ export class CollectionStackingView extends CollectionSubView(StackingDocument)
onClick={this.onChildClickHandler}
onDoubleClick={this.onChildDoubleClickHandler}
ScreenToLocalTransform={dxf}
- opacity={this.props.childOpacity}
+ opacity={opacity}
focus={this.focusDocument}
ContainingCollectionDoc={this.props.CollectionView?.props.Document}
ContainingCollectionView={this.props.CollectionView}
diff --git a/src/client/views/collections/CollectionView.tsx b/src/client/views/collections/CollectionView.tsx
index acb66acdb..ee4755355 100644
--- a/src/client/views/collections/CollectionView.tsx
+++ b/src/client/views/collections/CollectionView.tsx
@@ -72,7 +72,7 @@ export interface CollectionViewCustomProps {
filterAddDocument: (doc: Doc | Doc[]) => boolean; // allows a document that renders a Collection view to filter or modify any documents added to the collection (see PresBox for an example)
childLayoutTemplate?: () => Opt<Doc>; // specify a layout Doc template to use for children of the collection
childLayoutString?: string; // specify a layout string to use for children of the collection
- childOpacity?:() => number;
+ childOpacity?: () => number;
}
export interface CollectionRenderProps {
@@ -118,10 +118,8 @@ export class CollectionView extends Touchable<FieldViewProps & CollectionViewCus
@action.bound
addDocument = (doc: Doc | Doc[]): boolean => {
- if (doc instanceof Doc) {
- if (this.props.filterAddDocument?.(doc) === false) {
- return false;
- }
+ if (this.props.filterAddDocument?.(doc) === false) {
+ return false;
}
const docs = doc instanceof Doc ? [doc] : doc;
const targetDataDoc = this.props.Document[DataSym];
@@ -495,7 +493,7 @@ export class CollectionView extends Touchable<FieldViewProps & CollectionViewCus
return (<div className={"collectionView"}
style={{
pointerEvents: this.props.Document.isBackground ? "none" : undefined,
- boxShadow: this.props.Document.isBackground || this.collectionViewType === CollectionViewType.Linear ? undefined :
+ boxShadow: Doc.UserDoc().renderStyle === "comic" || this.props.Document.isBackground || this.collectionViewType === CollectionViewType.Linear ? undefined :
`${Cast(Doc.UserDoc().activeWorkspace, Doc, null)?.darkScheme ? "rgb(30, 32, 31)" : "#9c9396"} ${StrCast(this.props.Document.boxShadow, "0.2vw 0.2vw 0.8vw")}`
}}
onContextMenu={this.onContextMenu}>
diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
index 911a2bc3b..b2e6dad6b 100644
--- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
+++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
@@ -20,7 +20,6 @@ import { CollectionView } from "../CollectionView";
import MarqueeOptionsMenu from "./MarqueeOptionsMenu";
import "./MarqueeView.scss";
import React = require("react");
-import { InteractionUtils } from "../../../util/InteractionUtils";
interface MarqueeViewProps {
getContainerTransform: () => Transform;
@@ -66,58 +65,69 @@ export class MarqueeView extends React.Component<SubCollectionViewProps & Marque
//make textbox and add it to this collection
// tslint:disable-next-line:prefer-const
let [x, y] = this.props.getTransform().transformPoint(this._downX, this._downY);
- if (e.key === ":") {
- DocUtils.addDocumentCreatorMenuItems(this.props.addLiveTextDocument, this.props.addDocument, x, y);
+ if (e.key === "?") {
+ ContextMenu.Instance.setDefaultItem("?", (str: string) => {
+ const textDoc = Docs.Create.WebDocument(`http://bing.com/search?q=${str}`, {
+ _width: 200, x, y, _nativeHeight: 962, _nativeWidth: 800, isAnnotating: false,
+ title: "bing"
+ });
+ this.props.addDocTab(textDoc, "onRight");
+ });
ContextMenu.Instance.displayMenu(this._downX, this._downY);
- } else if (e.key === "q" && e.ctrlKey) {
- e.preventDefault();
- (async () => {
- const text: string = await navigator.clipboard.readText();
- const ns = text.split("\n").filter(t => t.trim() !== "\r" && t.trim() !== "");
- for (let i = 0; i < ns.length - 1; i++) {
- while (!(ns[i].trim() === "" || ns[i].endsWith("-\r") || ns[i].endsWith("-") ||
- ns[i].endsWith(";\r") || ns[i].endsWith(";") ||
- ns[i].endsWith(".\r") || ns[i].endsWith(".") ||
- ns[i].endsWith(":\r") || ns[i].endsWith(":")) && i < ns.length - 1) {
- const sub = ns[i].endsWith("\r") ? 1 : 0;
- const br = ns[i + 1].trim() === "";
- ns.splice(i, 2, ns[i].substr(0, ns[i].length - sub) + ns[i + 1].trimLeft());
- if (br) break;
+ } else
+ if (e.key === ":") {
+ DocUtils.addDocumentCreatorMenuItems(this.props.addLiveTextDocument, this.props.addDocument, x, y);
+
+ ContextMenu.Instance.displayMenu(this._downX, this._downY);
+ } else if (e.key === "q" && e.ctrlKey) {
+ e.preventDefault();
+ (async () => {
+ const text: string = await navigator.clipboard.readText();
+ const ns = text.split("\n").filter(t => t.trim() !== "\r" && t.trim() !== "");
+ for (let i = 0; i < ns.length - 1; i++) {
+ while (!(ns[i].trim() === "" || ns[i].endsWith("-\r") || ns[i].endsWith("-") ||
+ ns[i].endsWith(";\r") || ns[i].endsWith(";") ||
+ ns[i].endsWith(".\r") || ns[i].endsWith(".") ||
+ ns[i].endsWith(":\r") || ns[i].endsWith(":")) && i < ns.length - 1) {
+ const sub = ns[i].endsWith("\r") ? 1 : 0;
+ const br = ns[i + 1].trim() === "";
+ ns.splice(i, 2, ns[i].substr(0, ns[i].length - sub) + ns[i + 1].trimLeft());
+ if (br) break;
+ }
+ }
+ ns.map(line => {
+ const indent = line.search(/\S|$/);
+ const newBox = Docs.Create.TextDocument(line, { _width: 200, _height: 35, x: x + indent / 3 * 10, y: y, title: line });
+ this.props.addDocument(newBox);
+ y += 40 * this.props.getTransform().Scale;
+ });
+ })();
+ } else if (e.key === "b" && e.ctrlKey) {
+ e.preventDefault();
+ navigator.clipboard.readText().then(text => {
+ const ns = text.split("\n").filter(t => t.trim() !== "\r" && t.trim() !== "");
+ if (ns.length === 1 && text.startsWith("http")) {
+ this.props.addDocument(Docs.Create.ImageDocument(text, { _nativeWidth: 300, _width: 300, x: x, y: y }));// paste an image from its URL in the paste buffer
+ } else {
+ this.pasteTable(ns, x, y);
}
- }
- ns.map(line => {
- const indent = line.search(/\S|$/);
- const newBox = Docs.Create.TextDocument(line, { _width: 200, _height: 35, x: x + indent / 3 * 10, y: y, title: line });
- this.props.addDocument(newBox);
- y += 40 * this.props.getTransform().Scale;
});
- })();
- } else if (e.key === "b" && e.ctrlKey) {
- e.preventDefault();
- navigator.clipboard.readText().then(text => {
- const ns = text.split("\n").filter(t => t.trim() !== "\r" && t.trim() !== "");
- if (ns.length === 1 && text.startsWith("http")) {
- this.props.addDocument(Docs.Create.ImageDocument(text, { _nativeWidth: 300, _width: 300, x: x, y: y }));// paste an image from its URL in the paste buffer
- } else {
- this.pasteTable(ns, x, y);
+ } else if (!e.ctrlKey) {
+ FormattedTextBox.SelectOnLoadChar = FormattedTextBox.DefaultLayout ? e.key : "";
+ const tbox = Docs.Create.TextDocument("", {
+ _width: 200, _height: 100, x: x, y: y, _autoHeight: true, _fontSize: NumCast(Doc.UserDoc().fontSize),
+ _fontFamily: StrCast(Doc.UserDoc().fontFamily), _backgroundColor: StrCast(Doc.UserDoc().backgroundColor),
+ title: "-typed text-"
+ });
+ const template = FormattedTextBox.DefaultLayout;
+ if (template instanceof Doc) {
+ tbox._width = NumCast(template._width);
+ tbox.layoutKey = "layout_" + StrCast(template.title);
+ Doc.GetProto(tbox)[StrCast(tbox.layoutKey)] = template;
}
- });
- } else if (!e.ctrlKey) {
- FormattedTextBox.SelectOnLoadChar = FormattedTextBox.DefaultLayout ? e.key : "";
- const tbox = Docs.Create.TextDocument("", {
- _width: 200, _height: 100, x: x, y: y, _autoHeight: true, _fontSize: NumCast(Doc.UserDoc().fontSize),
- _fontFamily: StrCast(Doc.UserDoc().fontFamily), _backgroundColor: StrCast(Doc.UserDoc().backgroundColor),
- title: "-typed text-"
- });
- const template = FormattedTextBox.DefaultLayout;
- if (template instanceof Doc) {
- tbox._width = NumCast(template._width);
- tbox.layoutKey = "layout_" + StrCast(template.title);
- Doc.GetProto(tbox)[StrCast(tbox.layoutKey)] = template;
+ this.props.addLiveTextDocument(tbox);
}
- this.props.addLiveTextDocument(tbox);
- }
e.stopPropagation();
}
//heuristically converts pasted text into a table.
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index b9d33da90..d0540e00f 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -92,7 +92,7 @@ export interface DocumentViewProps {
pinToPres: (document: Doc) => void;
backgroundHalo?: () => boolean;
backgroundColor?: (doc: Doc) => string | undefined;
- opacity?: () => number;
+ opacity?: () => number | undefined;
ChromeHeight?: () => number;
dontRegisterView?: boolean;
layoutKey?: string;
diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx
index bcbd65258..a3abaedfa 100644
--- a/src/client/views/nodes/VideoBox.tsx
+++ b/src/client/views/nodes/VideoBox.tsx
@@ -22,6 +22,7 @@ import { InkingControl } from "../InkingControl";
import { FieldView, FieldViewProps } from './FieldView';
import "./VideoBox.scss";
import { documentSchema } from "../../../fields/documentSchemas";
+import { Networking } from "../../Network";
const path = require('path');
export const timeSchema = createSchema({
@@ -118,29 +119,45 @@ export class VideoBox extends ViewBoxAnnotatableComponent<FieldViewProps, VideoD
b.isLinkButton = true;
this.props.addDocument?.(b);
DocUtils.MakeLink({ doc: b }, { doc: this.rootDoc }, "video snapshot");
+ Networking.PostToServer("/youtubeScreenshot", {
+ id: this.youtubeVideoId,
+ timecode: this.layoutDoc.currentTimecode
+ }).then(response => {
+ const resolved = response?.accessPaths?.agnostic?.client;
+ if (resolved) {
+ this.props.removeDocument?.(b);
+ this.createRealSummaryLink(resolved);
+ }
+ });
} else {
//convert to desired file format
const dataUrl = canvas.toDataURL('image/png'); // can also use 'image/png'
// if you want to preview the captured image,
const filename = path.basename(encodeURIComponent("snapshot" + StrCast(this.rootDoc.title).replace(/\..*$/, "") + "_" + (this.layoutDoc.currentTimecode || 0).toString().replace(/\./, "_")));
- VideoBox.convertDataUri(dataUrl, filename).then(returnedFilename => {
+ VideoBox.convertDataUri(dataUrl, filename).then((returnedFilename: string) => {
if (returnedFilename) {
- const url = this.choosePath(Utils.prepend(returnedFilename));
- const imageSummary = Docs.Create.ImageDocument(url, {
- _nativeWidth: this.layoutDoc._nativeWidth, _nativeHeight: this.layoutDoc._nativeHeight,
- x: (this.layoutDoc.x || 0) + width, y: (this.layoutDoc.y || 0),
- _width: 150, _height: height / width * 150, title: "--snapshot" + (this.layoutDoc.currentTimecode || 0) + " image-"
- });
- Doc.GetProto(imageSummary)["data-nativeWidth"] = this.layoutDoc._nativeWidth;
- Doc.GetProto(imageSummary)["data-nativeHeight"] = this.layoutDoc._nativeHeight;
- imageSummary.isLinkButton = true;
- this.props.addDocument?.(imageSummary);
- DocUtils.MakeLink({ doc: imageSummary }, { doc: this.rootDoc }, "video snapshot");
+ this.createRealSummaryLink(returnedFilename);
}
});
}
}
+ private createRealSummaryLink = (relative: string) => {
+ const url = this.choosePath(Utils.prepend(relative));
+ const width = (this.layoutDoc._width || 0);
+ const height = (this.layoutDoc._height || 0);
+ const imageSummary = Docs.Create.ImageDocument(url, {
+ _nativeWidth: this.layoutDoc._nativeWidth, _nativeHeight: this.layoutDoc._nativeHeight,
+ x: (this.layoutDoc.x || 0) + width, y: (this.layoutDoc.y || 0),
+ _width: 150, _height: height / width * 150, title: "--snapshot" + (this.layoutDoc.currentTimecode || 0) + " image-"
+ });
+ Doc.GetProto(imageSummary)["data-nativeWidth"] = this.layoutDoc._nativeWidth;
+ Doc.GetProto(imageSummary)["data-nativeHeight"] = this.layoutDoc._nativeHeight;
+ imageSummary.isLinkButton = true;
+ this.props.addDocument?.(imageSummary);
+ DocUtils.MakeLink({ doc: imageSummary }, { doc: this.rootDoc }, "video snapshot");
+ }
+
@action
updateTimecode = () => {
this.player && (this.layoutDoc.currentTimecode = this.player.currentTime);
diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 06c2e516d..60c52bcfc 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -68,34 +68,34 @@ export default class UploadManager extends ApiManager {
method: Method.POST,
subscription: new RouteSubscriber("youtubeScreenshot"),
secureHandler: async ({ req, res }) => {
- const { url, t } = req.query;
- const parseUrl = (url: string) => {
- url = decodeURIComponent(url)
- if (!/^(?:f|ht)tps?\:\/\//.test(url)) {
- url = 'http://' + url
- }
- return url;
- }
- let targetUrl: string;
- if (!url || !t || !isWebUri(targetUrl = parseUrl(url as string))) {
- return res.send();
- }
- const buffer = await captureYoutubeScreenshot(targetUrl, t as string);
+ const { id, timecode } = req.body;
+ const convert = (raw: string) => {
+ const number = Math.floor(Number(raw));
+ const seconds = number % 60;
+ const minutes = (number - seconds) / 60;
+ return `${minutes}m${seconds}s`;
+ };
+ const suffix = timecode ? `&t=${convert(timecode)}` : ``;
+ const targetUrl = `https://www.youtube.com/watch?v=${id}${suffix}`;
+ const buffer = await captureYoutubeScreenshot(targetUrl);
if (!buffer) {
return res.send();
}
- const resolvedName = `${targetUrl}@${t}.png`;
+ const resolvedName = `youtube_capture_${id}_${suffix}.png`;
const resolvedPath = serverPathToFile(Directory.images, resolvedName);
- writeFile(resolvedPath, buffer, async error => {
- if (error) {
- return res.send();
- }
- await DashUploadUtils.outputResizedImages(() => createReadStream(resolvedPath), resolvedName, pathToDirectory(Directory.images));
- res.send({
- accessPaths: {
- agnostic: DashUploadUtils.getAccessPaths(Directory.images, resolvedName)
+ return new Promise<void>(resolve => {
+ writeFile(resolvedPath, buffer, async error => {
+ if (error) {
+ return res.send();
}
- } as Upload.FileInformation);
+ await DashUploadUtils.outputResizedImages(() => createReadStream(resolvedPath), resolvedName, pathToDirectory(Directory.images));
+ res.send({
+ accessPaths: {
+ agnostic: DashUploadUtils.getAccessPaths(Directory.images, resolvedName)
+ }
+ } as Upload.FileInformation);
+ resolve();
+ });
});
}
});
@@ -284,17 +284,19 @@ export default class UploadManager extends ApiManager {
*
* On failure, returns undefined.
*/
-async function captureYoutubeScreenshot(targetUrl: string, t: string): Promise<Opt<Buffer>> {
+async function captureYoutubeScreenshot(targetUrl: string): Promise<Opt<Buffer>> {
const browser = await launch({ args: ['--no-sandbox', '--disable-setuid-sandbox'] });
const page = await browser.newPage();
await page.setViewport({ width: 1920, height: 1080 });
- await page.goto(targetUrl + '&t=' + t, { waitUntil: 'networkidle0' });
+ await page.goto(targetUrl, { waitUntil: 'networkidle2' as any });
+ const videoPlayer = await page.$('.html5-video-player');
// hide youtube player controls.
- await page.evaluate(() => (document.querySelector('.ytp-chrome-bottom') as any).style.display = 'none');
+ await page.evaluate(() =>
+ (document.querySelector('.ytp-chrome-bottom') as any).style.display = 'none');
- const buffer = await (await page.$('.html5-video-player'))?.screenshot({ encoding: "binary" });
+ const buffer = await videoPlayer?.screenshot({ encoding: "binary" });
await browser.close();
return buffer;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-08 23:45:03 +0000