nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' into lint

Browse Source
This commit is contained in:
David Baker
2018-11-22 11:23:02 +00:00
committed by GitHub
parent a02009d31f 8298e73205
commit bbb128b672
11 changed files with 192 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "riot-web",
"version": "0.17.2",
"version": "0.17.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -591,31 +591,31 @@
}
},
"app-builder-bin": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.1.2.tgz",
"integrity": "sha512-PZJspzAqB0+z60OalXChP9I05BzODd/ffDz6RvTmDG3qclr7YrnpqzvPF+T7vGVtk2nN7syuveTQROJfXcB8xA==",
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.1.4.tgz",
"integrity": "sha512-i5ZfZtnAQqVZXpFYpvkQK/V0p9RwJjCW7X3CRcyDrnR3p1mQRoRTMSfPrtGTo1ens7kTfzk2S2i0QXq+gEplLg==",
"dev": true
},
"app-builder-lib": {
"version": "20.28.4",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.28.4.tgz",
"integrity": "sha512-RY4/NJs1HCFWAOpLMivuDzbesU5VyaZVKuQllxgCNZ56+ihgO5aGexla2DVjG/bBQleWfF3DPnEsF3sbZPlpHw==",
"version": "20.29.0",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.29.0.tgz",
"integrity": "sha512-pXIHWNdeQ+jqI5xv4L274YZo2AOSotXsH9/Q83+qgiAa62F/PIWgcd0LWWa//CD929+FrRFEgBq9sagh9uUTHw==",
"dev": true,
"requires": {
"7zip-bin": "~4.0.2",
"app-builder-bin": "2.1.2",
"app-builder-bin": "2.1.4",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.5",
"builder-util": "6.1.3",
"builder-util-runtime": "4.4.1",
"builder-util": "7.0.0",
"builder-util-runtime": "5.0.0",
"chromium-pickle-js": "^0.2.0",
"debug": "^3.1.0",
"debug": "^4.1.0",
"ejs": "^2.6.1",
"electron-osx-sign": "0.4.10",
"electron-publish": "20.28.3",
"electron-osx-sign": "0.4.11",
"electron-publish": "20.29.0",
"fs-extra-p": "^4.6.1",
"hosted-git-info": "^2.7.1",
"is-ci": "^1.2.0",
"is-ci": "^1.2.1",
"isbinaryfile": "^3.0.3",
"js-yaml": "^3.12.0",
"lazy-val": "^1.0.3",
@@ -624,8 +624,19 @@
"plist": "^3.0.1",
"read-config-file": "3.1.2",
"sanitize-filename": "^1.6.1",
"semver": "^5.5.1",
"semver": "^5.6.0",
"temp-file": "^3.1.3"
},
"dependencies": {
"debug": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
"integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
"dev": true,
"requires": {
"ms": "^2.1.1"
}
}
}
},
"aproba": {
@@ -2599,27 +2610,36 @@
"dev": true
},
"builder-util": {
"version": "6.1.3",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-6.1.3.tgz",
"integrity": "sha512-MXeARNff9KHlzJYGJcAhLI/tpE57PmUnleaYfL22IE+viRt192Yr3wQL444ztsA+LUHJ8d12moUoG00jh1hfLA==",
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-7.0.0.tgz",
"integrity": "sha512-GnszunK4uX1F8XP4U01m47VME0UQo97wM1i8h77j6+7V0xMz8faL9BHdv2O8/iOZ8HjfKSRJ+1v7RHohF6H0lA==",
"dev": true,
"requires": {
"7zip-bin": "~4.0.2",
"app-builder-bin": "2.1.2",
"app-builder-bin": "2.1.4",
"bluebird-lst": "^1.0.5",
"builder-util-runtime": "^4.4.1",
"builder-util-runtime": "^5.0.0",
"chalk": "^2.4.1",
"debug": "^3.1.0",
"debug": "^4.1.0",
"fs-extra-p": "^4.6.1",
"is-ci": "^1.2.0",
"is-ci": "^1.2.1",
"js-yaml": "^3.12.0",
"lazy-val": "^1.0.3",
"semver": "^5.5.1",
"semver": "^5.6.0",
"source-map-support": "^0.5.9",
"stat-mode": "^0.2.2",
"temp-file": "^3.1.3"
},
"dependencies": {
"debug": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
"integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
"dev": true,
"requires": {
"ms": "^2.1.1"
}
},
"source-map-support": {
"version": "0.5.9",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
@@ -2633,15 +2653,26 @@
}
},
"builder-util-runtime": {
"version": "4.4.1",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.4.1.tgz",
"integrity": "sha512-8L2pbL6D3VdI1f8OMknlZJpw0c7KK15BRz3cY77AOUElc4XlCv2UhVV01jJM7+6Lx7henaQh80ALULp64eFYAQ==",
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-5.0.0.tgz",
"integrity": "sha512-mTyLqmzdPzavKQNAfxcGu6kqaDiPCtFKJG+nNO9SYfL6lY7VgTUW+45iXhowc5ElmPj0eSTDaIGlScxVMwFUEA==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.5",
"debug": "^3.1.0",
"debug": "^4.1.0",
"fs-extra-p": "^4.6.1",
"sax": "^1.2.4"
},
"dependencies": {
"debug": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
"integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
"dev": true,
"requires": {
"ms": "^2.1.1"
}
}
}
},
"builtin-modules": {
@@ -4329,14 +4360,14 @@
"integrity": "sha1-zl15f5fib4vnvv9T99xA4cGp7Ew="
},
"dmg-builder": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-5.3.1.tgz",
"integrity": "sha512-/+vtqlgvTtha/4Gc76XIRKS2KzYO58sTWXhZ/kgfNr05ZXY6bIw26v7xDu8ZBpTYnfWI09JRZTMv1yIXT/vvfg==",
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.0.0.tgz",
"integrity": "sha512-nGeCoIctKP48QhohyQ6Uxx754XKyfVa5nx8YK6STIxTXoGTDWR/dwy8m4iCkM77//sd2wMdP9KYsUDuPxtbpLA==",
"dev": true,
"requires": {
"app-builder-lib": "~20.28.3",
"app-builder-lib": "~20.29.0",
"bluebird-lst": "^1.0.5",
"builder-util": "~6.1.3",
"builder-util": "~7.0.0",
"fs-extra-p": "^4.6.1",
"iconv-lite": "^0.4.24",
"js-yaml": "^3.12.0",
@@ -4537,24 +4568,24 @@
"dev": true
},
"electron-builder": {
"version": "20.28.4",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.28.4.tgz",
"integrity": "sha512-JMOzMfx9BrC9SJr6+UacuvQZmuodL02Zua8iFn0l5bv32GkWcNj1D6FwybV33BpsmdQ8sF1SkQj+7L+FEIxang==",
"version": "20.29.0",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.29.0.tgz",
"integrity": "sha512-i1v5dD0u8tu5rq8Nq3DohEj/Gm7WKSysvlbeb5oCvmJ0YslbsQm/Iq6SGLTmJbXlYp3hoL3djuBaWC+oM2hagw==",
"dev": true,
"requires": {
"app-builder-lib": "20.28.4",
"app-builder-lib": "20.29.0",
"bluebird-lst": "^1.0.5",
"builder-util": "6.1.3",
"builder-util-runtime": "4.4.1",
"builder-util": "7.0.0",
"builder-util-runtime": "5.0.0",
"chalk": "^2.4.1",
"dmg-builder": "5.3.1",
"dmg-builder": "6.0.0",
"fs-extra-p": "^4.6.1",
"is-ci": "^1.2.0",
"is-ci": "^1.2.1",
"lazy-val": "^1.0.3",
"read-config-file": "3.1.2",
"sanitize-filename": "^1.6.1",
"update-notifier": "^2.5.0",
"yargs": "^12.0.1"
"yargs": "^12.0.2"
},
"dependencies": {
"ansi-regex": {
@@ -4945,9 +4976,9 @@
}
},
"electron-osx-sign": {
"version": "0.4.10",
"resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.10.tgz",
"integrity": "sha1-vk87ibKnWh3F8eckkIGrKSnKOiY=",
"version": "0.4.11",
"resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz",
"integrity": "sha512-VVd40nrnVqymvFrY9ZkOYgHJOvexHHYTR3di/SN+mjJ0OWhR1I8BRVj3U+Yamw6hnkZZNKZp52rqL5EFAAPFkQ==",
"dev": true,
"requires": {
"bluebird": "^3.5.0",
@@ -4955,7 +4986,7 @@
"debug": "^2.6.8",
"isbinaryfile": "^3.0.2",
"minimist": "^1.2.0",
"plist": "^2.1.0"
"plist": "^3.0.1"
},
"dependencies": {
"debug": {
@@ -4972,29 +5003,18 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"dev": true
},
"plist": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz",
"integrity": "sha1-V8zbeggh3yGDEhejytVOPhRqECU=",
"dev": true,
"requires": {
"base64-js": "1.2.0",
"xmlbuilder": "8.2.2",
"xmldom": "0.1.x"
}
}
}
},
"electron-publish": {
"version": "20.28.3",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.28.3.tgz",
"integrity": "sha512-/2t5zk9EKgH7p7rFZ+ynTKLmpKGF9bktMP2UR6u4bbPz9w4r3WEUbPOeZ1TLqUCAqdfZECcj4ThjrlcAJTghCA==",
"version": "20.29.0",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.29.0.tgz",
"integrity": "sha512-Kc5u5YaJLcGWPrp3bFk8NdrYk5gNVG4lZqbAIZnYNPuOLMCNgUk4UqrONO6iuAE6x/vWOoovszf1gGIT7G01UA==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.5",
"builder-util": "~6.1.3",
"builder-util-runtime": "^4.4.1",
"builder-util": "~7.0.0",
"builder-util-runtime": "^5.0.0",
"chalk": "^2.4.1",
"fs-extra-p": "^4.6.1",
"lazy-val": "^1.0.3",
@@ -8890,7 +8910,7 @@
"dev": true
},
"matrix-js-sdk": {
"version": "github:matrix-org/matrix-js-sdk#01e31afcbd75d17b68c0b3209eb4bbcbef096457",
"version": "github:matrix-org/matrix-js-sdk#604af1ac8c180dcdddb761485eb03fad382bd06d",
"from": "github:matrix-org/matrix-js-sdk#develop",
"requires": {
"another-json": "^0.2.0",
@@ -8900,6 +8920,7 @@
"content-type": "^1.0.2",
"loglevel": "1.6.1",
"memfs": "^2.10.1",
"qs": "^6.5.2",
"request": "^2.88.0"
}
},
@@ -8963,8 +8984,8 @@
"from": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
},
"matrix-js-sdk": {
"version": "github:matrix-org/matrix-js-sdk#01e31afcbd75d17b68c0b3209eb4bbcbef096457",
"from": "github:matrix-org/matrix-js-sdk#01e31afcbd75d17b68c0b3209eb4bbcbef096457",
"version": "github:matrix-org/matrix-js-sdk#604af1ac8c180dcdddb761485eb03fad382bd06d",
"from": "github:matrix-org/matrix-js-sdk#604af1ac8c180dcdddb761485eb03fad382bd06d",
"requires": {
"another-json": "^0.2.0",
"babel-runtime": "^6.26.0",
@@ -10151,12 +10172,6 @@
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
"dev": true
},
"xmlbuilder": {
"version": "9.0.7",
"resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
"dev": true
}
}
},
@@ -11695,7 +11710,7 @@
},
"safe-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
"resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
"dev": true,
"requires": {
@@ -11995,9 +12010,9 @@
}
},
"slate-base64-serializer": {
"version": "0.2.76",
"resolved": "https://registry.npmjs.org/slate-base64-serializer/-/slate-base64-serializer-0.2.76.tgz",
"integrity": "sha512-MhqVWN4YRL8bKlaBKbpo2dx8mPy4ilIwSOE0gzpiaxrLOJ2U4CigLGtS+mxzkzWkdL+3WIATnEE4g0ZCxPTePQ==",
"version": "0.2.77",
"resolved": "https://registry.npmjs.org/slate-base64-serializer/-/slate-base64-serializer-0.2.77.tgz",
"integrity": "sha512-EZ5XpKf7l2mYIzbB0rdExAZ5FPgm252hmDtR5wTBY5m79ekw/xc016HxJrlg0HufMQKcRsQtuEhBRrwyLiWuag==",
"requires": {
"isomorphic-base64": "^1.0.2"
}
@@ -12039,9 +12054,9 @@
}
},
"slate-plain-serializer": {
"version": "0.6.15",
"resolved": "https://registry.npmjs.org/slate-plain-serializer/-/slate-plain-serializer-0.6.15.tgz",
"integrity": "sha512-gPHtJ+h8HBsUlRv6uJfVZpk1gGmCK1rriZEW1gWH8PmtKg2X46B8KNM1KtqJ4iAA3iADTtcWBB95/RiMC5i0yw=="
"version": "0.6.16",
"resolved": "https://registry.npmjs.org/slate-plain-serializer/-/slate-plain-serializer-0.6.16.tgz",
"integrity": "sha512-swQAe2ehGhsJWSOyGsmLWs/JSya5k8ipwOHpW1fy1hb1sU8BnU/0y9PMxGPCbpUugbSCFURmm6MPlj04Tc1/sg=="
},
"slate-prop-types": {
"version": "0.4.67",
@@ -14589,9 +14604,9 @@
"dev": true
},
"xmlbuilder": {
"version": "8.2.2",
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz",
"integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=",
"version": "9.0.7",
"resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
"dev": true
},
"xmldom": {