Skip to content

Commit 8ff268a

Browse files
committed
Rename webpackServerMap to serverManifest in unit tests
1 parent 87f1f55 commit 8ff268a

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ global.TextDecoder = require('util').TextDecoder;
1818
let clientExports;
1919
let serverExports;
2020
let clientManifest;
21-
let webpackServerMap;
21+
let serverManifest;
2222
let act;
2323
let React;
2424
let ReactDOMClient;
@@ -35,7 +35,7 @@ describe('ReactFlightDOMBrowser', () => {
3535
clientExports = WebpackMock.clientExports;
3636
serverExports = WebpackMock.serverExports;
3737
clientManifest = WebpackMock.webpackMap;
38-
webpackServerMap = WebpackMock.webpackServerMap;
38+
serverManifest = WebpackMock.webpackServerMap;
3939
React = require('react');
4040
ReactDOMClient = require('react-dom/client');
4141
ReactServerDOMServer = require('react-server-dom-webpack/server.browser');
@@ -75,7 +75,7 @@ describe('ReactFlightDOMBrowser', () => {
7575
}
7676

7777
function requireServerRef(ref) {
78-
const metaData = webpackServerMap[ref];
78+
const metaData = serverManifest[ref];
7979
const mod = __webpack_require__(metaData.id);
8080
if (metaData.name === '*') {
8181
return mod;
@@ -85,7 +85,7 @@ describe('ReactFlightDOMBrowser', () => {
8585

8686
async function callServer(actionId, body) {
8787
const fn = requireServerRef(actionId);
88-
const args = await ReactServerDOMServer.decodeReply(body, webpackServerMap);
88+
const args = await ReactServerDOMServer.decodeReply(body, serverManifest);
8989
return fn.apply(null, args);
9090
}
9191

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@ global.ReadableStream =
1515
global.TextEncoder = require('util').TextEncoder;
1616
global.TextDecoder = require('util').TextDecoder;
1717

18-
// let serverExports;
19-
let webpackServerMap;
18+
let serverManifest;
2019
let ReactServerDOMServer;
2120
let ReactServerDOMClient;
2221

2322
describe('ReactFlightDOMReply', () => {
2423
beforeEach(() => {
2524
jest.resetModules();
2625
const WebpackMock = require('./utils/WebpackMock');
27-
// serverExports = WebpackMock.serverExports;
28-
webpackServerMap = WebpackMock.webpackServerMap;
26+
serverManifest = WebpackMock.webpackServerMap;
2927
ReactServerDOMServer = require('react-server-dom-webpack/server.browser');
3028
ReactServerDOMClient = require('react-server-dom-webpack/client');
3129
});
@@ -34,7 +32,7 @@ describe('ReactFlightDOMReply', () => {
3432
const body = await ReactServerDOMClient.encodeReply(undefined);
3533
const missing = await ReactServerDOMServer.decodeReply(
3634
body,
37-
webpackServerMap,
35+
serverManifest,
3836
);
3937
expect(missing).toBe(undefined);
4038

@@ -44,7 +42,7 @@ describe('ReactFlightDOMReply', () => {
4442
});
4543
const object = await ReactServerDOMServer.decodeReply(
4644
body2,
47-
webpackServerMap,
45+
serverManifest,
4846
);
4947
expect(object.array.length).toBe(3);
5048
expect(object.array[0]).toBe(undefined);
@@ -66,7 +64,7 @@ describe('ReactFlightDOMReply', () => {
6664
});
6765
const iterable = await ReactServerDOMServer.decodeReply(
6866
body,
69-
webpackServerMap,
67+
serverManifest,
7068
);
7169
const items = [];
7270
// eslint-disable-next-line no-for-of-loops/no-for-of-loops

0 commit comments

Comments
 (0)