diff --git a/CHANGES.md b/CHANGES.md
index f948ab03a..0af307a76 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@
- #129: Add support for [XEP-0156: Disovering Alternative XMPP Connection Methods](https://xmpp.org/extensions/xep-0156.html). Only XML is supported for now.
- #1105: Support for storing persistent data in IndexedDB
+- #1322 Display occupants’ avatars in the occupants list
- #1640: Add the ability to resize the occupants sidebar in MUCs
- #1666: Allow scrolling of the OMEMO fingerprints list
- #1691: Fix `collection.chatbox is undefined` errors
diff --git a/package-lock.json b/package-lock.json
index 06940ad04..c85dcf1b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1010,9 +1010,9 @@
"dev": true
},
"glob": {
- "version": "7.1.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz",
- "integrity": "sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
"dev": true,
"requires": {
"fs.realpath": "^1.0.0",
@@ -1024,9 +1024,9 @@
}
},
"graceful-fs": {
- "version": "4.2.2",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
- "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+ "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
"dev": true
},
"lru-cache": {
@@ -1083,15 +1083,15 @@
"dev": true
},
"@lerna/add": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/add/-/add-3.18.0.tgz",
- "integrity": "sha512-Z5EaQbBnJn1LEPb0zb0Q2o9T8F8zOnlCsj6JYpY6aSke17UUT7xx0QMN98iBK+ueUHKjN/vdFdYlNCYRSIdujA==",
+ "version": "3.19.0",
+ "resolved": "https://registry.npmjs.org/@lerna/add/-/add-3.19.0.tgz",
+ "integrity": "sha512-qzhxPyoczvvT1W0wwCK9I0iJ4B9WR+HzYsusmRuzM3mEhWjowhbuvKEl5BjGYuXc9AvEErM/S0Fm5K0RcuS39Q==",
"dev": true,
"requires": {
"@evocateur/pacote": "^9.6.3",
- "@lerna/bootstrap": "3.18.0",
- "@lerna/command": "3.18.0",
- "@lerna/filter-options": "3.18.0",
+ "@lerna/bootstrap": "3.18.5",
+ "@lerna/command": "3.18.5",
+ "@lerna/filter-options": "3.18.4",
"@lerna/npm-conf": "3.16.0",
"@lerna/validation-error": "3.13.0",
"dedent": "^0.7.0",
@@ -1109,20 +1109,20 @@
}
},
"@lerna/bootstrap": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.18.0.tgz",
- "integrity": "sha512-3DZKWIaKvr7sUImoKqSz6eqn84SsOVMnA5QHwgzXiQjoeZ/5cg9x2r+Xj3+3w/lvLoh0j8U2GNtrIaPNis4bKQ==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.18.5.tgz",
+ "integrity": "sha512-9vD/BfCz8YSF2Dx7sHaMVo6Cy33WjLEmoN1yrHgNkHjm7ykWbLHG5wru0f4Y4pvwa0s5Hf76rvT8aJWzGHk9IQ==",
"dev": true,
"requires": {
- "@lerna/command": "3.18.0",
- "@lerna/filter-options": "3.18.0",
+ "@lerna/command": "3.18.5",
+ "@lerna/filter-options": "3.18.4",
"@lerna/has-npm-version": "3.16.5",
"@lerna/npm-install": "3.16.5",
- "@lerna/package-graph": "3.18.0",
+ "@lerna/package-graph": "3.18.5",
"@lerna/pulse-till-done": "3.13.0",
"@lerna/rimraf-dir": "3.16.5",
"@lerna/run-lifecycle": "3.16.2",
- "@lerna/run-topologically": "3.18.0",
+ "@lerna/run-topologically": "3.18.5",
"@lerna/symlink-binary": "3.17.0",
"@lerna/symlink-dependencies": "3.17.0",
"@lerna/validation-error": "3.13.0",
@@ -1148,16 +1148,15 @@
}
},
"@lerna/changed": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/changed/-/changed-3.18.0.tgz",
- "integrity": "sha512-caur6qjNXIZmBwJts6gkWfl5A1MlSq4/p8lAABuZ7fsEIkgoeoTVvMIDvEcYiVSGdVV/WJZGgG3kU+MTBIv/Bg==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/changed/-/changed-3.18.5.tgz",
+ "integrity": "sha512-IXS7VZ5VDQUfCsgK56WYxd42luMBxL456cNUf1yBgQ1cy1U2FPVMitIdLN4AcP7bJizdPWeG8yDptf47jN/xVw==",
"dev": true,
"requires": {
"@lerna/collect-updates": "3.18.0",
- "@lerna/command": "3.18.0",
- "@lerna/listable": "3.18.0",
- "@lerna/output": "3.13.0",
- "@lerna/version": "3.18.0"
+ "@lerna/command": "3.18.5",
+ "@lerna/listable": "3.18.5",
+ "@lerna/output": "3.13.0"
}
},
"@lerna/check-working-tree": {
@@ -1183,14 +1182,14 @@
}
},
"@lerna/clean": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/clean/-/clean-3.18.0.tgz",
- "integrity": "sha512-BiwBELZNkarRQqj+v5NPB1aIzsOX+Y5jkZ9a5UbwHzEdBUQ5lQa0qaMLSOve/fSkaiZQxe6qnTyatN75lOcDMg==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/clean/-/clean-3.18.5.tgz",
+ "integrity": "sha512-tHxOj9frTIhB/H2gtgMU3xpIc4IJEhXcUlReko6RJt8TTiDZGPDudCcgjg6i7n15v9jXMOc1y4F+y5/1089bfA==",
"dev": true,
"requires": {
- "@lerna/command": "3.18.0",
- "@lerna/filter-options": "3.18.0",
- "@lerna/prompt": "3.13.0",
+ "@lerna/command": "3.18.5",
+ "@lerna/filter-options": "3.18.4",
+ "@lerna/prompt": "3.18.5",
"@lerna/pulse-till-done": "3.13.0",
"@lerna/rimraf-dir": "3.16.5",
"p-map": "^2.1.0",
@@ -1199,15 +1198,15 @@
}
},
"@lerna/cli": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/cli/-/cli-3.18.0.tgz",
- "integrity": "sha512-AwDyfGx7fxJgeaZllEuyJ9LZ6Tdv9yqRD9RX762yCJu+PCAFvB9bp6OYuRSGli7QQgM0CuOYnSg4xVNOmuGKDA==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/cli/-/cli-3.18.5.tgz",
+ "integrity": "sha512-erkbxkj9jfc89vVs/jBLY/fM0I80oLmJkFUV3Q3wk9J3miYhP14zgVEBsPZY68IZlEjT6T3Xlq2xO1AVaatHsA==",
"dev": true,
"requires": {
"@lerna/global-options": "3.13.0",
"dedent": "^0.7.0",
"npmlog": "^4.1.2",
- "yargs": "^14.2.0"
+ "yargs": "^14.2.2"
},
"dependencies": {
"ansi-regex": {
@@ -1216,12 +1215,6 @@
"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
"dev": true
},
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
- "dev": true
- },
"cliui": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -1233,55 +1226,12 @@
"wrap-ansi": "^5.1.0"
}
},
- "find-up": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
- "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
- "dev": true,
- "requires": {
- "locate-path": "^3.0.0"
- }
- },
"get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
"dev": true
},
- "locate-path": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
- "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
- "dev": true,
- "requires": {
- "p-locate": "^3.0.0",
- "path-exists": "^3.0.0"
- }
- },
- "p-limit": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
- "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
- "dev": 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==",
- "dev": true,
- "requires": {
- "p-limit": "^2.0.0"
- }
- },
- "p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
- "dev": true
- },
"require-main-filename": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
@@ -1320,9 +1270,9 @@
}
},
"yargs": {
- "version": "14.2.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.0.tgz",
- "integrity": "sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg==",
+ "version": "14.2.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.2.tgz",
+ "integrity": "sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==",
"dev": true,
"requires": {
"cliui": "^5.0.0",
@@ -1376,27 +1326,55 @@
}
},
"@lerna/command": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/command/-/command-3.18.0.tgz",
- "integrity": "sha512-JQ0TGzuZc9Ky8xtwtSLywuvmkU8X62NTUT3rMNrUykIkOxBaO+tE0O98u2yo/9BYOeTRji9IsjKZEl5i9Qt0xQ==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/command/-/command-3.18.5.tgz",
+ "integrity": "sha512-36EnqR59yaTU4HrR1C9XDFti2jRx0BgpIUBeWn129LZZB8kAB3ov1/dJNa1KcNRKp91DncoKHLY99FZ6zTNpMQ==",
"dev": true,
"requires": {
"@lerna/child-process": "3.16.5",
- "@lerna/package-graph": "3.18.0",
+ "@lerna/package-graph": "3.18.5",
"@lerna/project": "3.18.0",
"@lerna/validation-error": "3.13.0",
"@lerna/write-log-file": "3.13.0",
+ "clone-deep": "^4.0.1",
"dedent": "^0.7.0",
"execa": "^1.0.0",
"is-ci": "^2.0.0",
- "lodash": "^4.17.14",
"npmlog": "^4.1.2"
+ },
+ "dependencies": {
+ "clone-deep": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+ "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+ "dev": true,
+ "requires": {
+ "is-plain-object": "^2.0.4",
+ "kind-of": "^6.0.2",
+ "shallow-clone": "^3.0.0"
+ }
+ },
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
+ },
+ "shallow-clone": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+ "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+ "dev": true,
+ "requires": {
+ "kind-of": "^6.0.2"
+ }
+ }
}
},
"@lerna/conventional-commits": {
- "version": "3.16.4",
- "resolved": "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.16.4.tgz",
- "integrity": "sha512-QSZJ0bC9n6FVaf+7KDIq5zMv8WnHXnwhyL5jG1Nyh3SgOg9q2uflqh7YsYB+G6FwaRfnPaKosh6obijpYg0llA==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.18.5.tgz",
+ "integrity": "sha512-qcvXIEJ3qSgalxXnQ7Yxp5H9Ta5TVyai6vEor6AAEHc20WiO7UIdbLDCxBtiiHMdGdpH85dTYlsoYUwsCJu3HQ==",
"dev": true,
"requires": {
"@lerna/validation-error": "3.13.0",
@@ -1421,14 +1399,14 @@
}
},
"@lerna/create": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/create/-/create-3.18.0.tgz",
- "integrity": "sha512-y9oS7ND5T13c+cCTJHa2Y9in02ppzyjsNynVWFuS40eIzZ3z058d9+3qSBt1nkbbQlVyfLoP6+bZPsjyzap5ig==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/create/-/create-3.18.5.tgz",
+ "integrity": "sha512-cHpjocbpKmLopCuZFI7cKEM3E/QY8y+yC7VtZ4FQRSaLU8D8i2xXtXmYaP1GOlVNavji0iwoXjuNpnRMInIr2g==",
"dev": true,
"requires": {
"@evocateur/pacote": "^9.6.3",
"@lerna/child-process": "3.16.5",
- "@lerna/command": "3.18.0",
+ "@lerna/command": "3.18.5",
"@lerna/npm-conf": "3.16.0",
"@lerna/validation-error": "3.13.0",
"camelcase": "^5.0.0",
@@ -1446,12 +1424,6 @@
"whatwg-url": "^7.0.0"
},
"dependencies": {
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
- "dev": true
- },
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -1482,35 +1454,35 @@
}
},
"@lerna/diff": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/diff/-/diff-3.18.0.tgz",
- "integrity": "sha512-3iLNlpurc2nV9k22w8ini2Zjm2UPo3xtQgWyqdA6eJjvge0+5AlNAWfPoV6cV+Hc1xDbJD2YDSFpZPJ1ZGilRw==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/diff/-/diff-3.18.5.tgz",
+ "integrity": "sha512-u90lGs+B8DRA9Z/2xX4YaS3h9X6GbypmGV6ITzx9+1Ga12UWGTVlKaCXBgONMBjzJDzAQOK8qPTwLA57SeBLgA==",
"dev": true,
"requires": {
"@lerna/child-process": "3.16.5",
- "@lerna/command": "3.18.0",
+ "@lerna/command": "3.18.5",
"@lerna/validation-error": "3.13.0",
"npmlog": "^4.1.2"
}
},
"@lerna/exec": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/exec/-/exec-3.18.0.tgz",
- "integrity": "sha512-hwkuzg1+38+pbzdZPhGtLIYJ59z498/BCNzR8d4/nfMYm8lFbw9RgJJajLcdbuJ9LJ08cZ93hf8OlzetL84TYg==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/exec/-/exec-3.18.5.tgz",
+ "integrity": "sha512-Q1nz95MeAxctS9bF+aG8FkjixzqEjRpg6ujtnDW84J42GgxedkPtNcJ2o/MBqLd/mxAlr+fW3UZ6CPC/zgoyCg==",
"dev": true,
"requires": {
"@lerna/child-process": "3.16.5",
- "@lerna/command": "3.18.0",
- "@lerna/filter-options": "3.18.0",
- "@lerna/run-topologically": "3.18.0",
+ "@lerna/command": "3.18.5",
+ "@lerna/filter-options": "3.18.4",
+ "@lerna/run-topologically": "3.18.5",
"@lerna/validation-error": "3.13.0",
"p-map": "^2.1.0"
}
},
"@lerna/filter-options": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.18.0.tgz",
- "integrity": "sha512-UGVcixs3TGzD8XSmFSbwUVVQnAjaZ6Rmt8Vuq2RcR98ULkGB1LiGNMY89XaNBhaaA8vx7yQWiLmJi2AfmD63Qg==",
+ "version": "3.18.4",
+ "resolved": "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.18.4.tgz",
+ "integrity": "sha512-4giVQD6tauRwweO/322LP2gfVDOVrt/xN4khkXyfkJDfcsZziFXq+668otD9KSLL8Ps+To4Fah3XbK0MoNuEvA==",
"dev": true,
"requires": {
"@lerna/collect-updates": "3.18.0",
@@ -1600,14 +1572,14 @@
}
},
"@lerna/import": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/import/-/import-3.18.0.tgz",
- "integrity": "sha512-2pYIkkBTZsEdccfc+dPsKZeSw3tBzKSyl0b2lGrfmNX2Y41qqOzsJCyI1WO1uvEIP8aOaLy4hPpqRIBe4ee7hw==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/import/-/import-3.18.5.tgz",
+ "integrity": "sha512-PH0WVLEgp+ORyNKbGGwUcrueW89K3Iuk/DDCz8mFyG2IG09l/jOF0vzckEyGyz6PO5CMcz4TI1al/qnp3FrahQ==",
"dev": true,
"requires": {
"@lerna/child-process": "3.16.5",
- "@lerna/command": "3.18.0",
- "@lerna/prompt": "3.13.0",
+ "@lerna/command": "3.18.5",
+ "@lerna/prompt": "3.18.5",
"@lerna/pulse-till-done": "3.13.0",
"@lerna/validation-error": "3.13.0",
"dedent": "^0.7.0",
@@ -1616,50 +1588,50 @@
}
},
"@lerna/init": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/init/-/init-3.18.0.tgz",
- "integrity": "sha512-/vHpmXkMlSaJaq25v5K13mcs/2L7E32O6dSsEkHaZCDRiV2BOqsZng9jjbE/4ynfsWfLLlU9ZcydwG72C3I+mQ==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/init/-/init-3.18.5.tgz",
+ "integrity": "sha512-oCwipWrha98EcJAHm8AGd2YFFLNI7AW9AWi0/LbClj1+XY9ah+uifXIgYGfTk63LbgophDd8936ZEpHMxBsbAg==",
"dev": true,
"requires": {
"@lerna/child-process": "3.16.5",
- "@lerna/command": "3.18.0",
+ "@lerna/command": "3.18.5",
"fs-extra": "^8.1.0",
"p-map": "^2.1.0",
"write-json-file": "^3.2.0"
}
},
"@lerna/link": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/link/-/link-3.18.0.tgz",
- "integrity": "sha512-FbbIpH0EpsC+dpAbvxCoF3cn7F1MAyJjEa5Lh3XkDGATOlinMFuKCbmX0NLpOPQZ5zghvrui97cx+jz5F2IlHw==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/link/-/link-3.18.5.tgz",
+ "integrity": "sha512-xTN3vktJpkT7Nqc3QkZRtHO4bT5NvuLMtKNIBDkks0HpGxC9PRyyqwOoCoh1yOGbrWIuDezhfMg3Qow+6I69IQ==",
"dev": true,
"requires": {
- "@lerna/command": "3.18.0",
- "@lerna/package-graph": "3.18.0",
+ "@lerna/command": "3.18.5",
+ "@lerna/package-graph": "3.18.5",
"@lerna/symlink-dependencies": "3.17.0",
"p-map": "^2.1.0",
"slash": "^2.0.0"
}
},
"@lerna/list": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/list/-/list-3.18.0.tgz",
- "integrity": "sha512-mpB7Q6T+n2CaiPFz0LuOE+rXphDfHm0mKIwShnyS/XDcii8jXv+z9Iytj8p3rfCH2I1L80j2qL6jWzyGy/uzKA==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/list/-/list-3.18.5.tgz",
+ "integrity": "sha512-qIeomm28C2OCM8TMjEe/chTnQf6XLN54wPVQ6kZy+axMYxANFNt/uhs6GZEmhem7GEVawzkyHSz5ZJPsfH3IFg==",
"dev": true,
"requires": {
- "@lerna/command": "3.18.0",
- "@lerna/filter-options": "3.18.0",
- "@lerna/listable": "3.18.0",
+ "@lerna/command": "3.18.5",
+ "@lerna/filter-options": "3.18.4",
+ "@lerna/listable": "3.18.5",
"@lerna/output": "3.13.0"
}
},
"@lerna/listable": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/listable/-/listable-3.18.0.tgz",
- "integrity": "sha512-9gLGKYNLSKeurD+sJ2RA+nz4Ftulr91U127gefz0RlmAPpYSjwcJkxwa0UfJvpQTXv9C7yzHLnn0BjyAQRjuew==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/listable/-/listable-3.18.5.tgz",
+ "integrity": "sha512-Sdr3pVyaEv5A7ZkGGYR7zN+tTl2iDcinryBPvtuv20VJrXBE8wYcOks1edBTcOWsPjCE/rMP4bo1pseyk3UTsg==",
"dev": true,
"requires": {
- "@lerna/query-graph": "3.18.0",
+ "@lerna/query-graph": "3.18.5",
"chalk": "^2.3.1",
"columnify": "^1.5.4"
}
@@ -1687,13 +1659,13 @@
}
},
"@lerna/npm-dist-tag": {
- "version": "3.18.1",
- "resolved": "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.18.1.tgz",
- "integrity": "sha512-vWkZh2T/O9OjPLDrba0BTWO7ug/C3sCwjw7Qyk1aEbxMBXB/eEJPqirwJTWT+EtRJQYB01ky3K8ZFOhElVyjLw==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.18.5.tgz",
+ "integrity": "sha512-xw0HDoIG6HreVsJND9/dGls1c+lf6vhu7yJoo56Sz5bvncTloYGLUppIfDHQr4ZvmPCK8rsh0euCVh2giPxzKQ==",
"dev": true,
"requires": {
"@evocateur/npm-registry-fetch": "^4.0.0",
- "@lerna/otplease": "3.16.0",
+ "@lerna/otplease": "3.18.5",
"figgy-pudding": "^3.5.1",
"npm-package-arg": "^6.1.0",
"npmlog": "^4.1.2"
@@ -1715,13 +1687,13 @@
}
},
"@lerna/npm-publish": {
- "version": "3.16.2",
- "resolved": "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.16.2.tgz",
- "integrity": "sha512-tGMb9vfTxP57vUV5svkBQxd5Tzc+imZbu9ZYf8Mtwe0+HYfDjNiiHLIQw7G95w4YRdc5KsCE8sQ0uSj+f2soIg==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.18.5.tgz",
+ "integrity": "sha512-3etLT9+2L8JAx5F8uf7qp6iAtOLSMj+ZYWY6oUgozPi/uLqU0/gsMsEXh3F0+YVW33q0M61RpduBoAlOOZnaTg==",
"dev": true,
"requires": {
"@evocateur/libnpmpublish": "^1.2.2",
- "@lerna/otplease": "3.16.0",
+ "@lerna/otplease": "3.18.5",
"@lerna/run-lifecycle": "3.16.2",
"figgy-pudding": "^3.5.1",
"fs-extra": "^8.1.0",
@@ -1743,12 +1715,12 @@
}
},
"@lerna/otplease": {
- "version": "3.16.0",
- "resolved": "https://registry.npmjs.org/@lerna/otplease/-/otplease-3.16.0.tgz",
- "integrity": "sha512-uqZ15wYOHC+/V0WnD2iTLXARjvx3vNrpiIeyIvVlDB7rWse9mL4egex/QSgZ+lDx1OID7l2kgvcUD9cFpbqB7Q==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/otplease/-/otplease-3.18.5.tgz",
+ "integrity": "sha512-S+SldXAbcXTEDhzdxYLU0ZBKuYyURP/ND2/dK6IpKgLxQYh/z4ScljPDMyKymmEvgiEJmBsPZAAPfmNPEzxjog==",
"dev": true,
"requires": {
- "@lerna/prompt": "3.13.0",
+ "@lerna/prompt": "3.18.5",
"figgy-pudding": "^3.5.1"
}
},
@@ -1789,9 +1761,9 @@
}
},
"@lerna/package-graph": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.18.0.tgz",
- "integrity": "sha512-BLYDHO5ihPh20i3zoXfLZ5ZWDCrPuGANgVhl7k5pCmRj90LCvT+C7V3zrw70fErGAfvkcYepMqxD+oBrAYwquQ==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.18.5.tgz",
+ "integrity": "sha512-8QDrR9T+dBegjeLr+n9WZTVxUYUhIUjUgZ0gvNxUBN8S1WB9r6H5Yk56/MVaB64tA3oGAN9IIxX6w0WvTfFudA==",
"dev": true,
"requires": {
"@lerna/prerelease-id-from-version": "3.16.0",
@@ -1867,9 +1839,9 @@
}
},
"@lerna/prompt": {
- "version": "3.13.0",
- "resolved": "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.13.0.tgz",
- "integrity": "sha512-P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.18.5.tgz",
+ "integrity": "sha512-rkKj4nm1twSbBEb69+Em/2jAERK8htUuV8/xSjN0NPC+6UjzAwY52/x9n5cfmpa9lyKf/uItp7chCI7eDmNTKQ==",
"dev": true,
"requires": {
"inquirer": "^6.2.0",
@@ -1877,9 +1849,9 @@
}
},
"@lerna/publish": {
- "version": "3.18.1",
- "resolved": "https://registry.npmjs.org/@lerna/publish/-/publish-3.18.1.tgz",
- "integrity": "sha512-3u65cMBkq24U8l7pQaZgdIAh2NO1Iw/sladW6/VBwFMcACwBBwEWm2LnrGStsB5Yijg3f+0NK1sT72xrzBpbag==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/publish/-/publish-3.18.5.tgz",
+ "integrity": "sha512-ifYqLX6mvw95T8vYRlhT68UC7Al0flQvnf5uF9lDgdrgR5Bs+BTwzk3D+0ctdqMtfooekrV6pqfW0R3gtwRffQ==",
"dev": true,
"requires": {
"@evocateur/libnpmaccess": "^3.1.2",
@@ -1888,22 +1860,22 @@
"@lerna/check-working-tree": "3.16.5",
"@lerna/child-process": "3.16.5",
"@lerna/collect-updates": "3.18.0",
- "@lerna/command": "3.18.0",
+ "@lerna/command": "3.18.5",
"@lerna/describe-ref": "3.16.5",
"@lerna/log-packed": "3.16.0",
"@lerna/npm-conf": "3.16.0",
- "@lerna/npm-dist-tag": "3.18.1",
- "@lerna/npm-publish": "3.16.2",
- "@lerna/otplease": "3.16.0",
+ "@lerna/npm-dist-tag": "3.18.5",
+ "@lerna/npm-publish": "3.18.5",
+ "@lerna/otplease": "3.18.5",
"@lerna/output": "3.13.0",
"@lerna/pack-directory": "3.16.4",
"@lerna/prerelease-id-from-version": "3.16.0",
- "@lerna/prompt": "3.13.0",
+ "@lerna/prompt": "3.18.5",
"@lerna/pulse-till-done": "3.13.0",
"@lerna/run-lifecycle": "3.16.2",
- "@lerna/run-topologically": "3.18.0",
+ "@lerna/run-topologically": "3.18.5",
"@lerna/validation-error": "3.13.0",
- "@lerna/version": "3.18.0",
+ "@lerna/version": "3.18.5",
"figgy-pudding": "^3.5.1",
"fs-extra": "^8.1.0",
"npm-package-arg": "^6.1.0",
@@ -1932,12 +1904,12 @@
}
},
"@lerna/query-graph": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-3.18.0.tgz",
- "integrity": "sha512-fgUhLx6V0jDuKZaKj562jkuuhrfVcjl5sscdfttJ8dXNVADfDz76nzzwLY0ZU7/0m69jDedohn5Fx5p7hDEVEg==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-3.18.5.tgz",
+ "integrity": "sha512-50Lf4uuMpMWvJ306be3oQDHrWV42nai9gbIVByPBYJuVW8dT8O8pA3EzitNYBUdLL9/qEVbrR0ry1HD7EXwtRA==",
"dev": true,
"requires": {
- "@lerna/package-graph": "3.18.0",
+ "@lerna/package-graph": "3.18.5",
"figgy-pudding": "^3.5.1"
}
},
@@ -1965,16 +1937,16 @@
}
},
"@lerna/run": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/run/-/run-3.18.0.tgz",
- "integrity": "sha512-sblxHBZ9djaaG7wefPcfEicDqzrB7CP1m/jIB0JvPEQwG4C2qp++ewBpkjRw/mBtjtzg0t7v0nNMXzaWYrQckQ==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/run/-/run-3.18.5.tgz",
+ "integrity": "sha512-1S0dZccNJO8+gT5ztYE4rHTEnbXVwThHOfDnlVt2KDxl9cbnBALk3xprGLW7lSzJsxegS849hxrAPUh0UorMgw==",
"dev": true,
"requires": {
- "@lerna/command": "3.18.0",
- "@lerna/filter-options": "3.18.0",
+ "@lerna/command": "3.18.5",
+ "@lerna/filter-options": "3.18.4",
"@lerna/npm-run-script": "3.16.5",
"@lerna/output": "3.13.0",
- "@lerna/run-topologically": "3.18.0",
+ "@lerna/run-topologically": "3.18.5",
"@lerna/timer": "3.13.0",
"@lerna/validation-error": "3.13.0",
"p-map": "^2.1.0"
@@ -1993,12 +1965,12 @@
}
},
"@lerna/run-topologically": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-3.18.0.tgz",
- "integrity": "sha512-lrfEewwuUMC3ioxf9Z9NdHUakN6ihekcPfdYbzR2slmdbjYKmIA5srkWdrK8NwOpQCAuekpOovH2s8X3FGEopg==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-3.18.5.tgz",
+ "integrity": "sha512-6N1I+6wf4hLOnPW+XDZqwufyIQ6gqoPfHZFkfWlvTQ+Ue7CuF8qIVQ1Eddw5HKQMkxqN10thKOFfq/9NQZ4NUg==",
"dev": true,
"requires": {
- "@lerna/query-graph": "3.18.0",
+ "@lerna/query-graph": "3.18.5",
"figgy-pudding": "^3.5.1",
"p-queue": "^4.0.0"
}
@@ -2046,26 +2018,27 @@
}
},
"@lerna/version": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/version/-/version-3.18.0.tgz",
- "integrity": "sha512-mGw5EoQ8wXyofJIHEWNsNWqnTsXlgVvsqePyKkUZTZCsG54ez0ZKpU87EgirxXvj+QDyKgB7X5Dz1hftaX5PSw==",
+ "version": "3.18.5",
+ "resolved": "https://registry.npmjs.org/@lerna/version/-/version-3.18.5.tgz",
+ "integrity": "sha512-eSMxLIDuVxZIq0JZKNih50x1IZuMmViwF59uwOGMx0hHB84N3waE8HXOF9CJXDSjeP6sHB8tS+Y+X5fFpBop2Q==",
"dev": true,
"requires": {
"@lerna/check-working-tree": "3.16.5",
"@lerna/child-process": "3.16.5",
"@lerna/collect-updates": "3.18.0",
- "@lerna/command": "3.18.0",
- "@lerna/conventional-commits": "3.16.4",
+ "@lerna/command": "3.18.5",
+ "@lerna/conventional-commits": "3.18.5",
"@lerna/github-client": "3.16.5",
"@lerna/gitlab-client": "3.15.0",
"@lerna/output": "3.13.0",
"@lerna/prerelease-id-from-version": "3.16.0",
- "@lerna/prompt": "3.13.0",
+ "@lerna/prompt": "3.18.5",
"@lerna/run-lifecycle": "3.16.2",
- "@lerna/run-topologically": "3.18.0",
+ "@lerna/run-topologically": "3.18.5",
"@lerna/validation-error": "3.13.0",
"chalk": "^2.3.1",
"dedent": "^0.7.0",
+ "load-json-file": "^5.3.0",
"minimatch": "^3.0.4",
"npmlog": "^4.1.2",
"p-map": "^2.1.0",
@@ -2074,7 +2047,8 @@
"p-waterfall": "^1.0.0",
"semver": "^6.2.0",
"slash": "^2.0.0",
- "temp-write": "^3.4.0"
+ "temp-write": "^3.4.0",
+ "write-json-file": "^3.2.0"
},
"dependencies": {
"semver": {
@@ -2112,11 +2086,12 @@
"dev": true
},
"@octokit/endpoint": {
- "version": "5.4.1",
- "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.4.1.tgz",
- "integrity": "sha512-iwn46orWg3F4iqIzAVRfbzhnROyx7BQ7zJE0B7SEeaMIBvk3qmWtswtRk14QkMNUuNiCHQ6mAM00VJxWqrdM1g==",
+ "version": "5.5.1",
+ "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.1.tgz",
+ "integrity": "sha512-nBFhRUb5YzVTCX/iAK1MgQ4uWo89Gu0TH00qQHoYRCsE12dWcG1OiLd7v2EIo2+tpUKPMOQ62QFy9hy9Vg2ULg==",
"dev": true,
"requires": {
+ "@octokit/types": "^2.0.0",
"is-plain-object": "^3.0.0",
"universal-user-agent": "^4.0.0"
},
@@ -2145,13 +2120,14 @@
"dev": true
},
"@octokit/request": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.2.1.tgz",
- "integrity": "sha512-onjQo4QKyiMAqLM6j3eH8vWw1LEfNCpoZUl6a+TrZVJM1wysBC8F0GhK9K/Vc9UsScSmVs2bstOVD34xpQ2wqQ==",
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.3.1.tgz",
+ "integrity": "sha512-5/X0AL1ZgoU32fAepTfEoggFinO3rxsMLtzhlUX+RctLrusn/CApJuGFCd0v7GMFhF+8UiCsTTfsu7Fh1HnEJg==",
"dev": true,
"requires": {
- "@octokit/endpoint": "^5.1.0",
+ "@octokit/endpoint": "^5.5.0",
"@octokit/request-error": "^1.0.1",
+ "@octokit/types": "^2.0.0",
"deprecation": "^2.0.0",
"is-plain-object": "^3.0.0",
"node-fetch": "^2.3.0",
@@ -2177,19 +2153,20 @@
}
},
"@octokit/request-error": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.0.4.tgz",
- "integrity": "sha512-L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.0.tgz",
+ "integrity": "sha512-DNBhROBYjjV/I9n7A8kVkmQNkqFAMem90dSxqvPq57e2hBr7mNTX98y3R2zDpqMQHVRpBDjsvsfIGgBzy+4PAg==",
"dev": true,
"requires": {
+ "@octokit/types": "^2.0.0",
"deprecation": "^2.0.0",
"once": "^1.4.0"
}
},
"@octokit/rest": {
- "version": "16.33.1",
- "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.33.1.tgz",
- "integrity": "sha512-lOQ+fJZwkeJ/1PRTdnY1uNja01aKOMioRhQfZtei64gZMXIX3EAfF4koMQMvoLFwsnVBu3ifj1JW1WAAKdXcnA==",
+ "version": "16.35.0",
+ "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.35.0.tgz",
+ "integrity": "sha512-9ShFqYWo0CLoGYhA1FdtdykJuMzS/9H6vSbbQWDX4pWr4p9v+15MsH/wpd/3fIU+tSxylaNO48+PIHqOkBRx3w==",
"dev": true,
"requires": {
"@octokit/request": "^5.2.0",
@@ -2206,6 +2183,15 @@
"universal-user-agent": "^4.0.0"
}
},
+ "@octokit/types": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.0.2.tgz",
+ "integrity": "sha512-StASIL2lgT3TRjxv17z9pAqbnI7HGu9DrJlg3sEBFfCLaMEqp+O3IQPUF6EZtQ4xkAu2ml6kMBBCtGxjvmtmuQ==",
+ "dev": true,
+ "requires": {
+ "@types/node": ">= 8"
+ }
+ },
"@sinonjs/commons": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.4.0.tgz",
@@ -3611,9 +3597,9 @@
}
},
"camelcase": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
- "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
"dev": true
},
"camelcase-keys": {
@@ -3625,6 +3611,14 @@
"camelcase": "^4.1.0",
"map-obj": "^2.0.0",
"quick-lru": "^1.0.0"
+ },
+ "dependencies": {
+ "camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "dev": true
+ }
}
},
"caniuse-lite": {
@@ -4061,9 +4055,9 @@
"dev": true
},
"conventional-changelog-angular": {
- "version": "5.0.5",
- "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.5.tgz",
- "integrity": "sha512-RrkdWnL/TVyWV1ayWmSsrWorsTDqjL/VwG5ZSEneBQrd65ONcfeA1cW7FLtNweQyMiKOyriCMTKRSlk18DjTrw==",
+ "version": "5.0.6",
+ "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz",
+ "integrity": "sha512-QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA==",
"dev": true,
"requires": {
"compare-func": "^1.3.1",
@@ -4103,15 +4097,15 @@
}
},
"conventional-changelog-preset-loader": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.2.0.tgz",
- "integrity": "sha512-zXB+5vF7D5Y3Cb/rJfSyCCvFphCVmF8mFqOdncX3BmjZwAtGAPfYrBcT225udilCKvBbHgyzgxqz2GWDB5xShQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.0.tgz",
+ "integrity": "sha512-/rHb32J2EJnEXeK4NpDgMaAVTFZS3o1ExmjKMtYVgIC4MQn0vkNSbYpdGRotkfGGRWiqk3Ri3FBkiZGbAfIfOQ==",
"dev": true
},
"conventional-changelog-writer": {
- "version": "4.0.9",
- "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.9.tgz",
- "integrity": "sha512-2Y3QfiAM37WvDMjkVNaRtZgxVzWKj73HE61YQ/95T53yle+CRwTVSl6Gbv/lWVKXeZcM5af9n9TDVf0k7Xh+cw==",
+ "version": "4.0.11",
+ "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.11.tgz",
+ "integrity": "sha512-g81GQOR392I+57Cw3IyP1f+f42ME6aEkbR+L7v1FBBWolB0xkjKTeCWVguzRrp6UiT1O6gBpJbEy2eq7AnV1rw==",
"dev": true,
"requires": {
"compare-func": "^1.3.1",
@@ -4119,8 +4113,8 @@
"dateformat": "^3.0.0",
"handlebars": "^4.4.0",
"json-stringify-safe": "^5.0.1",
- "lodash": "^4.2.1",
- "meow": "^4.0.0",
+ "lodash": "^4.17.15",
+ "meow": "^5.0.0",
"semver": "^6.0.0",
"split": "^1.0.0",
"through2": "^3.0.0"
@@ -4154,15 +4148,15 @@
}
},
"conventional-commits-parser": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.5.tgz",
- "integrity": "sha512-qVz9+5JwdJzsbt7JbJ6P7NOXBGt8CyLFJYSjKAuPSgO+5UGfcsbk9EMR+lI8Unlvx6qwIc2YDJlrGIfay2ehNA==",
+ "version": "3.0.8",
+ "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz",
+ "integrity": "sha512-YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ==",
"dev": true,
"requires": {
"JSONStream": "^1.0.4",
- "is-text-path": "^2.0.0",
- "lodash": "^4.2.1",
- "meow": "^4.0.0",
+ "is-text-path": "^1.0.1",
+ "lodash": "^4.17.15",
+ "meow": "^5.0.0",
"split2": "^2.0.0",
"through2": "^3.0.0",
"trim-off-newlines": "^1.0.0"
@@ -4207,6 +4201,23 @@
"typedarray": "^0.0.6"
}
},
+ "meow": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+ "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+ "dev": true,
+ "requires": {
+ "camelcase-keys": "^4.0.0",
+ "decamelize-keys": "^1.0.0",
+ "loud-rejection": "^1.0.0",
+ "minimist": "^1.1.3",
+ "minimist-options": "^3.0.1",
+ "normalize-package-data": "^2.3.4",
+ "read-pkg-up": "^3.0.0",
+ "redent": "^2.0.0",
+ "trim-newlines": "^2.0.0"
+ }
+ },
"readable-stream": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
@@ -6147,12 +6158,12 @@
}
},
"find-up": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
- "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
"dev": true,
"requires": {
- "locate-path": "^2.0.0"
+ "locate-path": "^3.0.0"
}
},
"findup-sync": {
@@ -6325,9 +6336,9 @@
},
"dependencies": {
"graceful-fs": {
- "version": "4.2.2",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
- "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+ "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
}
}
},
@@ -7277,6 +7288,25 @@
"meow": "^4.0.0",
"split2": "^2.0.0",
"through2": "^2.0.0"
+ },
+ "dependencies": {
+ "meow": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+ "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+ "dev": true,
+ "requires": {
+ "camelcase-keys": "^4.0.0",
+ "decamelize-keys": "^1.0.0",
+ "loud-rejection": "^1.0.0",
+ "minimist": "^1.1.3",
+ "minimist-options": "^3.0.1",
+ "normalize-package-data": "^2.3.4",
+ "read-pkg-up": "^3.0.0",
+ "redent": "^2.0.0",
+ "trim-newlines": "^2.0.0"
+ }
+ }
}
},
"git-remote-origin-url": {
@@ -7307,6 +7337,23 @@
"semver": "^6.0.0"
},
"dependencies": {
+ "meow": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+ "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+ "dev": true,
+ "requires": {
+ "camelcase-keys": "^4.0.0",
+ "decamelize-keys": "^1.0.0",
+ "loud-rejection": "^1.0.0",
+ "minimist": "^1.1.3",
+ "minimist-options": "^3.0.1",
+ "normalize-package-data": "^2.3.4",
+ "read-pkg-up": "^3.0.0",
+ "redent": "^2.0.0",
+ "trim-newlines": "^2.0.0"
+ }
+ },
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -7468,9 +7515,9 @@
},
"dependencies": {
"glob": {
- "version": "7.1.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz",
- "integrity": "sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
"dev": true,
"requires": {
"fs.realpath": "^1.0.0",
@@ -7506,9 +7553,9 @@
"dev": true
},
"handlebars": {
- "version": "4.4.5",
- "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.5.tgz",
- "integrity": "sha512-0Ce31oWVB7YidkaTq33ZxEbN+UDxMMgThvCe8ptgQViymL5DPis9uLdTA13MiRPhgvqyxIegugrP97iK3JeBHg==",
+ "version": "4.5.3",
+ "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz",
+ "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==",
"dev": true,
"requires": {
"neo-async": "^2.6.0",
@@ -7895,9 +7942,9 @@
"dev": true
},
"https-proxy-agent": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz",
- "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==",
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+ "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
"dev": true,
"requires": {
"agent-base": "^4.3.0",
@@ -8425,12 +8472,12 @@
}
},
"is-text-path": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz",
- "integrity": "sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
+ "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
"dev": true,
"requires": {
- "text-extensions": "^2.0.0"
+ "text-extensions": "^1.0.0"
}
},
"is-typedarray": {
@@ -8703,26 +8750,26 @@
}
},
"lerna": {
- "version": "3.18.1",
- "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.18.1.tgz",
- "integrity": "sha512-+EAAEgGl+oNeI1TBBW2btHp7NtpCrsRQET/NNCMRyVsl9/8a322t/WcpO9sCsAyEAITBXfhlRVB9rYifFQ6gNA==",
+ "version": "3.19.0",
+ "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.19.0.tgz",
+ "integrity": "sha512-YtMmwEqzWHQCh7Ynk7BvjrZri3EkSeVqTAcwZIqWlv9V/dCfvFPyRqp+2NIjPB5nj1FWXLRH6F05VT/qvzuuOA==",
"dev": true,
"requires": {
- "@lerna/add": "3.18.0",
- "@lerna/bootstrap": "3.18.0",
- "@lerna/changed": "3.18.0",
- "@lerna/clean": "3.18.0",
- "@lerna/cli": "3.18.0",
- "@lerna/create": "3.18.0",
- "@lerna/diff": "3.18.0",
- "@lerna/exec": "3.18.0",
- "@lerna/import": "3.18.0",
- "@lerna/init": "3.18.0",
- "@lerna/link": "3.18.0",
- "@lerna/list": "3.18.0",
- "@lerna/publish": "3.18.1",
- "@lerna/run": "3.18.0",
- "@lerna/version": "3.18.0",
+ "@lerna/add": "3.19.0",
+ "@lerna/bootstrap": "3.18.5",
+ "@lerna/changed": "3.18.5",
+ "@lerna/clean": "3.18.5",
+ "@lerna/cli": "3.18.5",
+ "@lerna/create": "3.18.5",
+ "@lerna/diff": "3.18.5",
+ "@lerna/exec": "3.18.5",
+ "@lerna/import": "3.18.5",
+ "@lerna/init": "3.18.5",
+ "@lerna/link": "3.18.5",
+ "@lerna/list": "3.18.5",
+ "@lerna/publish": "3.18.5",
+ "@lerna/run": "3.18.5",
+ "@lerna/version": "3.18.5",
"import-local": "^2.0.0",
"npmlog": "^4.1.2"
}
@@ -8768,9 +8815,9 @@
},
"dependencies": {
"graceful-fs": {
- "version": "4.2.2",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
- "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+ "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
"dev": true
}
}
@@ -8801,12 +8848,12 @@
}
},
"locate-path": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
- "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
"dev": true,
"requires": {
- "p-locate": "^2.0.0",
+ "p-locate": "^3.0.0",
"path-exists": "^3.0.0"
}
},
@@ -8978,16 +9025,16 @@
}
},
"make-fetch-happen": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz",
- "integrity": "sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA==",
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
+ "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
"dev": true,
"requires": {
"agentkeepalive": "^3.4.1",
"cacache": "^12.0.0",
"http-cache-semantics": "^3.8.1",
"http-proxy-agent": "^2.1.0",
- "https-proxy-agent": "^2.2.1",
+ "https-proxy-agent": "^2.2.3",
"lru-cache": "^5.1.1",
"mississippi": "^3.0.0",
"node-fetch-npm": "^2.0.2",
@@ -9020,9 +9067,9 @@
}
},
"glob": {
- "version": "7.1.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz",
- "integrity": "sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
"dev": true,
"requires": {
"fs.realpath": "^1.0.0",
@@ -9034,9 +9081,9 @@
}
},
"graceful-fs": {
- "version": "4.2.2",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
- "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+ "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
"dev": true
},
"lru-cache": {
@@ -9187,20 +9234,37 @@
}
},
"meow": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
- "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz",
+ "integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==",
"dev": true,
"requires": {
"camelcase-keys": "^4.0.0",
"decamelize-keys": "^1.0.0",
"loud-rejection": "^1.0.0",
- "minimist": "^1.1.3",
"minimist-options": "^3.0.1",
"normalize-package-data": "^2.3.4",
"read-pkg-up": "^3.0.0",
"redent": "^2.0.0",
- "trim-newlines": "^2.0.0"
+ "trim-newlines": "^2.0.0",
+ "yargs-parser": "^10.0.0"
+ },
+ "dependencies": {
+ "camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "dev": true
+ },
+ "yargs-parser": {
+ "version": "10.1.0",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+ "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+ "dev": true,
+ "requires": {
+ "camelcase": "^4.1.0"
+ }
+ }
}
},
"merge-descriptors": {
@@ -13999,9 +14063,9 @@
},
"dependencies": {
"graceful-fs": {
- "version": "4.2.2",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
- "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+ "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
"dev": true
},
"which": {
@@ -14381,21 +14445,21 @@
"dev": true
},
"p-limit": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
- "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
"dev": true,
"requires": {
- "p-try": "^1.0.0"
+ "p-try": "^2.0.0"
}
},
"p-locate": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
- "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+ "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==",
"dev": true,
"requires": {
- "p-limit": "^1.1.0"
+ "p-limit": "^2.0.0"
}
},
"p-map": {
@@ -14452,9 +14516,9 @@
}
},
"p-try": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
- "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
"dev": true
},
"p-waterfall": {
@@ -15297,9 +15361,9 @@
}
},
"read-cmd-shim": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.4.tgz",
- "integrity": "sha512-Pqpl3qJ/QdOIjRYA0q5DND/gLvGOfpIz/fYVDGYpOXfW/lFrIttmLsBnd6IkyK10+JHU9zhsaudfvrQTBB9YFQ==",
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz",
+ "integrity": "sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA==",
"dev": true,
"requires": {
"graceful-fs": "^4.1.2"
@@ -15376,6 +15440,51 @@
"requires": {
"find-up": "^2.0.0",
"read-pkg": "^3.0.0"
+ },
+ "dependencies": {
+ "find-up": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "dev": true,
+ "requires": {
+ "locate-path": "^2.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+ "dev": true,
+ "requires": {
+ "p-locate": "^2.0.0",
+ "path-exists": "^3.0.0"
+ }
+ },
+ "p-limit": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+ "dev": true,
+ "requires": {
+ "p-try": "^1.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+ "dev": true,
+ "requires": {
+ "p-limit": "^1.1.0"
+ }
+ },
+ "p-try": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+ "dev": true
+ }
}
},
"readable-stream": {
@@ -16352,9 +16461,9 @@
"dev": true
},
"smart-buffer": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.2.tgz",
- "integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
+ "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==",
"dev": true
},
"snabbdom": {
@@ -16525,13 +16634,13 @@
}
},
"socks": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz",
- "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==",
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
+ "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
"dev": true,
"requires": {
- "ip": "^1.1.5",
- "smart-buffer": "4.0.2"
+ "ip": "1.1.5",
+ "smart-buffer": "^4.1.0"
}
},
"socks-proxy-agent": {
@@ -17201,9 +17310,9 @@
}
},
"text-extensions": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-2.0.0.tgz",
- "integrity": "sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ==",
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
+ "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
"dev": true
},
"text-table": {
@@ -17501,9 +17610,9 @@
}
},
"uglify-js": {
- "version": "3.6.3",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.3.tgz",
- "integrity": "sha512-KfQUgOqTkLp2aZxrMbCuKCDGW9slFYu2A23A36Gs7sGzTLcRBDORdOi5E21KWHFIfkY8kzgi/Pr1cXCh0yIp5g==",
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.1.tgz",
+ "integrity": "sha512-pnOF7jY82wdIhATVn87uUY/FHU+MDUdPLkmGFvGoclQmeu229eTkbG5gjGGBi3R7UuYYSEeYXY/TTY5j2aym2g==",
"dev": true,
"optional": true,
"requires": {
@@ -18489,9 +18598,9 @@
},
"dependencies": {
"graceful-fs": {
- "version": "4.2.2",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
- "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+ "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
"dev": true
},
"make-dir": {
diff --git a/package.json b/package.json
index ab40c8d4f..18aa30db9 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
"install": "^0.9.5",
"jasmine-core": "2.99.1",
"jsdoc": "^3.6.2",
- "lerna": "^3.18.1",
+ "lerna": "^3.19.0",
"lodash-template-webpack-loader": "jcbrand/lodash-template-webpack-loader",
"mini-css-extract-plugin": "^0.7.0",
"minimist": "^1.2.0",
diff --git a/sass/_controlbox.scss b/sass/_controlbox.scss
index 2d6d104fe..4908dfff9 100644
--- a/sass/_controlbox.scss
+++ b/sass/_controlbox.scss
@@ -21,8 +21,7 @@
}
.set-xmpp-status,
- .xmpp-status,
- .roster-contacts {
+ .xmpp-status {
.chat-status--online {
color: var(--chat-status-online);
}
diff --git a/sass/_roster.scss b/sass/_roster.scss
index b9b1d39b2..786043956 100644
--- a/sass/_roster.scss
+++ b/sass/_roster.scss
@@ -76,6 +76,39 @@
}
}
+ .current-xmpp-contact {
+ margin: 0.25em 0;
+
+ .chat-status {
+ vertical-align: middle;
+ font-size: 0.6em;
+ margin-right: 0;
+ margin-left: -0.7em;
+ margin-bottom: -1.5em;
+ border-radius: 50%;
+ border: 2px solid var(--occupants-background-color);
+ }
+ .chat-status--offline {
+ margin-right: 0.8em;
+ }
+ .chat-status--online {
+ color: var(--chat-status-online);
+ }
+ .chat-status--busy {
+ color: var(--chat-status-busy);
+ }
+ .chat-status--away {
+ color: var(--chat-status-away);
+ }
+ .chat-status--offline {
+ display: none;
+ }
+ .far.fa-circle,
+ .fa-times-circle {
+ color: var(--subdued-color);
+ }
+ }
+
li {
&.requesting-xmpp-contact {
a {
@@ -117,28 +150,23 @@
&.unread-msgs {
max-width: 60%;
}
+ &.contact-name--offline {
+ margin-left: 0.7em;
+ }
}
-
- .avatar {
- float: left;
- display: inline-block;
- }
- }
- &.current-xmpp-contact span {
- font-size: var(--font-size);
- margin-right: 0.3em;
- vertical-align: middle;
}
&.odd {
background-color: #DCEAC5;
/* Make this difference */
}
a, span {
- display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
+ .span {
+ display: inline-block;
+ }
.decline-xmpp-request {
margin-left: 5px;
}
diff --git a/src/converse-rosterview.js b/src/converse-rosterview.js
index c7dd67cae..b84a926f7 100644
--- a/src/converse-rosterview.js
+++ b/src/converse-rosterview.js
@@ -28,7 +28,7 @@ const u = converse.env.utils;
converse.plugins.add('converse-rosterview', {
- dependencies: ["converse-roster", "converse-modal"],
+ dependencies: ["converse-roster", "converse-modal", "converse-chatboxviews"],
initialize () {
/* The initialize function gets called as soon as the plugin is
@@ -326,7 +326,8 @@ converse.plugins.add('converse-rosterview', {
}
});
- _converse.RosterContactView = Backbone.NativeView.extend({
+
+ _converse.RosterContactView = _converse.ViewWithAvatar.extend({
tagName: 'li',
className: 'list-item d-flex hidden controlbox-padded',
@@ -398,7 +399,7 @@ converse.plugins.add('converse-rosterview', {
this.el.classList.add('pending-xmpp-contact');
this.el.innerHTML = tpl_pending_contact(
Object.assign(this.model.toJSON(), {
- 'display_name': display_name,
+ display_name,
'desc_remove': __('Click to remove %1$s as a contact', display_name),
'allow_chat_pending_contacts': _converse.allow_chat_pending_contacts
})
@@ -408,7 +409,7 @@ converse.plugins.add('converse-rosterview', {
this.el.classList.add('requesting-xmpp-contact');
this.el.innerHTML = tpl_requesting_contact(
Object.assign(this.model.toJSON(), {
- 'display_name': display_name,
+ display_name,
'desc_accept': __("Click to accept the contact request from %1$s", display_name),
'desc_decline': __("Click to decline the contact request from %1$s", display_name),
'allow_chat_pending_contacts': _converse.allow_chat_pending_contacts
@@ -437,29 +438,34 @@ converse.plugins.add('converse-rosterview', {
},
renderRosterItem (item) {
- let status_icon = 'fa fa-times-circle';
const show = item.presence.get('show') || 'offline';
+ let status_icon;
if (show === 'online') {
status_icon = 'fa fa-circle chat-status chat-status--online';
} else if (show === 'away') {
status_icon = 'fa fa-circle chat-status chat-status--away';
} else if (show === 'xa') {
- status_icon = 'far fa-circle chat-status';
+ status_icon = 'far fa-circle chat-status chat-status-xa';
} else if (show === 'dnd') {
status_icon = 'fa fa-minus-circle chat-status chat-status--busy';
+ } else {
+ status_icon = 'fa fa-times-circle chat-status chat-status--offline';
}
const display_name = item.getDisplayName();
this.el.innerHTML = tpl_roster_item(
Object.assign(item.toJSON(), {
- 'display_name': display_name,
+ show,
+ display_name,
+ status_icon,
'desc_status': STATUSES[show],
- 'status_icon': status_icon,
'desc_chat': __('Click to chat with %1$s (JID: %2$s)', display_name, item.get('jid')),
'desc_remove': __('Click to remove %1$s as a contact', display_name),
'allow_contact_removal': _converse.allow_contact_removal,
- 'num_unread': item.get('num_unread') || 0
+ 'num_unread': item.get('num_unread') || 0,
+ classes: ''
})
);
+ this.renderAvatar();
return this;
},
diff --git a/src/templates/roster_item.html b/src/templates/roster_item.html
index cfa31bfb3..5dbd8c8cc 100644
--- a/src/templates/roster_item.html
+++ b/src/templates/roster_item.html
@@ -1,10 +1,11 @@
+
+
- {[ if (o.num_unread) { ]}
- {{{ o.num_unread }}}
- {[ } ]}
- {{{o.display_name}}}
+ {[ if (o.num_unread) { ]} {{{ o.num_unread }}} {[ } ]}
+ {{{o.display_name}}}
+
{[ if (o.allow_contact_removal) { ]}
{[ } ]}