Merge remote-tracking branch 'origin/master' into preferences-sign-in-flow

.travis.yml

@@ -19,8 +19,11 @@ cache:
   timeout: 600
   directories:
     - node_modules
+    - $HOME/.electron
 
 install:
+  - npm prune
+  - cd app && npm prune && cd ..
   - npm install
 
 script:

app/src/lib/dispatcher/emoji-store.ts

@@ -124,7 +124,12 @@ export class EmojiStore {
 
         // Sort and insert into actual map
         const keys = Array.from(tmp.keys()).sort()
-        keys.forEach(k => this.emoji.set(k, tmp.get(k)))
+        keys.forEach(k => {
+          const value = tmp.get(k)
+          if (value) {
+            this.emoji.set(k, value)
+          }
+        })
 
         resolve()
       })

app/src/lib/range.ts

@@ -1,7 +1,7 @@
 // extracted from underscore, which in itself comes from Python
 // https://github.com/jashkenas/underscore/blob/fc039f6a94fcf388d2b61ced4c02cd1ba116ecfd/underscore.js#L693-L710
 
-export function range(start: number, stop?: number, step?: number): ReadonlyArray<number> {
+export function range(start: number, stop: number, step?: number): ReadonlyArray<number> {
   if (stop === null) {
     stop = start || 0
     start = 0

app/src/ui/resizable/resizable.tsx

@@ -85,8 +85,9 @@ export class Resizable extends React.Component<IResizableProps, void> {
    * Handler for when the user moves the mouse while dragging
    */
   private handleDragMove = (e: MouseEvent) => {
-    const deltaX = e.clientX - this.startX
+    if (!this.startWidth) { return }
 
+    const deltaX = e.clientX - this.startX
     const newWidth = this.startWidth + deltaX
     const newWidthClamped = this.clampWidth(newWidth)
 

appveyor.yml

@@ -27,6 +27,8 @@ install:
   - ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
   - ps: Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent
   - git submodule update --init --recursive
+  - npm prune
+  - cd app && npm prune && cd ..
   - npm install
 
 build_script:

package.json

@@ -44,7 +44,7 @@
     "chai-datetime": "^1.4.1",
     "cross-env": "^1.0.8",
     "css-loader": "^0.23.1",
-    "electron": "1.6.0",
+    "electron": "1.6.1",
     "electron-mocha": "3.0.5",
     "electron-packager": "8.1.0",
     "electron-winstaller": "^2.3.0",
@@ -64,7 +64,7 @@
     "ts-loader": "^1.3.3",
     "ts-node": "^1.7.3",
     "tslint": "^3.14.0",
-    "typescript": "2.1.5",
+    "typescript": "^2.2.1",
     "vrsource-tslint-rules": "^0.12.0",
     "webpack": "^1.12.15",
     "webpack-dev-middleware": "^1.6.1",
@@ -90,7 +90,6 @@
     "@types/react-addons-test-utils": "^0.14.17",
     "@types/react-dom": "^0.14.23",
     "@types/react-virtualized": "0.0.3",
-    "@types/uuid": "^2.0.29",
-    "@types/whatwg-fetch": "0.0.28"
+    "@types/uuid": "^2.0.29"
   }
 }