sst 2.0.0-rc.50 → 2.0.0-rc.52

package/cli/commands/deploy.js

@@ -1,5 +1,7 @@
 import { useSTSIdentity } from "../../credentials.js";
 import { Colors } from "../colors.js";
+import fs from "fs/promises";
+import path from "path";
 export const deploy = (program) => program.command("deploy [filter]", "Deploy your app to AWS", (yargs) => yargs
     .option("from", {
     type: "string",
@@ -17,6 +19,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     const { loadAssembly, Stacks } = await import("../../stacks/index.js");
     const { render } = await import("ink");
     const { DeploymentUI } = await import("../ui/deploy.js");
+    const { mapValues } = await import("remeda");
     const project = useProject();
     const identity = await useSTSIdentity();
     Colors.line(`${Colors.primary.bold(`SST v${project.version}`)}`);
@@ -35,7 +38,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
             return result;
         }
         const spinner = createSpinner({
-            text: " Building stacks",
+            text: " Building...",
         });
         const result = await Stacks.synth({
             fn: project.stacks,
@@ -57,5 +60,6 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     printDeploymentResults(assembly, results);
     if (Object.values(results).some((stack) => Stacks.isFailed(stack.status)))
         process.exit(1);
+    fs.writeFile(path.join(project.paths.out, "outputs.json"), JSON.stringify(mapValues(results, (val) => val.outputs), null, 2));
     process.exit(0);
 });

package/cli/commands/dev.js

@@ -1,6 +1,6 @@
-import chalk from "chalk";
 import { Colors } from "../colors.js";
 import { printHeader } from "../ui/header.js";
+import { mapValues, omitBy, pipe } from "remeda";
 export const dev = (program) => program.command(["dev", "start"], "Work on your app locally", (yargs) => yargs.option("increase-timeout", {
     type: "boolean",
     description: "Increase function timeout",
@@ -69,11 +69,17 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
             }
         });
         bus.subscribe("function.build.success", async (evt) => {
-            Colors.line(Colors.dim(Colors.prefix, "Built", useFunctions().fromID(evt.properties.functionID).handler));
+            const info = useFunctions().fromID(evt.properties.functionID);
+            if (!info.enableLiveDev)
+                return;
+            Colors.line(Colors.dim(Colors.prefix, "Built", info.handler));
         });
         bus.subscribe("function.build.failed", async (evt) => {
+            const info = useFunctions().fromID(evt.properties.functionID);
+            if (!info.enableLiveDev)
+                return;
             Colors.gap();
-            Colors.line(Colors.danger("✖ "), "Build failed", useFunctions().fromID(evt.properties.functionID).handler);
+            Colors.line(Colors.danger("✖ "), "Build failed", info.handler);
             for (const line of evt.properties.errors) {
                 Colors.line("  ", line);
             }
@@ -81,9 +87,10 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
         bus.subscribe("function.success", async (evt) => {
             // stdout logs sometimes come in after
+            const p = prefix(evt.properties.requestID);
             const req = pending.get(evt.properties.requestID);
             setTimeout(() => {
-                Colors.line(prefix(evt.properties.requestID), Colors.dim(`Done in ${Date.now() - req.started - 100}ms`));
+                Colors.line(p, Colors.dim(`Done in ${Date.now() - req.started - 100}ms`));
                 end(evt.properties.requestID);
             }, 100);
         });
@@ -102,9 +109,15 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         const project = useProject();
         const bus = useBus();
         let lastDeployed;
-        let pending;
-        let isDeploying = false;
+        let isWorking = false;
+        let isDirty = false;
         async function build() {
+            if (isWorking) {
+                isDirty = true;
+                return;
+            }
+            isDirty = false;
+            isWorking = true;
             Colors.gap();
             const spinner = createSpinner({
                 color: "gray",
@@ -125,6 +138,9 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 Logger.debug("Checksum", "next", next, "old", lastDeployed);
                 if (next === lastDeployed) {
                     spinner.succeed(Colors.dim(" Built with no changes"));
+                    isWorking = false;
+                    if (isDirty)
+                        build();
                     return;
                 }
                 if (!lastDeployed) {
@@ -134,11 +150,9 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 }
                 else {
                     spinner.succeed(Colors.dim(` Built`));
-                    Colors.mode("gap");
+                    Colors.gap();
                 }
-                pending = assembly;
-                if (lastDeployed)
-                    setTimeout(() => deploy(), 100);
+                deploy(assembly);
             }
             catch (ex) {
                 spinner.fail();
@@ -149,17 +163,8 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 Colors.gap();
             }
         }
-        async function deploy() {
-            if (!pending)
-                return;
-            if (isDeploying)
-                return;
-            isDeploying = true;
-            const assembly = pending;
+        async function deploy(assembly) {
             const nextChecksum = await checksum(assembly.directory);
-            pending = undefined;
-            if (lastDeployed)
-                console.log();
             const component = render(React.createElement(DeploymentUI, { assembly: assembly }));
             const results = await Stacks.deployMany(assembly.stacks);
             component.clear();
@@ -181,8 +186,10 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 }
                 await SiteEnv.writeValues(result);
             }
-            isDeploying = false;
-            deploy();
+            fs.writeFile(path.join(project.paths.out, "outputs.json"), JSON.stringify(pipe(results, omitBy((_, key) => key.includes("SstSiteEnv")), mapValues((val) => val.outputs)), null, 2));
+            isWorking = false;
+            if (isDirty)
+                build();
         }
         async function checksum(cdkOutPath) {
             const manifestPath = path.join(cdkOutPath, "manifest.json");
@@ -209,11 +216,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
             build();
         });
         await build();
-        await deploy();
     });
-    const project = useProject();
-    const primary = chalk.hex("#E27152");
-    const link = chalk.cyan;
     await useLocalServer({
         key: "",
         cert: "",
@@ -221,17 +224,6 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     });
     clear();
     await printHeader({ console: true, hint: "ready!" });
-    /*
-    console.log(`  ${primary(`➜`)}  ${bold(dim(`Outputs:`))}`);
-    for (let i = 0; i < 3; i++) {
-      console.log(`       ${dim(`thdxr-scratch-MyStack`)}`);
-      console.log(
-        `       ${bold(
-          dim(`ApiEndpoint`)
-        )}: https://hdq3z0es2d.execute-api.us-east-1.amazonaws.com`
-      );
-    }
-    */
     await Promise.all([
         useRuntimeWorkers(),
         useIOTBridge(),

package/cli/commands/telemetry.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="yargs" />
+import type { Program } from "../program.js";
+export declare const telemetry: (program: Program) => import("yargs").Argv<{
+    stage: string | undefined;
+} & {
+    profile: string | undefined;
+} & {
+    region: string | undefined;
+} & {
+    verbose: boolean | undefined;
+} & {
+    role: string | undefined;
+} & {
+    action: string;
+}>;

package/cli/commands/telemetry.js

@@ -0,0 +1,17 @@
+import { Colors } from "../colors.js";
+export const telemetry = (program) => program.command("telemetry <action>", "Load environment variables and start your frontend", (yargs) => yargs.positional("action", {
+    type: "string",
+    describe: "Whether to enable or disable",
+    choices: ["enable", "disable"],
+    demandOption: true,
+}), async (args) => {
+    const { enable, disable } = await import("../telemetry/telemetry.js");
+    if (args.action === "enable") {
+        enable();
+        Colors.line(Colors.success(`✔ `), `Telemetry enabled`);
+    }
+    if (args.action === "disable") {
+        disable();
+        Colors.line(Colors.success(`✔ `), `Telemetry disabled`);
+    }
+});

package/cli/program.js

@@ -22,7 +22,7 @@ export const program = yargs(hideBin(process.argv))
     type: "string",
     describe: "ARN of the IAM role to use when invoking AWS",
 })
-    .group(["stage", "profile", "region", "help", "verbose", "role"], "Global:")
+    .group(["stage", "profile", "region", "role", "verbose", "help"], "Global:")
     .middleware(async (argv) => {
     if (argv.verbose) {
         process.env.SST_VERBOSE = "1";

package/cli/sst.js

@@ -20,6 +20,7 @@ import { update } from "./commands/update.js";
 import { transform } from "./commands/transform.js";
 import { diff } from "./commands/diff.js";
 import { version } from "./commands/version.js";
+import { telemetry } from "./commands/telemetry.js";
 dev(program);
 deploy(program);
 build(program);
@@ -32,6 +33,7 @@ transform(program);
 consoleCommand(program);
 diff(program);
 version(program);
+telemetry(program);
 // @ts-expect-error
 process.setSourceMapsEnabled(true);
 process.removeAllListeners("uncaughtException");

package/cli/ui/deploy.js

@@ -70,15 +70,7 @@ export function printDeploymentResults(assembly, results, remove) {
         Colors.gap();
         Colors.line(Colors.success(`✔`), Colors.bold(remove ? `  Removed:` : ` Deployed:`));
         for (const [stack, result] of success) {
-            const outputs = Object.entries(result.outputs).filter(([key, _]) => {
-                if (key.startsWith("Export"))
-                    return false;
-                if (key.includes("SstSiteEnv"))
-                    return false;
-                if (key === "SSTMetadata")
-                    return false;
-                return true;
-            });
+            const outputs = Object.entries(result.outputs).filter(([key, _]) => !key.includes("SstSiteEnv"));
             Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);
             if (outputs.length > 0) {
                 for (const key of Object.keys(Object.fromEntries(outputs)).sort()) {
@@ -87,6 +79,7 @@ export function printDeploymentResults(assembly, results, remove) {
                 }
             }
         }
+        Colors.gap();
     }
     // Print failed stacks
     const failed = Object.entries(results).filter(([_stack, result]) => Object.keys(result.errors).length > 0);
@@ -121,9 +114,9 @@ function logicalIdToCdkPath(assembly, stack, logicalId) {
 }
 function getHelper(error) {
     return `This is a common deploy error. Check out this GitHub issue for more details - https://github.com/serverless-stack/sst/issues/125`;
-    return getApiAccessLogPermissionsHelper(error)
-        || getAppSyncMultiResolverHelper(error)
-        || getApiLogRoleHelper(error);
+    return (getApiAccessLogPermissionsHelper(error) ||
+        getAppSyncMultiResolverHelper(error) ||
+        getApiLogRoleHelper(error));
 }
 function getApiAccessLogPermissionsHelper(error) {
     // Can run into this issue when enabling access logs for API Gateway

package/constructs/AstroSite.d.ts

@@ -17,7 +17,6 @@ export declare class AstroSite extends SsrSite {
         serverBuildOutputFile: string;
         clientBuildOutputDir: string;
         clientBuildVersionedSubDir: string;
-        siteStub: string;
     };
     protected validateBuildOutput(): void;
     protected createFunctionForRegional(): lambda.Function;

package/constructs/AstroSite.js

@@ -4,6 +4,7 @@ import path from "path";
 import * as esbuild from "esbuild";
 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));
 /**
@@ -23,7 +24,6 @@ export class AstroSite extends SsrSite {
             serverBuildOutputFile: "dist/server/entry.mjs",
             clientBuildOutputDir: "dist/client",
             clientBuildVersionedSubDir: "assets",
-            siteStub: path.resolve(__dirname, "../support/astro-site-html-stub"),
         };
     }
     validateBuildOutput() {
@@ -36,14 +36,10 @@ export class AstroSite extends SsrSite {
     }
     createFunctionForRegional() {
         const { defaults, environment, bind } = 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", "entry.handler");
         // Create function
         const fn = new Function(this, `ServerFunction`, {
             description: "Server handler",
-            handler,
+            handler: path.join(this.props.path, "dist", "server", "entry.handler"),
             bind,
             logRetention: "three_days",
             runtime: "nodejs16.x",
@@ -60,50 +56,39 @@ export class AstroSite extends SsrSite {
     }
     createFunctionForEdge() {
         const { defaults, environment } = this.props;
-        // 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, `AstroSiteFunction-${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, "entry.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} AstroSite.`);
-            }
-            // Create package.json
-            fs.writeFileSync(path.join(outputPath, "package.json"), `{"type":"module"}`);
-            bundlePath = outputPath;
-            handler = "entry.handler";
+        // 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({
+            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, "entry.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} AstroSite.`);
         }
+        // Create package.json
+        fs.writeFileSync(path.join(outputPath, "package.json"), `{"type":"module"}`);
         // Create function
         return new EdgeFunction(this, `Server`, {
             scopeOverride: this,
-            bundlePath,
-            handler,
+            bundlePath: outputPath,
+            handler: "entry.handler",
             timeout: defaults?.function?.timeout,
             memory: defaults?.function?.memorySize,
             permissions: defaults?.function?.permissions,

package/constructs/Job.js

@@ -7,7 +7,7 @@ import * as iam from "aws-cdk-lib/aws-iam";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import * as codebuild from "aws-cdk-lib/aws-codebuild";
 import { Stack } from "./Stack.js";
-import { Function } from "./Function.js";
+import { Function, useFunctions } from "./Function.js";
 import { toCdkDuration } from "./util/duration.js";
 import { attachPermissionsToRole } from "./util/permission.js";
 import { bindEnvironment, bindPermissions } from "./util/functionBinding.js";
@@ -44,6 +44,10 @@ export class Job extends Construct {
         const app = this.node.root;
         this.id = id;
         this.props = props;
+        useFunctions().add(this.node.addr, {
+            ...props,
+            runtime: "nodejs16.x",
+        });
         this.localId = path.posix
             .join(scope.node.path, id)
             .replace(/\$/g, "-")
@@ -254,7 +258,7 @@ export class Job extends Construct {
     }
     createCodeBuildInvoker() {
         return new Function(this, this.node.id, {
-            handler: path.join(__dirname, "../dist/support/job-invoke/index.main"),
+            handler: path.join(__dirname, "../support/job-invoker/index.main"),
             runtime: "nodejs16.x",
             timeout: 10,
             memorySize: 1024,

package/constructs/NextjsSite.d.ts

@@ -21,13 +21,11 @@ export declare class NextjsSite extends SsrSite {
         serverBuildOutputFile: string;
         clientBuildOutputDir: string;
         clientBuildVersionedSubDir: string;
-        siteStub: string;
     };
     protected createFunctionForRegional(): lambda.Function;
+    private createImageOptimizationFunctionForRegional;
+    private createMiddlewareEdgeFunctionForRegional;
     protected createCloudFrontDistributionForRegional(): cloudfront.Distribution;
-    protected createCloudFrontDistributionForStub(): cloudfront.Distribution;
     protected createCloudFrontServerCachePolicy(): cloudfront.CachePolicy;
     protected generateBuildId(): string;
-    private createImageOptimizationFunctionForRegional;
-    private createMiddlewareEdgeFunctionForRegional;
 }

package/constructs/NextjsSite.js

@@ -2,14 +2,14 @@ import fs from "fs";
 import url from "url";
 import path from "path";
 import spawn from "cross-spawn";
-import { buildErrorResponsesForRedirectToIndex } from "./BaseSite.js";
 import { Fn, Duration, 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 { useProject } from "../project.js";
 import { EdgeFunction } from "./EdgeFunction.js";
+import { SsrSite } from "./SsrSite.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.
@@ -34,50 +34,82 @@ 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 {
-            // 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.
-            //       https://github.com/aws/aws-cdk/issues/9251
-            //       We will zip the folder ourselves.
-            const zipOutDir = path.resolve(path.join(this.sstBuildDir, `Site-${this.node.id}-${this.node.addr}`));
-            const script = path.resolve(__dirname, "../support/ssr-site-function-archiver.mjs");
-            const result = spawn.sync("node", [
-                script,
-                path.join(this.props.path, ".open-next", "server-function"),
-                path.join(zipOutDir, "server-function.zip"),
-            ], {
-                stdio: "inherit",
-            });
-            if (result.status !== 0) {
-                throw new Error(`There was a problem generating the assets package.`);
-            }
-            bundlePath = path.join(zipOutDir, "server-function.zip");
-            handler = "index.handler";
+        // 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.
+        //       https://github.com/aws/aws-cdk/issues/9251
+        //       We will zip the folder ourselves.
+        const zipOutDir = path.resolve(path.join(useProject().paths.artifacts, `Site-${this.node.id}-${this.node.addr}`));
+        const script = path.resolve(__dirname, "../support/ssr-site-function-archiver.mjs");
+        const result = spawn.sync("node", [
+            script,
+            path.join(this.props.path, ".open-next", "server-function"),
+            path.join(zipOutDir, "server-function.zip"),
+        ], {
+            stdio: "inherit",
+        });
+        if (result.status !== 0) {
+            throw new Error(`There was a problem generating the assets package.`);
         }
         return new lambda.Function(this, `ServerFunction`, {
             description: "Server handler for Next.js",
-            handler,
+            handler: "index.handler",
+            currentVersionOptions: {
+                removalPolicy: RemovalPolicy.DESTROY,
+            },
+            logRetention: logs.RetentionDays.THREE_DAYS,
+            code: lambda.Code.fromAsset(path.join(zipOutDir, "server-function.zip")),
+            runtime: lambda.Runtime.NODEJS_18_X,
+            memorySize: defaults?.function?.memorySize || 512,
+            timeout: Duration.seconds(defaults?.function?.timeout || 10),
+            environment,
+        });
+    }
+    createImageOptimizationFunctionForRegional() {
+        const { defaults, 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),
+            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 (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,
+            memory: 128,
+            permissions: defaults?.function?.permissions,
             environment,
+            format: "esm",
         });
+        return { fn, isMiddlewareEnabled };
     }
     createCloudFrontDistributionForRegional() {
         const { cdk } = this.props;
@@ -96,7 +128,7 @@ export class NextjsSite extends SsrSite {
             compress: true,
             cachePolicy: cdk?.cachePolicies?.serverRequests ??
                 this.createCloudFrontServerCachePolicy(),
-            edgeLambdas: isMiddlewareEnabled && !this.isPlaceholder
+            edgeLambdas: isMiddlewareEnabled
                 ? [{
                         eventType: cloudfront.LambdaEdgeEventType.VIEWER_REQUEST,
                         functionVersion: middlewareFn.currentVersion,
@@ -208,22 +240,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(),
@@ -242,61 +258,7 @@ export class NextjsSite extends SsrSite {
         });
     }
     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 };
-    }
 }