Skip to content

Commit 1503363

Browse files
eps1loneps1lon
committed
Remove mixed environments
They were required when this branch was based on an earlier commit. But now we don't need a mixed environment anymore. Unclear why though.
1 parent 82d6f13 commit 1503363

21 files changed

+45
-321
lines changed

‎packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55
* LICENSE file in the root directory of this source tree.
66
*
77
* @emails react-core
8-
* @jest-environment node
98
*/
109

1110
'use strict';
1211

13-
let JSDOM;
1412
let Stream;
1513
let Scheduler;
1614
let React;
@@ -24,27 +22,14 @@ let PropTypes;
2422
let textCache;
2523
let writable;
2624
let CSPnonce = null;
27-
let container;
25+
let container = null;
2826
let buffer = '';
2927
let hasErrored = false;
3028
let fatalError = undefined;
3129

3230
describe('ReactDOMFizzServer', () => {
3331
beforeEach(() => {
3432
jest.resetModules();
35-
// Creating mixed environment for `react-dom` + `react-dom/server`
36-
JSDOM = require('jsdom').JSDOM;
37-
const jsdom = new JSDOM(
38-
'<!DOCTYPE html><html><head></head><body><div id="container">',
39-
{
40-
runScripts: 'dangerously',
41-
},
42-
);
43-
global.window = jsdom.window;
44-
global.document = jsdom.window.document;
45-
global.navigator = jsdom.window.navigator;
46-
global.Node = jsdom.window.Node;
47-
4833
Scheduler = require('scheduler');
4934
React = require('react');
5035
ReactDOMClient = require('react-dom/client');
@@ -75,7 +60,8 @@ describe('ReactDOMFizzServer', () => {
7560

7661
textCache = new Map();
7762

78-
container = document.getElementById('container');
63+
container = document.createElement('div');
64+
document.body.appendChild(container);
7965

8066
buffer = '';
8167
hasErrored = false;
@@ -91,6 +77,11 @@ describe('ReactDOMFizzServer', () => {
9177
});
9278
});
9379

80+
afterEach(() => {
81+
container?.remove();
82+
container = null
83+
});
84+
9485
async function act(callback) {
9586
await callback();
9687
// Await one turn around the event loop.

‎packages/react-dom/src/__tests__/ReactDOMFizzShellHydration-test.js‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,16 @@
55
* LICENSE file in the root directory of this source tree.
66
*
77
* @emails react-core
8-
* @jest-environment node
98
*/
109

11-
let JSDOM;
1210
let React;
1311
let ReactDOMClient;
1412
let Scheduler;
1513
let clientAct;
1614
let ReactDOMFizzServer;
1715
let Stream;
1816
let writable;
19-
let container;
17+
let container = null;
2018
let buffer = '';
2119
let hasErrored = false;
2220
let fatalError = undefined;
@@ -25,19 +23,6 @@ let textCache;
2523
describe('ReactDOMFizzShellHydration', () => {
2624
beforeEach(() => {
2725
jest.resetModules();
28-
// Creating mixed environment for `react-dom` + `react-dom/server`
29-
JSDOM = require('jsdom').JSDOM;
30-
const jsdom = new JSDOM(
31-
'<!DOCTYPE html><html><head></head><body><div id="container">',
32-
{
33-
runScripts: 'dangerously',
34-
},
35-
);
36-
global.window = jsdom.window;
37-
global.document = jsdom.window.document;
38-
global.navigator = jsdom.window.navigator;
39-
global.Node = jsdom.window.Node;
40-
4126
React = require('react');
4227
ReactDOMClient = require('react-dom/client');
4328
Scheduler = require('scheduler');
@@ -47,7 +32,8 @@ describe('ReactDOMFizzShellHydration', () => {
4732

4833
textCache = new Map();
4934

50-
container = document.getElementById('container');
35+
container = document.createElement('div');
36+
document.body.appendChild(container);
5137

5238
buffer = '';
5339
hasErrored = false;
@@ -63,6 +49,11 @@ describe('ReactDOMFizzShellHydration', () => {
6349
});
6450
});
6551

52+
afterEach(() => {
53+
container?.remove();
54+
container = null;
55+
});
56+
6657
async function serverAct(callback) {
6758
await callback();
6859
// Await one turn around the event loop.

‎packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
* LICENSE file in the root directory of this source tree.
66
*
77
* @emails react-core
8-
* @jest-environment node
98
*/
109

1110
'use strict';
1211

1312
const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
1413
const ReactFeatureFlags = require('shared/ReactFeatureFlags');
1514

16-
let JSDOM;
1715
let React;
1816
let ReactDOM;
1917
let ReactTestUtils;
@@ -22,19 +20,6 @@ let ReactDOMServer;
2220
function initModules() {
2321
// Reset warning cache.
2422
jest.resetModules();
25-
// Creating mixed environment for `react-dom` + `react-dom/server`
26-
JSDOM = require('jsdom').JSDOM;
27-
const jsdom = new JSDOM(
28-
'<!DOCTYPE html><html><head></head><body><div id="container">',
29-
{
30-
runScripts: 'dangerously',
31-
},
32-
);
33-
global.window = jsdom.window;
34-
global.document = jsdom.window.document;
35-
global.navigator = jsdom.window.navigator;
36-
global.Node = jsdom.window.Node;
37-
3823
React = require('react');
3924
ReactDOM = require('react-dom');
4025
ReactDOMServer = require('react-dom/server');

‎packages/react-dom/src/__tests__/ReactDOMServerIntegrationBasic-test.js‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* LICENSE file in the root directory of this source tree.
66
*
77
* @emails react-core
8-
* @jest-environment node
98
*/
109

1110
'use strict';
@@ -14,7 +13,6 @@ const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegratio
1413

1514
const TEXT_NODE_TYPE = 3;
1615

17-
let JSDOM;
1816
let React;
1917
let ReactDOM;
2018
let ReactDOMServer;
@@ -23,19 +21,6 @@ let ReactTestUtils;
2321
function initModules() {
2422
// Reset warning cache.
2523
jest.resetModules();
26-
// Creating mixed environment for `react-dom` + `react-dom/server`
27-
JSDOM = require('jsdom').JSDOM;
28-
const jsdom = new JSDOM(
29-
'<!DOCTYPE html><html><head></head><body><div id="container">',
30-
{
31-
runScripts: 'dangerously',
32-
},
33-
);
34-
global.window = jsdom.window;
35-
global.document = jsdom.window.document;
36-
global.navigator = jsdom.window.navigator;
37-
global.Node = jsdom.window.Node;
38-
3924
React = require('react');
4025
ReactDOM = require('react-dom');
4126
ReactDOMServer = require('react-dom/server');

‎packages/react-dom/src/__tests__/ReactDOMServerIntegrationCheckbox-test.js‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegratio
1414
// Set by `yarn test-fire`.
1515
const {disableInputAttributeSyncing} = require('shared/ReactFeatureFlags');
1616

17-
let JSDOM;
1817
let React;
1918
let ReactDOM;
2019
let ReactDOMServer;
@@ -23,19 +22,6 @@ let ReactTestUtils;
2322
function initModules() {
2423
// Reset warning cache.
2524
jest.resetModules();
26-
// Creating mixed environment for `react-dom` + `react-dom/server`
27-
JSDOM = require('jsdom').JSDOM;
28-
const jsdom = new JSDOM(
29-
'<!DOCTYPE html><html><head></head><body><div id="container">',
30-
{
31-
runScripts: 'dangerously',
32-
},
33-
);
34-
global.window = jsdom.window;
35-
global.document = jsdom.window.document;
36-
global.navigator = jsdom.window.navigator;
37-
global.Node = jsdom.window.Node;
38-
3925
React = require('react');
4026
ReactDOM = require('react-dom');
4127
ReactDOMServer = require('react-dom/server');

‎packages/react-dom/src/__tests__/ReactDOMServerIntegrationClassContextType-test.js‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
* LICENSE file in the root directory of this source tree.
66
*
77
* @emails react-core
8-
* @jest-environment node
98
*/
109

1110
'use strict';
1211

1312
const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
1413

15-
let JSDOM;
1614
let React;
1715
let ReactDOM;
1816
let ReactDOMServer;
@@ -21,19 +19,6 @@ let ReactTestUtils;
2119
function initModules() {
2220
// Reset warning cache.
2321
jest.resetModules();
24-
// Creating mixed environment for `react-dom` + `react-dom/server`
25-
JSDOM = require('jsdom').JSDOM;
26-
const jsdom = new JSDOM(
27-
'<!DOCTYPE html><html><head></head><body><div id="container">',
28-
{
29-
runScripts: 'dangerously',
30-
},
31-
);
32-
global.window = jsdom.window;
33-
global.document = jsdom.window.document;
34-
global.navigator = jsdom.window.navigator;
35-
global.Node = jsdom.window.Node;
36-
3722
React = require('react');
3823
ReactDOM = require('react-dom');
3924
ReactDOMServer = require('react-dom/server');

‎packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* LICENSE file in the root directory of this source tree.
66
*
77
* @emails react-core
8-
* @jest-environment node
98
*/
109

1110
'use strict';
@@ -14,27 +13,13 @@ const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegratio
1413

1514
const TEXT_NODE_TYPE = 3;
1615

17-
let JSDOM;
1816
let React;
1917
let ReactDOM;
2018
let ReactDOMServer;
2119
let ReactTestUtils;
2220

2321
function initModules() {
2422
jest.resetModules();
25-
// Creating mixed environment for `react-dom` + `react-dom/server`
26-
JSDOM = require('jsdom').JSDOM;
27-
const jsdom = new JSDOM(
28-
'<!DOCTYPE html><html><head></head><body><div id="container">',
29-
{
30-
runScripts: 'dangerously',
31-
},
32-
);
33-
global.window = jsdom.window;
34-
global.document = jsdom.window.document;
35-
global.navigator = jsdom.window.navigator;
36-
global.Node = jsdom.window.Node;
37-
3823
React = require('react');
3924
ReactDOM = require('react-dom');
4025
ReactDOMServer = require('react-dom/server');
@@ -58,7 +43,7 @@ const {
5843
clientRenderOnServerString,
5944
} = ReactDOMServerIntegrationUtils(initModules);
6045

61-
describe('ReactDOMServerIntegration', () => {
46+
describe('ReactDOMServerIntegrationElements', () => {
6247
beforeEach(() => {
6348
resetModules();
6449
});

‎packages/react-dom/src/__tests__/ReactDOMServerIntegrationFragment-test.js‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
* LICENSE file in the root directory of this source tree.
66
*
77
* @emails react-core
8-
* @jest-environment node
98
*/
109

1110
'use strict';
1211

1312
const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
1413

15-
let JSDOM;
1614
let React;
1715
let ReactDOM;
1816
let ReactDOMServer;
@@ -21,19 +19,6 @@ let ReactTestUtils;
2119
function initModules() {
2220
// Reset warning cache.
2321
jest.resetModules();
24-
// Creating mixed environment for `react-dom` + `react-dom/server`
25-
JSDOM = require('jsdom').JSDOM;
26-
const jsdom = new JSDOM(
27-
'<!DOCTYPE html><html><head></head><body><div id="container">',
28-
{
29-
runScripts: 'dangerously',
30-
},
31-
);
32-
global.window = jsdom.window;
33-
global.document = jsdom.window.document;
34-
global.navigator = jsdom.window.navigator;
35-
global.Node = jsdom.window.Node;
36-
3722
React = require('react');
3823
ReactDOM = require('react-dom');
3924
ReactDOMServer = require('react-dom/server');

‎packages/react-dom/src/__tests__/ReactDOMServerIntegrationHooks-test.js‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* LICENSE file in the root directory of this source tree.
66
*
77
* @emails react-core
8-
* @jest-environment node
98
*/
109

1110
/* eslint-disable no-func-assign */
@@ -14,7 +13,6 @@
1413

1514
const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
1615

17-
let JSDOM;
1816
let React;
1917
let ReactDOM;
2018
let ReactDOMServer;
@@ -38,19 +36,6 @@ let clearYields;
3836
function initModules() {
3937
// Reset warning cache.
4038
jest.resetModules();
41-
// Creating mixed environment for `react-dom` + `react-dom/server`
42-
JSDOM = require('jsdom').JSDOM;
43-
const jsdom = new JSDOM(
44-
'<!DOCTYPE html><html><head></head><body><div id="container">',
45-
{
46-
runScripts: 'dangerously',
47-
},
48-
);
49-
global.window = jsdom.window;
50-
global.document = jsdom.window.document;
51-
global.navigator = jsdom.window.navigator;
52-
global.Node = jsdom.window.Node;
53-
5439
React = require('react');
5540
ReactDOM = require('react-dom');
5641
ReactDOMServer = require('react-dom/server');
@@ -93,7 +78,7 @@ const {
9378
serverRender,
9479
} = ReactDOMServerIntegrationUtils(initModules);
9580

96-
describe('ReactDOMServerHooks', () => {
81+
describe('ReactDOMServerIntegrationHooks', () => {
9782
beforeEach(() => {
9883
resetModules();
9984
});

0 commit comments

Comments
 (0)