update and run prettier

Added prettier option `--arrow-parens avoid` to cause least change

Author: gomain

package.json

@@ -13,23 +13,25 @@
     "patch-package": "./index.js"
   },
   "config": {
-    "allsrc": "src{/**,}/*.ts integration-tests{/**,}/*.ts property-based-tests{/**,}/*.ts"
+    "allsrc": "src{/**,}/*.ts integration-tests{/**,}/*.ts property-based-tests{/**,}/*.ts",
+    "prettier_options": "--no-semi --trailing-comma=all --arrow-parens avoid"
   },
   "scripts": {
     "precommit": "tsc --noEmit && lint-staged",
     "prepublishOnly": "yarn run clean && yarn run build",
     "build": "tsc --project tsconfig.build.json",
     "new-integration-test": "ts-node integration-tests/newIntegrationTest.ts",
     "clean": "rimraf dist patch-package.test*.tgz",
-    "format": "prettier --no-semi --write --trailing-comma=all $npm_package_config_allsrc",
+    "format": "prettier $npm_package_config_prettier_options --write $npm_package_config_allsrc",
+    "format:verify": "prettier $npm_package_config_prettier_options --list-different",
     "lint": "eslint $npm_package_config_allsrc",
     "prepack": "rimraf dist/**/*.test.js",
     "test": "./run-tests.sh --runInBand"
   },
-  "lint-staged": {
+  "lint-staged":{
     "*.ts": [
       "eslint",
-      "prettier --no-semi --trailing-comma=all --list-different"
+      "yarn format:verify"
     ]
   },
   "jest": {
@@ -70,7 +72,7 @@
     "jest": "^24.5.0",
     "lint-staged": "^8.1.5",
     "np": "^6.2.0",
-    "prettier": "^1.18.2",
+    "prettier": "^2.1.1",
     "randomstring": "^1.1.5",
     "ts-jest": "^24.0.0",
     "ts-node": "8.0.3",

src/makePatch.ts

@@ -103,7 +103,7 @@ export function makePatch({
     )).version as string
 
     // copy .npmrc/.yarnrc in case packages are hosted in private registry
-    [".npmrc", ".yarnrc"].forEach(rcFile => {
+    ;[".npmrc", ".yarnrc"].forEach(rcFile => {
       const rcPath = join(appPath, rcFile)
       if (existsSync(rcPath)) {
         copySync(rcPath, join(tmpRepo.name, rcFile))

src/packageIsDevDependency.ts

@@ -14,5 +14,7 @@ export function packageIsDevDependency({
     return false
   }
   const { devDependencies } = require(packageJsonPath)
-  return Boolean(devDependencies && devDependencies[packageDetails.packageNames[0]])
+  return Boolean(
+    devDependencies && devDependencies[packageDetails.packageNames[0]],
+  )
 }

src/spawnSafe.ts

@@ -1,34 +1,34 @@
-import { sync as spawnSync } from "cross-spawn"
-import { SpawnOptions } from "child_process"
-
-export interface SpawnSafeOptions extends SpawnOptions {
-  throwOnError?: boolean
-  logStdErrOnError?: boolean
-}
-
-const defaultOptions: SpawnSafeOptions = {
-  logStdErrOnError: true,
-  throwOnError: true,
-}
-
-export const spawnSafeSync = (
-  command: string,
-  args?: string[],
-  options?: SpawnSafeOptions,
-) => {
-  const mergedOptions = Object.assign({}, defaultOptions, options)
-  const result = spawnSync(command, args, options)
-  if (result.error || result.status !== 0) {
-    if (mergedOptions.logStdErrOnError) {
-      if (result.stderr) {
-        console.error(result.stderr.toString())
-      } else if (result.error) {
-        console.error(result.error)
-      }
-    }
-    if (mergedOptions.throwOnError) {
-      throw result
-    }
-  }
-  return result
-}
+import { sync as spawnSync } from "cross-spawn"
+import { SpawnOptions } from "child_process"
+
+export interface SpawnSafeOptions extends SpawnOptions {
+  throwOnError?: boolean
+  logStdErrOnError?: boolean
+}
+
+const defaultOptions: SpawnSafeOptions = {
+  logStdErrOnError: true,
+  throwOnError: true,
+}
+
+export const spawnSafeSync = (
+  command: string,
+  args?: string[],
+  options?: SpawnSafeOptions,
+) => {
+  const mergedOptions = Object.assign({}, defaultOptions, options)
+  const result = spawnSync(command, args, options)
+  if (result.error || result.status !== 0) {
+    if (mergedOptions.logStdErrOnError) {
+      if (result.stderr) {
+        console.error(result.stderr.toString())
+      } else if (result.error) {
+        console.error(result.error)
+      }
+    }
+    if (mergedOptions.throwOnError) {
+      throw result
+    }
+  }
+  return result
+}

yarn.lock

@@ -4754,10 +4754,10 @@ prepend-http@^2.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
   integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
-prettier@^1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
-  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
+prettier@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6"
+  integrity sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==
 
 pretty-format@^24.5.0:
   version "24.5.0"