sst 2.1.16 → 2.1.18

package/bootstrap.js

@@ -190,7 +190,7 @@ async function bootstrapCDK() {
                 AWS_PROFILE: profile,
             },
             stdio: "pipe",
-            shell: process.env.SHELL || true,
+            shell: true,
         });
         let stderr = "";
         proc.stdout.on("data", (data) => {

package/cli/commands/bind.js

@@ -24,7 +24,7 @@ export const bind = (program) => program
             AWS_REGION: project.config.region,
         },
         stdio: "inherit",
-        shell: process.env.SHELL || true,
+        shell: true,
     });
     process.exitCode = result.status || undefined;
 })

package/cli/commands/env.js

@@ -39,7 +39,7 @@ export const env = (program) => program
                 AWS_REGION: project.config.region,
             },
             stdio: "inherit",
-            shell: process.env.SHELL || true,
+            shell: true,
         });
         process.exitCode = result.status || undefined;
         break;

package/constructs/App.js

@@ -247,7 +247,7 @@ export class App extends cdk.App {
                 if (!isSSTConstruct(c)) {
                     return;
                 }
-                if (c instanceof Function && c._disableBind) {
+                if (c instanceof Function && c._doNotAllowOthersToBind) {
                     return;
                 }
                 bindParameters(c);
@@ -370,7 +370,7 @@ export class App extends cdk.App {
                 if (!isSSTConstruct(c)) {
                     return;
                 }
-                if (c instanceof Function && c._disableBind) {
+                if (c instanceof Function && c._doNotAllowOthersToBind) {
                     return;
                 }
                 const className = c.constructor.name;
@@ -449,7 +449,7 @@ export class App extends cdk.App {
                 if (!isSSTConstruct(c)) {
                     return;
                 }
-                if (c instanceof Function && c._disableBind) {
+                if (c instanceof Function && c._doNotAllowOthersToBind) {
                     return;
                 }
                 const binding = bindType(c);

package/constructs/AstroSite.js

@@ -1,13 +1,9 @@
 import fs from "fs";
-import url from "url";
 import path from "path";
-import { buildSync } from "esbuild";
 import { Architecture } from "aws-cdk-lib/aws-lambda";
 import { SsrSite } from "./SsrSite.js";
 import { Function } from "./Function.js";
-import { useProject } from "../project.js";
 import { EdgeFunction } from "./EdgeFunction.js";
-const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /**
  * The `AstroSite` construct is a higher level CDK construct that makes it easy to create a Astro app.
  * @example
@@ -36,12 +32,10 @@ export class AstroSite extends SsrSite {
         super.validateBuildOutput();
     }
     createFunctionForRegional() {
-        const { runtime, memorySize, timeout, environment, bind, cdk } = this.props;
-        // Create function
+        const { runtime, timeout, memorySize, permissions, environment, bind, cdk, } = this.props;
         const fn = new Function(this, `ServerFunction`, {
             description: "Server handler",
             handler: path.join(this.props.path, "dist", "server", "entry.handler"),
-            bind,
             logRetention: "three_days",
             runtime,
             memorySize,
@@ -49,53 +43,26 @@ export class AstroSite extends SsrSite {
             nodejs: {
                 format: "esm",
             },
+            bind,
             environment,
+            permissions,
             ...cdk?.server,
             architecture: cdk?.server?.architecture === Architecture.ARM_64 ? "arm_64" : "x86_64",
         });
-        fn._disableBind = true;
+        fn._doNotAllowOthersToBind = true;
         return fn;
     }
     createFunctionForEdge() {
-        const { runtime, timeout, memorySize, permissions, environment } = this.props;
-        // Create a directory that we will use to create the bundled version
-        // of the "core server build" along with our custom Lamba server handler.
-        const outputPath = path.resolve(path.join(useProject().paths.artifacts, `AstroSiteFunction-${this.node.id}-${this.node.addr}`));
-        const result = buildSync({
-            entryPoints: [
-                path.join(this.props.path, this.buildConfig.serverBuildOutputFile),
-            ],
-            target: "esnext",
-            format: "esm",
-            platform: "node",
-            metafile: true,
-            bundle: true,
-            write: true,
-            allowOverwrite: true,
-            outfile: path.join(outputPath, "entry.mjs"),
-            banner: {
-                js: [
-                    `import { createRequire as topLevelCreateRequire } from 'module';`,
-                    `const require = topLevelCreateRequire(import.meta.url);`,
-                ].join(""),
-            },
-        });
-        if (result.errors.length > 0) {
-            result.errors.forEach((error) => console.error(error));
-            throw new Error(`There was a problem bundling the function code for the ${this.id} AstroSite.`);
-        }
-        // Create package.json
-        fs.writeFileSync(path.join(outputPath, "package.json"), `{"type":"module"}`);
-        // Create function
+        const { runtime, timeout, memorySize, bind, permissions, environment } = this.props;
         return new EdgeFunction(this, `Server`, {
             scopeOverride: this,
-            bundlePath: outputPath,
-            handler: "entry.handler",
+            handler: path.join(this.props.path, "dist", "server", "entry.handler"),
             runtime,
             timeout,
             memorySize,
-            permissions,
+            bind,
             environment,
+            permissions,
             format: "esm",
         });
     }

package/constructs/EdgeFunction.d.ts

@@ -1,25 +1,22 @@
+import { BuildOptions } from "esbuild";
 import { Construct, IConstruct } from "constructs";
 import { Role } from "aws-cdk-lib/aws-iam";
-import * as lambda from "aws-cdk-lib/aws-lambda";
+import { IVersion } from "aws-cdk-lib/aws-lambda";
+import { SSTConstruct } from "./Construct.js";
 import { Size } from "./util/size.js";
 import { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
 export interface EdgeFunctionProps {
-    bundlePath: string;
+    bundle?: string;
     handler: string;
-    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
+    runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
     timeout: number | Duration;
     memorySize: number | Size;
     permissions?: Permissions;
-    format: "cjs" | "esm";
     environment?: Record<string, string>;
-    /**
-     * This is intended to be used internally by SST to make constructs
-     * backwards compatible when the hirechical structure of the constructs
-     * changes. When the hirerchical structure changes, the child AWS
-     * resources' logical ID will change. And CloudFormation will recreate
-     * them.
-     */
+    bind?: SSTConstruct[];
+    esbuild?: BuildOptions;
+    format: "cjs" | "esm";
     scopeOverride?: IConstruct;
 }
 export declare class EdgeFunction extends Construct {
@@ -27,20 +24,21 @@ export declare class EdgeFunction extends Construct {
     functionArn: string;
     private scope;
     private versionId;
+    private bindingEnvs;
     private props;
     constructor(scope: Construct, id: string, props: EdgeFunctionProps);
-    get currentVersion(): lambda.IVersion;
+    get currentVersion(): IVersion;
     attachPermissions(permissions: Permissions): void;
-    private wrapFunctionCode;
-    private createAsset;
+    private buildBundle;
+    private updateBundleWithEnvWrapper;
+    private bind;
+    private createCodeAsset;
+    private createCodeReplacer;
     private createRole;
-    private createFunction;
-    private createLambdaCodeReplacer;
-    private createSingletonBucketCR;
-    private createFunctionCR;
-    private createVersionCR;
-    private getLambdaContentReplaceValues;
-    private updateVersionLogicalId;
+    private createSingletonBucketInUsEast1;
+    private createFunctionInUsEast1;
+    private createVersionInUsEast1;
+    private getHandlerExtension;
     private trimFromStart;
     private calculateHash;
 }