Merge branch 'canary' into hotfix-router-with-google-analytics

vercel · Sep 4, 2020 · b6b1ed6 · b6b1ed6
2 parents 955e6f3 + f7435b4
commit b6b1ed6
Show file tree

Hide file tree

Showing 17 changed files with 82 additions and 23 deletions.
diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.5.4-canary.1"
+  "version": "9.5.4-canary.2"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "9.5.4-canary.1",
+  "version": "9.5.4-canary.2",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "9.5.4-canary.1",
+  "version": "9.5.4-canary.2",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "9.5.4-canary.1",
+  "version": "9.5.4-canary.2",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "9.5.4-canary.1",
+  "version": "9.5.4-canary.2",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.5.4-canary.1",
+  "version": "9.5.4-canary.2",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-google-analytics/package.json b/packages/next-plugin-google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-google-analytics",
-  "version": "9.5.4-canary.1",
+  "version": "9.5.4-canary.2",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-google-analytics"

diff --git a/packages/next-plugin-sentry/package.json b/packages/next-plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-sentry",
-  "version": "9.5.4-canary.1",
+  "version": "9.5.4-canary.2",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-sentry"

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "9.5.4-canary.1",
+  "version": "9.5.4-canary.2",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "9.5.4-canary.1",
+  "version": "9.5.4-canary.2",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

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/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.5.4-canary.1",
+  "version": "9.5.4-canary.2",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -77,8 +77,8 @@
     "@babel/preset-typescript": "7.10.4",
     "@babel/runtime": "7.11.2",
     "@babel/types": "7.11.5",
-    "@next/react-dev-overlay": "9.5.4-canary.1",
-    "@next/react-refresh-utils": "9.5.4-canary.1",
+    "@next/react-dev-overlay": "9.5.4-canary.2",
+    "@next/react-refresh-utils": "9.5.4-canary.2",
     "ast-types": "0.13.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",
@@ -123,7 +123,7 @@
     "react-dom": "^16.6.0"
   },
   "devDependencies": {
-    "@next/polyfill-nomodule": "9.5.4-canary.1",
+    "@next/polyfill-nomodule": "9.5.4-canary.2",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "9.5.4-canary.1",
+  "version": "9.5.4-canary.2",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "9.5.4-canary.1",
+  "version": "9.5.4-canary.2",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",

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>