OSSForks/react
1
0
Fork 0
mirror of https://github.com/zebrajr/react.git synced 2025-12-06 12:20:20 +01:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[devtools] Fix "View source" for sources with URLs that aren't normalized (#32951)

Browse Source
This commit is contained in:
Sebastian "Sebbie" Silbermann 2025-04-17 21:56:05 +02:00 committed by GitHub
parent ce578f9c59
commit bc6184dd99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/react-devtools-extensions/src/main/fetchFileWithCaching.js vendored
View File

@ -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<string> {
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) {

7
packages/react-devtools-extensions/src/main/index.js vendored
View File

@ -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.

4
packages/react-devtools-shared/src/symbolicateSource.js vendored
View File

@ -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 (

14
packages/react-devtools-shared/src/utils.js vendored
View File

@ -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 {