chore(deps): update dependency rimraf to v4 (#7907)

* chore(deps): update dependency rimraf to v4 * chore(deps): update dependency rimraf to v4 * codemod breaking changes * Update packages/cli/src/commands/buildHandler.js --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: David Price <[email protected]> Co-authored-by: Dominic Saadi <[email protected]>
redwoodjs · Mar 27, 2023 · 7907329 · 7907329
1 parent 5f73fa3
commit 7907329
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 42 deletions.
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   ],
   "scripts": {
     "build": "lerna run build",
-    "build:clean": "yarn clean:prisma && rimraf \"packages/**/dist\"",
+    "build:clean": "yarn clean:prisma && rimraf \"packages/**/dist\" --glob",
     "build:link": "node ./tasks/build-and-copy",
     "build:test-project": "node ./tasks/test-project/test-project",
     "build:watch": "lerna run build:watch --parallel; tsc --build",
@@ -91,7 +91,7 @@
     "octokit": "2.0.14",
     "ora": "5.4.1",
     "prompts": "2.4.2",
-    "rimraf": "3.0.2",
+    "rimraf": "4.4.1",
     "typescript": "4.9.5",
     "yargs": "17.7.1",
     "zx": "7.2.1"

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "yarn build:js",
-    "build:clean-dist": "rimraf 'dist/**/*/__tests__'",
+    "build:clean-dist": "rimraf 'dist/**/*/__tests__' --glob",
     "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --copy-files --no-copy-ignored && yarn build:clean-dist",
     "build:watch": "nodemon --watch src --ext \"js,ts,tsx,template\" --ignore dist --exec \"yarn build && yarn fix:permissions\"",
     "dev": "RWJS_CWD=../../__fixtures__/example-todo-main node dist/index.js",
@@ -63,7 +63,7 @@
     "prettier": "2.8.7",
     "prisma": "4.11.0",
     "prompts": "2.4.2",
-    "rimraf": "3.0.2",
+    "rimraf": "4.4.1",
     "secure-random-password": "0.2.3",
     "terminal-link": "2.1.1",
     "title-case": "3.0.3",

diff --git a/packages/cli/src/commands/buildHandler.js b/packages/cli/src/commands/buildHandler.js
@@ -89,7 +89,7 @@ export const handler = async ({
       // Vite handles this internally
       title: 'Cleaning Web...',
       task: () => {
-        rimraf.sync(rwjsPaths.web.dist)
+        return rimraf(rwjsPaths.web.dist)
       },
       enabled: getConfig().web.bundler !== 'vite',
     },

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -75,7 +75,7 @@
     "nodemon": "2.0.22",
     "null-loader": "4.0.1",
     "react-refresh": "0.14.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.4.1",
     "style-loader": "3.3.2",
     "typescript": "4.9.5",
     "url-loader": "4.1.1",

diff --git a/packages/internal/package.json b/packages/internal/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "yarn build:js && yarn build:types",
-    "build:clean-dist": "rimraf 'dist/**/*/__tests__'",
+    "build:clean-dist": "rimraf 'dist/**/*/__tests__' --glob",
     "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --copy-files --no-copy-ignored && yarn build:clean-dist",
     "build:types": "tsc --build --verbose",
     "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"",
@@ -55,7 +55,7 @@
     "graphql": "16.6.0",
     "kill-port": "1.6.1",
     "prettier": "2.8.7",
-    "rimraf": "3.0.2",
+    "rimraf": "4.4.1",
     "string-env-interpolation": "1.0.1",
     "systeminformation": "5.17.12",
     "terminal-link": "2.1.1",
@@ -69,7 +69,6 @@
     "@types/babel__core": "7.20.0",
     "@types/findup-sync": "4.0.2",
     "@types/fs-extra": "11.0.1",
-    "@types/rimraf": "3.0.2",
     "babel-plugin-tester": "11.0.4",
     "graphql-tag": "2.12.6",
     "jest": "29.4.2"

diff --git a/packages/project-config/package.json b/packages/project-config/package.json
@@ -16,7 +16,7 @@
   ],
   "scripts": {
     "build": "run build:js && run build:types",
-    "build:clean-dist": "rimraf 'dist/**/__tests__'",
+    "build:clean-dist": "rimraf 'dist/**/__tests__' --glob",
     "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\" --copy-files --no-copy-ignored && run build:clean-dist",
     "build:types": "tsc --build --verbose",
     "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"",
@@ -41,7 +41,7 @@
     "@types/findup-sync": "4.0.2",
     "dependency-cruiser": "12.11.0",
     "jest": "29.4.2",
-    "rimraf": "3.0.2",
+    "rimraf": "4.4.1",
     "typescript": "4.9.5"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/tasks/framework-tools/lib/project.mjs b/tasks/framework-tools/lib/project.mjs
@@ -117,7 +117,7 @@ export async function copyFrameworkFilesToProject(
       files.length,
       'files'
     )
-    rimraf.sync(packageDstPath)
+    await rimraf(packageDstPath)
 
     for (const file of files) {
       const src = path.join(packageNamesToPaths[packageName], file)

diff --git a/tasks/test-project/test-project b/tasks/test-project/test-project
@@ -141,7 +141,7 @@ if (
 
 const createProject = async () => {
   if (clean) {
-    rimraf.sync(OUTPUT_PROJECT_PATH)
+    await rimraf(OUTPUT_PROJECT_PATH)
   }
 
   let cmd = `yarn babel-node packages/create-redwood-app/src/create-redwood-app.js ${OUTPUT_PROJECT_PATH}`
@@ -156,7 +156,7 @@ const createProject = async () => {
 
 const copyProject = async () => {
   if (clean && !rebuildFixture) {
-    rimraf.sync(OUTPUT_PROJECT_PATH)
+    await rimraf(OUTPUT_PROJECT_PATH)
   }
 
   const FIXTURE_TESTPROJ_PATH = path.join(
@@ -166,11 +166,11 @@ const copyProject = async () => {
 
   if (rebuildFixture) {
     // remove existing Fixture
-    rimraf.sync(FIXTURE_TESTPROJ_PATH)
+    await rimraf(FIXTURE_TESTPROJ_PATH)
     // copy from tempDir to Fixture dir
     await fse.copy(OUTPUT_PROJECT_PATH, FIXTURE_TESTPROJ_PATH)
     // cleanup after ourselves
-    rimraf.sync(OUTPUT_PROJECT_PATH)
+    await rimraf(OUTPUT_PROJECT_PATH)
   } else {
     // copying existing Fixture to new Project
     await fse.copy(FIXTURE_TESTPROJ_PATH, OUTPUT_PROJECT_PATH)
@@ -386,18 +386,18 @@ const globalTasks = () =>
         task: async () => {
           // @TODO: This only works on UNIX, we should use path.join everywhere
           // remove all .gitignore
-          rimraf.sync(`${OUTPUT_PROJECT_PATH}/.redwood`)
-          rimraf.sync(`${OUTPUT_PROJECT_PATH}/api/db/dev.db`)
-          rimraf.sync(`${OUTPUT_PROJECT_PATH}/api/db/dev.db-journal`)
-          rimraf.sync(`${OUTPUT_PROJECT_PATH}/api/dist`)
-          rimraf.sync(`${OUTPUT_PROJECT_PATH}/node_modules`)
-          rimraf.sync(`${OUTPUT_PROJECT_PATH}/web/node_modules`)
-          rimraf.sync(`${OUTPUT_PROJECT_PATH}/.env`)
-          rimraf.sync(`${OUTPUT_PROJECT_PATH}/yarn.lock`)
+          await rimraf(`${OUTPUT_PROJECT_PATH}/.redwood`)
+          await rimraf(`${OUTPUT_PROJECT_PATH}/api/db/dev.db`)
+          await rimraf(`${OUTPUT_PROJECT_PATH}/api/db/dev.db-journal`)
+          await rimraf(`${OUTPUT_PROJECT_PATH}/api/dist`)
+          await rimraf(`${OUTPUT_PROJECT_PATH}/node_modules`)
+          await rimraf(`${OUTPUT_PROJECT_PATH}/web/node_modules`)
+          await rimraf(`${OUTPUT_PROJECT_PATH}/.env`)
+          await rimraf(`${OUTPUT_PROJECT_PATH}/yarn.lock`)
 
           // Copy over package.json from template, so we remove the extra dev dependencies, and rwfw postinstall script
           // that we added in "Adding framework dependencies to project"
-          rimraf.sync(`${OUTPUT_PROJECT_PATH}/package.json`)
+          await rimraf(`${OUTPUT_PROJECT_PATH}/package.json`)
           fs.copyFileSync(
             path.join(
               __dirname,

diff --git a/yarn.lock b/yarn.lock
@@ -6797,7 +6797,7 @@ __metadata:
     prettier: 2.8.7
     prisma: 4.11.0
     prompts: 2.4.2
-    rimraf: 3.0.2
+    rimraf: 4.4.1
     secure-random-password: 0.2.3
     terminal-link: 2.1.1
     title-case: 3.0.3
@@ -6895,7 +6895,7 @@ __metadata:
     nodemon: 2.0.22
     null-loader: 4.0.1
     react-refresh: 0.14.0
-    rimraf: 3.0.2
+    rimraf: 4.4.1
     style-loader: 3.3.2
     typescript: 4.9.5
     url-loader: 4.1.1
@@ -7043,7 +7043,6 @@ __metadata:
     "@types/babel__core": 7.20.0
     "@types/findup-sync": 4.0.2
     "@types/fs-extra": 11.0.1
-    "@types/rimraf": 3.0.2
     babel-plugin-graphql-tag: 3.3.0
     babel-plugin-polyfill-corejs3: 0.7.1
     babel-plugin-tester: 11.0.4
@@ -7059,7 +7058,7 @@ __metadata:
     jest: 29.4.2
     kill-port: 1.6.1
     prettier: 2.8.7
-    rimraf: 3.0.2
+    rimraf: 4.4.1
     string-env-interpolation: 1.0.1
     systeminformation: 5.17.12
     terminal-link: 2.1.1
@@ -7115,7 +7114,7 @@ __metadata:
     fast-glob: 3.2.12
     findup-sync: 5.0.0
     jest: 29.4.2
-    rimraf: 3.0.2
+    rimraf: 4.4.1
     string-env-interpolation: 1.0.1
     typescript: 4.9.5
   languageName: unknown
@@ -27750,6 +27749,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rimraf@npm:4.4.1, rimraf@npm:^4.4.1":
+  version: 4.4.1
+  resolution: "rimraf@npm:4.4.1"
+  dependencies:
+    glob: ^9.2.0
+  bin:
+    rimraf: dist/cjs/src/bin.js
+  checksum: 8c5e142d26d8b222be9dc9a1a41ba48e95d8f374e813e66a8533e87c6180174fcb3f573b9b592eca12740ebf8b78526d136acd971d4a790763d6f2232c34fa24
+  languageName: node
+  linkType: hard
+
 "rimraf@npm:^2.5.4, rimraf@npm:^2.6.3":
   version: 2.7.1
   resolution: "rimraf@npm:2.7.1"
@@ -27761,17 +27771,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^4.4.1":
-  version: 4.4.1
-  resolution: "rimraf@npm:4.4.1"
-  dependencies:
-    glob: ^9.2.0
-  bin:
-    rimraf: dist/cjs/src/bin.js
-  checksum: 8c5e142d26d8b222be9dc9a1a41ba48e95d8f374e813e66a8533e87c6180174fcb3f573b9b592eca12740ebf8b78526d136acd971d4a790763d6f2232c34fa24
-  languageName: node
-  linkType: hard
-
 "rimraf@npm:~2.6.2":
   version: 2.6.3
   resolution: "rimraf@npm:2.6.3"
@@ -27871,7 +27870,7 @@ __metadata:
     octokit: 2.0.14
     ora: 5.4.1
     prompts: 2.4.2
-    rimraf: 3.0.2
+    rimraf: 4.4.1
     typescript: 4.9.5
     yargs: 17.7.1
     zx: 7.2.1