Skip to content

Commit

Permalink
Rename webpackServerMap to serverManifest in unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
unstubbable committed Mar 13, 2023
1 parent 023a841 commit e13f90d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ global.TextDecoder = require('util').TextDecoder;
let clientExports;
let serverExports;
let clientManifest;
let webpackServerMap;
let serverManifest;
let act;
let React;
let ReactDOMClient;
Expand All @@ -35,7 +35,7 @@ describe('ReactFlightDOMBrowser', () => {
clientExports = WebpackMock.clientExports;
serverExports = WebpackMock.serverExports;
clientManifest = WebpackMock.webpackMap;
webpackServerMap = WebpackMock.webpackServerMap;
serverManifest = WebpackMock.webpackServerMap;
React = require('react');
ReactDOMClient = require('react-dom/client');
ReactServerDOMServer = require('react-server-dom-webpack/server.browser');
Expand Down Expand Up @@ -75,7 +75,7 @@ describe('ReactFlightDOMBrowser', () => {
}

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

async function callServer(actionId, body) {
const fn = requireServerRef(actionId);
const args = await ReactServerDOMServer.decodeReply(body, webpackServerMap);
const args = await ReactServerDOMServer.decodeReply(body, serverManifest);
return fn.apply(null, args);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,15 @@ global.ReadableStream =
global.TextEncoder = require('util').TextEncoder;
global.TextDecoder = require('util').TextDecoder;

// let serverExports;
let webpackServerMap;
let serverManifest;
let ReactServerDOMServer;
let ReactServerDOMClient;

describe('ReactFlightDOMReply', () => {
beforeEach(() => {
jest.resetModules();
const WebpackMock = require('./utils/WebpackMock');
// serverExports = WebpackMock.serverExports;
webpackServerMap = WebpackMock.webpackServerMap;
serverManifest = WebpackMock.webpackServerMap;
ReactServerDOMServer = require('react-server-dom-webpack/server.browser');
ReactServerDOMClient = require('react-server-dom-webpack/client');
});
Expand All @@ -34,7 +32,7 @@ describe('ReactFlightDOMReply', () => {
const body = await ReactServerDOMClient.encodeReply(undefined);
const missing = await ReactServerDOMServer.decodeReply(
body,
webpackServerMap,
serverManifest,
);
expect(missing).toBe(undefined);

Expand All @@ -44,7 +42,7 @@ describe('ReactFlightDOMReply', () => {
});
const object = await ReactServerDOMServer.decodeReply(
body2,
webpackServerMap,
serverManifest,
);
expect(object.array.length).toBe(3);
expect(object.array[0]).toBe(undefined);
Expand All @@ -66,7 +64,7 @@ describe('ReactFlightDOMReply', () => {
});
const iterable = await ReactServerDOMServer.decodeReply(
body,
webpackServerMap,
serverManifest,
);
const items = [];
// eslint-disable-next-line no-for-of-loops/no-for-of-loops
Expand Down

0 comments on commit e13f90d

Please sign in to comment.