diff --git a/.changeset/soft-moons-lay.md b/.changeset/soft-moons-lay.md new file mode 100644 index 00000000..77441844 --- /dev/null +++ b/.changeset/soft-moons-lay.md @@ -0,0 +1,5 @@ +--- +"@unts/patch-package": patch +--- + +chore: migrate `chalk` to `picocolors` and `NO_COLOR` env diff --git a/package.json b/package.json index a9254561..a1ff299e 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,6 @@ "dependencies": { "@nolyfill/json-stable-stringify": "^1.0.30", "@yarnpkg/lockfile": "^1.1.0", - "chalk": "^4.1.2", "ci-info": "^3.7.0", "cross-spawn": "^7.0.3", "find-yarn-workspace-root": "^2.0.0", @@ -89,6 +88,7 @@ "klaw-sync": "^6.0.0", "minimist": "^1.2.6", "open": "^7.4.2", + "picocolors": "^1.1.1", "semver": "^7.5.3", "slash": "^3.0.0", "tmp": "^0.0.33", diff --git a/run-tests.sh b/run-tests.sh index 894d5268..c1645703 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -1,12 +1,10 @@ #!/usr/bin/env bash set -e -export CI=true - yarn clean yarn build version=$(node -e 'console.log(require("./package.json").version)') yarn version --new-version 0.0.0 --no-git-tag-version --no-commit-hooks yarn pack --filename patch-package.test.$(date +%s).tgz yarn version --new-version $version --no-git-tag-version --no-commit-hooks -yarn jest "$@" +NO_COLOR=1 yarn jest "$@" diff --git a/src/applyPatches.ts b/src/applyPatches.ts index 8e1f7bb9..2da417e7 100644 --- a/src/applyPatches.ts +++ b/src/applyPatches.ts @@ -1,6 +1,6 @@ -import colors from "chalk" import { existsSync, writeFileSync } from "fs-extra" import { posix } from "path" +import colors from "picocolors" import semver from "semver" import { hashFile } from "./hash" import { logPatchSequenceError } from "./makePatch" diff --git a/src/createIssue.ts b/src/createIssue.ts index 7d1015d9..75d3d67f 100644 --- a/src/createIssue.ts +++ b/src/createIssue.ts @@ -1,5 +1,5 @@ -import colors from "chalk" import open from "open" +import colors from "picocolors" import { stringify } from "querystring" import { PackageManager } from "./detectPackageManager" import { PackageDetails } from "./PackageDetails" diff --git a/src/detectPackageManager.ts b/src/detectPackageManager.ts index 0b7a6c80..efe1359c 100644 --- a/src/detectPackageManager.ts +++ b/src/detectPackageManager.ts @@ -1,6 +1,6 @@ -import colors from "chalk" import findWorkspaceRoot from "find-yarn-workspace-root" import fs from "fs-extra" +import colors from "picocolors" import { join } from "./path" export type PackageManager = "yarn" | "npm" | "npm-shrinkwrap" diff --git a/src/index.ts b/src/index.ts index 028870ff..6e51d976 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,7 @@ -import colors from "chalk" import { isCI } from "ci-info" import minimist from "minimist" import { normalize, sep } from "path" +import colors from "picocolors" import slash from "slash" import { applyPatchesForApp } from "./applyPatches" import { detectPackageManager } from "./detectPackageManager" diff --git a/src/makePatch.ts b/src/makePatch.ts index 659d1929..7629840a 100644 --- a/src/makePatch.ts +++ b/src/makePatch.ts @@ -1,4 +1,3 @@ -import colors from "chalk" import { copySync, existsSync, @@ -9,6 +8,7 @@ import { renameSync, writeFileSync, } from "fs-extra" +import colors from "picocolors" import { dirSync } from "tmp" import { gzipSync } from "zlib" import { applyPatch } from "./applyPatches" diff --git a/src/makeRegExp.ts b/src/makeRegExp.ts index 85e79e77..dcbb0f4b 100644 --- a/src/makeRegExp.ts +++ b/src/makeRegExp.ts @@ -1,4 +1,4 @@ -import colors from "chalk" +import colors from "picocolors" export const makeRegExp = ( reString: string, diff --git a/src/patch/read.ts b/src/patch/read.ts index afad154f..d24e6bb2 100644 --- a/src/patch/read.ts +++ b/src/patch/read.ts @@ -1,6 +1,6 @@ -import colors from "chalk" import { readFileSync } from "fs-extra" import { normalize } from "path" +import colors from "picocolors" import { PackageDetails } from "../PackageDetails" import { relative, resolve } from "../path" import { parsePatchFile, PatchFilePart } from "./parse" diff --git a/src/rebase.ts b/src/rebase.ts index 6fce8985..e32814ce 100644 --- a/src/rebase.ts +++ b/src/rebase.ts @@ -1,5 +1,5 @@ -import colors from "chalk" import { join, resolve } from "path" +import colors from "picocolors" import { applyPatch } from "./applyPatches" import { hashFile } from "./hash" import { PatchedPackageDetails } from "./PackageDetails" diff --git a/src/stateFile.ts b/src/stateFile.ts index c5b58313..0984c5ed 100644 --- a/src/stateFile.ts +++ b/src/stateFile.ts @@ -1,7 +1,7 @@ import stringify from "@nolyfill/json-stable-stringify" -import colors from "chalk" import { existsSync, readFileSync, unlinkSync, writeFileSync } from "fs" import { join } from "path" +import colors from "picocolors" import { hashFile } from "./hash" import { PackageDetails } from "./PackageDetails" export interface PatchState { diff --git a/yarn.lock b/yarn.lock index 795440f8..c78bb4b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5224,10 +5224,10 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +picocolors@^1.0.0, picocolors@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== picomatch@^2.3.1: version "2.3.1"