use the commented out async code (#1761)

i18next · Jul 15, 2024 · 5c3c3eb · 5c3c3eb
1 parent 1361608
commit 5c3c3eb
Showing 1 changed file with 12 additions and 29 deletions.
diff --git a/src/context.js b/src/context.js
@@ -24,35 +24,18 @@ export class ReportNamespaces {
 }
 
 export function composeInitialProps(ForComponent) {
-  return (ctx) =>
-    new Promise((resolve) => {
-      const i18nInitialProps = getInitialProps();
-
-      if (ForComponent.getInitialProps) {
-        ForComponent.getInitialProps(ctx).then((componentsInitialProps) => {
-          resolve({
-            ...componentsInitialProps,
-            ...i18nInitialProps,
-          });
-        });
-      } else {
-        resolve(i18nInitialProps);
-      }
-    });
-  // Avoid async for now - so we do not need to pull in regenerator
-
-  // return async ctx => {
-  //   const componentsInitialProps = ForComponent.getInitialProps
-  //     ? await ForComponent.getInitialProps(ctx)
-  //     : {};
-
-  //   const i18nInitialProps = getInitialProps();
-
-  //   return {
-  //     ...componentsInitialProps,
-  //     ...i18nInitialProps,
-  //   };
-  // };
+  return async (ctx) => {
+    const componentsInitialProps = ForComponent.getInitialProps
+      ? await ForComponent.getInitialProps(ctx)
+      : {};
+
+    const i18nInitialProps = getInitialProps();
+
+    return {
+      ...componentsInitialProps,
+      ...i18nInitialProps,
+    };
+  };
 }
 
 export function getInitialProps() {