Revert "chore: reduce fs-extra usage in scripts/"

run-tests.js

@@ -1,8 +1,7 @@
 const os = require('os')
 const path = require('path')
 const _glob = require('glob')
-const { existsSync } = require('fs')
-const fsp = require('fs/promises')
+const fs = require('fs-extra')
 const nodeFetch = require('node-fetch')
 const vercelFetch = require('@vercel/fetch')
 const fetch = vercelFetch(nodeFetch)
@@ -117,16 +116,10 @@ ${output}
 
 const cleanUpAndExit = async (code) => {
   if (process.env.NEXT_TEST_STARTER) {
-    await fsp.rm(process.env.NEXT_TEST_STARTER, {
-      recursive: true,
-      force: true,
-    })
+    await fs.remove(process.env.NEXT_TEST_STARTER)
   }
   if (process.env.NEXT_TEST_TEMP_REPO) {
-    await fsp.rm(process.env.NEXT_TEST_TEMP_REPO, {
-      recursive: true,
-      force: true,
-    })
+    await fs.remove(process.env.NEXT_TEST_TEMP_REPO)
   }
   if (process.env.CI) {
     await maybeLogSummary()
@@ -257,7 +250,7 @@ async function main() {
     try {
       const timingsFile = path.join(process.cwd(), 'test-timings.json')
       try {
-        prevTimings = JSON.parse(await fsp.readFile(timingsFile, 'utf8'))
+        prevTimings = JSON.parse(await fs.readFile(timingsFile, 'utf8'))
         console.log('Loaded test timings from disk successfully')
       } catch (_) {
         console.error('failed to load from disk', _)
@@ -268,7 +261,7 @@ async function main() {
         console.log('Fetched previous timings data successfully')
 
         if (writeTimings) {
-          await fsp.writeFile(timingsFile, JSON.stringify(prevTimings))
+          await fs.writeFile(timingsFile, JSON.stringify(prevTimings))
           console.log('Wrote previous timings data to', timingsFile)
           await cleanUpAndExit(0)
         }
@@ -551,16 +544,15 @@ ${ENDGROUP}`)
 
           return reject(err)
         }
-        await fsp
-          .rm(
+        await fs
+          .remove(
             path.join(
               __dirname,
               'test/traces',
               path
                 .relative(path.join(__dirname, 'test'), test.file)
                 .replace(/\//g, '-')
-            ),
-            { recursive: true, force: true }
+            )
           )
           .catch(() => {})
         resolve(new Date().getTime() - start)
@@ -653,7 +645,7 @@ ${ENDGROUP}`)
       // Emit test output if test failed or if we're continuing tests on error
       if ((!passed || shouldContinueTestsOnError) && isTestJob) {
         try {
-          const testsOutput = await fsp.readFile(
+          const testsOutput = await fs.readFile(
             `${test.file}${RESULTS_EXT}`,
             'utf8'
           )
@@ -716,7 +708,7 @@ ${ENDGROUP}`)
         }
 
         for (const test of Object.keys(newTimings)) {
-          if (!existsSync(path.join(__dirname, test))) {
+          if (!(await fs.pathExists(path.join(__dirname, test)))) {
             console.log('removing stale timing', test)
             delete newTimings[test]
           }

scripts/install-native.mjs

@@ -1,8 +1,7 @@
 import os from 'os'
 import path from 'path'
 import execa from 'execa'
-import fs from 'fs'
-import fsp from 'fs/promises'
+import fs from 'fs-extra'
 ;(async function () {
   if (process.env.NEXT_SKIP_NATIVE_POSTINSTALL) {
     console.log(
@@ -11,34 +10,34 @@ import fsp from 'fs/promises'
     return
   }
   let cwd = process.cwd()
-  const { version: nextVersion } = JSON.parse(
-    fs.readFileSync(path.join(cwd, 'packages', 'next', 'package.json'))
-  )
-  const { packageManager } = JSON.parse(
-    fs.readFileSync(path.join(cwd, 'package.json'))
+  const { version: nextVersion } = await fs.readJSON(
+    path.join(cwd, 'packages', 'next', 'package.json')
   )
+  const { packageManager } = await fs.readJSON(path.join(cwd, 'package.json'))
 
   try {
     // if installed swc package version matches monorepo version
     // we can skip re-installing
-    for (const pkg of fs.readdirSync(path.join(cwd, 'node_modules', '@next'))) {
+    for (const pkg of await fs.readdir(
+      path.join(cwd, 'node_modules', '@next')
+    )) {
       if (
         pkg.startsWith('swc-') &&
-        JSON.parse(
-          fs.readFileSync(
+        (
+          await fs.readJSON(
             path.join(cwd, 'node_modules', '@next', pkg, 'package.json')
           )
         ).version === nextVersion
       ) {
-        console.log(`@next/${pkg}@${nextVersion} already installed, skipping`)
+        console.log(`@next/${pkg}@${nextVersion} already installed skipping`)
         return
       }
     }
-  } catch {}
+  } catch (_) {}
 
   try {
     let tmpdir = path.join(os.tmpdir(), `next-swc-${Date.now()}`)
-    fs.mkdirSync(tmpdir, { recursive: true })
+    await fs.ensureDir(tmpdir)
     let pkgJson = {
       name: 'dummy-package',
       version: '1.0.0',
@@ -55,27 +54,28 @@ import fsp from 'fs/promises'
       },
       packageManager,
     }
-    fs.writeFileSync(path.join(tmpdir, 'package.json'), JSON.stringify(pkgJson))
-    fs.writeFileSync(path.join(tmpdir, '.npmrc'), 'node-linker=hoisted')
-
+    await fs.writeFile(
+      path.join(tmpdir, 'package.json'),
+      JSON.stringify(pkgJson)
+    )
+    await fs.writeFile(path.join(tmpdir, '.npmrc'), 'node-linker=hoisted')
     let { stdout } = await execa('pnpm', ['add', 'next@canary'], {
       cwd: tmpdir,
     })
     console.log(stdout)
-
-    let pkgs = fs.readdirSync(path.join(tmpdir, 'node_modules/@next'))
-    fs.mkdirSync(path.join(cwd, 'node_modules/@next'), { recursive: true })
+    let pkgs = await fs.readdir(path.join(tmpdir, 'node_modules/@next'))
+    await fs.ensureDir(path.join(cwd, 'node_modules/@next'))
 
     await Promise.all(
-      pkgs.map(async (pkg) => {
-        const from = path.join(tmpdir, 'node_modules/@next', pkg)
-        const to = path.join(cwd, 'node_modules/@next', pkg)
-        // overwriting by removing the target first
-        await fsp.rm(to, { recursive: true, force: true })
-        return fsp.rename(from, to)
-      })
+      pkgs.map((pkg) =>
+        fs.move(
+          path.join(tmpdir, 'node_modules/@next', pkg),
+          path.join(cwd, 'node_modules/@next', pkg),
+          { overwrite: true }
+        )
+      )
     )
-    fs.rmSync(tmpdir, { recursive: true, force: true })
+    await fs.remove(tmpdir)
     console.log('Installed the following binary packages:', pkgs)
   } catch (e) {
     console.error(e)

scripts/publish-release.js

@@ -5,7 +5,7 @@ const path = require('path')
 const execa = require('execa')
 const { Sema } = require('async-sema')
 const { execSync } = require('child_process')
-const fs = require('fs')
+const { readJson, readdir } = require('fs-extra')
 
 const cwd = process.cwd()
 
@@ -38,7 +38,7 @@ const cwd = process.cwd()
   }
 
   const packagesDir = path.join(cwd, 'packages')
-  const packageDirs = fs.readdirSync(packagesDir)
+  const packageDirs = await readdir(packagesDir)
   const publishSema = new Sema(2)
 
   const publish = async (pkg, retry = 0) => {
@@ -88,11 +88,8 @@ const cwd = process.cwd()
 
   await Promise.allSettled(
     packageDirs.map(async (packageDir) => {
-      const pkgJson = JSON.parse(
-        await fs.promises.readFile(
-          path.join(packagesDir, packageDir, 'package.json'),
-          'utf-8'
-        )
+      const pkgJson = await readJson(
+        path.join(packagesDir, packageDir, 'package.json')
       )
 
       if (pkgJson.private) {

scripts/setup-wasm.mjs

@@ -1,23 +1,23 @@
 import path from 'path'
-import fs from 'fs'
-import { copy } from 'fs-extra'
+import { readFile, writeFile } from 'fs/promises'
+import { copy, pathExists } from 'fs-extra'
 ;(async function () {
   try {
     let wasmDir = path.join(process.cwd(), 'packages/next-swc/crates/wasm')
     let wasmTarget = 'nodejs'
 
     // CI restores artifact at pkg-${wasmTarget}
     // This only runs locally
-    let folderName = fs.existsSync(path.join(wasmDir, 'pkg'))
+    let folderName = (await pathExists(path.join(wasmDir, 'pkg')))
       ? 'pkg'
       : `pkg-${wasmTarget}`
 
     let wasmPkg = JSON.parse(
-      fs.readFileSync(path.join(wasmDir, `${folderName}/package.json`))
+      await readFile(path.join(wasmDir, `${folderName}/package.json`))
     )
     wasmPkg.name = `@next/swc-wasm-${wasmTarget}`
 
-    fs.writeFileSync(
+    await writeFile(
       path.join(wasmDir, `${folderName}/package.json`),
       JSON.stringify(wasmPkg, null, 2)
     )

scripts/sync-react.js

@@ -1,7 +1,7 @@
 // @ts-check
 
 const path = require('path')
-const fsp = require('fs/promises')
+const { readJson, writeJson } = require('fs-extra')
 const execa = require('execa')
 
 /** @type {any} */
@@ -52,9 +52,7 @@ Or, run this command with no arguments to use the most recently published versio
   }
 
   const cwd = process.cwd()
-  const pkgJson = JSON.parse(
-    await fsp.readFile(path.join(cwd, 'package.json'), 'utf-8')
-  )
+  const pkgJson = await readJson(path.join(cwd, 'package.json'))
   const devDependencies = pkgJson.devDependencies
   const baseVersionStr = devDependencies[
     useExperimental ? 'react-experimental-builtin' : 'react-builtin'
@@ -92,10 +90,7 @@ Or, run this command with no arguments to use the most recently published versio
       )
     }
   }
-  await fsp.writeFile(
-    path.join(cwd, 'package.json'),
-    JSON.stringify(pkgJson, null, 2)
-  )
+  await writeJson(path.join(cwd, 'package.json'), pkgJson, { spaces: 2 })
   console.log('Successfully updated React dependencies in package.json.\n')
 
   // Install the updated dependencies and build the vendored React files.

scripts/trace-next-server.js

@@ -1,8 +1,7 @@
 const os = require('os')
 const path = require('path')
 const execa = require('execa')
-const fsp = require('fs/promises')
-const { copy } = require('fs-extra')
+const fs = require('fs-extra')
 const prettyBytes = require('pretty-bytes')
 const gzipSize = require('next/dist/compiled/gzip-size')
 const { nodeFileTrace } = require('next/dist/compiled/@vercel/nft')
@@ -25,7 +24,7 @@ async function main() {
   const origTestDir = path.join(origRepoDir, 'test')
   const dotDir = path.join(origRepoDir, './') + '.'
 
-  await copy(origRepoDir, repoDir, {
+  await fs.copy(origRepoDir, repoDir, {
     filter: (item) => {
       return (
         !item.startsWith(origTestDir) &&
@@ -37,11 +36,11 @@ async function main() {
 
   console.log('using workdir', workDir)
   console.log('using repodir', repoDir)
-  await fsp.mkdir(workDir, { recursive: true })
+  await fs.ensureDir(workDir)
 
   const pkgPaths = await linkPackages({ repoDir: origRepoDir })
 
-  await fsp.writeFile(
+  await fs.writeFile(
     path.join(workDir, 'package.json'),
     JSON.stringify(
       {
@@ -96,7 +95,7 @@ async function main() {
       continue
     }
     tracedDeps.add(file.replace(/\\/g, '/'))
-    const stat = await fsp.stat(path.join(workDir, file))
+    const stat = await fs.stat(path.join(workDir, file))
 
     if (stat.isFile()) {
       const compressedSize = await gzipSize(path.join(workDir, file))
@@ -113,7 +112,7 @@ async function main() {
     totalUncompressedSize: prettyBytes(totalUncompressedSize),
   })
 
-  await fsp.writeFile(
+  await fs.writeFile(
     path.join(
       __dirname,
       '../packages/next/dist/server/next-server.js.nft.json'
@@ -123,8 +122,8 @@ async function main() {
       version: 1,
     })
   )
-  await fsp.rm(workDir, { recursive: true, force: true })
-  await fsp.rm(repoDir, { recursive: true, force: true })
+  await fs.remove(workDir)
+  await fs.remove(repoDir)
 
   console.timeEnd(traceLabel)