sst 2.7.1 → 2.8.0

package/cli/ci-info.d.ts

@@ -0,0 +1,4 @@
+export declare function getCiInfo(): {
+    isCI: boolean;
+    name: string | null;
+};

package/cli/ci-info.js

@@ -0,0 +1,8 @@
+import ciInfo from "ci-info";
+export function getCiInfo() {
+    const isSeed = !!process.env.SEED_APP_NAME;
+    return {
+        isCI: ciInfo.isCI || isSeed,
+        name: (isSeed ? "Seed" : ciInfo.name) || null,
+    };
+}

package/cli/commands/bind.js

@@ -161,6 +161,7 @@ export const bind = (program) => program
             "AstroSite",
             "RemixSite",
             "SolidStartSite",
+            "SvelteKitSite",
             "SlsNextjsSite",
         ].includes(c.type))
             .find((c) => {

package/cli/commands/deploy.js

@@ -17,6 +17,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     const { dim, blue, bold } = await import("colorette");
     const { useProject } = await import("../../project.js");
     const { loadAssembly, useAppMetadata, saveAppMetadata, Stacks } = await import("../../stacks/index.js");
+    const { getCiInfo } = await import("../ci-info.js");
     const { render } = await import("ink");
     const { DeploymentUI } = await import("../ui/deploy.js");
     const { mapValues } = await import("remeda");
@@ -40,7 +41,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
         });
     }
     // Check app mode changed
-    if (appMetadata && appMetadata.mode !== "deploy") {
+    if (!getCiInfo().isCI && appMetadata && appMetadata.mode !== "deploy") {
         if (!(await promptChangeMode())) {
             process.exit(0);
         }

package/cli/commands/dev.js

@@ -31,6 +31,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const { useMetadata } = await import("../../stacks/metadata.js");
     const { useIOT } = await import("../../iot.js");
     const { clear } = await import("../terminal.js");
+    const { getCiInfo } = await import("../ci-info.js");
     if (args._[0] === "start") {
         console.log(yellow(`Warning: ${bold(`sst start`)} has been renamed to ${bold(`sst dev`)}`));
     }
@@ -69,12 +70,16 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
         bus.subscribe("function.build.success", async (evt) => {
             const info = useFunctions().fromID(evt.properties.functionID);
+            if (!info)
+                return;
             if (info.enableLiveDev === false)
                 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)
+                return;
             if (info.enableLiveDev === false)
                 return;
             Colors.gap();
@@ -109,7 +114,6 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const useStackBuilder = Context.memo(async () => {
         const watcher = useWatcher();
         const project = useProject();
-        const bus = useBus();
         let lastDeployed;
         let isWorking = false;
         let isDirty = false;
@@ -188,7 +192,9 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                                 ? "Remix"
                                 : type === "SolidStartSite"
                                     ? "SolidStart"
-                                    : undefined;
+                                    : type === "SvelteKitSite"
+                                        ? "SvelteKit"
+                                        : undefined;
                     if (framework) {
                         const cdCmd = path.resolve(props.path) === process.cwd()
                             ? ""
@@ -276,7 +282,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
     }
     // Check app mode changed
-    if (appMetadata && appMetadata.mode !== "dev") {
+    if (!getCiInfo().isCI && appMetadata && appMetadata.mode !== "dev") {
         if (!(await promptChangeMode())) {
             process.exit(0);
         }

package/cli/commands/diff.js

@@ -8,7 +8,6 @@ export const diff = (program) => program.command("diff", "Compare your app with
     const { useAWSClient } = await import("../../credentials.js");
     const { CloudFormationClient, GetTemplateCommand } = await import("@aws-sdk/client-cloudformation");
     const { createSpinner } = await import("../spinner.js");
-    const { green } = await import("colorette");
     const { Colors } = await import("../colors.js");
     // Build app
     const project = useProject();
@@ -23,10 +22,13 @@ export const diff = (program) => program.command("diff", "Compare your app with
     for (const stack of assembly.stacks) {
         const spinner = createSpinner(`${stack.stackName}: Checking for changes...`);
         // get old template
-        const response = await cfn.send(new GetTemplateCommand({
-            StackName: stack.stackName,
-        }));
-        const oldTemplate = JSON.parse(response.TemplateBody);
+        const oldTemplate = await getTemplate(stack.stackName);
+        if (!oldTemplate) {
+            spinner.clear();
+            Colors.line(`➜  ${Colors.dim.bold(stackNameToId(stack.stackName) + ":")} New stack`);
+            Colors.gap();
+            continue;
+        }
         // generate diff
         const { count, diff } = await Stacks.diff(stack, oldTemplate);
         spinner.clear();
@@ -58,4 +60,17 @@ export const diff = (program) => program.command("diff", "Compare your app with
         Colors.line(Colors.success(`✔`), Colors.bold(" Diff:"), changesAcc === 1 ? "1 change found in" : `${changesAcc} changes in`, changedStacks === 1 ? "1 stack" : `${changedStacks} stacks`);
     }
     process.exit(0);
+    async function getTemplate(stackName) {
+        try {
+            const response = await cfn.send(new GetTemplateCommand({ StackName: stackName }));
+            return JSON.parse(response.TemplateBody);
+        }
+        catch (e) {
+            if (e.name === "ValidationError" &&
+                e.message.includes("does not exist")) {
+                return;
+            }
+            throw e;
+        }
+    }
 });

package/cli/commands/update.js

@@ -4,6 +4,7 @@ const PACKAGE_MATCH = [
     "aws-cdk",
     "@aws-cdk",
     "constructs",
+    "svelte-kit-sst",
     "solid-start-sst",
 ];
 const FIELDS = ["dependencies", "devDependencies"];

package/cli/telemetry/environment.js

@@ -1,5 +1,5 @@
 import os from "os";
-import ciInfo from "ci-info";
+import { getCiInfo } from "../ci-info.js";
 import { useProject } from "../../project.js";
 let data;
 export function getEnvironmentData() {
@@ -7,7 +7,7 @@ export function getEnvironmentData() {
         return data;
     }
     const cpus = os.cpus() || [];
-    const isSeed = !!process.env.SEED_APP_NAME;
+    const ciInfo = getCiInfo();
     data = {
         // Software information
         systemPlatform: os.platform(),
@@ -19,8 +19,8 @@ export function getEnvironmentData() {
         cpuSpeed: cpus.length ? cpus[0].speed : null,
         memoryInMb: Math.trunc(os.totalmem() / Math.pow(1024, 2)),
         // Environment information
-        isCI: ciInfo.isCI || isSeed,
-        ciName: (isSeed ? "Seed" : ciInfo.name) || null,
+        isCI: ciInfo.isCI,
+        ciName: ciInfo.name,
         sstVersion: useProject().version,
     };
     return data;

package/cli/ui/functions.js

@@ -48,7 +48,7 @@ export function Functions() {
         const success = bus.subscribe("function.success", (evt) => {
             function print(input, diff) {
                 setTimeout(() => {
-                    console.log(Colors.primary(`  ➜ `), useFunctions().fromID(input.functionID).handler);
+                    console.log(Colors.primary(`  ➜ `), useFunctions().fromID(input.functionID)?.handler);
                     for (const log of input.logs) {
                         console.log(`     ${dim(log)}`);
                     }
@@ -78,7 +78,7 @@ export function Functions() {
         const error = bus.subscribe("function.error", (evt) => {
             function print(input, diff) {
                 setTimeout(() => {
-                    console.log(Colors.primary(`  ➜ `), useFunctions().fromID(input.functionID).handler);
+                    console.log(Colors.primary(`  ➜ `), useFunctions().fromID(input.functionID)?.handler);
                     for (const log of input.logs) {
                         console.log(`     ${dim(log)}`);
                     }
@@ -122,7 +122,7 @@ export function Functions() {
             "  ",
             React.createElement(Spinner, null),
             "  ",
-            useFunctions().fromID(evt.functionID).handler),
+            useFunctions().fromID(evt.functionID)?.handler),
         evt.logs.map((log, index) => (React.createElement(Text, { dimColor: true, key: index },
             "     ",
             log))),

package/config.js

@@ -122,7 +122,8 @@ export var Config;
             .filter((c) => c.type === "AstroSite" ||
             c.type === "NextjsSite" ||
             c.type === "RemixSite" ||
-            c.type === "SolidStartSite")
+            c.type === "SolidStartSite" ||
+            c.type === "SvelteKitSite")
             .filter((c) => keys.some((key) => c.data.secrets.includes(key)));
         const siteDataPlaceholder = siteData.filter((c) => c.data.mode === "placeholder");
         const siteDataEdge = siteData

package/constructs/AppSyncApi.d.ts

@@ -10,7 +10,7 @@ import { Permissions } from "./util/permission.js";
 import { Table as CDKTable } from "aws-cdk-lib/aws-dynamodb";
 import { IServerlessCluster } from "aws-cdk-lib/aws-rds";
 import { ISecret } from "aws-cdk-lib/aws-secretsmanager";
-import { AwsIamConfig, BaseDataSource, CfnDomainName, GraphqlApi, GraphqlApiProps, IGraphqlApi, Resolver, ResolverProps } from "aws-cdk-lib/aws-appsync";
+import { AwsIamConfig, BaseDataSource, GraphqlApi, GraphqlApiProps, IGraphqlApi, Resolver, ResolverProps } from "aws-cdk-lib/aws-appsync";
 import { ICertificate } from "aws-cdk-lib/aws-certificatemanager";
 import { IDomain } from "aws-cdk-lib/aws-opensearchservice";
 export interface AppSyncApiDomainProps extends appSyncApiDomain.CustomDomainProps {
@@ -403,7 +403,6 @@ export declare class AppSyncApi extends Construct implements SSTConstruct {
     };
     private readonly props;
     private _customDomainUrl?;
-    _cfnDomainName?: CfnDomainName;
     private readonly functionsByDsKey;
     private readonly dataSourcesByDsKey;
     private readonly dsKeysByResKey;

package/constructs/AppSyncApi.js

@@ -48,7 +48,6 @@ export class AppSyncApi extends Construct {
     cdk;
     props;
     _customDomainUrl;
-    _cfnDomainName;
     functionsByDsKey = {};
     dataSourcesByDsKey = {};
     dsKeysByResKey = {};
@@ -308,24 +307,15 @@ export class AppSyncApi extends Construct {
                 name: app.logicalPrefixedName(id),
                 xrayEnabled: true,
                 schema: mainSchema,
-                domainName: domainData,
+                domainName: domainData && {
+                    certificate: domainData.certificate,
+                    domainName: domainData.domainName,
+                },
                 ...graphqlApiProps,
             });
             this.cdk.certificate = domainData?.certificate;
-            // note: As of CDK 2.20.0, the "AWS::AppSync::DomainNameApiAssociation" resource
-            //       is not dependent on the "AWS::AppSync::DomainName" resource. This leads
-            //       CloudFormation deploy error if DomainNameApiAssociation is created before
-            //       DomainName is created.
-            //       https://github.com/aws/aws-cdk/issues/18395#issuecomment-1099455502
-            //       To workaround this issue, we need to add a dependency manually.
             if (domainData) {
-                this._cfnDomainName = this.cdk.graphqlApi.node.children.find((child) => child.cfnResourceType ===
-                    "AWS::AppSync::DomainName");
-                const cfnDomainNameApiAssociation = this.cdk.graphqlApi.node.children.find((child) => child.cfnResourceType ===
-                    "AWS::AppSync::DomainNameApiAssociation");
-                if (this._cfnDomainName && cfnDomainNameApiAssociation) {
-                    cfnDomainNameApiAssociation.node.addDependency(this._cfnDomainName);
-                }
+                appSyncApiDomain.cleanup(this, domainData);
             }
         }
     }

package/constructs/AstroSite.js

@@ -1,8 +1,7 @@
 import fs from "fs";
 import path from "path";
-import { Architecture } from "aws-cdk-lib/aws-lambda";
 import { SsrSite } from "./SsrSite.js";
-import { Function } from "./Function.js";
+import { SsrFunction } from "./SsrFunction.js";
 import { EdgeFunction } from "./EdgeFunction.js";
 /**
  * The `AstroSite` construct is a higher level CDK construct that makes it easy to create a Astro app.
@@ -34,10 +33,9 @@ export class AstroSite extends SsrSite {
     }
     createFunctionForRegional() {
         const { runtime, timeout, memorySize, permissions, environment, nodejs, bind, cdk, } = this.props;
-        const fn = new Function(this, `ServerFunction`, {
-            description: "Server handler",
+        const ssrFn = new SsrFunction(this, `ServerFunction`, {
+            description: "Server handler for Astro",
             handler: path.join(this.props.path, "dist", "server", "entry.handler"),
-            logRetention: "three_days",
             runtime,
             memorySize,
             timeout,
@@ -49,10 +47,8 @@ export class AstroSite extends SsrSite {
             environment,
             permissions,
             ...cdk?.server,
-            architecture: cdk?.server?.architecture === Architecture.ARM_64 ? "arm_64" : "x86_64",
         });
-        fn._doNotAllowOthersToBind = true;
-        return fn;
+        return ssrFn.function;
     }
     createFunctionForEdge() {
         const { runtime, timeout, memorySize, bind, permissions, environment, nodejs, } = this.props;

package/constructs/EdgeFunction.js

@@ -75,7 +75,7 @@ export class EdgeFunction extends Construct {
         const lambdaBucket = this.createSingletonBucketInUsEast1();
         const { fn, fnArn } = this.createFunctionInUsEast1(assetBucket, assetKey, lambdaBucket);
         const { versionId } = this.createVersionInUsEast1(fn, fnArn);
-        // Deploy after the code is updated
+        // Create function after the code is updated
         fn.node.addDependency(assetReplacer);
         this.function = fn;
         this.functionArn = fnArn;
@@ -182,6 +182,10 @@ export class EdgeFunction extends Construct {
     }
     createCodeReplacer(assetBucket, assetKey, handlerFilename) {
         const { environment } = this.props;
+        const stack = Stack.of(this);
+        // Note: Source code for the Lambda functions have "{{ ENV_KEY }}" in them.
+        //       They need to be replaced with real values before the Lambda
+        //       functions get deployed.
         const replacements = [
             {
                 files: handlerFilename,
@@ -192,15 +196,11 @@ export class EdgeFunction extends Construct {
                 }),
             },
             ...Object.entries(environment).map(([key, value]) => ({
-                files: "**/*.*js",
+                files: "**/*.@(*js|json|html)",
                 search: `{{ ${key} }}`,
                 replace: value,
             })),
         ];
-        // Note: Source code for the Lambda functions have "{{ ENV_KEY }}" in them.
-        //       They need to be replaced with real values before the Lambda
-        //       functions get deployed.
-        const stack = Stack.of(this);
         const policy = new Policy(this, "AssetReplacerPolicy", {
             statements: [
                 new PolicyStatement({

package/constructs/Function.d.ts

@@ -590,7 +590,7 @@ export declare class Function extends CDKFunction implements SSTConstruct {
     static mergeProps(baseProps?: FunctionProps, props?: FunctionProps): FunctionProps;
 }
 export declare const useFunctions: () => {
-    fromID(id: string): FunctionProps;
+    fromID(id: string): FunctionProps | undefined;
     add(name: string, props: FunctionProps): void;
     readonly all: Record<string, FunctionProps>;
 };

package/constructs/Function.js

@@ -122,6 +122,7 @@ export class Function extends CDKFunction {
                 environment: props.environment,
                 layers: Function.buildLayers(scope, id, props),
                 logRetention,
+                logRetentionRetryOptions: logRetention && { maxRetries: 100 },
             });
         }
         // Handle local development (ie. sst start)
@@ -156,6 +157,7 @@ export class Function extends CDKFunction {
                 environment: props.environment,
                 layers: [],
                 logRetention,
+                logRetentionRetryOptions: logRetention && { maxRetries: 100 },
                 retryAttempts: 0,
                 ...(debugOverrideProps || {}),
             });
@@ -171,7 +173,9 @@ export class Function extends CDKFunction {
                     new PolicyStatement({
                         actions: ["s3:*"],
                         effect: Effect.ALLOW,
-                        resources: [`arn:aws:s3:::${bootstrap.bucket}`],
+                        resources: [
+                            `arn:${Stack.of(this).partition}:s3:::${bootstrap.bucket}`,
+                        ],
                     }),
                 ]);
             });
@@ -192,6 +196,7 @@ export class Function extends CDKFunction {
                 environment: props.environment,
                 layers: Function.buildLayers(scope, id, props),
                 logRetention,
+                logRetentionRetryOptions: logRetention && { maxRetries: 100 },
             });
             useDeferredTasks().add(async () => {
                 // Build function
@@ -499,7 +504,10 @@ export const useFunctions = createAppContext(() => {
     const functions = {};
     return {
         fromID(id) {
-            return functions[id];
+            const result = functions[id];
+            if (!result)
+                return;
+            return result;
         },
         add(name, props) {
             functions[name] = props;

package/constructs/RemixSite.js

@@ -3,9 +3,8 @@ import url from "url";
 import path from "path";
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
-import { Architecture } from "aws-cdk-lib/aws-lambda";
 import { SsrSite } from "./SsrSite.js";
-import { Function } from "./Function.js";
+import { SsrFunction } from "./SsrFunction.js";
 import { EdgeFunction } from "./EdgeFunction.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /**
@@ -92,10 +91,9 @@ export class RemixSite extends SsrSite {
     createFunctionForRegional() {
         const { runtime, timeout, memorySize, permissions, environment, bind, nodejs, cdk, } = this.props;
         const { handler, esbuild } = this.createServerLambdaBundle("regional-server.js");
-        const fn = new Function(this, `ServerFunction`, {
-            description: "Server handler",
+        const ssrFn = new SsrFunction(this, `ServerFunction`, {
+            description: "Server handler for Remix",
             handler,
-            logRetention: "three_days",
             runtime,
             memorySize,
             timeout,
@@ -112,10 +110,8 @@ export class RemixSite extends SsrSite {
             environment,
             permissions,
             ...cdk?.server,
-            architecture: cdk?.server?.architecture === Architecture.ARM_64 ? "arm_64" : "x86_64",
         });
-        fn._doNotAllowOthersToBind = true;
-        return fn;
+        return ssrFn.function;
     }
     createFunctionForEdge() {
         const { runtime, timeout, memorySize, bind, permissions, environment, nodejs, } = this.props;

package/constructs/SolidStartSite.js

@@ -1,7 +1,6 @@
 import path from "path";
-import { Architecture } from "aws-cdk-lib/aws-lambda";
 import { SsrSite } from "./SsrSite.js";
-import { Function } from "./Function.js";
+import { SsrFunction } from "./SsrFunction.js";
 import { EdgeFunction } from "./EdgeFunction.js";
 /**
  * The `SolidStartSite` construct is a higher level CDK construct that makes it easy to create a SolidStart app.
@@ -25,11 +24,9 @@ export class SolidStartSite extends SsrSite {
     }
     createFunctionForRegional() {
         const { runtime, timeout, memorySize, bind, nodejs, permissions, environment, cdk, } = this.props;
-        // Create function
-        const fn = new Function(this, `ServerFunction`, {
-            description: "Server handler",
+        const ssrFn = new SsrFunction(this, `ServerFunction`, {
+            description: "Server handler for Solid",
             handler: path.join(this.props.path, "dist", "server", "index.handler"),
-            logRetention: "three_days",
             runtime,
             memorySize,
             timeout,
@@ -41,10 +38,8 @@ export class SolidStartSite extends SsrSite {
             environment,
             permissions,
             ...cdk?.server,
-            architecture: cdk?.server?.architecture === Architecture.ARM_64 ? "arm_64" : "x86_64",
         });
-        fn._doNotAllowOthersToBind = true;
-        return fn;
+        return ssrFn.function;
     }
     createFunctionForEdge() {
         const { runtime, timeout, memorySize, bind, permissions, environment, nodejs, } = this.props;

package/constructs/SsrFunction.d.ts

@@ -1,11 +1,12 @@
 import { Construct } from "constructs";
 import { FunctionOptions, Function as CdkFunction } from "aws-cdk-lib/aws-lambda";
+import { NodeJSProps, FunctionCopyFilesProps } from "./Function.js";
 import { SSTConstruct } from "./Construct.js";
 import { Permissions } from "./util/permission.js";
 import { Size } from "./util/size.js";
 import { Duration } from "./util/duration.js";
 export interface SsrFunctionProps extends Omit<FunctionOptions, "memorySize" | "timeout" | "runtime"> {
-    bundle: string;
+    bundle?: string;
     handler: string;
     runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
     timeout: number | Duration;
@@ -13,14 +14,21 @@ export interface SsrFunctionProps extends Omit<FunctionOptions, "memorySize" | "
     permissions?: Permissions;
     environment?: Record<string, string>;
     bind?: SSTConstruct[];
+    nodejs?: NodeJSProps;
+    copyFiles?: FunctionCopyFilesProps[];
 }
 export declare class SsrFunction extends Construct {
     function: CdkFunction;
+    private assetReplacer;
+    private assetReplacerPolicy;
     private props;
     constructor(scope: Construct, id: string, props: SsrFunctionProps);
     attachPermissions(permissions: Permissions): void;
-    private createCodeAsset;
     private createFunction;
     private createCodeReplacer;
     private bind;
+    private buildAssetFromHandler;
+    private buildAssetFromBundle;
+    private updateCodeReplacer;
+    private updateFunction;
 }