aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Use electron instead of electron-prebuilt

Browse source 
Now electron-prebuilt is deprecated.
https://github.com/electron-userland/electron-prebuilt/tree/v1.4.2#installation
This commit is contained in:
Yuya Ochiai 2016-11-08 00:00:45 +09:00
parent efa1171763
commit f3ee426ef5
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
package.json
View file

@ -44,9 +44,9 @@
"chai-as-promised": "^5.3.0", "chai-as-promised": "^5.3.0",
"cross-env": "^3.1.2", "cross-env": "^3.1.2",
"devtron": "^1.3.0", "devtron": "^1.3.0",
"electron": "1.4.2",
"electron-builder": "^7.11.2", "electron-builder": "^7.11.2",
"electron-connect": "~0.6.0", "electron-connect": "~0.6.0",
"electron-prebuilt": "1.4.2",
"eslint": "^3.4.0", "eslint": "^3.4.0",
"eslint-plugin-react": "^6.2.0", "eslint-plugin-react": "^6.2.0",
"gulp": "^3.9.1", "gulp": "^3.9.1",
@ -69,13 +69,16 @@
"tar.gz" "tar.gz"
], ],
"synopsis": "Mattermost", "synopsis": "Mattermost",
"extraFiles": [{ "extraFiles": [
"from": "resources", {
"filter": "icon.png" "from": "resources",
}, { "filter": "icon.png"
"from": "resources/linux", },
"filter": "create_desktop_file.sh" {
}] "from": "resources/linux",
"filter": "create_desktop_file.sh"
}
]
}, },
"mac": { "mac": {
"category": "public.app-category.productivity", "category": "public.app-category.productivity",

4
test/modules/environment.js
View file

@ -12,10 +12,10 @@ const Application = require('spectron').Application;
const sourceRootDir = path.join(__dirname, '../..'); const sourceRootDir = path.join(__dirname, '../..');
const electronBinaryPath = (() => { const electronBinaryPath = (() => {
if (process.platform === 'darwin') { if (process.platform === 'darwin') {
return path.join(sourceRootDir, 'node_modules/electron-prebuilt/dist/Electron.app/Contents/MacOS/Electron'); return path.join(sourceRootDir, 'node_modules/electron/dist/Electron.app/Contents/MacOS/Electron');
} }
const exeExtension = (process.platform === 'win32') ? '.exe' : ''; const exeExtension = (process.platform === 'win32') ? '.exe' : '';
return path.join(sourceRootDir, 'node_modules/electron-prebuilt/dist/electron' + exeExtension); return path.join(sourceRootDir, 'node_modules/electron/dist/electron' + exeExtension);
})(); })();
const configFilePath = path.join(sourceRootDir, 'test/test_config.json'); const configFilePath = path.join(sourceRootDir, 'test/test_config.json');
const mattermostURL = 'http://example.com/team'; const mattermostURL = 'http://example.com/team';