Skip to content

Restore Fantom DevTools launching with FANTOM_DEBUG_JS (#59410) #59410

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
rubennorte wants to merge 1 commit into from
Closed

Restore Fantom DevTools launching with FANTOM_DEBUG_JS (#59410) #59410

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
9 changes: 7 additions & 2 deletions packages/dev-middleware/src/utils/DefaultToolLauncher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,13 @@ const {apps, openApp} = open;
* local machine.
*/
const DefaultToolLauncher = {
launchDebuggerAppWindow: async (url: string): Promise<void> => {
if (process.env.NODE_ENV === 'test') {
launchDebuggerAppWindow: async (
url: string,
options?: Readonly<{
allowInTests?: boolean,
}>,
): Promise<void> => {
if (process.env.NODE_ENV === 'test' && options?.allowInTests !== true) {
assertMockedInTests();
}

Expand Down
28 changes: 21 additions & 7 deletions private/react-native-fantom/runner/global-setup/globalSetup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,17 @@

import type {DevToolLauncher} from '@react-native/dev-middleware';

import {isOSS, validateEnvironmentVariables} from '../EnvironmentOptions';
import {
debugJS,
isOSS,
validateEnvironmentVariables,
} from '../EnvironmentOptions';
import {getTestBuildOutputPath} from '../paths';
import build from './build';
import {createDevMiddleware} from '@react-native/dev-middleware';
import {
createDevMiddleware,
unstable_DefaultToolLauncher as DefaultToolLauncher,
} from '@react-native/dev-middleware';
import * as Metro from 'metro';
import {Server} from 'node:net';
import path from 'node:path';
Expand Down Expand Up @@ -55,19 +62,26 @@ async function startMetroServer() {
// $FlowExpectedError[cannot-write]
metroConfig.server.port = Number(process.env.__FANTOM_METRO_PORT__);

// No-op app launcher to prevent debugger-shell launches during tests
const serverBaseUrl = `http://localhost:${metroConfig.server.port}`;
const devToolLauncher: DevToolLauncher = {
launchDebuggerAppWindow: async (_url: string) => {},
launchDebuggerShell: async () => {},
prepareDebuggerShell: async () => ({code: 'not_implemented'}),
launchDebuggerAppWindow: async (url: string) => {
if (debugJS) {
await DefaultToolLauncher.launchDebuggerAppWindow(url, {
allowInTests: true,
});
}
},
};

const {
middleware: devMiddleware,
websocketEndpoints: debuggerWebsocketEndpoints,
} = createDevMiddleware({
serverBaseUrl: `http://localhost:${metroConfig.server.port}`,
serverBaseUrl,
unstable_toolLauncher: devToolLauncher,
unstable_experiments: {
enableStandaloneFuseboxShell: false,
},
});

const server = await Metro.runServer(metroConfig, {
Expand Down
2 changes: 1 addition & 1 deletion scripts/fantom.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ for arg in "$@"; do
esac
done

if [[ -n "$FANTOM_RUN_BENCHMARKS" ]]; then
if [[ -n "$FANTOM_RUN_BENCHMARKS" || -n "$FANTOM_DEBUG_JS" ]]; then
ARGS+=("--runInBand")
fi

Expand Down
Loading