Rename "shared subset" to "server" (#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.
This commit is contained in:
Andrew Clark authored and GitHub committed 2024-01-16 19:58:11 -05:00
1 parent 60a927d04a
commit 5d1b15a4f0
34 files changed
+60 -60

No files matched your search

+2 -2
View File
@@ -43,7 +43,7 @@ let assertLog;
describe('ReactFlight', () => {
beforeEach(() => {
jest.resetModules();
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
ReactServer = require('react');
ReactNoopFlightServer = require('react-noop-renderer/flight-server');
// This stores the state so we need to preserve it
@@ -1465,7 +1465,7 @@ describe('ReactFlight', () => {
// Reset all modules, except flight-modules which keeps the registry of Client Components
const flightModules = require('react-noop-renderer/flight-modules');
jest.resetModules();
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-noop-renderer/flight-modules', () => flightModules);
ReactServer = require('react');
@@ -0,0 +1,7 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-dom.react-server.production.min.js');
} else {
module.exports = require('./cjs/react-dom.react-server.development.js');
}
@@ -1,7 +0,0 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-dom.shared-subset.production.min.js');
} else {
module.exports = require('./cjs/react-dom.shared-subset.development.js');
}
+2 -2
View File
@@ -42,13 +42,13 @@
"test-utils.js",
"unstable_testing.js",
"unstable_server-external-runtime.js",
"react-dom.shared-subset.js",
"react-dom.react-server.js",
"cjs/",
"umd/"
],
"exports": {
".": {
"react-server": "./react-dom.shared-subset.js",
"react-server": "./react-dom.react-server.js",
"default": "./index.js"
},
"./client": "./client.js",
File renamed without changes.
@@ -12,7 +12,7 @@
describe('ReactDOMInReactServer', () => {
beforeEach(() => {
jest.resetModules();
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
});
it('can require react-dom', () => {
@@ -73,7 +73,7 @@ describe('ReactFlightDOM for FB', () => {
// condition
jest.resetModules();
jest.mock('react', () => require('react/src/ReactSharedSubsetFB'));
jest.mock('react', () => require('react/src/ReactServerFB'));
jest.mock('shared/ReactFeatureFlags', () => {
jest.mock(
@@ -41,7 +41,7 @@ describe('ReactFlightDOM', () => {
jest.mock('react-server-dom-turbopack/server', () =>
require('react-server-dom-turbopack/server.node.unbundled'),
);
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
const TurbopackMock = require('./utils/TurbopackMock');
clientExports = TurbopackMock.clientExports;
@@ -24,7 +24,7 @@ describe('ReactFlightDOMBrowser', () => {
jest.resetModules();
// Simulate the condition resolution
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-turbopack/server', () =>
require('react-server-dom-turbopack/server.browser'),
);
@@ -33,7 +33,7 @@ describe('ReactFlightDOMEdge', () => {
jest.resetModules();
// Simulate the condition resolution
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-turbopack/server', () =>
require('react-server-dom-turbopack/server.edge'),
);
@@ -33,7 +33,7 @@ describe('ReactFlightDOMForm', () => {
beforeEach(() => {
jest.resetModules();
// Simulate the condition resolution
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-turbopack/server', () =>
require('react-server-dom-turbopack/server.edge'),
);
@@ -29,7 +29,7 @@ describe('ReactFlightDOMNode', () => {
jest.resetModules();
// Simulate the condition resolution
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-turbopack/server', () =>
require('react-server-dom-turbopack/server.node'),
);
@@ -24,7 +24,7 @@ describe('ReactFlightDOMReply', () => {
beforeEach(() => {
jest.resetModules();
// Simulate the condition resolution
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-turbopack/server', () =>
require('react-server-dom-turbopack/server.browser'),
);
@@ -24,7 +24,7 @@ describe('ReactFlightDOMReply', () => {
beforeEach(() => {
jest.resetModules();
// Simulate the condition resolution
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-turbopack/server', () =>
require('react-server-dom-turbopack/server.edge'),
);
@@ -50,7 +50,7 @@ describe('ReactFlightDOM', () => {
jest.mock('react-server-dom-webpack/server', () =>
require('react-server-dom-webpack/server.node.unbundled'),
);
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
const WebpackMock = require('./utils/WebpackMock');
clientExports = WebpackMock.clientExports;
@@ -36,7 +36,7 @@ describe('ReactFlightDOMBrowser', () => {
jest.resetModules();
// Simulate the condition resolution
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-webpack/server', () =>
require('react-server-dom-webpack/server.browser'),
);
@@ -34,7 +34,7 @@ describe('ReactFlightDOMEdge', () => {
jest.resetModules();
// Simulate the condition resolution
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-webpack/server', () =>
require('react-server-dom-webpack/server.edge'),
);
@@ -38,7 +38,7 @@ describe('ReactFlightDOMForm', () => {
beforeEach(() => {
jest.resetModules();
// Simulate the condition resolution
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-webpack/server', () =>
require('react-server-dom-webpack/server.edge'),
);
@@ -29,7 +29,7 @@ describe('ReactFlightDOMNode', () => {
jest.resetModules();
// Simulate the condition resolution
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-webpack/server', () =>
require('react-server-dom-webpack/server.node'),
);
@@ -24,7 +24,7 @@ describe('ReactFlightDOMReply', () => {
beforeEach(() => {
jest.resetModules();
// Simulate the condition resolution
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-webpack/server', () =>
require('react-server-dom-webpack/server.browser'),
);
@@ -24,7 +24,7 @@ describe('ReactFlightDOMReplyEdge', () => {
beforeEach(() => {
jest.resetModules();
// Simulate the condition resolution
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-webpack/server', () =>
require('react-server-dom-webpack/server.edge'),
);
+7
View File
@@ -0,0 +1,7 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react.react-server.production.min.js');
} else {
module.exports = require('./cjs/react.react-server.development.js');
}
@@ -1,7 +0,0 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react.shared-subset.production.min.js');
} else {
module.exports = require('./cjs/react.shared-subset.development.js');
}
+2 -2
View File
@@ -16,12 +16,12 @@
"umd/",
"jsx-runtime.js",
"jsx-dev-runtime.js",
"react.shared-subset.js"
"react.react-server.js"
],
"main": "index.js",
"exports": {
".": {
"react-server": "./react.shared-subset.js",
"react-server": "./react.react-server.js",
"default": "./index.js"
},
"./package.json": "./package.json",
@@ -7,4 +7,4 @@
* @flow
*/
export * from './src/ReactSharedSubset';
export * from './src/ReactServer';
File renamed without changes.
@@ -7,5 +7,5 @@
* @flow
*/
export * from './ReactSharedSubset';
export * from './ReactServer';
export {jsx, jsxs, jsxDEV} from './jsx/ReactJSX';
@@ -44,7 +44,7 @@ describe('ReactFetch', () => {
fetchCount = 0;
global.fetch = fetchMock;
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-webpack/server', () =>
require('react-server-dom-webpack/server.browser'),
);
@@ -48,7 +48,7 @@ describe('ReactFetch', () => {
fetchCount = 0;
global.fetch = fetchMock;
jest.mock('react', () => require('react/react.shared-subset'));
jest.mock('react', () => require('react/react.react-server'));
jest.mock('react-server-dom-webpack/server', () =>
require('react-server-dom-webpack/server.edge'),
);
+2 -2
View File
@@ -58,9 +58,9 @@ global.__unmockReact = mockReact;
mockReact();
jest.mock('react/react.shared-subset', () => {
jest.mock('react/react.react-server', () => {
const resolvedEntryPoint = resolveEntryFork(
require.resolve('react/src/ReactSharedSubset'),
require.resolve('react/src/ReactServer'),
global.__WWW__
);
return jest.requireActual(resolvedEntryPoint);
+6 -6
View File
@@ -96,8 +96,8 @@ const bundles = [
{
bundleTypes: [NODE_DEV, NODE_PROD],
moduleType: ISOMORPHIC,
entry: 'react/src/ReactSharedSubset.js',
name: 'react.shared-subset',
entry: 'react/src/ReactServer.js',
name: 'react.react-server',
global: 'React',
minifyWithProdErrorCodes: true,
wrapWithModuleBoundaries: false,
@@ -108,8 +108,8 @@ const bundles = [
{
bundleTypes: __EXPERIMENTAL__ ? [FB_WWW_DEV, FB_WWW_PROD] : [],
moduleType: ISOMORPHIC,
entry: 'react/src/ReactSharedSubsetFB.js',
global: 'ReactSharedSubset',
entry: 'react/src/ReactServerFB.js',
global: 'ReactServer',
minifyWithProdErrorCodes: true,
wrapWithModuleBoundaries: false,
externals: [],
@@ -180,8 +180,8 @@ const bundles = [
{
bundleTypes: [NODE_DEV, NODE_PROD],
moduleType: RENDERER,
entry: 'react-dom/src/ReactDOMSharedSubset.js',
name: 'react-dom.shared-subset',
entry: 'react-dom/src/ReactDOMServer.js',
name: 'react-dom.react-server',
global: 'ReactDOM',
minifyWithProdErrorCodes: false,
wrapWithModuleBoundaries: false,
+3 -3
View File
@@ -64,8 +64,8 @@ const forks = Object.freeze({
return './packages/react/src/ReactSharedInternalsClient.js';
}
if (
entry === 'react/src/ReactSharedSubset.js' ||
entry === 'react/src/ReactSharedSubsetFB.js'
entry === 'react/src/ReactServer.js' ||
entry === 'react/src/ReactServerFB.js'
) {
return './packages/react/src/ReactSharedInternalsServer.js';
}
@@ -93,7 +93,7 @@ const forks = Object.freeze({
if (
entry === 'react-dom' ||
entry === 'react-dom/server-rendering-stub' ||
entry === 'react-dom/src/ReactDOMSharedSubset.js'
entry === 'react-dom/src/ReactDOMServer.js'
) {
return './packages/react-dom/src/ReactDOMSharedInternals.js';
}
+9 -9
View File
@@ -11,7 +11,7 @@ module.exports = [
shortName: 'dom-node',
entryPoints: [
'react-dom',
'react-dom/src/ReactDOMSharedSubset.js',
'react-dom/src/ReactDOMServer.js',
'react-dom/unstable_testing',
'react-dom/src/server/react-dom-server.node.js',
'react-dom/static.node',
@@ -22,7 +22,7 @@ module.exports = [
],
paths: [
'react-dom',
'react-dom/src/ReactDOMSharedSubset.js',
'react-dom/src/ReactDOMServer.js',
'react-dom-bindings',
'react-dom/client',
'react-dom/server',
@@ -190,7 +190,7 @@ module.exports = [
],
paths: [
'react-dom',
'react-dom/src/ReactDOMSharedSubset.js',
'react-dom/src/ReactDOMServer.js',
'react-dom-bindings',
'react-dom/client',
'react-dom/server.browser',
@@ -221,7 +221,7 @@ module.exports = [
entryPoints: ['react-server-dom-esm/client.browser'],
paths: [
'react-dom',
'react-dom/src/ReactDOMSharedSubset.js',
'react-dom/src/ReactDOMServer.js',
'react-dom/client',
'react-dom/server',
'react-dom/server.node',
@@ -280,7 +280,7 @@ module.exports = [
],
paths: [
'react-dom',
'react-dom/src/ReactDOMSharedSubset.js',
'react-dom/src/ReactDOMServer.js',
'react-dom-bindings',
'react-dom/client',
'react-dom/server.edge',
@@ -314,7 +314,7 @@ module.exports = [
],
paths: [
'react-dom',
'react-dom/src/ReactDOMSharedSubset.js',
'react-dom/src/ReactDOMServer.js',
'react-dom-bindings',
'react-dom/client',
'react-dom/server.edge',
@@ -348,7 +348,7 @@ module.exports = [
],
paths: [
'react-dom',
'react-dom/src/ReactDOMSharedSubset.js',
'react-dom/src/ReactDOMServer.js',
'react-dom-bindings',
'react-dom/client',
'react-dom/server',
@@ -383,7 +383,7 @@ module.exports = [
],
paths: [
'react-dom',
'react-dom/src/ReactDOMSharedSubset.js',
'react-dom/src/ReactDOMServer.js',
'react-dom-bindings',
'react-server-dom-webpack',
'react-dom/src/server/ReactDOMLegacyServerImpl.js', // not an entrypoint, but only usable in *Browser and *Node files
@@ -401,7 +401,7 @@ module.exports = [
entryPoints: ['react-server-dom-fb/src/ReactDOMServerFB.js'],
paths: [
'react-dom',
'react-dom/src/ReactDOMSharedSubset.js',
'react-dom/src/ReactDOMServer.js',
'react-dom-bindings',
'react-server-dom-fb/src/ReactDOMServerFB.js',
'shared/ReactDOMSharedInternals',