Move to standard Node.js rm

ai · ai · commit 2c09a8cdc70f · 2024-10-02T21:57:44.000Z
diff --git a/packages/esbuild-why/test/index.test.js b/packages/esbuild-why/test/index.test.js
@@ -1,8 +1,7 @@
 import esbuildPkg from '@size-limit/esbuild'
-import { readFile } from 'node:fs/promises'
+import { readFile, rm } from 'node:fs/promises'
 import { join } from 'node:path'
 import open from 'open'
-import { rm } from 'size-limit'
 import { afterEach, expect, it, vi } from 'vitest'
 
 import esbuildWhyPkg from '..'
@@ -18,7 +17,7 @@ function fixture(name) {
 }
 
 afterEach(async () => {
-  await rm(DIST)
+  await rm(DIST, { force: true, recursive: true })
   vi.clearAllMocks()
 })
 
diff --git a/packages/esbuild/index.js b/packages/esbuild/index.js
@@ -31,11 +31,13 @@ function getFiles(buildResult, check) {
 
   if (check.entry) {
     for (let entry of check.entry) {
-      let matches = Object.keys(outputs).filter(key => parse(key).name === entry)
-      if(matches.length === 0) {
+      let matches = Object.keys(outputs).filter(
+        key => parse(key).name === entry
+      )
+      if (matches.length === 0) {
         throw new SizeLimitError('unknownEntry', entry)
       }
-      for(let match of matches) {
+      for (let match of matches) {
         entries[match] = outputs[match]
       }
     }
@@ -61,7 +63,7 @@ export default [
     async before(config) {
       if (config.saveBundle) {
         if (config.cleanDir) {
-          await rm(config.saveBundle)
+          await rm(config.saveBundle, { force: true, recursive: true })
         } else {
           let notEmpty = await isDirNotEmpty(config.saveBundle)
           if (notEmpty) {
@@ -73,7 +75,7 @@ export default [
 
     async finally(config, check) {
       if (check.esbuildOutfile && !config.saveBundle) {
-        await rm(check.esbuildOutfile)
+        await rm(check.esbuildOutfile, { force: true, recursive: true })
       }
     },
 
diff --git a/packages/esbuild/test/index.test.js b/packages/esbuild/test/index.test.js
@@ -1,8 +1,8 @@
 import filePkg from '@size-limit/file'
 import { existsSync } from 'node:fs'
-import { mkdir, writeFile } from 'node:fs/promises'
+import { mkdir, rm, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
-import { rm, SizeLimitError } from 'size-limit'
+import { SizeLimitError } from 'size-limit'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
 import esbuildPkg from '../index.js'
@@ -37,7 +37,7 @@ async function getSize(check) {
 }
 
 afterEach(async () => {
-  await rm(DIST)
+  await rm(DIST, { force: true, recursive: true })
   vi.clearAllMocks()
 })
 
diff --git a/packages/size-limit/index.js b/packages/size-limit/index.js
@@ -1,8 +1,9 @@
+import fs from 'node:fs/promises'
+
 import calc from './calc.js'
 import { Plugins } from './load-plugins.js'
 
 export { processImport } from './process-import.js'
-export { rm } from './rm.js'
 export { SizeLimitError } from './size-limit-error.js'
 
 /**
@@ -30,3 +31,7 @@ export default async function (plugins, files) {
     return value
   })
 }
+
+export async function rm(dir) {
+  await fs.rm(dir, { force: true, recursive: true })
+}
diff --git a/packages/size-limit/rm.js b/packages/size-limit/rm.js
diff --git a/packages/time/test/cache.test.js b/packages/time/test/cache.test.js
@@ -1,14 +1,13 @@
-import { writeFile } from 'node:fs/promises'
+import { rm, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
-import { rm } from 'size-limit'
 import { afterEach, beforeAll, expect, it } from 'vitest'
 
 import { getCache, saveCache } from '../cache'
 
 const CACHE = join(__dirname, '..', '..', '.cache')
 
-beforeAll(() => rm(CACHE))
-afterEach(() => rm(CACHE))
+beforeAll(() => rm(CACHE, { force: true, recursive: true }))
+afterEach(() => rm(CACHE, { force: true, recursive: true }))
 
 it('returns false by default', async () => {
   expect(await getCache()).toBe(false)
diff --git a/packages/webpack-css/test/index.test.js b/packages/webpack-css/test/index.test.js
@@ -1,7 +1,7 @@
 import filePkg from '@size-limit/file'
 import webpackPkg from '@size-limit/webpack'
+import { rm } from 'node:fs/promises'
 import { join } from 'node:path'
-import { rm } from 'size-limit'
 import { afterEach, expect, it, vi } from 'vitest'
 
 import webpackCssPkg from '../index.js'
@@ -29,7 +29,7 @@ async function run(config) {
 }
 
 afterEach(async () => {
-  await rm(DIST)
+  await rm(DIST, { force: true, recursive: true })
   vi.clearAllMocks()
 })
 
diff --git a/packages/webpack-why/test/index.test.js b/packages/webpack-why/test/index.test.js
@@ -1,9 +1,8 @@
 import filePkg from '@size-limit/file'
 import webpackPkg from '@size-limit/webpack'
 import { existsSync } from 'node:fs'
-import { mkdir, readFile, writeFile } from 'node:fs/promises'
+import { mkdir, readFile, rm, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
-import { rm } from 'size-limit'
 import { afterEach, expect, it, vi } from 'vitest'
 
 import webpackWhyPkg from '../index.js'
@@ -31,7 +30,7 @@ async function run(config) {
 }
 
 afterEach(async () => {
-  await rm(DIST)
+  await rm(DIST, { force: true, recursive: true })
   vi.clearAllMocks()
 })
 
diff --git a/packages/webpack/index.js b/packages/webpack/index.js
@@ -1,8 +1,8 @@
 import { nanoid } from 'nanoid/non-secure'
-import { readdir } from 'node:fs/promises'
+import { readdir, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { rm, SizeLimitError } from 'size-limit'
+import { SizeLimitError } from 'size-limit'
 
 import { convertConfig } from './convert-config.js'
 import { getConfig } from './get-config.js'
@@ -59,7 +59,7 @@ export default [
     async before(config) {
       if (config.saveBundle) {
         if (config.cleanDir) {
-          await rm(config.saveBundle)
+          await rm(config.saveBundle, { force: true, recursive: true })
         } else {
           let notEmpty = await isDirNotEmpty(config.saveBundle)
           if (notEmpty) {
@@ -71,7 +71,7 @@ export default [
 
     async finally(config, check) {
       if (check.webpackOutput && !config.saveBundle) {
-        await rm(check.webpackOutput)
+        await rm(check.webpackOutput, { force: true, recursive: true })
       }
     },
 
diff --git a/packages/webpack/test/index.test.js b/packages/webpack/test/index.test.js
@@ -1,8 +1,8 @@
 import filePkg from '@size-limit/file'
 import { existsSync } from 'node:fs'
-import { mkdir, writeFile } from 'node:fs/promises'
+import { mkdir, rm, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
-import { rm, SizeLimitError } from 'size-limit'
+import { SizeLimitError } from 'size-limit'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
 import webpackPkg from '../index.js'
@@ -37,7 +37,7 @@ async function getSize(check) {
 }
 
 afterEach(async () => {
-  await rm(DIST)
+  await rm(DIST, { force: true, recursive: true })
   vi.clearAllMocks()
 })
 
