sst 2.0.0-rc.62 → 2.0.0-rc.64

package/constructs/AppSyncApi.d.ts

@@ -245,7 +245,7 @@ export interface AppSyncApiProps {
      * });
      * ```
      */
-    schema: string | string[];
+    schema?: string | string[];
     /**
      * Specify a custom domain to use in addition to the automatically generated one. SST currently supports domains that are configured using [Route 53](https://aws.amazon.com/route53/)
      *

package/constructs/AppSyncApi.js

@@ -278,7 +278,10 @@ export class AppSyncApi extends Construct {
                 {});
             // build schema
             let mainSchema;
-            if (typeof schema === "string") {
+            if (!schema) {
+                throw new Error(`Missing "schema" in "${id}" AppSyncApi`);
+            }
+            else if (typeof schema === "string") {
                 mainSchema = appsync.SchemaFile.fromAsset(schema);
             }
             else {

package/constructs/AstroSite.d.ts

@@ -1,4 +1,4 @@
-import * as lambda from "aws-cdk-lib/aws-lambda";
+import { Function as CdkFunction } from "aws-cdk-lib/aws-lambda";
 import { SsrSite } from "./SsrSite.js";
 import { EdgeFunction } from "./EdgeFunction.js";
 /**
@@ -19,6 +19,6 @@ export declare class AstroSite extends SsrSite {
         clientBuildVersionedSubDir: string;
     };
     protected validateBuildOutput(): void;
-    protected createFunctionForRegional(): lambda.Function;
+    protected createFunctionForRegional(): CdkFunction;
     protected createFunctionForEdge(): EdgeFunction;
 }

package/constructs/AstroSite.js

@@ -1,7 +1,8 @@
 import fs from "fs";
 import url from "url";
 import path from "path";
-import * as esbuild from "esbuild";
+import { buildSync } from "esbuild";
+import { Architecture } from "aws-cdk-lib/aws-lambda";
 import { SsrSite } from "./SsrSite.js";
 import { Function } from "./Function.js";
 import { useProject } from "../project.js";
@@ -50,6 +51,7 @@ export class AstroSite extends SsrSite {
             },
             environment,
             ...cdk?.server,
+            architecture: cdk?.server?.architecture === Architecture.ARM_64 ? "arm_64" : "x86_64",
         });
         fn._disableBind = true;
         return fn;
@@ -59,7 +61,7 @@ export class AstroSite extends SsrSite {
         // Create a directory that we will use to create the bundled version
         // of the "core server build" along with our custom Lamba server handler.
         const outputPath = path.resolve(path.join(useProject().paths.artifacts, `AstroSiteFunction-${this.node.id}-${this.node.addr}`));
-        const result = esbuild.buildSync({
+        const result = buildSync({
             entryPoints: [
                 path.join(this.props.path, this.buildConfig.serverBuildOutputFile),
             ],

package/constructs/NextjsSite.js

@@ -37,7 +37,7 @@ export class NextjsSite extends SsrSite {
         };
     }
     createFunctionForRegional() {
-        const { timeout, memorySize, permissions, environment } = this.props;
+        const { timeout, memorySize, permissions, environment, cdk } = this.props;
         const ssrFn = new SsrFunction(this, `ServerFunction`, {
             description: "Server handler for Next.js",
             bundlePath: path.join(this.props.path, ".open-next", "server-function"),
@@ -46,11 +46,12 @@ export class NextjsSite extends SsrSite {
             memorySize,
             permissions,
             environment,
+            ...cdk?.server,
         });
         return ssrFn.function;
     }
     createImageOptimizationFunctionForRegional() {
-        const { imageOptimization, path: sitePath, cdk } = this.props;
+        const { imageOptimization, path: sitePath } = this.props;
         return new lambda.Function(this, `ImageFunction`, {
             description: "Image optimization handler for Next.js",
             handler: "index.handler",
@@ -70,7 +71,6 @@ export class NextjsSite extends SsrSite {
             environment: {
                 BUCKET_NAME: this.cdk.bucket.bucketName,
             },
-            ...cdk?.server,
         });
     }
     createMiddlewareEdgeFunctionForRegional() {
@@ -89,8 +89,8 @@ export class NextjsSite extends SsrSite {
         const fn = new EdgeFunction(this, "Middleware", {
             bundlePath,
             handler,
-            timeout: 10,
-            memorySize: 512,
+            timeout: 5,
+            memorySize: 128,
             permissions,
             environment,
             format: "esm",

package/constructs/SolidStartSite.d.ts

@@ -1,4 +1,4 @@
-import * as lambda from "aws-cdk-lib/aws-lambda";
+import { Function as CdkFunction } from "aws-cdk-lib/aws-lambda";
 import { SsrSite } from "./SsrSite.js";
 import { EdgeFunction } from "./EdgeFunction.js";
 /**
@@ -18,6 +18,6 @@ export declare class SolidStartSite extends SsrSite {
         clientBuildOutputDir: string;
         clientBuildVersionedSubDir: string;
     };
-    protected createFunctionForRegional(): lambda.Function;
+    protected createFunctionForRegional(): CdkFunction;
     protected createFunctionForEdge(): EdgeFunction;
 }

package/constructs/SolidStartSite.js

@@ -1,12 +1,11 @@
 import fs from "fs";
-import url from "url";
 import path from "path";
-import * as esbuild from "esbuild";
+import { buildSync } from "esbuild";
+import { Architecture } from "aws-cdk-lib/aws-lambda";
 import { SsrSite } from "./SsrSite.js";
 import { Function } from "./Function.js";
 import { useProject } from "../project.js";
 import { EdgeFunction } from "./EdgeFunction.js";
-const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /**
  * The `SolidStartSite` construct is a higher level CDK construct that makes it easy to create a SolidStart app.
  * @example
@@ -43,6 +42,7 @@ export class SolidStartSite extends SsrSite {
             },
             environment,
             ...cdk?.server,
+            architecture: cdk?.server?.architecture === Architecture.ARM_64 ? "arm_64" : "x86_64",
         });
         fn._disableBind = true;
         return fn;
@@ -53,7 +53,7 @@ export class SolidStartSite extends SsrSite {
         // of the "core server build" along with our custom Lamba server handler.
         const outputPath = path.resolve(path.join(useProject().paths.artifacts, `SolidStartSiteFunction-${this.node.id}-${this.node.addr}`));
         // Bundle code
-        const result = esbuild.buildSync({
+        const result = buildSync({
             entryPoints: [
                 path.join(this.props.path, this.buildConfig.serverBuildOutputFile),
             ],

package/constructs/SsrFunction.d.ts

@@ -3,14 +3,13 @@ import * as lambda from "aws-cdk-lib/aws-lambda";
 import { Permissions } from "./util/permission.js";
 import { Size } from "./util/size.js";
 import { Duration } from "./util/duration.js";
-export interface SsrFunctionProps {
-    description?: string;
+import { FunctionOptions } from "aws-cdk-lib/aws-lambda";
+export interface SsrFunctionProps extends Omit<FunctionOptions, "memorySize" | "timeout" | "runtime"> {
     bundlePath: string;
     handler: string;
     timeout: number | Duration;
     memorySize: number | Size;
     permissions?: Permissions;
-    environment?: Record<string, string>;
 }
 export declare class SsrFunction extends Construct {
     function: lambda.Function;

package/constructs/SsrFunction.js

@@ -30,7 +30,7 @@ export class SsrFunction extends Construct {
         attachPermissionsToRole(this.function.role, permissions);
     }
     createFunction() {
-        const { timeout, memorySize, handler, bundlePath, environment } = this.props;
+        const { timeout, memorySize, handler, bundlePath } = this.props;
         // Note: cannot point the bundlePath to the `.open-next/server-function`
         //       b/c the folder contains node_modules. And pnpm node_modules
         //       contains symlinks. CDK cannot zip symlinks correctly.
@@ -53,7 +53,7 @@ export class SsrFunction extends Construct {
         // Deploy after the code is updated
         const replacer = this.createLambdaCodeReplacer(asset);
         const fn = new lambda.Function(this, `ServerFunction`, {
-            description: this.props.description,
+            ...this.props,
             handler,
             logRetention: logs.RetentionDays.THREE_DAYS,
             code: lambda.Code.fromBucket(asset.bucket, asset.s3ObjectKey),
@@ -65,7 +65,6 @@ export class SsrFunction extends Construct {
             timeout: typeof timeout === "string"
                 ? toCdkDuration(timeout)
                 : CdkDuration.seconds(timeout),
-            environment,
         });
         fn.node.addDependency(replacer);
         return fn;

package/constructs/SsrSite.d.ts

@@ -159,7 +159,7 @@ export interface SsrSiteProps {
              */
             serverRequests?: ICachePolicy;
         };
-        server?: Pick<FunctionProps, "vpc" | "vpcSubnets" | "securityGroups" | "allowAllOutbound" | "allowPublicSubnet">;
+        server?: Pick<FunctionProps, "vpc" | "vpcSubnets" | "securityGroups" | "allowAllOutbound" | "allowPublicSubnet" | "architecture">;
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.62",
+  "version": "2.0.0-rc.64",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -92,6 +92,7 @@
   "devDependencies": {
     "@aws-sdk/client-codebuild": "^3.257.0",
     "@aws-sdk/types": "^3.208.0",
+    "@graphql-tools/merge": "^8.3.16",
     "@sls-next/lambda-at-edge": "^3.7.0",
     "@tsconfig/node16": "^1.0.3",
     "@types/adm-zip": "^0.5.0",