Add debugger query parameter, disables debugger when set to false (#3787)

jspspike · web-flow · commit 3bba1eb2f1f3 · 2023-08-18T10:21:37.000-05:00
diff --git a/packages/wrangler-devtools/patches/0001-Add-README-detailing-the-setup-process.patch b/packages/wrangler-devtools/patches/0001-Add-README-detailing-the-setup-process.patch
@@ -1,7 +1,7 @@
-From b2985a087935838fdf6a6f0dba21afed484849c7 Mon Sep 17 00:00:00 2001
+From 085ba88402c95c0c110c77da1cdf23c0e7ccf0ab Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Wed, 11 Jan 2023 17:46:48 +0000
-Subject: [PATCH 01/15] Add README detailing the setup process
+Subject: [PATCH 01/16] Add README detailing the setup process
 
 ---
  README.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -74,5 +74,5 @@ index 8a057be23c..4e009509b2 100644
  
  <!-- [START badges] -->
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0002-Support-viewing-files-over-the-network.patch b/packages/wrangler-devtools/patches/0002-Support-viewing-files-over-the-network.patch
@@ -1,7 +1,7 @@
-From cc7b688a2427d7506a2f4111887a5e243fb841d4 Mon Sep 17 00:00:00 2001
+From ae9408ae42966da4f8e34a9add5c9ee641e1afa1 Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Thu, 12 Jan 2023 15:33:43 +0000
-Subject: [PATCH 02/15] Support viewing files over the network
+Subject: [PATCH 02/16] Support viewing files over the network
 
 ---
  front_end/core/sdk/Target.ts             |  4 ++++
@@ -93,5 +93,5 @@ index ac0d4aaf68..29c726e185 100644
    ]
  }
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0003-Show-fallback-image-on-Safari.patch b/packages/wrangler-devtools/patches/0003-Show-fallback-image-on-Safari.patch
@@ -1,7 +1,7 @@
-From a742a62c90c73c8c7e766eaaad9003200a447729 Mon Sep 17 00:00:00 2001
+From 3e732ac51f1cc473f5dea7224b3c5f2978a82956 Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Mon, 16 Jan 2023 16:51:11 +0000
-Subject: [PATCH 03/15] Show fallback image on Safari
+Subject: [PATCH 03/16] Show fallback image on Safari
 
 ---
  config/gni/devtools_grd_files.gni   |   1 +
@@ -1815,5 +1815,5 @@ index 1edaec9604..945aa6d816 100644
 +</script>
  <body class="undocked" id="-blink-dev-tools">
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0004-Support-previewing-subrequest-responses.patch b/packages/wrangler-devtools/patches/0004-Support-previewing-subrequest-responses.patch
@@ -1,7 +1,7 @@
-From 6c4581cd2e985e8e94aa3c9091faec45743da6e4 Mon Sep 17 00:00:00 2001
+From 2b46e6f3c86723ff2c0729ff9dee507347a07a75 Mon Sep 17 00:00:00 2001
 From: bcoll <bcoll@cloudflare.com>
 Date: Mon, 16 Jan 2023 14:26:52 +0000
-Subject: [PATCH 04/15] Support previewing subrequest responses
+Subject: [PATCH 04/16] Support previewing subrequest responses
 
 ---
  front_end/core/sdk/NetworkManager.ts   | 9 +++++++--
@@ -61,5 +61,5 @@ index 213ca7fecd..ef5c568e96 100644
  import '../../panels/js_profiler/js_profiler-meta.js';
  
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0005-Better-Firefox-support-for-network-tab.patch b/packages/wrangler-devtools/patches/0005-Better-Firefox-support-for-network-tab.patch
@@ -1,7 +1,7 @@
-From b91cdddb4b2576149ba2c184f011073140f16e9b Mon Sep 17 00:00:00 2001
+From c19d1d618c1ca839dd662e4dbd9b3fd6d1aa65e3 Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Thu, 19 Jan 2023 15:47:52 +0000
-Subject: [PATCH 05/15] Better Firefox support for network tab
+Subject: [PATCH 05/16] Better Firefox support for network tab
 
 ---
  front_end/entrypoints/js_app/js_app.ts               | 2 ++
@@ -45,5 +45,5 @@ index a7ec8ccf32..fc80d2769d 100644
        return;
      }
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0006-DEVX-292-Remove-unsupported-network-UI.patch b/packages/wrangler-devtools/patches/0006-DEVX-292-Remove-unsupported-network-UI.patch
@@ -1,7 +1,7 @@
-From 1a267cd3d143892fb0886907a75e3eb295b5b150 Mon Sep 17 00:00:00 2001
+From c8bc70352e561fdf6f004e0b3904a16d468d3690 Mon Sep 17 00:00:00 2001
 From: bcoll <bcoll@cloudflare.com>
 Date: Mon, 16 Jan 2023 15:43:50 +0000
-Subject: [PATCH 06/15] DEVX-292 Remove unsupported network UI
+Subject: [PATCH 06/16] DEVX-292 Remove unsupported network UI
 
 ---
  front_end/panels/network/NetworkPanel.ts | 35 ------------------------
@@ -75,5 +75,5 @@ index 304bb09af1..aaf80fbd50 100644
      this.rightToolbar.appendSeparator();
      this.rightToolbar.appendToolbarItem(new UI.Toolbar.ToolbarSettingToggle(
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0007-Remove-unsupported-profiler-UI.patch b/packages/wrangler-devtools/patches/0007-Remove-unsupported-profiler-UI.patch
@@ -1,7 +1,7 @@
-From 7312af32a23a62acc2f5661187ef90b01381c0de Mon Sep 17 00:00:00 2001
+From 300d56bf34269b93eb011a0a25bbd160f4d3e122 Mon Sep 17 00:00:00 2001
 From: bcoll <bcoll@cloudflare.com>
 Date: Mon, 16 Jan 2023 16:32:45 +0000
-Subject: [PATCH 07/15] Remove unsupported profiler UI
+Subject: [PATCH 07/16] Remove unsupported profiler UI
 
 ---
  front_end/panels/profiler/HeapProfilerPanel.ts | 2 +-
@@ -35,5 +35,5 @@ index c4680b48be..c2fe5b775f 100644
      this.profileViewToolbar = new UI.Toolbar.Toolbar('', this.toolbarElement);
      this.profileViewToolbar.makeWrappable(true);
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0008-Show-an-overlay-on-the-memory-tab-in-Firefox.patch b/packages/wrangler-devtools/patches/0008-Show-an-overlay-on-the-memory-tab-in-Firefox.patch
@@ -1,7 +1,7 @@
-From 70e79d4a4e1821021d0df627a23d62ede6c558ba Mon Sep 17 00:00:00 2001
+From 67881d8f2c90958d2532a8b2d794548b7836ec66 Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Thu, 19 Jan 2023 18:49:47 +0000
-Subject: [PATCH 08/15] Show an overlay on the memory tab in Firefox
+Subject: [PATCH 08/16] Show an overlay on the memory tab in Firefox
 
 ---
  front_end/entrypoint_template.html          | 18 ++++++++++++++++--
@@ -71,5 +71,5 @@ index 693621a273..9b330e7cf0 100644
    flex: auto;
    position: relative;
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0009-Support-theme-url-parameter-for-forcing-the-theme-fr.patch b/packages/wrangler-devtools/patches/0009-Support-theme-url-parameter-for-forcing-the-theme-fr.patch
@@ -1,7 +1,7 @@
-From 0edd0dbfe2704ef6bc527cbfa68dd35989d95cc5 Mon Sep 17 00:00:00 2001
+From 010c48b5ab6ae04da9c348e985a5f41397437fdc Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Fri, 20 Jan 2023 19:19:37 +0000
-Subject: [PATCH 09/15] Support theme= url parameter for forcing the theme from
+Subject: [PATCH 09/16] Support theme= url parameter for forcing the theme from
  outside
 
 ---
@@ -41,5 +41,5 @@ index 05736bc0b8..530028d5b0 100644
        this.customSheets.clear();
        this.dispatchEvent(new ThemeChangeEvent());
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0010-Basic-support-for-text-colour-in-dark-mode-in-browse.patch b/packages/wrangler-devtools/patches/0010-Basic-support-for-text-colour-in-dark-mode-in-browse.patch
@@ -1,7 +1,7 @@
-From 9d34de7c9010659ece1be008ee852a21e06bff55 Mon Sep 17 00:00:00 2001
+From 7c24a16730403a6db93a01aeb0d07c4910d320f6 Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Mon, 23 Jan 2023 15:12:38 +0000
-Subject: [PATCH 10/15] Basic support for text colour in dark mode in browsers
+Subject: [PATCH 10/16] Basic support for text colour in dark mode in browsers
  that don't implement :host-context
 
 ---
@@ -46,5 +46,5 @@ index b451da60eb..8828dd8f07 100644
  <meta http-equiv="Content-Security-Policy"
    content="object-src 'none'; script-src 'sha256-yYUen+rS0+K2iGZTeGzgeav9eHB7hosjob+ahEOInok=' 'self' 'unsafe-eval' https://chrome-devtools-frontend.appspot.com">
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0011-Fallback-to-location-for-domain.patch b/packages/wrangler-devtools/patches/0011-Fallback-to-location-for-domain.patch
@@ -1,7 +1,7 @@
-From 0091abac4c9631649485198cc36b49ebd4fd40dd Mon Sep 17 00:00:00 2001
+From 035ac87786e0f52c9ce36680083a07f1806b24bb Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Thu, 26 Jan 2023 15:27:04 +0000
-Subject: [PATCH 11/15] Fallback to location for domain
+Subject: [PATCH 11/16] Fallback to location for domain
 
 ---
  front_end/panels/sources/NavigatorView.ts | 3 ++-
@@ -22,5 +22,5 @@ index c7a64ab432..ca32b5202e 100644
  
      const parsedURL = new Common.ParsedURL.ParsedURL(projectOrigin);
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0012-Hide-unsupported-settings-UI.patch b/packages/wrangler-devtools/patches/0012-Hide-unsupported-settings-UI.patch
@@ -1,7 +1,7 @@
-From deeac26dadb8f2d7f5653c1994eed41f9e220af2 Mon Sep 17 00:00:00 2001
+From 3de10e06c66c60a9e2e34e4192571a0a8be30029 Mon Sep 17 00:00:00 2001
 From: bcoll <bcoll@cloudflare.com>
 Date: Thu, 26 Jan 2023 15:30:34 +0000
-Subject: [PATCH 12/15] Hide unsupported settings UI
+Subject: [PATCH 12/16] Hide unsupported settings UI
 
 - Show CORS errors in console setting
 - Show XHR requests in console setting
@@ -62,5 +62,5 @@ index df0806e90d..0b20193865 100644
 +  display: none;
 +}
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0013-DEVX-380-Hide-debugger-sidebar-and-disable-breakpoin.patch b/packages/wrangler-devtools/patches/0013-DEVX-380-Hide-debugger-sidebar-and-disable-breakpoin.patch
@@ -1,7 +1,7 @@
-From cde74d1233f0e89563cfe4d458af197f21c22f18 Mon Sep 17 00:00:00 2001
+From f2618d9d26296daddb304e5bf8295775882ccbc5 Mon Sep 17 00:00:00 2001
 From: bcoll <bcoll@cloudflare.com>
 Date: Wed, 15 Feb 2023 15:07:45 +0000
-Subject: [PATCH 13/15] DEVX-380 Hide debugger sidebar and disable breakpoints
+Subject: [PATCH 13/16] DEVX-380 Hide debugger sidebar and disable breakpoints
 
 - Hides debugger sidebar
 - Removes toggle debugger sidebar command
@@ -87,5 +87,5 @@ index c5e95ab535..9c53bca1b3 100644
    settingName: 'navigatorGroupByFolder',
    settingType: Common.Settings.SettingType.BOOLEAN,
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0014-Add-ping-to-improve-connection-stability.patch b/packages/wrangler-devtools/patches/0014-Add-ping-to-improve-connection-stability.patch
@@ -1,7 +1,7 @@
-From 37cafef0a7f76f3c623e1c0016244b07f4dfc5d9 Mon Sep 17 00:00:00 2001
+From e17ef45cf30b880519d9be96402f784beb363c4e Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Thu, 4 May 2023 03:21:58 +0100
-Subject: [PATCH 14/15] Add ping to improve connection stability
+Subject: [PATCH 14/16] Add ping to improve connection stability
 
 ---
  front_end/core/protocol_client/InspectorBackend.ts | 9 +++++++++
@@ -40,5 +40,5 @@ index bc7ccf9c08..7d033a7b26 100644
  
    registerSession(target: TargetBase, sessionId: string, proxyConnection?: Connection|null): void {
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0015-Support-sourcemaps.patch b/packages/wrangler-devtools/patches/0015-Support-sourcemaps.patch
@@ -1,7 +1,7 @@
-From 85fcb93878fac45074cc24d4e215ede8b9082339 Mon Sep 17 00:00:00 2001
+From cb79cae04886e81f8be78d4f90fad920b1e81f7c Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Thu, 4 May 2023 03:22:33 +0100
-Subject: [PATCH 15/15] Support sourcemaps:
+Subject: [PATCH 15/16] Support sourcemaps:
 
     * Recognise `wrangler://` URLs as "special", and always load them with Network.loadNetworkResource
 
@@ -56,5 +56,5 @@ index 87ad8ea645..047313c89c 100644
  
      Root.Runtime.experiments.setNonConfigurableExperiments([
 -- 
-2.39.2 (Apple Git-143)
+2.41.0
 
diff --git a/packages/wrangler-devtools/patches/0016-Disable-debugger-when-query-parameter-debugger-is-fa.patch b/packages/wrangler-devtools/patches/0016-Disable-debugger-when-query-parameter-debugger-is-fa.patch
@@ -0,0 +1,103 @@
+From 238f57c76bd8dc90069bb8004f832688ee1224db Mon Sep 17 00:00:00 2001
+From: Workers DevProd <workers-devprod@cloudflare.com>
+Date: Thu, 17 Aug 2023 13:31:48 -0500
+Subject: [PATCH 16/16] Disable debugger when query parameter `debugger` is
+ false Enable debugger by default
+
+---
+ front_end/panels/sources/DebuggerPlugin.ts |  8 +++++++
+ front_end/panels/sources/SourcesPanel.ts   | 14 +++++++++++-
+ front_end/panels/sources/sources-meta.ts   | 26 ++++++++++++++++++++++
+ 3 files changed, 47 insertions(+), 1 deletion(-)
+
+diff --git a/front_end/panels/sources/DebuggerPlugin.ts b/front_end/panels/sources/DebuggerPlugin.ts
+index 6871a61d55..50b38ca92c 100644
+--- a/front_end/panels/sources/DebuggerPlugin.ts
++++ b/front_end/panels/sources/DebuggerPlugin.ts
+@@ -228,6 +228,14 @@ export class DebuggerPlugin extends Plugin {
+     this.scriptsPanel = SourcesPanel.instance();
+     this.breakpointManager = Bindings.BreakpointManager.BreakpointManager.instance();
+ 
++    const debuggerQueryParam = Root.Runtime.Runtime.queryParam('debugger');
++    if (debuggerQueryParam !== 'false') {
++      this.breakpointManager.addEventListener(
++          Bindings.BreakpointManager.Events.BreakpointAdded, this.breakpointChange, this);
++      this.breakpointManager.addEventListener(
++          Bindings.BreakpointManager.Events.BreakpointRemoved, this.breakpointChange, this);
++    }
++
+     this.uiSourceCode.addEventListener(Workspace.UISourceCode.Events.WorkingCopyChanged, this.workingCopyChanged, this);
+     this.uiSourceCode.addEventListener(
+         Workspace.UISourceCode.Events.WorkingCopyCommitted, this.workingCopyCommitted, this);
+diff --git a/front_end/panels/sources/SourcesPanel.ts b/front_end/panels/sources/SourcesPanel.ts
+index 1e094864ea..ac30f5d54c 100644
+--- a/front_end/panels/sources/SourcesPanel.ts
++++ b/front_end/panels/sources/SourcesPanel.ts
+@@ -248,7 +248,11 @@ export class SourcesPanel extends UI.Panel.Panel implements UI.ContextMenu.Provi
+         new UI.SplitWidget.SplitWidget(true, true, 'sourcesPanelSplitViewState', initialDebugSidebarWidth);
+     this.splitWidget.enableShowModeSaving();
+     this.splitWidget.show(this.element);
+-    this.splitWidget.hideSidebar(false);
++
++    const debuggerQueryParam = Root.Runtime.Runtime.queryParam('debugger');
++    if (debuggerQueryParam === 'false') {
++      this.splitWidget.hideSidebar(false);
++    }
+ 
+     // Create scripts navigator
+     const initialNavigatorWidth = 225;
+@@ -355,6 +359,14 @@ export class SourcesPanel extends UI.Panel.Panel implements UI.ContextMenu.Provi
+       panel.splitWidget.installResizer(panel.sourcesViewInternal.toolbarContainerElement());
+     }
+     if (!isInWrapper) {
++      const debuggerQueryParam = Root.Runtime.Runtime.queryParam('debugger');
++      if (debuggerQueryParam !== 'false') {
++        if (panel.splitWidget.isVertical()) {
++          panel.sourcesViewInternal.rightToolbar().appendToolbarItem(panel.toggleDebuggerSidebarButton);
++        } else {
++          panel.sourcesViewInternal.bottomToolbar().appendToolbarItem(panel.toggleDebuggerSidebarButton);
++        }
++      }
+       panel.sourcesViewInternal.leftToolbar().appendToolbarItem(panel.toggleNavigatorSidebarButton);
+     }
+   }
+diff --git a/front_end/panels/sources/sources-meta.ts b/front_end/panels/sources/sources-meta.ts
+index 9c53bca1b3..036c33ea16 100644
+--- a/front_end/panels/sources/sources-meta.ts
++++ b/front_end/panels/sources/sources-meta.ts
+@@ -586,6 +586,32 @@ UI.ActionRegistration.registerActionExtension({
+   ],
+ });
+ 
++const debuggerQueryParam = Root.Runtime.Runtime.queryParam('debugger');
++if (debuggerQueryParam !== 'false') {
++  UI.ActionRegistration.registerActionExtension({
++    actionId: 'sources.toggle-debugger-sidebar',
++    category: UI.ActionRegistration.ActionCategory.SOURCES,
++    title: i18nLazyString(UIStrings.toggleDebuggerSidebar),
++    async loadActionDelegate() {
++      const Sources = await loadSourcesModule();
++      return Sources.SourcesPanel.ActionDelegate.instance();
++    },
++    contextTypes() {
++      return maybeRetrieveContextTypes(Sources => [Sources.SourcesView.SourcesView]);
++    },
++    bindings: [
++      {
++        platform: UI.ActionRegistration.Platforms.WindowsLinux,
++        shortcut: 'Ctrl+Shift+h',
++      },
++      {
++        platform: UI.ActionRegistration.Platforms.Mac,
++        shortcut: 'Meta+Shift+h',
++      },
++    ],
++  });
++}
++
+ UI.ActionRegistration.registerActionExtension({
+   category: UI.ActionRegistration.ActionCategory.DEBUGGER,
+   actionId: 'debugger.step-over',
+-- 
+2.41.0
+

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-From cc7b688a2427d7506a2f4111887a5e243fb841d4 Mon Sep 17 00:00:00 2001`
	`1`	`+From ae9408ae42966da4f8e34a9add5c9ee641e1afa1 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Samuel Macleod <[email protected]>`
`3`	`3`	`Date: Thu, 12 Jan 2023 15:33:43 +0000`
`4`		`-Subject: [PATCH 02/15] Support viewing files over the network`
	`4`	`+Subject: [PATCH 02/16] Support viewing files over the network`
`5`	`5`
`6`	`6`	`---`
`7`	`7`	`front_end/core/sdk/Target.ts \| 4 ++++`
`@@ -93,5 +93,5 @@ index ac0d4aaf68..29c726e185 100644`
`93`	`93`	`]`
`94`	`94`	`}`
`95`	`95`	`--`
`96`		`-2.39.2 (Apple Git-143)`
	`96`	`+2.41.0`
`97`	`97`