Merge pull request #103 from skellock/bump-deps

Bump deps

Author: skellock

justfile

@@ -0,0 +1,50 @@
+# justfile
+#
+# Holds some misc scripts that I need to run on this project every once in a while.
+#
+# USAGE:
+#
+#    just
+#
+# INSTALL:
+#
+#    https://github.com/casey/just#installation
+#
+
+green = "\\033[0;32m"
+red = "\\033[0;31m"
+clear = "\\033[0m"
+notFoundMessage = "\\033[0;31mmissing\\033[0m"
+foundMessage = "\\033[0;32mok\\033[0m"
+
+# list the tasks
+_default:
+  @just --list
+
+# check the global-dependencies
+@globals:
+  echo
+  echo "       fd: `which fd > /dev/null && echo "{{ green }}$(fd --version | cut -d" " -f2){{ clear }}" || echo "{{ notFoundMessage }}"`"
+  echo "     yarn: `which yarn > /dev/null && echo "{{ green }}$(yarn --version){{ clear }}" || echo "{{ notFoundMessage }}"`"
+  echo "     node: `which node > /dev/null && echo "{{ green }}$(node -v | sed s/v//){{ clear }}" || echo "{{ notFoundMessage }}"`"
+  echo
+
+# install dependencies -- only needed if something goes wrong with the silly yarn nested scoped packages bug
+@deps:
+  rm -rf node_modules
+  yarn
+  # kill nested react typings ... ugh
+  fd -p -I -td "@types.*@types/react" node_modules/@types -x rm -rf
+  
+# cuts the distributable builds
+@dist:
+  yarn clean
+  rm -rf node_modules
+  yarn
+  yarn typecheck
+  yarn lint
+  yarn test
+  yarn clean
+  yarn compile
+  yarn dist
+

package.json

@@ -45,70 +45,70 @@
   },
   "scripts": {
     "build-storybook": "build-storybook",
-    "check": "tsc -p . --noEmit --pretty",
-    "clean": "rm -rf .fusebox out dist",
+    "typecheck": "tsc -p . --noEmit --pretty",
+    "clean": "rm -rf .fusebox out dist coverage",
     "compile": "NODE_ENV=production ts-node fuse",
     "coverage:upload": "cat ./coverage/lcov.info | coveralls",
     "coverage": "yarn test --coverage --no-cache",
     "dist": "electron-builder --mac --win --linux --ia32 --x64",
     "draft": "electron-builder -p always --draft --mac --win --linux --ia32 --x64",
-    "info": "npm-scripts-info",
-    "lint": "tslint \"fuse.ts\" \"{src,typings}/**/*.{ts,tsx}\"",
+    "lint": "tslint --project .",
     "pack": "electron-builder --dir",
     "postinstall": "electron-builder install-app-deps",
     "precommit": "lint-staged",
-    "prepush": "npm-run-all check lint",
-    "sanity": "npm-run-all clean check lint test clean compile clean",
+    "prepush": "npm-run-all typecheck lint",
+    "sanity": "npm-run-all clean typecheck lint test clean compile clean",
     "start": "ts-node fuse",
     "storybook": "start-storybook -p 6006",
     "test": "jest"
   },
   "dependencies": {
     "electron-is-dev": "^0.3.0",
-    "electron-log": "^2.2.11",
+    "electron-log": "^2.2.12",
     "electron-store": "^1.3.0",
-    "electron-updater": "^2.16.1",
+    "electron-updater": "^2.17.2",
     "electron-window-state-manager": "^0.3.2",
     "glamor": "^2.20.40",
     "mousetrap": "^1.6.1",
     "popmotion": "^7.8.2",
     "popmotion-react": "^1.1.1",
+    "prop-types": "^15.6.0",
     "ramda": "^0.25.0",
-    "react": "^16.1.0",
-    "react-dom": "^16.1.0",
+    "react": "^16.2.0",
+    "react-dom": "^16.2.0",
     "react-transition-group": "^2.2.1"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^3.2.15",
-    "@storybook/addon-links": "^3.2.15",
-    "@storybook/addon-storyshots": "^3.2.15",
-    "@storybook/react": "^3.2.15",
+    "@storybook/addon-actions": "^3.2.17",
+    "@storybook/addon-links": "^3.2.17",
+    "@storybook/addon-storyshots": "^3.2.17",
+    "@storybook/react": "^3.2.17",
     "@types/electron-is-dev": "^0.3.0",
     "@types/electron-store": "^1.2.0",
-    "@types/jest": "^21.1.6",
+    "@types/jest": "^21.1.8",
     "@types/mousetrap": "^1.5.34",
-    "@types/react": "^16.0.22",
+    "@types/react": "^16.0.28",
     "@types/react-dom": "^16.0.3",
     "@types/react-test-renderer": "^16.0.0",
     "@types/storybook__react": "^3.0.5",
     "babel-preset-react": "^6.24.1",
     "coveralls": "^3.0.0",
     "electron": "^1.7.9",
-    "electron-builder": "^19.45.4",
+    "electron-builder": "^19.48.3",
     "fuse-box": "^2.4.0",
     "husky": "^0.14.3",
     "jest": "^21.2.1",
     "jest-expect-contain-deep": "^1.0.1",
-    "lint-staged": "^5.0.0",
+    "lint-staged": "^6.0.0",
     "npm-run-all": "^4.1.2",
-    "prettier": "^1.8.2",
+    "prettier": "^1.9.1",
     "react-powerplug": "^0.1.2",
-    "react-test-renderer": "^16.0.0",
-    "ts-jest": "^21.2.1",
-    "ts-loader": "^3.1.1",
+    "react-test-renderer": "^16.2.0",
+    "ts-jest": "^21.2.4",
+    "ts-loader": "^3.2.0",
     "ts-node": "^3.3.0",
     "tslint": "^5.8.0",
-    "typescript": "~2.6.1"
+    "typescript": "~2.6.2"
   },
   "jest": {
     "setupFiles": [
@@ -145,7 +145,7 @@
         "statements": 95
       }
     },
-    "collectCoverage": true,
+    "collectCoverage": false,
     "mapCoverage": true
   },
   "lint-staged": {

src/main/main-window/main-window.test.ts

@@ -1,7 +1,7 @@
 import { createMainWindow } from './main-window'
-import * as WindowStateManager from 'electron-window-state-manager'
 import * as containDeep from 'jest-expect-contain-deep'
 import { BrowserWindow } from 'electron'
+const WindowStateManager = require('electron-window-state-manager')
 
 it('can read window state', () => {
   WindowStateManager.mockImplementation(() => ({ width: 10, height: 40 }))

src/renderer/platform/components/spin-animation/spin-animation-state.test.ts

@@ -13,10 +13,10 @@ test('createSpinStates', () => {
   expect(typeof states.forward).toBe('function')
   expect(typeof states.back).toBe('function')
 
-  const forwardResults = states.forward({ value: { get: () => 1 } })
+  const forwardResults: any = states.forward({ value: { get: () => 1 } } as any)
   expect(forwardResults.current).toBe(1)
 
-  const backResults = states.back({ value: { get: () => 1 } })
+  const backResults: any = states.back({ value: { get: () => 1 } } as any)
   expect(backResults.current).toBe(1)
 
   const value: any = () => {}

tsconfig.json

@@ -11,6 +11,8 @@
     "inlineSourceMap": true
   },
   "include": [
-    "src"
+    "src",
+    "typings",
+    "fuse.ts"
   ]
 }