fix: detecting workspace root for calculating whether a relative file is within the project directory due to monorepo workspaces having process.cwd() returning the subpackage instead of monorepo root

Author: mmaietta

.changeset/stupid-lobsters-own.md

@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+fix: detecting workspace root for calculating whether a relative file is within the project directory due to monorepo workspaces having `process.cwd()` returning the subpackage instead of monorepo root

packages/app-builder-lib/package.json

@@ -66,6 +66,7 @@
     "dotenv-expand": "^11.0.6",
     "ejs": "^3.1.8",
     "electron-publish": "workspace:*",
+    "find-up": "^5.0.0",
     "fs-extra": "^10.1.0",
     "hosted-git-info": "^4.1.0",
     "isbinaryfile": "^5.0.0",
@@ -104,6 +105,7 @@
     "@babel/preset-react": "7.24.7",
     "@types/debug": "4.1.7",
     "@types/ejs": "3.1.0",
+    "@types/find-up": "^4.0.2",
     "@types/hosted-git-info": "3.0.2",
     "@types/js-yaml": "4.0.3",
     "@types/plist": "3.0.5",

packages/app-builder-lib/src/asar/asarUtil.ts

@@ -9,6 +9,8 @@ import { PlatformPackager } from "../platformPackager"
 import { ResolvedFileSet, getDestinationPath } from "../util/appFileCopier"
 import { detectUnpackedDirs } from "./unpackDetector"
 import { Readable } from "stream"
+import * as findUp from "find-up"
+import { readdir } from "fs/promises"
 
 /** @internal */
 export class AsarPackager {
@@ -143,8 +145,9 @@ export class AsarPackager {
       return { path: destination, streamGenerator, unpacked, type: "file", stat: { mode: stat.mode, size } }
     }
 
+    const rootDir = (await findWorkspaceRoot(fileSet.src)) ?? fileSet.src
     const realPathFile = await fs.realpath(file)
-    const realPathRelative = path.relative(fileSet.src, realPathFile)
+    const realPathRelative = path.relative(rootDir, realPathFile)
     const isOutsidePackage = realPathRelative.startsWith("..")
     if (isOutsidePackage) {
       log.error({ source: log.filePath(file), realPathFile: log.filePath(realPathFile) }, `unable to copy, file is symlinked outside the package`)
@@ -159,7 +162,7 @@ export class AsarPackager {
     }
 
     // not a symlink, stream directly
-    if (file === realPathFile) {
+    if (!stat.isSymbolicLink()) {
       return {
         ...config,
         type: "file",
@@ -231,3 +234,33 @@ export class AsarPackager {
     }
   }
 }
+
+export async function findWorkspaceRoot(startDir: string): Promise<string | undefined> {
+  const packageJson = "package.json"
+  const WORKSPACE_MARKERS = ["pnpm-workspace.yaml", "lerna.json", "nx.json", "turbo.json", ".yarnrc.yml", packageJson]
+  // Use findUp to search for workspace markers in parent directories
+  const file = await findUp(
+    async directory => {
+      const dirContents = await readdir(directory)
+      const pkgJsonPath = path.join(directory, packageJson)
+
+      for (const filenameMarker of WORKSPACE_MARKERS) {
+        if (dirContents.includes(filenameMarker)) {
+          if (filenameMarker === packageJson) {
+            const rootWorkspaceConfigPath = await fs
+              .readJson(pkgJsonPath)
+              .then(pkg => (pkg.workspaces || pkg.pnpm || pkg.workspaces?.packages ? pkgJsonPath : undefined))
+              .catch(() => undefined) // ignore invalid package.json
+            if (rootWorkspaceConfigPath) {
+              return rootWorkspaceConfigPath
+            }
+          }
+          return path.join(directory, filenameMarker)
+        }
+      }
+      return dirContents.includes(".git") ? findUp.stop : undefined // stop searching if we hit a .git root directory
+    },
+    { cwd: startDir }
+  )
+  return file ? path.dirname(file) : undefined
+}

packages/app-builder-lib/src/node-module-collector/yarnNodeModulesCollector.ts

@@ -6,6 +6,5 @@ export class YarnNodeModulesCollector extends NpmNodeModulesCollector {
     super(rootDir)
   }
 
-  // note: do not override instance-var `pmCommand`. We explicitly use npm for the json payload
   public readonly installOptions = { manager: PM.YARN, lockfile: "yarn.lock" }
 }