diff --git a/packages/react-devtools-extensions/src/main/fetchFileWithCaching.js b/packages/react-devtools-extensions/src/main/fetchFileWithCaching.js index 67725e27d8a7f..97bf1fe35bcbe 100644 --- a/packages/react-devtools-extensions/src/main/fetchFileWithCaching.js +++ b/packages/react-devtools-extensions/src/main/fetchFileWithCaching.js @@ -1,6 +1,6 @@ /* global chrome */ -import {normalizeUrl} from 'react-devtools-shared/src/utils'; +import {normalizeUrlIfValid} from 'react-devtools-shared/src/utils'; import {__DEBUG__} from 'react-devtools-shared/src/constants'; let debugIDCounter = 0; @@ -117,7 +117,7 @@ async function fetchFileWithCaching(url: string): Promise { chrome.devtools.inspectedWindow.getResources(r => resolve(r)), ); - const normalizedReferenceURL = normalizeUrl(url); + const normalizedReferenceURL = normalizeUrlIfValid(url); const resource = resources.find(r => r.url === normalizedReferenceURL); if (resource != null) { diff --git a/packages/react-devtools-extensions/src/main/index.js b/packages/react-devtools-extensions/src/main/index.js index 7d94449fcc748..63d25819539f1 100644 --- a/packages/react-devtools-extensions/src/main/index.js +++ b/packages/react-devtools-extensions/src/main/index.js @@ -16,6 +16,7 @@ import { LOCAL_STORAGE_TRACE_UPDATES_ENABLED_KEY, } from 'react-devtools-shared/src/constants'; import {logEvent} from 'react-devtools-shared/src/Logger'; +import {normalizeUrlIfValid} from 'react-devtools-shared/src/utils'; import { setBrowserSelectionFromReact, @@ -128,7 +129,11 @@ function createBridgeAndStore() { : source; // We use 1-based line and column, Chrome expects them 0-based. - chrome.devtools.panels.openResource(sourceURL, line - 1, column - 1); + chrome.devtools.panels.openResource( + normalizeUrlIfValid(sourceURL), + line - 1, + column - 1, + ); }; // TODO (Webpack 5) Hopefully we can remove this prop after the Webpack 5 migration. diff --git a/packages/react-devtools-shared/src/symbolicateSource.js b/packages/react-devtools-shared/src/symbolicateSource.js index 9430e88b3fc15..6504ab2594091 100644 --- a/packages/react-devtools-shared/src/symbolicateSource.js +++ b/packages/react-devtools-shared/src/symbolicateSource.js @@ -7,7 +7,6 @@ * @flow */ -import {normalizeUrl} from 'react-devtools-shared/src/utils'; import SourceMapConsumer from 'react-devtools-shared/src/hooks/SourceMapConsumer'; import type {Source} from 'react-devtools-shared/src/shared/types'; @@ -91,9 +90,8 @@ export async function symbolicateSource( try { // sourceMapURL = https://react.dev/script.js.map void new URL(possiblyURL); // test if it is a valid URL - const normalizedURL = normalizeUrl(possiblyURL); - return {sourceURL: normalizedURL, line, column}; + return {sourceURL: possiblyURL, line, column}; } catch (e) { // This is not valid URL if ( diff --git a/packages/react-devtools-shared/src/utils.js b/packages/react-devtools-shared/src/utils.js index 12c9fb739ce95..b0a8f5c53e0cd 100644 --- a/packages/react-devtools-shared/src/utils.js +++ b/packages/react-devtools-shared/src/utils.js @@ -996,9 +996,17 @@ export function backendToFrontendSerializedElementMapper( }; } -// Chrome normalizes urls like webpack-internals:// but new URL don't, so cannot use new URL here. -export function normalizeUrl(url: string): string { - return url.replace('/./', '/'); +/** + * Should be used when treating url as a Chrome Resource URL. + */ +export function normalizeUrlIfValid(url: string): string { + try { + // TODO: Chrome will use the basepath to create a Resource URL. + return new URL(url).toString(); + } catch { + // Giving up if it's not a valid URL without basepath + return url; + } } export function getIsReloadAndProfileSupported(): boolean {