Merge pull request #88 from blitz-js/fix-82

Only transform files with both gSP & Default Export
blitz-js · Aug 17, 2021 · dd7769a · dd7769a
2 parents 2c9101c + 4c3d211
commit dd7769a
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 20 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -60,7 +60,7 @@ const functionsToReplace = ['getServerSideProps', 'getStaticProps'];
 function transformPropGetters(
   path: NodePath<ExportNamedDeclaration>,
   transform: (v: Expression) => Expression
-) {
+): 'found' | undefined {
   const { node } = path;
 
   if (isFunctionDeclaration(node.declaration)) {
@@ -80,19 +80,20 @@ function transformPropGetters(
       ),
     ]);
 
-    return;
+    return 'found';
   }
 
   if (isVariableDeclaration(node.declaration)) {
-    node.declaration.declarations.forEach((declaration) => {
+    for (const declaration of node.declaration.declarations) {
       if (
         isIdentifier(declaration.id) &&
         functionsToReplace.includes(declaration.id.name) &&
         declaration.init
       ) {
         declaration.init = transform(declaration.init);
+        return 'found';
       }
-    });
+    }
   }
 }
 
@@ -185,29 +186,46 @@ function superJsonWithNext(): PluginObj {
 
         const body = path.get('body');
 
-        body
-          .filter((path) => isExportNamedDeclaration(path))
-          .forEach((path) => {
-            transformPropGetters(
-              path as NodePath<ExportNamedDeclaration>,
-              (decl) => {
-                return callExpression(addWithSuperJSONPropsImport(path), [
-                  decl,
-                  arrayExpression(
-                    propsToBeExcluded?.map((prop) => stringLiteral(prop))
-                  ),
-                ]);
-              }
-            );
-          });
-
         const exportDefaultDeclaration = body.find((path) =>
           isExportDefaultDeclaration(path)
         );
         if (!exportDefaultDeclaration) {
           return;
         }
 
+        const namedExportDeclarations = body
+          .filter((path) => path.isExportNamedDeclaration())
+          .map((path) => path as NodePath<ExportNamedDeclaration>);
+
+        const containsNextTag = namedExportDeclarations.some((path) => {
+          return (
+            isVariableDeclaration(path.node.declaration) &&
+            path.node.declaration.declarations.some(
+              (decl) => isIdentifier(decl.id) && decl.id.name.startsWith('__N_')
+            )
+          );
+        });
+
+        let transformedOne = false;
+        namedExportDeclarations.forEach((path) => {
+          const found = transformPropGetters(path, (decl) => {
+            return callExpression(addWithSuperJSONPropsImport(path), [
+              decl,
+              arrayExpression(
+                propsToBeExcluded?.map((prop) => stringLiteral(prop))
+              ),
+            ]);
+          });
+
+          if (found === 'found') {
+            transformedOne = true;
+          }
+        });
+
+        if (!transformedOne && !containsNextTag) {
+          return;
+        }
+
         wrapExportDefaultDeclaration(exportDefaultDeclaration);
       },
     },

diff --git a/test/pages/default export without gsp/code.js b/test/pages/default export without gsp/code.js
@@ -0,0 +1,3 @@
+export default function Home() {
+  return 'Home, Sweet Home';
+}
diff --git a/test/pages/default export without gsp/output.js b/test/pages/default export without gsp/output.js
@@ -0,0 +1,3 @@
+export default function Home() {
+  return 'Home, Sweet Home';
+}
diff --git a/test/pages/gSP without default export/code.js b/test/pages/gSP without default export/code.js
@@ -0,0 +1,13 @@
+export async function getStaticProps() {
+  const products = [
+    {
+      name: 'Hat',
+      publishedAt: new Date(0),
+    },
+  ];
+  return {
+    props: {
+      products,
+    },
+  };
+}
diff --git a/test/pages/gSP without default export/output.js b/test/pages/gSP without default export/output.js
@@ -0,0 +1,13 @@
+export async function getStaticProps() {
+  const products = [
+    {
+      name: 'Hat',
+      publishedAt: new Date(0),
+    },
+  ];
+  return {
+    props: {
+      products,
+    },
+  };
+}