@react-native/debugger-shell 0.82.0-nightly-20250822-646945c2f → 0.82.0-nightly-20250824-bf12e30cb

package/dist/electron/MainInstanceEntryPoint.js

@@ -18,37 +18,31 @@ function handleLaunchArgs(argv) {
     },
     args: argv,
   });
-  const existingWindow = BrowserWindow.getAllWindows().find((window) => {
+  let frontendWindow = BrowserWindow.getAllWindows().find((window) => {
     const metadata = windowMetadata.get(window);
     if (!metadata) {
       return false;
     }
     return metadata.windowKey === windowKey;
   });
-  if (existingWindow) {
-    if (existingWindow.isVisible()) {
-      existingWindow.flashFrame(true);
+  if (frontendWindow) {
+    if (frontendWindow.isVisible()) {
+      frontendWindow.flashFrame(true);
       setTimeout(() => {
-        existingWindow.flashFrame(false);
+        frontendWindow.flashFrame(false);
       }, 1000);
     }
-    if (process.platform === "darwin") {
-      app.focus({
-        steal: true,
-      });
-    }
-    existingWindow.focus();
-    return;
+  } else {
+    frontendWindow = new BrowserWindow({
+      width: 1200,
+      height: 600,
+      webPreferences: {
+        partition: "persist:react-native-devtools",
+        preload: require.resolve("./preload.js"),
+      },
+      icon: path.join(__dirname, "resources", "icon.png"),
+    });
   }
-  const frontendWindow = new BrowserWindow({
-    width: 1200,
-    height: 600,
-    webPreferences: {
-      partition: "persist:react-native-devtools",
-      preload: require.resolve("./preload.js"),
-    },
-    icon: path.join(__dirname, "resources", "icon.png"),
-  });
   frontendWindow.webContents.setWindowOpenHandler(({ url }) => {
     shell.openExternal(url);
     return {
@@ -64,6 +58,7 @@ function handleLaunchArgs(argv) {
       steal: true,
     });
   }
+  frontendWindow.focus();
 }
 app.whenReady().then(() => {
   handleLaunchArgs(process.argv.slice(app.isPackaged ? 1 : 2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/debugger-shell",
-  "version": "0.82.0-nightly-20250822-646945c2f",
+  "version": "0.82.0-nightly-20250824-bf12e30cb",
   "description": "Experimental debugger shell for React Native for use with @react-native/debugger-frontend",
   "keywords": [
     "react-native",

package/src/electron/MainInstanceEntryPoint.js

@@ -36,7 +36,7 @@ function handleLaunchArgs(argv: string[]) {
   });
 
   // Find an existing window for this app and launch configuration.
-  const existingWindow = BrowserWindow.getAllWindows().find(window => {
+  let frontendWindow = BrowserWindow.getAllWindows().find(window => {
     const metadata = windowMetadata.get(window);
     if (!metadata) {
       return false;
@@ -44,41 +44,37 @@ function handleLaunchArgs(argv: string[]) {
     return metadata.windowKey === windowKey;
   });
 
-  if (existingWindow) {
+  if (frontendWindow) {
     // If the window is already visible, flash it.
-    if (existingWindow.isVisible()) {
-      existingWindow.flashFrame(true);
+    if (frontendWindow.isVisible()) {
+      frontendWindow.flashFrame(true);
       setTimeout(() => {
-        existingWindow.flashFrame(false);
+        frontendWindow.flashFrame(false);
       }, 1000);
     }
-    if (process.platform === 'darwin') {
-      app.focus({
-        steal: true,
-      });
-    }
-    existingWindow.focus();
-    return;
+  } else {
+    // Create the browser window.
+    frontendWindow = new BrowserWindow({
+      width: 1200,
+      height: 600,
+      webPreferences: {
+        partition: 'persist:react-native-devtools',
+        preload: require.resolve('./preload.js'),
+      },
+      // Icon for Linux
+      icon: path.join(__dirname, 'resources', 'icon.png'),
+    });
   }
 
-  // Create the browser window.
-  const frontendWindow = new BrowserWindow({
-    width: 1200,
-    height: 600,
-    webPreferences: {
-      partition: 'persist:react-native-devtools',
-      preload: require.resolve('./preload.js'),
-    },
-    // Icon for Linux
-    icon: path.join(__dirname, 'resources', 'icon.png'),
-  });
-
   // Open links in the default browser instead of in new Electron windows.
   frontendWindow.webContents.setWindowOpenHandler(({url}) => {
     shell.openExternal(url);
     return {action: 'deny'};
   });
 
+  // TODO: If the window contains a live, working frontend instance with a valid connection to the backend,
+  // we should avoid this reload and instead send the frontend a message to handle the launch arguments
+  // dynamically (e.g. update the launch ID for telemetry purposes, handle deeplinking to a specific CDT panel, etc).
   frontendWindow.loadURL(frontendUrl);
 
   windowMetadata.set(frontendWindow, {
@@ -90,6 +86,7 @@ function handleLaunchArgs(argv: string[]) {
       steal: true,
     });
   }
+  frontendWindow.focus();
 }
 
 app.whenReady().then(() => {