@fy-stack/app-construct 0.0.147-alpha.304 → 0.0.147-alpha.3042

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

@@ -1 +1 @@
-{"version":3,"file":"image-app-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/apps/image-app-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAEL,eAAe,EAKhB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,qBAAa,iBAAkB,SAAQ,SAAU,YAAW,YAAY;IAMpE,OAAO,CAAC,KAAK;IALR,SAAS,EAAE,GAAG,CAAC,mBAAmB,CAAC;gBAGxC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC;IAMvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI;IAOpD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAyBzD,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAIvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}
+{"version":3,"file":"image-app-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/apps/image-app-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAEL,eAAe,EAKhB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,qBAAa,iBAAkB,SAAQ,SAAU,YAAW,YAAY;IAMpE,OAAO,CAAC,KAAK;IALR,SAAS,EAAE,GAAG,CAAC,mBAAmB,CAAC;gBAGxC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC;IAUvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI;IAOpD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAyBzD,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAIvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}

package/dist/lib/ecs/apps/image-app-construct.js

@@ -11,7 +11,7 @@ class ImageAppConstruct extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
         this.props = props;
-        this.container = (0, taskDefinitionImage_1.taskDefinitionImage)(`${props.appName}AppContainer`, props);
+        this.container = (0, taskDefinitionImage_1.taskDefinitionImage)(this, `${props.appName}AppContainer`, props);
     }
     attach(attachable) {
         const params = Object.assign({}, ...(0, params_from_attachable_1.paramsFromAttachable)(attachable));

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;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;IAS3E,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"}
+{"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,CAAa;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAU;gBAEpB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAU,KAAK,EAAE,kBAAkB;IA4B3E,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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NextAppRouterConstruct = void 0;
+const tslib_1 = require("tslib");
+const s3 = tslib_1.__importStar(require("aws-cdk-lib/aws-s3"));
 const constructs_1 = require("constructs");
 const next_app_router_1 = require("../../shared/next-app-router");
 const params_from_attachable_1 = require("../../util/params-from-attachable");
@@ -14,10 +16,19 @@ class NextAppRouterConstruct extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
         this.props = props;
-        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`, props);
+        if ('output' in props) {
+            const deployment = (0, next_app_router_1.staticDeployment)(this, props.output);
+            this.static = deployment.staticBucket;
+            this.files = deployment.files;
+        }
+        else {
+            if (!props.reference.static || !props.reference.files) {
+                throw new Error('Static bucket reference and files are required');
+            }
+            this.static = s3.Bucket.fromBucketName(this, 'StaticBucket', props.reference.static);
+            this.files = props.reference.files;
+        }
+        this.container = (0, taskDefinitionImage_1.taskDefinitionImage)(this, `${props.appName}AppContainer`, props);
     }
     cloudfront(path) {
         const { origin, basePath } = this.props.serverOrigin(this.props.port, this.container.containerName, path, '/');

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;AAG3C,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"}
+{"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;AACzB,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,eAAe,MAAM,mCAAmC,CAAC;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,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;IAsBpC,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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskConstruct = void 0;
 const tslib_1 = require("tslib");
-const ecrAssets = tslib_1.__importStar(require("aws-cdk-lib/aws-ecr-assets"));
 const ecs = tslib_1.__importStar(require("aws-cdk-lib/aws-ecs"));
 const iam = tslib_1.__importStar(require("aws-cdk-lib/aws-iam"));
 const pipes = tslib_1.__importStar(require("aws-cdk-lib/aws-pipes"));
@@ -10,35 +9,27 @@ const snsSubscription = tslib_1.__importStar(require("aws-cdk-lib/aws-sns-subscr
 const sqs = tslib_1.__importStar(require("aws-cdk-lib/aws-sqs"));
 const constructs_1 = require("constructs");
 const params_from_attachable_1 = require("../../util/params-from-attachable");
+const taskDefinitionImage_1 = require("../shared/taskDefinitionImage");
 class TaskConstruct extends constructs_1.Construct {
     props;
     definition;
     constructor(scope, id, props) {
         super(scope, id);
         this.props = props;
-        const { container, output, ...definitionProps } = props;
+        const { definition, cluster, taskName, vpc, ...containerProps } = props;
         this.definition = new ecs.FargateTaskDefinition(this, 'Task', {
             cpu: 256,
             memoryLimitMiB: 512,
             runtimePlatform: {
                 cpuArchitecture: ecs.CpuArchitecture.X86_64,
             },
-            ...definitionProps,
+            ...props.definition,
+        });
+        (0, taskDefinitionImage_1.taskDefinitionImage)(this, 'DefaultImage', {
+            port: 8080,
+            taskDefinition: this.definition,
+            ...containerProps,
         });
-        if (container) {
-            const { image: imageProps, logDuration, ...containerProps } = container;
-            this.definition.addContainer('DefaultImage', {
-                image: ecs.ContainerImage.fromAsset(output, {
-                    platform: ecrAssets.Platform.LINUX_AMD64,
-                    ...imageProps,
-                }),
-                logging: new ecs.AwsLogDriver({
-                    streamPrefix: `${props.taskName}TaskContainer`,
-                    logGroup: props.logGroup,
-                }),
-                ...containerProps,
-            });
-        }
     }
     subscription(props) {
         const queue = new sqs.Queue(this, 'TaskQueue');

package/dist/lib/ecs/shared/taskDefinitionImage.d.ts

@@ -1,14 +1,7 @@
 import * as ecs from 'aws-cdk-lib/aws-ecs';
-import type { LogGroup } from 'aws-cdk-lib/aws-logs';
-import type { AppProperties } from '../types';
-type Props = {
-    output: string;
-    logGroup: LogGroup;
-    taskDefinition: ecs.TaskDefinition;
-    env?: Record<string, string>;
-    port: number;
-    container?: AppProperties['container'];
-};
-export declare function taskDefinitionImage(id: string, props: Props): ecs.ContainerDefinition;
+import type { AppProperties, AppSource } from '../types';
+import type { Construct } from 'constructs';
+type Props = AppSource & Pick<AppProperties, 'env' | 'port' | 'logGroup' | 'taskDefinition'>;
+export declare function taskDefinitionImage(scope: Construct, id: string, props: Props): ecs.ContainerDefinition;
 export {};
 //# sourceMappingURL=taskDefinitionImage.d.ts.map

package/dist/lib/ecs/shared/taskDefinitionImage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taskDefinitionImage.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/shared/taskDefinitionImage.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,EAAE,GAAG,CAAC,cAAc,CAAC;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;CACxC,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,2BAuB3D"}
+{"version":3,"file":"taskDefinitionImage.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/shared/taskDefinitionImage.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,KAAK,KAAK,GAAG,SAAS,GACpB,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAC,CAAC;AAEtE,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,KAAK,2BA8Cb"}

package/dist/lib/ecs/shared/taskDefinitionImage.js

@@ -5,17 +5,29 @@ const tslib_1 = require("tslib");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const ecrAssets = tslib_1.__importStar(require("aws-cdk-lib/aws-ecr-assets"));
 const ecs = tslib_1.__importStar(require("aws-cdk-lib/aws-ecs"));
-function taskDefinitionImage(id, props) {
-    const { image, logDuration, ...containerProps } = props.container ?? {};
-    return props.taskDefinition.addContainer(id, {
-        image: ecs.ContainerImage.fromAsset(node_path_1.default.join(props.output), {
+const ecr = tslib_1.__importStar(require("aws-cdk-lib/aws-ecr"));
+function taskDefinitionImage(scope, id, props) {
+    let image;
+    let containerProps;
+    if ('output' in props) {
+        const { image: imageProps, ..._containerProps } = props.container ?? {};
+        image = ecs.ContainerImage.fromAsset(node_path_1.default.join(props.output), {
             platform: ecrAssets.Platform.LINUX_AMD64,
-            ...(image ?? {}),
+            ...(imageProps ?? {}),
             buildArgs: {
                 PORT: props.port.toString(),
-                ...(image?.buildArgs ?? {}),
+                ...(imageProps?.buildArgs ?? {}),
             },
-        }),
+        });
+        containerProps = _containerProps;
+    }
+    else {
+        const repository = ecr.Repository.fromRepositoryName(scope, `${id}Repository`, props.reference.repository);
+        image = ecs.ContainerImage.fromEcrRepository(repository, props.reference.tag);
+        containerProps = props.container;
+    }
+    return props.taskDefinition.addContainer(id, {
+        image,
         logging: new ecs.AwsLogDriver({
             streamPrefix: id,
             logGroup: props.logGroup,

package/dist/lib/ecs/types.d.ts

@@ -4,7 +4,7 @@ import type { LoadBalancerV2Origin } from 'aws-cdk-lib/aws-cloudfront-origins';
 import type { IVpc } from 'aws-cdk-lib/aws-ec2';
 import type { AssetImageProps, Cluster, ContainerDefinitionOptions, FargateServiceProps, FargateTaskDefinitionProps, TaskDefinition } from 'aws-cdk-lib/aws-ecs';
 import type { ApplicationLoadBalancerProps } from 'aws-cdk-lib/aws-elasticloadbalancingv2';
-import type { LogGroup, RetentionDays } from 'aws-cdk-lib/aws-logs';
+import type { LogGroup } from 'aws-cdk-lib/aws-logs';
 export type EcsConstructProps = {
     logGroup: LogGroup;
     environmentPath: string;
@@ -33,30 +33,33 @@ export type EcsConstructProps = {
     };
     tasks?: Record<string, TaskApp>;
 };
+export type AppSource = {
+    output: string;
+    container?: Omit<ContainerDefinitionOptions, 'image' | 'logging'> & {
+        image: AssetImageProps;
+    };
+} | {
+    reference: {
+        repository: string;
+        static?: string;
+        files?: Record<string, string>;
+        tag?: string;
+    };
+    container?: Omit<ContainerDefinitionOptions, 'image' | 'logging'>;
+};
 export type ServerApp = {
     type: typeof AppType.NEXT_APP_ROUTER | typeof AppType.IMAGE_APP;
-    /** Directory of build output to be deployed */
-    output: string;
     env?: Record<string, string>;
     /** Additional parameters that may be required, this varies based on type */
     buildParams?: Record<string, unknown>;
     port: number;
-    container?: Omit<ContainerDefinitionOptions, 'image' | 'logging'> & {
-        image: AssetImageProps;
-        logDuration?: RetentionDays;
-    };
-};
+} & AppSource;
 export type TaskApp = {
     type: typeof AppType.IMAGE_APP;
-    /** Directory of build output to be deployed */
-    output: string;
     env?: Record<string, string>;
     buildParams?: Record<string, unknown>;
-    container?: Omit<ContainerDefinitionOptions, 'image' | 'logging'> & {
-        image: AssetImageProps;
-        logDuration?: RetentionDays;
-    };
-};
+    definition?: FargateTaskDefinitionProps;
+} & AppSource;
 export type AppProperties<BuildParams = Record<string, unknown>> = {
     appName: string;
     environmentPath: string;
@@ -69,25 +72,15 @@ export type AppProperties<BuildParams = Record<string, unknown>> = {
         origin: LoadBalancerV2Origin;
     };
     port: number;
-    output: string;
-    container?: Omit<ContainerDefinitionOptions, 'image' | 'logging'> & {
-        image: AssetImageProps;
-        logDuration?: RetentionDays;
-    };
-};
-export type TaskConstructsProps = FargateTaskDefinitionProps & {
+} & AppSource;
+export type TaskConstructsProps = {
     vpc: IVpc;
     logGroup: LogGroup;
     taskName: string;
     cluster: Cluster;
     env?: Record<string, string>;
-    /** Directory of build output to be deployed */
-    output: string;
-    container?: Omit<ContainerDefinitionOptions, 'image' | 'logging'> & {
-        image: AssetImageProps;
-        logDuration?: RetentionDays;
-    };
-};
+    definition?: FargateTaskDefinitionProps;
+} & AppSource;
 export interface AppConstruct extends Attach, CDNResource, ApiResource {
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/lib/ecs/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/ecs/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/ecs/types.ts"],"names":[],"mappings":"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"}

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;AAEzE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAIjD,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;AAKvD,QAAA,MAAM,iBAAiB;;;;;;gCAA8C,CAAC;AAEtE,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;IAyCzD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAkBpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAsE3D,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;AAEzE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAIjD,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;AAKvD,QAAA,MAAM,iBAAiB;;;;;;gCAA8C,CAAC;AAEtE,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;IAyCzD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAkBpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAkF3D,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

@@ -66,21 +66,26 @@ class NextAppRouterConstruct extends constructs_1.Construct {
             authType: lambda.FunctionUrlAuthType.NONE,
             invokeMode: aws_lambda_1.InvokeMode.RESPONSE_STREAM,
         });
-        if (strippedBasePath) {
+        if (this.files.staticFiles) {
+            const staticFiles = s3Deploy.Source.bucket(this.static, this.files.staticFiles);
             new s3Deploy.BucketDeployment(this, `${strippedBasePath}StaticDeployment`, {
                 destinationBucket: this.static,
-                sources: [this.files.staticFiles],
+                sources: [staticFiles],
                 destinationKeyPrefix: `${strippedBasePath}/_next/static/`,
                 retainOnDelete: false,
             });
+        }
+        if (this.files.publicFiles) {
+            const publicFiles = s3Deploy.Source.bucket(this.static, this.files.publicFiles);
             new s3Deploy.BucketDeployment(this, `${strippedBasePath}PublicDeployment`, {
                 destinationBucket: this.static,
-                sources: [this.files.publicFiles],
+                sources: [publicFiles],
                 destinationKeyPrefix: `${strippedBasePath}/`,
                 retainOnDelete: false,
             });
-            this.function.addEnvironment('BASE_PATH', basePath);
         }
+        if (strippedBasePath)
+            this.function.addEnvironment('BASE_PATH', basePath);
         const imageIntegration = new aws_apigatewayv2_integrations_1.HttpUrlIntegration('AppImageIntegration', apiUrl.url + path.join(strippedBasePath, '_next/image', '{proxy}'));
         const staticIntegration = new aws_apigatewayv2_integrations_1.HttpUrlIntegration('AppStaticIntegration', this.static.bucketWebsiteUrl +
             path.join(strippedBasePath, '/_next', '{proxy}'));

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

@@ -1,20 +1,19 @@
 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 type AppFile = {
-    staticFiles: s3Deploy.ISource;
-    publicFiles: s3Deploy.ISource;
+    staticFiles?: string;
+    publicFiles?: string;
 };
 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;
+        staticFiles: string;
+        publicFiles: string;
     };
 };
-export declare function cloudfrontBehaviours(app: Construct, staticBucket: s3.Bucket, serverOrigin: cloudfront.IOrigin, basePath: string, files: AppFile, isLambda?: boolean): {
+export declare function cloudfrontBehaviours(app: Construct, staticBucket: s3.IBucket, serverOrigin: cloudfront.IOrigin, basePath: string, files: AppFile, isLambda?: boolean): {
     [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;AACzC,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAE1D,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,EACd,QAAQ,UAAQ;;EAkEjB"}
+{"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;AAGzC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM;;;;;;EAsD9D;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,SAAS,EACd,YAAY,EAAE,EAAE,CAAC,OAAO,EACxB,YAAY,EAAE,UAAU,CAAC,OAAO,EAChC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,QAAQ,UAAQ;;EA0EjB"}

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

@@ -28,36 +28,48 @@ 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`, {
+    const staticDeployment = new s3Deploy.BucketDeployment(app, `StaticAssetDeployment`, {
         destinationBucket: staticBucket,
         sources: [staticFiles],
-        destinationKeyPrefix: '_next/static',
+        destinationKeyPrefix: 'assets',
         retainOnDelete: false,
+        extract: false,
     });
-    new s3Deploy.BucketDeployment(app, `PublicDeployment`, {
+    const publicDeployment = new s3Deploy.BucketDeployment(app, `StaticAssetDeployment`, {
         destinationBucket: staticBucket,
         sources: [publicFiles],
-        destinationKeyPrefix: '',
+        destinationKeyPrefix: 'assets',
         retainOnDelete: false,
+        extract: false,
     });
-    return {
-        staticBucket,
-        files: { staticFiles, publicFiles },
+    const files = {
+        staticFiles: staticDeployment.objectKeys[0],
+        publicFiles: publicDeployment.objectKeys[0],
     };
+    if (!files.publicFiles || !files.staticFiles) {
+        throw new Error('Failed to deploy static and public files');
+    }
+    return { staticBucket, files };
 }
 function cloudfrontBehaviours(app, staticBucket, serverOrigin, basePath, files, isLambda = false) {
-    if (basePath) {
-        const strippedBasePath = basePath.replace(/^\/+|\/+$/g, '');
+    const strippedBasePath = basePath.replace(/^\/+|\/+$/g, '');
+    if (files.staticFiles) {
+        const staticFiles = s3Deploy.Source.bucket(staticBucket, files.staticFiles);
         new s3Deploy.BucketDeployment(app, `${basePath}StaticDeployment`, {
             destinationBucket: staticBucket,
-            sources: [files.staticFiles],
+            sources: [staticFiles],
             destinationKeyPrefix: `${strippedBasePath}/_next/static/`,
             retainOnDelete: false,
         });
+    }
+    if (files.publicFiles) {
+        const publicFiles = s3Deploy.Source.bucket(staticBucket, files.publicFiles);
         new s3Deploy.BucketDeployment(app, `${basePath}PublicDeployment`, {
             destinationBucket: staticBucket,
-            sources: [files.publicFiles],
-            destinationKeyPrefix: `${strippedBasePath}/`,
+            sources: [publicFiles],
+            destinationKeyPrefix: strippedBasePath
+                ? `${strippedBasePath}/`
+                : undefined,
             retainOnDelete: false,
         });
     }

package/package.json

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