Skip to content

Commit c944cca

Browse files
committed
Consistently encode
1 parent 7c5cf89 commit c944cca

17 files changed

+16
-63
lines changed

packages/react-client/src/ReactClientStackConfigWeb.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

packages/react-client/src/ReactFlightClient.js

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ import {
5252
} from 'shared/ReactFeatureFlags';
5353

5454
import {
55-
getSourceURL,
5655
resolveClientReference,
5756
resolveServerReference,
5857
preloadModule,
@@ -2753,32 +2752,25 @@ function createFakeFunction<T>(
27532752
code = comment + code;
27542753
}
27552754

2756-
if (filename.startsWith('/')) {
2757-
// If the filename starts with `/` we assume that it is a file system file
2758-
// rather than relative to the current host. Since on the server fully qualified
2759-
// stack traces use the file path.
2760-
// TODO: What does this look like on Windows?
2761-
filename = 'file://' + filename;
2762-
}
2763-
2755+
// We use the prefix rsc://React/ to separate these from other files listed in
2756+
// the Chrome DevTools. We need a "host name" and not just a protocol because
2757+
// otherwise the group name becomes the root folder. Ideally we don't want to
2758+
// show these at all but there's two reasons to assign a fake URL.
2759+
// 1) A printed stack trace string needs a unique URL to be able to source map it.
2760+
// 2) If source maps are disabled or fails, you should at least be able to tell
2761+
// which file it was.
2762+
const sourceURL =
2763+
'rsc://React/' +
2764+
encodeURIComponent(environmentName) +
2765+
'/' +
2766+
encodeURI(filename) +
2767+
'?' +
2768+
fakeFunctionIdx++;
27642769
if (sourceMap) {
2765-
// We use the prefix rsc://React/ to separate these from other files listed in
2766-
// the Chrome DevTools. We need a "host name" and not just a protocol because
2767-
// otherwise the group name becomes the root folder. Ideally we don't want to
2768-
// show these at all but there's two reasons to assign a fake URL.
2769-
// 1) A printed stack trace string needs a unique URL to be able to source map it.
2770-
// 2) If source maps are disabled or fails, you should at least be able to tell
2771-
// which file it was.
2772-
code +=
2773-
'\n//# sourceURL=rsc://React/' +
2774-
encodeURIComponent(environmentName) +
2775-
'/' +
2776-
getSourceURL(filename) +
2777-
'?' +
2778-
fakeFunctionIdx++;
2770+
code += '\n//# sourceURL=' + sourceURL;
27792771
code += '\n//# sourceMappingURL=' + sourceMap;
27802772
} else if (filename) {
2781-
code += '\n//# sourceURL=' + getSourceURL(filename);
2773+
code += '\n//# sourceURL=' + sourceURL;
27822774
} else {
27832775
code += '\n//# sourceURL=<anonymous>';
27842776
}

packages/react-client/src/forks/ReactFlightClientConfig.custom.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,3 @@ export const bindToConsole = $$$config.bindToConsole;
5252

5353
export const rendererVersion = $$$config.rendererVersion;
5454
export const rendererPackageName = $$$config.rendererPackageName;
55-
56-
export const getSourceURL = $$$config.getSourceURL;

packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-esm.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
export {default as rendererVersion} from 'shared/ReactVersion';
1111
export const rendererPackageName = 'react-server-dom-esm';
1212

13-
export * from 'react-client/src/ReactClientStackConfigWeb';
1413
export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
1514
export * from 'react-client/src/ReactClientConsoleConfigBrowser';
1615
export * from 'react-server-dom-esm/src/client/ReactFlightClientConfigBundlerESM';

packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-parcel.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
export {default as rendererVersion} from 'shared/ReactVersion';
1111
export const rendererPackageName = 'react-server-dom-parcel';
1212

13-
export * from 'react-client/src/ReactClientStackConfigWeb';
1413
export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
1514
export * from 'react-client/src/ReactClientConsoleConfigBrowser';
1615
export * from 'react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel';

packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-turbopack.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
export {default as rendererVersion} from 'shared/ReactVersion';
1111
export const rendererPackageName = 'react-server-dom-turbopack';
1212

13-
export * from 'react-client/src/ReactClientStackConfigWeb';
1413
export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
1514
export * from 'react-client/src/ReactClientConsoleConfigBrowser';
1615
export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack';

packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
export {default as rendererVersion} from 'shared/ReactVersion';
1111
export const rendererPackageName = 'react-server-dom-webpack';
1212

13-
export * from 'react-client/src/ReactClientStackConfigWeb';
1413
export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
1514
export * from 'react-client/src/ReactClientConsoleConfigBrowser';
1615
export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack';

packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
export {default as rendererVersion} from 'shared/ReactVersion';
1111
export const rendererPackageName = 'react-server-dom-bun';
1212

13-
export * from 'react-client/src/ReactClientStackConfigWeb';
1413
export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
1514
export * from 'react-client/src/ReactClientConsoleConfigPlain';
1615
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-parcel.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
export {default as rendererVersion} from 'shared/ReactVersion';
1111
export const rendererPackageName = 'react-server-dom-parcel';
1212

13-
export * from 'react-client/src/ReactClientStackConfigWeb';
1413
export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
1514
export * from 'react-client/src/ReactClientConsoleConfigServer';
1615
export * from 'react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel';

packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-turbopack.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
export {default as rendererVersion} from 'shared/ReactVersion';
1111
export const rendererPackageName = 'react-server-dom-turbopack';
1212

13-
export * from 'react-client/src/ReactClientStackConfigWeb';
1413
export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
1514
export * from 'react-client/src/ReactClientConsoleConfigServer';
1615
export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack';

0 commit comments

Comments
 (0)