port app/utils and app/plugins to ts

app/plugins/install.ts

@@ -3,9 +3,9 @@ import queue from 'queue';
 import ms from 'ms';
 import {yarn, plugs} from '../config/paths';
 
-export const install = fn => {
+export const install = (fn: Function) => {
   const spawnQueue = queue({concurrency: 1});
-  function yarnFn(args, cb) {
+  function yarnFn(args: string[], cb: Function) {
     const env = {
       NODE_ENV: 'production',
       ELECTRON_RUN_AS_NODE: 'true'
@@ -30,7 +30,7 @@ export const install = fn => {
           } else {
             cb(null);
           }
-          end();
+          end?.();
           spawnQueue.start();
         }
       );
@@ -39,7 +39,7 @@ export const install = fn => {
     spawnQueue.start();
   }
 
-  yarnFn(['install', '--no-emoji', '--no-lockfile', '--cache-folder', plugs.cache], err => {
+  yarnFn(['install', '--no-emoji', '--no-lockfile', '--cache-folder', plugs.cache], (err: any) => {
     if (err) {
       return fn(err);
     }

app/utils/cli-install.ts

@@ -79,13 +79,12 @@ const addBinToUserPath = () => {
   });
 };
 
-const logNotify = (withNotification, ...args) => {
+const logNotify = (withNotification: boolean, title: string, body: string, details?: any) => {
-  //eslint-disable-next-line no-console
+  console.log(title, body, details);
-  console.log(...args);
+  withNotification && notify(title, body, details);
-  withNotification && notify(...args);
 };
 
-export const installCLI = withNotification => {
+export const installCLI = (withNotification: boolean) => {
   if (process.platform === 'win32') {
     addBinToUserPath()
       .then(() =>

app/utils/map-keys.ts

@@ -1,5 +1,5 @@
-const generatePrefixedCommand = (command, shortcuts) => {
+const generatePrefixedCommand = (command: string, shortcuts: string[]) => {
-  const result = {};
+  const result: Record<string, string[]> = {};
   const baseCmd = command.replace(/:prefix$/, '');
   for (let i = 1; i <= 9; i++) {
     // 9 is a special number because it means 'last'
@@ -11,14 +11,15 @@ const generatePrefixedCommand = (command, shortcuts) => {
   return result;
 };
 
-export default config => {
+export default (config: Record<string, string[] | string>) => {
-  return Object.keys(config).reduce((keymap, command) => {
+  return Object.keys(config).reduce((keymap: Record<string, string[]>, command: string) => {
     if (!command) {
-      return;
+      return keymap;
     }
     // We can have different keys for a same command.
-    const shortcuts = Array.isArray(config[command]) ? config[command] : [config[command]];
+    const _shortcuts = config[command];
-    const fixedShortcuts = [];
+    const shortcuts = Array.isArray(_shortcuts) ? _shortcuts : [_shortcuts];
+    const fixedShortcuts: string[] = [];
     shortcuts.forEach(shortcut => {
       let newShortcut = shortcut;
       if (newShortcut.indexOf('cmd') !== -1) {

app/utils/renderer-utils.ts

@@ -1,14 +1,14 @@
-const rendererTypes = {};
+const rendererTypes: Record<string, string> = {};
 
 function getRendererTypes() {
   return rendererTypes;
 }
 
-function setRendererType(uid, type) {
+function setRendererType(uid: string, type: string) {
   rendererTypes[uid] = type;
 }
 
-function unsetRendererType(uid) {
+function unsetRendererType(uid: string) {
   delete rendererTypes[uid];
 }
 

app/utils/to-electron-background-color.ts

@@ -1,10 +1,10 @@
 // Packages
-const Color = require('color');
+import Color from 'color';
 
 // returns a background color that's in hex
 // format including the alpha channel (e.g.: `#00000050`)
 // input can be any css value (rgb, hsl, string…)
-module.exports = bgColor => {
+export default (bgColor: string) => {
   const color = Color(bgColor);
 
   if (color.alpha() === 1) {

app/utils/window-utils.ts

@@ -1,6 +1,6 @@
-const electron = require('electron');
+import electron from 'electron';
 
-function positionIsValid(position) {
+export function positionIsValid(position: [number, number]) {
   const displays = electron.screen.getAllDisplays();
   const [x, y] = position;
 
@@ -8,7 +8,3 @@ function positionIsValid(position) {
     return x >= workArea.x && x <= workArea.x + workArea.width && y >= workArea.y && y <= workArea.y + workArea.height;
   });
 }
-
-module.exports = {
-  positionIsValid
-};

package.json

@@ -303,6 +303,7 @@
     "@types/fs-extra": "8.0.1",
     "@types/mkdirp": "0.5.2",
     "@types/mousetrap": "^1.6.3",
+    "@types/ms": "0.7.31",
     "@types/node": "^12.12.21",
     "@types/pify": "3.0.2",
     "@types/plist": "3.0.2",

yarn.lock

@@ -708,6 +708,11 @@
   resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.3.tgz#3159a01a2b21c9155a3d8f85588885d725dc987d"
   integrity sha512-13gmo3M2qVvjQrWNseqM3+cR6S2Ss3grbR2NZltgMq94wOwqJYQdgn8qzwDshzgXqMlSUtyPZjysImmktu22ew==
 
+"@types/ms@0.7.31":
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
+  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+
 "@types/node@*", "@types/node@^12.0.12", "@types/node@^12.12.21":
   version "12.12.21"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.21.tgz#aa44a6363291c7037111c47e4661ad210aded23f"