Use named exports everywhere

Author: KevinVlaanderen

src/detectPackageManager.ts

@@ -1,44 +1,10 @@
 import * as fs from "fs"
-import * as path from "./path"
+import { join } from "./path"
 import * as chalk from "chalk"
 import * as process from "process"
 
 export type PackageManager = "yarn" | "npm" | "npm-shrinkwrap"
 
-export default function detectPackageManager(
-  appRootPath: string,
-  overridePackageManager: PackageManager | null,
-): PackageManager {
-  const packageLockExists = fs.existsSync(
-    path.join(appRootPath, "package-lock.json"),
-  )
-  const shrinkWrapExists = fs.existsSync(
-    path.join(appRootPath, "npm-shrinkwrap.json"),
-  )
-  const yarnLockExists = fs.existsSync(path.join(appRootPath, "yarn.lock"))
-  if ((packageLockExists || shrinkWrapExists) && yarnLockExists) {
-    if (overridePackageManager) {
-      return overridePackageManager
-    } else {
-      printSelectingDefaultMessage()
-      return shrinkWrapExists ? "npm-shrinkwrap" : "npm"
-    }
-  } else if (packageLockExists || shrinkWrapExists) {
-    if (overridePackageManager === "yarn") {
-      printNoYarnLockfileError()
-      process.exit(1)
-    } else {
-      return shrinkWrapExists ? "npm-shrinkwrap" : "npm"
-    }
-  } else if (yarnLockExists) {
-    return "yarn"
-  } else {
-    printNoLockfilesError()
-    process.exit(1)
-  }
-  throw Error()
-}
-
 function printNoYarnLockfileError() {
   console.error(`
 ${chalk.red.bold("**ERROR**")} ${chalk.red(
@@ -69,3 +35,37 @@ package-lock.json if you don't need it
 `,
   )
 }
+
+export const detectPackageManager = (
+  appRootPath: string,
+  overridePackageManager: PackageManager | null,
+): PackageManager => {
+  const packageLockExists = fs.existsSync(
+    join(appRootPath, "package-lock.json"),
+  )
+  const shrinkWrapExists = fs.existsSync(
+    join(appRootPath, "npm-shrinkwrap.json"),
+  )
+  const yarnLockExists = fs.existsSync(join(appRootPath, "yarn.lock"))
+  if ((packageLockExists || shrinkWrapExists) && yarnLockExists) {
+    if (overridePackageManager) {
+      return overridePackageManager
+    } else {
+      printSelectingDefaultMessage()
+      return shrinkWrapExists ? "npm-shrinkwrap" : "npm"
+    }
+  } else if (packageLockExists || shrinkWrapExists) {
+    if (overridePackageManager === "yarn") {
+      printNoYarnLockfileError()
+      process.exit(1)
+    } else {
+      return shrinkWrapExists ? "npm-shrinkwrap" : "npm"
+    }
+  } else if (yarnLockExists) {
+    return "yarn"
+  } else {
+    printNoLockfilesError()
+    process.exit(1)
+  }
+  throw Error()
+}

src/getAppRootPath.ts

@@ -1,12 +1,12 @@
 import * as fs from "fs"
-import * as path from "./path"
+import { join, resolve } from "./path"
 import * as process from "process"
 import { AppPath } from "./applyPatches"
 
-export default function getAppRootPath(): AppPath {
+export const getAppRootPath = (): AppPath => {
   let cwd = process.cwd()
-  while (!fs.existsSync(path.join(cwd, "package.json"))) {
-    cwd = path.resolve(cwd, "../")
+  while (!fs.existsSync(join(cwd, "package.json"))) {
+    cwd = resolve(cwd, "../")
   }
   return cwd as AppPath
 }

src/index.ts

@@ -3,10 +3,10 @@ import * as process from "process"
 import * as minimist from "minimist"
 
 import { applyPatchesForApp } from "./applyPatches"
-import getAppRootPath from "./getAppRootPath"
-import makePatch from "./makePatch"
-import makeRegExp from "./makeRegExp"
-import detectPackageManager from "./detectPackageManager"
+import { getAppRootPath } from "./getAppRootPath"
+import { makePatch } from "./makePatch"
+import { makeRegExp } from "./makeRegExp"
+import { detectPackageManager } from "./detectPackageManager"
 
 const appPath = getAppRootPath()
 const argv = minimist(process.argv.slice(2), {

src/makePatch.ts

@@ -1,6 +1,6 @@
 import { green } from "chalk"
 import * as fs from "fs"
-import * as path from "./path"
+import { join, dirname, relative } from "./path"
 import * as rimraf from "rimraf"
 import * as tmp from "tmp"
 import {
@@ -18,16 +18,27 @@ function deleteScripts(json: any) {
   return json
 }
 
-export default function makePatch(
+function printNoPackageFoundError(
+  packageName: string,
+  packageJsonPath: string,
+) {
+  console.error(
+    `No such package ${packageName}
+
+  File not found: ${packageJsonPath}`,
+  )
+}
+
+export const makePatch = (
   packageName: string,
   appPath: string,
   packageManager: PackageManager,
   includePaths: RegExp,
   excludePaths: RegExp,
-) {
-  const nodeModulesPath = path.join(appPath, "node_modules")
-  const packagePath = path.join(nodeModulesPath, packageName)
-  const packageJsonPath = path.join(packagePath, "package.json")
+) => {
+  const nodeModulesPath = join(appPath, "node_modules")
+  const packagePath = join(nodeModulesPath, packageName)
+  const packageJsonPath = join(packagePath, "package.json")
   if (!fs.existsSync(packageJsonPath)) {
     printNoPackageFoundError(packageName, packageJsonPath)
     process.exit(1)
@@ -36,12 +47,12 @@ export default function makePatch(
   const packageVersion = require(packageJsonPath).version
 
   const tmpRepo = tmp.dirSync({ unsafeCleanup: true })
-  const tmpRepoNodeModulesPath = path.join(tmpRepo.name, "node_modules")
-  const tmpRepoPackageJsonPath = path.join(tmpRepo.name, "package.json")
-  const tmpRepoPackagePath = path.join(tmpRepoNodeModulesPath, packageName)
+  const tmpRepoNodeModulesPath = join(tmpRepo.name, "node_modules")
+  const tmpRepoPackageJsonPath = join(tmpRepo.name, "package.json")
+  const tmpRepoPackagePath = join(tmpRepoNodeModulesPath, packageName)
 
   try {
-    const patchesDir = path.join(appPath, "patches")
+    const patchesDir = join(appPath, "patches")
 
     if (!fs.existsSync(patchesDir)) {
       fs.mkdirSync(patchesDir)
@@ -55,9 +66,9 @@ export default function makePatch(
           console.info(
             green("☑"),
             "Removing existing",
-            path.relative(process.cwd(), path.join(patchesDir, fileName)),
+            relative(process.cwd(), join(patchesDir, fileName)),
           )
-          fs.unlinkSync(path.join(patchesDir, fileName))
+          fs.unlinkSync(join(patchesDir, fileName))
         }
       })
     }
@@ -68,8 +79,8 @@ export default function makePatch(
       spawnSafeSync(command, args, { cwd: tmpRepo.name })
     // reinstall a clean version of the user's node_modules in our tmp location
     fsExtra.copySync(
-      path.join(appPath, "package.json"),
-      path.join(tmpRepo.name, "package.json"),
+      join(appPath, "package.json"),
+      join(tmpRepo.name, "package.json"),
     )
     // resolve relative file paths in package.json
     // also delete scripts
@@ -79,16 +90,16 @@ export default function makePatch(
         deleteScripts(
           resolveRelativeFileDependenciesInPackageJson(
             appPath,
-            require(path.join(tmpRepo.name, "package.json")),
+            require(join(tmpRepo.name, "package.json")),
           ),
         ),
       ),
     )
 
     if (packageManager === "yarn") {
       fsExtra.copySync(
-        path.join(appPath, "yarn.lock"),
-        path.join(tmpRepo.name, "yarn.lock"),
+        join(appPath, "yarn.lock"),
+        join(tmpRepo.name, "yarn.lock"),
       )
       console.info(green("☑"), "Building clean node_modules with yarn")
       tmpExec(`yarn`)
@@ -99,14 +110,14 @@ export default function makePatch(
           : "package-lock.json"
 
       const lockFileContents = JSON.parse(
-        fsExtra.readFileSync(path.join(appPath, lockFileName)).toString(),
+        fsExtra.readFileSync(join(appPath, lockFileName)).toString(),
       )
       const resolvedLockFileContents = resolveRelativeFileDependenciesInPackageLock(
         appPath,
         lockFileContents,
       )
       fs.writeFileSync(
-        path.join(tmpRepo.name, lockFileName),
+        join(tmpRepo.name, lockFileName),
         JSON.stringify(resolvedLockFileContents),
       )
       console.info(green("☑"), "Building clean node_modules with npm")
@@ -115,13 +126,10 @@ export default function makePatch(
 
     // commit the package
     console.info(green("☑"), "Diffing your files with clean files")
-    fs.writeFileSync(
-      path.join(tmpRepo.name, ".gitignore"),
-      "!/node_modules\n\n",
-    )
+    fs.writeFileSync(join(tmpRepo.name, ".gitignore"), "!/node_modules\n\n")
     tmpExec("git", ["init"])
     // don't commit package.json though
-    tmpExec("git", ["add", "-f", slash(path.join("node_modules", packageName))])
+    tmpExec("git", ["add", "-f", slash(join("node_modules", packageName))])
 
     tmpExec("git", ["commit", "-m", "init"])
 
@@ -130,7 +138,7 @@ export default function makePatch(
     fsExtra.copySync(packagePath, tmpRepoPackagePath, { recursive: true })
 
     // stage all files
-    tmpExec("git", ["add", "-f", slash(path.join("node_modules", packageName))])
+    tmpExec("git", ["add", "-f", slash(join("node_modules", packageName))])
 
     // unstage any ignored files so they don't show up in the diff
     tmpExec("git", ["diff", "--cached", "--name-only"])
@@ -155,7 +163,7 @@ export default function makePatch(
       "--cached",
       "--no-color",
       "--ignore-space-at-eol",
-      "--no-ext-diff"
+      "--no-ext-diff",
     ]).stdout.toString()
 
     if (patch.trim() === "") {
@@ -164,10 +172,10 @@ export default function makePatch(
       process.exit(1)
     } else {
       const patchFileName = `${packageName}+${packageVersion}.patch`
-      const patchPath = path.join(patchesDir, patchFileName)
-      if (!fs.existsSync(path.dirname(patchPath))) {
+      const patchPath = join(patchesDir, patchFileName)
+      if (!fs.existsSync(dirname(patchPath))) {
         // scoped package
-        fs.mkdirSync(path.dirname(patchPath))
+        fs.mkdirSync(dirname(patchPath))
       }
       fs.writeFileSync(patchPath, patch)
       console.log(`${green("✔")} Created file patches/${patchFileName}`)
@@ -179,14 +187,3 @@ export default function makePatch(
     tmpRepo.removeCallback()
   }
 }
-
-function printNoPackageFoundError(
-  packageName: string,
-  packageJsonPath: string,
-) {
-  console.error(
-    `No such package ${packageName}
-
-  File not found: ${packageJsonPath}`,
-  )
-}

src/makeRegExp.ts

@@ -1,11 +1,11 @@
 import { red } from "chalk"
 
-export default function makeRegExp(
+export const makeRegExp = (
   reString: string,
   name: string,
   defaultValue: RegExp,
   caseSensitive: boolean,
-): RegExp {
+): RegExp => {
   if (!reString) {
     return defaultValue
   } else {

src/patchFs.ts

@@ -1,17 +1,17 @@
 import * as fs from "fs-extra"
-import * as path from "./path"
+import { join } from "./path"
 
 function _getPatchFiles(
   rootPatchesDir: string,
   scopedDir: string = "",
   acc: string[] = [],
 ) {
-  fs.readdirSync(path.join(rootPatchesDir, scopedDir)).forEach(filename => {
+  fs.readdirSync(join(rootPatchesDir, scopedDir)).forEach(filename => {
     if (filename.endsWith(".patch")) {
-      acc.push(path.join(scopedDir, filename))
+      acc.push(join(scopedDir, filename))
     } else if (
       filename.startsWith("@") &&
-      fs.statSync(path.join(rootPatchesDir, filename)).isDirectory()
+      fs.statSync(join(rootPatchesDir, filename)).isDirectory()
     ) {
       _getPatchFiles(rootPatchesDir, filename, acc)
     }

tslint.json

@@ -15,7 +15,8 @@
     "one-line": [false],
     "object-literal-sort-keys": [false],
     "no-trailing-whitespace": [false],
-    "object-literal-key-quotes": [false]
+    "object-literal-key-quotes": [false],
+    "no-default-export": true
   },
   "rulesDirectory": []
 }