Merge pull request #33 from skellock/even-moar-typings

Even moar typings

Author: skellock

package-lock.json

@@ -51,6 +51,7 @@
   },
   "description": "An electron starter project.",
   "devDependencies": {
+    "@types/electron-store": "1.2.0",
     "@types/mousetrap": "1.5.34",
     "@types/react": "15.0.38",
     "@types/react-dom": "15.5.2",

package.json

@@ -1,5 +1,4 @@
 import { autoUpdater } from 'electron-updater'
-import { ProgressInfo } from 'electron-builder-http/out/ProgressCallbackTransform'
 import * as log from 'electron-log'
 import * as isDev from 'electron-is-dev'
 
@@ -50,24 +49,24 @@ export function createUpdater(app: Electron.App): void {
     log.info('checking for update')
   })
 
-  autoUpdater.on('update-available', info => {
+  autoUpdater.on('update-available', (info: string) => {
     log.info('update available')
   })
 
-  autoUpdater.on('update-not-available', info => {
+  autoUpdater.on('update-not-available', (info: string) => {
     log.info('update not available')
   })
 
-  autoUpdater.on('error', err => {
+  autoUpdater.on('error', (err: Error) => {
     log.error('error updating', err.message)
   })
 
-  autoUpdater.on('download-progress', (progressObj: ProgressInfo) => {
-    log.info(`${progressObj.percent}%`)
+  autoUpdater.signals.progress(info => {
+    log.info(`${info.percent}%`)
   })
 
   // fires when an update has been downloaded
-  autoUpdater.on('update-downloaded', info => {
+  autoUpdater.signals.updateDownloaded(info => {
     log.info('update downloaded')
     autoUpdater.quitAndInstall()
   })

src/main/updater/updater.ts

@@ -4,7 +4,7 @@ import { SampleTabs, SampleTabType } from './sample-tabs'
 import { LongTab } from '../long-tab/long-tab'
 import { DogTab } from '../dog-tab/dog-tab'
 import { Header } from '../header/header'
-import * as Store from 'electron-store'
+import Store = require('electron-store')
 
 // a sample store
 const store = new Store()

src/renderer/features/example-using-tabs/welcome-screen/welcome-screen.tsx

@@ -33,8 +33,8 @@ const FIRST_STYLE: CSSProperties = { marginLeft: 0 }
 export function Tab(props: TabProps) {
   const style: CSSProperties = {
     ...ROOT_STYLE,
-    ...props.active && ACTIVE_STYLE,
-    ...props.first && FIRST_STYLE,
+    ...props.active ? ACTIVE_STYLE : null,
+    ...props.first ? FIRST_STYLE : null,
     ...props.style
   }
   return (

src/renderer/platform/components/tab/tab.tsx

@@ -5,6 +5,8 @@
     "moduleResolution": "node",
     "jsx": "react",
     "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": false,
+    "strict": true,
     "noUnusedLocals": true
   }
 }

tsconfig.json

@@ -0,0 +1,3 @@
+declare module 'electron-is-dev' {
+  export const isDev: boolean
+}