Merge pull request #31 from therehq/fix/tz-update

Fix/tz update

main/index.js

@@ -285,7 +285,6 @@ app.on('ready', async () => {
 
  // Toggle submenu
  tray.popUpContextMenu(submenuShown ? null : menu)
- tray.setHighlightMode('selection')
  submenuShown = !submenuShown
 
  event.preventDefault()

main/static/entitlements.mac.plist

@@ -4,5 +4,11 @@
  <dict>
  <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
  <true/>
+ <key>com.apple.security.cs.disable-library-validation</key>
+ <true/>
+ <key>com.apple.security.cs.allow-jit</key>
+ <true/>
+ <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+ <true/>
  </dict>
 </plist>

main/utils/frames/list.js

@@ -56,6 +56,9 @@ exports.addWindow = tray => {
  fullscreenable: false,
  maximizable: true,
  backgroundColor: '#fff',
+ webPreferences: {
+ nodeIntegration: true,
+ },
  })
 
  win.loadURL(windowUrl('add'))
@@ -79,6 +82,7 @@ exports.joinWindow = tray => {
  backgroundColor: '#fff',
  webPreferences: {
  backgroundThrottling: false,
+ nodeIntegration: true,
  },
  })
 
@@ -130,6 +134,7 @@ exports.trayWindow = tray => {
  webPreferences: {
  backgroundThrottling: false,
  devTools: true,
+ nodeIntegration: true,
  },
  })
 

main/utils/highlight.js

@@ -31,16 +31,11 @@ module.exports = (win, tray, key) => {
  return
  }
 
- const highlighted = states[state]
-
  win.on(state, () => {
  // Don't toggle highlighting if one window is still open
  if (windowLeft(win)) {
  return
  }
-
- // Highlight the tray or don't
- tray.setHighlightMode(highlighted ? 'always' : 'selection')
  })
  }
 

package.json

@@ -3,7 +3,7 @@
  "productName": "There",
  "description": "Desktop client for There PM",
  "homepage": "https://there.team",
- "version": "1.8.3",
+ "version": "1.8.6",
  "main": "main/index.js",
  "license": "MIT",
  "author": {
@@ -24,9 +24,10 @@
  "concurrently": "^3.5.1",
  "cross-env": "5.1.3",
  "downshift": "1.28.5",
- "electron": "4.2.6",
- "electron-builder": "20.44.4",
+ "electron": "7.1.7",
+ "electron-builder": "22.1.0",
  "electron-builder-squirrel-windows": "20.8.0",
+ "electron-notarize": "0.2.0",
  "eslint": "4.16.0",
  "eslint-config-prettier": "2.9.0",
  "eslint-plugin-jsx-a11y": "6.0.3",
@@ -37,13 +38,13 @@
  "just-compose": "1.0.6",
  "just-debounce-it": "1.0.1",
  "lint-staged": "9.2.5",
- "moment": "2.21.0",
- "moment-timezone": "0.5.14",
+ "luxon": "1.21.1",
+ "moment": "2.24.0",
+ "moment-timezone": "0.5.27",
  "next": "5.1.0",
  "nodemon": "1.14.11",
- "parcel-bundler": "1.8.1",
  "polished": "1.9.0",
- "prettier": "1.11.1",
+ "prettier": "1.19.1",
  "prop-types": "15.6.0",
  "raven-js": "3.22.3",
  "react": "16.4.0",
@@ -74,7 +75,7 @@
  "electron-react-devtools": "0.5.3",
  "electron-squirrel-startup": "1.0.0",
  "electron-store": "1.3.0",
- "electron-updater": "4.0.14",
+ "electron-updater": "4.2.0",
  "electron-util": "0.6.0",
  "first-run": "1.2.0",
  "fix-path": "2.1.0",
@@ -85,6 +86,7 @@
  "ms": "2.1.1",
  "node-fetch": "2.1.1",
  "node-machine-id": "1.1.10",
+ "patch-package": "6.2.0",
  "qs": "6.5.1",
  "raven": "2.4.1",
  "semver": "5.5.0"
@@ -113,7 +115,8 @@
  "gatekeeperAssess": false,
  "hardenedRuntime": true,
  "target": [
- "zip"
+ "zip",
+ "dmg"
  ],
  "darkModeSupport": true,
  "extendInfo": {
@@ -147,6 +150,7 @@
  "format": "prettier --write '{renderer,main}/**/*.{js,json}'",
  "test": "yarn test-lint",
  "test-lint": "eslint . --fix",
- "precommit": "lint-staged"
+ "precommit": "lint-staged",
+ "postinstall": "patch-package"
  }
 }