Skip to content

Remove legacy debugger entry point selection #55548

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

Open
huntie wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −47
Open

Remove legacy debugger entry point selection #55548

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
11 changes: 9 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 @@ -27,6 +27,9 @@ jest.useFakeTimers();
describe('inspector proxy HTTP API', () => {
const serverRef = withServerForEachTest({
logger: undefined,
unstable_experiments: {
enableStandaloneFuseboxShell: false,
},
});
const autoCleanup = withAbortSignalForEachTest();
afterEach(() => {
Expand Down Expand Up @@ -189,7 +192,9 @@ describe('inspector proxy HTTP API', () => {
devtoolsFrontendUrl: expect.any(String),
id: 'device1-page1',
reactNative: {
capabilities: {},
capabilities: {
supportsMultipleDebuggers: false,
},
logicalDeviceId: 'device1',
},
title: 'bar-title',
Expand All @@ -204,7 +209,9 @@ describe('inspector proxy HTTP API', () => {
devtoolsFrontendUrl: expect.any(String),
id: 'device2-page1',
reactNative: {
capabilities: {},
capabilities: {
supportsMultipleDebuggers: false,
},
logicalDeviceId: 'device2',
},
title: 'bar-title',
Expand Down
2 changes: 0 additions & 2 deletions packages/dev-middleware/src/__tests__/StandaloneFuseboxShell-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ describe('enableStandaloneFuseboxShell experiment', () => {
capabilities: {
// Ensure the device target can be found when launching the debugger
nativePageReloads: true,
// Mark as Fusebox
prefersFuseboxFrontend: true,
},
},
]);
Expand Down
28 changes: 6 additions & 22 deletions packages/dev-middleware/src/__tests__/getDevToolsFrontendUrl-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('getDevToolsFrontendUrl', () => {
);
const url = new URL(actual);
expect(url.host).toBe('localhost:8081');
expect(url.pathname).toBe('/debugger-frontend/rn_inspector.html');
expect(url.pathname).toBe('/debugger-frontend/rn_fusebox.html');
expect(url.searchParams.get('ws')).toBe(
'/inspector/debug?device=1a9372c&page=-1',
);
Expand All @@ -44,7 +44,7 @@ describe('getDevToolsFrontendUrl', () => {
);
const url = new URL(actual);
expect(url.host).toBe('localhost:8081');
expect(url.pathname).toBe('/debugger-frontend/rn_inspector.html');
expect(url.pathname).toBe('/debugger-frontend/rn_fusebox.html');
expect(url.searchParams.get('unstable_enableNetworkPanel')).toBe('true');
expect(url.searchParams.get('ws')).toBe(
'/inspector/debug?device=1a9372c&page=-1',
Expand Down Expand Up @@ -87,7 +87,7 @@ describe('getDevToolsFrontendUrl', () => {
},
);
const url = assertValidRelativeURL(actual);
expect(url.pathname).toBe('/debugger-frontend/rn_inspector.html');
expect(url.pathname).toBe('/debugger-frontend/rn_fusebox.html');
expect(url.searchParams.get('ws')).toBe(
'/inspector/debug?device=1a9372c&page=-1',
);
Expand All @@ -103,7 +103,7 @@ describe('getDevToolsFrontendUrl', () => {
},
);
const url = assertValidRelativeURL(actual);
expect(url.pathname).toBe('/debugger-frontend/rn_inspector.html');
expect(url.pathname).toBe('/debugger-frontend/rn_fusebox.html');
expect(url.searchParams.get('unstable_enableNetworkPanel')).toBe('true');
expect(url.searchParams.get('ws')).toBe(
'/inspector/debug?device=1a9372c&page=-1',
Expand Down Expand Up @@ -147,7 +147,7 @@ describe('getDevToolsFrontendUrl', () => {
},
);
const url = new URL(actual);
expect(url.pathname).toBe('/debugger-frontend/rn_inspector.html');
expect(url.pathname).toBe('/debugger-frontend/rn_fusebox.html');
expect(url.searchParams.get('ws')).toBe(
'/inspector/debug?device=1a9372c&page=-1',
);
Expand All @@ -168,7 +168,7 @@ describe('getDevToolsFrontendUrl', () => {
},
);
const url = new URL(actual);
expect(url.pathname).toBe('/debugger-frontend/rn_inspector.html');
expect(url.pathname).toBe('/debugger-frontend/rn_fusebox.html');
expect(url.searchParams.get('unstable_enableNetworkPanel')).toBe('true');
expect(url.searchParams.get('ws')).toBe(
'/inspector/debug?device=1a9372c&page=-1',
Expand Down Expand Up @@ -201,20 +201,4 @@ describe('getDevToolsFrontendUrl', () => {
);
});
});

describe('useFuseboxEntryPoint: true', () => {
test('should return rn_fusebox.html entry point', async () => {
const result = getDevToolsFrontendUrl(
experiments,
webSocketDebuggerUrl,
devServerUrl,
{
useFuseboxEntryPoint: true,
},
);
const url = new URL(result);

expect(url.pathname).toBe('/debugger-frontend/rn_fusebox.html');
});
});
});
1 change: 0 additions & 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 @@ -258,7 +258,6 @@ export default class InspectorProxy implements InspectorProxyQueries {
new URL(this.#serverBaseUrl),
{
relative: true,
useFuseboxEntryPoint: page.capabilities.prefersFuseboxFrontend,
},
);

Expand Down
2 changes: 0 additions & 2 deletions packages/dev-middleware/src/inspector-proxy/__docs__/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ interface Page {
capabilities?: {
nativePageReloads?: boolean; // Target keeps the socket open across reloads
nativeSourceCodeFetching?: boolean; // Target supports Network.loadNetworkResource
prefersFuseboxFrontend?: boolean; // Target is designed for React Native DevTools
supportsMultipleDebuggers?: boolean; // Supports concurrent debugger sessions
};
}
Expand Down Expand Up @@ -248,7 +247,6 @@ interface PageDescription {
logicalDeviceId: string; // Used for target matching
capabilities: {
nativePageReloads?: boolean; // Used for target filtering
prefersFuseboxFrontend?: boolean; // Used for frontend selection
};
};
}
Expand Down
14 changes: 3 additions & 11 deletions packages/dev-middleware/src/middleware/openDebuggerMiddleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ type Options = Readonly<{
/**
* Open the debugger frontend for a given CDP target.
*
* Currently supports React Native DevTools (rn_fusebox.html) and legacy Hermes
* (rn_inspector.html) targets.
*
* @see https://chromedevtools.github.io/devtools-protocol/
*/
export default function openDebuggerMiddleware({
Expand All @@ -65,6 +62,7 @@ export default function openDebuggerMiddleware({
return result;
});
}

return async (
req: IncomingMessage,
res: ServerResponse,
Expand Down Expand Up @@ -156,9 +154,6 @@ export default function openDebuggerMiddleware({
return;
}

const useFuseboxEntryPoint =
target.reactNative.capabilities?.prefersFuseboxFrontend ?? false;

try {
switch (launchType) {
case 'launch': {
Expand All @@ -170,12 +165,11 @@ export default function openDebuggerMiddleware({
launchId: query.launchId,
telemetryInfo: query.telemetryInfo,
appId: target.appId,
useFuseboxEntryPoint,
panel: query.panel,
},
);
let shouldUseStandaloneFuseboxShell =
useFuseboxEntryPoint && experiments.enableStandaloneFuseboxShell;
experiments.enableStandaloneFuseboxShell;
if (shouldUseStandaloneFuseboxShell) {
const shellPreparationResult = await shellPreparationPromise;
switch (shellPreparationResult.code) {
Expand Down Expand Up @@ -229,7 +223,6 @@ export default function openDebuggerMiddleware({
launchId: query.launchId,
telemetryInfo: query.telemetryInfo,
appId: target.appId,
useFuseboxEntryPoint,
},
),
});
Expand All @@ -247,7 +240,7 @@ export default function openDebuggerMiddleware({
pageId: target.id,
deviceName: target.deviceName,
targetDescription: target.description,
prefersFuseboxFrontend: useFuseboxEntryPoint,
prefersFuseboxFrontend: true,
});
return;
} catch (e) {
Expand All @@ -261,7 +254,6 @@ export default function openDebuggerMiddleware({
launchType,
status: 'error',
error: e,
prefersFuseboxFrontend: useFuseboxEntryPoint,
});
return;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-middleware/src/types/Experiments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export type Experiments = Readonly<{
enableNetworkInspector: boolean,

/**
* Launch the Fusebox frontend in a standalone shell instead of a browser.
* Launch the debugger frontend in a standalone shell instead of a browser.
* When this is enabled, we will use the optional unstable_showFuseboxShell
* method on the BrowserLauncher, or throw an error if the method is missing.
*
Expand Down
7 changes: 1 addition & 6 deletions packages/dev-middleware/src/utils/getDevToolsFrontendUrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ export default function getDevToolsFrontendUrl(
relative?: boolean,
launchId?: string,
telemetryInfo?: string,
/** Whether to use the modern `rn_fusebox.html` entry point. */
useFuseboxEntryPoint?: boolean,
appId?: string,
panel?: string,
}>,
Expand All @@ -35,10 +33,7 @@ export default function getDevToolsFrontendUrl(

const appUrl =
(options?.relative === true ? '' : devServerUrl.origin) +
'/debugger-frontend/' +
(options?.useFuseboxEntryPoint === true
? 'rn_fusebox.html'
: 'rn_inspector.html');
'/debugger-frontend/rn_fusebox.html';

const searchParams = new URLSearchParams([
[wsParam.key, wsParam.value],
Expand Down
Loading