Merge pull request #3247 from withspectrum/2.4.4

2.4.4

Author: brianlovin

.circleci/config.yml

@@ -136,17 +136,6 @@ jobs:
           name: Deploy and alias Hyperion
           command: npx now-cd --alias "alpha=hyperion.alpha.spectrum.chat" --team spaceprogram
 
-  deploy_desktop:
-    <<: *js_defaults
-    docker:
-      - image: circleci/node:8
-    steps:
-      - attach_workspace:
-          at: ~/spectrum
-      - run:
-          name: Build and release desktop app
-          command: yarn run release:desktop
-
   # Run eslint, flow etc.
   test_static_js:
     <<: *js_defaults
@@ -225,10 +214,3 @@ workflows:
           filters:
             branches:
               only: alpha
-      - deploy_desktop:
-          requires:
-            - test_static_js
-            - test_web
-          filters:
-            branches:
-              only: alpha

desktop/deployment.md

@@ -1,11 +1,15 @@
 # Desktop App Deployment
 
-We have semi-continuous deployment set up for the desktop app. Here's how it works:
+1. Packages the desktop app for all operating systems and upload them to GitHub as a draft release with the following command: 
 
-## Automatic
+  ```
+  GH_TOKEN=xyz123 yarn run release:desktop
+  ```
 
-1. We merge the latest changes from `alpha` to `production`
-2. This prompts a CircleCI build, which packages the desktop app for all operating systems and uploads them to GitHub as a draft release. That looks something like this:
+> Note: GH_TOKEN has to be a valid GitHub personal token. You can get one from your user settings.
+> Note for employees: You will find the company GitHub token in 1Password under the entry for "Spectrum GitHub Bot"
+
+2. You'll then have a draft release on GitHub that looks something like this:
 
   ![screen shot 2018-05-30 at 15 42 22](https://user-images.githubusercontent.com/7525670/40724411-4b5fe9ec-6421-11e8-8e4b-d0df96b46f72.png)
 
@@ -19,11 +23,3 @@ We have semi-continuous deployment set up for the desktop app. Here's how it wor
 
 As soon as it's published, the app will prompt existing users to upgrade to the newest version and download and install it for them.
 
-## Manual
-
-You can also do a manual deploy of the desktop apps. You will need to get a GitHub token from your personal GitHub settings, then run the following command:
-
-```
-GH_TOKEN=asdf123 yarn run release:desktop
-```
-

desktop/package.json

@@ -11,6 +11,7 @@
   "main": "src/main.js",
   "private": true,
   "dependencies": {
+    "electron-context-menu": "^0.9.1",
     "electron-is-dev": "^0.3.0",
     "electron-log": "^2.2.14",
     "electron-updater": "^2.21.4",

desktop/src/config.js

@@ -11,6 +11,8 @@ module.exports = {
   APP_VERSION: app.getVersion(),
   APP_REMOTE_URL: 'https://spectrum.chat/login',
   APP_DEV_URL: 'http://localhost:3000/login',
+  APP_REMOTE_HOME_URL: 'https://spectrum.chat',
+  APP_DEV_HOME_URL: 'http://localhost:3000',
 
   GITHUB_URL: 'https://github.com/withspectrum/spectrum',
   GITHUB_URL_LICENSE:

desktop/src/main.js

@@ -1,8 +1,9 @@
 // @flow
 const electron = require('electron');
 const windowStateKeeper = require('electron-window-state');
-const { app, BrowserWindow } = electron;
+const { app, BrowserWindow, shell } = electron;
 const isDev = require('electron-is-dev');
+const contextMenu = require('electron-context-menu');
 
 const FIFTEEN_MINUTES = 900000;
 
@@ -73,7 +74,13 @@ function createWindow() {
     mainWindow && mainWindow.show();
   });
 
+  contextMenu();
   mainWindowState.manage(mainWindow);
+
+  mainWindow.webContents.on('new-window', (event, url) => {
+    event.preventDefault();
+    shell.openExternal(url);
+  });
 }
 
 // This method will be called when Electron has finished
@@ -99,15 +106,3 @@ app.on('activate', () => {
     createWindow();
   }
 });
-
-app.on('web-contents-created', (event, wc) => {
-  wc.on('before-input-event', (event, input) => {
-    if (input.key === ']' && input.meta && !input.shift && !input.control) {
-      if (wc.canGoForward()) wc.goForward();
-    }
-
-    if (input.key === '[' && input.meta && !input.shift && !input.control) {
-      if (wc.canGoBack()) wc.goBack();
-    }
-  });
-});

desktop/src/menu.js

@@ -1,6 +1,7 @@
 // @flow
-const { dialog, Menu, MenuItem, shell } = require('electron');
+const { dialog, Menu, MenuItem, shell, clipboard } = require('electron');
 const checkForUpdates = require('./autoUpdate');
+const isDev = require('electron-is-dev');
 
 const CONFIG = require('./config');
 
@@ -41,6 +42,42 @@ const template = [
       { role: 'quit' },
     ],
   },
+  {
+    label: 'Go',
+    submenu: [
+      {
+        label: 'Home',
+        accelerator: 'CmdOrCtrl+Shift+H',
+        click: function(item, focusedWindow) {
+          if (focusedWindow) {
+            focusedWindow.webContents.loadURL(
+              isDev ? CONFIG.APP_DEV_HOME_URL : CONFIG.APP_REMOTE_HOME_URL
+            );
+          }
+        },
+      },
+      {
+        label: 'Forward',
+        accelerator: 'CmdOrCtrl+]',
+        click: function(item, focusedWindow) {
+          if (focusedWindow) {
+            const wc = focusedWindow.webContents;
+            if (wc && wc.canGoForward()) wc.goForward();
+          }
+        },
+      },
+      {
+        label: 'Back',
+        accelerator: 'CmdOrCtrl+[',
+        click: function(item, focusedWindow) {
+          if (focusedWindow) {
+            const wc = focusedWindow.webContents;
+            if (wc && wc.canGoBack()) wc.goBack();
+          }
+        },
+      },
+    ],
+  },
   {
     label: 'Edit',
     submenu: [
@@ -131,6 +168,21 @@ const template = [
       },
     ],
   },
+  {
+    label: 'Share',
+    submenu: [
+      {
+        label: 'Copy link to current page',
+        click: function(item, focusedWindow) {
+          const url = focusedWindow.webContents.getURL();
+          if (url) {
+            clipboard.writeText(url);
+          }
+        },
+        accelerator: 'CmdOrCtrl+S',
+      },
+    ],
+  },
 ];
 
 function showAbout() {

desktop/yarn.lock

@@ -688,6 +688,21 @@ electron-builder@^20.8.1:
     update-notifier "^2.5.0"
     yargs "^11.0.0"
 
+electron-context-menu@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-0.9.1.tgz#ed4df20c080491c3c996abfcb363159946a38058"
+  dependencies:
+    electron-dl "^1.2.0"
+    electron-is-dev "^0.1.1"
+
+electron-dl@^1.2.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-1.12.0.tgz#328c7f12d3e458ed4ddc773d8ffc28d59ab35d2e"
+  dependencies:
+    ext-name "^5.0.0"
+    pupa "^1.0.0"
+    unused-filename "^1.0.0"
+
 [email protected]:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/electron-download-tf/-/electron-download-tf-4.3.4.tgz#b03740b2885aa2ad3f8784fae74df427f66d5165"
@@ -716,6 +731,10 @@ electron-download@^3.0.1:
     semver "^5.3.0"
     sumchecker "^1.2.0"
 
+electron-is-dev@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.1.2.tgz#8a1043e32b3a1da1c3f553dce28ce764246167e3"
+
 electron-is-dev@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe"
@@ -847,6 +866,19 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+ext-list@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37"
+  dependencies:
+    mime-db "^1.28.0"
+
+ext-name@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6"
+  dependencies:
+    ext-list "^2.0.0"
+    sort-keys-length "^1.0.0"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -1345,6 +1377,10 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -1599,7 +1635,7 @@ micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-mime-db@~1.33.0:
+mime-db@^1.28.0, mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
@@ -1657,6 +1693,10 @@ [email protected], mkdirp@^0.5.0, mkdirp@^0.5.1:
   dependencies:
     minimist "0.0.8"
 
+modify-filename@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/modify-filename/-/modify-filename-1.1.0.tgz#9a2dec83806fbb2d975f22beec859ca26b393aa1"
+
 [email protected]:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -2032,6 +2072,10 @@ punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
 
+pupa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pupa/-/pupa-1.0.0.tgz#9a9568a5af7e657b8462a6e9d5328743560ceff6"
+
 qs@~6.5.1:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -2303,6 +2347,18 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
+sort-keys-length@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188"
+  dependencies:
+    sort-keys "^1.0.0"
+
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
@@ -2623,6 +2679,13 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
+unused-filename@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unused-filename/-/unused-filename-1.0.0.tgz#d340880f71ae2115ebaa1325bef05cc6684469c6"
+  dependencies:
+    modify-filename "^1.1.0"
+    path-exists "^3.0.0"
+
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"

flow-typed/npm/electron-window-state_vx.x.x.js

@@ -0,0 +1,18 @@
+// flow-typed signature: 77130022186123cfc81d76787330354e
+// flow-typed version: <<STUB>>/electron-window-state_vx.x.x/flow_v0.66.0
+
+/**
+ * This is an autogenerated libdef stub for:
+ *
+ *   'electron-window-state'
+ *
+ * Fill this stub out by replacing all the `any` types.
+ *
+ * Once filled out, we encourage you to share your work with the
+ * community by sending a pull request to:
+ * https://github.com/flowtype/flow-typed
+ */
+
+declare module 'electron-window-state' {
+  declare module.exports: any;
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "babel-cli": "^6.24.1",

src/components/linkPreview/index.js

@@ -37,7 +37,7 @@ export class LinkPreview extends Component {
         size={this.props.size}
         padding={image}
         target="_blank"
-        rel="noopener"
+        rel="noopener noreferrer"
         href={url || trueUrl}
         margin={margin}
       >