Shun Miyazawa 6 bulan lalu
induk
melakukan
63928452cd
1 mengubah file dengan 10 tambahan dan 4 penghapusan
  1. 10 4
      apps/app/src/pages/[[...path]]/server-side-props.ts

+ 10 - 4
apps/app/src/pages/[[...path]]/server-side-props.ts

@@ -83,12 +83,18 @@ export async function getServerSidePropsForInitial(
 export async function getServerSidePropsForSameRoute(
 export async function getServerSidePropsForSameRoute(
   context: GetServerSidePropsContext,
   context: GetServerSidePropsContext,
 ): Promise<GetServerSidePropsResult<Stage2EachProps>> {
 ): Promise<GetServerSidePropsResult<Stage2EachProps>> {
-  // Get page data
-  const result = await getPageDataForSameRoute(context);
+  const [i18nPropsResult, pageDataResult] = await Promise.all([
+    getServerSideI18nProps(context, ['translation']),
+    getPageDataForSameRoute(context),
+  ]);
 
 
   // -- TODO: persist activity
   // -- TODO: persist activity
-
   // const mergedProps = await mergedResult.props;
   // const mergedProps = await mergedResult.props;
   // await addActivity(context, getActivityAction(mergedProps));
   // await addActivity(context, getActivityAction(mergedProps));
-  return result;
+  const mergedResult = mergeGetServerSidePropsResults(
+    pageDataResult,
+    i18nPropsResult,
+  );
+
+  return mergedResult;
 }
 }