refactor: upgrade and reduce usage of fs-extra

nitrojs · Dec 8, 2022 · cfbd029 · cfbd029
1 parent 42e17b4
commit cfbd029
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "esbuild": "^0.16.2",
     "escape-string-regexp": "^5.0.0",
     "etag": "^1.8.1",
-    "fs-extra": "^10.1.0",
+    "fs-extra": "^11.1.0",
     "globby": "^13.1.2",
     "gzip-size": "^7.0.0",
     "h3": "^1.0.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/presets/azure.ts b/src/presets/azure.ts
@@ -1,4 +1,4 @@
-import fse from 'fs-extra'
+import { readFile } from 'node:fs/promises'
 import { join, resolve } from 'pathe'
 import { writeFile } from '../utils'
 import { defineNitroPreset } from '../preset'
@@ -26,7 +26,7 @@ async function writeRoutes (nitro: Nitro) {
 
   let nodeVersion = '16'
   try {
-    const currentNodeVersion = fse.readJSONSync(join(nitro.options.rootDir, 'package.json')).engines.node
+    const currentNodeVersion = JSON.parse(await readFile(join(nitro.options.rootDir, 'package.json'), 'utf8')).engines.node
     if (['16', '14'].includes(currentNodeVersion)) {
       nodeVersion = currentNodeVersion
     }

diff --git a/src/presets/cloudflare.ts b/src/presets/cloudflare.ts
@@ -1,5 +1,5 @@
 import { resolve } from 'pathe'
-import { move } from 'fs-extra'
+import fse from 'fs-extra'
 import { writeFile } from '../utils'
 import { defineNitroPreset } from '../preset'
 import type { Nitro } from '../types'
@@ -37,8 +37,8 @@ export const cloudflarePages = defineNitroPreset({
   },
   hooks: {
     async 'compiled' (nitro: Nitro) {
-      await move(resolve(nitro.options.output.serverDir, 'path.js'), resolve(nitro.options.output.serverDir, '[[path]].js'))
-      await move(resolve(nitro.options.output.serverDir, 'path.js.map'), resolve(nitro.options.output.serverDir, '[[path]].js.map'))
+      await fse.move(resolve(nitro.options.output.serverDir, 'path.js'), resolve(nitro.options.output.serverDir, '[[path]].js'))
+      await fse.move(resolve(nitro.options.output.serverDir, 'path.js.map'), resolve(nitro.options.output.serverDir, '[[path]].js.map'))
     }
   }
 })
diff --git a/src/presets/firebase.ts b/src/presets/firebase.ts
@@ -1,6 +1,7 @@
 import { createRequire } from 'module'
+import { existsSync } from 'node:fs'
+import { readFile } from 'node:fs/promises'
 import { join, relative, resolve } from 'pathe'
-import fse from 'fs-extra'
 import { globby } from 'globby'
 import { readPackageJSON } from 'pkg-types'
 import { writeFile } from '../utils'
@@ -20,7 +21,7 @@ export const firebase = defineNitroPreset({
 })
 
 async function writeRoutes (nitro: Nitro) {
-  if (!fse.existsSync(join(nitro.options.rootDir, 'firebase.json'))) {
+  if (!existsSync(join(nitro.options.rootDir, 'firebase.json'))) {
     const firebase = {
       functions: {
         source: relative(nitro.options.rootDir, nitro.options.output.serverDir)
@@ -57,7 +58,7 @@ async function writeRoutes (nitro: Nitro) {
 
   let nodeVersion = '14'
   try {
-    const currentNodeVersion = fse.readJSONSync(join(nitro.options.rootDir, 'package.json')).engines.node
+    const currentNodeVersion = JSON.parse(await readFile(join(nitro.options.rootDir, 'package.json'), 'utf8')).engines.node
     if (['16', '14'].includes(currentNodeVersion)) {
       nodeVersion = currentNodeVersion
     }

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -1,6 +1,7 @@
 import { createRequire } from 'module'
+import fsp from 'node:fs/promises'
+import { existsSync, readFileSync } from 'node:fs'
 import { relative, dirname, resolve } from 'pathe'
-import fse from 'fs-extra'
 import jiti from 'jiti'
 import consola from 'consola'
 import chalk from 'chalk'
@@ -38,8 +39,8 @@ export function tryImport (dir: string, path: string) {
 }
 
 export async function writeFile (file: string, contents: Buffer | string, log = false) {
-  await fse.mkdirp(dirname(file))
-  await fse.writeFile(file, contents, typeof contents === 'string' ? 'utf-8' : undefined)
+  await fsp.mkdir(dirname(file), { recursive: true })
+  await fsp.writeFile(file, contents, typeof contents === 'string' ? 'utf-8' : undefined)
   if (log) {
     consola.info('Generated', prettyPath(file))
   }
@@ -80,7 +81,7 @@ export function detectTarget () {
 
 export async function isDirectory (path: string) {
   try {
-    return (await fse.stat(path)).isDirectory()
+    return (await fsp.stat(path)).isDirectory()
   } catch (_err) {
     return false
   }
@@ -117,8 +118,8 @@ export function readPackageJson (
       const pkgModulePaths = /^(.*\/node_modules\/).*$/.exec(_require.resolve(packageName))
       for (const pkgModulePath of pkgModulePaths || []) {
         const path = resolve(pkgModulePath, packageName, 'package.json')
-        if (fse.existsSync(path)) {
-          return fse.readJSONSync(path)
+        if (existsSync(path)) {
+          return JSON.parse(readFileSync(path, 'utf8'))
         }
         continue
       }