phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Upgrade dependencies (#996)

Browse Source 
* Upgrade Electron to 5.0.4

* Fix spellcheck provider

* npm audit fix
This commit is contained in:
Yuya Ochiai
2019-06-27 04:46:13 +09:00
committed by Harrison Healey
parent 2cfc735d6d
commit 04c03c3baf
5 changed files with 716 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1002
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@@ -51,8 +51,8 @@
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"css-loader": "^1.0.1", "css-loader": "^1.0.1",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"electron": "^4.2.4", "electron": "^5.0.4",
"electron-builder": "20.38.2", "electron-builder": "^20.44.4",
"electron-connect": "^0.6.3", "electron-connect": "^0.6.3",
"eslint": "^5.9.0", "eslint": "^5.9.0",
"eslint-config-mattermost": "github:mattermost/eslint-config-mattermost", "eslint-config-mattermost": "github:mattermost/eslint-config-mattermost",
@@ -67,7 +67,7 @@
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"react": "^16.6.3", "react": "^16.6.3",
"react-dom": "^16.6.3", "react-dom": "^16.6.3",
"spectron": "^5.0.0", "spectron": "^6.0.0",
"style-loader": "^0.23.1", "style-loader": "^0.23.1",
"url-loader": "^1.1.2", "url-loader": "^1.1.2",
"webpack": "^4.27.0", "webpack": "^4.27.0",

12
src/browser/webview/mattermost.js
View File

@@ -186,10 +186,14 @@ function resetMisspelledState() {
function setSpellChecker() { function setSpellChecker() {
const spellCheckerLocale = ipcRenderer.sendSync('get-spellchecker-locale'); const spellCheckerLocale = ipcRenderer.sendSync('get-spellchecker-locale');
webFrame.setSpellCheckProvider(spellCheckerLocale, false, { webFrame.setSpellCheckProvider(spellCheckerLocale, {
spellCheck(text) { spellCheck(words, callback) {
const res = ipcRenderer.sendSync('checkspell', text); const misspeltWords = words.filter((text) => {
return res === null ? true : res; const res = ipcRenderer.sendSync('checkspell', text);
const isCorrect = (res === null) ? true : res;
return !isCorrect;
});
callback(misspeltWords);
}, },
}); });
resetMisspelledState(); resetMisspelledState();

4
src/main/mainWindow.js
View File

@@ -43,6 +43,10 @@ function createMainWindow(config, options) {
minWidth: minimumWindowWidth, minWidth: minimumWindowWidth,
minHeight: minimumWindowHeight, minHeight: minimumWindowHeight,
fullscreen: false, fullscreen: false,
webPreferences: {
nodeIntegration: true,
webviewTag: true,
},
}); });
const mainWindow = new BrowserWindow(windowOptions); const mainWindow = new BrowserWindow(windowOptions);

6
src/package-lock.json generated
View File

@@ -370,9 +370,9 @@
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
}, },
"js-yaml": { "js-yaml": {
"version": "3.12.1", "version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==", "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"requires": { "requires": {
"argparse": "^1.0.7", "argparse": "^1.0.7",
"esprima": "^4.0.0" "esprima": "^4.0.0"