@awsless/cli 0.0.44 → 0.0.45

package/dist/bin.js

@@ -1666,6 +1666,7 @@ var RouterDefaultSchema = z21.record(
   z21.object({
     domain: ResourceIdSchema.describe("The domain id to link your Router.").optional(),
     subDomain: z21.string().optional(),
+    redirectWww: z21.boolean().default(false).describe("Redirect all www subdomain requests to your root domain."),
     waf: WafSettingsSchema.optional(),
     geoRestrictions: z21.array(z21.string().length(2).toUpperCase()).default([]).describe("Specifies a blacklist of countries that should be blocked."),
     errors: z21.object({
@@ -1754,6 +1755,21 @@ var RouterDefaultSchema = z21.record(
     }).optional().describe(
       "Specifies the cookies, headers, and query values that CloudFront includes in the cache key."
     )
+  }).superRefine((props, ctx) => {
+    if (props.redirectWww && !props.domain) {
+      ctx.addIssue({
+        code: z21.ZodIssueCode.custom,
+        path: ["redirectWww"],
+        message: "The redirectWww option requires a domain to be set."
+      });
+    }
+    if (props.redirectWww && props.subDomain) {
+      ctx.addIssue({
+        code: z21.ZodIssueCode.custom,
+        path: ["redirectWww"],
+        message: `The redirectWww option can't be combined with a subDomain, because the domain certificate only covers single level subdomains.`
+      });
+    }
   })
 ).optional().describe(`Define the global Router. Backed by AWS CloudFront.`);
 
@@ -9165,6 +9181,7 @@ import { camelCase as camelCase9, constantCase as constantCase16, kebabCase as k
 var getViewerRequestFunctionCode = (props) => {
   return CODE([
     props.blockDirectAccess ? BLOCK_DIRECT_ACCESS_TO_CLOUDFRONT : "",
+    props.redirectWww ? REDIRECT_WWW : "",
     props.passwordAuth ?? props.basicAuth ? AUTH_WRAPPER(
       [
         //
@@ -9181,6 +9198,38 @@ if (headers.host && headers.host.value.includes('cloudfront.net')) {
 		statusDescription: 'Forbidden'
 	};
 }`;
+var REDIRECT_WWW = `
+if (headers.host && headers.host.value.startsWith('www.')) {
+	let location = 'https://' + headers.host.value.slice(4) + request.uri;
+	const query = [];
+
+	for(const key in request.querystring) {
+		const item = request.querystring[key];
+
+		if(item.multiValue) {
+			for(const i in item.multiValue) {
+				query.push(key + '=' + item.multiValue[i].value);
+			}
+		} else if(item.value === '') {
+			query.push(key);
+		} else {
+			query.push(key + '=' + item.value);
+		}
+	}
+
+	if(query.length > 0) {
+		location += '?' + query.join('&');
+	}
+
+	return {
+		statusCode: 301,
+		statusDescription: 'Moved Permanently',
+		headers: {
+			'location': { value: location },
+			'strict-transport-security': { value: 'max-age=31536000; includeSubdomains; preload' }
+		}
+	};
+}`;
 var BASIC_AUTH_CHECK = (username, password) => `
 authMethods.push('Basic realm="Protected"');
 
@@ -9631,6 +9680,7 @@ var routerFeature = defineFeature({
         keyValueStoreAssociations: [routeStore.arn],
         code: getViewerRequestFunctionCode({
           blockDirectAccess: !!props.domain,
+          redirectWww: !!props.domain && props.redirectWww,
           basicAuth: props.basicAuth,
           passwordAuth: props.passwordAuth
         })
@@ -9860,6 +9910,7 @@ var routerFeature = defineFeature({
       });
       if (props.domain) {
         const domainName = formatFullDomainName(ctx.appConfig, props.domain, props.subDomain);
+        const wwwDomainName = props.redirectWww ? `www.${domainName}` : void 0;
         const certificateArn = ctx.shared.entry("domain", `global-certificate-arn`, props.domain);
         const zoneId = ctx.shared.entry("domain", "zone-id", props.domain);
         const connectionGroup = new aws32.cloudfront.ConnectionGroup(group, "connection-group", {
@@ -9870,7 +9921,11 @@ var routerFeature = defineFeature({
           enabled: true,
           distributionId: distribution.id,
           connectionGroupId: connectionGroup.id,
-          domain: [{ domain: domainName }],
+          domain: [
+            //
+            { domain: domainName },
+            ...wwwDomainName ? [{ domain: wwwDomainName }] : []
+          ],
           customizations: [{ certificate: [{ arn: certificateArn }] }]
         });
         new aws32.route53.Record(group, `record`, {
@@ -9883,6 +9938,18 @@ var routerFeature = defineFeature({
             evaluateTargetHealth: false
           }
         });
+        if (wwwDomainName) {
+          new aws32.route53.Record(group, `www-record`, {
+            zoneId,
+            type: "A",
+            name: wwwDomainName,
+            alias: {
+              name: connectionGroup.routingEndpoint,
+              zoneId: "Z2FDTNDATAQYW2",
+              evaluateTargetHealth: false
+            }
+          });
+        }
         ctx.bind(`ROUTER_${constantCase16(id)}_ENDPOINT`, domainName);
       }
     }

package/dist/build-json-schema.js

@@ -724,6 +724,7 @@ var RouterDefaultSchema = z17.record(
   z17.object({
     domain: ResourceIdSchema.describe("The domain id to link your Router.").optional(),
     subDomain: z17.string().optional(),
+    redirectWww: z17.boolean().default(false).describe("Redirect all www subdomain requests to your root domain."),
     waf: WafSettingsSchema.optional(),
     geoRestrictions: z17.array(z17.string().length(2).toUpperCase()).default([]).describe("Specifies a blacklist of countries that should be blocked."),
     errors: z17.object({
@@ -812,6 +813,21 @@ var RouterDefaultSchema = z17.record(
     }).optional().describe(
       "Specifies the cookies, headers, and query values that CloudFront includes in the cache key."
     )
+  }).superRefine((props, ctx) => {
+    if (props.redirectWww && !props.domain) {
+      ctx.addIssue({
+        code: z17.ZodIssueCode.custom,
+        path: ["redirectWww"],
+        message: "The redirectWww option requires a domain to be set."
+      });
+    }
+    if (props.redirectWww && props.subDomain) {
+      ctx.addIssue({
+        code: z17.ZodIssueCode.custom,
+        path: ["redirectWww"],
+        message: `The redirectWww option can't be combined with a subDomain, because the domain certificate only covers single level subdomains.`
+      });
+    }
   })
 ).optional().describe(`Define the global Router. Backed by AWS CloudFront.`);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/cli",
-  "version": "0.0.44",
+  "version": "0.0.45",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -90,22 +90,22 @@
     "zod-to-json-schema": "^3.24.3",
     "@awsless/big-float": "^0.1.7",
     "@awsless/dynamodb": "^0.3.22",
-    "@awsless/duration": "^0.0.4",
-    "@awsless/json": "^0.0.11",
     "@awsless/lambda": "^0.0.44",
     "@awsless/redis": "^0.1.13",
+    "@awsless/clui": "^0.0.8",
+    "@awsless/duration": "^0.0.4",
+    "@awsless/iot": "^0.0.5",
     "@awsless/s3": "^0.0.21",
-    "@awsless/cloudwatch": "^0.0.1",
+    "@awsless/json": "^0.0.11",
     "@awsless/size": "^0.0.2",
     "@awsless/sns": "^0.0.10",
-    "@awsless/clui": "^0.0.8",
-    "@awsless/scheduler": "^0.0.4",
     "@awsless/validate": "^0.1.7",
     "@awsless/weak-cache": "^0.0.1",
-    "awsless": "^0.0.14",
-    "@awsless/iot": "^0.0.5",
+    "@awsless/cloudwatch": "^0.0.1",
+    "@awsless/scheduler": "^0.0.4",
     "@awsless/ts-file-cache": "^0.0.16",
-    "@awsless/sqs": "^0.0.24"
+    "@awsless/sqs": "^0.0.24",
+    "awsless": "^0.0.14"
   },
   "devDependencies": {
     "@hono/node-server": "1.19.9",