sst 2.0.0-rc.52 → 2.0.0-rc.54

package/bootstrap.d.ts

@@ -1,3 +1,13 @@
+export declare const BootstrapContext: {
+    use(): {
+        version: string;
+        bucket: string;
+    };
+    provide(value: {
+        version: string;
+        bucket: string;
+    }): void;
+};
 export declare const useBootstrap: () => {
     version: string;
     bucket: string;

package/bootstrap.js

@@ -23,7 +23,7 @@ const OUTPUT_VERSION = "Version";
 const OUTPUT_BUCKET = "BucketName";
 const LATEST_VERSION = "6";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
-const BootstrapContext = Context.create();
+export const BootstrapContext = Context.create("Bootstrap");
 export const useBootstrap = BootstrapContext.use;
 export async function initBootstrap() {
     Logger.debug("Initializing bootstrap context");

package/cdk/deploy-stack.js

@@ -459,6 +459,11 @@ async function canSkipDeploy(deployStackOptions, cloudFormationStack, parameterC
         debug(`${deployName}: no existing stack`);
         return false;
     }
+    // SST check: stack is not busy
+    if (cloudFormationStack.stackStatus.isInProgress) {
+        debug(`${deployName}: stack is busy`);
+        return false;
+    }
     // Template has changed (assets taken into account here)
     if (JSON.stringify(deployStackOptions.stack.template) !==
         JSON.stringify(await cloudFormationStack.template())) {

package/cli/commands/deploy.js

@@ -16,12 +16,21 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     const { createSpinner } = await import("../spinner.js");
     const { dim, blue, bold } = await import("colorette");
     const { useProject } = await import("../../project.js");
-    const { loadAssembly, Stacks } = await import("../../stacks/index.js");
+    const { loadAssembly, useAppMetadata, saveAppMetadata, 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();
+    const [identity, appMetadata] = await Promise.all([
+        useSTSIdentity(),
+        useAppMetadata(),
+    ]);
+    // Check app mode changed
+    if (appMetadata && appMetadata.mode !== "deploy") {
+        if (!await promptChangeMode()) {
+            process.exit(0);
+        }
+    }
     Colors.line(`${Colors.primary.bold(`SST v${project.version}`)}`);
     Colors.gap();
     Colors.line(`${Colors.primary(`➜`)}  ${Colors.bold("App:")}     ${project.config.name}`);
@@ -61,5 +70,21 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     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));
+    // Update app state
+    await saveAppMetadata({ mode: "deploy" });
     process.exit(0);
 });
+async function promptChangeMode() {
+    const readline = await import("readline");
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    return new Promise((resolve) => {
+        console.log("");
+        rl.question("You were previously running this stage in dev mode. It is recommended that you use a different stage for production. Read more here — https://docs.sst.dev/live-lambda-development\n\nAre you sure you want to deploy to this stage? (y/N) ", async (input) => {
+            rl.close();
+            resolve(input.trim() === "y");
+        });
+    });
+}

package/cli/commands/dev.js

@@ -10,21 +10,19 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const { useRuntimeServer } = await import("../../runtime/server.js");
     const { useBus } = await import("../../bus.js");
     const { useWatcher } = await import("../../watcher.js");
-    const { Stacks } = await import("../../stacks/index.js");
+    const { useAppMetadata, saveAppMetadata, Stacks, } = await import("../../stacks/index.js");
     const { Logger } = await import("../../logger.js");
     const { createSpinner } = await import("../spinner.js");
-    const { bold, magenta, green, blue, red } = await import("colorette");
+    const { bold, dim, yellow } = await import("colorette");
     const { render } = await import("ink");
     const React = await import("react");
     const { Context } = await import("../../context/context.js");
-    const { DeploymentUI } = await import("../ui/deploy.js");
+    const { printDeploymentResults, DeploymentUI } = await import("../ui/deploy.js");
     const { useLocalServer } = await import("../local/server.js");
     const path = await import("path");
     const fs = await import("fs/promises");
     const crypto = await import("crypto");
-    const { printDeploymentResults } = await import("../ui/deploy.js");
     const { useFunctions } = await import("../../constructs/Function.js");
-    const { dim, gray, yellow } = await import("colorette");
     const { SiteEnv } = await import("../../site-env.js");
     const { usePothosBuilder } = await import("./plugins/pothos.js");
     const { useKyselyTypeGenerator } = await import("./plugins/kysely.js");
@@ -169,8 +167,13 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
             const results = await Stacks.deployMany(assembly.stacks);
             component.clear();
             component.unmount();
-            lastDeployed = nextChecksum;
             printDeploymentResults(assembly, results);
+            // Update app state
+            if (!lastDeployed) {
+                await saveAppMetadata({ mode: "dev" });
+            }
+            lastDeployed = nextChecksum;
+            // Update site env
             const keys = await SiteEnv.keys();
             if (keys.length) {
                 const result = {};
@@ -186,6 +189,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 }
                 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));
             isWorking = false;
             if (isDirty)
@@ -217,11 +221,20 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
         await build();
     });
-    await useLocalServer({
-        key: "",
-        cert: "",
-        live: true,
-    });
+    const [appMetadata] = await Promise.all([
+        useAppMetadata(),
+        useLocalServer({
+            key: "",
+            cert: "",
+            live: true,
+        }),
+    ]);
+    // Check app mode changed
+    if (appMetadata && appMetadata.mode !== "dev") {
+        if (!await promptChangeMode()) {
+            process.exit(0);
+        }
+    }
     clear();
     await printHeader({ console: true, hint: "ready!" });
     await Promise.all([
@@ -236,3 +249,17 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         useStackBuilder(),
     ]);
 });
+async function promptChangeMode() {
+    const readline = await import("readline");
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    return new Promise((resolve) => {
+        console.log("");
+        rl.question("You have previously deployed this stage in production. It is recommended that you use a different stage for development. Read more here — https://docs.sst.dev/live-lambda-development\n\nAre you sure you want to run this stage in dev mode? [y/N] ", async (input) => {
+            rl.close();
+            resolve(input.trim() === "y");
+        });
+    });
+}

package/cli/commands/remove.js

@@ -5,7 +5,7 @@ export const remove = (program) => program.command("remove [filter]", "Remove yo
     const React = await import("react");
     const { dim, blue, bold } = await import("colorette");
     const { useProject } = await import("../../project.js");
-    const { loadAssembly, Stacks } = await import("../../stacks/index.js");
+    const { loadAssembly, clearAppMetadata, Stacks, } = await import("../../stacks/index.js");
     const { render } = await import("ink");
     const { DeploymentUI } = await import("../ui/deploy.js");
     const { printDeploymentResults } = await import("../ui/deploy.js");
@@ -42,5 +42,6 @@ export const remove = (program) => program.command("remove [filter]", "Remove yo
     printDeploymentResults(assembly, results, true);
     if (Object.values(results).some((stack) => Stacks.isFailed(stack.status)))
         process.exit(1);
+    await clearAppMetadata();
     process.exit(0);
 });

package/cli/local/server.js

@@ -20,7 +20,7 @@ export const useLocalServerConfig = Context.memo(async () => {
     });
     return {
         port,
-        url: `https://console.sst.dev/${project.config.name}/${project.config.stage}${port !== 13557 ? `?port=${port}` : ""}`,
+        url: `https://console.sst.dev/${project.config.name}/${project.config.stage}${port !== 13557 ? `?_port=${port}` : ""}`,
     };
 });
 export async function useLocalServer(opts) {

package/cli/sst.js

@@ -8,6 +8,10 @@ import dotenv from "dotenv";
 dotenv.config({
     override: true,
 });
+dotenv.config({
+    path: ".env.local",
+    override: true,
+});
 import { env } from "./commands/env.js";
 import { dev } from "./commands/dev.js";
 import { bind } from "./commands/bind.js";

package/cli/ui/deploy.js

@@ -45,9 +45,11 @@ export const DeploymentUI = (props) => {
         return "yellow";
     }
     return (React.createElement(Box, { flexDirection: "column" },
-        Object.entries(resources).map(([_, evt]) => {
+        Object.entries(resources)
+            .slice(0, process.stdout.rows - 2)
+            .map(([_, evt], index) => {
             const readable = logicalIdToCdkPath(props.assembly, evt.StackName, evt.LogicalResourceId);
-            return (React.createElement(Box, { key: evt.LogicalResourceId },
+            return (React.createElement(Box, { key: index },
                 React.createElement(Text, null,
                     React.createElement(Spinner, null),
                     "  ",
@@ -113,7 +115,6 @@ function logicalIdToCdkPath(assembly, stack, logicalId) {
     return found.split("/").filter(Boolean).slice(1, -1).join("/");
 }
 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));

package/constructs/App.js

@@ -207,7 +207,6 @@ export class App extends cdk.App {
         Auth.injectConfig();
         this.ensureUniqueConstructIds();
         this.codegenTypes();
-        this.buildConstructsMetadata();
         this.createBindingSsmParameters();
         this.removeGovCloudUnsupportedResourceProperties();
         for (const child of this.node.children) {
@@ -231,6 +230,7 @@ export class App extends cdk.App {
     }
     async finish() {
         await useDeferredTasks().run();
+        this.buildConstructsMetadata();
     }
     isRunningSSTTest() {
         // Check the env var set inside test/setup-tests.js

package/constructs/StaticSite.d.ts

@@ -179,21 +179,19 @@ export interface StaticSiteProps {
      * ```
      */
     purgeFiles?: boolean;
-    dev?: {
-        /**
-         * When running `sst dev, site is not deployed. This is to ensure `sst dev` can start up quickly.
-         * @default false
-         * @example
-         * ```js
-         * new StaticSite(stack, "frontend", {
-         *  dev: {
-         *    deploy: true
-         *  }
-         * });
-         * ```
-         */
-        deploy?: boolean;
-    };
+    /**
+     * When running `sst start`, a placeholder site is deployed. This is to ensure that the site content remains unchanged, and subsequent `sst start` can start up quickly.
+     *
+     * @default false
+     *
+     * @example
+     * ```js
+     * new StaticSite(stack, "frontend", {
+     *  disablePlaceholder: true
+     * });
+     * ```
+     */
+    disablePlaceholder?: boolean;
     vite?: {
         /**
          * The path where code-gen should place the type definition for environment variables
@@ -211,11 +209,11 @@ export interface StaticSiteProps {
     };
     /**
      * While deploying, SST waits for the CloudFront cache invalidation process to finish. This ensures that the new content will be served once the deploy command finishes. However, this process can sometimes take more than 5 mins. For non-prod environments it might make sense to pass in `false`. That'll skip waiting for the cache to invalidate and speed up the deploy process.
-     * @default false
+     * @default true
      * @example
      * ```js
      * new StaticSite(stack, "frontend", {
-     *  waitForInvalidation: true
+     *  waitForInvalidation: false
      * });
      * ```
      */
@@ -282,33 +280,55 @@ export interface StaticSiteCdkDistributionProps extends BaseSiteCdkDistributionP
  */
 export declare class StaticSite extends Construct implements SSTConstruct {
     readonly id: string;
+    readonly cdk: {
+        /**
+         * The internally created CDK `Bucket` instance.
+         */
+        bucket: s3.Bucket;
+        /**
+         * The internally created CDK `Distribution` instance.
+         */
+        distribution: cloudfront.Distribution;
+        /**
+         * The Route 53 hosted zone for the custom domain.
+         */
+        hostedZone?: route53.IHostedZone;
+        certificate?: acm.ICertificate;
+    };
     private props;
-    private doNotDeploy;
-    private bucket;
-    private distribution;
-    private hostedZone?;
-    private certificate?;
+    private isPlaceholder;
+    private assets;
+    private filenamesAsset?;
+    private awsCliLayer;
     constructor(scope: Construct, id: string, props?: StaticSiteProps);
     /**
      * The CloudFront URL of the website.
      */
-    get url(): string | undefined;
+    get url(): string;
     /**
      * If the custom domain is enabled, this is the URL of the website with the custom domain.
      */
     get customDomainUrl(): string | undefined;
     /**
-     * The internally created CDK resources.
+     * The ARN of the internally created S3 Bucket.
      */
-    get cdk(): {
-        bucket: s3.Bucket;
-        distribution: cloudfront.Distribution;
-        hostedZone: route53.IHostedZone | undefined;
-        certificate: acm.ICertificate | undefined;
-    };
+    get bucketArn(): string;
+    /**
+     * The name of the internally created S3 Bucket.
+     */
+    get bucketName(): string;
+    /**
+     * The ID of the internally created CloudFront Distribution.
+     */
+    get distributionId(): string;
+    /**
+     * The domain name of the internally created CloudFront Distribution.
+     */
+    get distributionDomain(): string;
     getConstructMetadata(): {
         type: "StaticSite";
         data: {
+            distributionId: string;
             customDomainUrl: string | undefined;
         };
     };