@jaypie/constructs 1.1.56 → 1.1.58

package/dist/cjs/JaypieDatadogBucket.d.ts

@@ -4,9 +4,19 @@ import { Construct } from "constructs";
 export interface JaypieDatadogBucketProps extends BucketProps {
     /**
      * Optional construct ID
-     * @default "DatadogArchiveBucket"
+     * @default "JaypieDatadogBucket"
      */
     id?: string;
+    /**
+     * The scope to use when creating the S3 bucket
+     * @default this (the construct itself)
+     */
+    bucketScope?: Construct;
+    /**
+     * The ID to use for the S3 bucket construct
+     * @default "DatadogArchiveBucket"
+     */
+    bucketId?: string;
     /**
      * The service tag value
      * @default CDK.SERVICE.DATADOG

package/dist/cjs/JaypieNextJs.d.ts

@@ -0,0 +1,11 @@
+import { IHostedZone } from "aws-cdk-lib/aws-route53";
+import { Construct } from "constructs";
+export interface JaypieNextjsProps {
+    domainName?: string;
+    datadogApiKeyArn?: string;
+    hostedZone?: IHostedZone | string;
+    nextjsPath?: string;
+}
+export declare class JaypieNextJs extends Construct {
+    constructor(scope: Construct, id: string, props?: JaypieNextjsProps);
+}

package/dist/cjs/JaypieNextJs.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/cjs/helpers/resolveParamsAndSecrets.d.ts

@@ -6,7 +6,7 @@ export interface ResolveParamsAndSecretsOptions {
     parameterStoreTtl?: Duration;
     secretsManagerTtl?: Duration;
 }
-export declare const resolveParamsAndSecrets: ({ paramsAndSecrets, options, }: {
+export declare const resolveParamsAndSecrets: ({ paramsAndSecrets, options, }?: {
     paramsAndSecrets?: lambda.ParamsAndSecretsLayerVersion | boolean;
     options?: ResolveParamsAndSecretsOptions;
 }) => lambda.ParamsAndSecretsLayerVersion | undefined;

package/dist/cjs/index.cjs

@@ -19,6 +19,9 @@ var lambdaEventSources = require('aws-cdk-lib/aws-lambda-event-sources');
 var awsEvents = require('aws-cdk-lib/aws-events');
 var awsEventsTargets = require('aws-cdk-lib/aws-events-targets');
 var awsLogs = require('aws-cdk-lib/aws-logs');
+var constructs$1 = require('@jaypie/constructs');
+var cdkNextjsStandalone = require('cdk-nextjs-standalone');
+var path = require('path');
 var awsCloudtrail = require('aws-cdk-lib/aws-cloudtrail');
 var awsSso = require('aws-cdk-lib/aws-sso');
 var awsSam = require('aws-cdk-lib/aws-sam');
@@ -54,6 +57,7 @@ var logDestinations__namespace = /*#__PURE__*/_interopNamespaceDefault(logDestin
 var s3n__namespace = /*#__PURE__*/_interopNamespaceDefault(s3n);
 var sqs__namespace = /*#__PURE__*/_interopNamespaceDefault(sqs);
 var lambdaEventSources__namespace = /*#__PURE__*/_interopNamespaceDefault(lambdaEventSources);
+var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 var cloudfront__namespace = /*#__PURE__*/_interopNamespaceDefault(cloudfront);
 var origins__namespace = /*#__PURE__*/_interopNamespaceDefault(origins);
 
@@ -695,7 +699,7 @@ function resolveHostedZone(scope, { name = "HostedZone", zone = process.env.CDK_
     return zone;
 }
 
-const resolveParamsAndSecrets = ({ paramsAndSecrets, options, }) => {
+const resolveParamsAndSecrets = ({ paramsAndSecrets, options, } = {}) => {
     if (paramsAndSecrets === false) {
         return;
     }
@@ -1502,14 +1506,14 @@ class JaypieDatadogBucket extends constructs.Construct {
         else {
             // First param is props
             props = idOrProps || {};
-            id = props.id || "DatadogArchiveBucket";
+            id = props.id || "JaypieDatadogBucket";
         }
         super(scope, id);
         // Extract Jaypie-specific options
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { grantDatadogAccess = true, id: _id, project, service = CDK$2.SERVICE.DATADOG, ...bucketProps } = props;
-        // Create the bucket
-        this.bucket = new s3.Bucket(this, "Bucket", bucketProps);
+        const { bucketId = "DatadogArchiveBucket", bucketScope, grantDatadogAccess = true, project, service = CDK$2.SERVICE.DATADOG, ...bucketProps } = props;
+        // Create the bucket using bucketScope (defaults to this) and bucketId
+        const effectiveBucketScope = bucketScope || this;
+        this.bucket = new s3.Bucket(effectiveBucketScope, bucketId, bucketProps);
         // Add tags to bucket
         cdk__namespace.Tags.of(this.bucket).add(CDK$2.TAG.SERVICE, service);
         cdk__namespace.Tags.of(this.bucket).add(CDK$2.TAG.ROLE, CDK$2.ROLE.MONITORING);
@@ -2191,6 +2195,41 @@ class JaypieMongoDbSecret extends JaypieEnvSecret {
     }
 }
 
+class JaypieNextJs extends constructs.Construct {
+    constructor(scope, id, props) {
+        super(scope, id);
+        const domainName = props?.domainName || constructs$1.envHostname();
+        const nextjsPath = props?.nextjsPath?.startsWith("..")
+            ? path__namespace.join(process.cwd(), props.nextjsPath)
+            : props?.nextjsPath || path__namespace.join(process.cwd(), "..", "nextjs");
+        const paramsAndSecrets = resolveParamsAndSecrets();
+        const nextjs = new cdkNextjsStandalone.Nextjs(this, "NextJsApp", {
+            nextjsPath,
+            domainProps: {
+                domainName,
+                hostedZone: constructs$1.resolveHostedZone(this, {
+                    zone: props?.hostedZone,
+                }),
+            },
+            environment: constructs$1.jaypieLambdaEnv(),
+            overrides: {
+                nextjsServer: {
+                    functionProps: {
+                        paramsAndSecrets,
+                    },
+                },
+                nextjsImage: {
+                    functionProps: {
+                        paramsAndSecrets,
+                    },
+                },
+            },
+        });
+        addDatadogLayers(nextjs.imageOptimizationFunction);
+        addDatadogLayers(nextjs.serverFunction.lambdaFunction);
+    }
+}
+
 class JaypieOpenAiSecret extends JaypieEnvSecret {
     constructor(scope, id = "OpenAiApiKey", props) {
         const defaultProps = {
@@ -2929,6 +2968,7 @@ exports.JaypieHostedZone = JaypieHostedZone;
 exports.JaypieInfrastructureStack = JaypieInfrastructureStack;
 exports.JaypieLambda = JaypieLambda;
 exports.JaypieMongoDbSecret = JaypieMongoDbSecret;
+exports.JaypieNextJs = JaypieNextJs;
 exports.JaypieOpenAiSecret = JaypieOpenAiSecret;
 exports.JaypieOrganizationTrail = JaypieOrganizationTrail;
 exports.JaypieQueuedLambda = JaypieQueuedLambda;