chore: bump all (dev)Dependencies and fix related usage issues

JounQin · JounQin · commit 00cd0c6fc1d1 · 2025-06-02T01:34:29.000+08:00
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -5,8 +5,11 @@ github:
   - rx-ts
   - un-ts
 patreon: 1stG
-open_collective: unts
+open_collective: pretty-quick
 custom:
+  - https://opencollective.com/prettier-eslint
   - https://opencollective.com/1stG
   - https://opencollective.com/rxts
-  - https://afdian.net/@JounQin
+  - https://opencollective.com/unrs
+  - https://opencollective.com/unts
+  - https://afdian.com/a/JounQin
diff --git a/.lintstagedrc.js b/.lintstagedrc.js
diff --git a/.nano-staged.mjs b/.nano-staged.mjs
@@ -0,0 +1 @@
+export { default } from '@1stg/nano-staged/tsc'
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18
+20
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1 @@
-coverage
-lib
-/.yarn
+.yarn
diff --git a/.simple-git-hooks.js b/.simple-git-hooks.js
diff --git a/.simple-git-hooks.mjs b/.simple-git-hooks.mjs
@@ -0,0 +1 @@
+export { default } from '@1stg/simple-git-hooks'
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -8,8 +8,8 @@ nodeLinker: node-modules
 
 plugins:
   - path: .yarn/plugins/plugin-prepare-lifecycle.cjs
-    spec: "https://github.com/un-es/yarn-plugin-prepare-lifecycle/releases/download/v0.0.1/index.js"
+    spec: 'https://github.com/un-es/yarn-plugin-prepare-lifecycle/releases/download/v0.0.1/index.js'
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
+    spec: '@yarnpkg/plugin-interactive-tools'
 
 yarnPath: .yarn/releases/yarn-3.6.4.cjs
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,11 @@
+import base from '@1stg/eslint-config'
+
+export default [
+  ...base,
+  {
+    rules: {
+      '@typescript-eslint/no-duplicate-type-constituents': 'off',
+      'unicorn-x/prefer-node-protocol': 'off',
+    },
+  },
+]
diff --git a/package.json b/package.json
@@ -1,30 +1,37 @@
 {
   "name": "pretty-quick",
   "version": "4.1.1",
+  "type": "commonjs",
   "description": "Get Pretty Quick",
   "repository": "prettier/pretty-quick",
   "author": "Lucas Azzola <@azz>",
   "maintainers": [
-    "JounQin (https://www.1stG.me) <admin@1stg.me>"
+    "JounQin <admin@1stg.me> (https://www.1stG.me)"
   ],
+  "funding": "https://opencollective.com/pretty-quick",
   "license": "MIT",
   "packageManager": "yarn@3.6.4",
   "engines": {
     "node": ">=14"
   },
   "bin": "lib/cli.mjs",
   "main": "lib/index.js",
-  "module": "lib/index.esm.mjs",
+  "types": "lib/index.d.ts",
+  "module": "lib/index.mjs",
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
-      "require": "./lib/index.js",
-      "default": "./lib/index.esm.mjs"
+      "import": {
+        "types": "./lib/index.d.mts",
+        "default": "./lib/index.mjs"
+      },
+      "require": {
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
+      }
     },
     "./*": "./lib/*.js",
     "./package.json": "./package.json"
   },
-  "types": "lib/index.d.ts",
   "files": [
     "bin",
     "img",
@@ -44,8 +51,9 @@
   ],
   "scripts": {
     "build": "run-p 'build:*'",
-    "build:r": "r -f esm",
     "build:tsc": "tsc -b",
+    "build:tsdown": "tsdown --no-clean -d lib",
+    "format": "prettier --write .",
     "lint": "run-p 'lint:*'",
     "lint:es": "eslint . --cache",
     "lint:tsc": "tsc --noEmit",
@@ -57,66 +65,46 @@
     "prettier": "^3.0.0"
   },
   "dependencies": {
-    "find-up": "^5.0.0",
-    "ignore": "^7.0.3",
+    "@pkgr/core": "^0.2.7",
+    "ignore": "^7.0.5",
     "mri": "^1.2.0",
     "picocolors": "^1.1.1",
     "picomatch": "^4.0.2",
-    "tinyexec": "^0.3.2",
+    "tinyexec": "^1.0.1",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@1stg/lib-config": "^13.0.0",
+    "@1stg/common-config": "^14.1.0",
     "@changesets/changelog-github": "^0.5.1",
-    "@changesets/cli": "^2.28.1",
-    "@commitlint/cli": "^18.6.1",
-    "@pkgr/rollup": "^6.0.0",
+    "@changesets/cli": "^2.29.4",
+    "@commitlint/cli": "^19.8.1",
     "@total-typescript/ts-reset": "^0.6.1",
     "@types/jest": "^29.5.14",
     "@types/mock-fs": "^4.13.4",
-    "@types/picomatch": "^3.0.2",
+    "@types/picomatch": "^4.0.0",
     "@unts/patch-package": "^8.1.1",
-    "clean-pkg-json": "^1.2.0",
-    "eslint": "^8.57.1",
+    "clean-pkg-json": "^1.3.0",
+    "eslint": "^9.28.0",
     "jest": "^29.7.0",
-    "lint-staged": "^15.4.3",
     "mock-fs": "^5.5.0",
+    "nano-staged": "^0.8.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.5.3",
     "pretty-quick": "link:.",
-    "simple-git-hooks": "^2.9.0",
+    "simple-git-hooks": "^2.13.0",
     "size-limit": "^11.2.0",
-    "size-limit-preset-node-lib": "^0.3.0",
-    "ts-jest": "^29.2.6",
+    "size-limit-preset-node-lib": "^0.4.0",
+    "ts-jest": "^29.3.4",
     "ts-node": "^10.9.2",
-    "typescript": "^5.8.2"
+    "tsdown": "^0.12.5",
+    "typescript": "^5.8.3"
   },
   "resolutions": {
-    "prettier": "^3.5.3",
-    "rollup": "^3.29.5"
+    "prettier": "^3.5.3"
   },
   "commitlint": {
     "extends": "@1stg"
   },
-  "eslintConfig": {
-    "extends": "@1stg",
-    "rules": {
-      "unicorn/prefer-node-protocol": "off"
-    },
-    "overrides": [
-      {
-        "files": "__mocks__/*.*",
-        "env": {
-          "jest": true
-        }
-      }
-    ]
-  },
-  "eslintIgnore": [
-    "coverage",
-    "lib",
-    "!/.*.js"
-  ],
   "jest": {
     "preset": "ts-jest",
     "testMatch": [
diff --git a/src/createIgnorer.ts b/src/createIgnorer.ts
@@ -1,11 +1,14 @@
-/* eslint-disable unicorn/filename-case */
+/* eslint-disable unicorn-x/filename-case */
 
 import fs from 'fs'
 import path from 'path'
 
 import ignore from 'ignore'
 
-export default (directory: string, filename = '.prettierignore') => {
+export default function createIgnorer(
+  directory: string,
+  filename = '.prettierignore',
+) {
   const file = path.join(directory, filename)
 
   if (fs.existsSync(file)) {
diff --git a/src/createMatcher.ts b/src/createMatcher.ts
@@ -1,10 +1,10 @@
-/* eslint-disable unicorn/filename-case */
+/* eslint-disable unicorn-x/filename-case */
 
 import path from 'path'
 
 import picomatch from 'picomatch'
 
-export default (pattern: string[] | string | undefined) => {
+export default function createMatcher(pattern: string[] | string | undefined) {
   // Match everything if no pattern was given
   if (typeof pattern !== 'string' && !Array.isArray(pattern)) {
     return () => true
diff --git a/src/index.ts b/src/index.ts
@@ -6,7 +6,7 @@ import scms from './scms/index.js'
 import { PrettyQuickOptions } from './types.js'
 import { filterAsync } from './utils.js'
 
-export = async (
+export = async function prettyQuick(
   currentDirectory: string,
   {
     config,
@@ -27,8 +27,7 @@ export = async (
     onWriteFile,
     resolveConfig = true,
   }: Partial<PrettyQuickOptions> = {},
-  // eslint-disable-next-line sonarjs/cognitive-complexity
-) => {
+) {
   const scm = scms(currentDirectory)
   if (!scm) {
     throw new Error('Unable to detect a source control manager.')
diff --git a/src/isSupportedExtension.ts b/src/isSupportedExtension.ts
@@ -1,4 +1,4 @@
-/* eslint-disable unicorn/filename-case */
+/* eslint-disable unicorn-x/filename-case */
 
 import fs from 'fs/promises'
 
@@ -8,23 +8,26 @@ import {
   resolveConfig as prettierResolveConfig,
 } from 'prettier'
 
-export default (resolveConfig?: boolean) => async (file: string) => {
-  const stat = await fs.stat(file).catch(_error => null)
-  /* If file exists but is actually a directory, getFileInfo might end up trying
-   * to open it and read it as a file, so let's not let that happen.  On the
-   * other hand, the tests depend on our not failing out with files that don't
-   * exist, so permit nonexistent files to go through (they appear to be
-   * detected by suffix, so never get read).
-   */
-  if (stat?.isDirectory()) {
-    return false
+const isSupportedExtension =
+  (resolveConfig?: boolean) => async (file: string) => {
+    const stat = await fs.stat(file).catch(_error => null)
+    /* If file exists but is actually a directory, getFileInfo might end up trying
+     * to open it and read it as a file, so let's not let that happen.  On the
+     * other hand, the tests depend on our not failing out with files that don't
+     * exist, so permit nonexistent files to go through (they appear to be
+     * detected by suffix, so never get read).
+     */
+    if (stat?.isDirectory()) {
+      return false
+    }
+    const config = (await prettierResolveConfig(file, {
+      editorconfig: true,
+    })) as FileInfoOptions
+    const fileInfo = await getFileInfo(file, {
+      resolveConfig,
+      ...config,
+    })
+    return !!fileInfo.inferredParser
   }
-  const config = (await prettierResolveConfig(file, {
-    editorconfig: true,
-  })) as FileInfoOptions
-  const fileInfo = await getFileInfo(file, {
-    resolveConfig,
-    ...config,
-  })
-  return !!fileInfo.inferredParser
-}
+
+export default isSupportedExtension
diff --git a/src/processFiles.ts b/src/processFiles.ts
@@ -1,4 +1,4 @@
-/* eslint-disable unicorn/filename-case */
+/* eslint-disable unicorn-x/filename-case */
 
 import fs from 'fs'
 import path from 'path'
@@ -7,7 +7,7 @@ import { format, check as prettierCheck, resolveConfig } from 'prettier'
 
 import type { PrettyQuickOptions } from './types.js'
 
-export default async (
+export default async function processFiles(
   directory: string,
   files: string[],
   {
@@ -17,7 +17,7 @@ export default async (
     onCheckFile,
     onWriteFile,
   }: Partial<PrettyQuickOptions> = {},
-) => {
+) {
   for (const relative of files) {
     onExamineFile?.(relative)
     const file = path.join(directory, relative)
diff --git a/src/scms/git.ts b/src/scms/git.ts
@@ -1,46 +1,13 @@
-import fs from 'fs'
 import path from 'path'
 
-import findUp from 'find-up'
+import { findUp } from '@pkgr/core'
 import { Output, exec } from 'tinyexec'
 
 export const name = 'git'
 
 export const detect = (directory: string) => {
-  if (fs.existsSync(path.join(directory, '.git'))) {
-    return directory
-  }
-
-  const gitDirectory = findUp.sync('.git', {
-    cwd: directory,
-    type: 'directory',
-  })
-
-  const gitWorkTreeFile = findUp.sync('.git', {
-    cwd: directory,
-    type: 'file',
-  })
-
-  // if both of these are null then return null
-  if (!gitDirectory && !gitWorkTreeFile) {
-    return null
-  }
-
-  // if only one of these exists then return it
-  if (gitDirectory && !gitWorkTreeFile) {
-    return path.dirname(gitDirectory)
-  }
-
-  if (gitWorkTreeFile && !gitDirectory) {
-    return path.dirname(gitWorkTreeFile)
-  }
-
-  const gitRepoDirectory = path.dirname(gitDirectory!)
-  const gitWorkTreeDirectory = path.dirname(gitWorkTreeFile!)
-  // return the deeper of these two
-  return gitRepoDirectory.length > gitWorkTreeDirectory.length
-    ? gitRepoDirectory
-    : gitWorkTreeDirectory
+  const found = findUp(path.resolve(directory), '.git', true)
+  return found ? path.dirname(found) : null
 }
 
 const runGit = (directory: string, args: string[]) =>
diff --git a/src/scms/hg.ts b/src/scms/hg.ts
@@ -1,17 +1,15 @@
+import fs from 'fs'
 import path from 'path'
 
-import findUp from 'find-up'
+import { findUp } from '@pkgr/core'
 import { Output, exec } from 'tinyexec'
 
 export const name = 'hg'
 
 export const detect = (directory: string) => {
-  const hgDirectory = findUp.sync('.hg', {
-    cwd: directory,
-    type: 'directory',
-  })
-  if (hgDirectory) {
-    return path.dirname(hgDirectory)
+  const found = findUp(path.resolve(directory), '.hg', true)
+  if (found && fs.statSync(found).isDirectory()) {
+    return path.dirname(found)
   }
 }
 
diff --git a/src/scms/index.ts b/src/scms/index.ts
@@ -3,7 +3,7 @@ import * as hgScm from './hg.js'
 
 const scms = [gitScm, hgScm]
 
-export default (directory: string) => {
+export default function detectScm(directory: string) {
   for (const scm of scms) {
     const rootDirectory = scm.detect(directory)
     if (rootDirectory) {
diff --git a/test/isSupportedExtension.spec.ts b/test/isSupportedExtension.spec.ts
diff --git a/test/scm-git.spec.ts b/test/scm-git.spec.ts
diff --git a/test/scm-hg.spec.ts b/test/scm-hg.spec.ts
diff --git a/tsconfig.lib.json b/tsconfig.lib.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { default } from '@1stg/nano-staged/tsc'`
-Original file line number
+Diff line change
@@ @@ -1,3 +1 @@ @@
 -coverage
 -lib
 -/.yarn
 +.yarn
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { default } from '@1stg/simple-git-hooks'`