From c3207ddeddbae62c4f00b7a8f6063a01ed4fcc84 Mon Sep 17 00:00:00 2001
From: Minggang Wang <minggangw@gmail.com>
Date: Fri, 16 Oct 2026 15:51:49 +0800
Subject: [PATCH] Replace  cleanup and remove the redundant  declaration

---
 package.json                        |  4 +---
 test/test-message-generation-bin.js | 13 ++-----------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index c2438361..86f6f33d 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "generate-messages-idl": "node scripts/generate_messages.cjs --idl",
     "generate-messages:dev": "node scripts/generate_messages.cjs --debug",
     "generate-tsd-messages": "node scripts/generate_tsd.cjs",
-    "clean": "node-gyp clean && npx rimraf ./generated",
+    "clean": "node-gyp clean && node -e \"require('node:fs').rmSync('./generated', { recursive: true, force: true, maxRetries: 3 })\"",
     "install": "node scripts/install.cjs",
     "postinstall": "npm run generate-messages",
     "docs": "make -C tools/jsdoc",
@@ -111,9 +111,7 @@
     "lint-staged": "^17.0.0",
     "mocha": "^12.0.0",
     "prebuildify": "^6.0.1",
-    "rimraf": "^6.0.1",
     "sinon": "^22.0.0",
-    "tree-kill": "^1.2.2",
     "tsd": "^0.33.0",
     "tsdown": "^0.23.1",
     "typescript": "^6.0.3"
diff --git a/test/test-message-generation-bin.js b/test/test-message-generation-bin.js
index 899247df..7d8ecef0 100644
--- a/test/test-message-generation-bin.js
+++ b/test/test-message-generation-bin.js
@@ -17,7 +17,6 @@ import childProcess from 'child_process';
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import * as rimraf from 'rimraf';
 import rclnodejs from '../index.js';
 
 const GEN_FOLDER = 'generated';
@@ -130,21 +129,13 @@ suite('rclnodejs generate-messages binary-script tests', function () {
 
     let generatedFolderPath = createGeneratedFolderPath(this.tmpPkg);
     if (fs.existsSync(generatedFolderPath)) {
-      if (getNodeVersionInfo()[0] === 10) {
-        rimraf.sync(generatedFolderPath);
-      } else {
-        fs.rmSync(generatedFolderPath, { recursive: true });
-      }
+      fs.rmSync(generatedFolderPath, { recursive: true });
     }
   });
 
   after(function () {
     // recursively remove test package folder
-    if (getNodeVersionInfo()[0] === 10) {
-      rimraf.sync(this.tmpPkg);
-    } else {
-      fs.rmSync(this.tmpPkg, { recursive: true });
-    }
+    fs.rmSync(this.tmpPkg, { recursive: true });
   });
 
   it('test generate-ros-messages script installation', function (done) {