sst 2.40.3 → 2.40.5

package/constructs/Function.js

@@ -6,9 +6,10 @@ import zlib from "zlib";
 import { Stack } from "./Stack.js";
 import { Job } from "./Job.js";
 import { Secret } from "./Config.js";
+import { isSSTConstruct } from "./Construct.js";
 import { toCdkSize } from "./util/size.js";
 import { toCdkDuration } from "./util/duration.js";
-import { bindEnvironment, bindPermissions, getReferencedSecrets, } from "./util/functionBinding.js";
+import { getBindingEnvironments, getBindingPermissions, getBindingReferencedSecrets, } from "./util/binding.js";
 import { attachPermissionsToRole } from "./util/permission.js";
 import * as functionUrlCors from "./util/functionUrlCors.js";
 import url from "url";
@@ -251,6 +252,15 @@ export class Function extends CDKFunction {
                         ...(props.container?.buildArgs
                             ? { buildArgs: props.container.buildArgs }
                             : {}),
+                        ...(props.container?.buildSsh
+                            ? { buildSsh: props.container.buildSsh }
+                            : {}),
+                        ...(props.container?.cacheFrom
+                            ? { cacheFrom: props.container.cacheFrom }
+                            : {}),
+                        ...(props.container?.cacheTo
+                            ? { cacheTo: props.container.cacheTo }
+                            : {}),
                         exclude: [".sst/dist", ".sst/artifacts"],
                         ignoreMode: IgnoreMode.GLOB,
                     });
@@ -341,20 +351,14 @@ export class Function extends CDKFunction {
     bind(constructs) {
         // Get referenced secrets
         const referencedSecrets = [];
-        constructs.forEach((c) => referencedSecrets.push(...getReferencedSecrets(c)));
-        [...constructs, ...referencedSecrets].forEach((c) => {
+        constructs.forEach((r) => referencedSecrets.push(...getBindingReferencedSecrets(r)));
+        [...constructs, ...referencedSecrets].forEach((r) => {
             // Bind environment
-            const env = bindEnvironment(c);
+            const env = getBindingEnvironments(r);
             Object.entries(env).forEach(([key, value]) => this.addEnvironment(key, value));
             // Bind permissions
-            const permissions = bindPermissions(c);
-            Object.entries(permissions).forEach(([action, resources]) => this.attachPermissions([
-                new PolicyStatement({
-                    actions: [action],
-                    effect: Effect.ALLOW,
-                    resources,
-                }),
-            ]));
+            const policyStatements = getBindingPermissions(r);
+            this.attachPermissions(policyStatements);
         });
         this.allBindings.push(...constructs, ...referencedSecrets);
     }
@@ -389,14 +393,15 @@ export class Function extends CDKFunction {
                 missingSourcemap: this.missingSourcemap === true ? true : undefined,
                 localId: this.node.addr,
                 secrets: this.allBindings
-                    .filter((c) => c instanceof Secret)
+                    .map((r) => (isSSTConstruct(r) ? r : r.resource))
+                    .filter((r) => r instanceof Secret)
                     .map((c) => c.name),
                 prefetchSecrets: this.props.prefetchSecrets,
             },
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return {
             clientPackage: "function",
             variables: {

package/constructs/Job.d.ts

@@ -1,4 +1,5 @@
 import { Construct } from "constructs";
+import { DockerCacheOption } from "aws-cdk-lib/core";
 import { Function as CdkFunction } from "aws-cdk-lib/aws-lambda";
 import { Project } from "aws-cdk-lib/aws-codebuild";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
@@ -6,11 +7,13 @@ import { SSTConstruct } from "./Construct.js";
 import { NodeJSProps, FunctionCopyFilesProps } from "./Function.js";
 import { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingResource, BindingProps } from "./util/binding.js";
 import { ISecurityGroup, IVpc, SubnetSelection } from "aws-cdk-lib/aws-ec2";
 export type JobMemorySize = "3 GB" | "7 GB" | "15 GB" | "145 GB";
 export interface JobNodeJSProps extends NodeJSProps {
 }
+export interface JobContainerCacheProps extends DockerCacheOption {
+}
 export interface JobContainerProps {
     /**
      * Specify or override the CMD on the Docker image.
@@ -45,6 +48,42 @@ export interface JobContainerProps {
      * ```
      */
     buildArgs?: Record<string, string>;
+    /**
+     * SSH agent socket or keys to pass to the docker build command.
+     * Docker BuildKit must be enabled to use the ssh flag
+     * @default No --ssh flag is passed to the build command
+     * @example
+     * ```js
+     * container: {
+     *   buildSsh: "default"
+     * }
+     * ```
+     */
+    buildSsh?: string;
+    /**
+     * Cache from options to pass to the docker build command.
+     * [DockerCacheOption](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_ecr_assets.DockerCacheOption.html)[].
+     * @default No cache from options are passed to the build command
+     * @example
+     * ```js
+     * container: {
+     *   cacheFrom: [{ type: 'registry', params: { ref: 'ghcr.io/myorg/myimage:cache' }}],
+     * }
+     * ```
+     */
+    cacheFrom?: JobContainerCacheProps[];
+    /**
+     * Cache to options to pass to the docker build command.
+     * [DockerCacheOption](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_ecr_assets.DockerCacheOption.html)[].
+     * @default No cache to options are passed to the build command
+     * @example
+     * ```js
+     * container: {
+     *   cacheTo: { type: 'registry', params: { ref: 'ghcr.io/myorg/myimage:cache', mode: 'max', compression: 'zstd' }},
+     * }
+     * ```
+     */
+    cacheTo?: JobContainerCacheProps;
 }
 export interface JobProps {
     /**
@@ -180,7 +219,7 @@ export interface JobProps {
      * })
      * ```
      */
-    bind?: SSTConstruct[];
+    bind?: BindingResource[];
     /**
      * Attaches the given list of permissions to the job. Configuring this property is equivalent to calling `attachPermissions()` after the job is created.
      *
@@ -292,7 +331,7 @@ export declare class Job extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     /**
      * Binds additional resources to job.
      *
@@ -301,7 +340,7 @@ export declare class Job extends Construct implements SSTConstruct {
      * job.bind([STRIPE_KEY, bucket]);
      * ```
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Attaches the given list of [permissions](Permissions.md) to the job. This allows the job to access other AWS resources.
      *

package/constructs/Job.js

@@ -2,7 +2,7 @@ import url from "url";
 import path from "path";
 import fs from "fs/promises";
 import { Construct } from "constructs";
-import { Duration as CdkDuration, IgnoreMode } from "aws-cdk-lib/core";
+import { Duration as CdkDuration, IgnoreMode, } from "aws-cdk-lib/core";
 import { Platform } from "aws-cdk-lib/aws-ecr-assets";
 import { PolicyStatement, Effect } from "aws-cdk-lib/aws-iam";
 import { AssetCode, Code, Runtime, Function as CdkFunction, } from "aws-cdk-lib/aws-lambda";
@@ -12,7 +12,7 @@ import { Stack } from "./Stack.js";
 import { Function, useFunctions, } from "./Function.js";
 import { toCdkDuration } from "./util/duration.js";
 import { attachPermissionsToRole } from "./util/permission.js";
-import { bindEnvironment, bindPermissions, getReferencedSecrets, } from "./util/functionBinding.js";
+import { getBindingEnvironments, getBindingPermissions, getBindingReferencedSecrets, } from "./util/binding.js";
 import { useDeferredTasks } from "./deferred_task.js";
 import { useProject } from "../project.js";
 import { useRuntimeHandlers } from "../runtime/handlers.js";
@@ -83,7 +83,7 @@ export class Job extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return {
             clientPackage: "job",
             variables: {
@@ -219,6 +219,9 @@ export class Job extends Construct {
                         : Platform.custom("linux/amd64"),
                     file: container?.file,
                     buildArgs: container?.buildArgs,
+                    buildSsh: container?.buildSsh,
+                    cacheFrom: container?.cacheFrom,
+                    cacheTo: container?.cacheTo,
                     exclude: [".sst/dist", ".sst/artifacts"],
                     ignoreMode: IgnoreMode.GLOB,
                 });
@@ -351,20 +354,14 @@ export class Job extends Construct {
     bindForCodeBuild(constructs) {
         // Get referenced secrets
         const referencedSecrets = [];
-        constructs.forEach((c) => referencedSecrets.push(...getReferencedSecrets(c)));
-        [...constructs, ...referencedSecrets].forEach((c) => {
+        constructs.forEach((r) => referencedSecrets.push(...getBindingReferencedSecrets(r)));
+        [...constructs, ...referencedSecrets].forEach((r) => {
             // Bind environment
-            const env = bindEnvironment(c);
+            const env = getBindingEnvironments(r);
             Object.entries(env).forEach(([key, value]) => this.addEnvironmentForCodeBuild(key, value));
             // Bind permissions
-            const permissions = bindPermissions(c);
-            Object.entries(permissions).forEach(([action, resources]) => this.attachPermissionsForCodeBuild([
-                new PolicyStatement({
-                    actions: [action],
-                    effect: Effect.ALLOW,
-                    resources,
-                }),
-            ]));
+            const policyStatements = getBindingPermissions(r);
+            this.attachPermissionsForCodeBuild(policyStatements);
         });
     }
     attachPermissionsForCodeBuild(permissions) {

package/constructs/KinesisStream.d.ts

@@ -3,7 +3,7 @@ import * as kinesis from "aws-cdk-lib/aws-kinesis";
 import * as lambdaEventSources from "aws-cdk-lib/aws-lambda-event-sources";
 import { SSTConstruct } from "./Construct.js";
 import { Function as Fn, FunctionProps, FunctionInlineDefinition, FunctionDefinition } from "./Function.js";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingResource, BindingProps } from "./util/binding.js";
 import { Permissions } from "./util/permission.js";
 /**
  * Used to define the function consumer for the stream
@@ -166,7 +166,7 @@ export declare class KinesisStream extends Construct implements SSTConstruct {
      * stream.bind([STRIPE_KEY, bucket]]);
      * ```
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Binds the given list of resources to a specific consumer.
      *
@@ -175,7 +175,7 @@ export declare class KinesisStream extends Construct implements SSTConstruct {
      * stream.bindToConsumer("consumer1", [STRIPE_KEY, bucket]);
      * ```
      */
-    bindToConsumer(consumerName: string, constructs: SSTConstruct[]): void;
+    bindToConsumer(consumerName: string, constructs: BindingResource[]): void;
     /**
      * Attaches the given list of permissions to all the consumers. This allows the functions to access other AWS resources.
      *
@@ -218,7 +218,7 @@ export declare class KinesisStream extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private createStream;
     private addConsumer;
 }

package/constructs/KinesisStream.js

@@ -149,7 +149,7 @@ export class KinesisStream extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return {
             clientPackage: "kinesis-stream",
             variables: {

package/constructs/NextjsSite.d.ts

@@ -235,6 +235,7 @@ export declare class NextjsSite extends SsrSite {
         } | undefined;
         buildId?: string | undefined;
     };
+    private prefixPattern;
     private createRevalidationQueue;
     private createRevalidationTable;
     getConstructMetadata(): {
@@ -266,6 +267,7 @@ export declare class NextjsSite extends SsrSite {
     private usePagesManifest;
     private usePrerenderManifest;
     private useServerFunctionPerRouteLoggingInjection;
+    private useCloudFrontFunctionPrerenderBypassHeaderInjection;
     private getBuildId;
     private getSourcemapForAppRoute;
     private getSourcemapForPagesRoute;

package/constructs/NextjsSite.js

@@ -20,13 +20,14 @@ import { useFunctions } from "./Function.js";
 import { useDeferredTasks } from "./deferred_task.js";
 import { Logger } from "../logger.js";
 const LAYER_VERSION = "2";
-const DEFAULT_OPEN_NEXT_VERSION = "2.3.1";
+const DEFAULT_OPEN_NEXT_VERSION = "2.3.5";
 const DEFAULT_CACHE_POLICY_ALLOWED_HEADERS = [
     "accept",
     "rsc",
     "next-router-prefetch",
     "next-router-state-tree",
     "next-url",
+    "x-prerender-bypass",
 ];
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.
@@ -117,7 +118,10 @@ export class NextjsSite extends SsrSite {
             cloudFrontFunctions: {
                 serverCfFunction: {
                     constructId: "CloudFrontFunction",
-                    injections: [this.useCloudFrontFunctionHostHeaderInjection()],
+                    injections: [
+                        this.useCloudFrontFunctionHostHeaderInjection(),
+                        this.useCloudFrontFunctionPrerenderBypassHeaderInjection(),
+                    ],
                 },
             },
             edgeFunctions: edge
@@ -187,14 +191,14 @@ export class NextjsSite extends SsrSite {
                         },
                         {
                             cacheType: "server",
-                            pattern: "api/*",
+                            pattern: this.prefixPattern("api/*"),
                             cfFunction: "serverCfFunction",
                             edgeFunction: "edgeServer",
                             origin: "s3",
                         },
                         {
                             cacheType: "server",
-                            pattern: "_next/data/*",
+                            pattern: this.prefixPattern("_next/data/*"),
                             cfFunction: "serverCfFunction",
                             edgeFunction: "edgeServer",
                             origin: "s3",
@@ -208,31 +212,31 @@ export class NextjsSite extends SsrSite {
                         },
                         {
                             cacheType: "server",
-                            pattern: "api/*",
+                            pattern: this.prefixPattern("api/*"),
                             cfFunction: "serverCfFunction",
                             origin: "regionalServer",
                         },
                         {
                             cacheType: "server",
-                            pattern: "_next/data/*",
+                            pattern: this.prefixPattern("_next/data/*"),
                             cfFunction: "serverCfFunction",
                             origin: "regionalServer",
                         },
                     ]),
                 {
                     cacheType: "server",
-                    pattern: "_next/image*",
+                    pattern: this.prefixPattern("_next/image*"),
                     cfFunction: "serverCfFunction",
                     origin: "imageOptimizer",
                 },
                 // create 1 behaviour for each top level asset file/folder
                 ...fs.readdirSync(path.join(sitePath, ".open-next/assets")).map((item) => ({
                     cacheType: "static",
-                    pattern: fs
+                    pattern: this.prefixPattern(fs
                         .statSync(path.join(sitePath, ".open-next/assets", item))
                         .isDirectory()
                         ? `${item}/*`
-                        : item,
+                        : item),
                     origin: "s3",
                 })),
             ],
@@ -242,6 +246,13 @@ export class NextjsSite extends SsrSite {
             buildId: this.getBuildId(),
         });
     }
+    prefixPattern(pattern) {
+        // Prefix CloudFront distribution behavior path patterns with `basePath` if configured
+        const { basePath } = this.useRoutesManifest();
+        return basePath && basePath.length > 0
+            ? `${basePath.slice(1)}/${pattern}`
+            : pattern;
+    }
     createRevalidationQueue() {
         if (!this.serverFunction)
             return;
@@ -520,6 +531,15 @@ if (event.rawPath) {
       },
     }));
   }
+}`;
+    }
+    useCloudFrontFunctionPrerenderBypassHeaderInjection() {
+        // In Next.js page router preview mode (depends on the cookie __prerender_bypass),
+        // to ensure we receive the cached page instead of the preview version, we set the
+        // header "x-prerender-bypass", and add it to cache policy's allowed headers.
+        return `
+if (request.cookies["__prerender_bypass"]) { 
+  request.headers["x-prerender-bypass"] = { value: "true" }; 
 }`;
     }
     getBuildId() {

package/constructs/Parameter.d.ts

@@ -1,6 +1,6 @@
 import { Construct } from "constructs";
 import { SSTConstruct } from "./Construct.js";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingProps } from "./util/binding.js";
 export interface ParameterProps {
     /**
      * Value of the parameter
@@ -32,6 +32,6 @@ export declare class Parameter extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     static create<T extends Record<string, any>>(scope: Construct, parameters: T): { [key in keyof T]: Parameter; };
 }

package/constructs/Parameter.js

@@ -33,7 +33,7 @@ export class Parameter extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return {
             clientPackage: "config",
             variables: {

package/constructs/Queue.d.ts

@@ -4,7 +4,7 @@ import * as lambda from "aws-cdk-lib/aws-lambda";
 import * as lambdaEventSources from "aws-cdk-lib/aws-lambda-event-sources";
 import { SSTConstruct } from "./Construct.js";
 import { Function as Fn, FunctionInlineDefinition, FunctionDefinition } from "./Function.js";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingResource, BindingProps } from "./util/binding.js";
 import { Permissions } from "./util/permission.js";
 /**
  * Used to define the consumer for the queue and invocation details
@@ -164,7 +164,7 @@ export declare class Queue extends Construct implements SSTConstruct {
      * queue.bind([STRIPE_KEY, bucket]);
      * ```
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Attaches additional permissions to the consumer function
      *
@@ -189,6 +189,6 @@ export declare class Queue extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private createQueue;
 }

package/constructs/Queue.js

@@ -158,7 +158,7 @@ export class Queue extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return {
             clientPackage: "queue",
             variables: {

package/constructs/RDS.d.ts

@@ -4,7 +4,7 @@ import { AuroraCapacityUnit, Endpoint, IServerlessCluster, ServerlessCluster, Se
 import { ISecret } from "aws-cdk-lib/aws-secretsmanager";
 import { SSTConstruct } from "./Construct.js";
 import { Function as Fn } from "./Function.js";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingProps } from "./util/binding.js";
 export interface RDSTypes {
     path: string;
     camelCase?: boolean;
@@ -204,7 +204,7 @@ export declare class RDS extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private validateRequiredProps;
     private validateCDKPropWhenIsConstruct;
     private validateCDKPropWhenIsClusterProps;

package/constructs/RDS.js

@@ -116,7 +116,7 @@ export class RDS extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return {
             clientPackage: "rds",
             variables: {

package/constructs/RemixSite.d.ts

@@ -58,7 +58,7 @@ export declare class RemixSite extends SsrSite {
                     from: string;
                     to: string;
                     cached: true;
-                    versionedSubDir: string;
+                    versionedSubDir: string | undefined;
                 }[];
             };
             regionalServer?: {
@@ -91,7 +91,8 @@ export declare class RemixSite extends SsrSite {
         } | undefined;
         buildId?: string | undefined;
     };
-    protected getServerModuleFormat(): "cjs" | "esm";
+    private hasViteConfig;
+    private getServerModuleFormat;
     private createServerLambdaBundle;
     getConstructMetadata(): {
         data: {

package/constructs/RemixSite.js

@@ -26,8 +26,9 @@ export class RemixSite extends SsrSite {
     }
     plan() {
         const { path: sitePath, edge } = this.props;
-        const { handler, inject } = this.createServerLambdaBundle(edge ? "edge-server.js" : "regional-server.js");
-        const format = this.getServerModuleFormat();
+        const isUsingVite = this.hasViteConfig();
+        const format = this.getServerModuleFormat(isUsingVite);
+        const { handler, inject } = this.createServerLambdaBundle(isUsingVite, edge ? "edge-server.js" : "regional-server.js");
         const serverConfig = {
             description: "Server handler for Remix",
             handler,
@@ -38,6 +39,11 @@ export class RemixSite extends SsrSite {
                 },
             },
         };
+        // The path for all files that need to be in the "/" directory (static assets)
+        // is different when using Vite. These will be located in the "build/client"
+        // path of the output. It will be the "public" folder when using remix config.
+        const assetsPath = isUsingVite ? path.join("build", "client") : "public";
+        const assetsVersionedSubDir = isUsingVite ? undefined : "build";
         return this.validatePlan({
             edge: edge ?? false,
             cloudFrontFunctions: {
@@ -79,10 +85,10 @@ export class RemixSite extends SsrSite {
                     type: "s3",
                     copy: [
                         {
-                            from: "public",
+                            from: assetsPath,
                             to: "",
                             cached: true,
-                            versionedSubDir: "build",
+                            versionedSubDir: assetsVersionedSubDir,
                         },
                     ],
                 },
@@ -101,10 +107,10 @@ export class RemixSite extends SsrSite {
                         origin: "regionalServer",
                     },
                 // create 1 behaviour for each top level asset file/folder
-                ...fs.readdirSync(path.join(sitePath, "public")).map((item) => ({
+                ...fs.readdirSync(path.join(sitePath, assetsPath)).map((item) => ({
                     cacheType: "static",
                     pattern: fs
-                        .statSync(path.join(sitePath, "public", item))
+                        .statSync(path.join(sitePath, assetsPath, item))
                         .isDirectory()
                         ? `${item}/*`
                         : item,
@@ -114,8 +120,17 @@ export class RemixSite extends SsrSite {
             ],
         });
     }
-    getServerModuleFormat() {
+    hasViteConfig() {
         const { path: sitePath } = this.props;
+        return (fs.existsSync(path.resolve(sitePath, "vite.config.ts")) ||
+            fs.existsSync(path.resolve(sitePath, "vite.config.js")));
+    }
+    getServerModuleFormat(isUsingVite) {
+        const { path: sitePath } = this.props;
+        // Remix has two possible config formats: "remix.config.js" or "vite.config.ts/js".
+        // If using the vite format, we can short circuit the logic and just return ESM.
+        if (isUsingVite)
+            return "esm";
         // Validate config path
         const configPath = path.resolve(sitePath, "remix.config.js");
         if (!fs.existsSync(configPath)) {
@@ -158,7 +173,7 @@ export class RemixSite extends SsrSite {
         });
         return format;
     }
-    createServerLambdaBundle(wrapperFile) {
+    createServerLambdaBundle(isUsingVite, wrapperFile) {
         // Create a Lambda@Edge handler for the Remix server bundle.
         //
         // Note: Remix does perform their own internal ESBuild process, but it
@@ -178,13 +193,24 @@ export class RemixSite extends SsrSite {
         // Ensure build directory exists
         const buildPath = path.join(this.props.path, "build");
         fs.mkdirSync(buildPath, { recursive: true });
-        // Copy the server lambda handler
-        fs.copyFileSync(path.resolve(__dirname, `../support/remix-site-function/${wrapperFile}`), path.join(buildPath, "server.js"));
+        // Copy the server lambda handler and pre-append the build injection based
+        // on the config file used.
+        const content = [
+            // When using Vite config, the output build will be "server/index.js"
+            // and when using Remix config it will be `server.js`.
+            `// Import the server build that was produced by 'remix build'`,
+            isUsingVite
+                ? `import * as remixServerBuild from "./server/index.js";`
+                : `import * as remixServerBuild from "./index.js";`,
+            ``,
+            fs.readFileSync(path.resolve(__dirname, `../support/remix-site-function/${wrapperFile}`), { encoding: "utf8" }),
+        ].join("\n");
+        fs.writeFileSync(path.resolve(buildPath, "server.js"), content);
         // Copy the Remix polyfil to the server build directory
         //
         // Note: We need to ensure that the polyfills are injected above other code that
-        // will depend on them. Importing them within the top of the lambda code
-        // doesn't appear to guarantee this, we therefore leverage ESBUild's
+        // will depend on them when not using Vite. Importing them within the top of the
+        // lambda code doesn't appear to guarantee this, we therefore leverage ESBUild's
         // `inject` option to ensure that the polyfills are injected at the top of
         // the bundle.
         const polyfillDest = path.join(buildPath, "polyfill.js");

package/constructs/Script.d.ts

@@ -2,6 +2,7 @@ import { Construct } from "constructs";
 import { Function as Fn, FunctionProps, FunctionDefinition } from "./Function.js";
 import { SSTConstruct } from "./Construct.js";
 import { Permissions } from "./util/permission.js";
+import { BindingResource } from "./util/binding.js";
 export interface ScriptProps {
     /**
      * An object of input parameters to be passed to the script. Made available in the `event` object of the function.
@@ -123,7 +124,7 @@ export declare class Script extends Construct implements SSTConstruct {
      * script.bind([STRIPE_KEY, bucket]);
      * ```
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Grants additional permissions to the script
      *
@@ -156,5 +157,5 @@ export declare class Script extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): undefined;
+    getBindings(): undefined;
 }

package/constructs/Script.js

@@ -6,7 +6,7 @@ import { PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { Code, Runtime, Function as CdkFunction } from "aws-cdk-lib/aws-lambda";
 import { Stack } from "./Stack.js";
 import { Function as Fn, } from "./Function.js";
-import { getFunctionRef, } from "./Construct.js";
+import { getFunctionRef } from "./Construct.js";
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /////////////////////
 // Construct
@@ -175,7 +175,7 @@ export class Script extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return undefined;
     }
 }