Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update devtools patches #6959

Closed
wants to merge 9 commits into from
Closed

chore: update devtools patches #6959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb86708
chore: update devtools patches
andyjessop Oct 11, 2024
0cc9ee3
error error
andyjessop Oct 14, 2024
98c5525
remove erroring changes
andyjessop Oct 14, 2024
18309ba
delete .gcs_entries
andyjessop Oct 14, 2024
161f06d
add .g* files to gitignore
andyjessop Oct 14, 2024
196903b
add to prettierignore
andyjessop Oct 14, 2024
4ea0243
switch back to static instantiation
andyjessop Oct 14, 2024
b3c82ab
remove missing flag
andyjessop Oct 14, 2024
7841745
update patches
andyjessop Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
error error
  • Loading branch information
@andyjessop
andyjessop committed Oct 14, 2024
commit 0cc9ee36c70e53b5efd26d40b4a3cb3ddf3b26b7
10 changes: 10 additions & 0 deletions packages/wrangler-devtools/.gclient
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be added to the gitignore

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
solutions = [
{ "name" : 'devtools-frontend',
"url" : 'https://chromium.googlesource.com/devtools/devtools-frontend',
"deps_file" : 'DEPS',
"managed" : False,
"custom_deps" : {
},
"custom_vars": {},
},
]
13 changes: 13 additions & 0 deletions packages/wrangler-devtools/.gclient_entries
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
entries = {
'devtools-frontend': 'https://chromium.googlesource.com/devtools/devtools-frontend',
'devtools-frontend/build': 'https://chromium.googlesource.com/chromium/src/build.git@a96ee5fdfbad3196c2ae3dcfa1c0c93b4acd0bde',
'devtools-frontend/buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools.git@9807e11fd066b39cdf9c36db587494521ac300bb',
'devtools-frontend/buildtools/mac:gn/gn/mac-${arch}': 'https://chrome-infra-packages.appspot.com/gn/gn/mac-${arch}@git_revision:95b0f8fe31a992a33c040bbe3867901335c12762',
'devtools-frontend/third_party/clang-format/script': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@3c0acd2d4e73dd911309d9e970ba09d58bf23a62',
'devtools-frontend/third_party/depot_tools': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@a31b55235fa0e02cdd11e9e311a3da11fd53d473',
'devtools-frontend/third_party/esbuild:infra/3pp/tools/esbuild/${platform}': 'https://chrome-infra-packages.appspot.com/infra/3pp/tools/esbuild/${platform}@version:2@0.14.13.chromium.2',
'devtools-frontend/third_party/inspector_protocol': 'https://chromium.googlesource.com/deps/inspector_protocol@ccf6613682a24413db28656da6f9c52948331bad',
'devtools-frontend/third_party/ninja:infra/3pp/tools/ninja/${platform}': 'https://chrome-infra-packages.appspot.com/infra/3pp/tools/ninja/${platform}@version:3@1.12.1.chromium.4',
'devtools-frontend/third_party/node/mac_arm64:20.11.0/5b5681e12a21cda986410f69e03e6220a21dd4d2': 'gs://chromium-nodejs/20.11.0/5b5681e12a21cda986410f69e03e6220a21dd4d2',
'devtools-frontend/buildtools/mac_arm64-format:96c34e77259c4cc1fc7bdf067fc058bfd341ab85': 'gs://chromium-clang-format/96c34e77259c4cc1fc7bdf067fc058bfd341ab85',
}
1 change: 1 addition & 0 deletions packages/wrangler-devtools/.gclient_previous_sync_commits
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"devtools-frontend": "bc9bb817e9e8db44b31a34c5bb55b7f8574da0ea", "devtools-frontend/build": "a96ee5fdfbad3196c2ae3dcfa1c0c93b4acd0bde", "devtools-frontend/buildtools": "9807e11fd066b39cdf9c36db587494521ac300bb", "devtools-frontend/third_party/clang-format/script": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62", "devtools-frontend/third_party/depot_tools": "a31b55235fa0e02cdd11e9e311a3da11fd53d473", "devtools-frontend/third_party/inspector_protocol": "ccf6613682a24413db28656da6f9c52948331bad"}
50 changes: 50 additions & 0 deletions packages/wrangler-devtools/.gcs_entries
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above

Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"devtools-frontend": {
"devtools-frontend/third_party/node/linux": [
"20.11.0/f9a337cfa0e2b92d3e5c671c26b454bd8e99769e"
],
"devtools-frontend/third_party/node/mac": [
"20.11.0/e3c0fd53caae857309815f3f8de7c2dce49d7bca"
],
"devtools-frontend/third_party/node/mac_arm64": [
"20.11.0/5b5681e12a21cda986410f69e03e6220a21dd4d2"
],
"devtools-frontend/third_party/node/win": [
"20.11.0/2cb36010af52bc5e2a2d1e3675c10361c80d8f8d"
]
},
"devtools-frontend/build": {
"devtools-frontend/build/linux/debian_bullseye_amd64-sysroot": [
"dec7a3a0fc5b83b909cba1b6d119077e0429a138eadef6bf5a0f2e03b1904631"
],
"devtools-frontend/build/linux/debian_bullseye_arm64-sysroot": [
"308e23faba3174bd01accfe358467b8a40fad4db4c49ef629da30219f65a275f"
],
"devtools-frontend/build/linux/debian_bullseye_armhf-sysroot": [
"fe81e7114b97440262bce004caf02c1514732e2fa7f99693b2836932ad1c4626"
],
"devtools-frontend/build/linux/debian_bullseye_i386-sysroot": [
"b53933120bb08ffc38140a817e3f0f99782254a6bf9622271574fa004e8783a4"
],
"devtools-frontend/build/linux/debian_bullseye_mips64el-sysroot": [
"783cb79f26736c69e8125788d95ffb65a28172349009d75188838a004280a92b"
],
"devtools-frontend/build/linux/debian_bullseye_mipsel-sysroot": [
"fcf8c3931476dd097c58f2f5d44621c7090b135e85ab56885aa4b44f4bd6cdb5"
]
},
"devtools-frontend/buildtools": {
"devtools-frontend/buildtools/win-format": [
"49458d4c1e884a38308f8dc6a2c7eb55fc478755"
],
"devtools-frontend/buildtools/mac-format": [
"0b4bd257a1f4cd27d27d6919b0f9e52ecdfa8f1e"
],
"devtools-frontend/buildtools/mac_arm64-format": [
"96c34e77259c4cc1fc7bdf067fc058bfd341ab85"
],
"devtools-frontend/buildtools/linux64-format": [
"b42097ca924d1f1736a5a7806068fed9d7345eb4"
]
}
}
2 changes: 1 addition & 1 deletion packages/wrangler-devtools/patches/0001-Support-viewing-files-over-the-network.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ index f5f812b001..76b67ea20b 100644
this.#capabilitiesMask = Capability.TARGET | Capability.TRACING;
break;
+ case Type.CLOUDFLARE:
+ this.#capabilitiesMask = Capability.JS | Capability.Network;
+ this.#capabilitiesMask = Capability.JS | Capability.NETWORK;
+ break;
}
this.#typeInternal = type;
Expand Down
2 changes: 1 addition & 1 deletion packages/wrangler-devtools/patches/0003-Support-previewing-subrequest-responses.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ index e9d60c5b49..e1ae8c3f13 100644
this.getExtraInfoBuilder(requestId).finished();
+ if (cfResponse !== undefined) {
+ networkRequest.setContentDataProvider(async () => {
+ return { error: null, content: cfResponse.body, encoded: cfResponse.base64Encoded };
+ return { error: '', content: cfResponse.body, encoded: cfResponse.base64Encoded };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new type constraint in the frontend-devtools application.

+ });
+ }
this.finishNetworkRequest(networkRequest, finishTime, encodedDataLength);
Expand Down
Loading