Update patches (#4086)

cloudflare · Oct 5, 2023 · 90ee30c · 90ee30c
1 parent 807ab93
commit 90ee30c
Show file tree

Hide file tree

Showing 21 changed files with 469 additions and 447 deletions.
diff --git a/packages/wrangler-devtools/Makefile b/packages/wrangler-devtools/Makefile
@@ -1,24 +1,24 @@
 ROOT = $(realpath .)
-PATH_WITH_DEPOT = $(PATH):"$(ROOT)/depot/"
+PATH_WITH_DEPOT = $(PATH):$(ROOT)/depot/
 # The upstream devtools commit upon which our patches are based
-HEAD = f931aec3eca7c860dc4d657f328daca19d19221d
+HEAD = 64208f10b3efe06a92c58d345bd828832d09c4a7
 PATCHES = $(shell ls ${PWD}/patches/*.patch)
 depot:
 	git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git depot
 
 devtools-frontend: depot
 	git clone https://chromium.googlesource.com/devtools/devtools-frontend
   # Ensure other depot_tools can be called from gclient config
-	PATH=$(PATH_WITH_DEPOT) $(ROOT)/depot/gclient config https://chromium.googlesource.com/devtools/devtools-frontend --unmanaged
+	PATH="$(PATH_WITH_DEPOT)" $(ROOT)/depot/gclient config https://chromium.googlesource.com/devtools/devtools-frontend --unmanaged
 	git -C devtools-frontend checkout $(HEAD)
 	git -C devtools-frontend config user.email "[email protected]"
 	git -C devtools-frontend config user.name "Workers DevProd"
 	git -C devtools-frontend am $(PATCHES)
 
 devtools-frontend/out/Default/gen/front_end: devtools-frontend
-	cd devtools-frontend && PATH=$(PATH_WITH_DEPOT) $(ROOT)/depot/gclient sync
-	cd devtools-frontend && PATH=$(PATH_WITH_DEPOT) $(ROOT)/depot/gn gen out/Default
-	cd devtools-frontend && PATH=$(PATH_WITH_DEPOT) $(ROOT)/depot/autoninja -C out/Default
+	cd devtools-frontend && PATH="$(PATH_WITH_DEPOT)" $(ROOT)/depot/gclient sync
+	cd devtools-frontend && PATH="$(PATH_WITH_DEPOT)" $(ROOT)/depot/gn gen out/Default
+	cd devtools-frontend && PATH="$(PATH_WITH_DEPOT)" $(ROOT)/depot/autoninja -C out/Default
 
 publish: devtools-frontend/out/Default/gen/front_end
 	npx wrangler pages deploy --project-name cloudflare-devtools devtools-frontend/out/Default/gen/front_end

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
diff --git a/...port-viewing-files-over-the-network.patch → ...port-viewing-files-over-the-network.patch b/...port-viewing-files-over-the-network.patch → ...port-viewing-files-over-the-network.patch
@@ -1,7 +1,7 @@
-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/16] Support viewing files over the network
+From 24644cc732ec4bf8589715e853067eadd1b52e29 Mon Sep 17 00:00:00 2001
+From: Workers DevProd <workers-devprod@cloudflare.com>
+Date: Mon, 2 Oct 2023 18:13:34 +0100
+Subject: [PATCH 01/15] Support viewing files over the network
 
 ---
  front_end/core/sdk/Target.ts             |  4 ++++
@@ -11,20 +11,20 @@ Subject: [PATCH 02/16] Support viewing files over the network
  4 files changed, 15 insertions(+), 5 deletions(-)
 
 diff --git a/front_end/core/sdk/Target.ts b/front_end/core/sdk/Target.ts
-index 77e23b798e..11ff0af705 100644
+index eed909ea64..5e1778885d 100644
 --- a/front_end/core/sdk/Target.ts
 +++ b/front_end/core/sdk/Target.ts
-@@ -76,6 +76,9 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
+@@ -82,6 +82,9 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
        case Type.Tab:
-         this.#capabilitiesMask = Capability.Target;
+         this.#capabilitiesMask = Capability.Target | Capability.Tracing;
          break;
 +      case Type.Cloudflare:
 +        this.#capabilitiesMask = Capability.JS | Capability.Network;
 +        break;
      }
      this.#typeInternal = type;
      this.#parentTargetInternal = parentTarget;
-@@ -239,6 +242,7 @@ export enum Type {
+@@ -255,6 +258,7 @@ export enum Type {
    Browser = 'browser',
    AuctionWorklet = 'auction-worklet',
    Tab = 'tab',
@@ -46,10 +46,10 @@ index cafecfa4ba..213ca7fecd 100644
      }, Components.TargetDetachedDialog.TargetDetachedDialog.webSocketConnectionLost);
    }
 diff --git a/front_end/panels/sources/sources-meta.ts b/front_end/panels/sources/sources-meta.ts
-index 946dd8c333..c5e95ab535 100644
+index a0c126df12..4b8244ea69 100644
 --- a/front_end/panels/sources/sources-meta.ts
 +++ b/front_end/panels/sources/sources-meta.ts
-@@ -40,6 +40,11 @@ const UIStrings = {
+@@ -41,6 +41,11 @@ const UIStrings = {
     *@description Title of the 'Snippets' tool in the Snippets Navigator View, which is part of the Sources tool
     */
    snippets: 'Snippets',
@@ -61,14 +61,14 @@ index 946dd8c333..c5e95ab535 100644
    /**
     *@description Command for showing the 'Search' tool
     */
-@@ -428,14 +433,14 @@ UI.ViewManager.registerViewExtension({
+@@ -454,14 +459,14 @@ UI.ViewManager.registerViewExtension({
 
  UI.ViewManager.registerViewExtension({
    location: UI.ViewManager.ViewLocationValues.NAVIGATOR_VIEW,
 -  id: 'navigator-files',
 +  id: 'navigator-network',
-   commandPrompt: i18nLazyString(UIStrings.showFilesystem),
--  title: i18nLazyString(UIStrings.filesystem),
+   commandPrompt: i18nLazyString(UIStrings.showWorkspace),
+-  title: i18nLazyString(UIStrings.workspace),
 +  title: i18nLazyString(UIStrings.cloudflare),
    order: 3,
    persistence: UI.ViewManager.ViewPersistence.PERMANENT,
@@ -93,5 +93,5 @@ index ac0d4aaf68..29c726e185 100644
    ]
  }
 -- 
-2.41.0
+2.39.3 (Apple Git-145)
 
diff --git a/.../0003-Show-fallback-image-on-Safari.patch → .../0002-Show-fallback-image-on-Safari.patch b/.../0003-Show-fallback-image-on-Safari.patch → .../0002-Show-fallback-image-on-Safari.patch
@@ -1,7 +1,7 @@
-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/16] Show fallback image on Safari
+From 0ccfb994361f1fa467f7ea441131f4a079cea607 Mon Sep 17 00:00:00 2001
+From: Workers DevProd <workers-devprod@cloudflare.com>
+Date: Mon, 2 Oct 2023 18:18:45 +0100
+Subject: [PATCH 02/15] Show fallback image on Safari
 
 ---
  config/gni/devtools_grd_files.gni   |   1 +
@@ -12,29 +12,29 @@ Subject: [PATCH 03/16] Show fallback image on Safari
  create mode 100644 front_end/Images/fake.png
 
 diff --git a/config/gni/devtools_grd_files.gni b/config/gni/devtools_grd_files.gni
-index ddeed12b41..21d6e4c020 100644
+index f0007ac34b..5e2281b2e7 100644
 --- a/config/gni/devtools_grd_files.gni
 +++ b/config/gni/devtools_grd_files.gni
-@@ -37,6 +37,7 @@ grd_files_release_sources = [
-   "front_end/Images/baseline-icon.svg",
-   "front_end/Images/checkboxCheckmark.svg",
-   "front_end/Images/checker.png",
+@@ -58,6 +58,7 @@ grd_files_release_sources = [
+   "front_end/Images/check-circle.svg",
+   "front_end/Images/check-double.svg",
+   "front_end/Images/checker.svg",
 +  "front_end/Images/fake.png",
-   "front_end/Images/chevrons.svg",
-   "front_end/Images/chromeDisabledSelect.png",
-   "front_end/Images/chromeDisabledSelect_2x.png",
+   "front_end/Images/checkmark.svg",
+   "front_end/Images/chevron-double-right.svg",
+   "front_end/Images/chevron-down.svg",
 diff --git a/config/gni/devtools_image_files.gni b/config/gni/devtools_image_files.gni
-index 64c35de875..47ef8f4790 100644
+index 042be12dfd..7439a30ab7 100644
 --- a/config/gni/devtools_image_files.gni
 +++ b/config/gni/devtools_image_files.gni
 @@ -8,6 +8,7 @@ devtools_image_files = [
    "accelerometer-right.png",
    "accelerometer-top.png",
-   "checker.png",
-+  "fake.png",
-   "chromeDisabledSelect_2x.png",
-   "chromeDisabledSelect.png",
    "chromeLeft.avif",
++  "fake.png",
+   "chromeMiddle.avif",
+   "chromeRight.avif",
+   "cssoverview_icons_2x.avif",
 diff --git a/front_end/Images/fake.png b/front_end/Images/fake.png
 new file mode 100644
 index 0000000000000000000000000000000000000000..61468f4e731cdbbc8fa26ab74b72b93b509d5a54
@@ -1815,5 +1815,5 @@ index 1edaec9604..945aa6d816 100644
 +</script>
  <body class="undocked" id="-blink-dev-tools">
 -- 
-2.41.0
+2.39.3 (Apple Git-145)
 
diff --git a/...ort-previewing-subrequest-responses.patch → ...ort-previewing-subrequest-responses.patch b/...ort-previewing-subrequest-responses.patch → ...ort-previewing-subrequest-responses.patch
@@ -1,30 +1,28 @@
-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/16] Support previewing subrequest responses
+From 95b2dc1f6cf0f02c3c52da17c0cec1f6fdbf6035 Mon Sep 17 00:00:00 2001
+From: Workers DevProd <workers-devprod@cloudflare.com>
+Date: Mon, 2 Oct 2023 18:22:08 +0100
+Subject: [PATCH 03/15] Support previewing subrequest responses
 
 ---
- front_end/core/sdk/NetworkManager.ts   | 9 +++++++--
+ front_end/core/sdk/NetworkManager.ts   | 7 ++++++-
  front_end/entrypoints/js_app/BUILD.gn  | 1 +
  front_end/entrypoints/js_app/js_app.ts | 1 +
- 3 files changed, 9 insertions(+), 2 deletions(-)
+ 3 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/front_end/core/sdk/NetworkManager.ts b/front_end/core/sdk/NetworkManager.ts
-index a6cc176456..d0a60dd664 100644
+index c8aa624961..6201d73bba 100644
 --- a/front_end/core/sdk/NetworkManager.ts
 +++ b/front_end/core/sdk/NetworkManager.ts
-@@ -695,8 +695,8 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
+@@ -705,7 +705,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
      this.updateNetworkRequest(networkRequest);
    }
 
--  loadingFinished({requestId, timestamp: finishTime, encodedDataLength, shouldReportCorbBlocking}:
--                      Protocol.Network.LoadingFinishedEvent): void {
-+  loadingFinished({requestId, timestamp: finishTime, encodedDataLength, shouldReportCorbBlocking, cfResponse }:
-+                      Protocol.Network.LoadingFinishedEvent & { cfResponse?: Omit<Protocol.Network.GetResponseBodyResponse, 'getError'> }): void {
+-  loadingFinished({requestId, timestamp: finishTime, encodedDataLength}: Protocol.Network.LoadingFinishedEvent): void {
++  loadingFinished({requestId, timestamp: finishTime, encodedDataLength, cfResponse}: Protocol.Network.LoadingFinishedEvent & { cfResponse?: Omit<Protocol.Network.GetResponseBodyResponse, 'getError'> }): void {
      let networkRequest: NetworkRequest|null|undefined = this.#requestsById.get(requestId);
      if (!networkRequest) {
        networkRequest = this.maybeAdoptMainResourceRequest(requestId);
-@@ -705,6 +705,11 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
+@@ -714,6 +714,11 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
        return;
      }
      this.getExtraInfoBuilder(requestId).finished();
@@ -33,7 +31,7 @@ index a6cc176456..d0a60dd664 100644
 +        return { error: null, content: cfResponse.body, encoded: cfResponse.base64Encoded };
 +      });
 +    }
-     this.finishNetworkRequest(networkRequest, finishTime, encodedDataLength, shouldReportCorbBlocking);
+     this.finishNetworkRequest(networkRequest, finishTime, encodedDataLength);
      this.#manager.dispatchEventToListeners(Events.LoadingFinished, networkRequest);
    }
 diff --git a/front_end/entrypoints/js_app/BUILD.gn b/front_end/entrypoints/js_app/BUILD.gn
@@ -61,5 +59,5 @@ index 213ca7fecd..ef5c568e96 100644
  import '../../panels/js_profiler/js_profiler-meta.js';
 
 -- 
-2.41.0
+2.39.3 (Apple Git-145)
 
diff --git a/...ter-Firefox-support-for-network-tab.patch → ...ter-Firefox-support-for-network-tab.patch b/...ter-Firefox-support-for-network-tab.patch → ...ter-Firefox-support-for-network-tab.patch
@@ -1,7 +1,7 @@
-From c19d1d618c1ca839dd662e4dbd9b3fd6d1aa65e3 Mon Sep 17 00:00:00 2001
+From 83b63469d06e2318f880c417c168f5494edf89fa Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <[email protected]>
 Date: Thu, 19 Jan 2023 15:47:52 +0000
-Subject: [PATCH 05/16] Better Firefox support for network tab
+Subject: [PATCH 04/15] Better Firefox support for network tab
 
 ---
  front_end/entrypoints/js_app/js_app.ts               | 2 ++
@@ -22,10 +22,10 @@ index ef5c568e96..f6a3a1641f 100644
    static instance(opts: {forceNew: boolean|null} = {forceNew: null}): JsMainImpl {
      const {forceNew} = opts;
 diff --git a/front_end/ui/legacy/components/data_grid/DataGrid.ts b/front_end/ui/legacy/components/data_grid/DataGrid.ts
-index a7ec8ccf32..fc80d2769d 100644
+index 88c258f54f..0648649ccf 100644
 --- a/front_end/ui/legacy/components/data_grid/DataGrid.ts
 +++ b/front_end/ui/legacy/components/data_grid/DataGrid.ts
-@@ -219,6 +219,8 @@ export class DataGridImpl<T> extends Common.ObjectWrapper.ObjectWrapper<EventTyp
+@@ -218,6 +218,8 @@ export class DataGridImpl<T> extends Common.ObjectWrapper.ObjectWrapper<EventTyp
      this.headerRow = this.dataTableHeadInternal.createChild('tr');
 
      this.dataTableBody = this.dataTable.createChild('tbody');
@@ -34,7 +34,7 @@ index a7ec8ccf32..fc80d2769d 100644
      this.topFillerRow = (this.dataTableBody.createChild('tr', 'data-grid-filler-row revealed') as HTMLElement);
      UI.ARIAUtils.setHidden(this.topFillerRow, true);
      this.bottomFillerRow = (this.dataTableBody.createChild('tr', 'data-grid-filler-row revealed') as HTMLElement);
-@@ -496,6 +498,9 @@ export class DataGridImpl<T> extends Common.ObjectWrapper.ObjectWrapper<EventTyp
+@@ -500,6 +502,9 @@ export class DataGridImpl<T> extends Common.ObjectWrapper.ObjectWrapper<EventTyp
    protected setVerticalPadding(top: number, bottom: number, isConstructorTime: boolean = false): void {
      const topPx = top + 'px';
      const bottomPx = (top || bottom) ? bottom + 'px' : 'auto';
@@ -45,5 +45,5 @@ index a7ec8ccf32..fc80d2769d 100644
        return;
      }
 -- 
-2.41.0
+2.39.3 (Apple Git-145)