@jaypie/constructs 1.1.59 → 1.1.61

package/dist/cjs/JaypieEnvSecret.d.ts

@@ -17,7 +17,7 @@ export interface JaypieEnvSecretProps {
 export declare class JaypieEnvSecret extends Construct implements ISecret {
     private readonly _envKey?;
     private readonly _secret;
-    constructor(scope: Construct, id: string, props?: JaypieEnvSecretProps);
+    constructor(scope: Construct, idOrEnvKey: string, props?: JaypieEnvSecretProps);
     get stack(): Stack;
     get env(): {
         account: string;

package/dist/cjs/JaypieNextJs.d.ts

@@ -13,5 +13,6 @@ export interface JaypieNextjsProps {
     secrets?: JaypieEnvSecret[];
 }
 export declare class JaypieNextJs extends Construct {
+    readonly domainName: string;
     constructor(scope: Construct, id: string, props?: JaypieNextjsProps);
 }

package/dist/cjs/index.cjs

@@ -19,7 +19,6 @@ 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');
@@ -1691,9 +1690,17 @@ function exportEnvName(name, env = process.env) {
     return cleanName(rawName);
 }
 class JaypieEnvSecret extends constructs.Construct {
-    constructor(scope, id, props) {
+    constructor(scope, idOrEnvKey, props) {
+        // Check if idOrEnvKey should be treated as envKey:
+        // - No props provided OR props.envKey is not set
+        // - AND idOrEnvKey exists as a non-empty string in process.env
+        const treatAsEnvKey = (!props || props.envKey === undefined) &&
+            typeof process.env[idOrEnvKey] === "string" &&
+            process.env[idOrEnvKey] !== "";
+        const id = treatAsEnvKey ? `EnvSecret_${idOrEnvKey}` : idOrEnvKey;
         super(scope, id);
-        const { consumer = checkEnvIsConsumer(), envKey, export: exportParam, generateSecretString, provider = checkEnvIsProvider(), roleTag, vendorTag, value, } = props || {};
+        const { consumer = checkEnvIsConsumer(), envKey: envKeyProp, export: exportParam, generateSecretString, provider = checkEnvIsProvider(), roleTag, vendorTag, value, } = props || {};
+        const envKey = treatAsEnvKey ? idOrEnvKey : envKeyProp;
         this._envKey = envKey;
         let exportName;
         if (!exportParam) {
@@ -2199,7 +2206,8 @@ class JaypieMongoDbSecret extends JaypieEnvSecret {
 class JaypieNextJs extends constructs.Construct {
     constructor(scope, id, props) {
         super(scope, id);
-        const domainName = props?.domainName || constructs$1.envHostname();
+        const domainName = props?.domainName || envHostname();
+        this.domainName = domainName;
         const domainNameSanitized = domainName
             .replace(/\./g, "-")
             .replace(/[^a-zA-Z0-9]/g, "_");
@@ -2224,18 +2232,30 @@ class JaypieNextJs extends constructs.Construct {
             }
             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 cdkNextjsStandalone.Nextjs(this, "NextJsApp", {
             nextjsPath,
             domainProps: {
                 domainName,
-                hostedZone: constructs$1.resolveHostedZone(this, {
+                hostedZone: resolveHostedZone(this, {
                     zone: props?.hostedZone,
                 }),
             },
             environment: {
-                ...constructs$1.jaypieLambdaEnv(),
+                ...jaypieLambdaEnv(),
                 ...secretsEnvironment,
                 ...jaypieSecretsEnvironment,
+                ...nextPublicEnv,
+                NEXT_PUBLIC_SITE_URL: `https://${domainName}`,
             },
             overrides: {
                 nextjsDistribution: {