Merge branch 'development' into add-locale-support

teleporthq · Oct 17, 2024 · 6420553 · 6420553
2 parents 7491998 + 4388577
commit 6420553
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/packages/teleport-plugin-next-static-props/src/utils.ts b/packages/teleport-plugin-next-static-props/src/utils.ts
@@ -14,6 +14,12 @@ export const generateInitialPropsAST = (
       types.catchClause(
         types.identifier('error'),
         types.blockStatement([
+          types.expressionStatement(
+            types.callExpression(
+              types.memberExpression(types.identifier('console'), types.identifier('log')),
+              [types.identifier('error')]
+            )
+          ),
           types.returnStatement(
             types.objectExpression([
               types.objectProperty(types.identifier('notFound'), types.booleanLiteral(true)),
@@ -97,6 +103,23 @@ const computePropsAST = (
                 true
               )
             ),
+            types.spreadElement(
+              types.logicalExpression(
+                '&&',
+                types.optionalMemberExpression(
+                  types.identifier('context'),
+                  types.identifier('locale'),
+                  false,
+                  true
+                ),
+                types.objectExpression([
+                  types.objectProperty(
+                    types.identifier('locale'),
+                    types.memberExpression(types.identifier('context'), types.identifier('locale'))
+                  ),
+                ])
+              )
+            ),
             ...funcParams,
           ]),
         ])