From 36c7fc127da42a66fd9d730b7cb797550dccfbf5 Mon Sep 17 00:00:00 2001 From: JounQin Date: Sun, 2 Mar 2025 10:32:17 +0800 Subject: [PATCH 1/3] chore: replace chalk with colorette --- package.json | 2 +- src/applyPatches.ts | 2 +- src/createIssue.ts | 2 +- src/detectPackageManager.ts | 2 +- src/index.ts | 2 +- src/makePatch.ts | 2 +- src/makeRegExp.ts | 2 +- src/patch/read.ts | 2 +- src/rebase.ts | 2 +- src/stateFile.ts | 2 +- yarn.lock | 5 +++++ 11 files changed, 15 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index a9254561..182e3d1a 100644 --- a/package.json +++ b/package.json @@ -81,8 +81,8 @@ "dependencies": { "@nolyfill/json-stable-stringify": "^1.0.30", "@yarnpkg/lockfile": "^1.1.0", - "chalk": "^4.1.2", "ci-info": "^3.7.0", + "colorette": "^2.0.20", "cross-spawn": "^7.0.3", "find-yarn-workspace-root": "^2.0.0", "fs-extra": "^10.0.0", diff --git a/src/applyPatches.ts b/src/applyPatches.ts index 8e1f7bb9..38f684fd 100644 --- a/src/applyPatches.ts +++ b/src/applyPatches.ts @@ -1,4 +1,4 @@ -import colors from "chalk" +import colors from "colorette" import { existsSync, writeFileSync } from "fs-extra" import { posix } from "path" import semver from "semver" diff --git a/src/createIssue.ts b/src/createIssue.ts index 7d1015d9..d9a2e38c 100644 --- a/src/createIssue.ts +++ b/src/createIssue.ts @@ -1,4 +1,4 @@ -import colors from "chalk" +import colors from "colorette" import open from "open" import { stringify } from "querystring" import { PackageManager } from "./detectPackageManager" diff --git a/src/detectPackageManager.ts b/src/detectPackageManager.ts index 0b7a6c80..e91c1178 100644 --- a/src/detectPackageManager.ts +++ b/src/detectPackageManager.ts @@ -1,4 +1,4 @@ -import colors from "chalk" +import colors from "colorette" import findWorkspaceRoot from "find-yarn-workspace-root" import fs from "fs-extra" import { join } from "./path" diff --git a/src/index.ts b/src/index.ts index 028870ff..e88c7e74 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,4 @@ -import colors from "chalk" +import colors from "colorette" import { isCI } from "ci-info" import minimist from "minimist" import { normalize, sep } from "path" diff --git a/src/makePatch.ts b/src/makePatch.ts index 659d1929..575c0c7c 100644 --- a/src/makePatch.ts +++ b/src/makePatch.ts @@ -1,4 +1,4 @@ -import colors from "chalk" +import colors from "colorette" import { copySync, existsSync, diff --git a/src/makeRegExp.ts b/src/makeRegExp.ts index 85e79e77..063eb8ab 100644 --- a/src/makeRegExp.ts +++ b/src/makeRegExp.ts @@ -1,4 +1,4 @@ -import colors from "chalk" +import colors from "colorette" export const makeRegExp = ( reString: string, diff --git a/src/patch/read.ts b/src/patch/read.ts index afad154f..71fa39ce 100644 --- a/src/patch/read.ts +++ b/src/patch/read.ts @@ -1,4 +1,4 @@ -import colors from "chalk" +import colors from "colorette" import { readFileSync } from "fs-extra" import { normalize } from "path" import { PackageDetails } from "../PackageDetails" diff --git a/src/rebase.ts b/src/rebase.ts index 6fce8985..bd36e812 100644 --- a/src/rebase.ts +++ b/src/rebase.ts @@ -1,4 +1,4 @@ -import colors from "chalk" +import colors from "colorette" import { join, resolve } from "path" import { applyPatch } from "./applyPatches" import { hashFile } from "./hash" diff --git a/src/stateFile.ts b/src/stateFile.ts index c5b58313..a1dbe358 100644 --- a/src/stateFile.ts +++ b/src/stateFile.ts @@ -1,5 +1,5 @@ import stringify from "@nolyfill/json-stable-stringify" -import colors from "chalk" +import colors from "colorette" import { existsSync, readFileSync, unlinkSync, writeFileSync } from "fs" import { join } from "path" import { hashFile } from "./hash" diff --git a/yarn.lock b/yarn.lock index 795440f8..69301377 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1661,6 +1661,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +colorette@^2.0.20: + version "2.0.20" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" + integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== + combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" From 5ffb22634647eb0c04493c7d5a1fbdd1a9a0171a Mon Sep 17 00:00:00 2001 From: JounQin Date: Sun, 2 Mar 2025 10:55:46 +0800 Subject: [PATCH 2/3] Create fast-onions-count.md --- .changeset/fast-onions-count.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/fast-onions-count.md diff --git a/.changeset/fast-onions-count.md b/.changeset/fast-onions-count.md new file mode 100644 index 00000000..9ed3cdec --- /dev/null +++ b/.changeset/fast-onions-count.md @@ -0,0 +1,5 @@ +--- +"@unts/patch-package": patch +--- + +chore: replace `chalk` with `colorette` From 0f46b4d9acb61e7348f13ac092fcdae65aa488ee Mon Sep 17 00:00:00 2001 From: JounQin Date: Sun, 2 Mar 2025 11:02:11 +0800 Subject: [PATCH 3/3] chore: colorette has __esModule property --- src/applyPatches.ts | 2 +- src/createIssue.ts | 2 +- src/detectPackageManager.ts | 2 +- src/index.ts | 2 +- src/makePatch.ts | 2 +- src/makeRegExp.ts | 2 +- src/patch/read.ts | 2 +- src/rebase.ts | 2 +- src/stateFile.ts | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/applyPatches.ts b/src/applyPatches.ts index 38f684fd..5360fbc2 100644 --- a/src/applyPatches.ts +++ b/src/applyPatches.ts @@ -1,4 +1,4 @@ -import colors from "colorette" +import * as colors from "colorette" import { existsSync, writeFileSync } from "fs-extra" import { posix } from "path" import semver from "semver" diff --git a/src/createIssue.ts b/src/createIssue.ts index d9a2e38c..82b1a09d 100644 --- a/src/createIssue.ts +++ b/src/createIssue.ts @@ -1,4 +1,4 @@ -import colors from "colorette" +import * as colors from "colorette" import open from "open" import { stringify } from "querystring" import { PackageManager } from "./detectPackageManager" diff --git a/src/detectPackageManager.ts b/src/detectPackageManager.ts index e91c1178..6fb216b7 100644 --- a/src/detectPackageManager.ts +++ b/src/detectPackageManager.ts @@ -1,4 +1,4 @@ -import colors from "colorette" +import * as colors from "colorette" import findWorkspaceRoot from "find-yarn-workspace-root" import fs from "fs-extra" import { join } from "./path" diff --git a/src/index.ts b/src/index.ts index e88c7e74..99e1d16b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,4 @@ -import colors from "colorette" +import * as colors from "colorette" import { isCI } from "ci-info" import minimist from "minimist" import { normalize, sep } from "path" diff --git a/src/makePatch.ts b/src/makePatch.ts index 575c0c7c..ae692cc8 100644 --- a/src/makePatch.ts +++ b/src/makePatch.ts @@ -1,4 +1,4 @@ -import colors from "colorette" +import * as colors from "colorette" import { copySync, existsSync, diff --git a/src/makeRegExp.ts b/src/makeRegExp.ts index 063eb8ab..5d144c8e 100644 --- a/src/makeRegExp.ts +++ b/src/makeRegExp.ts @@ -1,4 +1,4 @@ -import colors from "colorette" +import * as colors from "colorette" export const makeRegExp = ( reString: string, diff --git a/src/patch/read.ts b/src/patch/read.ts index 71fa39ce..88808aa6 100644 --- a/src/patch/read.ts +++ b/src/patch/read.ts @@ -1,4 +1,4 @@ -import colors from "colorette" +import * as colors from "colorette" import { readFileSync } from "fs-extra" import { normalize } from "path" import { PackageDetails } from "../PackageDetails" diff --git a/src/rebase.ts b/src/rebase.ts index bd36e812..7690d8aa 100644 --- a/src/rebase.ts +++ b/src/rebase.ts @@ -1,4 +1,4 @@ -import colors from "colorette" +import * as colors from "colorette" import { join, resolve } from "path" import { applyPatch } from "./applyPatches" import { hashFile } from "./hash" diff --git a/src/stateFile.ts b/src/stateFile.ts index a1dbe358..bf685276 100644 --- a/src/stateFile.ts +++ b/src/stateFile.ts @@ -1,5 +1,5 @@ import stringify from "@nolyfill/json-stable-stringify" -import colors from "colorette" +import * as colors from "colorette" import { existsSync, readFileSync, unlinkSync, writeFileSync } from "fs" import { join } from "path" import { hashFile } from "./hash"