gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #7128 from vector-im/revert-7115-dbkr/remove_package_lock 

Revert "Remove package-lock.json for now"
This commit is contained in:
David Baker 2018-08-02 10:02:57 +01:00 committed by GitHub
parent 86a6f1e932 dcde74bc09
commit 53b179b22b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9625 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -19,6 +19,3 @@ electron/pub
/config.json.* /config.json.*
/config.local*.json /config.local*.json
/src/component-index.js /src/component-index.js
# https://github.com/vector-im/riot-web/issues/7083
package-lock.json

9623
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

4
src/vector/index.js
View File

@ -25,13 +25,13 @@ require('gfm.css/gfm.css');
require('highlight.js/styles/github.css'); require('highlight.js/styles/github.css');
require('draft-js/dist/Draft.css'); require('draft-js/dist/Draft.css');
/*const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake"); const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake");
rageshake.init().then(() => { rageshake.init().then(() => {
console.log("Initialised rageshake: See https://bugs.chromium.org/p/chromium/issues/detail?id=583193 to fix line numbers on Chrome."); console.log("Initialised rageshake: See https://bugs.chromium.org/p/chromium/issues/detail?id=583193 to fix line numbers on Chrome.");
rageshake.cleanup(); rageshake.cleanup();
}, (err) => { }, (err) => {
console.error("Failed to initialise rageshake: " + err); console.error("Failed to initialise rageshake: " + err);
});*/ });
window.addEventListener('beforeunload', (e) => { window.addEventListener('beforeunload', (e) => {
console.log('riot-web closing'); console.log('riot-web closing');