sst 2.0.0-rc.55 → 2.0.0-rc.56

package/cli/commands/plugins/pothos.js

@@ -17,7 +17,9 @@ export const usePothosBuilder = Context.memo(() => {
             });
             await fs.writeFile(route.output, schema);
             // bus.publish("pothos.extracted", { file: route.output });
-            await Promise.all(route.commands.map((cmd) => execAsync(cmd)));
+            if (Array.isArray(route.commands) && route.commands.length > 0) {
+                await Promise.all(route.commands.map((cmd) => execAsync(cmd)));
+            }
             Colors.line(Colors.success(`✔`), " Pothos: Extracted pothos schema");
         }
         catch (ex) {

package/constructs/StaticSite.d.ts

@@ -179,19 +179,21 @@ export interface StaticSiteProps {
      * ```
      */
     purgeFiles?: 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;
+    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;
+    };
     vite?: {
         /**
          * The path where code-gen should place the type definition for environment variables
@@ -209,11 +211,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 true
+     * @default false
      * @example
      * ```js
      * new StaticSite(stack, "frontend", {
-     *  waitForInvalidation: false
+     *  waitForInvalidation: true
      * });
      * ```
      */
@@ -280,55 +282,33 @@ 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 isPlaceholder;
-    private assets;
-    private filenamesAsset?;
-    private awsCliLayer;
+    private doNotDeploy;
+    private bucket;
+    private distribution;
+    private hostedZone?;
+    private certificate?;
     constructor(scope: Construct, id: string, props?: StaticSiteProps);
     /**
      * The CloudFront URL of the website.
      */
-    get url(): string;
+    get url(): string | undefined;
     /**
      * If the custom domain is enabled, this is the URL of the website with the custom domain.
      */
     get customDomainUrl(): string | undefined;
     /**
-     * The ARN of the internally created S3 Bucket.
+     * The internally created CDK resources.
      */
-    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;
+    get cdk(): {
+        bucket: s3.Bucket;
+        distribution: cloudfront.Distribution;
+        hostedZone: route53.IHostedZone | undefined;
+        certificate: acm.ICertificate | undefined;
+    };
     getConstructMetadata(): {
         type: "StaticSite";
         data: {
-            distributionId: string;
             customDomainUrl: string | undefined;
         };
     };

package/constructs/StaticSite.js

@@ -23,6 +23,7 @@ import { ENVIRONMENT_PLACEHOLDER, getParameterPath, } from "./util/functionBindi
 import { gray } from "colorette";
 import { useProject } from "../project.js";
 import { SiteEnv } from "../site-env.js";
+import { VisibleError } from "../error.js";
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /////////////////////
 // Construct
@@ -44,49 +45,53 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
  */
 export class StaticSite extends Construct {
     id;
-    cdk;
     props;
-    isPlaceholder;
-    assets;
-    filenamesAsset;
-    awsCliLayer;
+    doNotDeploy;
+    bucket;
+    distribution;
+    hostedZone;
+    certificate;
     constructor(scope, id, props) {
         super(scope, props?.cdk?.id || id);
         const app = scope.node.root;
         this.id = id;
-        this.props = { path: ".", ...props };
-        this.cdk = {};
-        // Local development or skip build => stub asset
-        this.isPlaceholder =
-            (app.local || app.skipBuild) && !this.props.disablePlaceholder;
+        this.props = {
+            path: ".",
+            waitForInvalidation: false,
+            ...props,
+        };
+        this.doNotDeploy = (app.local || app.skipBuild) && !this.props.dev?.deploy;
+        this.validateCustomDomainSettings();
+        this.registerSiteEnvironment();
+        this.generateViteTypes();
+        if (this.doNotDeploy) {
+            // @ts-ignore
+            this.bucket = this.distribution = null;
+            return;
+        }
+        const cliLayer = new AwsCliLayer(this, "AwsCliLayer");
+        // Build app
         const fileSizeLimit = app.isRunningSSTTest()
             ? // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore: "sstTestFileSizeLimitOverride" not exposed in props
                 this.props.sstTestFileSizeLimitOverride || 200
             : 200;
-        this.awsCliLayer = new AwsCliLayer(this, "AwsCliLayer");
-        this.registerSiteEnvironment();
-        // Validate input
-        this.validateCustomDomainSettings();
-        // Generate Vite types
-        this.generateViteTypes();
-        // Build app
         this.buildApp();
-        this.assets = this.bundleAssets(fileSizeLimit);
-        this.filenamesAsset = this.bundleFilenamesAsset();
+        const assets = this.bundleAssets(fileSizeLimit);
+        const filenamesAsset = this.bundleFilenamesAsset();
         // Create Bucket
-        this.cdk.bucket = this.createS3Bucket();
+        this.bucket = this.createS3Bucket();
         // Create Custom Domain
-        this.cdk.hostedZone = this.lookupHostedZone();
-        this.cdk.certificate = this.createCertificate();
+        this.hostedZone = this.lookupHostedZone();
+        this.certificate = this.createCertificate();
         // Create S3 Deployment
-        const s3deployCR = this.createS3Deployment();
+        const s3deployCR = this.createS3Deployment(cliLayer, assets, filenamesAsset);
         // Create CloudFront
-        this.cdk.distribution = this.createCfDistribution();
-        this.cdk.distribution.node.addDependency(s3deployCR);
+        this.distribution = this.createCfDistribution();
+        this.distribution.node.addDependency(s3deployCR);
         // Invalidate CloudFront
-        const invalidationCR = this.createCloudFrontInvalidation();
-        invalidationCR.node.addDependency(this.cdk.distribution);
+        const invalidationCR = this.createCloudFrontInvalidation(cliLayer, assets);
+        invalidationCR.node.addDependency(this.distribution);
         // Connect Custom Domain to CloudFront Distribution
         this.createRoute53Records();
     }
@@ -94,12 +99,18 @@ export class StaticSite extends Construct {
      * The CloudFront URL of the website.
      */
     get url() {
-        return `https://${this.cdk.distribution.distributionDomainName}`;
+        if (this.doNotDeploy) {
+            return;
+        }
+        return `https://${this.distribution.distributionDomainName}`;
     }
     /**
      * If the custom domain is enabled, this is the URL of the website with the custom domain.
      */
     get customDomainUrl() {
+        if (this.doNotDeploy) {
+            return;
+        }
         const { customDomain } = this.props;
         if (!customDomain) {
             return;
@@ -112,34 +123,23 @@ export class StaticSite extends Construct {
         }
     }
     /**
-     * The ARN of the internally created S3 Bucket.
-     */
-    get bucketArn() {
-        return this.cdk.bucket.bucketArn;
-    }
-    /**
-     * The name of the internally created S3 Bucket.
+     * The internally created CDK resources.
      */
-    get bucketName() {
-        return this.cdk.bucket.bucketName;
-    }
-    /**
-     * The ID of the internally created CloudFront Distribution.
-     */
-    get distributionId() {
-        return this.cdk.distribution.distributionId;
-    }
-    /**
-     * The domain name of the internally created CloudFront Distribution.
-     */
-    get distributionDomain() {
-        return this.cdk.distribution.distributionDomainName;
+    get cdk() {
+        if (this.doNotDeploy) {
+            throw new VisibleError(`Cannot access CDK resources for the "${this.node.id}" site in dev mode`);
+        }
+        return {
+            bucket: this.bucket,
+            distribution: this.distribution,
+            hostedZone: this.hostedZone,
+            certificate: this.certificate,
+        };
     }
     getConstructMetadata() {
         return {
             type: "StaticSite",
             data: {
-                distributionId: this.cdk.distribution.distributionId,
                 customDomainUrl: this.customDomainUrl,
             },
         };
@@ -195,9 +195,6 @@ interface ImportMeta {
         fs.writeFileSync(filePath, content);
     }
     buildApp() {
-        if (this.isPlaceholder) {
-            return;
-        }
         const { path: sitePath, buildCommand } = this.props;
         // validate site path exists
         if (!fs.existsSync(sitePath)) {
@@ -222,13 +219,6 @@ interface ImportMeta {
         }
     }
     bundleAssets(fileSizeLimit) {
-        if (this.isPlaceholder) {
-            return [
-                new s3Assets.Asset(this, "Asset", {
-                    path: path.resolve(__dirname, "../support/static-site-stub"),
-                }),
-            ];
-        }
         const { path: sitePath } = this.props;
         const buildOutput = this.props.buildOutput || ".";
         // validate buildOutput exists
@@ -268,9 +258,6 @@ interface ImportMeta {
         return assets;
     }
     bundleFilenamesAsset() {
-        if (this.isPlaceholder) {
-            return;
-        }
         if (this.props.purgeFiles === false) {
             return;
         }
@@ -307,7 +294,7 @@ interface ImportMeta {
             });
         }
     }
-    createS3Deployment() {
+    createS3Deployment(cliLayer, assets, filenamesAsset) {
         const fileOptions = this.props.fileOptions || [
             {
                 exclude: "*",
@@ -323,18 +310,18 @@ interface ImportMeta {
         // Create a Lambda function that will be doing the uploading
         const uploader = new lambda.Function(this, "S3Uploader", {
             code: lambda.Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
-            layers: [this.awsCliLayer],
+            layers: [cliLayer],
             runtime: lambda.Runtime.PYTHON_3_7,
             handler: "s3-upload.handler",
             timeout: Duration.minutes(15),
             memorySize: 1024,
         });
-        this.cdk.bucket.grantReadWrite(uploader);
-        this.assets.forEach((asset) => asset.grantRead(uploader));
+        this.bucket.grantReadWrite(uploader);
+        assets.forEach((asset) => asset.grantRead(uploader));
         // Create the custom resource function
         const handler = new lambda.Function(this, "S3Handler", {
             code: lambda.Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
-            layers: [this.awsCliLayer],
+            layers: [cliLayer],
             runtime: lambda.Runtime.PYTHON_3_7,
             handler: "s3-handler.handler",
             timeout: Duration.minutes(15),
@@ -343,22 +330,22 @@ interface ImportMeta {
                 UPLOADER_FUNCTION_NAME: uploader.functionName,
             },
         });
-        this.cdk.bucket.grantReadWrite(handler);
-        this.filenamesAsset?.grantRead(handler);
+        this.bucket.grantReadWrite(handler);
+        filenamesAsset?.grantRead(handler);
         uploader.grantInvoke(handler);
         // Create custom resource
         return new CustomResource(this, "S3Deployment", {
             serviceToken: handler.functionArn,
             resourceType: "Custom::SSTBucketDeployment",
             properties: {
-                Sources: this.assets.map((asset) => ({
+                Sources: assets.map((asset) => ({
                     BucketName: asset.s3BucketName,
                     ObjectKey: asset.s3ObjectKey,
                 })),
-                DestinationBucketName: this.cdk.bucket.bucketName,
-                Filenames: this.filenamesAsset && {
-                    BucketName: this.filenamesAsset.s3BucketName,
-                    ObjectKey: this.filenamesAsset.s3ObjectKey,
+                DestinationBucketName: this.bucket.bucketName,
+                Filenames: filenamesAsset && {
+                    BucketName: filenamesAsset.s3BucketName,
+                    ObjectKey: filenamesAsset.s3ObjectKey,
                 },
                 FileOptions: (fileOptions || []).map(({ exclude, include, cacheControl }) => {
                     if (typeof exclude === "string") {
@@ -411,17 +398,9 @@ interface ImportMeta {
             }
         }
         // Build errorResponses
-        let errorResponses;
-        // case: sst start => showing stub site, and redirect all routes to the index page
-        if (this.isPlaceholder) {
-            errorResponses = buildErrorResponsesForRedirectToIndex(indexPage);
-        }
-        else {
-            errorResponses =
-                errorPage === "redirect_to_index_page" || errorPage === undefined
-                    ? buildErrorResponsesForRedirectToIndex(indexPage)
-                    : buildErrorResponsesFor404ErrorPage(errorPage);
-        }
+        const errorResponses = errorPage === "redirect_to_index_page" || errorPage === undefined
+            ? buildErrorResponsesForRedirectToIndex(indexPage)
+            : buildErrorResponsesFor404ErrorPage(errorPage);
         // Create CloudFront distribution
         return new cloudfront.Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps
@@ -430,19 +409,19 @@ interface ImportMeta {
             ...cdk?.distribution,
             // these values can NOT be overwritten by cfDistributionProps
             domainNames,
-            certificate: this.cdk.certificate,
+            certificate: this.certificate,
             defaultBehavior: {
-                origin: new cfOrigins.S3Origin(this.cdk.bucket),
+                origin: new cfOrigins.S3Origin(this.bucket),
                 viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
                 ...cdk?.distribution?.defaultBehavior,
             },
         });
     }
-    createCloudFrontInvalidation() {
+    createCloudFrontInvalidation(cliLayer, assets) {
         // Create a Lambda function that will be doing the invalidation
         const invalidator = new lambda.Function(this, "CloudFrontInvalidator", {
             code: lambda.Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
-            layers: [this.awsCliLayer],
+            layers: [cliLayer],
             runtime: lambda.Runtime.PYTHON_3_7,
             handler: "cf-invalidate.handler",
             timeout: Duration.minutes(15),
@@ -460,22 +439,17 @@ interface ImportMeta {
         // Need the AssetHash field so the CR gets updated on each deploy
         const assetsHash = crypto
             .createHash("md5")
-            .update(this.assets.map(({ assetHash }) => assetHash).join(""))
+            .update(assets.map(({ assetHash }) => assetHash).join(""))
             .digest("hex");
         // Create custom resource
-        const waitForInvalidation = this.isPlaceholder
-            ? false
-            : this.props.waitForInvalidation === false
-                ? false
-                : true;
         return new CustomResource(this, "CloudFrontInvalidation", {
             serviceToken: invalidator.functionArn,
             resourceType: "Custom::SSTCloudFrontInvalidation",
             properties: {
                 AssetsHash: assetsHash,
-                DistributionId: this.cdk.distribution.distributionId,
+                DistributionId: this.distribution.distributionId,
                 DistributionPaths: ["/*"],
-                WaitForInvalidation: waitForInvalidation,
+                WaitForInvalidation: this.props.waitForInvalidation,
             },
         });
     }
@@ -543,11 +517,11 @@ interface ImportMeta {
         }
         let acmCertificate;
         // HostedZone is set for Route 53 domains
-        if (this.cdk.hostedZone) {
+        if (this.hostedZone) {
             if (typeof customDomain === "string") {
                 acmCertificate = new acm.DnsValidatedCertificate(this, "Certificate", {
                     domainName: customDomain,
-                    hostedZone: this.cdk.hostedZone,
+                    hostedZone: this.hostedZone,
                     region: "us-east-1",
                 });
             }
@@ -557,7 +531,7 @@ interface ImportMeta {
             else {
                 acmCertificate = new acm.DnsValidatedCertificate(this, "Certificate", {
                     domainName: customDomain.domainName,
-                    hostedZone: this.cdk.hostedZone,
+                    hostedZone: this.hostedZone,
                     region: "us-east-1",
                 });
             }
@@ -572,7 +546,7 @@ interface ImportMeta {
     }
     createRoute53Records() {
         const { customDomain } = this.props;
-        if (!customDomain || !this.cdk.hostedZone) {
+        if (!customDomain || !this.hostedZone) {
             return;
         }
         let recordName;
@@ -587,15 +561,15 @@ interface ImportMeta {
         // Create DNS record
         const recordProps = {
             recordName,
-            zone: this.cdk.hostedZone,
-            target: route53.RecordTarget.fromAlias(new route53Targets.CloudFrontTarget(this.cdk.distribution)),
+            zone: this.hostedZone,
+            target: route53.RecordTarget.fromAlias(new route53Targets.CloudFrontTarget(this.distribution)),
         };
         new route53.ARecord(this, "AliasRecord", recordProps);
         new route53.AaaaRecord(this, "AliasRecordAAAA", recordProps);
         // Create Alias redirect record
         if (domainAlias) {
             new route53Patterns.HttpsRedirect(this, "Redirect", {
-                zone: this.cdk.hostedZone,
+                zone: this.hostedZone,
                 recordNames: [domainAlias],
                 targetDomain: recordName,
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.55",
+  "version": "2.0.0-rc.56",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -5663,7 +5663,9 @@ var init_pothos2 = __esm({
             schema: route.schema
           });
           await fs15.writeFile(route.output, schema);
-          await Promise.all(route.commands.map((cmd) => execAsync4(cmd)));
+          if (Array.isArray(route.commands) && route.commands.length > 0) {
+            await Promise.all(route.commands.map((cmd) => execAsync4(cmd)));
+          }
           Colors.line(Colors.success(`\u2714`), " Pothos: Extracted pothos schema");
         } catch (ex) {
           Colors.line(Colors.danger(`\u2716`), " Pothos: Failed to extract schema:");