From 605dfde2be31309687a7216fa798cbafb9f9113d Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Wed, 21 Jun 2023 21:10:50 +0200
Subject: [PATCH] chore: rename popout.html to snapshot.html in trace viewer
 (#23842)

Turns out its caused by a uBlockOrigin EasyList entry which thinks we
are an ad since we call ourselves "popout.html". See this entry:


https://github.com/easylist/easylist/blob/e7883cfe74384b18cc864c7a54ec2c01f4741828/easylist/easylist_general_block_popup.txt#L42

Fixes https://github.com/microsoft/playwright/issues/23799
---
 packages/trace-viewer/{popout.html => snapshot.html} | 0
 packages/trace-viewer/src/snapshotRenderer.ts        | 4 ++--
 packages/trace-viewer/src/ui/snapshotTab.tsx         | 2 +-
 packages/trace-viewer/vite.config.ts                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/trace-viewer/{popout.html => snapshot.html} (100%)

diff --git a/packages/trace-viewer/popout.html b/packages/trace-viewer/snapshot.html
similarity index 100%
rename from packages/trace-viewer/popout.html
rename to packages/trace-viewer/snapshot.html
diff --git a/packages/trace-viewer/src/snapshotRenderer.ts b/packages/trace-viewer/src/snapshotRenderer.ts
index 1b6c177a68..223d553c7b 100644
--- a/packages/trace-viewer/src/snapshotRenderer.ts
+++ b/packages/trace-viewer/src/snapshotRenderer.ts
@@ -353,10 +353,10 @@ function rewriteURLsInStyleSheetForCustomProtocol(text: string): string {
   });
 }
 
-// <base>/popout.html?r=<snapshotUrl> is used for "pop out snapshot" feature.
+// <base>/snapshot.html?r=<snapshotUrl> is used for "pop out snapshot" feature.
 export function unwrapPopoutUrl(url: string) {
   const u = new URL(url);
-  if (u.pathname.endsWith('/popout.html'))
+  if (u.pathname.endsWith('/snapshot.html'))
     return u.searchParams.get('r')!;
   return url;
 }
diff --git a/packages/trace-viewer/src/ui/snapshotTab.tsx b/packages/trace-viewer/src/ui/snapshotTab.tsx
index 1a8365abfb..cef3a35358 100644
--- a/packages/trace-viewer/src/ui/snapshotTab.tsx
+++ b/packages/trace-viewer/src/ui/snapshotTab.tsx
@@ -73,7 +73,7 @@ export const SnapshotTab: React.FunctionComponent<{
     const popoutParams = new URLSearchParams();
     popoutParams.set('r', snapshotUrl);
     popoutParams.set('trace', context(snapshot.action).traceUrl);
-    const popoutUrl = new URL(`popout.html?${popoutParams.toString()}`, window.location.href).toString();
+    const popoutUrl = new URL(`snapshot.html?${popoutParams.toString()}`, window.location.href).toString();
     return { snapshots, snapshotInfoUrl, snapshotUrl, pointX, pointY, popoutUrl };
   }, [snapshots, snapshotTab]);
 
diff --git a/packages/trace-viewer/vite.config.ts b/packages/trace-viewer/vite.config.ts
index ef7b15780a..be6f2dffaf 100644
--- a/packages/trace-viewer/vite.config.ts
+++ b/packages/trace-viewer/vite.config.ts
@@ -45,7 +45,7 @@ export default defineConfig({
       input: {
         index: path.resolve(__dirname, 'index.html'),
         uiMode: path.resolve(__dirname, 'uiMode.html'),
-        popout: path.resolve(__dirname, 'popout.html'),
+        snapshot: path.resolve(__dirname, 'snapshot.html'),
       },
       output: {
         entryFileNames: () => '[name].[hash].js',