sst 2.2.8 → 2.3.1

package/cli/commands/bind.js

@@ -1,31 +1,203 @@
+import path from "path";
 import { VisibleError } from "../../error.js";
+const SITE_CONFIG = {
+    NextjsSite: "next.config",
+    AstroSite: "astro.config",
+    RemixSite: "remix.config",
+    SolidStartSite: "vite.config",
+    StaticSite: "vite.config",
+    SlsNextjsSite: "next.config",
+};
 export const bind = (program) => program
-    .command("bind <command..>", "Bind your app's resources to a command", (yargs) => yargs
+    .command(["bind <command..>", "env <command..>"], "Bind your app's resources to a command", (yargs) => yargs
     .array("command")
     .example(`sst bind "vitest run"`, "Bind your resources to your tests")
     .example(`sst bind "tsx scripts/myscript.ts"`, "Bind your resources to a script"), async (args) => {
-    const { Config } = await import("../../config.js");
-    const { spawnSync } = await import("child_process");
-    const { useAWSCredentials } = await import("../../credentials.js");
+    const { spawn } = await import("child_process");
     const { useProject } = await import("../../project.js");
-    const env = await Config.env();
+    const { useBus } = await import("../../bus.js");
+    const { useIOT } = await import("../../iot.js");
+    const { Colors } = await import("../colors.js");
+    if (args._[0] === "env") {
+        Colors.line(Colors.warning(`Warning: ${Colors.bold(`sst env`)} has been renamed to ${Colors.bold(`sst bind`)}`));
+    }
+    await useIOT();
+    const bus = useBus();
     const project = useProject();
-    const credentials = await useAWSCredentials();
-    const joined = args.command?.join(" ");
-    if (!joined)
-        throw new VisibleError("Command is required, e.g. sst bind env");
-    const result = spawnSync(joined, {
-        env: {
-            ...process.env,
-            ...env,
+    const command = args.command?.join(" ");
+    const isFrontend = await isRunningInFrontend();
+    let p;
+    let timer;
+    let metadataCache;
+    // Handle missing command
+    if (!command) {
+        throw new VisibleError(`Command is required, e.g. sst bind ${isFrontend ? "next dev" : "env"}`);
+    }
+    // Bind script
+    const initialMetadata = await getSiteMetadata();
+    if (!initialMetadata) {
+        return await bindScript();
+    }
+    // Bind site
+    await bindSite("init");
+    bus.subscribe("stacks.metadata.updated", () => bindSite("metadata_updated"));
+    bus.subscribe("stacks.metadata.deleted", () => bindSite("metadata_updated"));
+    bus.subscribe("config.secret.updated", (payload) => {
+        const secretName = payload.properties.name;
+        if (metadataCache?.secrets === undefined)
+            return;
+        if (!metadataCache.secrets.includes(secretName))
+            return;
+        Colors.line(`\n`, `SST secrets have been updated. Restarting \`${command}\`...`);
+        bindSite("secrets_updated");
+    });
+    async function isRunningInFrontend() {
+        const { existsAsync } = await import("../../util/fs.js");
+        const results = await Promise.all(Object.values(SITE_CONFIG)
+            .map((config) => [".js", ".cjs", ".mjs", ".ts"].map((ext) => existsAsync(`${config}${ext}`)))
+            .flat());
+        return results.some(Boolean);
+    }
+    async function bindSite(reason) {
+        // Get metadata
+        const metadata = (reason === "init" ? initialMetadata : await getSiteMetadata());
+        // Handle rebind due to metadata updated
+        if (reason === "metadata_updated") {
+            if (areEnvsSame(metadata.envs, metadataCache?.envs || {}))
+                return;
+            Colors.line(`\n`, `SST resources have been updated. Restarting \`${command}\`...`);
+        }
+        metadataCache = metadata;
+        // Assume function's role credentials
+        if (metadata.role) {
+            const credentials = await assumeSsrRole(metadata.role);
+            if (credentials) {
+                // refresh crecentials 1 minute before expiration
+                const expireAt = credentials.Expiration.getTime() - 60000;
+                clearTimeout(timer);
+                timer = setTimeout(() => {
+                    Colors.line(`\n`, `Your AWS session is about to expire. Creating a new session and restarting \`${command}\`...`);
+                    bindSite("iam_expired");
+                }, expireAt - Date.now());
+                runCommand({
+                    ...metadata.envs,
+                    AWS_ACCESS_KEY_ID: credentials.AccessKeyId,
+                    AWS_SECRET_ACCESS_KEY: credentials.SecretAccessKey,
+                    AWS_SESSION_TOKEN: credentials.SessionToken,
+                });
+                return;
+            }
+        }
+        // Fallback to use local IAM credentials
+        runCommand({
+            ...metadata.envs,
+            ...(await localIamCredentials()),
+        });
+    }
+    async function bindScript() {
+        const { Config } = await import("../../config.js");
+        runCommand({
+            ...(await Config.env()),
+            ...(await localIamCredentials()),
+        });
+    }
+    async function getSiteMetadata() {
+        const { metadata } = await import("../../stacks/metadata.js");
+        const { createSpinner } = await import("../spinner.js");
+        const { LambdaClient, GetFunctionCommand } = await import("@aws-sdk/client-lambda");
+        const { useAWSClient } = await import("../../credentials.js");
+        const spinner = createSpinner({});
+        while (true) {
+            const metadataData = await metadata();
+            const data = Object.values(metadataData)
+                .flat()
+                .filter((c) => Boolean(c))
+                .filter((c) => Boolean(SITE_CONFIG[c.type]))
+                .find((c) => path.resolve(project.paths.root, c.data.path) ===
+                process.cwd());
+            // Do not retry if not running in frontend
+            if (!data && !isFrontend) {
+                return;
+            }
+            // Handle site metadata not found
+            if (!data) {
+                spinner.start(
+                //"Waiting for SST to start for the first time. Run `sst dev`..."
+                //"Run `sst dev` for the first time. Waiting..."
+                "Make sure `sst dev` is running...");
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+                continue;
+            }
+            // Handle site metadata is old
+            const isBindSupported = data.type !== "StaticSite" && data.type !== "SlsNextjsSite";
+            if ((isBindSupported && !data.data.server) ||
+                (!isBindSupported && !data.data.environment)) {
+                spinner.start("This was deployed with an old version of SST. Make sure to restart `sst dev`...");
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+                continue;
+            }
+            spinner.isSpinning && spinner.stop().clear();
+            // Handle StaticSite
+            if (!isBindSupported) {
+                return { envs: data.data.environment };
+            }
+            // Get function details
+            const lambda = useAWSClient(LambdaClient);
+            const { Configuration: functionConfig } = await lambda.send(new GetFunctionCommand({
+                FunctionName: data.data.server,
+            }));
+            return {
+                role: functionConfig?.Role,
+                envs: functionConfig?.Environment?.Variables || {},
+                secrets: data.data.secrets,
+            };
+        }
+    }
+    async function assumeSsrRole(roleArn) {
+        const { STSClient, AssumeRoleCommand } = await import("@aws-sdk/client-sts");
+        const { Logger } = await import("../../logger.js");
+        const { useAWSClient } = await import("../../credentials.js");
+        const sts = useAWSClient(STSClient);
+        try {
+            const { Credentials: credentials } = await sts.send(new AssumeRoleCommand({
+                RoleArn: roleArn,
+                RoleSessionName: "dev-session",
+                DurationSeconds: 43200,
+            }));
+            return credentials;
+        }
+        catch (e) {
+            Colors.line(Colors.warning(`Failed to assume SSR role ${roleArn}. Falling back to using local IAM credentials.`));
+            Logger.debug(`Failed to assume ${roleArn}.`, e);
+        }
+    }
+    async function localIamCredentials() {
+        const { useAWSCredentials } = await import("../../credentials.js");
+        const credentials = await useAWSCredentials();
+        return {
             AWS_ACCESS_KEY_ID: credentials.accessKeyId,
             AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,
             AWS_SESSION_TOKEN: credentials.sessionToken,
-            AWS_REGION: project.config.region,
-        },
-        stdio: "inherit",
-        shell: true,
-    });
-    process.exitCode = result.status || undefined;
+        };
+    }
+    function runCommand(envs) {
+        Colors.gap();
+        if (p) {
+            p.kill();
+        }
+        p = spawn(command, {
+            env: {
+                ...process.env,
+                ...envs,
+                AWS_REGION: project.config.region,
+            },
+            stdio: "inherit",
+            shell: true,
+        });
+    }
+    function areEnvsSame(envs1, envs2) {
+        return (Object.keys(envs1).length === Object.keys(envs2).length &&
+            Object.keys(envs1).every((key) => envs1[key] === envs2[key]));
+    }
 })
     .strict(false);

package/cli/commands/dev.js

@@ -4,7 +4,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
 }), async (args) => {
     const { Colors } = await import("../colors.js");
     const { printHeader } = await import("../ui/header.js");
-    const { mapValues, omitBy, pipe } = await import("remeda");
+    const { mapValues } = await import("remeda");
     const path = await import("path");
     const { useRuntimeWorkers } = await import("../../runtime/workers.js");
     const { useIOTBridge } = await import("../../runtime/iot.js");
@@ -23,7 +23,6 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const fs = await import("fs/promises");
     const crypto = await import("crypto");
     const { useFunctions } = await import("../../constructs/Function.js");
-    const { SiteEnv } = await import("../../site-env.js");
     const { usePothosBuilder } = await import("./plugins/pothos.js");
     const { useKyselyTypeGenerator } = await import("./plugins/kysely.js");
     const { useRDSWarmer } = await import("./plugins/warmer.js");
@@ -178,22 +177,8 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 await saveAppMetadata({ mode: "dev" });
             }
             lastDeployed = nextChecksum;
-            // Update site env
-            const keys = await SiteEnv.keys();
-            const result = {};
-            for (const key of keys) {
-                const stack = results[key.stack];
-                const value = stack.outputs[key.output];
-                let existing = result[key.path];
-                if (!existing) {
-                    result[key.path] = existing;
-                    existing = result[key.path] = {};
-                }
-                existing[key.environment] = value;
-            }
-            await SiteEnv.writeValues(result);
             // Write outputs.json
-            fs.writeFile(path.join(project.paths.out, "outputs.json"), JSON.stringify(pipe(results, omitBy((_, key) => key.includes("SstSiteEnv")), mapValues((val) => val.outputs)), null, 2));
+            fs.writeFile(path.join(project.paths.out, "outputs.json"), JSON.stringify(mapValues(results, (val) => val.outputs), null, 2));
             isWorking = false;
             if (isDirty)
                 build();

package/cli/commands/secrets/set.js

@@ -14,8 +14,10 @@ export const set = (program) => program.command("set <name> <value>", "Set the v
     describe: "Set the fallback value",
 }), async (args) => {
     const { Config } = await import("../../../config.js");
+    const { Colors } = await import("../../colors.js");
     const { blue } = await import("colorette");
     const { createSpinner } = await import("../../spinner.js");
+    // Set secret value
     const setting = createSpinner(` Setting "${args.name}"`).start();
     await Config.setSecret({
         key: args.name,
@@ -23,9 +25,24 @@ export const set = (program) => program.command("set <name> <value>", "Set the v
         fallback: args.fallback === true,
     });
     setting.succeed();
-    const restarting = createSpinner(` Restarting all functions using ${blue(args.name)}...`).start();
-    const count = await Config.restart(args.name);
-    restarting.succeed(count === 1
-        ? ` Restarted ${count} function`
-        : ` Restarted ${count} functions`);
+    // Restart functions & sites
+    const restarting = createSpinner(` Reloading all resources using ${blue(args.name)}...`).start();
+    const { edgeSites, sites, placeholderSites, functions } = await Config.restart(args.name);
+    restarting.stop().clear();
+    const siteCount = sites.length + placeholderSites.length;
+    if (siteCount > 0) {
+        Colors.line(Colors.success(`✔ `), siteCount === 1
+            ? `Reloaded ${siteCount} site`
+            : `Reloaded ${siteCount} sites`);
+    }
+    const functionCount = functions.length;
+    if (functionCount > 0) {
+        Colors.line(Colors.success(`✔ `), functionCount === 1
+            ? `Reloaded ${functionCount} function`
+            : `Reloaded ${functionCount} functions`);
+    }
+    edgeSites.forEach(({ id, type }) => {
+        Colors.line(Colors.danger(`➜ `), `Redeploy the "${id}" ${type} to use the new secret`);
+    });
+    process.exit(0);
 });

package/cli/sst.js

@@ -13,7 +13,6 @@ dotenv.config({
     override: true,
 });
 import { bootstrap } from "./commands/bootstrap.js";
-import { env } from "./commands/env.js";
 import { dev } from "./commands/dev.js";
 import { bind } from "./commands/bind.js";
 import { build } from "./commands/build.js";
@@ -31,7 +30,6 @@ dev(program);
 deploy(program);
 build(program);
 bind(program);
-env(program);
 secrets(program);
 remove(program);
 update(program);

package/cli/ui/deploy.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+/// <reference types="react" resolution-mode="require"/>
 import { Stacks } from "../../stacks/index.js";
 import type { CloudAssembly } from "aws-cdk-lib/cx-api";
 interface Props {

package/cli/ui/deploy.js

@@ -71,13 +71,10 @@ 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, _]) => !key.includes("SstSiteEnv"));
             Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);
-            if (outputs.length > 0) {
-                for (const key of Object.keys(Object.fromEntries(outputs)).sort()) {
-                    const value = result.outputs[key];
-                    Colors.line(`   ${Colors.bold.dim(key + ":")} ${value}`);
-                }
+            for (const key of Object.keys(result.outputs).sort()) {
+                const value = result.outputs[key];
+                Colors.line(`   ${Colors.bold.dim(key + ":")} ${value}`);
             }
         }
         Colors.gap();

package/cli/ui/functions.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
+/// <reference types="react" resolution-mode="require"/>
 export declare function Functions(): JSX.Element;

package/config.d.ts

@@ -1,3 +1,11 @@
+import { FunctionMetadata, SsrSiteMetadata } from "./constructs/Metadata.js";
+declare module "./bus.js" {
+    interface Events {
+        "config.secret.updated": {
+            name: string;
+        };
+    }
+}
 interface Secret {
     value?: string;
     fallback?: string;
@@ -38,6 +46,11 @@ export declare namespace Config {
         key: string;
         fallback?: boolean;
     }): Promise<void>;
-    function restart(key: string): Promise<number>;
+    function restart(key: string): Promise<{
+        edgeSites: SsrSiteMetadata[];
+        sites: SsrSiteMetadata[];
+        placeholderSites: SsrSiteMetadata[];
+        functions: FunctionMetadata[];
+    }>;
 }
 export {};

package/config.js

@@ -3,6 +3,7 @@ import { GetFunctionConfigurationCommand, LambdaClient, UpdateFunctionConfigurat
 import { pipe, map } from "remeda";
 import { useProject } from "./project.js";
 import { useAWSClient } from "./credentials.js";
+import { useIOT } from "./iot.js";
 import { Stacks } from "./stacks/index.js";
 export var Config;
 (function (Config) {
@@ -71,7 +72,7 @@ export var Config;
     Config.env = env;
     async function setSecret(input) {
         const ssm = useAWSClient(SSMClient);
-        const result = await ssm.send(new PutParameterCommand({
+        await ssm.send(new PutParameterCommand({
             Name: pathFor({
                 id: input.key,
                 type: "Secret",
@@ -82,6 +83,10 @@ export var Config;
             Type: "SecureString",
             Overwrite: true,
         }));
+        // Publish event
+        const iot = await useIOT();
+        const topic = `${iot.prefix}/events`;
+        await iot.publish(topic, "config.secret.updated", { name: input.key });
     }
     Config.setSecret = setSecret;
     async function getSecret(input) {
@@ -111,38 +116,44 @@ export var Config;
     }
     Config.removeSecret = removeSecret;
     async function restart(key) {
-        const lambda = useAWSClient(LambdaClient);
         const metadata = await Stacks.metadata();
-        const filtered = Object.values(metadata)
+        const siteData = Object.values(metadata)
             .flat()
-            .filter((f) => f.type === "Function")
-            .filter((f) => f.data.secrets.includes(key));
-        const restarted = await Promise.all(filtered.map(async (f) => {
-            // Note: in the case where the function is removed, but the metadata
-            //       is not updated, we ignore the Function not found error.
-            try {
-                const config = await lambda.send(new GetFunctionConfigurationCommand({
-                    FunctionName: f.data.arn,
-                }));
-                await lambda.send(new UpdateFunctionConfigurationCommand({
-                    FunctionName: f.data.arn,
-                    Environment: {
-                        Variables: {
-                            ...(config.Environment?.Variables || {}),
-                            [SECRET_UPDATED_AT_ENV]: Date.now().toString(),
-                        },
-                    },
-                }));
-                return true;
-            }
-            catch (e) {
-                if (e.name === "ResourceNotFoundException" &&
-                    e.message.startsWith("Function not found")) {
-                    return;
-                }
-            }
-        }));
-        return restarted.filter(Boolean).length;
+            .filter((c) => c.type === "AstroSite" ||
+            c.type === "NextjsSite" ||
+            c.type === "RemixSite" ||
+            c.type === "SolidStartSite")
+            .filter((c) => c.data.secrets.includes(key));
+        const siteDataPlaceholder = siteData.filter((c) => c.data.mode === "placeholder");
+        const siteDataEdge = siteData
+            .filter((c) => c.data.mode === "deployed")
+            .filter((c) => c.data.edge);
+        const siteDataRegional = siteData
+            .filter((c) => c.data.mode === "deployed")
+            .filter((c) => !c.data.edge);
+        const regionalSiteArns = siteData.map((s) => s.data.server);
+        const functionData = Object.values(metadata)
+            .flat()
+            .filter((c) => c.type === "Function")
+            // filter out SSR functions for sites
+            .filter((c) => !regionalSiteArns.includes(c.data.arn))
+            .filter((c) => c.data.secrets.includes(key));
+        // Restart sites
+        const restartedSites = (await Promise.all(siteDataRegional.map(async (s) => {
+            const restarted = await restartFunction(s.data.server);
+            return restarted ? s : restarted;
+        }))).filter((c) => Boolean(c));
+        // Restart functions
+        const restartedFunctions = (await Promise.all(functionData.map(async (f) => {
+            const restarted = await restartFunction(f.data.arn);
+            return restarted ? f : restarted;
+        }))).filter((c) => Boolean(c));
+        return {
+            edgeSites: siteDataEdge,
+            sites: restartedSites,
+            placeholderSites: siteDataPlaceholder,
+            functions: restartedFunctions,
+        };
     }
     Config.restart = restart;
 })(Config || (Config = {}));
@@ -182,3 +193,29 @@ function parse(ssmName) {
         prop: parts.slice(6).join("/"),
     };
 }
+async function restartFunction(arn) {
+    const lambda = useAWSClient(LambdaClient);
+    // Note: in the case where the function is removed, but the metadata
+    //       is not updated, we ignore the Function not found error.
+    try {
+        const config = await lambda.send(new GetFunctionConfigurationCommand({
+            FunctionName: arn,
+        }));
+        await lambda.send(new UpdateFunctionConfigurationCommand({
+            FunctionName: arn,
+            Environment: {
+                Variables: {
+                    ...(config.Environment?.Variables || {}),
+                    [SECRET_UPDATED_AT_ENV]: Date.now().toString(),
+                },
+            },
+        }));
+        return true;
+    }
+    catch (e) {
+        if (e.name === "ResourceNotFoundException" &&
+            e.message.startsWith("Function not found")) {
+            return;
+        }
+    }
+}

package/constructs/App.d.ts

@@ -50,7 +50,7 @@ export declare class App extends CDKApp {
      */
     readonly mode: AppDeployProps["mode"];
     /**
-     * The name of your app, comes from the `name` in your `sst.json`
+     * The name of your app, comes from the `name` in your `sst.config.ts`
      */
     readonly name: string;
     /**
@@ -58,7 +58,7 @@ export declare class App extends CDKApp {
      */
     readonly stage: string;
     /**
-     * The region the app is being deployed to. If this is not specified as the --region option in the SST CLI, it'll default to the region in your sst.json.
+     * The region the app is being deployed to. If this is not specified as the --region option in the SST CLI, it'll default to the region in your sst.config.ts.
      */
     readonly region: string;
     /**

package/constructs/App.js

@@ -11,7 +11,6 @@ import { useDeferredTasks } from "./deferred_task.js";
 import { AppContext } from "./context.js";
 import { useProject } from "../project.js";
 import { Logger } from "../logger.js";
-import { SiteEnv } from "../site-env.js";
 import { App as CDKApp, Tags, CfnResource, RemovalPolicy, CustomResourceProvider, CustomResourceProviderRuntime, CustomResource, Aspects, } from "aws-cdk-lib";
 import { CfnFunction } from "aws-cdk-lib/aws-lambda";
 import { Bucket } from "aws-cdk-lib/aws-s3";
@@ -35,7 +34,7 @@ export class App extends CDKApp {
      */
     mode;
     /**
-     * The name of your app, comes from the `name` in your `sst.json`
+     * The name of your app, comes from the `name` in your `sst.config.ts`
      */
     name;
     /**
@@ -43,7 +42,7 @@ export class App extends CDKApp {
      */
     stage;
     /**
-     * The region the app is being deployed to. If this is not specified as the --region option in the SST CLI, it'll default to the region in your sst.json.
+     * The region the app is being deployed to. If this is not specified as the --region option in the SST CLI, it'll default to the region in your sst.config.ts.
      */
     region;
     /**
@@ -71,7 +70,6 @@ export class App extends CDKApp {
     constructor(deployProps, props = {}) {
         super(props);
         AppContext.provide(this);
-        SiteEnv.reset();
         this.appPath = process.cwd();
         this.mode = deployProps.mode;
         this.local = this.mode === "dev";

package/constructs/AstroSite.d.ts

@@ -14,6 +14,7 @@ import { EdgeFunction } from "./EdgeFunction.js";
  */
 export declare class AstroSite extends SsrSite {
     protected initBuildConfig(): {
+        typesPath: string;
         serverBuildOutputFile: string;
         clientBuildOutputDir: string;
         clientBuildVersionedSubDir: string;

package/constructs/AstroSite.js

@@ -18,6 +18,7 @@ import { EdgeFunction } from "./EdgeFunction.js";
 export class AstroSite extends SsrSite {
     initBuildConfig() {
         return {
+            typesPath: "src",
             serverBuildOutputFile: "dist/server/entry.mjs",
             clientBuildOutputDir: "dist/client",
             clientBuildVersionedSubDir: "assets",

package/constructs/Function.d.ts

@@ -513,7 +513,7 @@ export interface JavaProps {
  */
 export interface FunctionCopyFilesProps {
     /**
-     * Source path relative to sst.json
+     * Source path relative to sst.config.ts
      */
     from: string;
     /**

package/constructs/Metadata.d.ts

@@ -24,10 +24,14 @@ import type { KinesisStream } from "./KinesisStream.js";
 export type KinesisStreamMetadata = ExtractMetadata<KinesisStream>;
 import type { NextjsSite } from "./NextjsSite.js";
 export type NextjsMetadata = ExtractMetadata<NextjsSite>;
+import type { NextjsSite as SlsNextjsSite } from "./deprecated/NextjsSite.js";
+export type SlsNextjsMetadata = ExtractMetadata<SlsNextjsSite>;
 import type { Queue } from "./Queue.js";
 export type QueueMetadata = ExtractMetadata<Queue>;
 import type { StaticSite } from "./StaticSite.js";
 export type StaticSiteMetadata = ExtractMetadata<StaticSite>;
+import type { SsrSite } from "./SsrSite.js";
+export type SsrSiteMetadata = ExtractMetadata<SsrSite>;
 import type { Table } from "./Table.js";
 export type TableMetadata = ExtractMetadata<Table>;
 import type { Topic } from "./Topic.js";
@@ -36,5 +40,5 @@ import type { WebSocketApi } from "./WebSocketApi.js";
 export type WebSocketApiMetadata = ExtractMetadata<WebSocketApi>;
 import type { RDS } from "./RDS.js";
 export type RDSMetadata = ExtractMetadata<RDS>;
-export type Metadata = ApiMetadata | ApiGatewayV1ApiMetadata | AuthMetadata | AppSyncApiMetadata | BucketMetadata | CronMetadata | EventBusMetadata | FunctionMetadata | KinesisStreamMetadata | NextjsMetadata | QueueMetadata | StaticSiteMetadata | TableMetadata | TopicMetadata | WebSocketApiMetadata | RDSMetadata;
+export type Metadata = ApiMetadata | ApiGatewayV1ApiMetadata | AuthMetadata | AppSyncApiMetadata | BucketMetadata | CronMetadata | EventBusMetadata | FunctionMetadata | KinesisStreamMetadata | NextjsMetadata | SlsNextjsMetadata | QueueMetadata | StaticSiteMetadata | SsrSiteMetadata | TableMetadata | TopicMetadata | WebSocketApiMetadata | RDSMetadata;
 export {};

package/constructs/NextjsSite.d.ts

@@ -37,6 +37,7 @@ export declare class NextjsSite extends SsrSite {
     };
     constructor(scope: Construct, id: string, props?: NextjsSiteProps);
     protected initBuildConfig(): {
+        typesPath: string;
         serverBuildOutputFile: string;
         clientBuildOutputDir: string;
         clientBuildVersionedSubDir: string;

package/constructs/NextjsSite.js

@@ -32,6 +32,7 @@ export class NextjsSite extends SsrSite {
     }
     initBuildConfig() {
         return {
+            typesPath: ".",
             serverBuildOutputFile: ".open-next/server-function/index.mjs",
             clientBuildOutputDir: ".open-next/assets",
             clientBuildVersionedSubDir: "_next",

package/constructs/RemixSite.d.ts

@@ -16,6 +16,7 @@ import { EdgeFunction } from "./EdgeFunction.js";
  */
 export declare class RemixSite extends SsrSite {
     protected initBuildConfig(): {
+        typesPath: string;
         serverBuildOutputFile: string;
         clientBuildOutputDir: string;
         clientBuildVersionedSubDir: string;

package/constructs/RemixSite.js

@@ -49,6 +49,7 @@ export class RemixSite extends SsrSite {
             }
         });
         return {
+            typesPath: ".",
             serverBuildOutputFile: "build/index.js",
             clientBuildOutputDir: "public",
             clientBuildVersionedSubDir: "build",