Merge branch 'canary' into justman00/fix-preview-false

vercel · Sep 4, 2020 · 6918288 · 6918288
2 parents 97c7832 + d97237a
commit 6918288
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 7 deletions.
diff --git a/packages/next/build/babel/plugins/next-page-config.ts b/packages/next/build/babel/plugins/next-page-config.ts
@@ -82,20 +82,47 @@ export default function nextPageConfig({
                   exportPath.scope.getBinding(CONFIG_KEY)?.path.node,
                 ].filter(Boolean)
 
-                for (const declaration of declarations) {
-                  if (
-                    !BabelTypes.isIdentifier(declaration.id, {
-                      name: CONFIG_KEY,
-                    })
-                  ) {
-                    if (BabelTypes.isImportSpecifier(declaration)) {
+                for (const specifier of exportPath.node.specifiers) {
+                  if (specifier.exported.name === CONFIG_KEY) {
+                    // export {} from 'somewhere'
+                    if (BabelTypes.isStringLiteral(exportPath.node.source)) {
                       throw new Error(
                         errorMessage(
                           exportState,
                           `Expected object but got import`
                         )
                       )
+                      // import hello from 'world'
+                      // export { hello as config }
+                    } else if (
+                      BabelTypes.isIdentifier(
+                        (specifier as BabelTypes.ExportSpecifier).local
+                      )
+                    ) {
+                      if (
+                        BabelTypes.isImportSpecifier(
+                          exportPath.scope.getBinding(
+                            (specifier as BabelTypes.ExportSpecifier).local.name
+                          )?.path.node
+                        )
+                      ) {
+                        throw new Error(
+                          errorMessage(
+                            exportState,
+                            `Expected object but got import`
+                          )
+                        )
+                      }
                     }
+                  }
+                }
+
+                for (const declaration of declarations) {
+                  if (
+                    !BabelTypes.isIdentifier(declaration.id, {
+                      name: CONFIG_KEY,
+                    })
+                  ) {
                     continue
                   }
 

diff --git a/test/integration/page-config/pages/valid/config-import.js b/test/integration/page-config/pages/valid/config-import.js
@@ -0,0 +1,10 @@
+// eslint-disable-next-line no-unused-vars
+import { config } from '../../config'
+
+export const getServerSideProps = () => {
+  return {
+    props: {},
+  }
+}
+
+export default () => <p>hello world</p>
diff --git a/test/integration/page-config/pages/valid/not-config-export.js b/test/integration/page-config/pages/valid/not-config-export.js
@@ -0,0 +1,10 @@
+// eslint-disable-next-line no-unused-vars
+export { config as notConfig } from '../../config'
+
+export const getServerSideProps = () => {
+  return {
+    props: {},
+  }
+}
+
+export default () => <p>hello world</p>
diff --git a/test/integration/page-config/pages/valid/not-config-import-export.js b/test/integration/page-config/pages/valid/not-config-import-export.js
@@ -0,0 +1,12 @@
+// eslint-disable-next-line no-unused-vars
+import { config } from '../../config'
+
+export { config as notConfig }
+
+export const getServerSideProps = () => {
+  return {
+    props: {},
+  }
+}
+
+export default () => <p>hello world</p>