sst 2.0.0-rc.9 → 2.0.1

package/constructs/NextjsSite.js

@@ -1,14 +1,15 @@
 import fs from "fs";
 import url from "url";
 import path from "path";
-import { buildErrorResponsesForRedirectToIndex } from "./BaseSite.js";
-import { Fn, Duration, RemovalPolicy, } from "aws-cdk-lib";
+import { Fn, Duration as CdkDuration, RemovalPolicy } from "aws-cdk-lib";
 import * as logs from "aws-cdk-lib/aws-logs";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
 import * as origins from "aws-cdk-lib/aws-cloudfront-origins";
-import { SsrSite } from "./SsrSite.js";
+import { SsrFunction } from "./SsrFunction.js";
 import { EdgeFunction } from "./EdgeFunction.js";
+import { SsrSite } from "./SsrSite.js";
+import { toCdkSize } from "./util/size.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.
@@ -24,7 +25,7 @@ const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 export class NextjsSite extends SsrSite {
     constructor(scope, id, props) {
         super(scope, id, {
-            buildCommand: "npm_config_yes=true npx open-next@latest build",
+            buildCommand: "npx --yes open-next@latest build",
             ...props,
         });
     }
@@ -33,33 +34,68 @@ export class NextjsSite extends SsrSite {
             serverBuildOutputFile: ".open-next/server-function/index.mjs",
             clientBuildOutputDir: ".open-next/assets",
             clientBuildVersionedSubDir: "_next",
-            siteStub: path.resolve(__dirname, "../support/nextjs-site-html-stub"),
         };
     }
     createFunctionForRegional() {
-        const { defaults, environment } = this.props;
-        let bundlePath, handler;
-        if (this.isPlaceholder) {
-            bundlePath = path.resolve(__dirname, "../support/ssr-site-function-stub");
-            handler = "server.handler";
-        }
-        else {
-            bundlePath = path.join(this.props.path, path.dirname(this.buildConfig.serverBuildOutputFile));
-            handler = "index.handler";
-        }
-        return new lambda.Function(this, `ServerFunction`, {
+        const { timeout, memorySize, permissions, environment, cdk } = this.props;
+        const ssrFn = new SsrFunction(this, `ServerFunction`, {
             description: "Server handler for Next.js",
-            handler,
+            bundlePath: path.join(this.props.path, ".open-next", "server-function"),
+            handler: "index.handler",
+            timeout,
+            memorySize,
+            permissions,
+            environment,
+            ...cdk?.server,
+        });
+        return ssrFn.function;
+    }
+    createImageOptimizationFunctionForRegional() {
+        const { imageOptimization, path: sitePath } = this.props;
+        return new lambda.Function(this, `ImageFunction`, {
+            description: "Image optimization handler for Next.js",
+            handler: "index.handler",
             currentVersionOptions: {
                 removalPolicy: RemovalPolicy.DESTROY,
             },
             logRetention: logs.RetentionDays.THREE_DAYS,
-            code: lambda.Code.fromAsset(bundlePath),
+            code: lambda.Code.fromAsset(path.join(sitePath, ".open-next/image-optimization-function")),
             runtime: lambda.Runtime.NODEJS_18_X,
-            memorySize: defaults?.function?.memorySize || 512,
-            timeout: Duration.seconds(defaults?.function?.timeout || 10),
+            memorySize: imageOptimization?.memorySize
+                ? typeof imageOptimization.memorySize === "string"
+                    ? toCdkSize(imageOptimization.memorySize).toMebibytes()
+                    : imageOptimization.memorySize
+                : 1536,
+            timeout: CdkDuration.seconds(25),
+            architecture: lambda.Architecture.ARM_64,
+            environment: {
+                BUCKET_NAME: this.cdk.bucket.bucketName,
+            },
+        });
+    }
+    createMiddlewareEdgeFunctionForRegional() {
+        const { permissions, environment, path: sitePath } = this.props;
+        const middlewarePath = path.resolve(sitePath, ".open-next/middleware-function");
+        const isMiddlewareEnabled = fs.existsSync(middlewarePath);
+        let bundlePath, handler;
+        if (isMiddlewareEnabled) {
+            bundlePath = middlewarePath;
+            handler = "index.handler";
+        }
+        else {
+            bundlePath = path.resolve(__dirname, "../support/ssr-site-function-stub");
+            handler = "server.handler";
+        }
+        const fn = new EdgeFunction(this, "Middleware", {
+            bundlePath,
+            handler,
+            timeout: 5,
+            memorySize: 128,
+            permissions,
             environment,
+            format: "esm",
         });
+        return { fn, isMiddlewareEnabled };
     }
     createCloudFrontDistributionForRegional() {
         const { cdk } = this.props;
@@ -76,13 +112,14 @@ export class NextjsSite extends SsrSite {
             allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
             cachedMethods: cloudfront.CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
-            cachePolicy: cdk?.cachePolicies?.serverRequests ??
-                this.createCloudFrontServerCachePolicy(),
-            edgeLambdas: isMiddlewareEnabled && !this.isPlaceholder
-                ? [{
+            cachePolicy: cdk?.serverCachePolicy ?? this.createCloudFrontServerCachePolicy(),
+            edgeLambdas: isMiddlewareEnabled
+                ? [
+                    {
                         eventType: cloudfront.LambdaEdgeEventType.VIEWER_REQUEST,
                         functionVersion: middlewareFn.currentVersion,
-                    }]
+                    },
+                ]
                 : undefined,
         };
         // Create image optimization behavior
@@ -109,9 +146,8 @@ export class NextjsSite extends SsrSite {
         };
         // Create default behavior
         // default handler for requests that don't match any other path:
-        //   - try S3 first
-        //   - if 403, fall back to lambda handler (mostly for /)
-        //   - if 404, fall back to lambda handler
+        //   - try lambda handler first first
+        //   - if failed, fall back to S3
         const fallbackOriginGroup = new origins.OriginGroup({
             primaryOrigin: serverBehavior.origin,
             fallbackOrigin: s3Origin,
@@ -191,22 +227,6 @@ export class NextjsSite extends SsrSite {
             },
         });
     }
-    createCloudFrontDistributionForStub() {
-        // Keep creating middleware edge function b/c edge function cannot be removed
-        // immediately.
-        this.createMiddlewareEdgeFunctionForRegional();
-        // Create placeholder distribution
-        return new cloudfront.Distribution(this, "Distribution", {
-            defaultRootObject: "index.html",
-            errorResponses: buildErrorResponsesForRedirectToIndex("index.html"),
-            domainNames: this.buildDistributionDomainNames(),
-            certificate: this.cdk.certificate,
-            defaultBehavior: {
-                origin: new origins.S3Origin(this.cdk.bucket),
-                viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            },
-        });
-    }
     createCloudFrontServerCachePolicy() {
         return new cloudfront.CachePolicy(this, "ServerCache", {
             queryStringBehavior: cloudfront.CacheQueryStringBehavior.all(),
@@ -216,70 +236,16 @@ export class NextjsSite extends SsrSite {
             // required by server request
             "x-op-middleware-request-headers", "x-op-middleware-response-headers", "x-nextjs-data", "x-middleware-prefetch"),
             cookieBehavior: cloudfront.CacheCookieBehavior.all(),
-            defaultTtl: Duration.days(0),
-            maxTtl: Duration.days(365),
-            minTtl: Duration.days(0),
+            defaultTtl: CdkDuration.days(0),
+            maxTtl: CdkDuration.days(365),
+            minTtl: CdkDuration.days(0),
             enableAcceptEncodingBrotli: true,
             enableAcceptEncodingGzip: true,
             comment: "SST server response cache policy",
         });
     }
     generateBuildId() {
-        if (this.isPlaceholder) {
-            return "live";
-        }
         const filePath = path.join(this.props.path, ".next/BUILD_ID");
         return fs.readFileSync(filePath).toString();
     }
-    createImageOptimizationFunctionForRegional() {
-        const { defaults, path: sitePath } = this.props;
-        let bundlePath, handler;
-        if (this.isPlaceholder) {
-            bundlePath = path.resolve(__dirname, "../support/ssr-site-function-stub");
-            handler = "server.handler";
-        }
-        else {
-            bundlePath = path.join(sitePath, ".open-next/image-optimization-function");
-            handler = "index.handler";
-        }
-        return new lambda.Function(this, `ImageFunction`, {
-            description: "Image optimization handler for Next.js",
-            handler,
-            currentVersionOptions: {
-                removalPolicy: RemovalPolicy.DESTROY,
-            },
-            logRetention: logs.RetentionDays.THREE_DAYS,
-            code: lambda.Code.fromAsset(bundlePath),
-            runtime: lambda.Runtime.NODEJS_18_X,
-            memorySize: defaults?.function?.memorySize || 512,
-            timeout: Duration.seconds(defaults?.function?.timeout || 10),
-            environment: {
-                BUCKET_NAME: this.cdk.bucket.bucketName,
-            }
-        });
-    }
-    createMiddlewareEdgeFunctionForRegional() {
-        const { defaults, environment, path: sitePath } = this.props;
-        const middlewarePath = path.resolve(sitePath, ".open-next/middleware-function");
-        const isMiddlewareEnabled = fs.existsSync(middlewarePath);
-        let bundlePath, handler;
-        if (this.isPlaceholder || !isMiddlewareEnabled) {
-            bundlePath = path.resolve(__dirname, "../support/ssr-site-function-stub");
-            handler = "server.handler";
-        }
-        else {
-            bundlePath = middlewarePath;
-            handler = "index.handler";
-        }
-        const fn = new EdgeFunction(this, "Middleware", {
-            bundlePath,
-            handler,
-            timeout: 5,
-            memory: 128,
-            permissions: defaults?.function?.permissions,
-            environment,
-            format: "esm",
-        });
-        return { fn, isMiddlewareEnabled };
-    }
 }

package/constructs/Queue.js

@@ -2,7 +2,7 @@ import { Construct } from "constructs";
 import * as sqs from "aws-cdk-lib/aws-sqs";
 import * as lambdaEventSources from "aws-cdk-lib/aws-lambda-event-sources";
 import { getFunctionRef, isCDKConstruct } from "./Construct.js";
-import { Function as Fn } from "./Function.js";
+import { Function as Fn, } from "./Function.js";
 import { toCdkDuration } from "./util/duration.js";
 /////////////////////
 // Construct
@@ -105,7 +105,7 @@ export class Queue extends Construct {
         const fn = Fn.fromDefinition(scope, `Consumer_${this.node.id}`, functionDefinition);
         fn.addEventSource(new lambdaEventSources.SqsEventSource(this.cdk.queue, eventSourceProps));
         // Attach permissions
-        this.permissionsAttachedForAllConsumers.forEach(permissions => {
+        this.permissionsAttachedForAllConsumers.forEach((permissions) => {
             fn.attachPermissions(permissions);
         });
         fn.bind(this.bindingForAllConsumers);
@@ -151,8 +151,8 @@ export class Queue extends Construct {
             data: {
                 name: this.cdk.queue.queueName,
                 url: this.cdk.queue.queueUrl,
-                consumer: getFunctionRef(this.consumerFunction)
-            }
+                consumer: getFunctionRef(this.consumerFunction),
+            },
         };
     }
     /** @internal */
@@ -162,12 +162,12 @@ export class Queue extends Construct {
             variables: {
                 queueUrl: {
                     environment: this.queueUrl,
-                    parameter: this.queueUrl
-                }
+                    parameter: this.queueUrl,
+                },
             },
             permissions: {
-                "sqs:*": [this.queueArn]
-            }
+                "sqs:*": [this.queueArn],
+            },
         };
     }
     createQueue() {
@@ -191,7 +191,7 @@ export class Queue extends Construct {
                     // TODO
                     console.log(toCdkDuration("900 seconds"));
                     debugOverrideProps = {
-                        visibilityTimeout: toCdkDuration("900 seconds")
+                        visibilityTimeout: toCdkDuration("900 seconds"),
                     };
                 }
             }
@@ -199,7 +199,7 @@ export class Queue extends Construct {
             this.cdk.queue = new sqs.Queue(this, "Queue", {
                 queueName: name,
                 ...sqsQueueProps,
-                ...debugOverrideProps
+                ...debugOverrideProps,
             });
         }
     }

package/constructs/RDS.d.ts

@@ -134,7 +134,7 @@ export interface RDSProps {
         secret?: secretsManager.ISecret;
     };
 }
-export declare type RDSEngineType = RDSProps["engine"];
+export type RDSEngineType = RDSProps["engine"];
 export interface RDSCdkServerlessClusterProps extends Omit<rds.ServerlessClusterProps, "vpc" | "engine" | "defaultDatabaseName" | "scaling"> {
     vpc?: ec2.IVpc;
 }

package/constructs/RDS.js

@@ -294,7 +294,7 @@ export class RDS extends Construct {
         const app = this.node.root;
         // Create custom resource handler
         const handler = new lambda.Function(this, "MigrationHandler", {
-            code: lambda.Code.fromAsset(path.join(__dirname, "Script")),
+            code: lambda.Code.fromAsset(path.join(__dirname, "../support/script-function")),
             runtime: lambda.Runtime.NODEJS_16_X,
             handler: "index.handler",
             timeout: cdk.Duration.minutes(15),

package/constructs/RemixSite.d.ts

@@ -19,10 +19,8 @@ export declare class RemixSite extends SsrSite {
         serverBuildOutputFile: string;
         clientBuildOutputDir: string;
         clientBuildVersionedSubDir: string;
-        siteStub: string;
     };
     private createServerLambdaBundle;
-    private createServerLambdaBundleWithStub;
     protected createFunctionForRegional(): lambda.Function;
     protected createFunctionForEdge(): EdgeFunction;
 }

package/constructs/RemixSite.js

@@ -4,12 +4,15 @@ import path from "path";
 import * as esbuild from "esbuild";
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
-import { Duration, RemovalPolicy } from "aws-cdk-lib";
+import { Duration as CdkDuration, RemovalPolicy } from "aws-cdk-lib";
 import * as logs from "aws-cdk-lib/aws-logs";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import { Logger } from "../logger.js";
 import { SsrSite } from "./SsrSite.js";
+import { useProject } from "../project.js";
 import { EdgeFunction } from "./EdgeFunction.js";
+import { toCdkSize } from "./util/size.js";
+import { toCdkDuration } from "./util/duration.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /**
  * The `RemixSite` construct is a higher level CDK construct that makes it easy to create a Remix app.
@@ -55,7 +58,6 @@ export class RemixSite extends SsrSite {
             serverBuildOutputFile: "build/index.js",
             clientBuildOutputDir: "public",
             clientBuildVersionedSubDir: "build",
-            siteStub: path.resolve(__dirname, "../support/remix-site-html-stub"),
         };
     }
     createServerLambdaBundle(wrapperFile) {
@@ -84,7 +86,7 @@ export class RemixSite extends SsrSite {
         Logger.debug(`Bundling server`);
         // 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(this.sstBuildDir, `RemixSiteFunction-${this.node.id}-${this.node.addr}`));
+        const outputPath = path.resolve(path.join(useProject().paths.artifacts, `RemixSiteFunction-${this.node.id}-${this.node.addr}`));
         // Copy the Remix polyfil to the server build directory
         const polyfillSource = path.resolve(__dirname, "../support/remix-site-function/polyfill.js");
         const polyfillDest = path.join(this.props.path, "build/polyfill.js");
@@ -109,15 +111,9 @@ export class RemixSite extends SsrSite {
         }
         return outputPath;
     }
-    createServerLambdaBundleWithStub() {
-        // Use existing stub bundle in assets
-        return path.resolve(__dirname, "../support/ssr-site-function-stub");
-    }
     createFunctionForRegional() {
-        const { defaults, environment } = this.props;
-        const bundlePath = this.isPlaceholder
-            ? this.createServerLambdaBundleWithStub()
-            : this.createServerLambdaBundle("regional-server.js");
+        const { timeout, memorySize, environment, cdk } = this.props;
+        const bundlePath = this.createServerLambdaBundle("regional-server.js");
         return new lambda.Function(this, `ServerFunction`, {
             description: "Server handler for Remix",
             handler: "server.handler",
@@ -127,23 +123,27 @@ export class RemixSite extends SsrSite {
             logRetention: logs.RetentionDays.THREE_DAYS,
             code: lambda.Code.fromAsset(bundlePath),
             runtime: lambda.Runtime.NODEJS_16_X,
-            memorySize: defaults?.function?.memorySize || 512,
-            timeout: Duration.seconds(defaults?.function?.timeout || 10),
+            memorySize: typeof memorySize === "string"
+                ? toCdkSize(memorySize).toMebibytes()
+                : memorySize,
+            timeout: typeof timeout === "string"
+                ? toCdkDuration(timeout)
+                : CdkDuration.seconds(timeout),
             environment,
+            ...cdk?.server,
         });
     }
     createFunctionForEdge() {
-        const { defaults, environment } = this.props;
-        const bundlePath = this.isPlaceholder
-            ? this.createServerLambdaBundleWithStub()
-            : this.createServerLambdaBundle("edge-server.js");
+        const { timeout, memorySize, permissions, environment } = this.props;
+        const bundlePath = this.createServerLambdaBundle("edge-server.js");
         return new EdgeFunction(this, `Server`, {
             scopeOverride: this,
+            format: "cjs",
             bundlePath,
             handler: "server.handler",
-            timeout: defaults?.function?.timeout,
-            memory: defaults?.function?.memorySize,
-            permissions: defaults?.function?.permissions,
+            timeout,
+            memorySize,
+            permissions,
             environment,
         });
     }

package/constructs/Script.js

@@ -113,7 +113,7 @@ export class Script extends Construct {
     }
     createCustomResourceFunction() {
         const handler = new lambda.Function(this, "ScriptHandler", {
-            code: lambda.Code.fromAsset(path.join(__dirname, "Script")),
+            code: lambda.Code.fromAsset(path.join(__dirname, "../support/script-function")),
             runtime: lambda.Runtime.NODEJS_16_X,
             handler: "index.handler",
             timeout: cdk.Duration.minutes(15),

package/constructs/Secret.js

@@ -1,5 +1,6 @@
 import { Construct } from "constructs";
-import { ENVIRONMENT_PLACEHOLDER, getParameterPath, getParameterFallbackPath } from "./util/functionBinding.js";
+import { Stack } from "./Stack.js";
+import { ENVIRONMENT_PLACEHOLDER, getParameterPath, getParameterFallbackPath, } from "./util/functionBinding.js";
 /**
  * The `Secret` construct is a higher level CDK construct that makes it easy to manage app secrets.
  *
@@ -32,6 +33,7 @@ export class Secret extends Construct {
     /** @internal */
     getFunctionBinding() {
         const app = this.node.root;
+        const partition = Stack.of(this).partition;
         return {
             clientPackage: "config",
             variables: {
@@ -43,8 +45,8 @@ export class Secret extends Construct {
             },
             permissions: {
                 "ssm:GetParameters": [
-                    `arn:aws:ssm:${app.region}:${app.account}:parameter${getParameterPath(this, "value")}`,
-                    `arn:aws:ssm:${app.region}:${app.account}:parameter${getParameterFallbackPath(this, "value")}`
+                    `arn:${partition}:ssm:${app.region}:${app.account}:parameter${getParameterPath(this, "value")}`,
+                    `arn:${partition}:ssm:${app.region}:${app.account}:parameter${getParameterFallbackPath(this, "value")}`,
                 ],
             },
         };

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";
 /**
@@ -17,8 +17,7 @@ export declare class SolidStartSite extends SsrSite {
         serverBuildOutputFile: string;
         clientBuildOutputDir: string;
         clientBuildVersionedSubDir: string;
-        siteStub: string;
     };
-    protected createFunctionForRegional(): lambda.Function;
+    protected createFunctionForRegional(): CdkFunction;
     protected createFunctionForEdge(): EdgeFunction;
 }

package/constructs/SolidStartSite.js

@@ -1,11 +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
@@ -23,79 +23,69 @@ export class SolidStartSite extends SsrSite {
             serverBuildOutputFile: "dist/server/index.mjs",
             clientBuildOutputDir: "dist/client",
             clientBuildVersionedSubDir: "assets",
-            siteStub: path.resolve(__dirname, "../support/solid-start-site-html-stub"),
         };
     }
     createFunctionForRegional() {
-        const { defaults, environment } = this.props;
+        const { timeout, memorySize, environment, cdk } = this.props;
         // Bundle code
-        const handler = this.isPlaceholder
-            ? path.resolve(__dirname, "../support/ssr-site-function-stub/index.handler")
-            : path.join(this.props.path, "dist", "server", "index.handler");
+        const handler = path.join(this.props.path, "dist", "server", "index.handler");
         // Create function
         const fn = new Function(this, `ServerFunction`, {
             description: "Server handler",
             handler,
             logRetention: "three_days",
             runtime: "nodejs16.x",
-            memorySize: defaults?.function?.memorySize || "512 MB",
-            timeout: defaults?.function?.timeout || "10 seconds",
+            memorySize,
+            timeout,
             nodejs: {
                 format: "esm",
             },
-            enableLiveDev: false,
             environment,
+            ...cdk?.server,
+            architecture: cdk?.server?.architecture === Architecture.ARM_64 ? "arm_64" : "x86_64",
         });
         fn._disableBind = true;
         return fn;
     }
     createFunctionForEdge() {
-        const { defaults, environment } = this.props;
+        const { timeout, memorySize, permissions, environment } = this.props;
+        // 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, `SolidStartSiteFunction-${this.node.id}-${this.node.addr}`));
         // Bundle code
-        let bundlePath;
-        let handler;
-        if (this.isPlaceholder) {
-            bundlePath = path.resolve(__dirname, "../support/ssr-site-function-stub");
-            handler = "index.handler";
-        }
-        else {
-            // 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(this.sstBuildDir, `SolidStartSiteFunction-${this.node.id}-${this.node.addr}`));
-            const result = esbuild.buildSync({
-                entryPoints: [path.join(this.props.path, this.buildConfig.serverBuildOutputFile)],
-                target: "esnext",
-                format: "esm",
-                platform: "node",
-                metafile: true,
-                bundle: true,
-                write: true,
-                allowOverwrite: true,
-                outfile: path.join(outputPath, "server.mjs"),
-                banner: {
-                    js: [
-                        `import { createRequire as topLevelCreateRequire } from 'module';`,
-                        `const require = topLevelCreateRequire(import.meta.url);`,
-                    ].join(""),
-                },
-            });
-            if (result.errors.length > 0) {
-                result.errors.forEach((error) => console.error(error));
-                throw new Error(`There was a problem bundling the function code for the ${this.id} SolidStartSite.`);
-            }
-            // Create package.json
-            fs.writeFileSync(path.join(outputPath, "package.json"), `{"type":"module"}`);
-            bundlePath = outputPath;
-            handler = "server.handler";
+        const result = buildSync({
+            entryPoints: [
+                path.join(this.props.path, this.buildConfig.serverBuildOutputFile),
+            ],
+            target: "esnext",
+            format: "esm",
+            platform: "node",
+            metafile: true,
+            bundle: true,
+            write: true,
+            allowOverwrite: true,
+            outfile: path.join(outputPath, "server.mjs"),
+            banner: {
+                js: [
+                    `import { createRequire as topLevelCreateRequire } from 'module';`,
+                    `const require = topLevelCreateRequire(import.meta.url);`,
+                ].join(""),
+            },
+        });
+        if (result.errors.length > 0) {
+            result.errors.forEach((error) => console.error(error));
+            throw new Error(`There was a problem bundling the function code for the ${this.id} SolidStartSite.`);
         }
+        // Create package.json
+        fs.writeFileSync(path.join(outputPath, "package.json"), `{"type":"module"}`);
         // Create function
         return new EdgeFunction(this, `Server`, {
             scopeOverride: this,
-            bundlePath,
-            handler,
-            timeout: defaults?.function?.timeout,
-            memory: defaults?.function?.memorySize,
-            permissions: defaults?.function?.permissions,
+            bundlePath: outputPath,
+            handler: "server.handler",
+            timeout,
+            memorySize,
+            permissions,
             environment,
             format: "esm",
         });

package/constructs/SsrFunction.d.ts

@@ -0,0 +1,22 @@
+import { Construct } from "constructs";
+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";
+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;
+}
+export declare class SsrFunction extends Construct {
+    function: lambda.Function;
+    private props;
+    constructor(scope: Construct, id: string, props: SsrFunctionProps);
+    attachPermissions(permissions: Permissions): void;
+    private createFunction;
+    private createLambdaCodeReplacer;
+    private getLambdaContentReplaceValues;
+}