rename force-load feature into immediate-hydrate feature

Author: AbanoubGhadban

node_package/src/clientStartup.ts

@@ -1,8 +1,8 @@
 import {
   hydrateAllStores,
-  hydrateForceLoadedStores,
+  hydrateImmediateHydratedStores,
   renderOrHydrateAllComponents,
-  renderOrHydrateForceLoadedComponents,
+  renderOrHydrateImmediateHydratedComponents,
   unmountAll,
 } from './pro/ClientSideRenderer.ts';
 import { onPageLoaded, onPageUnloaded } from './pageLifecycle.ts';
@@ -36,8 +36,8 @@ export function clientStartup() {
   // Force loaded components and stores are rendered and hydrated immediately.
   // The hydration process can handle the concurrent hydration of components and stores,
   // so awaiting this isn't necessary.
-  void renderOrHydrateForceLoadedComponents();
-  void hydrateForceLoadedStores();
+  void renderOrHydrateImmediateHydratedComponents();
+  void hydrateImmediateHydratedStores();
 
   // Other components and stores are rendered and hydrated when the page is fully loaded
   onPageLoaded(reactOnRailsPageLoaded);

node_package/src/pro/ClientSideRenderer.ts

@@ -32,10 +32,6 @@ const IMMEDIATE_HYDRATION_PRO_WARNING =
   "[REACT ON RAILS] The 'immediate_hydration' feature requires a React on Rails Pro license. " +
   'Please visit https://shakacode.com/react-on-rails-pro to get a license.';
 
-const FORCE_LOADING_PRO_WARNING =
-  "[REACT ON RAILS] The 'force_loading' feature requires a React on Rails Pro license. " +
-  'Please visit https://shakacode.com/react-on-rails-pro to get a license.';
-
 async function delegateToRenderer(
   componentObj: RegisteredComponent,
   props: Record<string, unknown>,
@@ -277,8 +273,11 @@ async function forAllElementsAsync(
   await Promise.all(Array.from(els).map(callback));
 }
 
-export const renderOrHydrateForceLoadedComponents = () =>
-  forAllElementsAsync('.js-react-on-rails-component[data-force-load="true"]', renderOrHydrateComponent);
+export const renderOrHydrateImmediateHydratedComponents = () =>
+  forAllElementsAsync(
+    '.js-react-on-rails-component[data-immediate-hydration="true"]',
+    renderOrHydrateComponent,
+  );
 
 export const renderOrHydrateAllComponents = () =>
   forAllElementsAsync('.js-react-on-rails-component', renderOrHydrateComponent);
@@ -312,16 +311,19 @@ export async function hydrateStore(storeNameOrElement: string | Element) {
   await storeRenderer.waitUntilHydrated();
 }
 
-export const hydrateForceLoadedStores = () => {
+export const hydrateImmediateHydratedStores = () => {
   const railsContext = getRailsContext();
   const hasProLicense = railsContext?.rorPro;
 
   if (!hasProLicense) {
-    console.warn(FORCE_LOADING_PRO_WARNING);
+    console.warn(IMMEDIATE_HYDRATION_PRO_WARNING);
     return Promise.resolve();
   }
 
-  return forAllElementsAsync(`[${REACT_ON_RAILS_STORE_ATTRIBUTE}][data-force-load="true"]`, hydrateStore);
+  return forAllElementsAsync(
+    `[${REACT_ON_RAILS_STORE_ATTRIBUTE}][data-immediate-hydration="true"]`,
+    hydrateStore,
+  );
 };
 
 export const hydrateAllStores = () =>

node_package/tests/proLicenseValidation.test.js

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import { hydrateForceLoadedStores } from '../src/pro/ClientSideRenderer.ts';
+import { hydrateImmediateHydratedStores } from '../src/pro/ClientSideRenderer.ts';
 import { getRailsContext } from '../src/context.ts';
 
 // Mock the getRailsContext function
@@ -22,14 +22,14 @@ describe('Pro License Validation', () => {
     consoleSpy.mockRestore();
   });
 
-  describe('hydrateForceLoadedStores', () => {
+  describe('hydrateImmediateHydratedStores', () => {
     it('should warn and return early when no Pro license is detected', async () => {
       getRailsContext.mockReturnValue({ rorPro: false });
 
-      const result = await hydrateForceLoadedStores();
+      const result = await hydrateImmediateHydratedStores();
 
       expect(consoleSpy).toHaveBeenCalledWith(
-        "[REACT ON RAILS] The 'force_loading' feature requires a React on Rails Pro license. " +
+        "[REACT ON RAILS] The 'immediate_hydration' feature requires a React on Rails Pro license. " +
           'Please visit https://shakacode.com/react-on-rails-pro to get a license.',
       );
       expect(result).toBeUndefined();
@@ -39,7 +39,7 @@ describe('Pro License Validation', () => {
       getRailsContext.mockReturnValue({ rorPro: true });
 
       // Test that it doesn't warn when license is valid (no force-load elements present)
-      const result = hydrateForceLoadedStores();
+      const result = hydrateImmediateHydratedStores();
 
       expect(consoleSpy).not.toHaveBeenCalled();
       expect(result).toBeDefined();
@@ -48,10 +48,10 @@ describe('Pro License Validation', () => {
     it('should return early when no rails context is available', async () => {
       getRailsContext.mockReturnValue(null);
 
-      const result = await hydrateForceLoadedStores();
+      const result = await hydrateImmediateHydratedStores();
 
       expect(consoleSpy).toHaveBeenCalledWith(
-        "[REACT ON RAILS] The 'force_loading' feature requires a React on Rails Pro license. " +
+        "[REACT ON RAILS] The 'immediate_hydration' feature requires a React on Rails Pro license. " +
           'Please visit https://shakacode.com/react-on-rails-pro to get a license.',
       );
       expect(result).toBeUndefined();