From 8f33ca4520b1428eb19b65e3ad0189f5e27d9af8 Mon Sep 17 00:00:00 2001 From: mixmix Date: Fri, 19 Jul 2019 04:03:00 +1200 Subject: [PATCH 1/8] move to secret-stack@6.2.1 + ssb-conn --- package-lock.json | 590 +++++++++++++++++++++++++++++++++++++++++++++- package.json | 4 +- 2 files changed, 585 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index ae209cdf..8a7c125d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10927,6 +10927,11 @@ "pull-stream": "^3.4.5" } }, + "secret-stack-decorators": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/secret-stack-decorators/-/secret-stack-decorators-1.0.0.tgz", + "integrity": "sha512-IOg/RCXS6q5rRuGPV0fsExG5D5wGVk+evvPl0pdZJrfBwDQiWGi4yxPhDNxvZb/So4TiVj8iQRxVdkWwrPFaBg==" + }, "secrets.js-grempe": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/secrets.js-grempe/-/secrets.js-grempe-1.1.0.tgz", @@ -11932,6 +11937,87 @@ "ssb-keys": "^7.1.4" } }, + "ssb-conn": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ssb-conn/-/ssb-conn-0.1.0.tgz", + "integrity": "sha512-K/mo6u1TvfQaBPojUshQ+QtkjOUYtA/GfGB90gVKjHIX8HBH2BBgti9l8OAJWB7sqmPl9pf5n5eoFHJGhyKQ9w==", + "requires": { + "debug": "~4.1.1", + "has-network": "0.0.1", + "ip": "^1.1.5", + "multiserver-address": "~1.0.1", + "on-change-network": "0.0.2", + "on-wakeup": "^1.0.1", + "pull-notify": "^0.1.1", + "pull-ping": "^2.0.2", + "pull-stream": "^3.6.9", + "secret-stack-decorators": "1.0.0", + "ssb-conn-db": "~0.2.0", + "ssb-conn-hub": "~0.0.9", + "ssb-conn-query": "~0.1.2", + "ssb-conn-staging": "~0.0.7", + "ssb-keys": "^7.1.3", + "ssb-ref": "^2.13.9", + "ssb-typescript": "^1.4.0", + "statistics": "^3.3.0", + "zii": "~1.1.0" + } + }, + "ssb-conn-db": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/ssb-conn-db/-/ssb-conn-db-0.2.0.tgz", + "integrity": "sha512-jdYFkBp8CpFzL0gMN9m1K7+K/nOnydhjsFyl3S1TLhQwP/qxh+rAb+WlOUtHrUHF6CJoBW0gKNiQ2Hd78IKjtw==", + "requires": { + "atomic-file": "^1.1.5", + "debug": "~4.1.1", + "multiserver-address": "~1.0.1", + "pull-notify": "~0.1.1", + "ssb-ref": "~2.13.9" + }, + "dependencies": { + "atomic-file": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/atomic-file/-/atomic-file-1.1.5.tgz", + "integrity": "sha512-TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ==" + } + } + }, + "ssb-conn-hub": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/ssb-conn-hub/-/ssb-conn-hub-0.0.9.tgz", + "integrity": "sha512-O32fqJ276vhbqGq/3+GUvqcAbxp1uKVnUhH7B4E+yUDORdmizRJ2N0Mqsxtewhl7/XB/GIG0oeYkKMsO5Y4Y/Q==", + "requires": { + "debug": "^4.1.1", + "multiserver-address": "~1.0.1", + "promisify-tuple": "^1.0.0", + "pull-cat": "~1.1.11", + "pull-notify": "~0.1.1", + "pull-stream": "~3.6.9", + "ssb-ref": "~2.13.9" + } + }, + "ssb-conn-query": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ssb-conn-query/-/ssb-conn-query-0.1.2.tgz", + "integrity": "sha512-MtOVpMUUydoDXUr1Y0i8XWrzkmCKROyiWNpBWOpM7LQMx3oalp68wcufSRL4Ady/IhlEy6GlbaNFeVNchHdoQQ==", + "requires": { + "ssb-conn-db": "~0.2.0", + "ssb-conn-hub": "~0.0.9", + "ssb-conn-staging": "~0.0.6" + } + }, + "ssb-conn-staging": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/ssb-conn-staging/-/ssb-conn-staging-0.0.7.tgz", + "integrity": "sha512-1HefddXgvnS3ith7Pa37QCH1CurTIN2QPGZ1/UA83iFt/xVf0TLDHEFHnkjzngp/345nWacfjQH+rKnLgvygFg==", + "requires": { + "debug": "^4.1.1", + "multiserver-address": "~1.0.1", + "pull-cat": "~1.1.11", + "pull-notify": "~0.1.1", + "pull-stream": "^3.6.9" + } + }, "ssb-dark-crystal-schema": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/ssb-dark-crystal-schema/-/ssb-dark-crystal-schema-1.2.6.tgz", @@ -12628,9 +12714,8 @@ } }, "ssb-server": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/ssb-server/-/ssb-server-15.0.2.tgz", - "integrity": "sha512-xY3H+E3P5vSQREtoBohUT/1Lhx01NNTkooud29h+fhwXX1+Erowds/b0M+HpVpVClY8/yR4/0jATBg0oKvD+VA==", + "version": "github:ssbc/ssb-server#29b1d632ad62b77222f2ce89bb52f8f796804dbe", + "from": "github:ssbc/ssb-server#secret-stack-16.2.1", "requires": { "bash-color": "~0.0.3", "broadcast-stream": "^0.2.1", @@ -12657,7 +12742,7 @@ "pull-pushable": "^2.2.0", "pull-stream": "^3.6.2", "rimraf": "^2.4.2", - "secret-stack": "^6.0.2", + "secret-stack": "^6.2.1", "ssb-blobs": "1.2.1", "ssb-caps": "^1.0.1", "ssb-client": "^4.7.5", @@ -14106,6 +14191,487 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "fsevents": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", + "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", + "optional": true, + "requires": { + "nan": "^2.12.1", + "node-pre-gyp": "^0.12.0" + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true, + "optional": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "optional": 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, + "optional": true + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "optional": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "chownr": { + "version": "1.1.1", + "bundled": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "optional": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "optional": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "optional": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "debug": { + "version": "4.1.1", + "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.5", + "bundled": true, + "optional": true, + "requires": { + "minipass": "^2.2.1" + } + }, + "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.3", + "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.1", + "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.3", + "bundled": true, + "optional": true + }, + "ini": { + "version": "1.3.5", + "bundled": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "optional": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "optional": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "optional": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "optional": true + }, + "minipass": { + "version": "2.3.5", + "bundled": true, + "optional": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.2.1", + "bundled": true, + "optional": true, + "requires": { + "minipass": "^2.2.1" + } + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "optional": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.1.1", + "bundled": true, + "optional": true + }, + "needle": { + "version": "2.3.0", + "bundled": true, + "optional": true, + "requires": { + "debug": "^4.1.0", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, + "node-pre-gyp": { + "version": "0.12.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" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "optional": true, + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, + "npm-bundled": { + "version": "1.0.6", + "bundled": true, + "optional": true + }, + "npm-packlist": { + "version": "1.4.1", + "bundled": true, + "optional": true, + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^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, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "optional": 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.0", + "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" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.3.6", + "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.6.3", + "bundled": true, + "optional": true, + "requires": { + "glob": "^7.1.3" + } + }, + "safe-buffer": { + "version": "5.1.2", + "bundled": true, + "optional": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "optional": true + }, + "sax": { + "version": "1.2.4", + "bundled": true, + "optional": true + }, + "semver": { + "version": "5.7.0", + "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, + "optional": 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, + "optional": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "optional": true + }, + "tar": { + "version": "4.4.8", + "bundled": true, + "optional": true, + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.4", + "minizlib": "^1.1.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" + } + }, + "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, + "optional": true + }, + "yallist": { + "version": "3.0.3", + "bundled": true, + "optional": true + } + } + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -17660,9 +18226,9 @@ } }, "secret-stack": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/secret-stack/-/secret-stack-6.1.2.tgz", - "integrity": "sha512-J8JlISJnWsEapR5GOOtnFD1JuJ9QHinWzSSzPMIqoVwhz05bnwCmTQvtMRKD5Hk9WrjCrPTprubJvrrYhqHpeg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/secret-stack/-/secret-stack-6.2.1.tgz", + "integrity": "sha512-7hw13S77Et4yC23uVXOFDRyullxAvFuoN3XW6PvHlAVkYMirLkyeglPOwPTk5JhYwIKPdpIz6vQ7DM0zSlOUHA==", "requires": { "debug": "^4.1.0", "hoox": "0.0.1", @@ -19029,6 +19595,11 @@ "ssb-sort": "^1.1.3" } }, + "ssb-typescript": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ssb-typescript/-/ssb-typescript-1.4.0.tgz", + "integrity": "sha512-+qFUlFGTIR9f4ab45UfszGCBiClSPH1llM072zWiwlxMyKu70CQ4IUgsWGWyge2mN8z9CiNkPm+ElZ5Ok0Mxcg==" + }, "ssb-unix-socket": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/ssb-unix-socket/-/ssb-unix-socket-1.0.0.tgz", @@ -20715,6 +21286,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/zerr/-/zerr-1.0.4.tgz", "integrity": "sha1-YoFN15nv+DYfKiKPQfcFxeGd5Mk=" + }, + "zii": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/zii/-/zii-1.1.0.tgz", + "integrity": "sha512-l4EKO8dgLsEWxdb/koCjv92FplAIAQaV4Riq5n/38dTC7Z3NwaFSKQ5Bda+CUTu11VtFE1D+4+HPfPt7/86CRw==" } } } diff --git a/package.json b/package.json index 595c6cbe..7924c37d 100644 --- a/package.json +++ b/package.json @@ -103,13 +103,13 @@ "ssb-chess-db": "^1.0.6", "ssb-chess-mithril": "1.0.10", "ssb-config": "^3.3.0", + "ssb-conn": "^0.1.0", "ssb-device-address": "^1.1.6", "ssb-ebt": "^5.6.6", "ssb-friend-pub": "^1.0.7", "ssb-friends": "^4.1.4", "ssb-identities": "^2.1.0", "ssb-invite": "~2.0.4", - "ssb-legacy-conn": "^1.0.25", "ssb-local": "^1.0.0", "ssb-logging": "^1.0.0", "ssb-master": "^1.0.3", @@ -126,7 +126,7 @@ "ssb-ref": "^2.13.6", "ssb-replicate": "^1.3.0", "ssb-search": "^1.1.2", - "ssb-server": "^15.0.2", + "ssb-server": "github:ssbc/ssb-server#secret-stack-16.2.1", "ssb-sort": "^1.1.0", "ssb-suggest": "^1.0.4", "ssb-tangle": "^1.0.1", From e5a80e70e052e3162bc3b33d2b93886364f5ae40 Mon Sep 17 00:00:00 2001 From: mixmix Date: Fri, 19 Jul 2019 04:14:11 +1200 Subject: [PATCH 2/8] add keyboard scrolling to /network groups --- app/page/network/index.js | 5 +++++ app/sync/catch-keyboard-shortcut.js | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/page/network/index.js b/app/page/network/index.js index 19a109fa..107de28c 100644 --- a/app/page/network/index.js +++ b/app/page/network/index.js @@ -89,6 +89,11 @@ exports.create = function (api) { var { container } = api.app.html.scroller({ prepend: page }) container.title = '/network' + container.keyboardScroll = function (n) { + if (isNaN(n)) return + + state.activeGroup.set((state.activeGroup() + n) % state.groups.length) + } return container } } diff --git a/app/sync/catch-keyboard-shortcut.js b/app/sync/catch-keyboard-shortcut.js index 1f32a353..abb71fa4 100644 --- a/app/sync/catch-keyboard-shortcut.js +++ b/app/sync/catch-keyboard-shortcut.js @@ -46,8 +46,6 @@ function textFieldShortcuts (ev) { function genericShortcuts (ev, { tabs, search, goTo, back }) { let scroll const currentPage = tabs.currentPage() - // TODO change this scroll API - it seems some pages - // (e.g. Dark Crystal Index) has scroll defined and expect an object if (currentPage) { scroll = currentPage.keyboardScroll || noop } else { From a5d53b9c02c2ec770579b85963a8a377205fc4f4 Mon Sep 17 00:00:00 2001 From: mixmix Date: Fri, 19 Jul 2019 04:33:37 +1200 Subject: [PATCH 3/8] make /settings listen to keyboard scroll shortcuts --- app/html/settings/custom-styles.mcss | 2 +- app/page/settings.js | 44 ++++++++++++++++++---------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/app/html/settings/custom-styles.mcss b/app/html/settings/custom-styles.mcss index 7a32946e..e6d72378 100644 --- a/app/html/settings/custom-styles.mcss +++ b/app/html/settings/custom-styles.mcss @@ -2,7 +2,7 @@ CustomStyles { textarea { font-family: monospace line-height: 1.2rem - max-width: calc(100% - 1rem) + width: 100% min-height: 400px border: 1px solid gainsboro } diff --git a/app/page/settings.js b/app/page/settings.js index 4ed9583d..6be5f329 100644 --- a/app/page/settings.js +++ b/app/page/settings.js @@ -25,28 +25,24 @@ exports.create = function (api) { } function settingsPage (location) { - const groups = groupSettings(api.app.html.settings()) - const groupNames = Object.keys(groups) - .sort((a, b) => { - if (a === 'general') return -1 - else if (b === 'general') return 1 - else return a < b ? -1 : +1 - }) - const activeGroup = Value('general') // NOTE this assume this group exists! + const state = { + groups: groupSettings(api.app.html.settings()), + activeGroup: Value(0) + } var page = h('SettingsPage', { title: '/settings' }, [ - h('div.container', computed(activeGroup, _activeGroup => { + h('div.container', computed(state.activeGroup, activeGroup => { return [ - h('section.groups', groupNames.map(group => { + h('section.groups', state.groups.map((group, i) => { return h('div.group', { - 'className': group === _activeGroup ? '-active' : '', - 'ev-click': () => activeGroup.set(group) + 'className': i === activeGroup ? '-active' : '', + 'ev-click': () => state.activeGroup.set(i) }, - group + group.name ) })), - h('section.group-settings', groups[_activeGroup].map(Setting)) + h('section.group-settings', state.groups[activeGroup].subgroups.map(Setting)) ] })) ]) @@ -60,12 +56,17 @@ exports.create = function (api) { var { container } = api.app.html.scroller({ prepend: page }) container.title = '/settings' + container.keyboardScroll = function (n) { + if (isNaN(n)) return + + state.activeGroup.set((state.activeGroup() + n) % state.groups.length) + } return container } } function groupSettings (settings) { - return settings + const groupedByGroup = settings .reduce((acc, setting) => { if (!setting.title || !setting.body) throw new Error('setting sections require title, body') @@ -75,4 +76,17 @@ function groupSettings (settings) { return acc }, {}) + + return Object.keys(groupedByGroup) + .map(name => { + return { + name, + subgroups: groupedByGroup[name] + } + }) + .sort((a, b) => { + if (a === 'general') return -1 + else if (b === 'general') return 1 + else return a < b ? -1 : +1 + }) } From 46688f65e39325b8faab7b50ff8799ded5f26d4b Mon Sep 17 00:00:00 2001 From: mixmix Date: Fri, 19 Jul 2019 04:38:13 +1200 Subject: [PATCH 4/8] kill PgUp/PgDn if you're in an input/text field --- app/sync/catch-keyboard-shortcut.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/sync/catch-keyboard-shortcut.js b/app/sync/catch-keyboard-shortcut.js index abb71fa4..db44d188 100644 --- a/app/sync/catch-keyboard-shortcut.js +++ b/app/sync/catch-keyboard-shortcut.js @@ -40,6 +40,10 @@ function textFieldShortcuts (ev) { return case 27: // esc return ev.target.blur() + case 33: // PgUp + return ev.preventDefault() + case 34: // PgDn + return ev.preventDefault() } } From 1f4ef3222f636d0c17f9325a2245da24c21c478a Mon Sep 17 00:00:00 2001 From: mixmix Date: Mon, 29 Jul 2019 16:14:45 +1200 Subject: [PATCH 5/8] fix /network page keyboardScroll --- app/page/network/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/page/network/index.js b/app/page/network/index.js index 107de28c..682c56c5 100644 --- a/app/page/network/index.js +++ b/app/page/network/index.js @@ -92,7 +92,11 @@ exports.create = function (api) { container.keyboardScroll = function (n) { if (isNaN(n)) return - state.activeGroup.set((state.activeGroup() + n) % state.groups.length) + var nextGroup = state.activeGroup() + n + if (nextGroup === -1) nextGroup = state.groups.length - 1 + else nextGroup = nextGroup % state.groups.length + + state.activeGroup.set(nextGroup) } return container } From 8bdb12915dad8904801c41ccdfd07d8874b5b71f Mon Sep 17 00:00:00 2001 From: mixmix Date: Mon, 29 Jul 2019 16:15:41 +1200 Subject: [PATCH 6/8] upgrade to ssb-conn --- index.js | 3 +- package-lock.json | 1262 +++++++++++++++++++++------------------------ package.json | 2 +- 3 files changed, 590 insertions(+), 677 deletions(-) diff --git a/index.js b/index.js index 9c2befa5..76f51323 100644 --- a/index.js +++ b/index.js @@ -9,8 +9,7 @@ const plugins = [ 'ssb-local', 'ssb-logging', - 'ssb-legacy-conn', - // 'ssb-conn', // TODO requires secret-stack@^6.2.0 , but ssb-server shrinkwrapped @6.1.2 + 'ssb-conn', // TODO need to re-enable local auto-gossip 'ssb-replicate', 'ssb-friends', diff --git a/package-lock.json b/package-lock.json index 8a7c125d..2ee64e91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,14 @@ "requires": { "core-js": "^2.6.5", "regenerator-runtime": "^0.13.2" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", + "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==", + "dev": true + } } }, "@f/zip-obj": { @@ -406,9 +414,9 @@ "dev": true }, "@types/node": { - "version": "10.14.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.12.tgz", - "integrity": "sha512-QcAKpaO6nhHLlxWBvpc4WeLrTvPqlHOvaj0s5GriKkA1zq+bsFBPpfYCvQhLqLgYlIko8A9YrPdaMHCo5mBcpg==" + "version": "10.14.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.13.tgz", + "integrity": "sha512-yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ==" }, "abstract-leveldown": { "version": "6.0.3", @@ -428,9 +436,9 @@ } }, "acorn": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz", - "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==" + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz", + "integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==" }, "acorn-dynamic-import": { "version": "4.0.0", @@ -612,9 +620,9 @@ }, "dependencies": { "semver": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz", - "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true } } @@ -1054,13 +1062,6 @@ "requires": { "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" - } } }, "babel-template": { @@ -1184,9 +1185,9 @@ "dev": true }, "base64-url": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-2.2.2.tgz", - "integrity": "sha512-JMAkNo3MJ7GG2CHPVMiGPrzGQizUcVE9qvCU6pxQln4aYZZgYM6BJHXbawDegSoryvsKGrK3FuBO9IuGWErRLQ==" + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-2.3.2.tgz", + "integrity": "sha512-2QpXjtjndKqPn9JKBpMTCbDGpgicfLUu+N5Y1vEfbuyqb1MN1D68C9YKCth4SjTHRvJleF3tPuxhLbH79MM0iQ==" }, "bash-color": { "version": "0.0.4", @@ -3140,9 +3141,9 @@ } }, "electron": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/electron/-/electron-4.2.6.tgz", - "integrity": "sha512-qnaQXQcRKugXoQ7/4J4lYKzyU/RJMK/qrIGyC8KsgGG/IVVagolNPYy7QrsGpJ7YwpQHzNjwtDNaJ/UI7VTCyA==", + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/electron/-/electron-4.2.8.tgz", + "integrity": "sha512-/D9zfs+EWLN4yLV7tu2kWyXUnZQ3CKG1cmWbXeSFXF+0dNXQ8iFpY49dqZRoHGIBImFfp2x4N3Zc5Tu7rw3PJw==", "requires": { "@types/node": "^10.12.18", "electron-download": "^4.1.0", @@ -3441,12 +3442,6 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, - "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", - "dev": true - }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -3594,13 +3589,6 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "requires": { "is-arrayish": "^0.2.1" - }, - "dependencies": { - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" - } } }, "es-abstract": { @@ -3901,9 +3889,9 @@ } }, "eslint-module-utils": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz", - "integrity": "sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz", + "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==", "dev": true, "requires": { "debug": "^2.6.8", @@ -4664,9 +4652,9 @@ } }, "flumelog-offset": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.4.2.tgz", - "integrity": "sha512-pj8gc3idzbpWjGQPXvRwNdkqtHPx/0olLsyip3u1lULP+LVvcYGYvTt8AU0frKWSFsGST0B8WVh9DrZ5rsEzbg==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.4.3.tgz", + "integrity": "sha512-XG2uVxoMjwcWKHniKSp1Iyo4XSZqvpK/KcQNDfTUM+ajpehLveMTd5H0cXWzaVlNjkHE0oGDGL7CgHrDyixiIg==", "requires": { "aligned-block-file": "^1.2.0", "append-batch": "0.0.2", @@ -4676,6 +4664,7 @@ "obv": "0.0.1", "pull-cursor": "^3.0.0", "pull-looper": "^1.0.0", + "pull-stream": "^3.6.13", "uint48be": "^2.0.1" }, "dependencies": { @@ -5695,6 +5684,11 @@ "os-tmpdir": "^1.0.1" } }, + "hoox": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/hoox/-/hoox-0.0.1.tgz", + "integrity": "sha1-CKdNknKpzIOujmu+AwPw7nZDIJQ=" + }, "hosted-git-info": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", @@ -5754,9 +5748,9 @@ "integrity": "sha1-KA0DNjeRmTBrLhUY49X2OBy4UH0=" }, "hypercore": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/hypercore/-/hypercore-7.5.0.tgz", - "integrity": "sha512-Uuk0xmc73YzkqRCcLtAUTm5dmtdvg6yG3sMytIJuf/bu+9SB5pej0tILEBgnI+TmWRdJrxd242j1C4ND96V0xg==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/hypercore/-/hypercore-7.5.1.tgz", + "integrity": "sha512-tgololYj3O6Y0Mg6PK7EJntRu+auKSYuER2a8pVetPqnDSJ1RfAVlyVr3VmuS5W9hS0PwH4OXl4R/uVfkuNNoQ==", "requires": { "array-lru": "^1.1.0", "atomic-batcher": "^1.0.2", @@ -5803,9 +5797,9 @@ } }, "hypercore-protocol": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.11.0.tgz", - "integrity": "sha512-V/0Vru8gavoO++K2QFOAXu7xgBuXcBAjURQ9BQ48DnQ/p4hK4Jy76ulRnppDHpbDthxRziMWLZfmYXncwD63Aw==", + "version": "6.11.1", + "resolved": "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.11.1.tgz", + "integrity": "sha512-4vyYGzSTRCfpIPnpYO/WN0VeS2oGeIrzCCwIXfz5TL2dyyHu7wF5xiigNuUfTn9n3cTOwwbH+EKsygTNsO2yfw==", "requires": { "buffer-alloc-unsafe": "^1.0.0", "buffer-from": "^1.0.0", @@ -5856,13 +5850,6 @@ "mime": "^2.3.1", "pump": "^3.0.0", "range-parser": "^1.2.0" - }, - "dependencies": { - "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==" - } } }, "hyperdrive-network-speed": { @@ -6223,10 +6210,9 @@ } }, "is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "dev": true + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-binary-path": { "version": "1.0.1", @@ -7103,6 +7089,14 @@ "phin": "^2.9.1", "xhr": "^2.0.1", "xtend": "^4.0.0" + }, + "dependencies": { + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true + } } }, "load-json-file": { @@ -7127,9 +7121,9 @@ } }, "lodash": { - "version": "4.17.14", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", - "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.assign": { "version": "4.2.0", @@ -7333,6 +7327,11 @@ "typewiselite": "^1.0.0" } }, + "map-merge": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz", + "integrity": "sha1-am/FjJXYqrRsK93kTVFbbuBvzjQ=" + }, "map-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", @@ -7496,9 +7495,9 @@ } }, "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", + "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==" }, "mime-db": { "version": "1.40.0", @@ -7689,9 +7688,9 @@ "integrity": "sha512-PZM4dhYFmCF6uZGWpEmoPMUqJBywS9IcAgybT2GmSpYI1BvGvoWSdbio+ik+q/YD2vodhvslESWIS3NnkKYdqQ==" }, "multiserver": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/multiserver/-/multiserver-3.3.6.tgz", - "integrity": "sha512-zuPjEaPEVMosWXnfNalXv3QyjYCwaD2emC6l/ozwMeaCcZ/Do7WMb/ZF8MC6TVwhV9Y7eTcnBiYEP/hq8zA2nA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/multiserver/-/multiserver-3.4.0.tgz", + "integrity": "sha512-HSGnZBXDM9e8gi3YyhObwiDYP3BFeL+TV22H1dAReigHHMc52IDBsz9N1OR72OKxCd7SMD+gKBpVJbJohhb3og==", "requires": { "debug": "^4.1.1", "multicb": "^1.2.2", @@ -7812,6 +7811,14 @@ "pull-stream": "^3.2.3" } }, + "muxrpc-usage": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/muxrpc-usage/-/muxrpc-usage-2.1.0.tgz", + "integrity": "sha512-ZspYQd4n4pLy86Gu/yrEdHvg5NBrg4p2NayQ2NFelN1QyLZRLTKPlTyaa6DyztsCG7mjLzxFBw9jw9LReB8Azw==", + "requires": { + "right-pad": "^1.0.1" + } + }, "muxrpc-validation": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/muxrpc-validation/-/muxrpc-validation-3.0.2.tgz", @@ -7821,6 +7828,26 @@ "zerr": "^1.0.4" } }, + "muxrpcli": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/muxrpcli/-/muxrpcli-3.1.1.tgz", + "integrity": "sha512-DSBXkmbfZgUrM9Y54Saeb2RySmuDMo5jAnMnBo0JHempIlHIXmnrIASdC0co0TQATq8kECF6SYcTFbJLKZUfJw==", + "requires": { + "cont": "^1.0.3", + "minimist": "^1.2.0", + "muxrpc-usage": "^2.0.1", + "pull-stream": "^3.6.9", + "stream-to-pull-stream": "^1.7.3", + "word-wrap": "^1.2.3" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + } + } + }, "mv": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", @@ -7903,9 +7930,9 @@ "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=" }, "nearley": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.16.0.tgz", - "integrity": "sha512-Tr9XD3Vt/EujXbZBv6UAHYoLUSMQAxSsTnm9K3koXzjzNWY195NqALeyrzLZBKzAkL3gl92BcSogqrHjD8QuUg==", + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.17.0.tgz", + "integrity": "sha512-duA4zGPF0EC93e0UNqCowBiZg6wnBKUazA1YSYoyJDKx24dPqNITBZb3dp/e92wTdyeGKe+ng1iOTWn69FiGEQ==", "requires": { "commander": "^2.19.0", "moo": "^0.4.3", @@ -8178,9 +8205,9 @@ } }, "omggif": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.9.tgz", - "integrity": "sha1-3LcCTazVDFK00wPwSALJHAV8dl8=", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz", + "integrity": "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==", "dev": true }, "on-change-network": { @@ -8327,21 +8354,21 @@ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, "package-json": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.4.0.tgz", - "integrity": "sha512-bd1T8OBG7hcvMd9c/udgv6u5v9wISP3Oyl9Cm7Weop8EFwrtcQDnS2sb6zhwqus2WslSr5wSTIPiTTpxxmPm7Q==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", + "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", "dev": true, "requires": { "got": "^9.6.0", - "registry-auth-token": "^3.4.0", + "registry-auth-token": "^4.0.0", "registry-url": "^5.0.0", - "semver": "^6.1.1" + "semver": "^6.2.0" }, "dependencies": { "semver": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz", - "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true } } @@ -9687,6 +9714,22 @@ "resolved": "https://registry.npmjs.org/pull-high-watermark/-/pull-high-watermark-0.2.0.tgz", "integrity": "sha512-kgiY2WwebW6i6oCC2ZuwJhHb/6zQ5rY/NwxbZu7Rp2sMVwWIAHGB0Pf3s0sffxdAHL3WkJKVWFeatTFLkRgjtA==" }, + "pull-inactivity": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.3.tgz", + "integrity": "sha512-swJ/jwkIN/O1bQCE3iY7Xy9r3gYuJ50MXaxZilw/HIduAy4tJu+vcz2/If0L+xNK7Ku/FfjtVbTpRTe7sf3hmA==", + "requires": { + "pull-abortable": "~4.0.0", + "pull-stream": "^3.4.5" + }, + "dependencies": { + "pull-abortable": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.0.0.tgz", + "integrity": "sha1-cBephMO4NN53usOMELd28i38GEM=" + } + } + }, "pull-iterable": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/pull-iterable/-/pull-iterable-0.1.0.tgz", @@ -9808,6 +9851,14 @@ "resolved": "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.2.0.tgz", "integrity": "sha1-Xy867UethpGfAbEqLpnW8b13ZYE=" }, + "pull-rate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pull-rate/-/pull-rate-1.0.2.tgz", + "integrity": "sha1-F7IxrV81n2dYJmcBcrDlkMiWTo0=", + "requires": { + "pull-stream": "^3.6.0" + } + }, "pull-reader": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/pull-reader/-/pull-reader-1.3.1.tgz", @@ -10247,10 +10298,9 @@ } }, "regenerator-runtime": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", - "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==", - "dev": true + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" }, "regex-cache": { "version": "0.4.4", @@ -10276,12 +10326,12 @@ "dev": true }, "registry-auth-token": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz", - "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.0.0.tgz", + "integrity": "sha512-lpQkHxd9UL6tb3k/aHAVfnVtn+Bcs9ob5InuFLLEDqSqeq+AljB8GZW9xY0x7F+xYwEcjKe07nyoxzEYz6yvkw==", "dev": true, "requires": { - "rc": "^1.1.6", + "rc": "^1.2.8", "safe-buffer": "^5.0.1" } }, @@ -10599,6 +10649,12 @@ "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz", "integrity": "sha1-E1uZLAV1yYXPoPSUoyJ+0jhYPs4=", "dev": true + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true } } }, @@ -10652,6 +10708,11 @@ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, + "right-pad": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz", + "integrity": "sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA=" + }, "rimraf": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", @@ -10724,9 +10785,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sanitize-filename": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz", - "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.2.tgz", + "integrity": "sha512-cmTzND7RMxUB+f7gI+4+KAVHWEg0lfXvQJdko+FXDP5bNbGIdx4KMP5pX6lv5jfT9jSf6OBbjyxjFtZQwYA/ig==", "dev": true, "requires": { "truncate-utf8-bytes": "^1.0.0" @@ -10927,6 +10988,25 @@ "pull-stream": "^3.4.5" } }, + "secret-stack": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/secret-stack/-/secret-stack-6.2.1.tgz", + "integrity": "sha512-7hw13S77Et4yC23uVXOFDRyullxAvFuoN3XW6PvHlAVkYMirLkyeglPOwPTk5JhYwIKPdpIz6vQ7DM0zSlOUHA==", + "requires": { + "debug": "^4.1.0", + "hoox": "0.0.1", + "ip": "^1.1.5", + "map-merge": "^1.1.0", + "multiserver": "^3.1.0", + "muxrpc": "^6.4.0", + "non-private-ip": "^1.4.3", + "pull-inactivity": "~2.1.1", + "pull-rate": "^1.0.2", + "pull-stream": "^3.4.5", + "stream-to-pull-stream": "^1.6.1", + "to-camel-case": "^1.0.0" + } + }, "secret-stack-decorators": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/secret-stack-decorators/-/secret-stack-decorators-1.0.0.tgz", @@ -11083,9 +11163,9 @@ } }, "semver": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz", - "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true } } @@ -11156,6 +11236,14 @@ "dev": true, "requires": { "is-arrayish": "^0.3.1" + }, + "dependencies": { + "is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "dev": true + } } }, "single-line-log": { @@ -11316,9 +11404,9 @@ } }, "sodium-browserify": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/sodium-browserify/-/sodium-browserify-1.2.7.tgz", - "integrity": "sha512-PGhNO8KravjroRDYvurMPRYi4xMM7zjTW10R77Nq9sjkU314YA2sPeXS6UA5k/rLHaXLaZ6YfLLVz+DdCU5w0g==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/sodium-browserify/-/sodium-browserify-1.3.0.tgz", + "integrity": "sha512-1KRS6Oew3X13AIZhbmGF0YBdt2pQdafJMfv83OZHWbzxG92YBBnN8HYx/VKmYB4xCe90eidNaDJWBEFw/o3ahw==", "requires": { "libsodium-wrappers": "^0.7.4", "sha.js": "2.4.5", @@ -11909,9 +11997,9 @@ } }, "ssb-client": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.7.tgz", - "integrity": "sha512-JKB4DzicHXEAzNnEHrp/FJI7LGnLedfmmWaXuSDjpRH0MzGGFw1oir7R5a11pe7gxXJvm1uQZ4mdNz7nJgHyyw==", + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.8.tgz", + "integrity": "sha512-0oQhsa8EZtXbq2tdb/Pvf9h22tW4q7BZ4gbuaxVqIyYqw79Hq6Sr3xFa6+Mj6DX0Gb00TbI/Ft/jts2NyDfbmQ==", "requires": { "explain-error": "^1.0.1", "multicb": "^1.2.1", @@ -11938,9 +12026,9 @@ } }, "ssb-conn": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ssb-conn/-/ssb-conn-0.1.0.tgz", - "integrity": "sha512-K/mo6u1TvfQaBPojUshQ+QtkjOUYtA/GfGB90gVKjHIX8HBH2BBgti9l8OAJWB7sqmPl9pf5n5eoFHJGhyKQ9w==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/ssb-conn/-/ssb-conn-0.2.7.tgz", + "integrity": "sha512-DU7chwQmTGOX1EGVL+wrDIKo5F7ujrrT3igyMUSXTvYnC/iPqyQ7lftxOaKWIpB8hOFoFAHlLgp7I5j4yjKPOQ==", "requires": { "debug": "~4.1.1", "has-network": "0.0.1", @@ -11953,20 +12041,64 @@ "pull-stream": "^3.6.9", "secret-stack-decorators": "1.0.0", "ssb-conn-db": "~0.2.0", - "ssb-conn-hub": "~0.0.9", + "ssb-conn-hub": "~0.0.10", "ssb-conn-query": "~0.1.2", "ssb-conn-staging": "~0.0.7", - "ssb-keys": "^7.1.3", "ssb-ref": "^2.13.9", "ssb-typescript": "^1.4.0", "statistics": "^3.3.0", "zii": "~1.1.0" + }, + "dependencies": { + "atomic-file": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/atomic-file/-/atomic-file-1.1.5.tgz", + "integrity": "sha512-TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ==" + }, + "ssb-conn-db": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/ssb-conn-db/-/ssb-conn-db-0.2.0.tgz", + "integrity": "sha512-jdYFkBp8CpFzL0gMN9m1K7+K/nOnydhjsFyl3S1TLhQwP/qxh+rAb+WlOUtHrUHF6CJoBW0gKNiQ2Hd78IKjtw==", + "requires": { + "atomic-file": "^1.1.5", + "debug": "~4.1.1", + "multiserver-address": "~1.0.1", + "pull-notify": "~0.1.1", + "ssb-ref": "~2.13.9" + } + }, + "ssb-conn-hub": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/ssb-conn-hub/-/ssb-conn-hub-0.0.10.tgz", + "integrity": "sha512-glmCWj5ahbKK33ZCxgB9D9+Ut31zB7DZvt+SY95dQ9/mUMfBTcmO9U1+0N6Q6MGgx9fbRGvH8OFWqMkgseWm3Q==", + "requires": { + "debug": "^4.1.1", + "multiserver-address": "~1.0.1", + "promisify-tuple": "^1.0.0", + "pull-cat": "~1.1.11", + "pull-notify": "~0.1.1", + "pull-stream": "~3.6.9", + "ssb-ref": "~2.13.9" + } + }, + "ssb-conn-staging": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/ssb-conn-staging/-/ssb-conn-staging-0.0.7.tgz", + "integrity": "sha512-1HefddXgvnS3ith7Pa37QCH1CurTIN2QPGZ1/UA83iFt/xVf0TLDHEFHnkjzngp/345nWacfjQH+rKnLgvygFg==", + "requires": { + "debug": "^4.1.1", + "multiserver-address": "~1.0.1", + "pull-cat": "~1.1.11", + "pull-notify": "~0.1.1", + "pull-stream": "^3.6.9" + } + } } }, "ssb-conn-db": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/ssb-conn-db/-/ssb-conn-db-0.2.0.tgz", - "integrity": "sha512-jdYFkBp8CpFzL0gMN9m1K7+K/nOnydhjsFyl3S1TLhQwP/qxh+rAb+WlOUtHrUHF6CJoBW0gKNiQ2Hd78IKjtw==", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ssb-conn-db/-/ssb-conn-db-0.1.0.tgz", + "integrity": "sha512-mzRZv1IKPcnDpJndr4HsvJ/EBA1Bb849y+DjOwgvP0Vsk0R0bkhyNqmUHIrUTeJX8jkyeuiVXc6iYAIKqOYNmA==", "requires": { "atomic-file": "^1.1.5", "debug": "~4.1.1", @@ -11983,16 +12115,14 @@ } }, "ssb-conn-hub": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/ssb-conn-hub/-/ssb-conn-hub-0.0.9.tgz", - "integrity": "sha512-O32fqJ276vhbqGq/3+GUvqcAbxp1uKVnUhH7B4E+yUDORdmizRJ2N0Mqsxtewhl7/XB/GIG0oeYkKMsO5Y4Y/Q==", + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/ssb-conn-hub/-/ssb-conn-hub-0.0.3.tgz", + "integrity": "sha512-F/5XtjFObCK9VCEKMoKoS0xoFGuV2AM+wU4+4GJCR7SUz3ZqNj8ik9Qu4esDSqsv2Q2JFSeupcO8d0Tqt6lWlw==", "requires": { "debug": "^4.1.1", "multiserver-address": "~1.0.1", "promisify-tuple": "^1.0.0", - "pull-cat": "~1.1.11", "pull-notify": "~0.1.1", - "pull-stream": "~3.6.9", "ssb-ref": "~2.13.9" } }, @@ -12004,18 +12134,63 @@ "ssb-conn-db": "~0.2.0", "ssb-conn-hub": "~0.0.9", "ssb-conn-staging": "~0.0.6" + }, + "dependencies": { + "atomic-file": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/atomic-file/-/atomic-file-1.1.5.tgz", + "integrity": "sha512-TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ==" + }, + "ssb-conn-db": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/ssb-conn-db/-/ssb-conn-db-0.2.0.tgz", + "integrity": "sha512-jdYFkBp8CpFzL0gMN9m1K7+K/nOnydhjsFyl3S1TLhQwP/qxh+rAb+WlOUtHrUHF6CJoBW0gKNiQ2Hd78IKjtw==", + "requires": { + "atomic-file": "^1.1.5", + "debug": "~4.1.1", + "multiserver-address": "~1.0.1", + "pull-notify": "~0.1.1", + "ssb-ref": "~2.13.9" + } + }, + "ssb-conn-hub": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/ssb-conn-hub/-/ssb-conn-hub-0.0.10.tgz", + "integrity": "sha512-glmCWj5ahbKK33ZCxgB9D9+Ut31zB7DZvt+SY95dQ9/mUMfBTcmO9U1+0N6Q6MGgx9fbRGvH8OFWqMkgseWm3Q==", + "requires": { + "debug": "^4.1.1", + "multiserver-address": "~1.0.1", + "promisify-tuple": "^1.0.0", + "pull-cat": "~1.1.11", + "pull-notify": "~0.1.1", + "pull-stream": "~3.6.9", + "ssb-ref": "~2.13.9" + } + }, + "ssb-conn-staging": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/ssb-conn-staging/-/ssb-conn-staging-0.0.7.tgz", + "integrity": "sha512-1HefddXgvnS3ith7Pa37QCH1CurTIN2QPGZ1/UA83iFt/xVf0TLDHEFHnkjzngp/345nWacfjQH+rKnLgvygFg==", + "requires": { + "debug": "^4.1.1", + "multiserver-address": "~1.0.1", + "pull-cat": "~1.1.11", + "pull-notify": "~0.1.1", + "pull-stream": "^3.6.9" + } + } } }, "ssb-conn-staging": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ssb-conn-staging/-/ssb-conn-staging-0.0.7.tgz", - "integrity": "sha512-1HefddXgvnS3ith7Pa37QCH1CurTIN2QPGZ1/UA83iFt/xVf0TLDHEFHnkjzngp/345nWacfjQH+rKnLgvygFg==", + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/ssb-conn-staging/-/ssb-conn-staging-0.0.1.tgz", + "integrity": "sha512-4iOxScdLWy6kAAtfIv7C7TiHqtZFgg+cdJt66peXx3MrfLqMDy657DFe5C2neTD4N63MIlysplkmtXYQzTusRg==", "requires": { "debug": "^4.1.1", "multiserver-address": "~1.0.1", - "pull-cat": "~1.1.11", "pull-notify": "~0.1.1", - "pull-stream": "^3.6.9" + "pull-stream": "^3.6.9", + "ssb-conn-hub": "~0.0.3" } }, "ssb-dark-crystal-schema": { @@ -12139,6 +12314,33 @@ "ssb-schema-definitions": "^1.1.3" } }, + "ssb-gossip": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ssb-gossip/-/ssb-gossip-1.1.0.tgz", + "integrity": "sha512-z4DBUtGJ+/k6z67EjavmPYAKz9BLF7zWcSDwUwLKZZT3AJp/5J6iPxHkilz2UfJ9LdGT4gF5CUe2xyIt1QFguA==", + "requires": { + "atomic-file": "^1.1.5", + "deep-equal": "^1.0.1", + "has-network": "0.0.1", + "ip": "^1.1.5", + "mdmanifest": "^1.0.8", + "muxrpc-validation": "^3.0.0", + "on-change-network": "0.0.2", + "on-wakeup": "^1.0.1", + "pull-notify": "^0.1.1", + "pull-ping": "^2.0.2", + "pull-stream": "^3.6.9", + "ssb-ref": "^2.13.9", + "statistics": "^3.3.0" + }, + "dependencies": { + "atomic-file": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/atomic-file/-/atomic-file-1.1.5.tgz", + "integrity": "sha512-TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ==" + } + } + }, "ssb-identities": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ssb-identities/-/ssb-identities-2.1.0.tgz", @@ -12321,9 +12523,9 @@ } }, "ssb-keys": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.1.7.tgz", - "integrity": "sha512-Zncn++gtpoF4Wjz/po4Jvt7mCHbQfU6ATljahqf1CprWAio4JBUJnQrUeUlmlTn3f4Tseo0/hoh3vk7Bu6M/Sw==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.2.0.tgz", + "integrity": "sha512-qxbVBYB5CsxWPEFg6qe+98hL6Jbs0rztA5zYsoQmYqz2+j3EhhIuXMTki92K4xREOCA2x45FFdOjDFy7ReDpBA==", "requires": { "chloride": "^2.2.8", "mkdirp": "~0.5.0", @@ -12349,49 +12551,6 @@ "ssb-conn-staging": "0.0.1", "ssb-ref": "^2.13.9", "statistics": "^3.3.0" - }, - "dependencies": { - "atomic-file": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/atomic-file/-/atomic-file-1.1.5.tgz", - "integrity": "sha512-TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ==" - }, - "ssb-conn-db": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ssb-conn-db/-/ssb-conn-db-0.1.0.tgz", - "integrity": "sha512-mzRZv1IKPcnDpJndr4HsvJ/EBA1Bb849y+DjOwgvP0Vsk0R0bkhyNqmUHIrUTeJX8jkyeuiVXc6iYAIKqOYNmA==", - "requires": { - "atomic-file": "^1.1.5", - "debug": "~4.1.1", - "multiserver-address": "~1.0.1", - "pull-notify": "~0.1.1", - "ssb-ref": "~2.13.9" - } - }, - "ssb-conn-hub": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/ssb-conn-hub/-/ssb-conn-hub-0.0.3.tgz", - "integrity": "sha512-F/5XtjFObCK9VCEKMoKoS0xoFGuV2AM+wU4+4GJCR7SUz3ZqNj8ik9Qu4esDSqsv2Q2JFSeupcO8d0Tqt6lWlw==", - "requires": { - "debug": "^4.1.1", - "multiserver-address": "~1.0.1", - "promisify-tuple": "^1.0.0", - "pull-notify": "~0.1.1", - "ssb-ref": "~2.13.9" - } - }, - "ssb-conn-staging": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/ssb-conn-staging/-/ssb-conn-staging-0.0.1.tgz", - "integrity": "sha512-4iOxScdLWy6kAAtfIv7C7TiHqtZFgg+cdJt66peXx3MrfLqMDy657DFe5C2neTD4N63MIlysplkmtXYQzTusRg==", - "requires": { - "debug": "^4.1.1", - "multiserver-address": "~1.0.1", - "pull-notify": "~0.1.1", - "pull-stream": "^3.6.9", - "ssb-conn-hub": "~0.0.3" - } - } } }, "ssb-local": { @@ -12714,7 +12873,7 @@ } }, "ssb-server": { - "version": "github:ssbc/ssb-server#29b1d632ad62b77222f2ce89bb52f8f796804dbe", + "version": "github:ssbc/ssb-server#44cdab847c509ef9117e257fcd2ae67bb570200a", "from": "github:ssbc/ssb-server#secret-stack-16.2.1", "requires": { "bash-color": "~0.0.3", @@ -12745,7 +12904,7 @@ "secret-stack": "^6.2.1", "ssb-blobs": "1.2.1", "ssb-caps": "^1.0.1", - "ssb-client": "^4.7.5", + "ssb-client": "^4.7.8", "ssb-config": "^3.2.5", "ssb-db": "19.2.0", "ssb-ebt": "^5.6.1", @@ -12905,15 +13064,14 @@ } }, "aligned-block-file": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.2.2.tgz", - "integrity": "sha512-2Sy0hWhifVb8ycNFJgicL8fDPL2Ct1r62XOVxXnykn36z22MPZwnQlCmB2viQlY/lwfuO67GaQjUZ0rJgdVP7Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.2.1.tgz", + "integrity": "sha512-w9GFJfDcd3Fn60wuLkSFD7zH2aUQAk2yNoHZ1W0HnZZH1OhBjR8BpgBBsqfoqFpPoUivPk++VaZV6z7lzIVqrw==", "requires": { "hashlru": "^2.1.0", "int53": "^1.0.0", "mkdirp": "^0.5.1", "obv": "^0.0.1", - "rwlock": "^5.0.0", "uint48be": "^2.0.1" } }, @@ -13420,23 +13578,6 @@ "typewiselite": "^1.0.0" } }, - "compatibility": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/compatibility/-/compatibility-1.0.0.tgz", - "integrity": "sha512-SJztBRqXAddo8gBxYjXLgvLvdCveuTNzDhNl7layXezAmHUIt2JKTCGZjUsVukFNowFI108TT3T3dbvBA5+bXg==", - "requires": { - "debug": "^4.1.1", - "npm-install-package": "^2.1.0", - "semver": "^6.1.0" - }, - "dependencies": { - "semver": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.0.tgz", - "integrity": "sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==" - } - } - }, "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", @@ -14061,9 +14202,9 @@ } }, "flumeview-hashtable": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/flumeview-hashtable/-/flumeview-hashtable-1.1.1.tgz", - "integrity": "sha512-73LAN0qF4zVMHMExYhK0z1swDo6FEh/bt1HF5/UnWkgI5JsECXOK2bTokWVU1levtr9bd+IxYChnJKJNnEzD0A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/flumeview-hashtable/-/flumeview-hashtable-1.1.0.tgz", + "integrity": "sha512-QMV6/HgIwYDp+zxUb5AtCqo4kO+/CfZtgybn9IyTmIOArEaiRWxWKxwfidRNt0xPCXVSOipl3XX8eUUarLoPYg==", "requires": { "async-single": "^1.0.5", "atomic-file": "^1.1.3", @@ -14072,9 +14213,9 @@ } }, "flumeview-level": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.13.tgz", - "integrity": "sha512-K8sM6AoWVGWps5H/MiqEHxWd0Ts3NtcWEsBjGmC3LD2EPOhrTcDQFn4dVpGAdiZma3RGFRVHE7OTperHrfJnkA==", + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.10.tgz", + "integrity": "sha512-KOmMx3b1RyQ5RlTgk3xkKjpKpJTPI3TWQAZZVn390rEATvVxzMd4IaeiJWfXrgCYKZzzszX1WKSbv474PAfc9A==", "requires": { "charwise": "^3.0.1", "explain-error": "^1.0.4", @@ -14748,24 +14889,6 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" }, - "handlebars": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", - "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", - "requires": { - "neo-async": "^2.6.0", - "optimist": "^0.6.1", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -15431,20 +15554,20 @@ } }, "leveldown": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-5.1.0.tgz", - "integrity": "sha512-+Ws1IDVSbJRJl/cP/JlapGSmt8xPSvZQpTlYGpyaMQiXtlx/fdMX30K2aHiTLxhLcnAg74D8odBG1Fk12/8SRA==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-5.0.3.tgz", + "integrity": "sha512-isfWtOQIXbGbQRI8nmU9FqCZM0klmqTAOFi0vF6G/D0O1ZgxLrSh6Xd4Zj9iVQfGt6+8jpYwkRbN07VLrxRM8w==", "requires": { "abstract-leveldown": "~6.0.3", "fast-future": "~1.0.2", "napi-macros": "~1.8.1", - "node-gyp-build": "~4.1.0" + "node-gyp-build": "~3.8.0" }, "dependencies": { "node-gyp-build": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.0.tgz", - "integrity": "sha512-rGLv++nK20BG8gc0MzzcYe1Nl3p3mtwJ74Q2QD0HTEDKZ6NvOFSelY6s2QBPWIHRR8h7hpad0LiwajfClBJfNg==" + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.8.0.tgz", + "integrity": "sha512-bYbpIHyRqZ7sVWXxGpz8QIRug5JZc/hzZH4GbdT9HTZi6WmKCZ8GLvP8OZ9TTiIBvwPFKgtGrlWQSXDAvYdsPw==" } } }, @@ -15749,13 +15872,11 @@ } }, "multiblob-http": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.0.0.tgz", - "integrity": "sha512-wKsVFCi3lSR75peYpFMRDbWeGm86qgYfBe9Otm8j73rs+a1OltSLcg8fsTCO+pJTbYyIV92Iw5lnVYYTs7zMvg==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/multiblob-http/-/multiblob-http-0.4.2.tgz", + "integrity": "sha512-hVaXryaqJ3vvKjRNcOCEadzgO99nR+haxlptswr3vRvgavbK/Y/I7/Nat12WIQno2/A8+nkbE+ZcrsN3UDbtQw==", "requires": { - "pull-many": "^1.0.8", "pull-stream": "^3.4.3", - "range-parser": "^1.2.0", "stream-to-pull-stream": "^1.7.0" } }, @@ -15765,9 +15886,9 @@ "integrity": "sha512-PZM4dhYFmCF6uZGWpEmoPMUqJBywS9IcAgybT2GmSpYI1BvGvoWSdbio+ik+q/YD2vodhvslESWIS3NnkKYdqQ==" }, "multiserver": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/multiserver/-/multiserver-3.3.6.tgz", - "integrity": "sha512-zuPjEaPEVMosWXnfNalXv3QyjYCwaD2emC6l/ozwMeaCcZ/Do7WMb/ZF8MC6TVwhV9Y7eTcnBiYEP/hq8zA2nA==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/multiserver/-/multiserver-3.3.3.tgz", + "integrity": "sha512-hbYf5A3DELSQdVUN4KcdD6It2yGE4f3CyHcz3qY0Lq+EojThFZaoe9ov1zFoaYnYqAEUnnRD1cTB6n/xZvu5Lw==", "requires": { "debug": "^4.1.1", "multicb": "^1.2.2", @@ -15809,14 +15930,6 @@ "pull-stream": "^3.2.3" } }, - "muxrpc-usage": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/muxrpc-usage/-/muxrpc-usage-2.1.0.tgz", - "integrity": "sha512-ZspYQd4n4pLy86Gu/yrEdHvg5NBrg4p2NayQ2NFelN1QyLZRLTKPlTyaa6DyztsCG7mjLzxFBw9jw9LReB8Azw==", - "requires": { - "right-pad": "^1.0.1" - } - }, "muxrpc-validation": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/muxrpc-validation/-/muxrpc-validation-3.0.0.tgz", @@ -15836,19 +15949,6 @@ } } }, - "muxrpcli": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/muxrpcli/-/muxrpcli-3.1.0.tgz", - "integrity": "sha512-GvnPFBTA5oHHJDI9U7cwiOWCbVOLHcuO8cprwRLPD/zEXBQWeZ5qOw3/wpT2GGFyXL/gCDm456EjYj7hjY7jiA==", - "requires": { - "cont": "^1.0.3", - "minimist": "^1.2.0", - "muxrpc-usage": "^2.0.1", - "pull-stream": "^3.6.9", - "stream-to-pull-stream": "^1.7.3", - "word-wrap": "^1.2.3" - } - }, "mv": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", @@ -15870,9 +15970,9 @@ } }, "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", + "version": "2.13.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", + "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==", "optional": true }, "nanomatch": { @@ -15932,11 +16032,6 @@ "semver": "^5.4.1" } }, - "neo-async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==" - }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -16033,36 +16128,37 @@ "dependencies": { "ansi-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + "bundled": true }, "append-transform": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz", - "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", + "bundled": true, "requires": { "default-require-extensions": "^2.0.0" } }, "archy": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" + "bundled": true }, "arrify": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" + "bundled": true + }, + "async": { + "version": "2.6.2", + "bundled": true, + "requires": { + "lodash": "^4.17.11" + } }, "balanced-match": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "bundled": true }, "brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "bundled": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -16070,8 +16166,7 @@ }, "caching-transform": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-3.0.1.tgz", - "integrity": "sha512-Y1KTLNwSPd4ljsDrFOtyXVmm7Gnk42yQitNq43AhE+cwUR/e4T+rmOHs1IPtzBg8066GBJfTOj1rQYFSWSsH2g==", + "bundled": true, "requires": { "hasha": "^3.0.0", "make-dir": "^1.3.0", @@ -16081,13 +16176,11 @@ }, "camelcase": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz", - "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==" + "bundled": true }, "cliui": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "bundled": true, "requires": { "string-width": "^2.1.1", "strip-ansi": "^4.0.0", @@ -16096,31 +16189,31 @@ }, "code-point-at": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "bundled": true + }, + "commander": { + "version": "2.17.1", + "bundled": true, + "optional": true }, "commondir": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" + "bundled": true }, "concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "bundled": true }, "convert-source-map": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", - "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", + "bundled": true, "requires": { "safe-buffer": "~5.1.1" } }, "cross-spawn": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", + "bundled": true, "requires": { "lru-cache": "^4.0.1", "which": "^1.2.9" @@ -16128,50 +16221,43 @@ }, "debug": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "bundled": true, "requires": { "ms": "^2.1.1" } }, "decamelize": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + "bundled": true }, "default-require-extensions": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz", - "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", + "bundled": true, "requires": { "strip-bom": "^3.0.0" } }, "end-of-stream": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "bundled": true, "requires": { "once": "^1.4.0" } }, "error-ex": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "bundled": true, "requires": { "is-arrayish": "^0.2.1" } }, "es6-error": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==" + "bundled": true }, "execa": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "bundled": true, "requires": { "cross-spawn": "^6.0.0", "get-stream": "^4.0.0", @@ -16184,8 +16270,7 @@ "dependencies": { "cross-spawn": { "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "bundled": true, "requires": { "nice-try": "^1.0.4", "path-key": "^2.0.1", @@ -16198,8 +16283,7 @@ }, "find-cache-dir": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz", - "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==", + "bundled": true, "requires": { "commondir": "^1.0.1", "make-dir": "^1.0.0", @@ -16208,16 +16292,14 @@ }, "find-up": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "bundled": true, "requires": { "locate-path": "^3.0.0" } }, "foreground-child": { "version": "1.5.6", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", - "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=", + "bundled": true, "requires": { "cross-spawn": "^4", "signal-exit": "^3.0.0" @@ -16225,26 +16307,22 @@ }, "fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "bundled": true }, "get-caller-file": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + "bundled": true }, "get-stream": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "bundled": true, "requires": { "pump": "^3.0.0" } }, "glob": { "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "bundled": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -16256,36 +16334,46 @@ }, "graceful-fs": { "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" + "bundled": true + }, + "handlebars": { + "version": "4.1.0", + "bundled": true, + "requires": { + "async": "^2.5.0", + "optimist": "^0.6.1", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "bundled": true + } + } }, "has-flag": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + "bundled": true }, "hasha": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/hasha/-/hasha-3.0.0.tgz", - "integrity": "sha1-UqMvq4Vp1BymmmH/GiFPjrfIvTk=", + "bundled": true, "requires": { "is-stream": "^1.0.1" } }, "hosted-git-info": { "version": "2.7.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", - "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==" + "bundled": true }, "imurmurhash": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + "bundled": true }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "bundled": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -16293,51 +16381,42 @@ }, "inherits": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "bundled": true }, "invert-kv": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" + "bundled": true }, "is-arrayish": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + "bundled": true }, "is-fullwidth-code-point": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + "bundled": true }, "is-stream": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + "bundled": true }, "isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + "bundled": true }, "istanbul-lib-coverage": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", - "integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==" + "bundled": true }, "istanbul-lib-hook": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.3.tgz", - "integrity": "sha512-CLmEqwEhuCYtGcpNVJjLV1DQyVnIqavMLFHV/DP+np/g3qvdxu3gsPqYoJMXm15sN84xOlckFB3VNvRbf5yEgA==", + "bundled": true, "requires": { "append-transform": "^1.0.0" } }, "istanbul-lib-report": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz", - "integrity": "sha512-sOiLZLAWpA0+3b5w5/dq0cjm2rrNdAfHWaGhmn7XEFW6X++IV9Ohn+pnELAl9K3rfpaeBfbmH9JU5sejacdLeA==", + "bundled": true, "requires": { "istanbul-lib-coverage": "^2.0.3", "make-dir": "^1.3.0", @@ -16346,8 +16425,7 @@ "dependencies": { "supports-color": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "bundled": true, "requires": { "has-flag": "^3.0.0" } @@ -16356,8 +16434,7 @@ }, "istanbul-lib-source-maps": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz", - "integrity": "sha512-JX4v0CiKTGp9fZPmoxpu9YEkPbEqCqBbO3403VabKjH+NRXo72HafD5UgnjTEqHL2SAjaZK1XDuDOkn6I5QVfQ==", + "bundled": true, "requires": { "debug": "^4.1.1", "istanbul-lib-coverage": "^2.0.3", @@ -16368,36 +16445,31 @@ "dependencies": { "source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "bundled": true } } }, "istanbul-reports": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.1.1.tgz", - "integrity": "sha512-FzNahnidyEPBCI0HcufJoSEoKykesRlFcSzQqjH9x0+LC8tnnE/p/90PBLu8iZTxr8yYZNyTtiAujUqyN+CIxw==", + "bundled": true, "requires": { "handlebars": "^4.1.0" } }, "json-parse-better-errors": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + "bundled": true }, "lcid": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", + "bundled": true, "requires": { "invert-kv": "^2.0.0" } }, "load-json-file": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "bundled": true, "requires": { "graceful-fs": "^4.1.2", "parse-json": "^4.0.0", @@ -16407,22 +16479,23 @@ }, "locate-path": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "bundled": true, "requires": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" } }, + "lodash": { + "version": "4.17.11", + "bundled": true + }, "lodash.flattendeep": { "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", - "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=" + "bundled": true }, "lru-cache": { "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "bundled": true, "requires": { "pseudomap": "^1.0.2", "yallist": "^2.1.2" @@ -16430,24 +16503,21 @@ }, "make-dir": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "bundled": true, "requires": { "pify": "^3.0.0" } }, "map-age-cleaner": { "version": "0.1.3", - "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", - "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", + "bundled": true, "requires": { "p-defer": "^1.0.0" } }, "mem": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.1.0.tgz", - "integrity": "sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==", + "bundled": true, "requires": { "map-age-cleaner": "^0.1.1", "mimic-fn": "^1.0.0", @@ -16456,61 +16526,56 @@ }, "merge-source-map": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", - "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", + "bundled": true, "requires": { "source-map": "^0.6.1" }, "dependencies": { "source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "bundled": true } } }, "mimic-fn": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" + "bundled": true }, "minimatch": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "bundled": true, "requires": { "brace-expansion": "^1.1.7" } }, + "minimist": { + "version": "0.0.10", + "bundled": true + }, "mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "bundled": true, "requires": { "minimist": "0.0.8" }, "dependencies": { "minimist": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "bundled": true } } }, "ms": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "bundled": true }, "nice-try": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" + "bundled": true }, "normalize-package-data": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "bundled": true, "requires": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", @@ -16520,34 +16585,37 @@ }, "npm-run-path": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "bundled": true, "requires": { "path-key": "^2.0.0" } }, "number-is-nan": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "bundled": true }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "bundled": true, "requires": { "wrappy": "1" } }, + "optimist": { + "version": "0.6.1", + "bundled": true, + "requires": { + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" + } + }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + "bundled": true }, "os-locale": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", + "bundled": true, "requires": { "execa": "^1.0.0", "lcid": "^2.0.0", @@ -16556,44 +16624,37 @@ }, "p-defer": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" + "bundled": true }, "p-finally": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" + "bundled": true }, "p-is-promise": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz", - "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==" + "bundled": true }, "p-limit": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz", - "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", + "bundled": true, "requires": { "p-try": "^2.0.0" } }, "p-locate": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "bundled": true, "requires": { "p-limit": "^2.0.0" } }, "p-try": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==" + "bundled": true }, "package-hash": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-3.0.0.tgz", - "integrity": "sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA==", + "bundled": true, "requires": { "graceful-fs": "^4.1.15", "hasha": "^3.0.0", @@ -16603,8 +16664,7 @@ }, "parse-json": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "bundled": true, "requires": { "error-ex": "^1.3.1", "json-parse-better-errors": "^1.0.1" @@ -16612,54 +16672,45 @@ }, "path-exists": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + "bundled": true }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "bundled": true }, "path-key": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + "bundled": true }, "path-parse": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + "bundled": true }, "path-type": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "bundled": true, "requires": { "pify": "^3.0.0" } }, "pify": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + "bundled": true }, "pkg-dir": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", - "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", + "bundled": true, "requires": { "find-up": "^3.0.0" } }, "pseudomap": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + "bundled": true }, "pump": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "bundled": true, "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -16667,8 +16718,7 @@ }, "read-pkg": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "bundled": true, "requires": { "load-json-file": "^4.0.0", "normalize-package-data": "^2.3.2", @@ -16677,8 +16727,7 @@ }, "read-pkg-up": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz", - "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", + "bundled": true, "requires": { "find-up": "^3.0.0", "read-pkg": "^3.0.0" @@ -16686,80 +16735,67 @@ }, "release-zalgo": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", - "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", + "bundled": true, "requires": { "es6-error": "^4.0.1" } }, "require-directory": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + "bundled": true }, "require-main-filename": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + "bundled": true }, "resolve": { "version": "1.10.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz", - "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==", + "bundled": true, "requires": { "path-parse": "^1.0.6" } }, "resolve-from": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + "bundled": true }, "rimraf": { "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "bundled": true, "requires": { "glob": "^7.1.3" } }, "safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "bundled": true }, "semver": { "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" + "bundled": true }, "set-blocking": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "bundled": true }, "shebang-command": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "bundled": true, "requires": { "shebang-regex": "^1.0.0" } }, "shebang-regex": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" + "bundled": true }, "signal-exit": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + "bundled": true }, "spawn-wrap": { "version": "1.4.2", - "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.2.tgz", - "integrity": "sha512-vMwR3OmmDhnxCVxM8M+xO/FtIp6Ju/mNaDfCMMW7FDcLRTPFWUswec4LXJHTJE2hwTI9O0YBfygu4DalFl7Ylg==", + "bundled": true, "requires": { "foreground-child": "^1.5.6", "mkdirp": "^0.5.0", @@ -16771,8 +16807,7 @@ }, "spdx-correct": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", - "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", + "bundled": true, "requires": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -16780,13 +16815,11 @@ }, "spdx-exceptions": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", - "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==" + "bundled": true }, "spdx-expression-parse": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "bundled": true, "requires": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -16794,13 +16827,11 @@ }, "spdx-license-ids": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz", - "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==" + "bundled": true }, "string-width": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "bundled": true, "requires": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" @@ -16808,26 +16839,22 @@ }, "strip-ansi": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "bundled": true, "requires": { "ansi-regex": "^3.0.0" } }, "strip-bom": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" + "bundled": true }, "strip-eof": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" + "bundled": true }, "test-exclude": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.1.0.tgz", - "integrity": "sha512-gwf0S2fFsANC55fSeSqpb8BYk6w3FDvwZxfNjeF6FRgvFa43r+7wRiA/Q0IxoRU37wB/LE8IQ4221BsNucTaCA==", + "bundled": true, "requires": { "arrify": "^1.0.1", "minimatch": "^3.0.4", @@ -16835,15 +16862,29 @@ "require-main-filename": "^1.0.1" } }, + "uglify-js": { + "version": "3.4.9", + "bundled": true, + "optional": true, + "requires": { + "commander": "~2.17.1", + "source-map": "~0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "bundled": true, + "optional": true + } + } + }, "uuid": { "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + "bundled": true }, "validate-npm-package-license": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "bundled": true, "requires": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -16851,21 +16892,22 @@ }, "which": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "bundled": true, "requires": { "isexe": "^2.0.0" } }, "which-module": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + "bundled": true + }, + "wordwrap": { + "version": "0.0.3", + "bundled": true }, "wrap-ansi": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "bundled": true, "requires": { "string-width": "^1.0.1", "strip-ansi": "^3.0.1" @@ -16873,21 +16915,18 @@ "dependencies": { "ansi-regex": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "bundled": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "bundled": true, "requires": { "number-is-nan": "^1.0.0" } }, "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "bundled": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -16896,8 +16935,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "bundled": true, "requires": { "ansi-regex": "^2.0.0" } @@ -16906,13 +16944,11 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "bundled": true }, "write-file-atomic": { "version": "2.4.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz", - "integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==", + "bundled": true, "requires": { "graceful-fs": "^4.1.11", "imurmurhash": "^0.1.4", @@ -16921,18 +16957,15 @@ }, "y18n": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" + "bundled": true }, "yallist": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + "bundled": true }, "yargs": { "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "bundled": true, "requires": { "cliui": "^4.0.0", "decamelize": "^1.2.0", @@ -16950,8 +16983,7 @@ }, "yargs-parser": { "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", + "bundled": true, "requires": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" @@ -17079,22 +17111,6 @@ "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz", "integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==" }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - }, - "dependencies": { - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" - } - } - }, "options": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", @@ -17679,11 +17695,6 @@ } } }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" - }, "rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -18157,11 +18168,6 @@ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, - "right-pad": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz", - "integrity": "sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA=" - }, "rimraf": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", @@ -18195,11 +18201,6 @@ "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz", "integrity": "sha512-+GztYEPRpIsQoCSraWHDBs9WVy4eVME16zhOtDB4H9J4xN0XRhknnmLOl+4gRgZtu8dpp9N/utSPjKH/xmDzXg==" }, - "rwlock": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/rwlock/-/rwlock-5.0.0.tgz", - "integrity": "sha1-iI1qd6M1HMGiCSBO8u4XIgk4Ns8=" - }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -18225,25 +18226,6 @@ "pull-stream": "^3.4.5" } }, - "secret-stack": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/secret-stack/-/secret-stack-6.2.1.tgz", - "integrity": "sha512-7hw13S77Et4yC23uVXOFDRyullxAvFuoN3XW6PvHlAVkYMirLkyeglPOwPTk5JhYwIKPdpIz6vQ7DM0zSlOUHA==", - "requires": { - "debug": "^4.1.0", - "hoox": "0.0.1", - "ip": "^1.1.5", - "map-merge": "^1.1.0", - "multiserver": "^3.1.0", - "muxrpc": "^6.4.0", - "non-private-ip": "^1.4.3", - "pull-inactivity": "~2.1.1", - "pull-rate": "^1.0.2", - "pull-stream": "^3.4.5", - "stream-to-pull-stream": "^1.6.1", - "to-camel-case": "^1.0.0" - } - }, "semver": { "version": "5.7.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", @@ -18563,15 +18545,10 @@ "ssb-ref": "^2.3.0" } }, - "ssb-caps": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ssb-caps/-/ssb-caps-1.0.1.tgz", - "integrity": "sha512-ULJhokqDW4a9l7xXKPHwbhLQgRZmEjwdrrXMsPGoVYnvKb9sJuJ8ki9ilBZIs+NmYuAV+H1ffbB2Z4uioBtFYQ==" - }, "ssb-client": { - "version": "4.7.5", - "resolved": "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.5.tgz", - "integrity": "sha512-+GgakuweQ/oiL5EWfqQYes9+/9ooFB+QRKhbDvw1JDjya57fAmtvHhKbWZ2nzurJ1KM9iRTHU+BcZJ4xl4hr7Q==", + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.8.tgz", + "integrity": "sha512-0oQhsa8EZtXbq2tdb/Pvf9h22tW4q7BZ4gbuaxVqIyYqw79Hq6Sr3xFa6+Mj6DX0Gb00TbI/Ft/jts2NyDfbmQ==", "requires": { "explain-error": "^1.0.1", "multicb": "^1.2.1", @@ -18579,21 +18556,8 @@ "muxrpc": "^6.4.2", "pull-hash": "^1.0.0", "pull-stream": "^3.6.0", - "ssb-config": "^2.3.9", + "ssb-config": "^3.2.5", "ssb-keys": "^7.0.13" - }, - "dependencies": { - "ssb-config": { - "version": "2.3.9", - "resolved": "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.9.tgz", - "integrity": "sha512-UF+4+khFXILLBqtu9HfrpUwYnDXIdAyJe3u9X4GrApuoakxuSKwaUGakUxLPyo6COyV2brMqufUgf+fDOI8Ftw==", - "requires": { - "deep-extend": "^0.6.0", - "non-private-ip": "^1.2.1", - "os-homedir": "^1.0.1", - "rc": "^1.1.6" - } - } } }, "ssb-config": { @@ -18688,26 +18652,6 @@ "pull-stream": "^3.6.0" } }, - "ssb-gossip": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ssb-gossip/-/ssb-gossip-1.1.0.tgz", - "integrity": "sha512-z4DBUtGJ+/k6z67EjavmPYAKz9BLF7zWcSDwUwLKZZT3AJp/5J6iPxHkilz2UfJ9LdGT4gF5CUe2xyIt1QFguA==", - "requires": { - "atomic-file": "^1.1.5", - "deep-equal": "^1.0.1", - "has-network": "0.0.1", - "ip": "^1.1.5", - "mdmanifest": "^1.0.8", - "muxrpc-validation": "^3.0.0", - "on-change-network": "0.0.2", - "on-wakeup": "^1.0.1", - "pull-notify": "^0.1.1", - "pull-ping": "^2.0.2", - "pull-stream": "^3.6.9", - "ssb-ref": "^2.13.9", - "statistics": "^3.3.0" - } - }, "ssb-invite": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ssb-invite/-/ssb-invite-2.1.3.tgz", @@ -18746,28 +18690,6 @@ "ssb-msgs": "^5.2.0" } }, - "ssb-local": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ssb-local/-/ssb-local-1.0.0.tgz", - "integrity": "sha512-aIkz+tDsAQFLbcN5d9itipHG71EG62UdIwojz78BQBxD7kGTwMezZofkMplURp9/njwdqMiqxYEUMvOh8Emh/w==", - "requires": { - "broadcast-stream": "^0.2.2", - "ssb-ref": "^2.13.9" - } - }, - "ssb-logging": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ssb-logging/-/ssb-logging-1.0.0.tgz", - "integrity": "sha512-6apTG47+VgLAD3MYkpRTbO27DMDh0YLJIvWfcJUEo5FdrjnLsqDl1kkzQ4B5MbH08z5Vklx5907t4by9rhlROQ==", - "requires": { - "bash-color": "0.0.4" - } - }, - "ssb-master": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ssb-master/-/ssb-master-1.0.2.tgz", - "integrity": "sha512-Sn19i0OrQYRqC8MEN7NLO8oX+/qE3fZ6VDuw6iUC7S9VIe8oh2A9bWKTGL8GR1vG5+HyxVSRo8FdgcglJDBc3g==" - }, "ssb-msgs": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ssb-msgs/-/ssb-msgs-5.2.0.tgz", @@ -18776,22 +18698,6 @@ "ssb-ref": "^2.0.0" } }, - "ssb-no-auth": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ssb-no-auth/-/ssb-no-auth-1.0.0.tgz", - "integrity": "sha512-+o9WnY566shLyiJp6l21+SHZfgv40SEr35PtoF3uuFYI24vFhgcfv77pXvWpDINVyX2uQ152o2eQHg1amlp6lQ==", - "requires": { - "multiserver": "^3.3.3" - } - }, - "ssb-onion": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ssb-onion/-/ssb-onion-1.0.0.tgz", - "integrity": "sha512-iRXjeI0sbRbgMwaKg+poqhHSH7GvUVgJ+8ysi8q7Hjj4wHkczLGAOyVjnyhjF+ErPDFn9kXN+46joneKqSgEDg==", - "requires": { - "multiserver": "^3.3.3" - } - }, "ssb-ooo": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/ssb-ooo/-/ssb-ooo-1.3.0.tgz", @@ -18910,14 +18816,6 @@ "ssb-ref": "^2.13.9" } }, - "ssb-unix-socket": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ssb-unix-socket/-/ssb-unix-socket-1.0.0.tgz", - "integrity": "sha512-Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA==", - "requires": { - "multiserver": "^3.3.3" - } - }, "ssb-validate": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.0.4.tgz", @@ -18929,9 +18827,9 @@ } }, "ssb-ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ssb-ws/-/ssb-ws-6.2.1.tgz", - "integrity": "sha512-PR8vJVhLo8eIWfPa/NRpVWRSmASDQFS/KxHsfBmz1zGrMnLNGSW28KD5A/jVsFLDQfDlNyC75dThgUbEIki4mQ==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ssb-ws/-/ssb-ws-6.2.3.tgz", + "integrity": "sha512-zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA==", "requires": { "emoji-server": "^1.0.0", "multiblob-http": "^1.0.0", @@ -18940,6 +18838,19 @@ "pull-stream": "^3.6.9", "ssb-ref": "^2.3.0", "stack": "^0.1.0" + }, + "dependencies": { + "multiblob-http": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.0.0.tgz", + "integrity": "sha512-wKsVFCi3lSR75peYpFMRDbWeGm86qgYfBe9Otm8j73rs+a1OltSLcg8fsTCO+pJTbYyIV92Iw5lnVYYTs7zMvg==", + "requires": { + "pull-many": "^1.0.8", + "pull-stream": "^3.4.3", + "range-parser": "^1.2.0", + "stream-to-pull-stream": "^1.7.0" + } + } } }, "stack": { @@ -19240,24 +19151,6 @@ "resolved": "https://registry.npmjs.org/typewiselite/-/typewiselite-1.0.0.tgz", "integrity": "sha1-yIgvobsQksBgBal/NO9chQjjZk4=" }, - "uglify-js": { - "version": "3.5.14", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.14.tgz", - "integrity": "sha512-dgyjIw8KFK6AyVl5vm2tEqPewv5TKGEiiVFLI1LbF+oHua/Njd8tZk3lIbF1AWU1rNdEg7scaceADb4zqCcWXg==", - "optional": true, - "requires": { - "commander": "~2.20.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "optional": true - } - } - }, "uint48be": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/uint48be/-/uint48be-2.0.1.tgz", @@ -19498,11 +19391,6 @@ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" }, - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" - }, "wrap-fn": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz", @@ -20402,6 +20290,14 @@ "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==" }, + "to-camel-case": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/to-camel-case/-/to-camel-case-1.0.0.tgz", + "integrity": "sha1-GlYFSy+daWKYzmamCJcyK29CPkY=", + "requires": { + "to-space-case": "^1.0.0" + } + }, "to-fast-properties": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", @@ -20420,6 +20316,11 @@ "resize-img": "^1.1.0" } }, + "to-no-case": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/to-no-case/-/to-no-case-1.0.2.tgz", + "integrity": "sha1-xyKQcWTvaxeBMsjmmTAhLRtKoWo=" + }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", @@ -20464,6 +20365,14 @@ "repeat-string": "^1.6.1" } }, + "to-space-case": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/to-space-case/-/to-space-case-1.0.0.tgz", + "integrity": "sha1-sFLar7Gysp3HcM6gFj5ewOvJ/Bc=", + "requires": { + "to-no-case": "^1.0.0" + } + }, "to-vfile": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/to-vfile/-/to-vfile-1.0.0.tgz", @@ -20846,6 +20755,11 @@ "static-module": "^3.0.0" }, "dependencies": { + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", diff --git a/package.json b/package.json index 7924c37d..8a7e5456 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "ssb-chess-db": "^1.0.6", "ssb-chess-mithril": "1.0.10", "ssb-config": "^3.3.0", - "ssb-conn": "^0.1.0", + "ssb-conn": "^0.2.7", "ssb-device-address": "^1.1.6", "ssb-ebt": "^5.6.6", "ssb-friend-pub": "^1.0.7", From 99fe3a840327ee1dc4209117998ad1cef2acfc99 Mon Sep 17 00:00:00 2001 From: mixmix Date: Mon, 29 Jul 2019 20:27:47 +1200 Subject: [PATCH 7/8] update to ssb-server 15.1.0 --- package-lock.json | 884 +++++++++++++++++++++++++++------------------- package.json | 2 +- 2 files changed, 512 insertions(+), 374 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2ee64e91..3f50ec13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5684,11 +5684,6 @@ "os-tmpdir": "^1.0.1" } }, - "hoox": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/hoox/-/hoox-0.0.1.tgz", - "integrity": "sha1-CKdNknKpzIOujmu+AwPw7nZDIJQ=" - }, "hosted-git-info": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", @@ -7327,11 +7322,6 @@ "typewiselite": "^1.0.0" } }, - "map-merge": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz", - "integrity": "sha1-am/FjJXYqrRsK93kTVFbbuBvzjQ=" - }, "map-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", @@ -7811,14 +7801,6 @@ "pull-stream": "^3.2.3" } }, - "muxrpc-usage": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/muxrpc-usage/-/muxrpc-usage-2.1.0.tgz", - "integrity": "sha512-ZspYQd4n4pLy86Gu/yrEdHvg5NBrg4p2NayQ2NFelN1QyLZRLTKPlTyaa6DyztsCG7mjLzxFBw9jw9LReB8Azw==", - "requires": { - "right-pad": "^1.0.1" - } - }, "muxrpc-validation": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/muxrpc-validation/-/muxrpc-validation-3.0.2.tgz", @@ -7828,26 +7810,6 @@ "zerr": "^1.0.4" } }, - "muxrpcli": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/muxrpcli/-/muxrpcli-3.1.1.tgz", - "integrity": "sha512-DSBXkmbfZgUrM9Y54Saeb2RySmuDMo5jAnMnBo0JHempIlHIXmnrIASdC0co0TQATq8kECF6SYcTFbJLKZUfJw==", - "requires": { - "cont": "^1.0.3", - "minimist": "^1.2.0", - "muxrpc-usage": "^2.0.1", - "pull-stream": "^3.6.9", - "stream-to-pull-stream": "^1.7.3", - "word-wrap": "^1.2.3" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - } - } - }, "mv": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", @@ -9714,22 +9676,6 @@ "resolved": "https://registry.npmjs.org/pull-high-watermark/-/pull-high-watermark-0.2.0.tgz", "integrity": "sha512-kgiY2WwebW6i6oCC2ZuwJhHb/6zQ5rY/NwxbZu7Rp2sMVwWIAHGB0Pf3s0sffxdAHL3WkJKVWFeatTFLkRgjtA==" }, - "pull-inactivity": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.3.tgz", - "integrity": "sha512-swJ/jwkIN/O1bQCE3iY7Xy9r3gYuJ50MXaxZilw/HIduAy4tJu+vcz2/If0L+xNK7Ku/FfjtVbTpRTe7sf3hmA==", - "requires": { - "pull-abortable": "~4.0.0", - "pull-stream": "^3.4.5" - }, - "dependencies": { - "pull-abortable": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.0.0.tgz", - "integrity": "sha1-cBephMO4NN53usOMELd28i38GEM=" - } - } - }, "pull-iterable": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/pull-iterable/-/pull-iterable-0.1.0.tgz", @@ -9851,14 +9797,6 @@ "resolved": "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.2.0.tgz", "integrity": "sha1-Xy867UethpGfAbEqLpnW8b13ZYE=" }, - "pull-rate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pull-rate/-/pull-rate-1.0.2.tgz", - "integrity": "sha1-F7IxrV81n2dYJmcBcrDlkMiWTo0=", - "requires": { - "pull-stream": "^3.6.0" - } - }, "pull-reader": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/pull-reader/-/pull-reader-1.3.1.tgz", @@ -10708,11 +10646,6 @@ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, - "right-pad": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz", - "integrity": "sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA=" - }, "rimraf": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", @@ -10988,25 +10921,6 @@ "pull-stream": "^3.4.5" } }, - "secret-stack": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/secret-stack/-/secret-stack-6.2.1.tgz", - "integrity": "sha512-7hw13S77Et4yC23uVXOFDRyullxAvFuoN3XW6PvHlAVkYMirLkyeglPOwPTk5JhYwIKPdpIz6vQ7DM0zSlOUHA==", - "requires": { - "debug": "^4.1.0", - "hoox": "0.0.1", - "ip": "^1.1.5", - "map-merge": "^1.1.0", - "multiserver": "^3.1.0", - "muxrpc": "^6.4.0", - "non-private-ip": "^1.4.3", - "pull-inactivity": "~2.1.1", - "pull-rate": "^1.0.2", - "pull-stream": "^3.4.5", - "stream-to-pull-stream": "^1.6.1", - "to-camel-case": "^1.0.0" - } - }, "secret-stack-decorators": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/secret-stack-decorators/-/secret-stack-decorators-1.0.0.tgz", @@ -12314,33 +12228,6 @@ "ssb-schema-definitions": "^1.1.3" } }, - "ssb-gossip": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ssb-gossip/-/ssb-gossip-1.1.0.tgz", - "integrity": "sha512-z4DBUtGJ+/k6z67EjavmPYAKz9BLF7zWcSDwUwLKZZT3AJp/5J6iPxHkilz2UfJ9LdGT4gF5CUe2xyIt1QFguA==", - "requires": { - "atomic-file": "^1.1.5", - "deep-equal": "^1.0.1", - "has-network": "0.0.1", - "ip": "^1.1.5", - "mdmanifest": "^1.0.8", - "muxrpc-validation": "^3.0.0", - "on-change-network": "0.0.2", - "on-wakeup": "^1.0.1", - "pull-notify": "^0.1.1", - "pull-ping": "^2.0.2", - "pull-stream": "^3.6.9", - "ssb-ref": "^2.13.9", - "statistics": "^3.3.0" - }, - "dependencies": { - "atomic-file": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/atomic-file/-/atomic-file-1.1.5.tgz", - "integrity": "sha512-TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ==" - } - } - }, "ssb-identities": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ssb-identities/-/ssb-identities-2.1.0.tgz", @@ -12873,8 +12760,9 @@ } }, "ssb-server": { - "version": "github:ssbc/ssb-server#44cdab847c509ef9117e257fcd2ae67bb570200a", - "from": "github:ssbc/ssb-server#secret-stack-16.2.1", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/ssb-server/-/ssb-server-15.1.0.tgz", + "integrity": "sha512-4qn3Q+xpKL6BKBTgO1dHSt5ljyrZkWVoHYaZzCYbs75rGbaGvc0evSyu2TpaYwiiSxrVxJGYr8s4MyXzdPqUVQ==", "requires": { "bash-color": "~0.0.3", "broadcast-stream": "^0.2.1", @@ -12904,7 +12792,7 @@ "secret-stack": "^6.2.1", "ssb-blobs": "1.2.1", "ssb-caps": "^1.0.1", - "ssb-client": "^4.7.8", + "ssb-client": "^4.7.5", "ssb-config": "^3.2.5", "ssb-db": "19.2.0", "ssb-ebt": "^5.6.1", @@ -13064,14 +12952,15 @@ } }, "aligned-block-file": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.2.1.tgz", - "integrity": "sha512-w9GFJfDcd3Fn60wuLkSFD7zH2aUQAk2yNoHZ1W0HnZZH1OhBjR8BpgBBsqfoqFpPoUivPk++VaZV6z7lzIVqrw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.2.2.tgz", + "integrity": "sha512-2Sy0hWhifVb8ycNFJgicL8fDPL2Ct1r62XOVxXnykn36z22MPZwnQlCmB2viQlY/lwfuO67GaQjUZ0rJgdVP7Q==", "requires": { "hashlru": "^2.1.0", "int53": "^1.0.0", "mkdirp": "^0.5.1", "obv": "^0.0.1", + "rwlock": "^5.0.0", "uint48be": "^2.0.1" } }, @@ -13578,6 +13467,23 @@ "typewiselite": "^1.0.0" } }, + "compatibility": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/compatibility/-/compatibility-1.0.0.tgz", + "integrity": "sha512-SJztBRqXAddo8gBxYjXLgvLvdCveuTNzDhNl7layXezAmHUIt2JKTCGZjUsVukFNowFI108TT3T3dbvBA5+bXg==", + "requires": { + "debug": "^4.1.1", + "npm-install-package": "^2.1.0", + "semver": "^6.1.0" + }, + "dependencies": { + "semver": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.0.tgz", + "integrity": "sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==" + } + } + }, "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", @@ -14202,9 +14108,9 @@ } }, "flumeview-hashtable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/flumeview-hashtable/-/flumeview-hashtable-1.1.0.tgz", - "integrity": "sha512-QMV6/HgIwYDp+zxUb5AtCqo4kO+/CfZtgybn9IyTmIOArEaiRWxWKxwfidRNt0xPCXVSOipl3XX8eUUarLoPYg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/flumeview-hashtable/-/flumeview-hashtable-1.1.1.tgz", + "integrity": "sha512-73LAN0qF4zVMHMExYhK0z1swDo6FEh/bt1HF5/UnWkgI5JsECXOK2bTokWVU1levtr9bd+IxYChnJKJNnEzD0A==", "requires": { "async-single": "^1.0.5", "atomic-file": "^1.1.3", @@ -14213,9 +14119,9 @@ } }, "flumeview-level": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.10.tgz", - "integrity": "sha512-KOmMx3b1RyQ5RlTgk3xkKjpKpJTPI3TWQAZZVn390rEATvVxzMd4IaeiJWfXrgCYKZzzszX1WKSbv474PAfc9A==", + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.13.tgz", + "integrity": "sha512-K8sM6AoWVGWps5H/MiqEHxWd0Ts3NtcWEsBjGmC3LD2EPOhrTcDQFn4dVpGAdiZma3RGFRVHE7OTperHrfJnkA==", "requires": { "charwise": "^3.0.1", "explain-error": "^1.0.4", @@ -14889,6 +14795,24 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" }, + "handlebars": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", + "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", + "requires": { + "neo-async": "^2.6.0", + "optimist": "^0.6.1", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } + } + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -15554,20 +15478,20 @@ } }, "leveldown": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-5.0.3.tgz", - "integrity": "sha512-isfWtOQIXbGbQRI8nmU9FqCZM0klmqTAOFi0vF6G/D0O1ZgxLrSh6Xd4Zj9iVQfGt6+8jpYwkRbN07VLrxRM8w==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-5.1.0.tgz", + "integrity": "sha512-+Ws1IDVSbJRJl/cP/JlapGSmt8xPSvZQpTlYGpyaMQiXtlx/fdMX30K2aHiTLxhLcnAg74D8odBG1Fk12/8SRA==", "requires": { "abstract-leveldown": "~6.0.3", "fast-future": "~1.0.2", "napi-macros": "~1.8.1", - "node-gyp-build": "~3.8.0" + "node-gyp-build": "~4.1.0" }, "dependencies": { "node-gyp-build": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.8.0.tgz", - "integrity": "sha512-bYbpIHyRqZ7sVWXxGpz8QIRug5JZc/hzZH4GbdT9HTZi6WmKCZ8GLvP8OZ9TTiIBvwPFKgtGrlWQSXDAvYdsPw==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.0.tgz", + "integrity": "sha512-rGLv++nK20BG8gc0MzzcYe1Nl3p3mtwJ74Q2QD0HTEDKZ6NvOFSelY6s2QBPWIHRR8h7hpad0LiwajfClBJfNg==" } } }, @@ -15872,11 +15796,13 @@ } }, "multiblob-http": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/multiblob-http/-/multiblob-http-0.4.2.tgz", - "integrity": "sha512-hVaXryaqJ3vvKjRNcOCEadzgO99nR+haxlptswr3vRvgavbK/Y/I7/Nat12WIQno2/A8+nkbE+ZcrsN3UDbtQw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.0.0.tgz", + "integrity": "sha512-wKsVFCi3lSR75peYpFMRDbWeGm86qgYfBe9Otm8j73rs+a1OltSLcg8fsTCO+pJTbYyIV92Iw5lnVYYTs7zMvg==", "requires": { + "pull-many": "^1.0.8", "pull-stream": "^3.4.3", + "range-parser": "^1.2.0", "stream-to-pull-stream": "^1.7.0" } }, @@ -15886,9 +15812,9 @@ "integrity": "sha512-PZM4dhYFmCF6uZGWpEmoPMUqJBywS9IcAgybT2GmSpYI1BvGvoWSdbio+ik+q/YD2vodhvslESWIS3NnkKYdqQ==" }, "multiserver": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/multiserver/-/multiserver-3.3.3.tgz", - "integrity": "sha512-hbYf5A3DELSQdVUN4KcdD6It2yGE4f3CyHcz3qY0Lq+EojThFZaoe9ov1zFoaYnYqAEUnnRD1cTB6n/xZvu5Lw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/multiserver/-/multiserver-3.3.6.tgz", + "integrity": "sha512-zuPjEaPEVMosWXnfNalXv3QyjYCwaD2emC6l/ozwMeaCcZ/Do7WMb/ZF8MC6TVwhV9Y7eTcnBiYEP/hq8zA2nA==", "requires": { "debug": "^4.1.1", "multicb": "^1.2.2", @@ -15930,6 +15856,14 @@ "pull-stream": "^3.2.3" } }, + "muxrpc-usage": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/muxrpc-usage/-/muxrpc-usage-2.1.0.tgz", + "integrity": "sha512-ZspYQd4n4pLy86Gu/yrEdHvg5NBrg4p2NayQ2NFelN1QyLZRLTKPlTyaa6DyztsCG7mjLzxFBw9jw9LReB8Azw==", + "requires": { + "right-pad": "^1.0.1" + } + }, "muxrpc-validation": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/muxrpc-validation/-/muxrpc-validation-3.0.0.tgz", @@ -15949,6 +15883,19 @@ } } }, + "muxrpcli": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/muxrpcli/-/muxrpcli-3.1.0.tgz", + "integrity": "sha512-GvnPFBTA5oHHJDI9U7cwiOWCbVOLHcuO8cprwRLPD/zEXBQWeZ5qOw3/wpT2GGFyXL/gCDm456EjYj7hjY7jiA==", + "requires": { + "cont": "^1.0.3", + "minimist": "^1.2.0", + "muxrpc-usage": "^2.0.1", + "pull-stream": "^3.6.9", + "stream-to-pull-stream": "^1.7.3", + "word-wrap": "^1.2.3" + } + }, "mv": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", @@ -15970,9 +15917,9 @@ } }, "nan": { - "version": "2.13.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", - "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", "optional": true }, "nanomatch": { @@ -16032,6 +15979,11 @@ "semver": "^5.4.1" } }, + "neo-async": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", + "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==" + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -16128,37 +16080,36 @@ "dependencies": { "ansi-regex": { "version": "3.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" }, "append-transform": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz", + "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", "requires": { "default-require-extensions": "^2.0.0" } }, "archy": { "version": "1.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" }, "arrify": { "version": "1.0.1", - "bundled": true - }, - "async": { - "version": "2.6.2", - "bundled": true, - "requires": { - "lodash": "^4.17.11" - } + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" }, "balanced-match": { "version": "1.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "brace-expansion": { "version": "1.1.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -16166,7 +16117,8 @@ }, "caching-transform": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-3.0.1.tgz", + "integrity": "sha512-Y1KTLNwSPd4ljsDrFOtyXVmm7Gnk42yQitNq43AhE+cwUR/e4T+rmOHs1IPtzBg8066GBJfTOj1rQYFSWSsH2g==", "requires": { "hasha": "^3.0.0", "make-dir": "^1.3.0", @@ -16176,11 +16128,13 @@ }, "camelcase": { "version": "5.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz", + "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==" }, "cliui": { "version": "4.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "requires": { "string-width": "^2.1.1", "strip-ansi": "^4.0.0", @@ -16189,31 +16143,31 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true - }, - "commander": { - "version": "2.17.1", - "bundled": true, - "optional": true + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "commondir": { "version": "1.0.1", - "bundled": true + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" }, "concat-map": { "version": "0.0.1", - "bundled": true + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "convert-source-map": { "version": "1.6.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", + "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", "requires": { "safe-buffer": "~5.1.1" } }, "cross-spawn": { "version": "4.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", "requires": { "lru-cache": "^4.0.1", "which": "^1.2.9" @@ -16221,43 +16175,50 @@ }, "debug": { "version": "4.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { "ms": "^2.1.1" } }, "decamelize": { "version": "1.2.0", - "bundled": true + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "default-require-extensions": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz", + "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", "requires": { "strip-bom": "^3.0.0" } }, "end-of-stream": { "version": "1.4.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "requires": { "once": "^1.4.0" } }, "error-ex": { "version": "1.3.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "requires": { "is-arrayish": "^0.2.1" } }, "es6-error": { "version": "4.1.1", - "bundled": true + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==" }, "execa": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "requires": { "cross-spawn": "^6.0.0", "get-stream": "^4.0.0", @@ -16270,7 +16231,8 @@ "dependencies": { "cross-spawn": { "version": "6.0.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "requires": { "nice-try": "^1.0.4", "path-key": "^2.0.1", @@ -16283,7 +16245,8 @@ }, "find-cache-dir": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz", + "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==", "requires": { "commondir": "^1.0.1", "make-dir": "^1.0.0", @@ -16292,14 +16255,16 @@ }, "find-up": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "requires": { "locate-path": "^3.0.0" } }, "foreground-child": { "version": "1.5.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", + "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=", "requires": { "cross-spawn": "^4", "signal-exit": "^3.0.0" @@ -16307,22 +16272,26 @@ }, "fs.realpath": { "version": "1.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "get-caller-file": { "version": "1.0.3", - "bundled": true + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" }, "get-stream": { "version": "4.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "requires": { "pump": "^3.0.0" } }, "glob": { "version": "7.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -16334,46 +16303,36 @@ }, "graceful-fs": { "version": "4.1.15", - "bundled": true - }, - "handlebars": { - "version": "4.1.0", - "bundled": true, - "requires": { - "async": "^2.5.0", - "optimist": "^0.6.1", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "bundled": true - } - } + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", + "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" }, "has-flag": { "version": "3.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "hasha": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/hasha/-/hasha-3.0.0.tgz", + "integrity": "sha1-UqMvq4Vp1BymmmH/GiFPjrfIvTk=", "requires": { "is-stream": "^1.0.1" } }, "hosted-git-info": { "version": "2.7.1", - "bundled": true + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", + "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==" }, "imurmurhash": { "version": "0.1.4", - "bundled": true + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { "once": "^1.3.0", "wrappy": "1" @@ -16381,42 +16340,51 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "invert-kv": { "version": "2.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", + "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" }, "is-arrayish": { "version": "0.2.1", - "bundled": true + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-fullwidth-code-point": { "version": "2.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, "is-stream": { "version": "1.1.0", - "bundled": true + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, "isexe": { "version": "2.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "istanbul-lib-coverage": { "version": "2.0.3", - "bundled": true + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", + "integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==" }, "istanbul-lib-hook": { "version": "2.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.3.tgz", + "integrity": "sha512-CLmEqwEhuCYtGcpNVJjLV1DQyVnIqavMLFHV/DP+np/g3qvdxu3gsPqYoJMXm15sN84xOlckFB3VNvRbf5yEgA==", "requires": { "append-transform": "^1.0.0" } }, "istanbul-lib-report": { "version": "2.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz", + "integrity": "sha512-sOiLZLAWpA0+3b5w5/dq0cjm2rrNdAfHWaGhmn7XEFW6X++IV9Ohn+pnELAl9K3rfpaeBfbmH9JU5sejacdLeA==", "requires": { "istanbul-lib-coverage": "^2.0.3", "make-dir": "^1.3.0", @@ -16425,7 +16393,8 @@ "dependencies": { "supports-color": { "version": "6.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "requires": { "has-flag": "^3.0.0" } @@ -16434,7 +16403,8 @@ }, "istanbul-lib-source-maps": { "version": "3.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz", + "integrity": "sha512-JX4v0CiKTGp9fZPmoxpu9YEkPbEqCqBbO3403VabKjH+NRXo72HafD5UgnjTEqHL2SAjaZK1XDuDOkn6I5QVfQ==", "requires": { "debug": "^4.1.1", "istanbul-lib-coverage": "^2.0.3", @@ -16445,31 +16415,36 @@ "dependencies": { "source-map": { "version": "0.6.1", - "bundled": true + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, "istanbul-reports": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.1.1.tgz", + "integrity": "sha512-FzNahnidyEPBCI0HcufJoSEoKykesRlFcSzQqjH9x0+LC8tnnE/p/90PBLu8iZTxr8yYZNyTtiAujUqyN+CIxw==", "requires": { "handlebars": "^4.1.0" } }, "json-parse-better-errors": { "version": "1.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" }, "lcid": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", + "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "requires": { "invert-kv": "^2.0.0" } }, "load-json-file": { "version": "4.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "requires": { "graceful-fs": "^4.1.2", "parse-json": "^4.0.0", @@ -16479,23 +16454,22 @@ }, "locate-path": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "requires": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" } }, - "lodash": { - "version": "4.17.11", - "bundled": true - }, "lodash.flattendeep": { "version": "4.4.0", - "bundled": true + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=" }, "lru-cache": { "version": "4.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "requires": { "pseudomap": "^1.0.2", "yallist": "^2.1.2" @@ -16503,21 +16477,24 @@ }, "make-dir": { "version": "1.3.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "requires": { "pify": "^3.0.0" } }, "map-age-cleaner": { "version": "0.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", + "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", "requires": { "p-defer": "^1.0.0" } }, "mem": { "version": "4.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/mem/-/mem-4.1.0.tgz", + "integrity": "sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==", "requires": { "map-age-cleaner": "^0.1.1", "mimic-fn": "^1.0.0", @@ -16526,56 +16503,61 @@ }, "merge-source-map": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", + "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", "requires": { "source-map": "^0.6.1" }, "dependencies": { "source-map": { "version": "0.6.1", - "bundled": true + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, "mimic-fn": { "version": "1.2.0", - "bundled": true + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { "brace-expansion": "^1.1.7" } }, - "minimist": { - "version": "0.0.10", - "bundled": true - }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { "minimist": "0.0.8" }, "dependencies": { "minimist": { "version": "0.0.8", - "bundled": true + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" } } }, "ms": { "version": "2.1.1", - "bundled": true + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" }, "nice-try": { "version": "1.0.5", - "bundled": true + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, "normalize-package-data": { "version": "2.5.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "requires": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", @@ -16585,37 +16567,34 @@ }, "npm-run-path": { "version": "2.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "requires": { "path-key": "^2.0.0" } }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { "wrappy": "1" } }, - "optimist": { - "version": "0.6.1", - "bundled": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - } - }, "os-homedir": { "version": "1.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "os-locale": { "version": "3.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", + "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "requires": { "execa": "^1.0.0", "lcid": "^2.0.0", @@ -16624,37 +16603,44 @@ }, "p-defer": { "version": "1.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", + "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" }, "p-finally": { "version": "1.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, "p-is-promise": { "version": "2.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz", + "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==" }, "p-limit": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz", + "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", "requires": { "p-try": "^2.0.0" } }, "p-locate": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "requires": { "p-limit": "^2.0.0" } }, "p-try": { "version": "2.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", + "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==" }, "package-hash": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-3.0.0.tgz", + "integrity": "sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA==", "requires": { "graceful-fs": "^4.1.15", "hasha": "^3.0.0", @@ -16664,7 +16650,8 @@ }, "parse-json": { "version": "4.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "requires": { "error-ex": "^1.3.1", "json-parse-better-errors": "^1.0.1" @@ -16672,45 +16659,54 @@ }, "path-exists": { "version": "3.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" }, "path-is-absolute": { "version": "1.0.1", - "bundled": true + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-key": { "version": "2.0.1", - "bundled": true + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" }, "path-parse": { "version": "1.0.6", - "bundled": true + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "path-type": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "requires": { "pify": "^3.0.0" } }, "pify": { "version": "3.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" }, "pkg-dir": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", + "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "requires": { "find-up": "^3.0.0" } }, "pseudomap": { "version": "1.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "pump": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -16718,7 +16714,8 @@ }, "read-pkg": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", "requires": { "load-json-file": "^4.0.0", "normalize-package-data": "^2.3.2", @@ -16727,7 +16724,8 @@ }, "read-pkg-up": { "version": "4.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz", + "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", "requires": { "find-up": "^3.0.0", "read-pkg": "^3.0.0" @@ -16735,67 +16733,80 @@ }, "release-zalgo": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", + "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", "requires": { "es6-error": "^4.0.1" } }, "require-directory": { "version": "2.1.1", - "bundled": true + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "require-main-filename": { "version": "1.0.1", - "bundled": true + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" }, "resolve": { "version": "1.10.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz", + "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==", "requires": { "path-parse": "^1.0.6" } }, "resolve-from": { "version": "4.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" }, "rimraf": { "version": "2.6.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "requires": { "glob": "^7.1.3" } }, "safe-buffer": { "version": "5.1.2", - "bundled": true + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "semver": { "version": "5.6.0", - "bundled": true + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" }, "set-blocking": { "version": "2.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "shebang-command": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "requires": { "shebang-regex": "^1.0.0" } }, "shebang-regex": { "version": "1.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" }, "signal-exit": { "version": "3.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, "spawn-wrap": { "version": "1.4.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.2.tgz", + "integrity": "sha512-vMwR3OmmDhnxCVxM8M+xO/FtIp6Ju/mNaDfCMMW7FDcLRTPFWUswec4LXJHTJE2hwTI9O0YBfygu4DalFl7Ylg==", "requires": { "foreground-child": "^1.5.6", "mkdirp": "^0.5.0", @@ -16807,7 +16818,8 @@ }, "spdx-correct": { "version": "3.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", + "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", "requires": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -16815,11 +16827,13 @@ }, "spdx-exceptions": { "version": "2.2.0", - "bundled": true + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", + "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==" }, "spdx-expression-parse": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "requires": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -16827,11 +16841,13 @@ }, "spdx-license-ids": { "version": "3.0.3", - "bundled": true + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz", + "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==" }, "string-width": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "requires": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" @@ -16839,22 +16855,26 @@ }, "strip-ansi": { "version": "4.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "requires": { "ansi-regex": "^3.0.0" } }, "strip-bom": { "version": "3.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" }, "strip-eof": { "version": "1.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, "test-exclude": { "version": "5.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.1.0.tgz", + "integrity": "sha512-gwf0S2fFsANC55fSeSqpb8BYk6w3FDvwZxfNjeF6FRgvFa43r+7wRiA/Q0IxoRU37wB/LE8IQ4221BsNucTaCA==", "requires": { "arrify": "^1.0.1", "minimatch": "^3.0.4", @@ -16862,29 +16882,15 @@ "require-main-filename": "^1.0.1" } }, - "uglify-js": { - "version": "3.4.9", - "bundled": true, - "optional": true, - "requires": { - "commander": "~2.17.1", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "bundled": true, - "optional": true - } - } - }, "uuid": { "version": "3.3.2", - "bundled": true + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" }, "validate-npm-package-license": { "version": "3.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "requires": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -16892,22 +16898,21 @@ }, "which": { "version": "1.3.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "requires": { "isexe": "^2.0.0" } }, "which-module": { "version": "2.0.0", - "bundled": true - }, - "wordwrap": { - "version": "0.0.3", - "bundled": true + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, "wrap-ansi": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "requires": { "string-width": "^1.0.1", "strip-ansi": "^3.0.1" @@ -16915,18 +16920,21 @@ "dependencies": { "ansi-regex": { "version": "2.1.1", - "bundled": true + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { "number-is-nan": "^1.0.0" } }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -16935,7 +16943,8 @@ }, "strip-ansi": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { "ansi-regex": "^2.0.0" } @@ -16944,11 +16953,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "write-file-atomic": { "version": "2.4.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz", + "integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==", "requires": { "graceful-fs": "^4.1.11", "imurmurhash": "^0.1.4", @@ -16957,15 +16968,18 @@ }, "y18n": { "version": "4.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" }, "yallist": { "version": "2.1.2", - "bundled": true + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" }, "yargs": { "version": "12.0.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", + "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", "requires": { "cliui": "^4.0.0", "decamelize": "^1.2.0", @@ -16983,7 +16997,8 @@ }, "yargs-parser": { "version": "11.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", + "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", "requires": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" @@ -17111,6 +17126,22 @@ "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz", "integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==" }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "requires": { + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" + }, + "dependencies": { + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + } + } + }, "options": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", @@ -17695,6 +17726,11 @@ } } }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + }, "rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -18168,6 +18204,11 @@ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, + "right-pad": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz", + "integrity": "sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA=" + }, "rimraf": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", @@ -18201,6 +18242,11 @@ "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz", "integrity": "sha512-+GztYEPRpIsQoCSraWHDBs9WVy4eVME16zhOtDB4H9J4xN0XRhknnmLOl+4gRgZtu8dpp9N/utSPjKH/xmDzXg==" }, + "rwlock": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/rwlock/-/rwlock-5.0.0.tgz", + "integrity": "sha1-iI1qd6M1HMGiCSBO8u4XIgk4Ns8=" + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -18226,6 +18272,25 @@ "pull-stream": "^3.4.5" } }, + "secret-stack": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/secret-stack/-/secret-stack-6.2.1.tgz", + "integrity": "sha512-7hw13S77Et4yC23uVXOFDRyullxAvFuoN3XW6PvHlAVkYMirLkyeglPOwPTk5JhYwIKPdpIz6vQ7DM0zSlOUHA==", + "requires": { + "debug": "^4.1.0", + "hoox": "0.0.1", + "ip": "^1.1.5", + "map-merge": "^1.1.0", + "multiserver": "^3.1.0", + "muxrpc": "^6.4.0", + "non-private-ip": "^1.4.3", + "pull-inactivity": "~2.1.1", + "pull-rate": "^1.0.2", + "pull-stream": "^3.4.5", + "stream-to-pull-stream": "^1.6.1", + "to-camel-case": "^1.0.0" + } + }, "semver": { "version": "5.7.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", @@ -18545,10 +18610,15 @@ "ssb-ref": "^2.3.0" } }, + "ssb-caps": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ssb-caps/-/ssb-caps-1.0.1.tgz", + "integrity": "sha512-ULJhokqDW4a9l7xXKPHwbhLQgRZmEjwdrrXMsPGoVYnvKb9sJuJ8ki9ilBZIs+NmYuAV+H1ffbB2Z4uioBtFYQ==" + }, "ssb-client": { - "version": "4.7.8", - "resolved": "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.8.tgz", - "integrity": "sha512-0oQhsa8EZtXbq2tdb/Pvf9h22tW4q7BZ4gbuaxVqIyYqw79Hq6Sr3xFa6+Mj6DX0Gb00TbI/Ft/jts2NyDfbmQ==", + "version": "4.7.5", + "resolved": "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.5.tgz", + "integrity": "sha512-+GgakuweQ/oiL5EWfqQYes9+/9ooFB+QRKhbDvw1JDjya57fAmtvHhKbWZ2nzurJ1KM9iRTHU+BcZJ4xl4hr7Q==", "requires": { "explain-error": "^1.0.1", "multicb": "^1.2.1", @@ -18556,8 +18626,21 @@ "muxrpc": "^6.4.2", "pull-hash": "^1.0.0", "pull-stream": "^3.6.0", - "ssb-config": "^3.2.5", + "ssb-config": "^2.3.9", "ssb-keys": "^7.0.13" + }, + "dependencies": { + "ssb-config": { + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.9.tgz", + "integrity": "sha512-UF+4+khFXILLBqtu9HfrpUwYnDXIdAyJe3u9X4GrApuoakxuSKwaUGakUxLPyo6COyV2brMqufUgf+fDOI8Ftw==", + "requires": { + "deep-extend": "^0.6.0", + "non-private-ip": "^1.2.1", + "os-homedir": "^1.0.1", + "rc": "^1.1.6" + } + } } }, "ssb-config": { @@ -18652,6 +18735,26 @@ "pull-stream": "^3.6.0" } }, + "ssb-gossip": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ssb-gossip/-/ssb-gossip-1.1.0.tgz", + "integrity": "sha512-z4DBUtGJ+/k6z67EjavmPYAKz9BLF7zWcSDwUwLKZZT3AJp/5J6iPxHkilz2UfJ9LdGT4gF5CUe2xyIt1QFguA==", + "requires": { + "atomic-file": "^1.1.5", + "deep-equal": "^1.0.1", + "has-network": "0.0.1", + "ip": "^1.1.5", + "mdmanifest": "^1.0.8", + "muxrpc-validation": "^3.0.0", + "on-change-network": "0.0.2", + "on-wakeup": "^1.0.1", + "pull-notify": "^0.1.1", + "pull-ping": "^2.0.2", + "pull-stream": "^3.6.9", + "ssb-ref": "^2.13.9", + "statistics": "^3.3.0" + } + }, "ssb-invite": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ssb-invite/-/ssb-invite-2.1.3.tgz", @@ -18690,6 +18793,28 @@ "ssb-msgs": "^5.2.0" } }, + "ssb-local": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ssb-local/-/ssb-local-1.0.0.tgz", + "integrity": "sha512-aIkz+tDsAQFLbcN5d9itipHG71EG62UdIwojz78BQBxD7kGTwMezZofkMplURp9/njwdqMiqxYEUMvOh8Emh/w==", + "requires": { + "broadcast-stream": "^0.2.2", + "ssb-ref": "^2.13.9" + } + }, + "ssb-logging": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ssb-logging/-/ssb-logging-1.0.0.tgz", + "integrity": "sha512-6apTG47+VgLAD3MYkpRTbO27DMDh0YLJIvWfcJUEo5FdrjnLsqDl1kkzQ4B5MbH08z5Vklx5907t4by9rhlROQ==", + "requires": { + "bash-color": "0.0.4" + } + }, + "ssb-master": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/ssb-master/-/ssb-master-1.0.2.tgz", + "integrity": "sha512-Sn19i0OrQYRqC8MEN7NLO8oX+/qE3fZ6VDuw6iUC7S9VIe8oh2A9bWKTGL8GR1vG5+HyxVSRo8FdgcglJDBc3g==" + }, "ssb-msgs": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ssb-msgs/-/ssb-msgs-5.2.0.tgz", @@ -18698,6 +18823,22 @@ "ssb-ref": "^2.0.0" } }, + "ssb-no-auth": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ssb-no-auth/-/ssb-no-auth-1.0.0.tgz", + "integrity": "sha512-+o9WnY566shLyiJp6l21+SHZfgv40SEr35PtoF3uuFYI24vFhgcfv77pXvWpDINVyX2uQ152o2eQHg1amlp6lQ==", + "requires": { + "multiserver": "^3.3.3" + } + }, + "ssb-onion": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ssb-onion/-/ssb-onion-1.0.0.tgz", + "integrity": "sha512-iRXjeI0sbRbgMwaKg+poqhHSH7GvUVgJ+8ysi8q7Hjj4wHkczLGAOyVjnyhjF+ErPDFn9kXN+46joneKqSgEDg==", + "requires": { + "multiserver": "^3.3.3" + } + }, "ssb-ooo": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/ssb-ooo/-/ssb-ooo-1.3.0.tgz", @@ -18816,6 +18957,14 @@ "ssb-ref": "^2.13.9" } }, + "ssb-unix-socket": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ssb-unix-socket/-/ssb-unix-socket-1.0.0.tgz", + "integrity": "sha512-Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA==", + "requires": { + "multiserver": "^3.3.3" + } + }, "ssb-validate": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.0.4.tgz", @@ -18827,9 +18976,9 @@ } }, "ssb-ws": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ssb-ws/-/ssb-ws-6.2.3.tgz", - "integrity": "sha512-zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ssb-ws/-/ssb-ws-6.2.1.tgz", + "integrity": "sha512-PR8vJVhLo8eIWfPa/NRpVWRSmASDQFS/KxHsfBmz1zGrMnLNGSW28KD5A/jVsFLDQfDlNyC75dThgUbEIki4mQ==", "requires": { "emoji-server": "^1.0.0", "multiblob-http": "^1.0.0", @@ -18838,19 +18987,6 @@ "pull-stream": "^3.6.9", "ssb-ref": "^2.3.0", "stack": "^0.1.0" - }, - "dependencies": { - "multiblob-http": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.0.0.tgz", - "integrity": "sha512-wKsVFCi3lSR75peYpFMRDbWeGm86qgYfBe9Otm8j73rs+a1OltSLcg8fsTCO+pJTbYyIV92Iw5lnVYYTs7zMvg==", - "requires": { - "pull-many": "^1.0.8", - "pull-stream": "^3.4.3", - "range-parser": "^1.2.0", - "stream-to-pull-stream": "^1.7.0" - } - } } }, "stack": { @@ -19151,6 +19287,24 @@ "resolved": "https://registry.npmjs.org/typewiselite/-/typewiselite-1.0.0.tgz", "integrity": "sha1-yIgvobsQksBgBal/NO9chQjjZk4=" }, + "uglify-js": { + "version": "3.5.14", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.14.tgz", + "integrity": "sha512-dgyjIw8KFK6AyVl5vm2tEqPewv5TKGEiiVFLI1LbF+oHua/Njd8tZk3lIbF1AWU1rNdEg7scaceADb4zqCcWXg==", + "optional": true, + "requires": { + "commander": "~2.20.0", + "source-map": "~0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true + } + } + }, "uint48be": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/uint48be/-/uint48be-2.0.1.tgz", @@ -19391,6 +19545,11 @@ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + }, "wrap-fn": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz", @@ -20290,14 +20449,6 @@ "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==" }, - "to-camel-case": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-camel-case/-/to-camel-case-1.0.0.tgz", - "integrity": "sha1-GlYFSy+daWKYzmamCJcyK29CPkY=", - "requires": { - "to-space-case": "^1.0.0" - } - }, "to-fast-properties": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", @@ -20316,11 +20467,6 @@ "resize-img": "^1.1.0" } }, - "to-no-case": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/to-no-case/-/to-no-case-1.0.2.tgz", - "integrity": "sha1-xyKQcWTvaxeBMsjmmTAhLRtKoWo=" - }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", @@ -20365,14 +20511,6 @@ "repeat-string": "^1.6.1" } }, - "to-space-case": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-space-case/-/to-space-case-1.0.0.tgz", - "integrity": "sha1-sFLar7Gysp3HcM6gFj5ewOvJ/Bc=", - "requires": { - "to-no-case": "^1.0.0" - } - }, "to-vfile": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/to-vfile/-/to-vfile-1.0.0.tgz", diff --git a/package.json b/package.json index 8a7e5456..39349b5b 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "ssb-ref": "^2.13.6", "ssb-replicate": "^1.3.0", "ssb-search": "^1.1.2", - "ssb-server": "github:ssbc/ssb-server#secret-stack-16.2.1", + "ssb-server": "^15.1.0", "ssb-sort": "^1.1.0", "ssb-suggest": "^1.0.4", "ssb-tangle": "^1.0.1", From 475cf8a2ef855c81c4e00c828ebd39ab88c3a5ad Mon Sep 17 00:00:00 2001 From: mixmix Date: Mon, 5 Aug 2019 22:26:10 +1200 Subject: [PATCH 8/8] fix gatherings (see github.com/mmckegg/mutant/issues/28) --- app/html/modal.js | 24 +++++++------ app/html/modal.mcss | 6 ++-- package-lock.json | 84 +++++++++++++++++++++++++++------------------ package.json | 4 +-- 4 files changed, 69 insertions(+), 49 deletions(-) diff --git a/app/html/modal.js b/app/html/modal.js index 43589cd8..b73854cf 100644 --- a/app/html/modal.js +++ b/app/html/modal.js @@ -4,7 +4,7 @@ const { h, Value } = require('mutant') exports.gives = nest('app.html.modal') exports.create = (api) => { - return nest('app.html.modal', (content, { isOpen, onClose, className = '' } = {}) => { + return nest('app.html.modal', (content, { isOpen, onOpen, onClose, className = '' } = {}) => { if (typeof isOpen !== 'function') isOpen = Value(false) const openMe = () => { @@ -15,7 +15,7 @@ exports.create = (api) => { if (typeof onClose === 'function') onClose() } - const lb = h('Modal -closed', + const modal = h('Modal -closed', { className, 'ev-click': closeMe, @@ -33,27 +33,29 @@ exports.create = (api) => { isOpen(state => { if (state === true) { - lb.classList.remove('-closed') - lb.classList.add('-open') + modal.classList.remove('-closed') + modal.classList.add('-open') } else { - lb.classList.remove('-open') - lb.classList.add('-closed') + modal.classList.remove('-open') + modal.classList.add('-closed') return } + if (typeof onOpen === 'function') onOpen() focus() + function focus () { - if (!lb.isConnected) setTimeout(focus, 200) + if (!modal.isConnected) setTimeout(focus, 200) else { - const target = lb.querySelector('input') || lb.querySelector('textarea') + const target = modal.querySelector('input') || modal.querySelector('textarea') if (target) target.focus() } } }) - lb.open = openMe - lb.close = closeMe + modal.open = openMe + modal.close = closeMe - return lb + return modal }) } diff --git a/app/html/modal.mcss b/app/html/modal.mcss index 20c4df40..38e87b07 100644 --- a/app/html/modal.mcss +++ b/app/html/modal.mcss @@ -25,11 +25,13 @@ Modal { } -open { - display: grid + /* display: grid */ + visibility: visible } -closed { - display: none + /* display: none */ + visibility: hidden } -dark { diff --git a/package-lock.json b/package-lock.json index 0981f86e..96bfd93f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7730,12 +7730,11 @@ } }, "mutant": { - "version": "3.23.0", - "resolved": "https://registry.npmjs.org/mutant/-/mutant-3.23.0.tgz", - "integrity": "sha512-gCMc5o0CtRosBJIvQnVzYuD+vDN4rWeGtWAjbpsZIpArIGEyITMCK0v6WnIcuSyYl5EiCvTbtPVUOwPjo7Mp0w==", + "version": "3.22.1", + "resolved": "https://registry.npmjs.org/mutant/-/mutant-3.22.1.tgz", + "integrity": "sha1-kEh1RvcAs8KKqApD0c99M48wdYE=", "requires": { "browser-split": "0.0.1", - "source-map-support": "^0.5.9", "xtend": "^4.0.1" }, "dependencies": { @@ -7743,20 +7742,6 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/browser-split/-/browser-split-0.0.1.tgz", "integrity": "sha1-ewl1dPjj6tYG+0Zk5krf3aKYGpM=" - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "source-map-support": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", - "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } } } }, @@ -8554,9 +8539,9 @@ } }, "patchbay-gatherings": { - "version": "3.2.14", - "resolved": "https://registry.npmjs.org/patchbay-gatherings/-/patchbay-gatherings-3.2.14.tgz", - "integrity": "sha512-gDXhuMh17TQGd7LOk9raGJzgiYJ+/EaJgTNpmC8O9ZZwIY1RkLL2dwyhdwYXfPTYOYOkNoixRUtRGCpq1hsRDw==", + "version": "3.2.19", + "resolved": "https://registry.npmjs.org/patchbay-gatherings/-/patchbay-gatherings-3.2.19.tgz", + "integrity": "sha512-GEj68oK+OskqGcdfwxmWBwJIXbvulLPYx362+OwUP9ou8pzyq8WH5ghbzo5AaU+0Rz6JIqiStZ8/xGMZMQjKUw==", "requires": { "depject": "^4.1.1", "depnest": "^1.3.0", @@ -8576,6 +8561,11 @@ "suggest-box": "^2.2.3" }, "dependencies": { + "browser-split": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/browser-split/-/browser-split-0.0.1.tgz", + "integrity": "sha1-ewl1dPjj6tYG+0Zk5krf3aKYGpM=" + }, "duplexer2": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", @@ -8606,6 +8596,17 @@ "estraverse": "~1.5.0", "esutils": "~1.0.0", "source-map": "~0.1.33" + }, + "dependencies": { + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "optional": true, + "requires": { + "amdefine": ">=0.0.4" + } + } } }, "esprima": { @@ -8628,6 +8629,16 @@ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" }, + "mutant": { + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/mutant/-/mutant-3.23.0.tgz", + "integrity": "sha512-gCMc5o0CtRosBJIvQnVzYuD+vDN4rWeGtWAjbpsZIpArIGEyITMCK0v6WnIcuSyYl5EiCvTbtPVUOwPjo7Mp0w==", + "requires": { + "browser-split": "0.0.1", + "source-map-support": "^0.5.9", + "xtend": "^4.0.1" + } + }, "object-inspect": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz", @@ -8662,12 +8673,17 @@ } }, "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "optional": true, + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + }, + "source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", "requires": { - "amdefine": ">=0.0.4" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" } }, "static-eval": { @@ -8726,6 +8742,14 @@ "readable-stream": "~1.0.17", "xtend": "~2.1.1" } + }, + "xtend": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", + "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", + "requires": { + "object-keys": "~0.4.0" + } } } }, @@ -8733,14 +8757,6 @@ "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - }, - "xtend": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", - "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", - "requires": { - "object-keys": "~0.4.0" - } } } }, diff --git a/package.json b/package.json index 8fd90cbf..b7808c1a 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "lodash": "^4.17.10", "marama": "^1.2.2", "micro-css": "^2.0.1", - "mutant": "^3.23.0", + "mutant": "~3.22.1", "mutant-scroll": "^1.0.2", "noto-color-emoji": "^1.0.0", "open-dyslexic": "^1.0.3", @@ -79,7 +79,7 @@ "patch-suggest": "^3.0.1", "patchbay-book": "^2.0.4", "patchbay-dark-crystal": "^2.0.0", - "patchbay-gatherings": "^3.2.14", + "patchbay-gatherings": "^3.2.19", "patchbay-hacky-art": "^1.0.0", "patchbay-poll": "^1.1.4", "patchbay-scry": "^1.5.0",