[test] Exclude repository root from assertions (#35361)

Author: eps1lon

.eslintrc.js

@@ -635,6 +635,7 @@ module.exports = {
 FocusOptions: 'readonly',
 OptionalEffectTiming: 'readonly',
 
+__REACT_ROOT_PATH_TEST__: 'readonly',
 spyOnDev: 'readonly',
 spyOnDevAndProd: 'readonly',
 spyOnProd: 'readonly',

packages/internal-test-utils/debugInfo.js

@@ -1,9 +1,5 @@
 'use strict';
 
-constpath=require('path');
-
-constrepoRoot=path.resolve(__dirname,'../../');
-
 typeDebugInfoConfig={
 ignoreProps?: boolean,
 ignoreRscStreamInfo?: boolean,
@@ -34,7 +30,7 @@ function normalizeStack(stack) {
 const[name,file,line,col,enclosingLine,enclosingCol]=stack[i];
 copy.push([
 name,
-file.replace(repoRoot,''),
+file.replace(__REACT_ROOT_PATH_TEST__,''),
 line,
 col,
 enclosingLine,

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-constpath=require('path');
-
 if(typeofBlob==='undefined'){
 global.Blob=require('buffer').Blob;
 }
@@ -33,9 +31,8 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
-constrepoRoot=path.resolve(__dirname,'../../../../');
 functionnormalizeReactCodeLocInfo(str){
-constrepoRootForRegexp=repoRoot.replace(/\//g,'\\/');
+constrepoRootForRegexp=__REACT_ROOT_PATH_TEST__.replace(/\//g,'\\/');
 constrepoFileLocMatch=newRegExp(`${repoRootForRegexp}.+?:\\d+:\\d+`,'g');
 returnstr&&str.replace(repoFileLocMatch,'**');
 }

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js

@@ -39,6 +39,10 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
+functionnormalizeSerializedContent(str){
+returnstr.replaceAll(__REACT_ROOT_PATH_TEST__,'**');
+}
+
 describe('ReactFlightDOMEdge',()=>{
 beforeEach(()=>{
 // Mock performance.now for timing tests
@@ -481,8 +485,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(1100);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(1075);
 
 constresult=awaitReactServerDOMClient.createFromReadableStream(
 stream2,
@@ -551,9 +557,11 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
 
-expect(serializedContent.length).toBeLessThan(490);
+expect(serializedContent.length).toBeLessThan(465);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitReactServerDOMClient.createFromReadableStream(stream2,{
@@ -623,8 +631,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(__DEV__ ? 680 : 400);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(__DEV__ ? 630 : 400);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitserverAct(()=>
@@ -657,8 +667,10 @@ describe('ReactFlightDOMEdge', () => {
 <ServerComponentrecurse={20}/>,
 ),
 );
-constserializedContent=awaitreadResult(stream);
-constexpectedDebugInfoSize=__DEV__ ? 320*20 : 0;
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream),
+);
+constexpectedDebugInfoSize=__DEV__ ? 295*20 : 0;
 expect(serializedContent.length).toBeLessThan(150+expectedDebugInfoSize);
 });
 

scripts/jest/setupTests.js

@@ -6,6 +6,7 @@ const {
  resetAllUnexpectedConsoleCalls,
  patchConsoleMethods,
 }=require('internal-test-utils/consoleMock');
+constpath=require('path');
 
 if(process.env.REACT_CLASS_EQUIVALENCE_TEST){
 // Inside the class equivalence tester, we have a custom environment, let's
@@ -18,6 +19,9 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
 constspyOn=jest.spyOn;
 constnoop=jest.fn;
 
+// Can be used to normalize paths in stackframes
+global.__REACT_ROOT_PATH_TEST__=path.resolve(__dirname,'../..');
+
 // Spying on console methods in production builds can mask errors.
 // This is why we added an explicit spyOnDev() helper.
 // It's too easy to accidentally use the more familiar spyOn() helper though,

.eslintrc.js

@@ -635,6 +635,7 @@ module.exports = {
 FocusOptions: 'readonly',
 OptionalEffectTiming: 'readonly',
 
+__REACT_ROOT_PATH_TEST__: 'readonly',
 spyOnDev: 'readonly',
 spyOnDevAndProd: 'readonly',
 spyOnProd: 'readonly',

packages/internal-test-utils/debugInfo.js

@@ -1,9 +1,5 @@
 'use strict';
 
-constpath=require('path');
-
-constrepoRoot=path.resolve(__dirname,'../../');
-
 typeDebugInfoConfig={
 ignoreProps?: boolean,
 ignoreRscStreamInfo?: boolean,
@@ -34,7 +30,7 @@ function normalizeStack(stack) {
 const[name,file,line,col,enclosingLine,enclosingCol]=stack[i];
 copy.push([
 name,
-file.replace(repoRoot,''),
+file.replace(__REACT_ROOT_PATH_TEST__,''),
 line,
 col,
 enclosingLine,

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-constpath=require('path');
-
 if(typeofBlob==='undefined'){
 global.Blob=require('buffer').Blob;
 }
@@ -33,9 +31,8 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
-constrepoRoot=path.resolve(__dirname,'../../../../');
 functionnormalizeReactCodeLocInfo(str){
-constrepoRootForRegexp=repoRoot.replace(/\//g,'\\/');
+constrepoRootForRegexp=__REACT_ROOT_PATH_TEST__.replace(/\//g,'\\/');
 constrepoFileLocMatch=newRegExp(`${repoRootForRegexp}.+?:\\d+:\\d+`,'g');
 returnstr&&str.replace(repoFileLocMatch,'**');
 }

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js

@@ -39,6 +39,10 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
+functionnormalizeSerializedContent(str){
+returnstr.replaceAll(__REACT_ROOT_PATH_TEST__,'**');
+}
+
 describe('ReactFlightDOMEdge',()=>{
 beforeEach(()=>{
 // Mock performance.now for timing tests
@@ -481,8 +485,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(1100);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(1075);
 
 constresult=awaitReactServerDOMClient.createFromReadableStream(
 stream2,
@@ -551,9 +557,11 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
 
-expect(serializedContent.length).toBeLessThan(490);
+expect(serializedContent.length).toBeLessThan(465);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitReactServerDOMClient.createFromReadableStream(stream2,{
@@ -623,8 +631,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(__DEV__ ? 680 : 400);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(__DEV__ ? 630 : 400);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitserverAct(()=>
@@ -657,8 +667,10 @@ describe('ReactFlightDOMEdge', () => {
 <ServerComponentrecurse={20}/>,
 ),
 );
-constserializedContent=awaitreadResult(stream);
-constexpectedDebugInfoSize=__DEV__ ? 320*20 : 0;
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream),
+);
+constexpectedDebugInfoSize=__DEV__ ? 295*20 : 0;
 expect(serializedContent.length).toBeLessThan(150+expectedDebugInfoSize);
 });
 

scripts/jest/setupTests.js

@@ -6,6 +6,7 @@ const {
  resetAllUnexpectedConsoleCalls,
  patchConsoleMethods,
 }=require('internal-test-utils/consoleMock');
+constpath=require('path');
 
 if(process.env.REACT_CLASS_EQUIVALENCE_TEST){
 // Inside the class equivalence tester, we have a custom environment, let's
@@ -18,6 +19,9 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
 constspyOn=jest.spyOn;
 constnoop=jest.fn;
 
+// Can be used to normalize paths in stackframes
+global.__REACT_ROOT_PATH_TEST__=path.resolve(__dirname,'../..');
+
 // Spying on console methods in production builds can mask errors.
 // This is why we added an explicit spyOnDev() helper.
 // It's too easy to accidentally use the more familiar spyOn() helper though,

.eslintrc.js

@@ -635,6 +635,7 @@ module.exports = {
 FocusOptions: 'readonly',
 OptionalEffectTiming: 'readonly',
 
+__REACT_ROOT_PATH_TEST__: 'readonly',
 spyOnDev: 'readonly',
 spyOnDevAndProd: 'readonly',
 spyOnProd: 'readonly',

packages/internal-test-utils/debugInfo.js

@@ -1,9 +1,5 @@
 'use strict';
 
-constpath=require('path');
-
-constrepoRoot=path.resolve(__dirname,'../../');
-
 typeDebugInfoConfig={
 ignoreProps?: boolean,
 ignoreRscStreamInfo?: boolean,
@@ -34,7 +30,7 @@ function normalizeStack(stack) {
 const[name,file,line,col,enclosingLine,enclosingCol]=stack[i];
 copy.push([
 name,
-file.replace(repoRoot,''),
+file.replace(__REACT_ROOT_PATH_TEST__,''),
 line,
 col,
 enclosingLine,

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-constpath=require('path');
-
 if(typeofBlob==='undefined'){
 global.Blob=require('buffer').Blob;
 }
@@ -33,9 +31,8 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
-constrepoRoot=path.resolve(__dirname,'../../../../');
 functionnormalizeReactCodeLocInfo(str){
-constrepoRootForRegexp=repoRoot.replace(/\//g,'\\/');
+constrepoRootForRegexp=__REACT_ROOT_PATH_TEST__.replace(/\//g,'\\/');
 constrepoFileLocMatch=newRegExp(`${repoRootForRegexp}.+?:\\d+:\\d+`,'g');
 returnstr&&str.replace(repoFileLocMatch,'**');
 }

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js

@@ -39,6 +39,10 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
+functionnormalizeSerializedContent(str){
+returnstr.replaceAll(__REACT_ROOT_PATH_TEST__,'**');
+}
+
 describe('ReactFlightDOMEdge',()=>{
 beforeEach(()=>{
 // Mock performance.now for timing tests
@@ -481,8 +485,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(1100);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(1075);
 
 constresult=awaitReactServerDOMClient.createFromReadableStream(
 stream2,
@@ -551,9 +557,11 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
 
-expect(serializedContent.length).toBeLessThan(490);
+expect(serializedContent.length).toBeLessThan(465);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitReactServerDOMClient.createFromReadableStream(stream2,{
@@ -623,8 +631,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(__DEV__ ? 680 : 400);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(__DEV__ ? 630 : 400);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitserverAct(()=>
@@ -657,8 +667,10 @@ describe('ReactFlightDOMEdge', () => {
 <ServerComponentrecurse={20}/>,
 ),
 );
-constserializedContent=awaitreadResult(stream);
-constexpectedDebugInfoSize=__DEV__ ? 320*20 : 0;
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream),
+);
+constexpectedDebugInfoSize=__DEV__ ? 295*20 : 0;
 expect(serializedContent.length).toBeLessThan(150+expectedDebugInfoSize);
 });
 

scripts/jest/setupTests.js

@@ -6,6 +6,7 @@ const {
  resetAllUnexpectedConsoleCalls,
  patchConsoleMethods,
 }=require('internal-test-utils/consoleMock');
+constpath=require('path');
 
 if(process.env.REACT_CLASS_EQUIVALENCE_TEST){
 // Inside the class equivalence tester, we have a custom environment, let's
@@ -18,6 +19,9 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
 constspyOn=jest.spyOn;
 constnoop=jest.fn;
 
+// Can be used to normalize paths in stackframes
+global.__REACT_ROOT_PATH_TEST__=path.resolve(__dirname,'../..');
+
 // Spying on console methods in production builds can mask errors.
 // This is why we added an explicit spyOnDev() helper.
 // It's too easy to accidentally use the more familiar spyOn() helper though,

.eslintrc.js

@@ -635,6 +635,7 @@ module.exports = {
 FocusOptions: 'readonly',
 OptionalEffectTiming: 'readonly',
 
+__REACT_ROOT_PATH_TEST__: 'readonly',
 spyOnDev: 'readonly',
 spyOnDevAndProd: 'readonly',
 spyOnProd: 'readonly',

packages/internal-test-utils/debugInfo.js

@@ -1,9 +1,5 @@
 'use strict';
 
-constpath=require('path');
-
-constrepoRoot=path.resolve(__dirname,'../../');
-
 typeDebugInfoConfig={
 ignoreProps?: boolean,
 ignoreRscStreamInfo?: boolean,
@@ -34,7 +30,7 @@ function normalizeStack(stack) {
 const[name,file,line,col,enclosingLine,enclosingCol]=stack[i];
 copy.push([
 name,
-file.replace(repoRoot,''),
+file.replace(__REACT_ROOT_PATH_TEST__,''),
 line,
 col,
 enclosingLine,

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-constpath=require('path');
-
 if(typeofBlob==='undefined'){
 global.Blob=require('buffer').Blob;
 }
@@ -33,9 +31,8 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
-constrepoRoot=path.resolve(__dirname,'../../../../');
 functionnormalizeReactCodeLocInfo(str){
-constrepoRootForRegexp=repoRoot.replace(/\//g,'\\/');
+constrepoRootForRegexp=__REACT_ROOT_PATH_TEST__.replace(/\//g,'\\/');
 constrepoFileLocMatch=newRegExp(`${repoRootForRegexp}.+?:\\d+:\\d+`,'g');
 returnstr&&str.replace(repoFileLocMatch,'**');
 }

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js

@@ -39,6 +39,10 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
+functionnormalizeSerializedContent(str){
+returnstr.replaceAll(__REACT_ROOT_PATH_TEST__,'**');
+}
+
 describe('ReactFlightDOMEdge',()=>{
 beforeEach(()=>{
 // Mock performance.now for timing tests
@@ -481,8 +485,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(1100);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(1075);
 
 constresult=awaitReactServerDOMClient.createFromReadableStream(
 stream2,
@@ -551,9 +557,11 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
 
-expect(serializedContent.length).toBeLessThan(490);
+expect(serializedContent.length).toBeLessThan(465);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitReactServerDOMClient.createFromReadableStream(stream2,{
@@ -623,8 +631,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(__DEV__ ? 680 : 400);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(__DEV__ ? 630 : 400);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitserverAct(()=>
@@ -657,8 +667,10 @@ describe('ReactFlightDOMEdge', () => {
 <ServerComponentrecurse={20}/>,
 ),
 );
-constserializedContent=awaitreadResult(stream);
-constexpectedDebugInfoSize=__DEV__ ? 320*20 : 0;
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream),
+);
+constexpectedDebugInfoSize=__DEV__ ? 295*20 : 0;
 expect(serializedContent.length).toBeLessThan(150+expectedDebugInfoSize);
 });
 

scripts/jest/setupTests.js

@@ -6,6 +6,7 @@ const {
  resetAllUnexpectedConsoleCalls,
  patchConsoleMethods,
 }=require('internal-test-utils/consoleMock');
+constpath=require('path');
 
 if(process.env.REACT_CLASS_EQUIVALENCE_TEST){
 // Inside the class equivalence tester, we have a custom environment, let's
@@ -18,6 +19,9 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
 constspyOn=jest.spyOn;
 constnoop=jest.fn;
 
+// Can be used to normalize paths in stackframes
+global.__REACT_ROOT_PATH_TEST__=path.resolve(__dirname,'../..');
+
 // Spying on console methods in production builds can mask errors.
 // This is why we added an explicit spyOnDev() helper.
 // It's too easy to accidentally use the more familiar spyOn() helper though,

.eslintrc.js

@@ -635,6 +635,7 @@ module.exports = {
 FocusOptions: 'readonly',
 OptionalEffectTiming: 'readonly',
 
+__REACT_ROOT_PATH_TEST__: 'readonly',
 spyOnDev: 'readonly',
 spyOnDevAndProd: 'readonly',
 spyOnProd: 'readonly',

packages/internal-test-utils/debugInfo.js

@@ -1,9 +1,5 @@
 'use strict';
 
-constpath=require('path');
-
-constrepoRoot=path.resolve(__dirname,'../../');
-
 typeDebugInfoConfig={
 ignoreProps?: boolean,
 ignoreRscStreamInfo?: boolean,
@@ -34,7 +30,7 @@ function normalizeStack(stack) {
 const[name,file,line,col,enclosingLine,enclosingCol]=stack[i];
 copy.push([
 name,
-file.replace(repoRoot,''),
+file.replace(__REACT_ROOT_PATH_TEST__,''),
 line,
 col,
 enclosingLine,

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-constpath=require('path');
-
 if(typeofBlob==='undefined'){
 global.Blob=require('buffer').Blob;
 }
@@ -33,9 +31,8 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
-constrepoRoot=path.resolve(__dirname,'../../../../');
 functionnormalizeReactCodeLocInfo(str){
-constrepoRootForRegexp=repoRoot.replace(/\//g,'\\/');
+constrepoRootForRegexp=__REACT_ROOT_PATH_TEST__.replace(/\//g,'\\/');
 constrepoFileLocMatch=newRegExp(`${repoRootForRegexp}.+?:\\d+:\\d+`,'g');
 returnstr&&str.replace(repoFileLocMatch,'**');
 }

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js

@@ -39,6 +39,10 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
+functionnormalizeSerializedContent(str){
+returnstr.replaceAll(__REACT_ROOT_PATH_TEST__,'**');
+}
+
 describe('ReactFlightDOMEdge',()=>{
 beforeEach(()=>{
 // Mock performance.now for timing tests
@@ -481,8 +485,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(1100);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(1075);
 
 constresult=awaitReactServerDOMClient.createFromReadableStream(
 stream2,
@@ -551,9 +557,11 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
 
-expect(serializedContent.length).toBeLessThan(490);
+expect(serializedContent.length).toBeLessThan(465);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitReactServerDOMClient.createFromReadableStream(stream2,{
@@ -623,8 +631,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(__DEV__ ? 680 : 400);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(__DEV__ ? 630 : 400);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitserverAct(()=>
@@ -657,8 +667,10 @@ describe('ReactFlightDOMEdge', () => {
 <ServerComponentrecurse={20}/>,
 ),
 );
-constserializedContent=awaitreadResult(stream);
-constexpectedDebugInfoSize=__DEV__ ? 320*20 : 0;
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream),
+);
+constexpectedDebugInfoSize=__DEV__ ? 295*20 : 0;
 expect(serializedContent.length).toBeLessThan(150+expectedDebugInfoSize);
 });
 

scripts/jest/setupTests.js

@@ -6,6 +6,7 @@ const {
  resetAllUnexpectedConsoleCalls,
  patchConsoleMethods,
 }=require('internal-test-utils/consoleMock');
+constpath=require('path');
 
 if(process.env.REACT_CLASS_EQUIVALENCE_TEST){
 // Inside the class equivalence tester, we have a custom environment, let's
@@ -18,6 +19,9 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
 constspyOn=jest.spyOn;
 constnoop=jest.fn;
 
+// Can be used to normalize paths in stackframes
+global.__REACT_ROOT_PATH_TEST__=path.resolve(__dirname,'../..');
+
 // Spying on console methods in production builds can mask errors.
 // This is why we added an explicit spyOnDev() helper.
 // It's too easy to accidentally use the more familiar spyOn() helper though,

.eslintrc.js

@@ -635,6 +635,7 @@ module.exports = {
 FocusOptions: 'readonly',
 OptionalEffectTiming: 'readonly',
 
+__REACT_ROOT_PATH_TEST__: 'readonly',
 spyOnDev: 'readonly',
 spyOnDevAndProd: 'readonly',
 spyOnProd: 'readonly',

packages/internal-test-utils/debugInfo.js

@@ -1,9 +1,5 @@
 'use strict';
 
-constpath=require('path');
-
-constrepoRoot=path.resolve(__dirname,'../../');
-
 typeDebugInfoConfig={
 ignoreProps?: boolean,
 ignoreRscStreamInfo?: boolean,
@@ -34,7 +30,7 @@ function normalizeStack(stack) {
 const[name,file,line,col,enclosingLine,enclosingCol]=stack[i];
 copy.push([
 name,
-file.replace(repoRoot,''),
+file.replace(__REACT_ROOT_PATH_TEST__,''),
 line,
 col,
 enclosingLine,

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-constpath=require('path');
-
 if(typeofBlob==='undefined'){
 global.Blob=require('buffer').Blob;
 }
@@ -33,9 +31,8 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
-constrepoRoot=path.resolve(__dirname,'../../../../');
 functionnormalizeReactCodeLocInfo(str){
-constrepoRootForRegexp=repoRoot.replace(/\//g,'\\/');
+constrepoRootForRegexp=__REACT_ROOT_PATH_TEST__.replace(/\//g,'\\/');
 constrepoFileLocMatch=newRegExp(`${repoRootForRegexp}.+?:\\d+:\\d+`,'g');
 returnstr&&str.replace(repoFileLocMatch,'**');
 }

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js

@@ -39,6 +39,10 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
+functionnormalizeSerializedContent(str){
+returnstr.replaceAll(__REACT_ROOT_PATH_TEST__,'**');
+}
+
 describe('ReactFlightDOMEdge',()=>{
 beforeEach(()=>{
 // Mock performance.now for timing tests
@@ -481,8 +485,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(1100);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(1075);
 
 constresult=awaitReactServerDOMClient.createFromReadableStream(
 stream2,
@@ -551,9 +557,11 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
 
-expect(serializedContent.length).toBeLessThan(490);
+expect(serializedContent.length).toBeLessThan(465);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitReactServerDOMClient.createFromReadableStream(stream2,{
@@ -623,8 +631,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(__DEV__ ? 680 : 400);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(__DEV__ ? 630 : 400);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitserverAct(()=>
@@ -657,8 +667,10 @@ describe('ReactFlightDOMEdge', () => {
 <ServerComponentrecurse={20}/>,
 ),
 );
-constserializedContent=awaitreadResult(stream);
-constexpectedDebugInfoSize=__DEV__ ? 320*20 : 0;
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream),
+);
+constexpectedDebugInfoSize=__DEV__ ? 295*20 : 0;
 expect(serializedContent.length).toBeLessThan(150+expectedDebugInfoSize);
 });
 

scripts/jest/setupTests.js

@@ -6,6 +6,7 @@ const {
  resetAllUnexpectedConsoleCalls,
  patchConsoleMethods,
 }=require('internal-test-utils/consoleMock');
+constpath=require('path');
 
 if(process.env.REACT_CLASS_EQUIVALENCE_TEST){
 // Inside the class equivalence tester, we have a custom environment, let's
@@ -18,6 +19,9 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
 constspyOn=jest.spyOn;
 constnoop=jest.fn;
 
+// Can be used to normalize paths in stackframes
+global.__REACT_ROOT_PATH_TEST__=path.resolve(__dirname,'../..');
+
 // Spying on console methods in production builds can mask errors.
 // This is why we added an explicit spyOnDev() helper.
 // It's too easy to accidentally use the more familiar spyOn() helper though,

.eslintrc.js

@@ -635,6 +635,7 @@ module.exports = {
 FocusOptions: 'readonly',
 OptionalEffectTiming: 'readonly',
 
+__REACT_ROOT_PATH_TEST__: 'readonly',
 spyOnDev: 'readonly',
 spyOnDevAndProd: 'readonly',
 spyOnProd: 'readonly',

packages/internal-test-utils/debugInfo.js

@@ -1,9 +1,5 @@
 'use strict';
 
-constpath=require('path');
-
-constrepoRoot=path.resolve(__dirname,'../../');
-
 typeDebugInfoConfig={
 ignoreProps?: boolean,
 ignoreRscStreamInfo?: boolean,
@@ -34,7 +30,7 @@ function normalizeStack(stack) {
 const[name,file,line,col,enclosingLine,enclosingCol]=stack[i];
 copy.push([
 name,
-file.replace(repoRoot,''),
+file.replace(__REACT_ROOT_PATH_TEST__,''),
 line,
 col,
 enclosingLine,

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-constpath=require('path');
-
 if(typeofBlob==='undefined'){
 global.Blob=require('buffer').Blob;
 }
@@ -33,9 +31,8 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
-constrepoRoot=path.resolve(__dirname,'../../../../');
 functionnormalizeReactCodeLocInfo(str){
-constrepoRootForRegexp=repoRoot.replace(/\//g,'\\/');
+constrepoRootForRegexp=__REACT_ROOT_PATH_TEST__.replace(/\//g,'\\/');
 constrepoFileLocMatch=newRegExp(`${repoRootForRegexp}.+?:\\d+:\\d+`,'g');
 returnstr&&str.replace(repoFileLocMatch,'**');
 }

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js

@@ -39,6 +39,10 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
+functionnormalizeSerializedContent(str){
+returnstr.replaceAll(__REACT_ROOT_PATH_TEST__,'**');
+}
+
 describe('ReactFlightDOMEdge',()=>{
 beforeEach(()=>{
 // Mock performance.now for timing tests
@@ -481,8 +485,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(1100);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(1075);
 
 constresult=awaitReactServerDOMClient.createFromReadableStream(
 stream2,
@@ -551,9 +557,11 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
 
-expect(serializedContent.length).toBeLessThan(490);
+expect(serializedContent.length).toBeLessThan(465);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitReactServerDOMClient.createFromReadableStream(stream2,{
@@ -623,8 +631,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(__DEV__ ? 680 : 400);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(__DEV__ ? 630 : 400);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitserverAct(()=>
@@ -657,8 +667,10 @@ describe('ReactFlightDOMEdge', () => {
 <ServerComponentrecurse={20}/>,
 ),
 );
-constserializedContent=awaitreadResult(stream);
-constexpectedDebugInfoSize=__DEV__ ? 320*20 : 0;
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream),
+);
+constexpectedDebugInfoSize=__DEV__ ? 295*20 : 0;
 expect(serializedContent.length).toBeLessThan(150+expectedDebugInfoSize);
 });
 

scripts/jest/setupTests.js

@@ -6,6 +6,7 @@ const {
  resetAllUnexpectedConsoleCalls,
  patchConsoleMethods,
 }=require('internal-test-utils/consoleMock');
+constpath=require('path');
 
 if(process.env.REACT_CLASS_EQUIVALENCE_TEST){
 // Inside the class equivalence tester, we have a custom environment, let's
@@ -18,6 +19,9 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
 constspyOn=jest.spyOn;
 constnoop=jest.fn;
 
+// Can be used to normalize paths in stackframes
+global.__REACT_ROOT_PATH_TEST__=path.resolve(__dirname,'../..');
+
 // Spying on console methods in production builds can mask errors.
 // This is why we added an explicit spyOnDev() helper.
 // It's too easy to accidentally use the more familiar spyOn() helper though,

.eslintrc.js

@@ -635,6 +635,7 @@ module.exports = {
 FocusOptions: 'readonly',
 OptionalEffectTiming: 'readonly',
 
+__REACT_ROOT_PATH_TEST__: 'readonly',
 spyOnDev: 'readonly',
 spyOnDevAndProd: 'readonly',
 spyOnProd: 'readonly',

packages/internal-test-utils/debugInfo.js

@@ -1,9 +1,5 @@
 'use strict';
 
-constpath=require('path');
-
-constrepoRoot=path.resolve(__dirname,'../../');
-
 typeDebugInfoConfig={
 ignoreProps?: boolean,
 ignoreRscStreamInfo?: boolean,
@@ -34,7 +30,7 @@ function normalizeStack(stack) {
 const[name,file,line,col,enclosingLine,enclosingCol]=stack[i];
 copy.push([
 name,
-file.replace(repoRoot,''),
+file.replace(__REACT_ROOT_PATH_TEST__,''),
 line,
 col,
 enclosingLine,

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-constpath=require('path');
-
 if(typeofBlob==='undefined'){
 global.Blob=require('buffer').Blob;
 }
@@ -33,9 +31,8 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
-constrepoRoot=path.resolve(__dirname,'../../../../');
 functionnormalizeReactCodeLocInfo(str){
-constrepoRootForRegexp=repoRoot.replace(/\//g,'\\/');
+constrepoRootForRegexp=__REACT_ROOT_PATH_TEST__.replace(/\//g,'\\/');
 constrepoFileLocMatch=newRegExp(`${repoRootForRegexp}.+?:\\d+:\\d+`,'g');
 returnstr&&str.replace(repoFileLocMatch,'**');
 }

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js

@@ -39,6 +39,10 @@ function normalizeCodeLocInfo(str) {
 );
 }
 
+functionnormalizeSerializedContent(str){
+returnstr.replaceAll(__REACT_ROOT_PATH_TEST__,'**');
+}
+
 describe('ReactFlightDOMEdge',()=>{
 beforeEach(()=>{
 // Mock performance.now for timing tests
@@ -481,8 +485,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(1100);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(1075);
 
 constresult=awaitReactServerDOMClient.createFromReadableStream(
 stream2,
@@ -551,9 +557,11 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
 
-expect(serializedContent.length).toBeLessThan(490);
+expect(serializedContent.length).toBeLessThan(465);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitReactServerDOMClient.createFromReadableStream(stream2,{
@@ -623,8 +631,10 @@ describe('ReactFlightDOMEdge', () => {
 );
 const[stream1,stream2]=passThrough(stream).tee();
 
-constserializedContent=awaitreadResult(stream1);
-expect(serializedContent.length).toBeLessThan(__DEV__ ? 680 : 400);
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream1),
+);
+expect(serializedContent.length).toBeLessThan(__DEV__ ? 630 : 400);
 expect(timesRendered).toBeLessThan(5);
 
 constmodel=awaitserverAct(()=>
@@ -657,8 +667,10 @@ describe('ReactFlightDOMEdge', () => {
 <ServerComponentrecurse={20}/>,
 ),
 );
-constserializedContent=awaitreadResult(stream);
-constexpectedDebugInfoSize=__DEV__ ? 320*20 : 0;
+constserializedContent=normalizeSerializedContent(
+awaitreadResult(stream),
+);
+constexpectedDebugInfoSize=__DEV__ ? 295*20 : 0;
 expect(serializedContent.length).toBeLessThan(150+expectedDebugInfoSize);
 });
 

scripts/jest/setupTests.js

@@ -6,6 +6,7 @@ const {
  resetAllUnexpectedConsoleCalls,
  patchConsoleMethods,
 }=require('internal-test-utils/consoleMock');
+constpath=require('path');
 
 if(process.env.REACT_CLASS_EQUIVALENCE_TEST){
 // Inside the class equivalence tester, we have a custom environment, let's
@@ -18,6 +19,9 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
 constspyOn=jest.spyOn;
 constnoop=jest.fn;
 
+// Can be used to normalize paths in stackframes
+global.__REACT_ROOT_PATH_TEST__=path.resolve(__dirname,'../..');
+
 // Spying on console methods in production builds can mask errors.
 // This is why we added an explicit spyOnDev() helper.
 // It's too easy to accidentally use the more familiar spyOn() helper though,