update patches

cloudflare · andyjessop · Oct 11, 2024 · Oct 14, 2024 · Oct 14, 2024 · Oct 14, 2024
commit 7841745f0d140cf131e55fcb3f8f506fdcbea3ec
@@ -1,7 +1,7 @@
-From 8a98ae9d046cc405a30be831e2918e66d017fcc7 Mon Sep 17 00:00:00 2001
+From 9c08db34087cad21bdcef72128bb23be9846ddb0 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
+Subject: [PATCH 01/14] Support viewing files over the network
 
 ---
  front_end/core/sdk/Target.ts             |  4 ++++
@@ -11,7 +11,7 @@ Subject: [PATCH 01/15] 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 f5f812b001..76b67ea20b 100644
+index f5f812b001..07072175b7 100644
 --- a/front_end/core/sdk/Target.ts
 +++ b/front_end/core/sdk/Target.ts
 @@ -85,6 +85,9 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
@@ -30,7 +30,7 @@ index f5f812b001..76b67ea20b 100644
    TAB = 'tab',
 +  CLOUDFLARE = 'cloudflare',
  }
-
+ 
  export const enum Capability {
 diff --git a/front_end/entrypoints/js_app/js_app.ts b/front_end/entrypoints/js_app/js_app.ts
 index 45028f436a..39a4b237b7 100644
@@ -62,7 +62,7 @@ index 42a2e17f07..9713c169a0 100644
     *@description Command for showing the 'Search' tool
     */
 @@ -497,14 +502,14 @@ UI.ViewManager.registerViewExtension({
-
+ 
  UI.ViewManager.registerViewExtension({
    location: UI.ViewManager.ViewLocationValues.NAVIGATOR_VIEW,
 -  id: 'navigator-files',
@@ -78,7 +78,7 @@ index 42a2e17f07..9713c169a0 100644
 +    return Sources.SourcesNavigator.NetworkNavigatorView.instance();
    },
  });
-
+ 
 diff --git a/tsconfig.json b/tsconfig.json
 index b3be02e26b..811051314d 100644
 --- a/tsconfig.json
@@ -92,6 +92,6 @@ index b3be02e26b..811051314d 100644
 +    "third_party/**/*.ts"
    ]
  }
---
+-- 
 2.39.5 (Apple Git-154)
 
@@ -1,7 +1,7 @@
-From 0c3c6b443e184d4f0e6c81137c3a35da3f1aa74b Mon Sep 17 00:00:00 2001
+From 139a1d5f797fba311b5d6c2082b2e3b2b49c584d 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
+Subject: [PATCH 02/14] Show fallback image on Safari
 
 ---
  config/gni/devtools_grd_files.gni   |   1 +

@@ -1,7 +1,7 @@
-From efaafbbe11191f5a5f1cf2c071fb532a512e1565 Mon Sep 17 00:00:00 2001
+From c70d702b20aefb940d7108b348265123403ef7d0 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
+Subject: [PATCH 03/14] Support previewing subrequest responses
 
 ---
  front_end/core/sdk/NetworkManager.ts   | 7 ++++++-
@@ -10,7 +10,7 @@ Subject: [PATCH 03/15] Support previewing subrequest responses
  3 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/front_end/core/sdk/NetworkManager.ts b/front_end/core/sdk/NetworkManager.ts
-index e9d60c5b49..e1ae8c3f13 100644
+index e9d60c5b49..734a39f9bc 100644
 --- a/front_end/core/sdk/NetworkManager.ts
 +++ b/front_end/core/sdk/NetworkManager.ts
 @@ -794,7 +794,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {

@@ -1,7 +1,7 @@
-From f934a19a84288b4ae8cb556ccadff26d3ae17588 Mon Sep 17 00:00:00 2001
+From 2932b512ce27c800e5f3bf956d8c920ca1839221 Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Thu, 19 Jan 2023 15:47:52 +0000
-Subject: [PATCH 04/15] Better Firefox support for network tab
+Subject: [PATCH 04/14] Better Firefox support for network tab
 
 ---
  front_end/entrypoints/js_app/js_app.ts               | 2 ++

@@ -1,7 +1,7 @@
-From cba2aa820a945dcc479c69481bb97811b5517253 Mon Sep 17 00:00:00 2001
+From d553554b296a1f936e96cd1c30e10faba89563fe Mon Sep 17 00:00:00 2001
 From: Workers DevProd <workers-devprod@cloudflare.com>
 Date: Mon, 2 Oct 2023 18:24:46 +0100
-Subject: [PATCH 05/15] Remove unsupported network UI
+Subject: [PATCH 05/14] Remove unsupported network UI
 
 ---
  front_end/panels/network/NetworkPanel.ts | 19 -------------------

@@ -1,7 +1,7 @@
-From 9726d319865d7e8ec3919cf4e028faecca3babcc Mon Sep 17 00:00:00 2001
+From bfa89440d304750e5c4d3c8a1fd0e35edc6ef511 Mon Sep 17 00:00:00 2001
 From: Workers DevProd <workers-devprod@cloudflare.com>
 Date: Mon, 2 Oct 2023 18:26:03 +0100
-Subject: [PATCH 06/15] Remove unsupported profiler UI
+Subject: [PATCH 06/14] Remove unsupported profiler UI
 
 ---
  front_end/panels/profiler/HeapProfilerPanel.ts | 10 +++-------

@@ -1,7 +1,7 @@
-From 6905b89364395eda494ce967d15114c3e0df4336 Mon Sep 17 00:00:00 2001
+From e158cd9ab14995e385585d856c6397a3782e3874 Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Fri, 20 Jan 2023 19:19:37 +0000
-Subject: [PATCH 07/15] Support theme= url parameter for forcing the theme from
+Subject: [PATCH 07/14] Support theme= url parameter for forcing the theme from
  outside
 
 ---

@@ -1,7 +1,7 @@
-From 955a8440dca7d71e69b2f89859dd2068369551d8 Mon Sep 17 00:00:00 2001
+From 679cd7b9e995b4808b2cd150f6de5b9b840ee69c Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Mon, 23 Jan 2023 15:12:38 +0000
-Subject: [PATCH 08/15] Basic support for text colour in dark mode in browsers
+Subject: [PATCH 08/14] Basic support for text colour in dark mode in browsers
  that don't implement :host-context
 
 ---

@@ -1,7 +1,7 @@
-From 9502d98583fcd13898abac24e5cc2e8a373a1ab7 Mon Sep 17 00:00:00 2001
+From 9ae3881a06a83e66f3d2021cd3c57502a09c9970 Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Thu, 26 Jan 2023 15:27:04 +0000
-Subject: [PATCH 09/15] Fallback to location for domain
+Subject: [PATCH 09/14] Fallback to location for domain
 
 ---
  front_end/panels/sources/NavigatorView.ts | 3 ++-

@@ -1,7 +1,7 @@
-From 2bb0613935ab2d1412e456e13cca620b515d0710 Mon Sep 17 00:00:00 2001
+From e0938ea8c876580bd1f5642b080a96fbdb4bba0d Mon Sep 17 00:00:00 2001
 From: bcoll <bcoll@cloudflare.com>
 Date: Thu, 26 Jan 2023 15:30:34 +0000
-Subject: [PATCH 10/15] Hide unsupported settings UI
+Subject: [PATCH 10/14] Hide unsupported settings UI
 
 - Show CORS errors in console setting
 - Show XHR requests in console setting

@@ -1,7 +1,7 @@
-From caee1569339cadffa1c6cfcbed922623d0f6dcb6 Mon Sep 17 00:00:00 2001
+From 3cecca951de90e5395b9b36ba3d264c6bb37c0e6 Mon Sep 17 00:00:00 2001
 From: Samuel Macleod <smacleod@cloudflare.com>
 Date: Thu, 4 May 2023 03:21:58 +0100
-Subject: [PATCH 11/15] Add ping to improve connection stability
+Subject: [PATCH 11/14] Add ping to improve connection stability
 
 ---
  front_end/core/protocol_client/InspectorBackend.ts | 9 +++++++++

@@ -1,7 +1,7 @@
-From a22c7f26faf4bb485cd0682af8d93a76520e2998 Mon Sep 17 00:00:00 2001
+From 6cab942ba84bbfe9543a9479744eec4b80637eca Mon Sep 17 00:00:00 2001
 From: Workers DevProd <workers-devprod@cloudflare.com>
 Date: Mon, 2 Oct 2023 18:30:44 +0100
-Subject: [PATCH 12/15] Support sourcemaps:
+Subject: [PATCH 12/14] Support sourcemaps:
 
     * Recognise `wrangler://` URLs as "special", and always load them with Network.loadNetworkResource
 

@@ -1,7 +1,7 @@
-From 1f4f5cf67ac5fdb060564f93f5a756950c619f34 Mon Sep 17 00:00:00 2001
+From f6926ce33293c392fa769b19c831ec7fbfd2b2da Mon Sep 17 00:00:00 2001
 From: Workers DevProd <workers-devprod@cloudflare.com>
 Date: Thu, 5 Oct 2023 16:37:38 +0100
-Subject: [PATCH 15/15] Basic support for Safari
+Subject: [PATCH 13/14] Basic support for Safari
 
 ---
  front_end/core/dom_extension/DOMExtension.ts |  2 +-

@@ -0,0 +1,52 @@
+From 74212d5714c1a71ee2edaaa79a02e787b35bb947 Mon Sep 17 00:00:00 2001
+From: Workers DevProd <workers-devprod@cloudflare.com>
+Date: Thu, 17 Oct 2024 13:17:57 +0200
+Subject: [PATCH 14/14] Fix conflicts
+
+---
+ front_end/entrypoint_template.html       |  4 ++--
+ front_end/panels/sources/sources-meta.ts | 13 -------------
+ 2 files changed, 2 insertions(+), 15 deletions(-)
+
+diff --git a/front_end/entrypoint_template.html b/front_end/entrypoint_template.html
+index 1d0a47d265..c9fd899944 100644
+--- a/front_end/entrypoint_template.html
++++ b/front_end/entrypoint_template.html
+@@ -40,8 +40,8 @@
+     --override-text-color: rgb(189 198 207);
+   }
+ </style>
+-<meta http-equiv="Content-Security-Policy"
+-  content="object-src 'none'; script-src 'sha256-nR3ouvAaRD5oAvx24d8aFSv1EH9XKi9uVvoOsvVuW8U=' 'sha256-AIRkz8wOl/LgmUJduw9AsUnrb94PlBpePfk0Rowm+Vo=' 'self' 'unsafe-eval' https://chrome-devtools-frontend.appspot.com">
++<meta http-equiv="Content-Security-Policy" content="object-src 'none'; script-src 'self' https://chrome-devtools-frontend.appspot.com">
++
+ <meta name="referrer" content="no-referrer">
+ <script>
+   // Vendored from https://unpkg.com/@ungap/custom-elements@1.3.0/min.js
+diff --git a/front_end/panels/sources/sources-meta.ts b/front_end/panels/sources/sources-meta.ts
+index 9713c169a0..d06bef00fb 100644
+--- a/front_end/panels/sources/sources-meta.ts
++++ b/front_end/panels/sources/sources-meta.ts
+@@ -500,19 +500,6 @@ UI.ViewManager.registerViewExtension({
+   },
+ });
+
+-UI.ViewManager.registerViewExtension({
+-  location: UI.ViewManager.ViewLocationValues.NAVIGATOR_VIEW,
+-  id: 'navigator-network',
+-  commandPrompt: i18nLazyString(UIStrings.showWorkspace),
+-  title: i18nLazyString(UIStrings.cloudflare),
+-  order: 3,
+-  persistence: UI.ViewManager.ViewPersistence.PERMANENT,
+-  async loadView() {
+-    const Sources = await loadSourcesModule();
+-    return Sources.SourcesNavigator.NetworkNavigatorView.instance();
+-  },
+-});
+-
+ UI.ViewManager.registerViewExtension({
+   location: UI.ViewManager.ViewLocationValues.NAVIGATOR_VIEW,
+   id: 'navigator-snippets',
+-- 
+2.39.5 (Apple Git-154)
+