From 6ed1f52f5c451487160d2b04439ffcb0e15eff0c Mon Sep 17 00:00:00 2001 From: fisker Date: Sat, 1 Mar 2025 02:31:22 +0800 Subject: [PATCH] refactor: remove `del` and `make-dir` --- package-lock.json | 120 ---------------------------------------------- package.json | 2 - tests/_helpers.js | 12 ++--- 3 files changed, 5 insertions(+), 129 deletions(-) diff --git a/package-lock.json b/package-lock.json index f78a414..ea7399a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,6 @@ "@commitlint/cli": "^17.1.2", "@commitlint/config-conventional": "^17.1.0", "ava": "^4.3.3", - "del": "^7.0.0", "dot-prop": "^7.2.0", "dtslint": "^4.2.1", "esbuild": "^0.25.0", @@ -38,7 +37,6 @@ "eslint-plugin-promise": "^6.0.1", "husky": "^8.0.1", "lint-staged": "^13.0.3", - "make-dir": "^3.1.0", "ncp": "^2.0.0", "nyc": "^15.1.0", "prettier": "^2.7.1", @@ -4065,55 +4063,6 @@ "node": ">= 0.4" } }, - "node_modules/del": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-7.0.0.tgz", - "integrity": "sha512-tQbV/4u5WVB8HMJr08pgw0b6nG4RGt/tj+7Numvq+zqcvUFeMaIWWOUFltiU+6go8BSO2/ogsB4EasDaj0y68Q==", - "dev": true, - "dependencies": { - "globby": "^13.1.2", - "graceful-fs": "^4.2.10", - "is-glob": "^4.0.3", - "is-path-cwd": "^3.0.0", - "is-path-inside": "^4.0.0", - "p-map": "^5.5.0", - "rimraf": "^3.0.2", - "slash": "^4.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/del/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/del/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -6930,30 +6879,6 @@ "node": ">=8" } }, - "node_modules/is-path-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-3.0.0.tgz", - "integrity": "sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-path-inside": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz", - "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-plain-obj": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz", @@ -17471,39 +17396,6 @@ "object-keys": "^1.0.12" } }, - "del": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-7.0.0.tgz", - "integrity": "sha512-tQbV/4u5WVB8HMJr08pgw0b6nG4RGt/tj+7Numvq+zqcvUFeMaIWWOUFltiU+6go8BSO2/ogsB4EasDaj0y68Q==", - "dev": true, - "requires": { - "globby": "^13.1.2", - "graceful-fs": "^4.2.10", - "is-glob": "^4.0.3", - "is-path-cwd": "^3.0.0", - "is-path-inside": "^4.0.0", - "p-map": "^5.5.0", - "rimraf": "^3.0.2", - "slash": "^4.0.0" - }, - "dependencies": { - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true - } - } - }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -19595,18 +19487,6 @@ "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", "dev": true }, - "is-path-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-3.0.0.tgz", - "integrity": "sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==", - "dev": true - }, - "is-path-inside": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz", - "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==", - "dev": true - }, "is-plain-obj": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz", diff --git a/package.json b/package.json index 7b89ad3..53deff6 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,6 @@ "@commitlint/cli": "^17.1.2", "@commitlint/config-conventional": "^17.1.0", "ava": "^4.3.3", - "del": "^7.0.0", "dot-prop": "^7.2.0", "dtslint": "^4.2.1", "esbuild": "^0.25.0", @@ -107,7 +106,6 @@ "eslint-plugin-promise": "^6.0.1", "husky": "^8.0.1", "lint-staged": "^13.0.3", - "make-dir": "^3.1.0", "ncp": "^2.0.0", "nyc": "^15.1.0", "prettier": "^2.7.1", diff --git a/tests/_helpers.js b/tests/_helpers.js index 0b8862b..56a491e 100644 --- a/tests/_helpers.js +++ b/tests/_helpers.js @@ -4,8 +4,6 @@ import { execFile } from 'node:child_process' import { fileURLToPath } from 'node:url' import { getProperty, setProperty } from 'dot-prop' import tempy from 'tempy' -import makeDir from 'make-dir' -import { deleteSync } from 'del' import sortPackageJson from '../index.js' const cliScript = fileURLToPath(new URL('../cli.js', import.meta.url)) @@ -163,11 +161,11 @@ function asItIs(t, { path, options }, excludeTypes = []) { } async function testCLI(t, { fixtures = [], args, message, stdin }) { - const cwd = tempy.directory() + const temporaryDirectory = tempy.directory() fixtures = fixtures.map(({ file = 'package.json', content, expect }) => { - const absolutePath = path.join(cwd, file) - makeDir.sync(path.dirname(absolutePath)) + const absolutePath = path.join(temporaryDirectory, file) + fs.mkdirSync(path.dirname(absolutePath), { recursive: true }) const original = typeof content === 'string' ? content : JSON.stringify(content, null, 2) @@ -185,7 +183,7 @@ async function testCLI(t, { fixtures = [], args, message, stdin }) { const result = await runCLI({ args, - cwd, + cwd: temporaryDirectory, message, stdin, }) @@ -195,7 +193,7 @@ async function testCLI(t, { fixtures = [], args, message, stdin }) { } // clean up fixtures - deleteSync(cwd, { force: true }) + fs.rmSync(temporaryDirectory, { force: true, recursive: true }) for (const { actual, expect, file } of fixtures) { t.is(actual, expect, `\`${file}\` content is expected.`)