@awsless/awsless 0.0.441 → 0.0.442

package/dist/bin.js

@@ -10803,7 +10803,7 @@ var createLambdaFunction = (group, ctx, ns, id, local2) => {
           file: fileCode.file,
           external: [
             ...fileCode.external ?? [],
-            ...(props.layers ?? []).flatMap((id2) => ctx.shared.get(`layer-${id2}-packages`))
+            ...props.layers?.flatMap((id2) => ctx.shared.get(`layer-${id2}-packages`))
           ],
           minify: fileCode.minify,
           nativeDir: temp.path
@@ -10879,7 +10879,7 @@ var createLambdaFunction = (group, ctx, ns, id, local2) => {
     role: role.arn,
     code,
     runtime: props.runtime === "container" ? void 0 : props.runtime,
-    layers: (props.layers ?? []).map((id2) => ctx.shared.get(`layer-${id2}-arn`)),
+    layers: props.layers?.map((id2) => ctx.shared.get(`layer-${id2}-arn`)).filter((v) => !!v),
     // Remove conflicting props.
     vpc: void 0,
     log: props.log
@@ -13159,24 +13159,29 @@ var siteFeature = defineFeature({
         ctx.onBind((name2, value) => {
           lambda.addEnvironment(name2, value);
         });
-        new aws19.lambda.Permission(group, "permission", {
-          principal: "*",
-          // principal: 'cloudfront.amazonaws.com',
-          action: "lambda:InvokeFunctionUrl",
-          functionArn: lambda.arn,
-          urlAuthType: "none"
-          // urlAuthType: 'aws-iam',
-          // sourceArn: distribution.arn,
-        });
         const url = new aws19.lambda.Url(group, "url", {
           targetArn: lambda.arn,
-          authType: "none"
-          // authType: 'aws-iam',
+          authType: "aws-iam"
+        });
+        const ssrAccessControl = new aws19.cloudFront.OriginAccessControl(group, `ssr-access`, {
+          name,
+          type: "lambda",
+          behavior: "always",
+          protocol: "sigv4"
+        });
+        new aws19.lambda.Permission(group, "ssr-permission", {
+          principal: "cloudfront.amazonaws.com",
+          action: "lambda:InvokeFunctionUrl",
+          functionArn: lambda.arn,
+          urlAuthType: "aws-iam",
+          sourceArn: `arn:aws:cloudfront::${ctx.accountId}:distribution/*`
         });
+        ssrAccessControl.deletionPolicy = "after-deployment";
         origins.push({
           id: "ssr",
           domainName: url.url.apply((url2) => url2.split("/")[2]),
-          protocol: "https-only"
+          protocol: "https-only",
+          originAccessControlId: ssrAccessControl.id
         });
       }
       if (props.static) {
@@ -13206,13 +13211,13 @@ var siteFeature = defineFeature({
           policy.addStatement(bucket.permissions);
         });
         bucket.deletionPolicy = "after-deployment";
-        const accessControl = new aws19.cloudFront.OriginAccessControl(group, `access`, {
+        const s3AccessControl = new aws19.cloudFront.OriginAccessControl(group, `s3-access`, {
           name,
           type: "s3",
           behavior: "always",
           protocol: "sigv4"
         });
-        accessControl.deletionPolicy = "after-deployment";
+        s3AccessControl.deletionPolicy = "after-deployment";
         if (typeof props.static === "string") {
           const files = glob2.sync("**", {
             cwd: props.static,
@@ -13233,7 +13238,7 @@ var siteFeature = defineFeature({
         origins.push({
           id: "static",
           domainName: bucket.regionalDomainName,
-          originAccessControlId: accessControl.id
+          originAccessControlId: s3AccessControl.id
         });
       }
       if (props.ssr && props.static) {
@@ -13935,6 +13940,22 @@ var alertFeature = defineFeature({
 
 // src/feature/layer/index.ts
 import { Asset as Asset7, aws as aws26, Node as Node26 } from "@awsless/formation";
+var stackSearch = (stack, key) => {
+  let found = [];
+  function search(obj) {
+    if (typeof obj !== "object" || obj === null) return;
+    if (obj[key]) {
+      found.push(obj[key]);
+    }
+    for (let k in obj) {
+      if (typeof obj[k] === "object") {
+        search(obj[k]);
+      }
+    }
+  }
+  search(stack);
+  return found;
+};
 var layerFeature = defineFeature({
   name: "layer",
   onBefore(ctx) {
@@ -13955,6 +13976,17 @@ var layerFeature = defineFeature({
     });
     ctx.shared.set("layer-bucket-name", bucket.name);
   },
+  onValidate(ctx) {
+    const layers = Object.keys(ctx.appConfig.defaults.layers ?? []);
+    for (const stack of ctx.stackConfigs) {
+      const stackLayers = stackSearch(stack, "layers").flat();
+      for (const layer of stackLayers) {
+        if (!layers.includes(layer)) {
+          throw new FileError(stack.file, `Layer "${layer}" is not defined in app.json`);
+        }
+      }
+    }
+  },
   onApp(ctx) {
     const layers = Object.entries(ctx.appConfig.defaults.layers ?? {});
     if (layers.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.441",
+  "version": "0.0.442",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -28,19 +28,19 @@
     }
   },
   "peerDependencies": {
-    "@awsless/json": "^0.0.7",
-    "@awsless/dynamodb": "^0.1.5",
-    "@awsless/lambda": "^0.0.30",
     "@awsless/iot": "^0.0.3",
-    "@awsless/mqtt": "^0.0.2",
+    "@awsless/dynamodb": "^0.1.5",
+    "@awsless/json": "^0.0.7",
     "@awsless/open-search": "^0.0.17",
-    "@awsless/sns": "^0.0.10",
+    "@awsless/lambda": "^0.0.30",
     "@awsless/s3": "^0.0.20",
+    "@awsless/sns": "^0.0.10",
+    "@awsless/validate": "^0.0.17",
     "@awsless/redis": "^0.0.13",
+    "@awsless/ssm": "^0.0.7",
     "@awsless/weak-cache": "^0.0.1",
-    "@awsless/validate": "^0.0.17",
     "@awsless/sqs": "^0.0.8",
-    "@awsless/ssm": "^0.0.7"
+    "@awsless/mqtt": "^0.0.2"
   },
   "dependencies": {
     "@arcanyx/cidr-slicer": "^0.3.0",
@@ -116,14 +116,14 @@
     "zip-a-folder": "^3.1.6",
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
-    "@awsless/duration": "^0.0.1",
     "@awsless/formation": "^0.0.59",
-    "@awsless/json": "^0.0.7",
-    "@awsless/size": "^0.0.1",
-    "@awsless/validate": "^0.0.17",
     "@awsless/code": "^0.0.10",
+    "@awsless/duration": "^0.0.1",
+    "@awsless/json": "^0.0.7",
     "@awsless/graphql": "^0.0.9",
-    "@awsless/ts-file-cache": "^0.0.12"
+    "@awsless/size": "^0.0.1",
+    "@awsless/ts-file-cache": "^0.0.12",
+    "@awsless/validate": "^0.0.17"
   },
   "devDependencies": {
     "@node-rs/bcrypt": "^1.10.5"