Bound server references should be able to be bound again

facebook · Nov 14, 2023 · ba831eb · ba831eb
1 parent 432b9f1
commit ba831eb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/packages/react-server-dom-esm/src/ReactFlightESMReferences.js b/packages/react-server-dom-esm/src/ReactFlightESMReferences.js
@@ -53,9 +53,12 @@ function bind(this: ServerReference<any>) {
   if (this.$$typeof === SERVER_REFERENCE_TAG) {
     // $FlowFixMe[method-unbinding]
     const args = ArraySlice.call(arguments, 1);
-    newFn.$$typeof = SERVER_REFERENCE_TAG;
-    newFn.$$id = this.$$id;
-    newFn.$$bound = this.$$bound ? this.$$bound.concat(args) : args;
+    return Object.defineProperties((newFn: any), {
+      $$typeof: {value: SERVER_REFERENCE_TAG},
+      $$id: {value: this.$$id},
+      $$bound: {value: this.$$bound ? this.$$bound.concat(args) : args},
+      bind: {value: bind},
+    });
   }
   return newFn;
 }

diff --git a/packages/react-server-dom-turbopack/src/ReactFlightTurbopackReferences.js b/packages/react-server-dom-turbopack/src/ReactFlightTurbopackReferences.js
@@ -66,9 +66,12 @@ function bind(this: ServerReference<any>) {
   const newFn = FunctionBind.apply(this, arguments);
   if (this.$$typeof === SERVER_REFERENCE_TAG) {
     const args = ArraySlice.call(arguments, 1);
-    newFn.$$typeof = SERVER_REFERENCE_TAG;
-    newFn.$$id = this.$$id;
-    newFn.$$bound = this.$$bound ? this.$$bound.concat(args) : args;
+    return Object.defineProperties((newFn: any), {
+      $$typeof: {value: SERVER_REFERENCE_TAG},
+      $$id: {value: this.$$id},
+      $$bound: {value: this.$$bound ? this.$$bound.concat(args) : args},
+      bind: {value: bind},
+    });
   }
   return newFn;
 }

diff --git a/packages/react-server-dom-webpack/src/ReactFlightWebpackReferences.js b/packages/react-server-dom-webpack/src/ReactFlightWebpackReferences.js
@@ -61,14 +61,17 @@ function registerClientReferenceImpl<T>(
 const FunctionBind = Function.prototype.bind;
 // $FlowFixMe[method-unbinding]
 const ArraySlice = Array.prototype.slice;
-function bind(this: ServerReference<any>) {
+function bind(this: ServerReference<any>): any {
   // $FlowFixMe[unsupported-syntax]
   const newFn = FunctionBind.apply(this, arguments);
   if (this.$$typeof === SERVER_REFERENCE_TAG) {
     const args = ArraySlice.call(arguments, 1);
-    newFn.$$typeof = SERVER_REFERENCE_TAG;
-    newFn.$$id = this.$$id;
-    newFn.$$bound = this.$$bound ? this.$$bound.concat(args) : args;
+    return Object.defineProperties((newFn: any), {
+      $$typeof: {value: SERVER_REFERENCE_TAG},
+      $$id: {value: this.$$id},
+      $$bound: {value: this.$$bound ? this.$$bound.concat(args) : args},
+      bind: {value: bind},
+    });
   }
   return newFn;
 }

diff --git a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
@@ -1011,7 +1011,7 @@ describe('ReactFlightDOMBrowser', () => {
     const ClientRef = clientExports(Client);
 
     const stream = ReactServerDOMServer.renderToReadableStream(
-      <ClientRef action={greet.bind(null, 'Hello', 'World')} />,
+      <ClientRef action={greet.bind(null, 'Hello').bind(null, 'World')} />,
       webpackMap,
     );