@fy-stack/app-construct 0.0.145 → 0.0.146

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

@@ -14,6 +14,7 @@ export declare class EcsServerConstruct extends Construct implements Grant {
     private props;
     apps: Record<string, AppConstruct>;
     definition: ecs.TaskDefinition;
+    service: ecs.BaseService;
     loadBalancer?: {
         alb: elbV2.IApplicationLoadBalancer;
         listener: elbV2.IApplicationListener;

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;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"}
+{"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;IAa9D,OAAO,CAAC,KAAK;IAZR,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IACxC,UAAU,EAAE,GAAG,CAAC,cAAc,CAAC;IAC/B,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC;IAEzB,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;IAwExC,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

@@ -21,6 +21,7 @@ class EcsServerConstruct extends constructs_1.Construct {
     props;
     apps = {};
     definition;
+    service;
     loadBalancer;
     constructor(scope, id, props) {
         super(scope, id);
@@ -38,7 +39,7 @@ class EcsServerConstruct extends constructs_1.Construct {
             },
             ...(definition ?? {}),
         });
-        const service = new ecs.FargateService(this, 'ServerService', {
+        this.service = new ecs.FargateService(this, 'ServerService', {
             cluster,
             taskDefinition: this.definition,
             capacityProviderStrategies: [{ capacityProvider: 'FARGATE', weight: 1 }],
@@ -52,7 +53,8 @@ class EcsServerConstruct extends constructs_1.Construct {
             propagateTags: ecs.PropagatedTagSource.SERVICE,
             ...serverProps,
         });
-        const serverOrigin = (port, containerName, appPath, healthPath) => this.serverOrigin(service, port, containerName, appPath, healthPath);
+        this.service.connections.securityGroups[0].securityGroupId;
+        const serverOrigin = (port, containerName, appPath, healthPath) => this.serverOrigin(this.service, port, containerName, appPath, healthPath);
         serverOrigin.bind(this);
         Object.assign(this.apps, Object.fromEntries(Object.entries(apps).map(([key, app]) => {
             const AppTypeConstruct = AppBuilds[app.type];

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;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"}
+{"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;;EA2Df"}

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

@@ -46,17 +46,17 @@ function staticDeployment(app, output) {
 }
 function cloudfrontBehaviours(app, staticBucket, serverOrigin, basePath, files) {
     if (basePath) {
-        // redeploy files for apps hosted in sub path
+        const strippedBasePath = basePath.replace(/^\/+|\/+$/g, '');
         new s3Deploy.BucketDeployment(app, `${basePath}StaticDeployment`, {
             destinationBucket: staticBucket,
             sources: [files.staticFiles],
-            destinationKeyPrefix: `${basePath}/_next/static`,
+            destinationKeyPrefix: `${strippedBasePath}/_next/static/`,
             retainOnDelete: false,
         });
         new s3Deploy.BucketDeployment(app, `${basePath}PublicDeployment`, {
             destinationBucket: staticBucket,
             sources: [files.publicFiles],
-            destinationKeyPrefix: basePath,
+            destinationKeyPrefix: `${strippedBasePath}/`,
             retainOnDelete: false,
         });
     }
@@ -86,17 +86,12 @@ function cloudfrontBehaviours(app, staticBucket, serverOrigin, basePath, files)
             .CORS_ALLOW_ALL_ORIGINS_WITH_PREFLIGHT_AND_SECURITY_HEADERS,
     };
     return {
-        [`${basePath}/_next/image`]: {
-            ...appBehaviour,
+        [`${basePath}/_next/image`]: Object.assign({}, 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}/*.*`]: staticBehavior,
         [`${basePath}/*`]: appBehaviour,
     };
 }

package/dist/lib/static/apps/static-website-construct.d.ts

@@ -3,14 +3,23 @@ import * as cloudfront from 'aws-cdk-lib/aws-cloudfront';
 import { Construct } from 'constructs';
 import { z } from 'zod';
 import { AppConstruct, AppProperties } from '../types';
-declare const BuildParamsSchema: z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
+declare const BuildParamsSchema: z.ZodOptional<z.ZodObject<{
+    spa: z.ZodOptional<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    spa?: boolean | undefined;
+}, {
+    spa?: boolean | undefined;
+}>>;
 export declare class StaticWebsiteConstruct extends Construct implements AppConstruct {
+    private props;
     private readonly static;
     constructor(scope: Construct, id: string, props: AppProperties<z.infer<typeof BuildParamsSchema>>);
     cloudfront(path: string): Record<string, cloudfront.BehaviorOptions>;
     cloudfrontPolicy(distributionId: string): void;
     api(): Record<string, HttpRouteIntegration>;
-    static parse(params: unknown): {} | undefined;
+    static parse(params: unknown): {
+        spa?: boolean | undefined;
+    } | undefined;
 }
 export {};
 //# sourceMappingURL=static-website-construct.d.ts.map

package/dist/lib/static/apps/static-website-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"static-website-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/static/apps/static-website-construct.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAIzD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,QAAA,MAAM,iBAAiB,+DAA0B,CAAC;AAElD,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IAC3E,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;IA2BzD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAmBpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAI3C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}
+{"version":3,"file":"static-website-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/static/apps/static-website-construct.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAIzD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,QAAA,MAAM,iBAAiB;;;;;;GAIV,CAAC;AAEd,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IAMzE,OAAO,CAAC,KAAK;IALf,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;gBAGjC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IA2BjE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IA2DpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAI3C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;CAG7B"}

package/dist/lib/static/apps/static-website-construct.js

@@ -9,11 +9,17 @@ const s3 = tslib_1.__importStar(require("aws-cdk-lib/aws-s3"));
 const s3Deploy = tslib_1.__importStar(require("aws-cdk-lib/aws-s3-deployment"));
 const constructs_1 = require("constructs");
 const zod_1 = require("zod");
-const BuildParamsSchema = zod_1.z.object({}).optional();
+const BuildParamsSchema = zod_1.z
+    .object({
+    spa: zod_1.z.boolean().optional(),
+})
+    .optional();
 class StaticWebsiteConstruct extends constructs_1.Construct {
+    props;
     static;
     constructor(scope, id, props) {
         super(scope, id);
+        this.props = props;
         this.static = new s3.Bucket(this, `StaticBucket`, {
             removalPolicy: cdk.RemovalPolicy.DESTROY,
             autoDeleteObjects: true,
@@ -45,8 +51,45 @@ class StaticWebsiteConstruct extends constructs_1.Construct {
             compress: true,
             viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
         };
+        let staticPageBehaviour = Object.assign({}, staticBehavior);
+        if (this.props.buildParams?.spa) {
+            const spaRewriteFunction = new cloudfront.Function(this, 'SpaRewrite', {
+                code: cloudfront.FunctionCode.fromInline(`
+        function handler(event) {
+          var request = event.request
+          
+          if (!request.uri.endsWith('/')) {
+            return {
+              statusCode: 301,
+              statusDescription: 'Moved Permanently',
+              headers: {
+                  location: {
+                      value: request.uri + '/'
+                  }
+              }
+            }
+          }
+          
+          if (request.uri !== "${path || '/'}") {
+            request.uri = '/index.html'
+          }
+        
+          return request;
+        }
+      `),
+            });
+            staticPageBehaviour = Object.assign(staticPageBehaviour, {
+                functionAssociations: [
+                    {
+                        eventType: cloudfront.FunctionEventType.VIEWER_REQUEST,
+                        function: spaRewriteFunction,
+                    },
+                ],
+            });
+        }
         return {
-            [`${path}/*`]: staticBehavior,
+            [`${path}/*.*`]: staticBehavior,
+            [`${path}/*`]: staticPageBehaviour,
         };
     }
     cloudfrontPolicy(distributionId) {

package/package.json

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