Consider case when getInitialProps comes first (#42)

Author: orionmiz

src/lib.rs

@@ -610,9 +610,6 @@ impl NextSuperJsonTransformer {
         let mut first = None;
 
         items.iter_mut().enumerate().any(|(pos, item)| {
-            // check initial props
-            item.visit_mut_children_with(self);
-
             let found = match item {
                 // check has ssg props
                 ModuleItem::ModuleDecl(ModuleDecl::ExportDecl(ExportDecl { decl, .. })) => {
@@ -666,7 +663,7 @@ impl NextSuperJsonTransformer {
             };
 
             if found {
-                if first.is_some() || self.use_init_props {
+                if first.is_some() {
                     self.has_multiple_props = true;
                     return true;
                 }
@@ -680,6 +677,13 @@ impl NextSuperJsonTransformer {
             return;
         }
 
+        // check initial props
+        if first.is_none() {
+            items
+                .iter_mut()
+                .for_each(|item| item.visit_mut_children_with(self));
+        }
+
         self.props.export.orig = first;
 
         if ssg_prop_ident.is_some() && !self.props.skip {

tests/fixture/skip/multiple-exports/code.js

@@ -2,6 +2,10 @@ export default function Page() {
   return <div>Page</div>;
 }
 
+Page.getInitialProps = () => {
+  return {};
+}
+
 export const getStaticProps = () => {
   return {
     props: {},
@@ -12,8 +16,4 @@ export const getServerSideProps = () => {
   return {
     props: {},
   };
-}
-
-Page.getInitialProps = () => {
-  return {};
 }

tests/fixture/skip/multiple-exports/output.js

@@ -2,6 +2,10 @@ export default function Page() {
   return <div>Page</div>;
 }
 
+Page.getInitialProps = () => {
+  return {};
+}
+
 export const getStaticProps = () => {
   return {
     props: {},
@@ -12,8 +16,4 @@ export const getServerSideProps = () => {
   return {
     props: {},
   };
-}
-
-Page.getInitialProps = () => {
-  return {};
 }