fix: newPath dir could be unavailable, make sure it's already there (#27)

JounQin · web-flow · commit f52b3e9c8056 · 2025-04-29T01:48:49.000+08:00
diff --git a/.changeset/eight-balloons-relax.md b/.changeset/eight-balloons-relax.md
@@ -0,0 +1,5 @@
+---
+"napi-postinstall": patch
+---
+
+fix: `newPath` dir could be unavailable, make sure it's already there
diff --git a/src/helpers.ts b/src/helpers.ts
@@ -37,7 +37,7 @@ export function removeRecursive(dir: string) {
 
 export function downloadedNodePath(name: string, subpath: string) {
   const pkgLibDir = path.dirname(require.resolve(name + '/package.json'))
-  return path.join(pkgLibDir, `${path.basename(subpath)}`)
+  return path.join(pkgLibDir, path.basename(subpath))
 }
 
 export function getNapiInfoFromPackageJson(
diff --git a/src/index.ts b/src/index.ts
@@ -139,8 +139,9 @@ function installUsingNPM(
       fs.unlinkSync(packageJsonPath)
     }
 
+    const nodeModulesDir = path.join(installDir, 'node_modules')
+
     try {
-      const nodeModulesDir = path.join(installDir, 'node_modules')
       if (isWasm32Wasi) {
         const newNodeModulesDir = path.resolve(installDir, '../node_modules')
         const dirs = fs.readdirSync(nodeModulesDir)
@@ -200,10 +201,7 @@ function installUsingNPM(
       // Move the downloaded binary executable into place. The destination path
       // is the same one that the JavaScript API code uses so it will be able to
       // find the binary executable here later.
-      fs.renameSync(
-        path.join(installDir, 'node_modules', pkg, subpath),
-        nodePath,
-      )
+      fs.renameSync(path.join(nodeModulesDir, pkg, subpath), nodePath)
     }
   } finally {
     try {
@@ -328,6 +326,11 @@ export async function checkAndPreparePackage(
       require.resolve(`${pkg}/${subpath}`)
       break
     } catch {
+      try {
+        // Check whether it's already been patched
+        require.resolve(`${name}/${subpath}`)
+        break
+      } catch {}
       if (isPnp()) {
         if (isWasm32Wasi) {
           try {
@@ -374,6 +377,7 @@ this. If that fails, you need to remove the "--no-optional" flag to use ${name}.
           '../..',
         )
         nodePath = path.join(nodeModulesDir, name, subpath)
+        fs.mkdirSync(path.dirname(nodePath), { recursive: true })
       }
       try {
         errorLog(`Trying to install package "${pkg}" using npm`)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"napi-postinstall": patch
 +---
++
 +fix: `newPath` dir could be unavailable, make sure it's already there
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ export function removeRecursive(dir: string) {`
`37`	`37`
`38`	`38`	`export function downloadedNodePath(name: string, subpath: string) {`
`39`	`39`	`const pkgLibDir = path.dirname(require.resolve(name + '/package.json'))`
`40`		- return path.join(pkgLibDir, `${path.basename(subpath)}`)
	`40`	`+ return path.join(pkgLibDir, path.basename(subpath))`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`export function getNapiInfoFromPackageJson(`