sst 2.2.8 → 2.3.0

package/constructs/SolidStartSite.d.ts

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

package/constructs/SolidStartSite.js

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

package/constructs/SsrSite.d.ts

@@ -1,12 +1,12 @@
 import { Construct } from "constructs";
 import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
-import { Function, FunctionProps } from "aws-cdk-lib/aws-lambda";
+import { Function as CdkFunction, FunctionProps } from "aws-cdk-lib/aws-lambda";
 import { IHostedZone } from "aws-cdk-lib/aws-route53";
 import { Distribution, ICachePolicy, BehaviorOptions, CachePolicy } from "aws-cdk-lib/aws-cloudfront";
 import { ICertificate } from "aws-cdk-lib/aws-certificatemanager";
 import { S3Origin } from "aws-cdk-lib/aws-cloudfront-origins";
 import { SSTConstruct } from "./Construct.js";
-import { NodeJSProps } from "./Function.js";
+import { NodeJSProps, Function } from "./Function.js";
 import { EdgeFunction } from "./EdgeFunction.js";
 import { BaseSiteDomainProps, BaseSiteReplaceProps, BaseSiteCdkDistributionProps } from "./BaseSite.js";
 import { Size } from "./util/size.js";
@@ -14,6 +14,7 @@ import { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
 import { FunctionBindingProps } from "./util/functionBinding.js";
 export type SsrBuildConfig = {
+    typesPath: string;
     serverBuildOutputFile: string;
     clientBuildOutputDir: string;
     clientBuildVersionedSubDir: string;
@@ -196,7 +197,8 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     private doNotDeploy;
     protected buildConfig: SsrBuildConfig;
     private serverLambdaForEdge?;
-    protected serverLambdaForRegional?: Function;
+    protected serverLambdaForRegional?: CdkFunction;
+    private serverLambdaForDev?;
     private bucket;
     private distribution;
     private hostedZone?;
@@ -215,7 +217,7 @@ export declare class SsrSite extends Construct implements SSTConstruct {
      * The internally created CDK resources.
      */
     get cdk(): {
-        function: Function | undefined;
+        function: CdkFunction | undefined;
         bucket: Bucket;
         distribution: Distribution;
         hostedZone: IHostedZone | undefined;
@@ -233,9 +235,14 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     attachPermissions(permissions: Permissions): void;
     /** @internal */
     getConstructMetadata(): {
-        type: "SsrSite";
+        type: "NextjsSite" | "RemixSite" | "AstroSite" | "SolidStartSite";
         data: {
+            mode: "placeholder" | "deployed";
+            path: string;
             customDomainUrl: string | undefined;
+            edge: boolean | undefined;
+            server: string;
+            secrets: string[];
         };
     };
     /** @internal */
@@ -248,8 +255,9 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     private createS3AssetFileOptions;
     private createS3Bucket;
     private createS3Deployment;
-    protected createFunctionForRegional(): Function;
+    protected createFunctionForRegional(): CdkFunction;
     protected createFunctionForEdge(): EdgeFunction;
+    protected createFunctionForDev(): Function;
     private createFunctionPermissionsForRegional;
     private createFunctionPermissionsForEdge;
     private validateCloudFrontDistributionSettings;
@@ -269,6 +277,6 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     protected createRoute53Records(): void;
     private getS3ContentReplaceValues;
     private validateSiteExists;
-    private registerSiteEnvironment;
+    private writeTypesFile;
     protected generateBuildId(): string;
 }

package/constructs/SsrSite.js

@@ -6,10 +6,10 @@ import crypto from "crypto";
 import spawn from "cross-spawn";
 import { execSync } from "child_process";
 import { Construct } from "constructs";
-import { Fn, Token, Duration as CdkDuration, CfnOutput, RemovalPolicy, CustomResource, } from "aws-cdk-lib";
+import { Fn, Token, Duration as CdkDuration, RemovalPolicy, CustomResource, } from "aws-cdk-lib";
 import { BlockPublicAccess, Bucket, } from "aws-cdk-lib/aws-s3";
-import { Effect, Policy, PolicyStatement } from "aws-cdk-lib/aws-iam";
-import { Function, Code, Runtime, FunctionUrlAuthType, } from "aws-cdk-lib/aws-lambda";
+import { Role, Effect, Policy, PolicyStatement, AnyPrincipal, } from "aws-cdk-lib/aws-iam";
+import { Function as CdkFunction, Code, Runtime, FunctionUrlAuthType, } from "aws-cdk-lib/aws-lambda";
 import { HostedZone, ARecord, AaaaRecord, RecordTarget, } from "aws-cdk-lib/aws-route53";
 import { Asset } from "aws-cdk-lib/aws-s3-assets";
 import { Distribution, ViewerProtocolPolicy, AllowedMethods, CachedMethods, LambdaEdgeEventType, CachePolicy, CacheQueryStringBehavior, CacheHeaderBehavior, CacheCookieBehavior, OriginRequestPolicy, Function as CfFunction, FunctionCode as CfFunctionCode, FunctionEventType as CfFunctionEventType, } from "aws-cdk-lib/aws-cloudfront";
@@ -19,12 +19,13 @@ import { CloudFrontTarget } from "aws-cdk-lib/aws-route53-targets";
 import { Stack } from "./Stack.js";
 import { Logger } from "../logger.js";
 import { isCDKConstruct } from "./Construct.js";
+import { Function } from "./Function.js";
+import { Secret } from "./Secret.js";
 import { getBuildCmdEnvironment, } from "./BaseSite.js";
 import { HttpsRedirect } from "./cdk/website-redirect.js";
 import { DnsValidatedCertificate } from "./cdk/dns-validated-certificate.js";
 import { attachPermissionsToRole } from "./util/permission.js";
 import { getParameterPath, } from "./util/functionBinding.js";
-import { SiteEnv } from "../site-env.js";
 import { useProject } from "../project.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /**
@@ -45,6 +46,7 @@ export class SsrSite extends Construct {
     buildConfig;
     serverLambdaForEdge;
     serverLambdaForRegional;
+    serverLambdaForDev;
     bucket;
     distribution;
     hostedZone;
@@ -64,16 +66,17 @@ export class SsrSite extends Construct {
         };
         this.doNotDeploy =
             !stack.isActive || (app.mode === "dev" && !this.props.dev?.deploy);
+        this.buildConfig = this.initBuildConfig();
         this.validateSiteExists();
-        this.registerSiteEnvironment();
+        this.writeTypesFile();
         if (this.doNotDeploy) {
             // @ts-ignore
-            this.buildConfig = this.bucket = this.distribution = null;
+            this.bucket = this.distribution = null;
+            this.serverLambdaForDev = this.createFunctionForDev();
             return;
         }
         const cliLayer = new AwsCliLayer(this, "AwsCliLayer");
         // Build app
-        this.buildConfig = this.initBuildConfig();
         this.buildApp();
         // Create Bucket which will be utilised to contain the statics
         this.bucket = this.createS3Bucket();
@@ -168,9 +171,20 @@ export class SsrSite extends Construct {
     /** @internal */
     getConstructMetadata() {
         return {
-            type: "SsrSite",
+            type: this.constructor.name,
             data: {
+                mode: this.doNotDeploy
+                    ? "placeholder"
+                    : "deployed",
+                path: this.props.path,
                 customDomainUrl: this.customDomainUrl,
+                edge: this.props.edge,
+                server: (this.serverLambdaForDev ||
+                    this.serverLambdaForRegional ||
+                    this.serverLambdaForEdge)?.functionArn,
+                secrets: (this.props.bind || [])
+                    .filter((c) => c instanceof Secret)
+                    .map((c) => c.name),
             },
         };
     }
@@ -206,6 +220,7 @@ export class SsrSite extends Construct {
     /////////////////////
     initBuildConfig() {
         return {
+            typesPath: ".",
             serverBuildOutputFile: "placeholder",
             clientBuildOutputDir: "placeholder",
             clientBuildVersionedSubDir: "placeholder",
@@ -342,7 +357,7 @@ export class SsrSite extends Construct {
     }
     createS3Deployment(cliLayer, assets, fileOptions) {
         // Create a Lambda function that will be doing the uploading
-        const uploader = new Function(this, "S3Uploader", {
+        const uploader = new CdkFunction(this, "S3Uploader", {
             code: Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
             layers: [cliLayer],
             runtime: Runtime.PYTHON_3_7,
@@ -353,7 +368,7 @@ export class SsrSite extends Construct {
         this.bucket.grantReadWrite(uploader);
         assets.forEach((asset) => asset.grantRead(uploader));
         // Create the custom resource function
-        const handler = new Function(this, "S3Handler", {
+        const handler = new CdkFunction(this, "S3Handler", {
             code: Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
             layers: [cliLayer],
             runtime: Runtime.PYTHON_3_7,
@@ -399,6 +414,26 @@ export class SsrSite extends Construct {
     createFunctionForEdge() {
         return {};
     }
+    createFunctionForDev() {
+        const { runtime, timeout, memorySize, permissions, environment, bind } = this.props;
+        const role = new Role(this, "ServerFunctionRole", {
+            assumedBy: new AnyPrincipal(),
+            maxSessionDuration: CdkDuration.hours(12),
+        });
+        const fn = new Function(this, `ServerFunction`, {
+            description: "Server handler placeholder",
+            handler: "placeholder",
+            runtime,
+            memorySize,
+            timeout,
+            bind,
+            environment,
+            permissions,
+            role,
+        });
+        fn._doNotAllowOthersToBind = true;
+        return fn;
+    }
     createFunctionPermissionsForRegional() {
         this.bucket.grantReadWrite(this.serverLambdaForRegional.role);
     }
@@ -751,17 +786,13 @@ function handler(event) {
             throw new Error(`No site found at "${path.resolve(sitePath)}"`);
         }
     }
-    registerSiteEnvironment() {
-        for (const [key, value] of Object.entries(this.props.environment || {})) {
-            const outputId = `SstSiteEnv_${key}`;
-            const output = new CfnOutput(this, outputId, { value });
-            SiteEnv.append({
-                path: this.props.path,
-                output: Stack.of(this).getLogicalId(output),
-                environment: key,
-                stack: Stack.of(this).stackName,
-            });
-        }
+    writeTypesFile() {
+        const typesPath = path.resolve(this.props.path, this.buildConfig.typesPath, "sst-env.d.ts");
+        // Do not override the types file if it already exists
+        if (fs.existsSync(typesPath))
+            return;
+        const relPathToSstTypesFile = path.join(path.relative(path.dirname(typesPath), useProject().paths.root), ".sst/types/index.ts");
+        fs.writeFileSync(typesPath, `/// <reference path="${relPathToSstTypesFile}" />`);
     }
     generateBuildId() {
         // We will generate a hash based on the contents of the "public" folder

package/constructs/StaticSite.d.ts

@@ -309,6 +309,8 @@ export declare class StaticSite extends Construct implements SSTConstruct {
     getConstructMetadata(): {
         type: "StaticSite";
         data: {
+            path: string;
+            environment: Record<string, string>;
             customDomainUrl: string | undefined;
         };
     };
@@ -330,5 +332,4 @@ export declare class StaticSite extends Construct implements SSTConstruct {
     private createCertificate;
     protected createRoute53Records(): void;
     private getS3ContentReplaceValues;
-    private registerSiteEnvironment;
 }

package/constructs/StaticSite.js

@@ -4,7 +4,7 @@ import fs from "fs";
 import crypto from "crypto";
 import { execSync } from "child_process";
 import { Construct } from "constructs";
-import { Token, Duration, CfnOutput, RemovalPolicy, CustomResource, } from "aws-cdk-lib";
+import { Token, Duration, RemovalPolicy, CustomResource, } from "aws-cdk-lib";
 import { BlockPublicAccess, Bucket, } from "aws-cdk-lib/aws-s3";
 import { Asset } from "aws-cdk-lib/aws-s3-assets";
 import { Effect, Policy, PolicyStatement } from "aws-cdk-lib/aws-iam";
@@ -22,7 +22,6 @@ import { isCDKConstruct } from "./Construct.js";
 import { getParameterPath, } from "./util/functionBinding.js";
 import { gray } from "colorette";
 import { useProject } from "../project.js";
-import { SiteEnv } from "../site-env.js";
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /////////////////////
 // Construct
@@ -63,7 +62,6 @@ export class StaticSite extends Construct {
         this.doNotDeploy =
             !stack.isActive || (app.mode === "dev" && !this.props.dev?.deploy);
         this.validateCustomDomainSettings();
-        this.registerSiteEnvironment();
         this.generateViteTypes();
         if (this.doNotDeploy) {
             // @ts-ignore
@@ -138,6 +136,8 @@ export class StaticSite extends Construct {
         return {
             type: "StaticSite",
             data: {
+                path: this.props.path,
+                environment: this.props.environment || {},
                 customDomainUrl: this.customDomainUrl,
             },
         };
@@ -627,16 +627,4 @@ function handler(event) {
         });
         return replaceValues;
     }
-    registerSiteEnvironment() {
-        for (const [key, value] of Object.entries(this.props.environment || {})) {
-            const outputId = `SstSiteEnv_${key}`;
-            const output = new CfnOutput(this, outputId, { value });
-            SiteEnv.append({
-                path: this.props.path,
-                output: Stack.of(this).getLogicalId(output),
-                environment: key,
-                stack: Stack.of(this).stackName,
-            });
-        }
-    }
 }

package/constructs/deprecated/NextjsSite.d.ts

@@ -256,8 +256,12 @@ export declare class NextjsSite extends Construct implements SSTConstruct {
      */
     attachPermissions(permissions: Permissions): void;
     getConstructMetadata(): {
-        type: "NextSite";
+        type: "SlsNextjsSite";
         data: {
+            path: string;
+            environment: {
+                [key: string]: string;
+            };
             distributionId: string;
             customDomainUrl: string | undefined;
         };
@@ -292,6 +296,5 @@ export declare class NextjsSite extends Construct implements SSTConstruct {
     private readRoutesManifest;
     private getS3ContentReplaceValues;
     private getLambdaContentReplaceValues;
-    private registerSiteEnvironment;
     private normalizeRuntime;
 }

package/constructs/deprecated/NextjsSite.js

@@ -4,7 +4,7 @@ import fs from "fs";
 import spawn from "cross-spawn";
 import { execSync } from "child_process";
 import { Construct } from "constructs";
-import { Token, Duration, CfnOutput, RemovalPolicy, CustomResource, } from "aws-cdk-lib";
+import { Token, Duration, RemovalPolicy, CustomResource, } from "aws-cdk-lib";
 import * as s3 from "aws-cdk-lib/aws-s3";
 import { Role, Effect, PolicyStatement, CompositePrincipal, ServicePrincipal, ManagedPolicy, } from "aws-cdk-lib/aws-iam";
 import * as sqs from "aws-cdk-lib/aws-sqs";
@@ -27,7 +27,6 @@ import { getHandlerHash } from "../util/builder.js";
 import { getParameterPath, } from "../util/functionBinding.js";
 import * as crossRegionHelper from "./cross-region-helper.js";
 import { gray, red } from "colorette";
-import { SiteEnv } from "../../site-env.js";
 import { useProject } from "../../project.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /////////////////////
@@ -130,7 +129,6 @@ export class NextjsSite extends Construct {
         this.props = props;
         this.cdk = {};
         this.awsCliLayer = new AwsCliLayer(this, "AwsCliLayer");
-        this.registerSiteEnvironment();
         // Build app
         if (this.isPlaceholder) {
             this.buildOutDir = null;
@@ -230,8 +228,10 @@ export class NextjsSite extends Construct {
     }
     getConstructMetadata() {
         return {
-            type: "NextSite",
+            type: "SlsNextjsSite",
             data: {
+                path: this.props.path,
+                environment: this.props.environment || {},
                 distributionId: this.cdk.distribution.distributionId,
                 customDomainUrl: this.customDomainUrl,
             },
@@ -1045,18 +1045,6 @@ export class NextjsSite extends Construct {
         });
         return replaceValues;
     }
-    registerSiteEnvironment() {
-        for (const [key, value] of Object.entries(this.props.environment || {})) {
-            const outputId = `SstSiteEnv_${key}`;
-            const output = new CfnOutput(this, outputId, { value });
-            SiteEnv.append({
-                path: this.props.path,
-                output: Stack.of(this).getLogicalId(output),
-                environment: key,
-                stack: Stack.of(this).stackName,
-            });
-        }
-    }
     normalizeRuntime(runtime) {
         if (runtime === "nodejs12.x") {
             return lambda.Runtime.NODEJS_12_X;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.2.8",
+  "version": "2.3.0",
   "bin": {
     "sst": "cli/sst.js"
   },