refactor: remove del, update rimraf

typeorm · alumni · Dec 21, 2024 · Dec 23, 2024 · Dec 23, 2024 · b7cc21b142244277d326bb2814b8256619f8de8e
commit b7cc21b142244277d326bb2814b8256619f8de8e
diff --git a/gulpfile.ts b/gulpfile.ts
@@ -2,12 +2,12 @@
 
 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 @@
      */
     @Task()
     async clean() {
-        return del(["./build/**"]);
+        return rimraf(["./build/**"]);
     }
 
     /**
@@ -86,7 +86,7 @@
 
     @Task()
     async browserClearPackageDirectory() {
-        return del([
+        return rimraf([
             "./build/browser/**"
         ]);
     }
@@ -165,7 +165,7 @@
    @Task()
    async packageCreateEsmIndex() {
        const buildDir = "./build/package";
        const cjsIndex = require(`${buildDir}/index.js`);
        const cjsKeys = Object.keys(cjsIndex).filter(key => key !== "default" && !key.startsWith("__"));

        const indexMjsContent =
@@ -193,7 +193,7 @@
      */
     @Task()
     async packageClearPackageDirectory() {
-        return del([
+        return rimraf([
             "build/package/src/**"
         ]);
     }

diff --git a/package-lock.json b/package-lock.json
diff --git 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/...l/multi-database/multi-database-basic-functionality/multi-database-basic-functionality.ts b/...l/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
@@ -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
@@ -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) {