Mastodon
/
hyperspace-desktop-client-windows-linux-macos
mirror of https://github.com/hyperspacedev/hyperspace
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix vibrancy issues on Catalina, add notarization 

Signed-off-by: Marquis Kurt <software@marquiskurt.net>
This commit is contained in:
Marquis Kurt 2019-07-28 10:48:33 -04:00
parent a55e0c152c
commit 5d84e77baa
No known key found for this signature in database
GPG Key ID: 725636D259F5402D
5 changed files with 2704 additions and 503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/app.icns
View File

Binary file not shown.

27
desktop/notarize.js Normal file
View File

@ -0,0 +1,27 @@
// notarize.js
// Script to notarize Hyperspace for macOS
// © 2019 Hyperspace developers. Licensed under Apache 2.0.
const { notarize } = require('electron-notarize');
// This is pulled from the Apple Keychain. To set this up,
// follow the instructions provided here:
// https://github.com/electron/electron-notarize#safety-when-using-appleidpassword
const password = `@keychain:AC_PASSWORD`;
exports.default = async function notarizing(context) {
const { electronPlatformName, appOutDir } = context;
if (electronPlatformName !== 'darwin') {
return;
}
const appName = context.packager.appInfo.productFilename;
return await notarize({
appBundleId: 'net.marquiskurt.hyperspace',
appPath: `${appOutDir}/${appName}.app`,
appleId: "appleseed@marquiskurt.net",
appleIdPassword: password,
ascProvider: "FQQXSP79X3"
});
};

3131
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

38
package.json
View File

@ -8,37 +8,38 @@
"private": true,
"homepage": "./",
"devDependencies": {
"@date-io/moment": "^1.3.5",
"@date-io/moment": "^1.3.8",
"@material-ui/core": "^3.9.3",
"@material-ui/icons": "^3.0.2",
"@types/emoji-mart": "^2.8.2",
"@types/jest": "^24.0.11",
"@types/jest": "^24.0.15",
"@types/node": "11.11.6",
"@types/react": "16.8.8",
"@types/react-dom": "16.8.3",
"@types/react-router-dom": "^4.3.2",
"@types/react-router-dom": "^4.3.4",
"@types/react-swipeable-views": "latest",
"axios": "^0.19.0",
"electron": "^5.0.8",
"electron-builder": "^20.39.0",
"emoji-mart": "^2.8.2",
"electron-builder": "^21.1.5",
"emoji-mart": "^2.11.1",
"file-dialog": "^0.0.7",
"material-ui-pickers": "^2.2.4",
"mdi-material-ui": "^5.11.0",
"megalodon": "^0.6.3",
"mdi-material-ui": "^5.13.0",
"megalodon": "^0.6.4",
"moment": "^2.24.0",
"notistack": "^0.5.1",
"query-string": "^6.4.2",
"query-string": "^6.8.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-router-dom": "^5.0.0",
"react-router-dom": "^5.0.1",
"react-scripts": "^2.1.8",
"react-swipeable-views": "^0.13.1",
"react-swipeable-views": "^0.13.3",
"react-web-share-api": "^0.0.2",
"typescript": "3.4.1"
},
"dependencies": {
"electron-updater": "^4.0.6",
"electron-notarize": "^0.1.1",
"electron-updater": "^4.1.2",
"electron-window-state": "^5.0.3"
},
"main": "public/electron.js",
@ -48,11 +49,11 @@
"electrify-nobuild": "electron .",
"build": "react-scripts build",
"create-mac-icon": "cd desktop; iconutil -c icns app.iconset; cd ..",
"build-desktop": "npm run build; npm run create-mac-icon; build -mwl deb AppImage snap",
"build-desktop": "npm run build; npm run create-mac-icon; electron-builder -mwl deb AppImage snap",
"build-desktop-win": "build -w",
"build-desktop-darwin": "npm run create-mac-icon; build -m",
"build-desktop-linux": "build -l deb AppImage snap",
"build-desktop-linux-select": "build -l ",
"build-desktop-darwin": "npm run create-mac-icon; electron-builder -m",
"build-desktop-linux": "electron-builder -l deb AppImage snap",
"build-desktop-linux-select": "electron-builder -l ",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
@ -67,6 +68,7 @@
],
"build": {
"appId": "net.marquiskurt.hyperspace",
"afterSign": "desktop/notarize.js",
"directories": {
"buildResources": "desktop"
},
@ -77,12 +79,16 @@
"dmg",
"mas"
],
"darkModeSupport": true
"darkModeSupport": true,
"hardenedRuntime": true
},
"mas": {
"entitlements": "desktop/entitlements.mas.plist",
"provisioningProfile": "desktop/embedded.provisionprofile"
},
"dmg": {
"sign": false
},
"win": {
"target": [
"nsis"

11
public/electron.js
View File

@ -6,6 +6,7 @@ const { app, Menu, protocol, BrowserWindow, shell, systemPreferences } = require
const windowStateKeeper = require('electron-window-state');
const { autoUpdater } = require('electron-updater');
const path = require('path');
const os = require('os');
// Check for any updates to the app
autoUpdater.checkForUpdatesAndNotify();
@ -28,6 +29,10 @@ function darwin() {
return process.platform === "darwin";
}
function catalina() {
return os.release() >= "19.0.0";
}
/**
* Register the protocol for Hyperspace
*/
@ -133,7 +138,7 @@ function createWindow() {
// Set some preferences that are specific to macOS.
titleBarStyle: 'hidden',
vibrancy: systemPreferences.isDarkMode()? "ultra-dark": "light",
vibrancy: catalina()? "sidebar": systemPreferences.isDarkMode()? "ultra-dark": "light",
transparent: darwin(),
backgroundColor: darwin()? "#80FFFFFF": "#FFF"
}
@ -149,7 +154,9 @@ function createWindow() {
systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
if (mainWindow != null) {
console.log(`Dark mode: ${systemPreferences.isDarkMode()}`)
mainWindow.setVibrancy(systemPreferences.isDarkMode()? "ultra-dark": "light");
if (!catalina()) {
mainWindow.setVibrancy(systemPreferences.isDarkMode()? "ultra-dark": "light");
}
mainWindow.webContents.reload();
}
})