cross-env

Author: cmdcolin

pnpm-lock.yaml

@@ -10,13 +10,13 @@
   "dir": "src",
   "repository": "https://github.com/GMOD/jbrowse-components.git",
   "scripts": {
-    "start": "NODE_ENV=development node scripts/start.js",
+    "start": "cross-env NODE_ENV=development node scripts/start.js",
     "electron": "electron . --no-sandbox",
     "electron-ts": "tsc -p tsconfig.electron.json",
     "preelectron": "pnpm electron-ts",
     "prebuild": "pnpm electron-ts",
     "prepack": "pnpm build",
-    "build": "NODE_ENV=production node scripts/build.js",
+    "build": "cross-env NODE_ENV=production node scripts/build.js",
     "build-electron": "pnpm build && electron-builder build --windows --mac --linux",
     "build-electron:win": "pnpm build && electron-builder build --windows",
     "build-electron:mac": "pnpm build && electron-builder build --mac",
@@ -105,6 +105,7 @@
   },
   "devDependencies": {
     "@types/selenium-webdriver": "^4.35.5",
+    "cross-env": "^7.0.3",
     "electron": "40.0.0",
     "electron-chromedriver": "^40.0.0",
     "selenium-webdriver": "^4.39.0"

products/jbrowse-desktop/package.json

@@ -2,7 +2,7 @@ import { fileURLToPath } from 'url'
 import { dirname, resolve, join } from 'path'
 import { spawn, ChildProcess } from 'child_process'
 import { createRequire } from 'module'
-import { Builder, WebDriver, By, until } from 'selenium-webdriver'
+import { Builder, WebDriver, By, until, logging } from 'selenium-webdriver'
 
 const require = createRequire(import.meta.url)
 
@@ -89,20 +89,42 @@ async function createDriver(): Promise<WebDriver> {
     )
   }
 
+  // Enable browser logging to capture console output
+  const prefs = new logging.Preferences()
+  prefs.setLevel(logging.Type.BROWSER, logging.Level.ALL)
+
   const driver = await new Builder()
     .usingServer(`http://localhost:${CHROMEDRIVER_PORT}`)
     .withCapabilities({
       'goog:chromeOptions': {
         binary: APP_BINARY,
         args: chromeArgs,
       },
+      'goog:loggingPrefs': {
+        browser: 'ALL',
+      },
     })
+    .setLoggingPrefs(prefs)
     .forBrowser('chrome')
     .build()
 
   return driver
 }
 
+// Flush browser console logs to stdout
+async function flushBrowserLogs(driver: WebDriver): Promise<void> {
+  try {
+    const logs = await driver.manage().logs().get(logging.Type.BROWSER)
+    for (const entry of logs) {
+      const level = entry.level.name
+      const message = entry.message
+      console.log(`    [Browser ${level}] ${message}`)
+    }
+  } catch {
+    // Ignore errors fetching logs
+  }
+}
+
 // Utility for case-insensitive XPath text search
 function textContainsXPath(text: string, elementType = '*') {
   const lowerText = text.toLowerCase()
@@ -235,13 +257,17 @@ async function runTest(
     const duration = Date.now() - start
     results.push({ name, passed: true, duration })
     console.log(`\r  ✓ ${name} (${duration}ms)`)
+    await flushBrowserLogs(d)
   } catch (e) {
     const duration = Date.now() - start
     const error = e instanceof Error ? e.message : String(e)
     results.push({ name, passed: false, error, duration })
     console.log(`\r  ✗ ${name}`)
     console.log(`    Error: ${error}`)
 
+    // Flush browser logs on failure for debugging
+    await flushBrowserLogs(d)
+
     // Capture debug info on failure
     try {
       const title = await d.getTitle()
@@ -1061,8 +1087,13 @@ async function testWorkspaceCopyView(driver: WebDriver): Promise<void> {
 async function cleanup(): Promise<void> {
   const { execSync } = await import('child_process')
   try {
-    execSync('pkill -f chromedriver || true', { stdio: 'ignore' })
-    execSync('pkill -f jbrowse-desktop || true', { stdio: 'ignore' })
+    if (isWindows) {
+      execSync('taskkill /F /IM chromedriver.exe 2>nul', { stdio: 'ignore' })
+      execSync('taskkill /F /IM "JBrowse 2.exe" 2>nul', { stdio: 'ignore' })
+    } else {
+      execSync('pkill -f chromedriver || true', { stdio: 'ignore' })
+      execSync('pkill -f jbrowse-desktop || true', { stdio: 'ignore' })
+    }
   } catch {
     // Ignore errors
   }
@@ -1140,7 +1171,11 @@ async function main(): Promise<void> {
   // Force kill any remaining jbrowse-desktop processes
   const { execSync } = await import('child_process')
   try {
-    execSync('pkill -f jbrowse-desktop || true', { stdio: 'ignore' })
+    if (isWindows) {
+      execSync('taskkill /F /IM "JBrowse 2.exe" 2>nul', { stdio: 'ignore' })
+    } else {
+      execSync('pkill -f jbrowse-desktop || true', { stdio: 'ignore' })
+    }
   } catch {
     // Ignore errors
   }
@@ -1163,7 +1198,11 @@ main().catch(async e => {
   // Force kill any remaining jbrowse-desktop processes
   const { execSync } = await import('child_process')
   try {
-    execSync('pkill -f jbrowse-desktop || true', { stdio: 'ignore' })
+    if (isWindows) {
+      execSync('taskkill /F /IM "JBrowse 2.exe" 2>nul', { stdio: 'ignore' })
+    } else {
+      execSync('pkill -f jbrowse-desktop || true', { stdio: 'ignore' })
+    }
   } catch {
     // Ignore errors
   }