8000 refactor: upgrade and reduce usage of `fs-extra` · nitrojs/nitro@cfbd029 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit cfbd029

Browse files
pi0pi0
committed
refactor: upgrade and reduce usage of fs-extra 
1 parent 42e17b4 commit cfbd029

File tree

6 files changed

+29
-17
lines changed

6 files changed

+29
-17
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"esbuild": "^0.16.2",
6666
"escape-string-regexp": "^5.0.0",
6767
"etag": "^1.8.1",
68-
"fs-extra": "^10.1.0",
68+
"fs-extra": "^11.1.0",
6969
"globby": "^13.1.2",
7070
"gzip-size": "^7.0.0",
7171
"h3": "^1.0.1",

‎pnpm-lock.yaml

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/presets/azure.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import fse from 'fs-extra'
1+
import { readFile } from 'node:fs/promises'
22
import { join, resolve } from 'pathe'
33
import { writeFile } from '../utils'
44
import { defineNitroPreset } from '../preset'
@@ -26,7 +26,7 @@ async function writeRoutes (nitro: Nitro) {
2626

2727
let nodeVersion = '16'
2828
try {
29-
const currentNodeVersion = fse.readJSONSync(join(nitro.options.rootDir, 'package.json')).engines.node
29+
const currentNodeVersion = JSON.parse(await readFile(join(nitro.options.rootDir, 'package.json'), 'utf8')).engines.node
3030
if (['16', '14'].includes(currentNodeVersion)) {
3131
nodeVersion = currentNodeVersion
3232
}

‎src/presets/cloudflare.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { resolve } from 'pathe'
2-
import { move } from 'fs-extra'
2+
import fse from 'fs-extra'
33
import { writeFile } from '../utils'
44
import { defineNitroPreset } from '../preset'
55
import type { Nitro } from '../types'
@@ -37,8 +37,8 @@ export const cloudflarePages = defineNitroPreset({
3737
},
3838
hooks: {
3939
async 'compiled' (nitro: Nitro) {
40-
await move(resolve(nitro.options.output.serverDir, 'path.js'), resolve(nitro.options.output.serverDir, '[[path]].js'))
41-
await move(resolve(nitro.options.output.serverDir, 'path.js.map'), resolve(nitro.options.output.serverDir, '[[path]].js.map'))
40+
await fse.move(resolve(nitro.options.output.serverDir, 'path.js'), resolve(nitro.options.output.serverDir, '[[path]].js'))
41+
await fse.move(resolve(nitro.options.output.serverDir, 'path.js.map'), resolve(nitro.options.output.serverDir, '[[path]].js.map'))
4242
}
4343
}
4444
})

‎src/presets/firebase.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { createRequire } from 'module'
2+
import { existsSync } from 'node:fs'
3+
import { readFile } from 'node:fs/promises'
24
import { join, relative, resolve } from 'pathe'
3-
import fse from 'fs-extra'
45
import { globby } from 'globby'
56
import { readPackageJSON } from 'pkg-types'
67
import { writeFile } from '../utils'
@@ -20,7 +21,7 @@ export const firebase = defineNitroPreset({
2021
})
2122

2223
async function writeRoutes (nitro: Nitro) {
23-
if (!fse.existsSync(join(nitro.options.rootDir, 'firebase.json'))) {
24+
if (!existsSync(join(nitro.options.rootDir, 'firebase.json'))) {
2425
const firebase = {
2526
functions: {
2627
source: relative(nitro.options.rootDir, nitro.options.output.serverDir)
@@ -57,7 +58,7 @@ async function writeRoutes (nitro: Nitro) {
5758

5859
let nodeVersion = '14'
5960
try {
60-
const currentNodeVersion = fse.readJSONSync(join(nitro.options.rootDir, 'package.json')).engines.node
61+
const currentNodeVersion = JSON.parse(await readFile(join(nitro.options.rootDir, 'package.json'), 'utf8')).engines.node
6162
if (['16', '14'].includes(currentNodeVersion)) {
6263
nodeVersion = currentNodeVersion
6364
}

‎src/utils/index.ts

Lines changed: 7 additions & 6 deletions
< 74A4 td data-grid-cell-id="diff-6147e3c1761df71fd40952dbcbac388a45f80b8c318f367ef41048351a2c0c99-117-118-1" data-selected="false" role="gridcell" style="background-color:var(--bgColor-default);text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative diff-line-number-neutral left-side">118
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { createRequire } from 'module'
2+
import fsp from 'node:fs/promises'
3+
import { existsSync, readFileSync } from 'node:fs'
24
import { relative, dirname, resolve } from 'pathe'
3-
import fse from 'fs-extra'
45
import jiti from 'jiti'
56
import consola from 'consola'
67
import chalk from 'chalk'
@@ -38,8 +39,8 @@ export function tryImport (dir: string, path: string) {
3839
}
3940

4041
export async function writeFile (file: string, contents: Buffer | string, log = false) {
41-
await fse.mkdirp(dirname(file))
42-
await fse.writeFile(file, contents, typeof contents === 'string' ? 'utf-8' : undefined)
42+
await fsp.mkdir(dirname(file), { recursive: true })
43+
await fsp.writeFile(file, contents, typeof contents === 'string' ? 'utf-8' : undefined)
4344
if (log) {
4445
consola.info('Generated', prettyPath(file))
4546
}
@@ -80,7 +81,7 @@ export function detectTarget () {
8081

8182
export async function isDirectory (path: string) {
8283
try {
83-
return (await fse.stat(path)).isDirectory()
84+
return (await fsp.stat(path)).isDirectory()
8485
} catch (_err) {
8586
return false
8687
}
@@ -117,8 +118,8 @@ export function readPackageJson (
117
const pkgModulePaths = /^(.*\/node_modules\/).*$/.exec(_require.resolve(packageName))
118119
for (const pkgModulePath of pkgModulePaths || []) {
119120
const path = resolve(pkgModulePath, packageName, 'package.json')
120-
if (fse.existsSync(path)) {
121-
return fse.readJSONSync(path)
121+
if (existsSync(path)) {
122+
return JSON.parse(readFileSync(path, 'utf8'))
122123
}
123124
continue
124125
}

0 commit comments

Comments
 (0)
0