more placeholder stuff - add retries

src/Nextjs.ts

@@ -230,7 +230,7 @@ export class Nextjs extends Construct {
     });
     this.bucket = this.assetsDeployment.bucket;
 
-    this.originAccessIdentity = new cloudfront.OriginAccessIdentity(this, 'OAI(', {
+    this.originAccessIdentity = new cloudfront.OriginAccessIdentity(this, 'OAI', {
       comment: 'Allows CloudFront to access S3 bucket with assets',
     });
 
@@ -239,7 +239,7 @@ export class Nextjs extends Construct {
       new iam.PolicyStatement({
         // only allow getting of files - not listing
         actions: ['s3:GetObject'],
-        resources: [`${this.bucket.bucketArn}/*`],
+        resources: [this.bucket.arnForObjects('*')],
         principals: [this.originAccessIdentity.grantPrincipal],
       })
     );
@@ -253,7 +253,9 @@ export class Nextjs extends Construct {
       ? this.createCloudFrontDistributionForStub()
       : this.createCloudFrontDistribution();
     // wait for asset deployments to finish
-    this.assetsDeployment.deployments.forEach((s3Deployment) => this.distribution.node.addDependency(s3Deployment));
+    this.assetsDeployment.deployments.forEach((s3Deployment) =>
+      this.distribution.node.addDependency(s3Deployment.deployedBucket)
+    );
 
     // // Invalidate CloudFront (might already be handled by deployments?)
     // const invalidationCR = this.createCloudFrontInvalidation();

src/NextjsAssetsDeployment.ts

@@ -10,13 +10,7 @@ import { Construct } from 'constructs';
 import * as fs from 'fs-extra';
 import * as micromatch from 'micromatch';
 import { NextjsBaseProps } from './NextjsBase';
-import {
-  createArchive,
-  makeTokenPlaceholder,
-  NextjsBuild,
-  replaceTokenGlobs,
-  TOKEN_PLACEHOLDER_BEGIN,
-} from './NextjsBuild';
+import { createArchive, makeTokenPlaceholder, NextjsBuild, replaceTokenGlobs } from './NextjsBuild';
 
 export interface NextjsAssetsDeploymentProps extends NextjsBaseProps {
   /**
@@ -330,7 +324,7 @@ exports.handler = async (event) => {
 
     Object.entries(this.props.environment || {})
       .filter(([, value]) => Token.isUnresolved(value))
-      .filter(([key]) => key.startsWith(TOKEN_PLACEHOLDER_BEGIN + 'NEXT_PUBLIC_')) // don't replace server-only env vars
+      .filter(([key]) => key.startsWith('NEXT_PUBLIC_')) // don't replace server-only env vars
       .forEach(([key, value]) => {
         const token = makeTokenPlaceholder(key);
         replacements[token] = value.toString();

src/NextjsBuild.ts

@@ -256,9 +256,7 @@ export function getBuildCmdEnvironment(siteEnvironment?: { [key: string]: string
   //
   const buildCmdEnvironment: Record<string, string> = {};
   Object.entries(siteEnvironment || {}).forEach(([key, value]) => {
-    buildCmdEnvironment[key] = Token.isUnresolved(value)
-      ? TOKEN_PLACEHOLDER_BEGIN + key.toString() + TOKEN_PLACEHOLDER_END
-      : value;
+    buildCmdEnvironment[key] = Token.isUnresolved(value) ? makeTokenPlaceholder(key) : value;
   });
 
   return buildCmdEnvironment;