Skip to content

Commit 128e936

Browse files
acdliteAndyPengc12
authored andcommitted
Rename "shared subset" to "server" (facebook#27939)
The internal file ReactSharedSubset is what the `react` module resolves to when imported from a Server Component environment. We gave it this name because, originally, the idea was that Server Components can access a subset of the APIs available on the client. However, since then, we've also added APIs that can _only_ by accessed on the server and not the client. In other words, it's no longer a subset, it's a slightly different overlapping set. So this commit renames ReactSharedSubet to ReactServer and updates all the references. This does not affect the public API, only our internal implementation.
1 parent d52f893 commit 128e936

34 files changed

+60
-60
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ let assertLog;
4343
describe('ReactFlight', () => {
4444
beforeEach(() => {
4545
jest.resetModules();
46-
jest.mock('react', () => require('react/react.shared-subset'));
46+
jest.mock('react', () => require('react/react.react-server'));
4747
ReactServer = require('react');
4848
ReactNoopFlightServer = require('react-noop-renderer/flight-server');
4949
// This stores the state so we need to preserve it
@@ -1465,7 +1465,7 @@ describe('ReactFlight', () => {
14651465
// Reset all modules, except flight-modules which keeps the registry of Client Components
14661466
const flightModules = require('react-noop-renderer/flight-modules');
14671467
jest.resetModules();
1468-
jest.mock('react', () => require('react/react.shared-subset'));
1468+
jest.mock('react', () => require('react/react.react-server'));
14691469
jest.mock('react-noop-renderer/flight-modules', () => flightModules);
14701470

14711471
ReactServer = require('react');
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
'use strict';
2+
3+
if (process.env.NODE_ENV === 'production') {
4+
module.exports = require('./cjs/react-dom.react-server.production.min.js');
5+
} else {
6+
module.exports = require('./cjs/react-dom.react-server.development.js');
7+
}

packages/react-dom/npm/react-dom.shared-subset.js

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

packages/react-dom/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
"test-utils.js",
4343
"unstable_testing.js",
4444
"unstable_server-external-runtime.js",
45-
"react-dom.shared-subset.js",
45+
"react-dom.react-server.js",
4646
"cjs/",
4747
"umd/"
4848
],
4949
"exports": {
5050
".": {
51-
"react-server": "./react-dom.shared-subset.js",
51+
"react-server": "./react-dom.react-server.js",
5252
"default": "./index.js"
5353
},
5454
"./client": "./client.js",

packages/react-dom/src/__tests__/ReactDOMInReactServer-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
describe('ReactDOMInReactServer', () => {
1313
beforeEach(() => {
1414
jest.resetModules();
15-
jest.mock('react', () => require('react/react.shared-subset'));
15+
jest.mock('react', () => require('react/react.react-server'));
1616
});
1717

1818
it('can require react-dom', () => {

packages/react-server-dom-fb/src/__tests__/ReactFlightDOMServerFB-test.internal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ describe('ReactFlightDOM for FB', () => {
7373
// condition
7474
jest.resetModules();
7575

76-
jest.mock('react', () => require('react/src/ReactSharedSubsetFB'));
76+
jest.mock('react', () => require('react/src/ReactServerFB'));
7777

7878
jest.mock('shared/ReactFeatureFlags', () => {
7979
jest.mock(

packages/react-server-dom-turbopack/src/__tests__/ReactFlightTurbopackDOM-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('ReactFlightDOM', () => {
4141
jest.mock('react-server-dom-turbopack/server', () =>
4242
require('react-server-dom-turbopack/server.node.unbundled'),
4343
);
44-
jest.mock('react', () => require('react/react.shared-subset'));
44+
jest.mock('react', () => require('react/react.react-server'));
4545

4646
const TurbopackMock = require('./utils/TurbopackMock');
4747
clientExports = TurbopackMock.clientExports;

packages/react-server-dom-turbopack/src/__tests__/ReactFlightTurbopackDOMBrowser-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('ReactFlightDOMBrowser', () => {
2424
jest.resetModules();
2525

2626
// Simulate the condition resolution
27-
jest.mock('react', () => require('react/react.shared-subset'));
27+
jest.mock('react', () => require('react/react.react-server'));
2828
jest.mock('react-server-dom-turbopack/server', () =>
2929
require('react-server-dom-turbopack/server.browser'),
3030
);

packages/react-server-dom-turbopack/src/__tests__/ReactFlightTurbopackDOMEdge-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe('ReactFlightDOMEdge', () => {
3333
jest.resetModules();
3434

3535
// Simulate the condition resolution
36-
jest.mock('react', () => require('react/react.shared-subset'));
36+
jest.mock('react', () => require('react/react.react-server'));
3737
jest.mock('react-server-dom-turbopack/server', () =>
3838
require('react-server-dom-turbopack/server.edge'),
3939
);

0 commit comments

Comments
 (0)