Make onPageLoaded/Unloaded sync again

Author: alexeyr

node_package/src/CallbackRegistry.ts

@@ -29,7 +29,7 @@ export default class CallbackRegistry<T> {
     this.registryType = registryType;
   }
 
-  private async initializeTimeoutEvents() {
+  private initializeTimeoutEvents() {
     if (this.timeoutEventsInitialized) return;
     this.timeoutEventsInitialized = true;
 
@@ -46,14 +46,14 @@ export default class CallbackRegistry<T> {
       });
     };
 
-    await onPageLoaded(() => {
+    onPageLoaded(() => {
       const registryTimeout = getContextAndRailsContext().railsContext?.componentRegistryTimeout;
       if (!registryTimeout) return;
 
       timeoutId = setTimeout(triggerTimeout, registryTimeout);
     });
 
-    await onPageUnloaded(() => {
+    onPageUnloaded(() => {
       this.waitingPromises.clear();
       this.timedout = false;
       clearTimeout(timeoutId);
@@ -97,7 +97,7 @@ export default class CallbackRegistry<T> {
   }
 
   async getOrWaitForItem(name: string): Promise<T> {
-    await this.initializeTimeoutEvents();
+    this.initializeTimeoutEvents();
     try {
       return this.get(name);
     } catch (error) {

node_package/src/ReactOnRails.client.ts

@@ -343,7 +343,7 @@ ctx.ReactOnRails = {
 
 ctx.ReactOnRails.resetOptions();
 
-void ClientStartup.clientStartup(ctx);
+ClientStartup.clientStartup(ctx);
 
 export * from './types';
 export default ctx.ReactOnRails;

node_package/src/clientStartup.ts

@@ -19,7 +19,7 @@ function reactOnRailsPageUnloaded(): void {
   unmountAll();
 }
 
-export async function clientStartup(context: Context): Promise<void> {
+export function clientStartup(context: Context) {
   // Check if server rendering
   if (!isWindow(context)) {
     return;
@@ -41,6 +41,6 @@ export async function clientStartup(context: Context): Promise<void> {
   void hydrateForceLoadedStores();
 
   // Other components and stores are rendered and hydrated when the page is fully loaded
-  await onPageLoaded(reactOnRailsPageLoaded);
-  await onPageUnloaded(reactOnRailsPageUnloaded);
+  onPageLoaded(reactOnRailsPageLoaded);
+  onPageUnloaded(reactOnRailsPageUnloaded);
 }

node_package/src/pageLifecycle.ts

@@ -73,17 +73,17 @@ function initializePageEventListeners(): void {
   }
 }
 
-export async function onPageLoaded(callback: PageLifecycleCallback): Promise<void> {
+export function onPageLoaded(callback: PageLifecycleCallback): void {
   if (currentPageState === 'load') {
-    await callback();
+    void callback();
   }
   pageLoadedCallbacks.add(callback);
   initializePageEventListeners();
 }
 
-export async function onPageUnloaded(callback: PageLifecycleCallback): Promise<void> {
+export function onPageUnloaded(callback: PageLifecycleCallback): void {
   if (currentPageState === 'unload') {
-    await callback();
+    void callback();
   }
   pageUnloadedCallbacks.add(callback);
   initializePageEventListeners();