The library for web and native user interfaces.
Mirrored from https://github.com/247TaxiDriver/QOS-React.git
Synced Nov 13, 18:15 UTC
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.
Andrew Clark committed
Jan 16, 2024 at 19:58 UTC
5d1b15a4f06fa93e76cd89f37ea5bfd62cc66183
34 files changed
+60
-60
packages/react-client/src/__tests__/ReactFlight-test.js
+2
-2
@@ -43,7 +43,7 @@ let assertLog;
43
describe('ReactFlight', () => {
44
beforeEach(() => {
45
jest.resetModules();
46
- jest.mock('react', () => require('react/react.shared-subset'));
46
+ jest.mock('react', () => require('react/react.react-server'));
47
ReactServer = require('react');
48
ReactNoopFlightServer = require('react-noop-renderer/flight-server');
49
// This stores the state so we need to preserve it
@@ -1465,7 +1465,7 @@ describe('ReactFlight', () => {
1465
// Reset all modules, except flight-modules which keeps the registry of Client Components
1466
const flightModules = require('react-noop-renderer/flight-modules');
1467
jest.resetModules();
1468
- jest.mock('react', () => require('react/react.shared-subset'));
1468
+ jest.mock('react', () => require('react/react.react-server'));
1469
jest.mock('react-noop-renderer/flight-modules', () => flightModules);
1470
1471
ReactServer = require('react');
packages/react-dom/npm/react-dom.react-server.js
new
+7
@@ -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
deleted
-7
@@ -1,7 +0,0 @@
1
-'use strict';
2
-
3
-if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-dom.shared-subset.production.min.js');
5
-} else {
6
- module.exports = require('./cjs/react-dom.shared-subset.development.js');
7
-}
packages/react-dom/package.json
+2
-2
@@ -42,13 +42,13 @@
42
"test-utils.js",
43
"unstable_testing.js",
44
"unstable_server-external-runtime.js",
45
- "react-dom.shared-subset.js",
45
+ "react-dom.react-server.js",
46
"cjs/",
47
"umd/"
48
],
49
"exports": {
50
".": {
51
- "react-server": "./react-dom.shared-subset.js",
51
+ "react-server": "./react-dom.react-server.js",
52
"default": "./index.js"
53
},
54
"./client": "./client.js",
packages/react-dom/src/ReactDOMServer.js
renamed
packages/react-dom/src/__tests__/ReactDOMInReactServer-test.js
+1
-1
@@ -12,7 +12,7 @@
12
describe('ReactDOMInReactServer', () => {
13
beforeEach(() => {
14
jest.resetModules();
15
- jest.mock('react', () => require('react/react.shared-subset'));
15
+ jest.mock('react', () => require('react/react.react-server'));
16
});
17
18
it('can require react-dom', () => {
packages/react-server-dom-fb/src/__tests__/ReactFlightDOMServerFB-test.internal.js
+1
-1
@@ -73,7 +73,7 @@ describe('ReactFlightDOM for FB', () => {
73
// condition
74
jest.resetModules();
75
76
- jest.mock('react', () => require('react/src/ReactSharedSubsetFB'));
76
+ jest.mock('react', () => require('react/src/ReactServerFB'));
77
78
jest.mock('shared/ReactFeatureFlags', () => {
79
jest.mock(
packages/react-server-dom-turbopack/src/__tests__/ReactFlightTurbopackDOM-test.js
+1
-1
@@ -41,7 +41,7 @@ describe('ReactFlightDOM', () => {
41
jest.mock('react-server-dom-turbopack/server', () =>
42
require('react-server-dom-turbopack/server.node.unbundled'),
43
);
44
- jest.mock('react', () => require('react/react.shared-subset'));
44
+ jest.mock('react', () => require('react/react.react-server'));
45
46
const TurbopackMock = require('./utils/TurbopackMock');
47
clientExports = TurbopackMock.clientExports;
packages/react-server-dom-turbopack/src/__tests__/ReactFlightTurbopackDOMBrowser-test.js
+1
-1
@@ -24,7 +24,7 @@ describe('ReactFlightDOMBrowser', () => {
24
jest.resetModules();
25
26
// Simulate the condition resolution
27
- jest.mock('react', () => require('react/react.shared-subset'));
27
+ jest.mock('react', () => require('react/react.react-server'));
28
jest.mock('react-server-dom-turbopack/server', () =>
29
require('react-server-dom-turbopack/server.browser'),
30
);
packages/react-server-dom-turbopack/src/__tests__/ReactFlightTurbopackDOMEdge-test.js
+1
-1
@@ -33,7 +33,7 @@ describe('ReactFlightDOMEdge', () => {
33
jest.resetModules();
34
35
// Simulate the condition resolution
36
- jest.mock('react', () => require('react/react.shared-subset'));
36
+ jest.mock('react', () => require('react/react.react-server'));
37
jest.mock('react-server-dom-turbopack/server', () =>
38
require('react-server-dom-turbopack/server.edge'),
39
);
packages/react-server-dom-turbopack/src/__tests__/ReactFlightTurbopackDOMForm-test.js
+1
-1
@@ -33,7 +33,7 @@ describe('ReactFlightDOMForm', () => {
33
beforeEach(() => {
34
jest.resetModules();
35
// Simulate the condition resolution
36
- jest.mock('react', () => require('react/react.shared-subset'));
36
+ jest.mock('react', () => require('react/react.react-server'));
37
jest.mock('react-server-dom-turbopack/server', () =>
38
require('react-server-dom-turbopack/server.edge'),
39
);
packages/react-server-dom-turbopack/src/__tests__/ReactFlightTurbopackDOMNode-test.js
+1
-1
@@ -29,7 +29,7 @@ describe('ReactFlightDOMNode', () => {
29
jest.resetModules();
30
31
// Simulate the condition resolution
32
- jest.mock('react', () => require('react/react.shared-subset'));
32
+ jest.mock('react', () => require('react/react.react-server'));
33
jest.mock('react-server-dom-turbopack/server', () =>
34
require('react-server-dom-turbopack/server.node'),
35
);
packages/react-server-dom-turbopack/src/__tests__/ReactFlightTurbopackDOMReply-test.js
+1
-1
@@ -24,7 +24,7 @@ describe('ReactFlightDOMReply', () => {
24
beforeEach(() => {
25
jest.resetModules();
26
// Simulate the condition resolution
27
- jest.mock('react', () => require('react/react.shared-subset'));
27
+ jest.mock('react', () => require('react/react.react-server'));
28
jest.mock('react-server-dom-turbopack/server', () =>
29
require('react-server-dom-turbopack/server.browser'),
30
);
packages/react-server-dom-turbopack/src/__tests__/ReactFlightTurbopackDOMReplyEdge-test.js
+1
-1
@@ -24,7 +24,7 @@ describe('ReactFlightDOMReply', () => {
24
beforeEach(() => {
25
jest.resetModules();
26
// Simulate the condition resolution
27
- jest.mock('react', () => require('react/react.shared-subset'));
27
+ jest.mock('react', () => require('react/react.react-server'));
28
jest.mock('react-server-dom-turbopack/server', () =>
29
require('react-server-dom-turbopack/server.edge'),
30
);
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
+1
-1
@@ -50,7 +50,7 @@ describe('ReactFlightDOM', () => {
50
jest.mock('react-server-dom-webpack/server', () =>
51
require('react-server-dom-webpack/server.node.unbundled'),
52
);
53
- jest.mock('react', () => require('react/react.shared-subset'));
53
+ jest.mock('react', () => require('react/react.react-server'));
54
55
const WebpackMock = require('./utils/WebpackMock');
56
clientExports = WebpackMock.clientExports;
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
+1
-1
@@ -36,7 +36,7 @@ describe('ReactFlightDOMBrowser', () => {
36
jest.resetModules();
37
38
// Simulate the condition resolution
39
- jest.mock('react', () => require('react/react.shared-subset'));
39
+ jest.mock('react', () => require('react/react.react-server'));
40
jest.mock('react-server-dom-webpack/server', () =>
41
require('react-server-dom-webpack/server.browser'),
42
);
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js
+1
-1
@@ -34,7 +34,7 @@ describe('ReactFlightDOMEdge', () => {
34
jest.resetModules();
35
36
// Simulate the condition resolution
37
- jest.mock('react', () => require('react/react.shared-subset'));
37
+ jest.mock('react', () => require('react/react.react-server'));
38
jest.mock('react-server-dom-webpack/server', () =>
39
require('react-server-dom-webpack/server.edge'),
40
);
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMForm-test.js
+1
-1
@@ -38,7 +38,7 @@ describe('ReactFlightDOMForm', () => {
38
beforeEach(() => {
39
jest.resetModules();
40
// Simulate the condition resolution
41
- jest.mock('react', () => require('react/react.shared-subset'));
41
+ jest.mock('react', () => require('react/react.react-server'));
42
jest.mock('react-server-dom-webpack/server', () =>
43
require('react-server-dom-webpack/server.edge'),
44
);
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js
+1
-1
@@ -29,7 +29,7 @@ describe('ReactFlightDOMNode', () => {
29
jest.resetModules();
30
31
// Simulate the condition resolution
32
- jest.mock('react', () => require('react/react.shared-subset'));
32
+ jest.mock('react', () => require('react/react.react-server'));
33
jest.mock('react-server-dom-webpack/server', () =>
34
require('react-server-dom-webpack/server.node'),
35
);
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMReply-test.js
+1
-1
@@ -24,7 +24,7 @@ describe('ReactFlightDOMReply', () => {
24
beforeEach(() => {
25
jest.resetModules();
26
// Simulate the condition resolution
27
- jest.mock('react', () => require('react/react.shared-subset'));
27
+ jest.mock('react', () => require('react/react.react-server'));
28
jest.mock('react-server-dom-webpack/server', () =>
29
require('react-server-dom-webpack/server.browser'),
30
);
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMReplyEdge-test.js
+1
-1
@@ -24,7 +24,7 @@ describe('ReactFlightDOMReplyEdge', () => {
24
beforeEach(() => {
25
jest.resetModules();
26
// Simulate the condition resolution
27
- jest.mock('react', () => require('react/react.shared-subset'));
27
+ jest.mock('react', () => require('react/react.react-server'));
28
jest.mock('react-server-dom-webpack/server', () =>
29
require('react-server-dom-webpack/server.edge'),
30
);
packages/react/npm/react.react-server.js
new
+7
@@ -0,0 +1,7 @@
1
+'use strict';
2
+
3
+if (process.env.NODE_ENV === 'production') {
4
+ module.exports = require('./cjs/react.react-server.production.min.js');
5
+} else {
6
+ module.exports = require('./cjs/react.react-server.development.js');
7
+}
packages/react/npm/react.shared-subset.js
deleted
-7
@@ -1,7 +0,0 @@
1
-'use strict';
2
-
3
-if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react.shared-subset.production.min.js');
5
-} else {
6
- module.exports = require('./cjs/react.shared-subset.development.js');
7
-}
packages/react/package.json
+2
-2
@@ -16,12 +16,12 @@
16
"umd/",
17
"jsx-runtime.js",
18
"jsx-dev-runtime.js",
19
- "react.shared-subset.js"
19
+ "react.react-server.js"
20
],
21
"main": "index.js",
22
"exports": {
23
".": {
24
- "react-server": "./react.shared-subset.js",
24
+ "react-server": "./react.react-server.js",
25
"default": "./index.js"
26
},
27
"./package.json": "./package.json",
packages/react/react.react-server.js
renamed
+1
-1
@@ -7,4 +7,4 @@
7
* @flow
8
*/
9
10
-export * from './src/ReactSharedSubset';
10
+export * from './src/ReactServer';
packages/react/src/ReactServer.experimental.js
renamed
packages/react/src/ReactServer.js
renamed
packages/react/src/ReactServerFB.js
renamed
+1
-1
@@ -7,5 +7,5 @@
7
* @flow
8
*/
9
10
-export * from './ReactSharedSubset';
10
+export * from './ReactServer';
11
export {jsx, jsxs, jsxDEV} from './jsx/ReactJSX';
packages/react/src/__tests__/ReactFetch-test.js
+1
-1
@@ -44,7 +44,7 @@ describe('ReactFetch', () => {
44
fetchCount = 0;
45
global.fetch = fetchMock;
46
47
- jest.mock('react', () => require('react/react.shared-subset'));
47
+ jest.mock('react', () => require('react/react.react-server'));
48
jest.mock('react-server-dom-webpack/server', () =>
49
require('react-server-dom-webpack/server.browser'),
50
);
packages/react/src/__tests__/ReactFetchEdge-test.js
+1
-1
@@ -48,7 +48,7 @@ describe('ReactFetch', () => {
48
fetchCount = 0;
49
global.fetch = fetchMock;
50
51
- jest.mock('react', () => require('react/react.shared-subset'));
51
+ jest.mock('react', () => require('react/react.react-server'));
52
jest.mock('react-server-dom-webpack/server', () =>
53
require('react-server-dom-webpack/server.edge'),
54
);
scripts/jest/setupHostConfigs.js
+2
-2
@@ -58,9 +58,9 @@ global.__unmockReact = mockReact;
58
59
mockReact();
60
61
-jest.mock('react/react.shared-subset', () => {
61
+jest.mock('react/react.react-server', () => {
62
const resolvedEntryPoint = resolveEntryFork(
63
- require.resolve('react/src/ReactSharedSubset'),
63
+ require.resolve('react/src/ReactServer'),
64
global.__WWW__
65
);
66
return jest.requireActual(resolvedEntryPoint);
scripts/rollup/bundles.js
+6
-6
@@ -96,8 +96,8 @@ const bundles = [
96
{
97
bundleTypes: [NODE_DEV, NODE_PROD],
98
moduleType: ISOMORPHIC,
99
- entry: 'react/src/ReactSharedSubset.js',
100
- name: 'react.shared-subset',
99
+ entry: 'react/src/ReactServer.js',
100
+ name: 'react.react-server',
101
global: 'React',
102
minifyWithProdErrorCodes: true,
103
wrapWithModuleBoundaries: false,
@@ -108,8 +108,8 @@ const bundles = [
108
{
109
bundleTypes: __EXPERIMENTAL__ ? [FB_WWW_DEV, FB_WWW_PROD] : [],
110
moduleType: ISOMORPHIC,
111
- entry: 'react/src/ReactSharedSubsetFB.js',
112
- global: 'ReactSharedSubset',
111
+ entry: 'react/src/ReactServerFB.js',
112
+ global: 'ReactServer',
113
minifyWithProdErrorCodes: true,
114
wrapWithModuleBoundaries: false,
115
externals: [],
@@ -180,8 +180,8 @@ const bundles = [
180
{
181
bundleTypes: [NODE_DEV, NODE_PROD],
182
moduleType: RENDERER,
183
- entry: 'react-dom/src/ReactDOMSharedSubset.js',
184
- name: 'react-dom.shared-subset',
183
+ entry: 'react-dom/src/ReactDOMServer.js',
184
+ name: 'react-dom.react-server',
185
global: 'ReactDOM',
186
minifyWithProdErrorCodes: false,
187
wrapWithModuleBoundaries: false,
scripts/rollup/forks.js
+3
-3
@@ -64,8 +64,8 @@ const forks = Object.freeze({
64
return './packages/react/src/ReactSharedInternalsClient.js';
65
}
66
if (
67
- entry === 'react/src/ReactSharedSubset.js' ||
68
- entry === 'react/src/ReactSharedSubsetFB.js'
67
+ entry === 'react/src/ReactServer.js' ||
68
+ entry === 'react/src/ReactServerFB.js'
69
) {
70
return './packages/react/src/ReactSharedInternalsServer.js';
71
}
@@ -93,7 +93,7 @@ const forks = Object.freeze({
93
if (
94
entry === 'react-dom' ||
95
entry === 'react-dom/server-rendering-stub' ||
96
- entry === 'react-dom/src/ReactDOMSharedSubset.js'
96
+ entry === 'react-dom/src/ReactDOMServer.js'
97
) {
98
return './packages/react-dom/src/ReactDOMSharedInternals.js';
99
}
scripts/shared/inlinedHostConfigs.js
+9
-9
@@ -11,7 +11,7 @@ module.exports = [
11
shortName: 'dom-node',
12
entryPoints: [
13
'react-dom',
14
- 'react-dom/src/ReactDOMSharedSubset.js',
14
+ 'react-dom/src/ReactDOMServer.js',
15
'react-dom/unstable_testing',
16
'react-dom/src/server/react-dom-server.node.js',
17
'react-dom/static.node',
@@ -22,7 +22,7 @@ module.exports = [
22
],
23
paths: [
24
'react-dom',
25
- 'react-dom/src/ReactDOMSharedSubset.js',
25
+ 'react-dom/src/ReactDOMServer.js',
26
'react-dom-bindings',
27
'react-dom/client',
28
'react-dom/server',
@@ -190,7 +190,7 @@ module.exports = [
190
],
191
paths: [
192
'react-dom',
193
- 'react-dom/src/ReactDOMSharedSubset.js',
193
+ 'react-dom/src/ReactDOMServer.js',
194
'react-dom-bindings',
195
'react-dom/client',
196
'react-dom/server.browser',
@@ -221,7 +221,7 @@ module.exports = [
221
entryPoints: ['react-server-dom-esm/client.browser'],
222
paths: [
223
'react-dom',
224
- 'react-dom/src/ReactDOMSharedSubset.js',
224
+ 'react-dom/src/ReactDOMServer.js',
225
'react-dom/client',
226
'react-dom/server',
227
'react-dom/server.node',
@@ -280,7 +280,7 @@ module.exports = [
280
],
281
paths: [
282
'react-dom',
283
- 'react-dom/src/ReactDOMSharedSubset.js',
283
+ 'react-dom/src/ReactDOMServer.js',
284
'react-dom-bindings',
285
'react-dom/client',
286
'react-dom/server.edge',
@@ -314,7 +314,7 @@ module.exports = [
314
],
315
paths: [
316
'react-dom',
317
- 'react-dom/src/ReactDOMSharedSubset.js',
317
+ 'react-dom/src/ReactDOMServer.js',
318
'react-dom-bindings',
319
'react-dom/client',
320
'react-dom/server.edge',
@@ -348,7 +348,7 @@ module.exports = [
348
],
349
paths: [
350
'react-dom',
351
- 'react-dom/src/ReactDOMSharedSubset.js',
351
+ 'react-dom/src/ReactDOMServer.js',
352
'react-dom-bindings',
353
'react-dom/client',
354
'react-dom/server',
@@ -383,7 +383,7 @@ module.exports = [
383
],
384
paths: [
385
'react-dom',
386
- 'react-dom/src/ReactDOMSharedSubset.js',
386
+ 'react-dom/src/ReactDOMServer.js',
387
'react-dom-bindings',
388
'react-server-dom-webpack',
389
'react-dom/src/server/ReactDOMLegacyServerImpl.js', // not an entrypoint, but only usable in *Browser and *Node files
@@ -401,7 +401,7 @@ module.exports = [
401
entryPoints: ['react-server-dom-fb/src/ReactDOMServerFB.js'],
402
paths: [
403
'react-dom',
404
- 'react-dom/src/ReactDOMSharedSubset.js',
404
+ 'react-dom/src/ReactDOMServer.js',
405
'react-dom-bindings',
406
'react-server-dom-fb/src/ReactDOMServerFB.js',
407
'shared/ReactDOMSharedInternals',