From f20b9114b4490fa3df539c39f49b87da017ddf9d Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Mon, 5 Oct 2020 09:46:23 -0500 Subject: [PATCH 1/2] Update to use hasNextSupport for custom-routes in next export check --- packages/next/export/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/next/export/index.ts b/packages/next/export/index.ts index 756497968624..755ca4666544 100644 --- a/packages/next/export/index.ts +++ b/packages/next/export/index.ts @@ -33,6 +33,7 @@ import loadConfig, { isTargetLikeServerless, } from '../next-server/server/config' import { eventCliSession } from '../telemetry/events' +import { hasNextSupport } from '../telemetry/ci-info' import { Telemetry } from '../telemetry/storage' import { normalizePagePath, @@ -170,7 +171,7 @@ export default async function exportApp( ) if ( - !process.env.NOW_BUILDER && + hasNextSupport && !options.buildExport && customRoutesDetected.length > 0 ) { From 5c585e78c33e5a6bef475f0ac2f1b432a1007781 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Mon, 5 Oct 2020 09:58:32 -0500 Subject: [PATCH 2/2] Update check --- packages/next/export/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/next/export/index.ts b/packages/next/export/index.ts index 755ca4666544..9bd7d5bc9c8f 100644 --- a/packages/next/export/index.ts +++ b/packages/next/export/index.ts @@ -171,7 +171,7 @@ export default async function exportApp( ) if ( - hasNextSupport && + !hasNextSupport && !options.buildExport && customRoutesDetected.length > 0 ) {