Skip to content

Remove nonstandard "vm" field from modern CDP targets #44835

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

Closed
huntie wants to merge 1 commit into from
Closed

Remove nonstandard "vm" field from modern CDP targets #44835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions packages/dev-middleware/src/__tests__/InspectorProxyHttpApi-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ describe('inspector proxy HTTP API', () => {
app: 'bar-app',
id: 'page1',
title: 'bar-title',
vm: 'bar-vm',
},
]);

Expand Down Expand Up @@ -209,7 +208,6 @@ describe('inspector proxy HTTP API', () => {
},
title: 'bar-title',
type: 'node',
vm: 'bar-vm',
webSocketDebuggerUrl: expect.any(String),
},
]);
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-middleware/src/inspector-proxy/InspectorProxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export default class InspectorProxy implements InspectorProxyQueries {
type: 'node',
devtoolsFrontendUrl,
webSocketDebuggerUrl,
vm: page.vm,
...(page.vm != null ? {vm: page.vm} : null),
deviceName: device.getName(),
reactNative: {
logicalDeviceId: deviceId,
Expand Down
11 changes: 8 additions & 3 deletions packages/dev-middleware/src/inspector-proxy/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,16 @@ export type TargetCapabilityFlags = $ReadOnly<{
export type PageFromDevice = $ReadOnly<{
id: string,
title: string,
vm: string,
/** @deprecated This is sent from legacy targets only */
vm?: string,
app: string,
capabilities?: TargetCapabilityFlags,
}>;

export type Page = Required<PageFromDevice>;
export type Page = $ReadOnly<{
...PageFromDevice,
capabilities: $NonMaybeType<PageFromDevice['capabilities']>,
}>;

// Chrome Debugger Protocol message/event passed between device and debugger.
export type WrappedEvent = $ReadOnly<{
Expand Down Expand Up @@ -116,7 +120,8 @@ export type PageDescription = $ReadOnly<{

// React Native specific fields
deviceName: string,
vm: string,
/** @deprecated This is sent from legacy targets only */
vm?: string,

// React Native specific metadata
reactNative: $ReadOnly<{
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/ReactCommon/jsinspector-modern/InspectorPackagerConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ folly::dynamic InspectorPackagerConnection::Impl::pages() {
pageDescription["id"] = std::to_string(page.id);
pageDescription["title"] = page.title + " [C++ connection]";
pageDescription["app"] = app_;
pageDescription["vm"] = page.vm;
pageDescription["capabilities"] =
targetCapabilitiesToDynamic(page.capabilities);

Expand Down
1 change: 0 additions & 1 deletion ...ges/react-native/ReactCommon/jsinspector-modern/tests/InspectorPackagerConnectionTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ TEST_F(InspectorPackagerConnectionTest, TestGetPages) {
ElementsAreArray({AllOf(
AtJsonPtr("/app", Eq("my-app")),
AtJsonPtr("/title", Eq("mock-title [C++ connection]")),
AtJsonPtr("/vm", Eq("mock-vm")),
AtJsonPtr("/id", Eq(std::to_string(pageId))),
AtJsonPtr("/capabilities/nativePageReloads", Eq(true)),
AtJsonPtr(
Expand Down