{"commit":{"shortRevision":"46a6d77e32","authorName":"Timothy Yung","authoredAt":"2022-05-06T11:24:04-07:00","revision":"46a6d77e32d00c8c71ab989ca88b1c51aad07cdd","authorEmail":"yungsters@fb.com","subject":"Unify JSResourceReference Interfaces (#24507)"},"body":"","files":[{"status":"M","path":"packages\/react-server-dom-relay\/src\/ReactFlightDOMRelayClientHostConfig.js"},{"status":"M","path":"packages\/react-server-dom-relay\/src\/ReactFlightDOMRelayServerHostConfig.js"},{"status":"R066","path":"packages\/react-server-dom-relay\/src\/__mocks__\/JSResourceReferenceImpl.js","previousPath":"packages\/react-server-dom-relay\/src\/__mocks__\/JSResourceReference.js"},{"status":"M","path":"packages\/react-server-dom-relay\/src\/__mocks__\/ReactFlightDOMRelayClientIntegration.js"},{"status":"M","path":"packages\/react-server-dom-relay\/src\/__tests__\/ReactFlightDOMRelay-test.internal.js"},{"status":"M","path":"packages\/react-server-native-relay\/src\/ReactFlightNativeRelayClientHostConfig.js"},{"status":"M","path":"packages\/react-server-native-relay\/src\/ReactFlightNativeRelayServerHostConfig.js"},{"status":"M","path":"packages\/react-server-native-relay\/src\/__mocks__\/JSResourceReferenceImpl.js"},{"status":"M","path":"packages\/react-server-native-relay\/src\/__mocks__\/ReactFlightNativeRelayClientIntegration.js"},{"status":"M","path":"scripts\/flow\/react-relay-hooks.js"},{"status":"M","path":"scripts\/rollup\/bundles.js"},{"status":"M","path":"yarn.lock"}],"patch":"diff --git a\/packages\/react-server-dom-relay\/src\/ReactFlightDOMRelayClientHostConfig.js b\/packages\/react-server-dom-relay\/src\/ReactFlightDOMRelayClientHostConfig.js\nindex 35203ee92c..30718865cc 100644\n--- a\/packages\/react-server-dom-relay\/src\/ReactFlightDOMRelayClientHostConfig.js\n+++ b\/packages\/react-server-dom-relay\/src\/ReactFlightDOMRelayClientHostConfig.js\n@@ -9,7 +9,7 @@\n \n import type {JSONValue, ResponseBase} from 'react-client\/src\/ReactFlightClient';\n \n-import type JSResourceReference from 'JSResourceReference';\n+import type {JSResourceReference} from 'JSResourceReference';\n \n export type ModuleReference = JSResourceReference;\n \ndiff --git a\/packages\/react-server-dom-relay\/src\/ReactFlightDOMRelayServerHostConfig.js b\/packages\/react-server-dom-relay\/src\/ReactFlightDOMRelayServerHostConfig.js\nindex a29a6449d8..8fcd823204 100644\n--- a\/packages\/react-server-dom-relay\/src\/ReactFlightDOMRelayServerHostConfig.js\n+++ b\/packages\/react-server-dom-relay\/src\/ReactFlightDOMRelayServerHostConfig.js\n@@ -11,7 +11,8 @@ import type {RowEncoding, JSONValue} from '.\/ReactFlightDOMRelayProtocol';\n \n import type {Request, ReactModel} from 'react-server\/src\/ReactFlightServer';\n \n-import JSResourceReference from 'JSResourceReference';\n+import type {JSResourceReference} from 'JSResourceReference';\n+import JSResourceReferenceImpl from 'JSResourceReferenceImpl';\n \n import hasOwnProperty from 'shared\/hasOwnProperty';\n import isArray from 'shared\/isArray';\n@@ -39,7 +40,7 @@ export type {\n } from 'ReactFlightDOMRelayServerIntegration';\n \n export function isModuleReference(reference: Object): boolean {\n- return reference instanceof JSResourceReference;\n+ return reference instanceof JSResourceReferenceImpl;\n }\n \n export type ModuleKey = ModuleReference;\ndiff --git a\/packages\/react-server-dom-relay\/src\/__mocks__\/JSResourceReference.js b\/packages\/react-server-dom-relay\/src\/__mocks__\/JSResourceReferenceImpl.js\nsimilarity index 66%\nrename from packages\/react-server-dom-relay\/src\/__mocks__\/JSResourceReference.js\nrename to packages\/react-server-dom-relay\/src\/__mocks__\/JSResourceReferenceImpl.js\nindex 18dab0739c..2891385ae9 100644\n--- a\/packages\/react-server-dom-relay\/src\/__mocks__\/JSResourceReference.js\n+++ b\/packages\/react-server-dom-relay\/src\/__mocks__\/JSResourceReferenceImpl.js\n@@ -7,13 +7,13 @@\n \n 'use strict';\n \n-class JSResourceReference {\n- constructor(exportedValue) {\n- this._moduleId = exportedValue;\n+class JSResourceReferenceImpl {\n+ constructor(moduleId) {\n+ this._moduleId = moduleId;\n }\n getModuleId() {\n return this._moduleId;\n }\n }\n \n-module.exports = JSResourceReference;\n+module.exports = JSResourceReferenceImpl;\ndiff --git a\/packages\/react-server-dom-relay\/src\/__mocks__\/ReactFlightDOMRelayClientIntegration.js b\/packages\/react-server-dom-relay\/src\/__mocks__\/ReactFlightDOMRelayClientIntegration.js\nindex 25403877da..4d89b5a2b8 100644\n--- a\/packages\/react-server-dom-relay\/src\/__mocks__\/ReactFlightDOMRelayClientIntegration.js\n+++ b\/packages\/react-server-dom-relay\/src\/__mocks__\/ReactFlightDOMRelayClientIntegration.js\n@@ -7,11 +7,11 @@\n \n 'use strict';\n \n-import JSResourceReference from 'JSResourceReference';\n+import JSResourceReferenceImpl from 'JSResourceReferenceImpl';\n \n const ReactFlightDOMRelayClientIntegration = {\n resolveModuleReference(moduleData) {\n- return new JSResourceReference(moduleData);\n+ return new JSResourceReferenceImpl(moduleData);\n },\n preloadModule(moduleReference) {},\n requireModule(moduleReference) {\ndiff --git a\/packages\/react-server-dom-relay\/src\/__tests__\/ReactFlightDOMRelay-test.internal.js b\/packages\/react-server-dom-relay\/src\/__tests__\/ReactFlightDOMRelay-test.internal.js\nindex dc981b9bd5..daf01d5d69 100644\n--- a\/packages\/react-server-dom-relay\/src\/__tests__\/ReactFlightDOMRelay-test.internal.js\n+++ b\/packages\/react-server-dom-relay\/src\/__tests__\/ReactFlightDOMRelay-test.internal.js\n@@ -10,7 +10,7 @@\n let act;\n let React;\n let ReactDOMClient;\n-let JSResourceReference;\n+let JSResourceReferenceImpl;\n let ReactDOMFlightRelayServer;\n let ReactDOMFlightRelayClient;\n let SuspenseList;\n@@ -24,7 +24,7 @@ describe('ReactFlightDOMRelay', () => {\n ReactDOMClient = require('react-dom\/client');\n ReactDOMFlightRelayServer = require('react-server-dom-relay\/server');\n ReactDOMFlightRelayClient = require('react-server-dom-relay');\n- JSResourceReference = require('JSResourceReference');\n+ JSResourceReferenceImpl = require('JSResourceReferenceImpl');\n if (gate(flags => flags.enableSuspenseList)) {\n SuspenseList = React.SuspenseList;\n }\n@@ -84,7 +84,7 @@ describe('ReactFlightDOMRelay', () => {\n <\/span>\n );\n }\n- const User = new JSResourceReference(UserClient);\n+ const User = new JSResourceReferenceImpl(UserClient);\n \n function Greeting({firstName, lastName}) {\n return ;\ndiff --git a\/packages\/react-server-native-relay\/src\/ReactFlightNativeRelayClientHostConfig.js b\/packages\/react-server-native-relay\/src\/ReactFlightNativeRelayClientHostConfig.js\nindex d8e27657b2..eb6f0080e3 100644\n--- a\/packages\/react-server-native-relay\/src\/ReactFlightNativeRelayClientHostConfig.js\n+++ b\/packages\/react-server-native-relay\/src\/ReactFlightNativeRelayClientHostConfig.js\n@@ -9,7 +9,7 @@\n \n import type {JSONValue, ResponseBase} from 'react-client\/src\/ReactFlightClient';\n \n-import type JSResourceReference from 'JSResourceReference';\n+import type {JSResourceReference} from 'JSResourceReference';\n \n export type ModuleReference = JSResourceReference;\n \ndiff --git a\/packages\/react-server-native-relay\/src\/ReactFlightNativeRelayServerHostConfig.js b\/packages\/react-server-native-relay\/src\/ReactFlightNativeRelayServerHostConfig.js\nindex b07c084eaa..c139769fe4 100644\n--- a\/packages\/react-server-native-relay\/src\/ReactFlightNativeRelayServerHostConfig.js\n+++ b\/packages\/react-server-native-relay\/src\/ReactFlightNativeRelayServerHostConfig.js\n@@ -11,9 +11,10 @@ import type {RowEncoding, JSONValue} from '.\/ReactFlightNativeRelayProtocol';\n import type {Request, ReactModel} from 'react-server\/src\/ReactFlightServer';\n import hasOwnProperty from 'shared\/hasOwnProperty';\n import isArray from 'shared\/isArray';\n+import type {JSResourceReference} from 'JSResourceReference';\n import JSResourceReferenceImpl from 'JSResourceReferenceImpl';\n \n-export type ModuleReference = JSResourceReferenceImpl;\n+export type ModuleReference = JSResourceReference;\n \n import type {\n Destination,\ndiff --git a\/packages\/react-server-native-relay\/src\/__mocks__\/JSResourceReferenceImpl.js b\/packages\/react-server-native-relay\/src\/__mocks__\/JSResourceReferenceImpl.js\nindex 8fc06aca7a..2891385ae9 100644\n--- a\/packages\/react-server-native-relay\/src\/__mocks__\/JSResourceReferenceImpl.js\n+++ b\/packages\/react-server-native-relay\/src\/__mocks__\/JSResourceReferenceImpl.js\n@@ -8,8 +8,8 @@\n 'use strict';\n \n class JSResourceReferenceImpl {\n- constructor(exportedValue) {\n- this._moduleId = exportedValue;\n+ constructor(moduleId) {\n+ this._moduleId = moduleId;\n }\n getModuleId() {\n return this._moduleId;\ndiff --git a\/packages\/react-server-native-relay\/src\/__mocks__\/ReactFlightNativeRelayClientIntegration.js b\/packages\/react-server-native-relay\/src\/__mocks__\/ReactFlightNativeRelayClientIntegration.js\nindex ea8f508ea2..64cc55bc22 100644\n--- a\/packages\/react-server-native-relay\/src\/__mocks__\/ReactFlightNativeRelayClientIntegration.js\n+++ b\/packages\/react-server-native-relay\/src\/__mocks__\/ReactFlightNativeRelayClientIntegration.js\n@@ -7,11 +7,11 @@\n \n 'use strict';\n \n-import JSResourceReference from 'JSResourceReference';\n+import JSResourceReferenceImpl from 'JSResourceReferenceImpl';\n \n const ReactFlightNativeRelayClientIntegration = {\n resolveModuleReference(moduleData) {\n- return new JSResourceReference(moduleData);\n+ return new JSResourceReferenceImpl(moduleData);\n },\n preloadModule(moduleReference) {},\n requireModule(moduleReference) {\ndiff --git a\/scripts\/flow\/react-relay-hooks.js b\/scripts\/flow\/react-relay-hooks.js\nindex 73eb20ef41..9f45268997 100644\n--- a\/scripts\/flow\/react-relay-hooks.js\n+++ b\/scripts\/flow\/react-relay-hooks.js\n@@ -15,24 +15,29 @@ type JSONValue =\n | {+[key: string]: JSONValue}\n | $ReadOnlyArray;\n \n-declare class JSResourceReference {\n- _moduleId: T;\n- getModuleId(): string;\n-}\n-\n-\/\/ Haste\n declare module 'JSResourceReference' {\n- declare export default typeof JSResourceReference;\n+ declare export interface JSResourceReference {\n+ getModuleId(): string;\n+ getModuleIdAsRef(): $Flow$ModuleRef;\n+ getModuleIfRequired(): ?T;\n+ load(): Promise;\n+ preload(): void;\n+ }\n }\n \n-\/\/ Metro\n declare module 'JSResourceReferenceImpl' {\n- declare export default class JSResourceReferenceImpl<\n- T,\n- > extends JSResourceReference {}\n+ declare export default class JSResourceReferenceImpl {\n+ getModuleId(): string;\n+ getModuleIdAsRef(): $Flow$ModuleRef;\n+ getModuleIfRequired(): ?T;\n+ load(): Promise;\n+ preload(): void;\n+ }\n }\n \n declare module 'ReactFlightDOMRelayServerIntegration' {\n+ import type {JSResourceReference} from 'JSResourceReference';\n+\n declare export opaque type Destination;\n declare export opaque type BundlerConfig;\n declare export function emitRow(\n@@ -49,6 +54,8 @@ declare module 'ReactFlightDOMRelayServerIntegration' {\n }\n \n declare module 'ReactFlightDOMRelayClientIntegration' {\n+ import type {JSResourceReference} from 'JSResourceReference';\n+\n declare export opaque type ModuleMetaData;\n declare export function resolveModuleReference(\n moduleData: ModuleMetaData,\n@@ -62,6 +69,8 @@ declare module 'ReactFlightDOMRelayClientIntegration' {\n }\n \n declare module 'ReactFlightNativeRelayServerIntegration' {\n+ import type {JSResourceReference} from 'JSResourceReference';\n+\n declare export opaque type Destination;\n declare export opaque type BundlerConfig;\n declare export function emitRow(\n@@ -78,6 +87,8 @@ declare module 'ReactFlightNativeRelayServerIntegration' {\n }\n \n declare module 'ReactFlightNativeRelayClientIntegration' {\n+ import type {JSResourceReference} from 'JSResourceReference';\n+\n declare export opaque type ModuleMetaData;\n declare export function resolveModuleReference(\n moduleData: ModuleMetaData,\ndiff --git a\/scripts\/rollup\/bundles.js b\/scripts\/rollup\/bundles.js\nindex 4819ecb2a4..0c8a3b6403 100644\n--- a\/scripts\/rollup\/bundles.js\n+++ b\/scripts\/rollup\/bundles.js\n@@ -405,7 +405,7 @@ const bundles = [\n externals: [\n 'react',\n 'ReactFlightDOMRelayServerIntegration',\n- 'JSResourceReference',\n+ 'JSResourceReferenceImpl',\n ],\n },\n \n@@ -420,7 +420,7 @@ const bundles = [\n externals: [\n 'react',\n 'ReactFlightDOMRelayClientIntegration',\n- 'JSResourceReference',\n+ 'JSResourceReferenceImpl',\n ],\n },\n \ndiff --git a\/yarn.lock b\/yarn.lock\nindex f9d8524bd6..4f9e9225b3 100644\n--- a\/yarn.lock\n+++ b\/yarn.lock\n@@ -13629,7 +13629,7 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.8:\n prop-types \"^15.6.2\"\n scheduler \"^0.13.0\"\n \n-react-is@^16.8.1, \"react-is@npm:react-is\":\n+react-is@^16.8.1, react-is@^17.0.1, \"react-is@npm:react-is\":\n version \"17.0.2\"\n resolved \"https:\/\/registry.yarnpkg.com\/react-is\/-\/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0\"\n integrity sha512-w2GsyukL62IJnlaff\/nRegPQR94C\/XXamvMWmSHRJ4y7Ts\/4ocGRmTHvOs8PSE6pB3dWOrD\/nueuU5sduBsQ4w==\n","parents":["e531a4a62d0b88301ac06d4efd3f5a30faa03c94"]}

dillon1000/react

Files changed