react-on-rails 16.2.0-test.6 → 16.2.0-test.7

package/lib/ClientRenderer.js

@@ -140,7 +140,6 @@ function unmountAllComponents() {
             }
             else {
                 // React 16-17 legacy API
-                // eslint-disable-next-line @typescript-eslint/no-deprecated
                 unmountComponentAtNode(domNode);
             }
         }

package/lib/reactApis.cjs

@@ -25,25 +25,38 @@ if (exports.supportsRootApi) {
         reactDomClient = ReactDOM;
     }
 }
-/* eslint-disable @typescript-eslint/no-deprecated,@typescript-eslint/no-non-null-assertion,react/no-deprecated --
- * while we need to support React 16
- */
+// Cast ReactDOM to include legacy APIs for React 16/17 compatibility
+// These methods exist at runtime but are removed from @types/react-dom@19
+const legacyReactDOM = ReactDOM;
+// Validate legacy APIs exist at runtime when needed (React < 18)
+if (!exports.supportsRootApi) {
+    if (typeof legacyReactDOM.hydrate !== 'function') {
+        throw new Error('React legacy hydrate API not available. Expected React 16/17.');
+    }
+    if (typeof legacyReactDOM.render !== 'function') {
+        throw new Error('React legacy render API not available. Expected React 16/17.');
+    }
+    if (typeof legacyReactDOM.unmountComponentAtNode !== 'function') {
+        throw new Error('React legacy unmountComponentAtNode API not available. Expected React 16/17.');
+    }
+}
+/* eslint-disable @typescript-eslint/no-non-null-assertion -- reactDomClient is always defined when supportsRootApi is true */
 exports.reactHydrate = exports.supportsRootApi
     ? reactDomClient.hydrateRoot
-    : (domNode, reactElement) => ReactDOM.hydrate(reactElement, domNode);
+    : (domNode, reactElement) => legacyReactDOM.hydrate(reactElement, domNode);
 function reactRender(domNode, reactElement) {
     if (exports.supportsRootApi) {
         const root = reactDomClient.createRoot(domNode);
         root.render(reactElement);
         return root;
     }
-    // eslint-disable-next-line react/no-render-return-value
-    return ReactDOM.render(reactElement, domNode);
+    return legacyReactDOM.render(reactElement, domNode);
 }
 exports.unmountComponentAtNode = exports.supportsRootApi
     ? // not used if we use root API
-        () => false
-    : ReactDOM.unmountComponentAtNode;
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        (_container) => false
+    : (container) => legacyReactDOM.unmountComponentAtNode(container);
 const ensureReactUseAvailable = () => {
     if (!('use' in React) || typeof React.use !== 'function') {
         throw new Error('React.use is not defined. Please ensure you are using React 19 to use server components.');

package/lib/serverRenderReactComponent.js

@@ -49,6 +49,7 @@ function processPromise(result, renderingReturnsPromises) {
         if (isValidElement(promiseResult)) {
             return processReactElement(promiseResult);
         }
+        // promiseResult is string | ServerRenderHashRenderedHtml (both are FinalHtmlResult)
         return promiseResult;
     });
 }

package/lib/types/index.d.ts

@@ -68,8 +68,8 @@ interface ServerRenderResult {
     routeError?: Error;
     error?: Error;
 }
-type CreateReactOutputSyncResult = ServerRenderResult | ReactElement<unknown>;
-type CreateReactOutputAsyncResult = Promise<string | ServerRenderHashRenderedHtml | ReactElement<unknown>>;
+type CreateReactOutputSyncResult = ServerRenderResult | ReactElement;
+type CreateReactOutputAsyncResult = Promise<string | ServerRenderHashRenderedHtml | ReactElement>;
 type CreateReactOutputResult = CreateReactOutputSyncResult | CreateReactOutputAsyncResult;
 type RenderFunctionSyncResult = ReactComponent | ServerRenderResult;
 type RenderFunctionAsyncResult = Promise<string | ServerRenderHashRenderedHtml | ReactComponent>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "16.2.0-test.6",
+  "version": "16.2.0-test.7",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "lib/ReactOnRails.full.js",
   "type": "module",
@@ -48,13 +48,7 @@
   },
   "peerDependencies": {
     "react": ">= 16",
-    "react-dom": ">= 16",
-    "react-on-rails-rsc": "19.0.2"
-  },
-  "peerDependenciesMeta": {
-    "react-on-rails-rsc": {
-      "optional": true
-    }
+    "react-dom": ">= 16"
   },
   "files": [
     "lib/**/*.js",