sst 2.1.1 → 2.1.3

package/constructs/RemixSite.d.ts

@@ -23,4 +23,5 @@ export declare class RemixSite extends SsrSite {
     private createServerLambdaBundle;
     protected createFunctionForRegional(): lambda.Function;
     protected createFunctionForEdge(): EdgeFunction;
+    private normalizeRuntime;
 }

package/constructs/RemixSite.js

@@ -60,7 +60,7 @@ export class RemixSite extends SsrSite {
             clientBuildVersionedSubDir: "build",
         };
     }
-    createServerLambdaBundle(wrapperFile) {
+    createServerLambdaBundle(wrapperFile, external) {
         // Create a Lambda@Edge handler for the Remix server bundle.
         //
         // Note: Remix does perform their own internal ESBuild process, but it
@@ -96,7 +96,7 @@ export class RemixSite extends SsrSite {
             bundle: true,
             target: "node16",
             platform: "node",
-            external: ["aws-sdk"],
+            external,
             outfile: path.join(outputPath, "server.js"),
             // 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
@@ -112,8 +112,9 @@ export class RemixSite extends SsrSite {
         return outputPath;
     }
     createFunctionForRegional() {
-        const { runtime, timeout, memorySize, environment, cdk } = this.props;
-        const bundlePath = this.createServerLambdaBundle("regional-server.js");
+        const { runtime: runtimeRaw, timeout, memorySize, environment, cdk, } = this.props;
+        const runtime = this.normalizeRuntime(runtimeRaw);
+        const bundlePath = this.createServerLambdaBundle("regional-server.js", runtime === "nodejs18.x" ? [] : ["aws-sdk"]);
         return new lambda.Function(this, `ServerFunction`, {
             description: "Server handler for Remix",
             handler: "server.handler",
@@ -138,8 +139,9 @@ export class RemixSite extends SsrSite {
         });
     }
     createFunctionForEdge() {
-        const { runtime, timeout, memorySize, permissions, environment } = this.props;
-        const bundlePath = this.createServerLambdaBundle("edge-server.js");
+        const { runtime: runtimeRaw, timeout, memorySize, permissions, environment, } = this.props;
+        const runtime = this.normalizeRuntime(runtimeRaw);
+        const bundlePath = this.createServerLambdaBundle("edge-server.js", runtime === "nodejs18.x" ? [] : ["aws-sdk"]);
         return new EdgeFunction(this, `Server`, {
             scopeOverride: this,
             format: "cjs",
@@ -152,4 +154,7 @@ export class RemixSite extends SsrSite {
             environment,
         });
     }
+    normalizeRuntime(runtime) {
+        return runtime || "nodejs18.x";
+    }
 }

package/package.json

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

package/runtime/handlers/pythonBundling.js

@@ -4,7 +4,7 @@
 import fs from "fs";
 import url from "url";
 import path from "path";
-import { AssetStaging, DockerImage, FileSystem, } from "aws-cdk-lib";
+import { DockerImage, FileSystem, } from "aws-cdk-lib";
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /**
  * Dependency files to exclude from the asset hash.
@@ -22,13 +22,6 @@ export function bundle(options) {
     const stagedir = FileSystem.mkdtemp("python-bundling-");
     const hasDeps = stageDependencies(entry, stagedir);
     const hasInstallCommands = stageInstallCommands(installCommands || [], stagedir);
-    const depsCommand = chain([
-        hasDeps || hasInstallCommands
-            ? `rsync -r ${BUNDLER_DEPENDENCIES_CACHE}/. ${AssetStaging.BUNDLING_OUTPUT_DIR}/${outputPathSuffix}`
-            : "",
-        `rsync -r . ${AssetStaging.BUNDLING_OUTPUT_DIR}/${outputPathSuffix}`,
-    ]);
-    console.log("Commands", depsCommand);
     // Determine which dockerfile to use. When dependencies are present, we use a
     // Dockerfile that can create a cacheable layer. We can't use this Dockerfile
     // if there aren't dependencies or the Dockerfile will complain about missing
@@ -46,19 +39,14 @@ export function bundle(options) {
         },
         file: dockerfile,
     });
-    image.run({
-        command: ["bash", "-c", depsCommand],
-        workingDirectory: AssetStaging.BUNDLING_INPUT_DIR,
-        volumes: [
-            {
-                hostPath: entry,
-                containerPath: AssetStaging.BUNDLING_INPUT_DIR,
-            },
-            {
-                hostPath: options.out,
-                containerPath: AssetStaging.BUNDLING_OUTPUT_DIR,
-            },
-        ],
+    const outputPath = path.join(options.out, outputPathSuffix);
+    // Copy dependencies to the bundle if applicable.
+    if (hasDeps || hasInstallCommands) {
+        image.cp(`${BUNDLER_DEPENDENCIES_CACHE}/.`, outputPath);
+    }
+    // Copy source code to the bundle.
+    fs.cpSync(entry, outputPath, {
+        recursive: true,
     });
 }
 /**
@@ -88,6 +76,3 @@ function stageInstallCommands(installCommands, stagedir) {
     }
     return found;
 }
-function chain(commands) {
-    return commands.filter((c) => !!c).join(" && ");
-}

package/sst.mjs

@@ -1695,7 +1695,7 @@ var init_credentials = __esm({
       Logger.debug("Loading v2 AWS SDK");
       const project = useProject();
       const creds = await useAWSCredentials();
-      const chain2 = new CredentialProviderChain([
+      const chain = new CredentialProviderChain([
         () => ({
           ...creds,
           get(cb) {
@@ -1718,7 +1718,7 @@ var init_credentials = __esm({
           secretAccessKey: creds.secretAccessKey
         })
       ]);
-      const provider = new SdkProvider(chain2, project.config.region, {
+      const provider = new SdkProvider(chain, project.config.region, {
         maxRetries: 1e4,
         region: project.config.region
       });
@@ -5292,7 +5292,6 @@ import fs13 from "fs";
 import url6 from "url";
 import path13 from "path";
 import {
-  AssetStaging,
   DockerImage,
   FileSystem
 } from "aws-cdk-lib";
@@ -5304,11 +5303,6 @@ function bundle(options) {
     installCommands || [],
     stagedir
   );
-  const depsCommand = chain([
-    hasDeps || hasInstallCommands ? `rsync -r ${BUNDLER_DEPENDENCIES_CACHE}/. ${AssetStaging.BUNDLING_OUTPUT_DIR}/${outputPathSuffix}` : "",
-    `rsync -r . ${AssetStaging.BUNDLING_OUTPUT_DIR}/${outputPathSuffix}`
-  ]);
-  console.log("Commands", depsCommand);
   const dockerfile = hasInstallCommands ? "Dockerfile.custom" : hasDeps ? "Dockerfile.dependencies" : "Dockerfile";
   fs13.copyFileSync(
     path13.join(__dirname2, "../../support/python-runtime", dockerfile),
@@ -5320,19 +5314,12 @@ function bundle(options) {
     },
     file: dockerfile
   });
-  image.run({
-    command: ["bash", "-c", depsCommand],
-    workingDirectory: AssetStaging.BUNDLING_INPUT_DIR,
-    volumes: [
-      {
-        hostPath: entry,
-        containerPath: AssetStaging.BUNDLING_INPUT_DIR
-      },
-      {
-        hostPath: options.out,
-        containerPath: AssetStaging.BUNDLING_OUTPUT_DIR
-      }
-    ]
+  const outputPath = path13.join(options.out, outputPathSuffix);
+  if (hasDeps || hasInstallCommands) {
+    image.cp(`${BUNDLER_DEPENDENCIES_CACHE}/.`, outputPath);
+  }
+  fs13.cpSync(entry, outputPath, {
+    recursive: true
   });
 }
 function stageDependencies(entry, stagedir) {
@@ -5358,9 +5345,6 @@ function stageInstallCommands(installCommands, stagedir) {
   }
   return found;
 }
-function chain(commands) {
-  return commands.filter((c) => !!c).join(" && ");
-}
 var __dirname2, BUNDLER_DEPENDENCIES_CACHE;
 var init_pythonBundling = __esm({
   "src/runtime/handlers/pythonBundling.ts"() {