From b7cc21b142244277d326bb2814b8256619f8de8e Mon Sep 17 00:00:00 2001 From: Lucian Mocanu Date: Mon, 23 Dec 2024 13:36:37 +0200 Subject: [PATCH] refactor: remove del, update rimraf --- gulpfile.ts | 8 +- package-lock.json | 150 ++---------------- package.json | 3 +- .../multi-database-basic-functionality.ts | 2 +- test/github-issues/799/issue-799.ts | 13 +- test/github-issues/8975/issue-8975.ts | 7 +- 6 files changed, 25 insertions(+), 158 deletions(-) diff --git a/gulpfile.ts b/gulpfile.ts index 42affa0cddc..7556d7c7ad3 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -2,12 +2,12 @@ import { Gulpclass, Task, SequenceTask, MergedTask } from "gulpclass"; import fs from "fs/promises"; import gulp from "gulp"; -import del from "del"; import shell from "gulp-shell"; import replace from "gulp-replace"; import rename from "gulp-rename"; import sourcemaps from "gulp-sourcemaps"; import ts from "gulp-typescript"; +import { rimraf } from "rimraf"; @Gulpclass() export class Gulpfile { @@ -21,7 +21,7 @@ export class Gulpfile { */ @Task() async clean() { - return del(["./build/**"]); + return rimraf(["./build/**"]); } /** @@ -86,7 +86,7 @@ export class Gulpfile { @Task() async browserClearPackageDirectory() { - return del([ + return rimraf([ "./build/browser/**" ]); } @@ -193,7 +193,7 @@ export class Gulpfile { */ @Task() async packageClearPackageDirectory() { - return del([ + return rimraf([ "build/package/src/**" ]); } diff --git a/package-lock.json b/package-lock.json index 27969e40820..e21d530f83a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,7 +49,6 @@ "class-transformer": "^0.5.1", "conventional-changelog-angular": "^5.0.13", "conventional-changelog-cli": "^2.2.2", - "del": "6.1.1", "eslint": "^8.44.0", "gulp": "^4.0.2", "gulp-istanbul": "^1.1.3", @@ -71,7 +70,7 @@ "prettier": "^2.8.3", "redis": "^4.6.4", "remap-istanbul": "^0.13.0", - "rimraf": "^4.1.2", + "rimraf": "^5.0.10", "sinon": "^15.0.1", "sinon-chai": "^3.7.0", "source-map-support": "^0.5.21", @@ -1976,6 +1975,7 @@ "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, + "optional": true, "dependencies": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" @@ -3212,6 +3212,7 @@ "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "dev": true, + "optional": true, "engines": { "node": ">=6" } @@ -4070,85 +4071,6 @@ "node": ">=0.10.0" } }, - "node_modules/del": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz", - "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==", - "dev": true, - "dependencies": { - "globby": "^11.0.1", - "graceful-fs": "^4.2.4", - "is-glob": "^4.0.1", - "is-path-cwd": "^2.2.0", - "is-path-inside": "^3.0.2", - "p-map": "^4.0.0", - "rimraf": "^3.0.2", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/del/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/del/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/del/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "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/delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -7598,15 +7520,6 @@ "node": ">=8" } }, - "node_modules/is-path-cwd": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", - "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/is-path-inside": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", @@ -10699,6 +10612,7 @@ "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, + "optional": true, "dependencies": { "aggregate-error": "^3.0.0" }, @@ -12127,65 +12041,21 @@ "dev": true }, "node_modules/rimraf": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz", - "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==", + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", + "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", "dev": true, + "license": "ISC", "dependencies": { - "glob": "^9.2.0" + "glob": "^10.3.7" }, "bin": { - "rimraf": "dist/cjs/src/bin.js" - }, - "engines": { - "node": ">=14" + "rimraf": "dist/esm/bin.mjs" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rimraf/node_modules/glob": { - "version": "9.3.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", - "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "minimatch": "^8.0.2", - "minipass": "^4.2.4", - "path-scurry": "^1.6.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/minimatch": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", - "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/minipass": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", - "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", diff --git a/package.json b/package.json index 11c867dc810..4e4841e8933 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,6 @@ "class-transformer": "^0.5.1", "conventional-changelog-angular": "^5.0.13", "conventional-changelog-cli": "^2.2.2", - "del": "6.1.1", "eslint": "^8.44.0", "gulp": "^4.0.2", "gulp-istanbul": "^1.1.3", @@ -135,7 +134,7 @@ "prettier": "^2.8.3", "redis": "^4.6.4", "remap-istanbul": "^0.13.0", - "rimraf": "^4.1.2", + "rimraf": "^5.0.10", "sinon": "^15.0.1", "sinon-chai": "^3.7.0", "source-map-support": "^0.5.21", diff --git a/test/functional/multi-database/multi-database-basic-functionality/multi-database-basic-functionality.ts b/test/functional/multi-database/multi-database-basic-functionality/multi-database-basic-functionality.ts index 4c1a8aec2d1..e789ffbc272 100644 --- a/test/functional/multi-database/multi-database-basic-functionality/multi-database-basic-functionality.ts +++ b/test/functional/multi-database/multi-database-basic-functionality/multi-database-basic-functionality.ts @@ -11,7 +11,7 @@ import { Category } from "./entity/Category" import { Post } from "./entity/Post" import { User } from "./entity/User" import { filepathToName } from "../../../../src/util/PathUtils" -import rimraf from "rimraf" +import { rimraf } from "rimraf" import path from "path" import fs from "fs/promises" import appRoot from "app-root-path" diff --git a/test/github-issues/799/issue-799.ts b/test/github-issues/799/issue-799.ts index a8abf449127..838f3c67912 100644 --- a/test/github-issues/799/issue-799.ts +++ b/test/github-issues/799/issue-799.ts @@ -1,9 +1,8 @@ -import "reflect-metadata" -import * as assert from "assert" -import rimraf from "rimraf" +import { expect } from "chai" import { dirname } from "path" import { DataSource } from "../../../src/data-source/DataSource" import { getTypeOrmConfig } from "../../utils/test-utils" +import { rimraf } from "rimraf" describe("github issues > #799 sqlite: 'database' path should be created", () => { let dataSource: DataSource @@ -26,14 +25,14 @@ describe("github issues > #799 sqlite: 'database' path should be created", () => ) if (isEnabled === false) return - const dataSource = new DataSource({ + dataSource = new DataSource({ name: "sqlite", type: "sqlite", database: path, }) await dataSource.initialize() - assert.strictEqual(dataSource.isInitialized, true) + expect(dataSource.isInitialized).to.equal(true) }) it("should create the whole path to database file for better-sqlite3", async function () { @@ -43,13 +42,13 @@ describe("github issues > #799 sqlite: 'database' path should be created", () => ) if (isEnabled === false) return - const dataSource = new DataSource({ + dataSource = new DataSource({ name: "better-sqlite3", type: "better-sqlite3", database: path, }) await dataSource.initialize() - assert.strictEqual(dataSource.isInitialized, true) + expect(dataSource.isInitialized).to.equal(true) }) }) diff --git a/test/github-issues/8975/issue-8975.ts b/test/github-issues/8975/issue-8975.ts index 9faaadfedbc..4b6b5d4e815 100644 --- a/test/github-issues/8975/issue-8975.ts +++ b/test/github-issues/8975/issue-8975.ts @@ -1,8 +1,7 @@ import { expect } from "chai" import { exec } from "child_process" -import { readFile, writeFile, chmod } from "fs/promises" +import { readFile, writeFile, chmod, unlink, rmdir } from "fs/promises" import { dirname } from "path" -import rimraf from "rimraf" describe("cli init command", () => { const cliPath = `${dirname(dirname(dirname(__dirname)))}/src/cli.js` @@ -43,11 +42,11 @@ describe("cli init command", () => { }) after(async () => { - await rimraf(`./${builtSrcDirectory}/package.json`) + await unlink(`./${builtSrcDirectory}/package.json`) }) afterEach(async () => { - await rimraf(`./${testProjectName}`) + await rmdir(`./${testProjectName}`, { recursive: true }) }) for (const databaseOption of databaseOptions) {