@fy-stack/app-construct 0.0.143 → 0.0.145

package/dist/lib/ecs/apps/next-app-router-construct.d.ts

@@ -11,6 +11,7 @@ export declare class NextAppRouterConstruct extends Construct implements AppCons
     container: ecs.ContainerDefinition;
     queue: sqs.Queue | undefined;
     private readonly static;
+    private readonly files;
     constructor(scope: Construct, id: string, props: NextAppRouterProps);
     cloudfront(path: string): Record<string, cloudfront.BehaviorOptions>;
     cloudfrontPolicy(distributionId: string): void;

package/dist/lib/ecs/apps/next-app-router-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"next-app-router-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/apps/next-app-router-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AASvC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,KAAK,kBAAkB,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;AAEjD,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IAMjC,OAAO,CAAC,KAAK;IALhD,SAAS,EAAE,GAAG,CAAC,mBAAmB,CAAC;IACnC,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;gBAEvB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAU,KAAK,EAAE,kBAAkB;IAe3E,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAiBpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAI3C,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAO7C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}
+{"version":3,"file":"next-app-router-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/apps/next-app-router-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AASvC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,KAAK,kBAAkB,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;AAEjD,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IAOjC,OAAO,CAAC,KAAK;IANhD,SAAS,EAAE,GAAG,CAAC,mBAAmB,CAAC;IACnC,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAU;gBAEpB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAU,KAAK,EAAE,kBAAkB;IAiB3E,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAcpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAI3C,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAO7C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}

package/dist/lib/ecs/apps/next-app-router-construct.js

@@ -10,17 +10,20 @@ class NextAppRouterConstruct extends constructs_1.Construct {
     container;
     queue;
     static;
+    files;
     constructor(scope, id, props) {
         super(scope, id);
         this.props = props;
-        this.static = (0, next_app_router_1.staticDeployment)(this, props.output);
+        const deployment = (0, next_app_router_1.staticDeployment)(this, props.output);
+        this.static = deployment.staticBucket;
+        this.files = deployment.files;
         this.container = (0, taskDefinitionImage_1.taskDefinitionImage)(`${props.appName}AppContainer`, {
             taskDefinition: props.taskDefinition,
             port: props.port,
             env: props.env,
             output: props.output,
             container: props.container,
-            environmentPath: props.environmentPath
+            environmentPath: props.environmentPath,
         });
     }
     cloudfront(path) {
@@ -28,10 +31,7 @@ class NextAppRouterConstruct extends constructs_1.Construct {
         if (!origin)
             throw new Error('No server origin');
         this.container.addEnvironment('BASE_PATH', basePath);
-        return {
-            ...(0, next_app_router_1.serverCloudfrontBehaviour)(this, origin, path),
-            ...(0, next_app_router_1.staticCloudfrontBehaviour)(this.static, path),
-        };
+        return (0, next_app_router_1.cloudfrontBehaviours)(this, this.static, origin, path, this.files);
     }
     cloudfrontPolicy(distributionId) {
         throw new Error(`cloudfrontPolicy not supported for ${this}`);

package/dist/lib/ecs/apps/task-construct.d.ts

@@ -6,7 +6,7 @@ import { Construct } from 'constructs';
 import { TaskConstructsProps } from '../types';
 export declare class TaskConstruct extends Construct implements EventResource, Grant, Attach {
     private props;
-    taskDefinition: ecs.FargateTaskDefinition;
+    definition: ecs.FargateTaskDefinition;
     constructor(scope: Construct, id: string, props: TaskConstructsProps);
     subscription(props: snsSubscription.SubscriptionProps): sns.ITopicSubscription;
     grant(...grantables: Grantable[]): void;

package/dist/lib/ecs/apps/task-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/apps/task-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,UAAU,EACV,aAAa,EACb,KAAK,EACL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAI3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,eAAe,MAAM,mCAAmC,CAAC;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,qBAAa,aACX,SAAQ,SACR,YAAW,aAAa,EAAE,KAAK,EAAE,MAAM;IAOrC,OAAO,CAAC,KAAK;IALR,cAAc,EAAE,GAAG,CAAC,qBAAqB,CAAC;gBAG/C,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,mBAAmB;IAgCpC,YAAY,CACV,KAAK,EAAE,eAAe,CAAC,iBAAiB,GACvC,GAAG,CAAC,kBAAkB;IA6CzB,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAMvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAS7C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}
+{"version":3,"file":"task-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/apps/task-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,UAAU,EACV,aAAa,EACb,KAAK,EACL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAI3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,eAAe,MAAM,mCAAmC,CAAC;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,qBAAa,aACX,SAAQ,SACR,YAAW,aAAa,EAAE,KAAK,EAAE,MAAM;IAOrC,OAAO,CAAC,KAAK;IALR,UAAU,EAAE,GAAG,CAAC,qBAAqB,CAAC;gBAG3C,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,mBAAmB;IAgCpC,YAAY,CACV,KAAK,EAAE,eAAe,CAAC,iBAAiB,GACvC,GAAG,CAAC,kBAAkB;IA6CzB,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAMvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAS7C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}

package/dist/lib/ecs/apps/task-construct.js

@@ -13,12 +13,12 @@ const constructs_1 = require("constructs");
 const params_from_attachable_1 = require("../../util/params-from-attachable");
 class TaskConstruct extends constructs_1.Construct {
     props;
-    taskDefinition;
+    definition;
     constructor(scope, id, props) {
         super(scope, id);
         this.props = props;
         const { container, output, ...definitionProps } = props;
-        this.taskDefinition = new ecs.FargateTaskDefinition(this, 'Task', {
+        this.definition = new ecs.FargateTaskDefinition(this, 'Task', {
             cpu: 256,
             memoryLimitMiB: 512,
             runtimePlatform: {
@@ -28,7 +28,7 @@ class TaskConstruct extends constructs_1.Construct {
         });
         if (container) {
             const { image: imageProps, logDuration, ...containerProps } = container;
-            this.taskDefinition.addContainer('DefaultImage', {
+            this.definition.addContainer('DefaultImage', {
                 image: ecs.ContainerImage.fromAsset(output, {
                     platform: ecrAssets.Platform.LINUX_AMD64,
                     ...imageProps,
@@ -53,7 +53,7 @@ class TaskConstruct extends constructs_1.Construct {
             desiredState: 'RUNNING',
             targetParameters: {
                 ecsTaskParameters: {
-                    taskDefinitionArn: this.taskDefinition.taskDefinitionArn,
+                    taskDefinitionArn: this.definition.taskDefinitionArn,
                     launchType: 'FARGATE',
                     networkConfiguration: {
                         awsvpcConfiguration: {
@@ -76,7 +76,7 @@ class TaskConstruct extends constructs_1.Construct {
             },
         });
         queue.grantConsumeMessages(pipeRole);
-        this.taskDefinition.grantRun(pipeRole);
+        this.definition.grantRun(pipeRole);
         return new snsSubscription.SqsSubscription(queue, {
             ...props,
             rawMessageDelivery: true,
@@ -84,14 +84,14 @@ class TaskConstruct extends constructs_1.Construct {
     }
     grant(...grantables) {
         for (const i in grantables) {
-            grantables[i].grantable(this.taskDefinition.taskRole);
+            grantables[i].grantable(this.definition.taskRole);
         }
     }
     attach(attachable) {
         const params = {};
         Object.assign(params, ...(0, params_from_attachable_1.paramsFromAttachable)(attachable));
         for (const i in params) {
-            this.taskDefinition.defaultContainer?.addEnvironment(i, params[i]);
+            this.definition.defaultContainer?.addEnvironment(i, params[i]);
         }
     }
     static parse(params) {

package/dist/lib/ecs/ecs-server-construct.d.ts

@@ -13,8 +13,11 @@ type EcsServerConstructProps = EcsConstructProps['server'] & {
 export declare class EcsServerConstruct extends Construct implements Grant {
     private props;
     apps: Record<string, AppConstruct>;
-    private readonly appTaskDefinition;
-    private loadBalancer?;
+    definition: ecs.TaskDefinition;
+    loadBalancer?: {
+        alb: elbV2.IApplicationLoadBalancer;
+        listener: elbV2.IApplicationListener;
+    };
     constructor(scope: Construct, id: string, props: EcsServerConstructProps);
     grant(...grantables: Grantable[]): void;
     private serverOrigin;

package/dist/lib/ecs/ecs-server-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ecs-server-construct.d.ts","sourceRoot":"","sources":["../../../src/lib/ecs/ecs-server-construct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,KAAK,EAAE,SAAS,EAAgB,MAAM,iBAAiB,CAAC;AAG1E,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,wCAAwC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAO1D,KAAK,uBAAuB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,GAAG;IAC3D,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC;CACtB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,SAAU,YAAW,KAAK;IAY9D,OAAO,CAAC,KAAK;IAXR,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IAE/C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,OAAO,CAAC,YAAY,CAAC,CAGnB;gBAGA,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,uBAAuB;IAqExC,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAMvC,OAAO,CAAC,YAAY;IA8CpB,gBAAgB;;;;IAuChB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CA8CxC"}
+{"version":3,"file":"ecs-server-construct.d.ts","sourceRoot":"","sources":["../../../src/lib/ecs/ecs-server-construct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,KAAK,EAAE,SAAS,EAAgB,MAAM,iBAAiB,CAAC;AAG1E,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,wCAAwC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAO1D,KAAK,uBAAuB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,GAAG;IAC3D,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC;CACtB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,SAAU,YAAW,KAAK;IAY9D,OAAO,CAAC,KAAK;IAXR,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IACxC,UAAU,EAAE,GAAG,CAAC,cAAc,CAAC;IAE/B,YAAY,CAAC,EAAE;QACpB,GAAG,EAAE,KAAK,CAAC,wBAAwB,CAAC;QACpC,QAAQ,EAAE,KAAK,CAAC,oBAAoB,CAAC;KACtC,CAAC;gBAGA,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,uBAAuB;IAsExC,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAMvC,OAAO,CAAC,YAAY;IA8CpB,gBAAgB;;;;IAuChB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CA+CxC"}

package/dist/lib/ecs/ecs-server-construct.js

@@ -20,7 +20,7 @@ const AppBuilds = {
 class EcsServerConstruct extends constructs_1.Construct {
     props;
     apps = {};
-    appTaskDefinition;
+    definition;
     loadBalancer;
     constructor(scope, id, props) {
         super(scope, id);
@@ -29,7 +29,7 @@ class EcsServerConstruct extends constructs_1.Construct {
             vpc: props.vpc,
         });
         const { definition, apps, cluster, ...serverProps } = props;
-        this.appTaskDefinition = new ecs.FargateTaskDefinition(this, 'ServerTaskDefinition', {
+        this.definition = new ecs.FargateTaskDefinition(this, 'ServerTaskDefinition', {
             cpu: 256,
             memoryLimitMiB: 512,
             runtimePlatform: {
@@ -40,7 +40,7 @@ class EcsServerConstruct extends constructs_1.Construct {
         });
         const service = new ecs.FargateService(this, 'ServerService', {
             cluster,
-            taskDefinition: this.appTaskDefinition,
+            taskDefinition: this.definition,
             capacityProviderStrategies: [{ capacityProvider: 'FARGATE', weight: 1 }],
             desiredCount: 1,
             vpcSubnets: {
@@ -49,6 +49,7 @@ class EcsServerConstruct extends constructs_1.Construct {
                     : ec2.SubnetType.PRIVATE_WITH_EGRESS,
             },
             securityGroups: [appSecurityGroup],
+            propagateTags: ecs.PropagatedTagSource.SERVICE,
             ...serverProps,
         });
         const serverOrigin = (port, containerName, appPath, healthPath) => this.serverOrigin(service, port, containerName, appPath, healthPath);
@@ -62,7 +63,7 @@ class EcsServerConstruct extends constructs_1.Construct {
                     environmentPath: props.environmentPath,
                     buildParams: AppTypeConstruct.parse(app.buildParams ?? {}),
                     serverOrigin,
-                    taskDefinition: this.appTaskDefinition,
+                    taskDefinition: this.definition,
                     ...app,
                 }),
             ];
@@ -70,7 +71,7 @@ class EcsServerConstruct extends constructs_1.Construct {
     }
     grant(...grantables) {
         for (const i in grantables) {
-            grantables[i].grantable(this.appTaskDefinition.taskRole);
+            grantables[i].grantable(this.definition.taskRole);
         }
     }
     serverOrigin(service, port, containerName, appPath, healthPath) {
@@ -127,7 +128,7 @@ class EcsServerConstruct extends constructs_1.Construct {
         const configPath = './fy-stack.context.json';
         let config = {};
         let priorityRage = [0, 1000];
-        if (this.props.loadBalancer && "priorityRange" in this.props.loadBalancer) {
+        if (this.props.loadBalancer && 'priorityRange' in this.props.loadBalancer) {
             priorityRage = this.props.loadBalancer.priorityRange;
         }
         let priority = priorityRage[0];

package/dist/lib/lambda/apps/next-app-router-construct.d.ts

@@ -18,6 +18,7 @@ export declare class NextAppRouterConstruct extends Construct implements AppCons
     function: lambda.Function;
     queue: sqs.Queue | undefined;
     private readonly static;
+    private readonly files;
     constructor(scope: Construct, id: string, props: AppProperties<z.infer<typeof BuildParamsSchema>>);
     cloudfront(path: string): Record<string, cloudfront.BehaviorOptions>;
     cloudfrontPolicy(distributionId: string): void;

package/dist/lib/lambda/apps/next-app-router-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"next-app-router-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/next-app-router-construct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAIvD,QAAA,MAAM,iBAAiB;;;;;;EAErB,CAAC;AAEH,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IACpE,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;gBAGjC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAqCzD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAcpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAI3C,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAI7C,KAAK,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE;IAI5B,YAAY,IAAI,kBAAkB;IAIlC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;CAG7B"}
+{"version":3,"file":"next-app-router-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/next-app-router-construct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAIvD,QAAA,MAAM,iBAAiB;;;;;;EAErB,CAAC;AAEH,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IACpE,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAU;gBAG9B,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAwCzD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAiBpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAI3C,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAI7C,KAAK,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE;IAI5B,YAAY,IAAI,kBAAkB;IAIlC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;CAG7B"}

package/dist/lib/lambda/apps/next-app-router-construct.js

@@ -19,11 +19,14 @@ class NextAppRouterConstruct extends constructs_1.Construct {
     function;
     queue;
     static;
+    files;
     constructor(scope, id, props) {
         super(scope, id);
         const region = cdk.Stack.of(this).region;
-        this.static = (0, next_app_router_1.staticDeployment)(this, props.output);
-        const webAdapterLayer = lambda.LayerVersion.fromLayerVersionArn(this, 'WebAdapterLayer', `arn:aws:lambda:${region}:753240598075:layer:LambdaAdapterLayerX86:16`);
+        const deployment = (0, next_app_router_1.staticDeployment)(this, props.output);
+        this.static = deployment.staticBucket;
+        this.files = deployment.files;
+        const webAdapterLayer = lambda.LayerVersion.fromLayerVersionArn(this, 'WebAdapterLayer', `arn:aws:lambda:${region}:753240598075:layer:LambdaAdapterLayerX86:25`);
         const environment = {
             AWS_LAMBDA_EXEC_WRAPPER: '/opt/bootstrap',
             PORT: '8080',
@@ -50,10 +53,7 @@ class NextAppRouterConstruct extends constructs_1.Construct {
             invokeMode: lambda.InvokeMode.RESPONSE_STREAM,
         });
         const serverOrigin = new cloudfrontOrigin.FunctionUrlOrigin(webUrl);
-        return {
-            ...(0, next_app_router_1.serverCloudfrontBehaviour)(this, serverOrigin, path),
-            ...(0, next_app_router_1.staticCloudfrontBehaviour)(this.static, path),
-        };
+        return (0, next_app_router_1.cloudfrontBehaviours)(this, this.static, serverOrigin, path, this.files);
     }
     cloudfrontPolicy(distributionId) {
         throw new Error(`cloudfrontPolicy not supported for ${this}`);

package/dist/lib/shared/next-app-router.d.ts

@@ -1,12 +1,20 @@
 import * as cdk from 'aws-cdk-lib';
 import * as cloudfront from 'aws-cdk-lib/aws-cloudfront';
 import * as s3 from 'aws-cdk-lib/aws-s3';
+import * as s3Deploy from 'aws-cdk-lib/aws-s3-deployment';
 import { Construct } from 'constructs';
-export declare function staticDeployment(app: Construct, output: string): cdk.aws_s3.Bucket;
-export declare function staticCloudfrontBehaviour(staticBucket: s3.Bucket, basePath: string): {
-    [x: string]: cdk.aws_cloudfront.BehaviorOptions;
+export type AppFile = {
+    staticFiles: s3Deploy.ISource;
+    publicFiles: s3Deploy.ISource;
+};
+export declare function staticDeployment(app: Construct, output: string): {
+    staticBucket: cdk.aws_s3.Bucket;
+    files: {
+        staticFiles: cdk.aws_s3_deployment.ISource;
+        publicFiles: cdk.aws_s3_deployment.ISource;
+    };
 };
-export declare function serverCloudfrontBehaviour(app: Construct, serverOrigin: cloudfront.IOrigin, basePath: string): {
+export declare function cloudfrontBehaviours(app: Construct, staticBucket: s3.Bucket, serverOrigin: cloudfront.IOrigin, basePath: string, files: AppFile): {
     [x: string]: cdk.aws_cloudfront.BehaviorOptions;
 };
 //# sourceMappingURL=next-app-router.d.ts.map

package/dist/lib/shared/next-app-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"next-app-router.d.ts","sourceRoot":"","sources":["../../../src/lib/shared/next-app-router.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,qBAgC9D;AAED,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,EAAE,CAAC,MAAM,EACvB,QAAQ,EAAE,MAAM;;EAqBjB;AAED,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,SAAS,EACd,YAAY,EAAE,UAAU,CAAC,OAAO,EAChC,QAAQ,EAAE,MAAM;;EA6BjB"}
+{"version":3,"file":"next-app-router.d.ts","sourceRoot":"","sources":["../../../src/lib/shared/next-app-router.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC;IAC9B,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC;CAC/B,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM;;;;;;EAsC9D;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,SAAS,EACd,YAAY,EAAE,EAAE,CAAC,MAAM,EACvB,YAAY,EAAE,UAAU,CAAC,OAAO,EAChC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO;;EA+Df"}

package/dist/lib/shared/next-app-router.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.staticDeployment = staticDeployment;
-exports.staticCloudfrontBehaviour = staticCloudfrontBehaviour;
-exports.serverCloudfrontBehaviour = serverCloudfrontBehaviour;
+exports.cloudfrontBehaviours = cloudfrontBehaviours;
 const tslib_1 = require("tslib");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const cdk = tslib_1.__importStar(require("aws-cdk-lib"));
@@ -26,21 +25,41 @@ function staticDeployment(app, output) {
             },
         ],
     });
+    const staticFiles = s3Deploy.Source.asset(node_path_1.default.join(output, '/.next/static'));
+    const publicFiles = s3Deploy.Source.asset(node_path_1.default.join(output, '/public'));
     new s3Deploy.BucketDeployment(app, `StaticDeployment`, {
         destinationBucket: staticBucket,
-        sources: [s3Deploy.Source.asset(node_path_1.default.join(output, '/.next/static'))],
+        sources: [staticFiles],
         destinationKeyPrefix: '_next/static',
         retainOnDelete: false,
     });
     new s3Deploy.BucketDeployment(app, `PublicDeployment`, {
         destinationBucket: staticBucket,
-        sources: [s3Deploy.Source.asset(node_path_1.default.join(output, '/public'))],
+        sources: [publicFiles],
         destinationKeyPrefix: '',
         retainOnDelete: false,
     });
-    return staticBucket;
+    return {
+        staticBucket,
+        files: { staticFiles, publicFiles },
+    };
 }
-function staticCloudfrontBehaviour(staticBucket, basePath) {
+function cloudfrontBehaviours(app, staticBucket, serverOrigin, basePath, files) {
+    if (basePath) {
+        // redeploy files for apps hosted in sub path
+        new s3Deploy.BucketDeployment(app, `${basePath}StaticDeployment`, {
+            destinationBucket: staticBucket,
+            sources: [files.staticFiles],
+            destinationKeyPrefix: `${basePath}/_next/static`,
+            retainOnDelete: false,
+        });
+        new s3Deploy.BucketDeployment(app, `${basePath}PublicDeployment`, {
+            destinationBucket: staticBucket,
+            sources: [files.publicFiles],
+            destinationKeyPrefix: basePath,
+            retainOnDelete: false,
+        });
+    }
     const staticOrigin = new cloudfrontOrigin.S3StaticWebsiteOrigin(staticBucket);
     const staticBehavior = {
         origin: staticOrigin,
@@ -50,16 +69,6 @@ function staticCloudfrontBehaviour(staticBucket, basePath) {
         compress: true,
         viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
     };
-    return {
-        [`${basePath}/_next/*`]: staticBehavior,
-        [`${basePath}/*.ico`]: staticBehavior,
-        [`${basePath}/*.png`]: staticBehavior,
-        [`${basePath}/*.svg`]: staticBehavior,
-        [`${basePath}/*.jpg`]: staticBehavior,
-        [`${basePath}/*.jpeg`]: staticBehavior,
-    };
-}
-function serverCloudfrontBehaviour(app, serverOrigin, basePath) {
     const imageCachePolicy = new cloudfront.CachePolicy(app, 'ImagePolicy', {
         queryStringBehavior: cloudfront.CacheQueryStringBehavior.all(),
         maxTtl: cdk.Duration.days(365),
@@ -77,11 +86,17 @@ function serverCloudfrontBehaviour(app, serverOrigin, basePath) {
             .CORS_ALLOW_ALL_ORIGINS_WITH_PREFLIGHT_AND_SECURITY_HEADERS,
     };
     return {
-        [`${basePath}/*`]: appBehaviour,
         [`${basePath}/_next/image`]: {
             ...appBehaviour,
             cachePolicy: imageCachePolicy,
             allowedMethods: cloudfront.AllowedMethods.ALLOW_GET_HEAD,
         },
+        [`${basePath}/_next/*`]: staticBehavior,
+        [`${basePath}/*.ico`]: staticBehavior,
+        [`${basePath}/*.png`]: staticBehavior,
+        [`${basePath}/*.svg`]: staticBehavior,
+        [`${basePath}/*.jpg`]: staticBehavior,
+        [`${basePath}/*.jpeg`]: staticBehavior,
+        [`${basePath}/*`]: appBehaviour,
     };
 }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@fy-stack/app-construct",
-  "version": "0.0.143",
+  "version": "0.0.145",
   "repository": "https://github.com/festusyuma/fy-stack",
   "dependencies": {
-    "@fy-stack/types": "0.0.143",
+    "@fy-stack/types": "0.0.145",
     "tslib": "^2.3.0",
     "zod": "^3.24.1"
   },