Merge pull request #97 from blitz-js/fix-96

Fix #96
blitz-js · Sep 20, 2021 · f8f5b2b · f8f5b2b
2 parents ca77f5a + 82b944e
commit f8f5b2b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -12,7 +12,6 @@ import {
   isClassDeclaration,
   isExportDefaultDeclaration,
   isFunctionDeclaration,
-  isFunctionExpression,
   isIdentifier,
   isVariableDeclaration,
   stringLiteral,
@@ -119,14 +118,6 @@ function wrapExportDefaultDeclaration(path: NodePath<any>) {
 
   const { node } = path;
 
-  if (isIdentifier(node.declaration)) {
-    node.declaration = wrapInHOC(node.declaration);
-  }
-
-  if (isFunctionExpression(node.declaration)) {
-    node.declaration = wrapInHOC(node.declaration);
-  }
-
   if (
     isFunctionDeclaration(node.declaration) ||
     isClassDeclaration(node.declaration)
@@ -145,6 +136,8 @@ function wrapExportDefaultDeclaration(path: NodePath<any>) {
         );
       }
     }
+  } else {
+    node.declaration = wrapInHOC(node.declaration);
   }
 }
 

diff --git a/test/pages/already wrapped gSSP and component/code.js b/test/pages/already wrapped gSSP and component/code.js
@@ -0,0 +1,10 @@
+export const getServerSideProps = withAuthUserTokenSSR({
+  whenUnauthed: AuthAction.REDIRECT_TO_LOGIN,
+})(async ({ AuthUser }) => {
+  // ...
+  return {
+    props,
+  };
+});
+
+export default withAuthUser()(Component);
diff --git a/test/pages/already wrapped gSSP and component/output.js b/test/pages/already wrapped gSSP and component/output.js
@@ -0,0 +1,14 @@
+import { withSuperJSONPage as _withSuperJSONPage } from 'babel-plugin-superjson-next/tools';
+import { withSuperJSONProps as _withSuperJSONProps } from 'babel-plugin-superjson-next/tools';
+export const getServerSideProps = _withSuperJSONProps(
+  withAuthUserTokenSSR({
+    whenUnauthed: AuthAction.REDIRECT_TO_LOGIN,
+  })(async ({ AuthUser }) => {
+    // ...
+    return {
+      props,
+    };
+  }),
+  ['smth']
+);
+export default _withSuperJSONPage(withAuthUser()(Component));