🐛 fix(region): prefer default region by default, do not enforce eu-central-1 for cli

Author: sladg

Diff for: lib/cdk/stack.ts

@@ -93,13 +93,13 @@ export class NextStandaloneStack extends Stack {
 				hostedZone: this.hostedZone,
 				dnsPrefix: config.dnsPrefix,
 			})
-		}
 
-		if (config.redirectFromApex && this.domainName && this.hostedZone) {
-			this.setupApexRedirect({
-				sourceHostedZone: this.hostedZone,
-				targetDomain: this.domainName,
-			})
+			if (!!config.redirectFromApex) {
+				this.setupApexRedirect({
+					sourceHostedZone: this.hostedZone,
+					targetDomain: this.domainName,
+				})
+			}
 		}
 	}
 

Diff for: lib/cdk/utils/cfnDistro.ts

@@ -25,7 +25,10 @@ export interface SetupCfnDistroProps {
 	customApiOrigin?: IOrigin
 }
 
-export const setupCfnDistro = (scope: Stack, { apiGateway, imageBasePath, serverBasePath, assetsBucket, domainName, certificate, customApiOrigin }: SetupCfnDistroProps) => {
+export const setupCfnDistro = (
+	scope: Stack,
+	{ apiGateway, imageBasePath, serverBasePath, assetsBucket, domainName, certificate, customApiOrigin }: SetupCfnDistroProps,
+) => {
 	const apiGwDomainName = `${apiGateway.apiId}.execute-api.${scope.region}.amazonaws.com`
 
 	const serverOrigin = new HttpOrigin(apiGwDomainName, { originPath: serverBasePath })
@@ -69,6 +72,7 @@ export const setupCfnDistro = (scope: Stack, { apiGateway, imageBasePath, server
 	// Caching is optinionated to work out-of-the-box, for granular access and customization, create your own cache policies.
 	const cfnDistro = new Distribution(scope, 'CfnDistro', {
 		defaultRootObject: '',
+		comment: `CloudFront distribution for ${scope.stackName}`,
 		enableIpv6: true,
 		priceClass: PriceClass.PRICE_CLASS_100,
 		domainNames: domainName ? [domainName] : undefined,

Diff for: lib/cli.ts

@@ -8,7 +8,6 @@ import { packHandler } from './cli/pack'
 import { wrapProcess } from './utils'
 import { DEFAULT_TIMEOUT as IMAGE_LAMBDA_DEFAULT_TIMEOUT, DEFAULT_MEMORY as IMAGE_LAMBDA_DEFAULT_MEMORY } from './cdk/utils/imageLambda'
 import { removeHandler } from './cli/remove'
-import { DEFAULT_REGION } from './consts'
 
 const commandCwd = process.cwd()
 const program = new Command()
@@ -55,7 +54,7 @@ program
 	.option('--stackName <name>', 'Name of the stack to be deployed.', 'StandaloneNextjsStack-Temporary')
 	.option('--appPath <path>', 'Absolute path to app.', path.resolve(__dirname, '../dist/cdk/app.js'))
 	.option('--bootstrap', 'Bootstrap CDK stack.', false)
-	.option('--region <region>', 'AWS region to deploy to.', DEFAULT_REGION)
+	.option('--region <region>', 'AWS region to deploy to.', undefined)
 	.option('--lambdaTimeout <sec>', 'Set timeout for lambda function handling server requests.', Number, 15)
 	.option('--lambdaMemory <mb>', 'Set memory for lambda function handling server requests.', Number, 512)
 	.option('--imageLambdaTimeout <sec>', 'Set timeout for lambda function handling image optimization.', Number, IMAGE_LAMBDA_DEFAULT_TIMEOUT)
@@ -104,7 +103,7 @@ program
 	.description('Remove Next application via CDK')
 	.option('--stackName <name>', 'Name of the stack to be deployed.', 'StandaloneNextjsStack-Temporary')
 	.option('--appPath <path>', 'Absolute path to app.', path.resolve(__dirname, '../dist/cdk/app.js'))
-	.option('--region <region>', 'AWS region to deploy to.', DEFAULT_REGION)
+	.option('--region <region>', 'AWS region to deploy to.', undefined)
 	.action(async (options) => {
 		console.log('Our config is: ', options)
 		const { stackName, appPath, region } = options

Diff for: lib/cli/deploy.ts

@@ -4,7 +4,7 @@ interface Props {
 	stackName: string
 	appPath: string
 	bootstrap: boolean
-	region: string
+	region?: string
 	lambdaMemory?: number
 	lambdaTimeout?: number
 	imageLambdaMemory?: number

Diff for: lib/cli/remove.ts

@@ -3,7 +3,7 @@ import { executeAsyncCmd } from '../utils'
 interface Props {
 	stackName: string
 	appPath: string
-	region: string
+	region?: string
 }
 
 const cdkExecutable = require.resolve('aws-cdk/bin/cdk')
@@ -14,7 +14,7 @@ export const removeHandler = async ({ appPath, stackName, region }: Props) => {
 
 	const variables = {
 		STACK_NAME: stackName,
-		AWS_REGION: region,
+		...(region && { AWS_REGION: region }),
 	}
 
 	await executeAsyncCmd({