Merge pull request #14 from ferocia/cleanup-dependencies

Cleanup dependencies

Author: levibuzolic

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "trailingComma": "es5"
+}

package.json

@@ -5,22 +5,18 @@
   },
   "dependencies": {
     "execa": "^6.1.0",
-    "minimist": "^1.2.0",
-    "pify": "^3.0.0",
-    "tempfile": "^2.0.0",
-    "which": "^1.2.14"
+    "minimist": "^1.2.7",
+    "tempy": "^3.0.0",
+    "which": "^3.0.0"
   },
   "description": "A CLI for grabbing ios/android screenshots and saving to your clipboard or filesystem.",
   "devDependencies": {
-    "@types/minimist": "^1.2.0",
-    "@types/node": "^18.11.13",
-    "@types/pify": "^0.0.28",
-    "@types/tempfile": "^1.1.5",
-    "@types/which": "^1.0.28",
+    "@types/minimist": "^1.2.2",
+    "@types/node": "^18.11.14",
+    "@types/which": "^2.0.1",
     "np": "^7.6.2",
-    "prettier": "^1.4.2",
-    "rimraf": "^2.6.1",
-    "tslint": "^5.4.2",
+    "prettier": "^2.8.1",
+    "rimraf": "^3.0.2",
     "typescript": "^4.9.4"
   },
   "files": [
@@ -36,6 +32,10 @@
   ],
   "license": "MIT",
   "name": "@ferocia-oss/osnap",
+  "np": {
+    "yarn": true,
+    "branch": "main"
+  },
   "private": false,
   "publishConfig": {
     "access": "public"

src/android.ts

@@ -1,7 +1,7 @@
 import { CliParameters } from './cli-parameters'
 import { ErrorCode, createError } from './errors'
-import { which } from './which'
-import * as execa from 'execa'
+import which from 'which'
+import {execa} from 'execa'
 import { existsSync, createWriteStream } from 'fs'
 
 /**

src/cli-parameters.ts

@@ -1,6 +1,6 @@
-import * as minimist from 'minimist'
+import minimist from 'minimist'
 import { createError, ErrorCode } from './errors'
-import * as tempfile from 'tempfile'
+import {temporaryFile} from 'tempy';
 
 export type Platform = 'ios' | 'android'
 
@@ -52,7 +52,7 @@ export function parse(argv?: string[]): CliParameters {
   // grab what we need
   const platform = getPlatform(parsed)
   const useClipboard = !parsed['f']
-  const filename = (parsed['f'] as string) || tempfile('.png')
+  const filename = (parsed['f'] as string) || temporaryFile({extension: 'png'});
   const device = parsed['d'] as string
 
   return { platform, filename, device, useClipboard }

src/copy-to-clipboard.ts

@@ -1,4 +1,4 @@
-import * as execa from 'execa'
+import {execa} from 'execa'
 import { ErrorCode, createError } from './errors'
 import { resolve } from 'path'
 

src/ios.ts

@@ -1,7 +1,7 @@
 import { CliParameters } from './cli-parameters'
-import { which } from './which'
+import which from 'which'
 import { ErrorCode, createError } from './errors'
-import * as execa from 'execa'
+import {execa} from 'execa'
 
 /**
  * Finds the path to xcrun or throws an error.
@@ -57,10 +57,7 @@ export async function checkSimulator(xcrunPath: string, device?: string): Promis
  */
 export async function saveScreenshot(xcrunPath: string, device: string, filename: string) {
   try {
-    const response = await execa(xcrunPath, ['simctl', 'io', device, 'screenshot', filename])
-    if (response.code !== 0) {
-      throw createError(ErrorCode.ScreenshotFail)
-    }
+    await execa(xcrunPath, ['simctl', 'io', device, 'screenshot', filename])
   } catch (err) {
     throw createError(ErrorCode.ScreenshotFail)
   }

src/which.ts

@@ -6,11 +6,12 @@
     "noImplicitAny": false,
     "noImplicitThis": true,
     "noUnusedLocals": true,
+    "esModuleInterop": true,
     "pretty": true,
     "target": "es5",
     "lib": ["es2015"],
     "typeRoots": [
       "node_modules/@types"
     ]
   }
-}
+}