Use shared dir for browser installs

Author: cezaraugusto

programs/develop/webpack/plugin-browsers/browsers-lib/messages.ts

@@ -433,16 +433,35 @@ export function prettyPuppeteerInstallGuidance(
     // ignore expansion errors
   }
 
-  // Inject --path "<cacheDir>" into Puppeteer install commands if not present
+  // Normalize browser subdir for our binaries layout (shared across installers)
+  let browserNorm = ''
+
+  if (browser === 'chromium-based') browserNorm = 'chromium'
+  if (browser === 'gecko-based') browserNorm = 'firefox'
+  if (
+    browser === 'chrome' ||
+    browser === 'chromium' ||
+    browser === 'firefox' ||
+    browser === 'edge'
+  ) {
+    browserNorm = browser
+  }
+  // default to chrome for unknown
+  browserNorm = 'chromium'
+
+  const finalCachePath =
+    browserNorm && cacheDir ? path.join(cacheDir, browserNorm) : cacheDir
+
+  // Inject install destinations for Puppeteer/Playwright to land in our cache
   try {
-    if (cacheDir && cacheDir.trim().length > 0) {
+    if (finalCachePath && finalCachePath.trim().length > 0) {
       const lines = cleaned.split(/\r?\n/)
       // Puppeteer path injection
       const idx = lines.findIndex((l) =>
         /npx\s+@puppeteer\/browsers\s+install\s+/i.test(l)
       )
       if (idx !== -1 && !/--path\s+/i.test(lines[idx])) {
-        lines[idx] = `${lines[idx].trim()} --path "${cacheDir}"`
+        lines[idx] = `${lines[idx].trim()} --path "${finalCachePath}"`
         cleaned = lines.join('\n')
       }
       // Playwright custom install dir via PLAYWRIGHT_BROWSERS_PATH
@@ -452,32 +471,12 @@ export function prettyPuppeteerInstallGuidance(
         )
 
         if (pwIdx !== -1) {
-          // Normalize browser subdir for our binaries layout
-          const browserNorm = (() => {
-            const b = String(browser || '').toLowerCase()
-            if (b === 'chromium-based') return 'chromium'
-            if (b === 'gecko-based') return 'firefox'
-            if (
-              b === 'chrome' ||
-              b === 'chromium' ||
-              b === 'firefox' ||
-              b === 'edge'
-            )
-              return b
-            // default to chrome for unknown
-            return 'chrome'
-          })()
-          const finalPath =
-            browserNorm && cacheDir
-              ? path.join(cacheDir, browserNorm)
-              : cacheDir
-
-          if (finalPath && finalPath.trim().length > 0) {
+          if (finalCachePath && finalCachePath.trim().length > 0) {
             const cmd = lines[pwIdx].trim()
             const withEnv =
               process.platform === 'win32'
-                ? `set PLAYWRIGHT_BROWSERS_PATH="${finalPath}" && ${cmd}`
-                : `PLAYWRIGHT_BROWSERS_PATH="${finalPath}" ${cmd}`
+                ? `set PLAYWRIGHT_BROWSERS_PATH="${finalCachePath}" && ${cmd}`
+                : `PLAYWRIGHT_BROWSERS_PATH="${finalCachePath}" ${cmd}`
             lines[pwIdx] = withEnv
             cleaned = lines.join('\n')
           }
@@ -491,8 +490,8 @@ export function prettyPuppeteerInstallGuidance(
   }
 
   body.push(cleaned)
-  if (cacheDir) {
-    body.push(`${dim('INSTALL PATH')} ${colors.underline(cacheDir)}`)
+  if (finalCachePath) {
+    body.push(`${dim('INSTALL PATH')} ${colors.underline(finalCachePath)}`)
   }
   return body.join('\n') + '\n'
 }

programs/develop/webpack/plugin-browsers/browsers-lib/output-binaries-resolver.ts

@@ -2,6 +2,58 @@ import * as fs from 'fs'
 import * as path from 'path'
 import type {Compilation} from '@rspack/core'
 
+function computeSharedCacheRoot(): string {
+  // Highest priority: explicit override
+  const explicit = String(process.env.EXT_BROWSERS_CACHE_DIR || '').trim()
+  if (explicit) return path.resolve(explicit)
+
+  // Respect XDG cache on Linux
+  const isWin = process.platform === 'win32'
+  const isMac = process.platform === 'darwin'
+
+  if (isWin) {
+    const local = String(process.env.LOCALAPPDATA || '').trim()
+    if (local) return path.join(local, 'extension.js', 'browsers')
+
+    const userProfile = String(process.env.USERPROFILE || '').trim()
+
+    if (userProfile) {
+      return path.join(
+        userProfile,
+        'AppData',
+        'Local',
+        'extension.js',
+        'browsers'
+      )
+    }
+    // Fallback to cwd if envs are missing (rare)
+    return path.resolve(process.cwd(), '.cache', 'extension.js', 'browsers')
+  }
+
+  if (isMac) {
+    const home = String(process.env.HOME || '').trim()
+
+    if (home) {
+      return path.join(home, 'Library', 'Caches', 'extension.js', 'browsers')
+    }
+
+    return path.resolve(process.cwd(), '.cache', 'extension.js', 'browsers')
+  }
+
+  // Linux / others
+  const xdg = String(process.env.XDG_CACHE_HOME || '').trim()
+
+  if (xdg) return path.join(xdg, 'extension.js', 'browsers')
+
+  const home = String(process.env.HOME || '').trim()
+
+  if (home) {
+    return path.join(home, '.cache', 'extension.js', 'browsers')
+  }
+
+  return path.resolve(process.cwd(), '.cache', 'extension.js', 'browsers')
+}
+
 export function getCompilationOutputPath(compilation: Compilation): string {
   try {
     return (
@@ -13,6 +65,12 @@ export function getCompilationOutputPath(compilation: Compilation): string {
 }
 
 export function computeBinariesBaseDir(compilation: Compilation) {
+  // New default: per-user shared cache
+  if (process.env.EXTENSIONJS_BINARIES_IN_DIST !== '1') {
+    return computeSharedCacheRoot()
+  }
+
+  // Legacy fallback: project dist
   const outputDir = getCompilationOutputPath(compilation)
 
   if (outputDir) {