@jaypie/constructs 1.1.58 → 1.1.60

package/dist/esm/JaypieNextJs.d.ts

@@ -1,11 +1,18 @@
 import { IHostedZone } from "aws-cdk-lib/aws-route53";
+import * as secretsmanager from "aws-cdk-lib/aws-secretsmanager";
 import { Construct } from "constructs";
+import { JaypieEnvSecret } from "./JaypieEnvSecret.js";
 export interface JaypieNextjsProps {
-    domainName?: string;
     datadogApiKeyArn?: string;
+    domainName?: string;
+    envSecrets?: {
+        [key: string]: secretsmanager.ISecret;
+    };
     hostedZone?: IHostedZone | string;
     nextjsPath?: string;
+    secrets?: JaypieEnvSecret[];
 }
 export declare class JaypieNextJs extends Construct {
+    readonly domainName: string;
     constructor(scope: Construct, id: string, props?: JaypieNextjsProps);
 }

package/dist/esm/index.js

@@ -21,7 +21,6 @@ import * as lambdaEventSources from 'aws-cdk-lib/aws-lambda-event-sources';
 import { Rule, RuleTargetInput } from 'aws-cdk-lib/aws-events';
 import { LambdaFunction } from 'aws-cdk-lib/aws-events-targets';
 import { LogGroup, RetentionDays, FilterPattern } from 'aws-cdk-lib/aws-logs';
-import { envHostname as envHostname$1, jaypieLambdaEnv as jaypieLambdaEnv$1, resolveHostedZone as resolveHostedZone$1 } from '@jaypie/constructs';
 import { Nextjs } from 'cdk-nextjs-standalone';
 import * as path from 'path';
 import { Trail, ReadWriteType } from 'aws-cdk-lib/aws-cloudtrail';
@@ -362,10 +361,11 @@ function envHostname({ component, domain, env, subdomain, } = {}) {
     const resolvedComponent = component === "@" || component === "" ? undefined : component;
     const resolvedSubdomain = subdomain || process.env.CDK_ENV_SUBDOMAIN;
     const resolvedEnv = env || process.env.PROJECT_ENV;
+    const filteredEnv = resolvedEnv === CDK$2.ENV.PRODUCTION ? undefined : resolvedEnv;
     const parts = [
         resolvedComponent,
         resolvedSubdomain,
-        resolvedEnv,
+        filteredEnv,
         resolvedDomain,
     ].filter((part) => part);
     return parts.join(".");
@@ -2167,27 +2167,72 @@ class JaypieMongoDbSecret extends JaypieEnvSecret {
 class JaypieNextJs extends Construct {
     constructor(scope, id, props) {
         super(scope, id);
-        const domainName = props?.domainName || envHostname$1();
+        const domainName = props?.domainName || envHostname();
+        this.domainName = domainName;
+        const domainNameSanitized = domainName
+            .replace(/\./g, "-")
+            .replace(/[^a-zA-Z0-9]/g, "_");
+        const envSecrets = props?.envSecrets || {};
         const nextjsPath = props?.nextjsPath?.startsWith("..")
             ? path.join(process.cwd(), props.nextjsPath)
             : props?.nextjsPath || path.join(process.cwd(), "..", "nextjs");
         const paramsAndSecrets = resolveParamsAndSecrets();
+        const secrets = props?.secrets || [];
+        // Process secrets environment variables
+        const secretsEnvironment = Object.entries(envSecrets).reduce((acc, [key, secret]) => ({
+            ...acc,
+            [`SECRET_${key}`]: secret.secretName,
+        }), {});
+        // Process JaypieEnvSecret array
+        const jaypieSecretsEnvironment = secrets.reduce((acc, secret) => {
+            if (secret.envKey) {
+                return {
+                    ...acc,
+                    [`SECRET_${secret.envKey}`]: secret.secretName,
+                };
+            }
+            return acc;
+        }, {});
+        // Process NEXT_PUBLIC_ environment variables
+        const nextPublicEnv = Object.entries(process.env).reduce((acc, [key, value]) => {
+            if (key.startsWith("NEXT_PUBLIC_") && value) {
+                return {
+                    ...acc,
+                    [key]: value,
+                };
+            }
+            return acc;
+        }, {});
         const nextjs = new Nextjs(this, "NextJsApp", {
             nextjsPath,
             domainProps: {
                 domainName,
-                hostedZone: resolveHostedZone$1(this, {
+                hostedZone: resolveHostedZone(this, {
                     zone: props?.hostedZone,
                 }),
             },
-            environment: jaypieLambdaEnv$1(),
+            environment: {
+                ...jaypieLambdaEnv(),
+                ...secretsEnvironment,
+                ...jaypieSecretsEnvironment,
+                ...nextPublicEnv,
+                NEXT_PUBLIC_SITE_URL: `https://${domainName}`,
+            },
             overrides: {
-                nextjsServer: {
+                nextjsDistribution: {
+                    imageCachePolicyProps: {
+                        cachePolicyName: `NextJsImageCachePolicy-${domainNameSanitized}`,
+                    },
+                    serverCachePolicyProps: {
+                        cachePolicyName: `NextJsServerCachePolicy-${domainNameSanitized}`,
+                    },
+                },
+                nextjsImage: {
                     functionProps: {
                         paramsAndSecrets,
                     },
                 },
-                nextjsImage: {
+                nextjsServer: {
                     functionProps: {
                         paramsAndSecrets,
                     },
@@ -2196,6 +2241,14 @@ class JaypieNextJs extends Construct {
         });
         addDatadogLayers(nextjs.imageOptimizationFunction);
         addDatadogLayers(nextjs.serverFunction.lambdaFunction);
+        // Grant secret read permissions
+        Object.values(envSecrets).forEach((secret) => {
+            secret.grantRead(nextjs.serverFunction.lambdaFunction);
+        });
+        // Grant read permissions for JaypieEnvSecrets
+        secrets.forEach((secret) => {
+            secret.grantRead(nextjs.serverFunction.lambdaFunction);
+        });
     }
 }