sst 2.1.2 → 2.1.4

package/cli/commands/plugins/kysely.js

@@ -1,13 +1,13 @@
 import { Kysely } from "kysely";
 import { DataApiDialect } from "kysely-data-api";
-import RDSDataService from "aws-sdk/clients/rdsdataservice.js";
+import { RDSData } from "@aws-sdk/client-rds-data";
 import * as fs from "fs/promises";
 import { DatabaseMetadata, EnumCollection, PostgresDialect, MysqlDialect, Serializer, Transformer, } from "kysely-codegen";
 import { Context } from "../../../context/context.js";
 import { useBus } from "../../../bus.js";
 import { useProject } from "../../../project.js";
 import { Logger } from "../../../logger.js";
-import { useAWSCredentials, } from "../../../credentials.js";
+import { useAWSClient, useAWSCredentials, } from "../../../credentials.js";
 export const useKyselyTypeGenerator = Context.memo(async () => {
     let databases = [];
     const bus = useBus();
@@ -24,10 +24,7 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
                     secretArn: db.secretArn,
                     resourceArn: db.clusterArn,
                     database: db.defaultDatabaseName,
-                    client: new RDSDataService({
-                        region: project.config.region,
-                        credentials,
-                    }),
+                    client: useAWSClient(RDSData),
                 },
             }),
         });

package/constructs/Api.d.ts

@@ -15,7 +15,7 @@ import * as apigV2Cors from "./util/apiGatewayV2Cors.js";
 import * as apigV2Domain from "./util/apiGatewayV2Domain.js";
 import * as apigV2AccessLog from "./util/apiGatewayV2AccessLog.js";
 declare const PayloadFormatVersions: readonly ["1.0", "2.0"];
-export type ApiPayloadFormatVersion = (typeof PayloadFormatVersions)[number];
+export type ApiPayloadFormatVersion = typeof PayloadFormatVersions[number];
 export type ApiAuthorizer = ApiUserPoolAuthorizer | ApiJwtAuthorizer | ApiLambdaAuthorizer;
 interface ApiBaseAuthorizer {
     /**

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.2",
+  "version": "2.1.4",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -76,9 +76,9 @@
     "immer": "9",
     "ink": "^3.2.0",
     "ink-spinner": "^4.0.3",
-    "kysely": "^0.23.3",
+    "kysely": "^0.23.4",
     "kysely-codegen": "^0.9.0",
-    "kysely-data-api": "^0.1.4",
+    "kysely-data-api": "^0.2.0",
     "minimatch": "^6.1.6",
     "openid-client": "^5.1.8",
     "ora": "^6.1.2",

package/sst.mjs

@@ -6213,7 +6213,7 @@ __export(kysely_exports, {
 });
 import { Kysely } from "kysely";
 import { DataApiDialect } from "kysely-data-api";
-import RDSDataService from "aws-sdk/clients/rdsdataservice.js";
+import { RDSData } from "@aws-sdk/client-rds-data";
 import * as fs17 from "fs/promises";
 import {
   DatabaseMetadata,
@@ -6248,10 +6248,7 @@ var init_kysely = __esm({
               secretArn: db.secretArn,
               resourceArn: db.clusterArn,
               database: db.defaultDatabaseName,
-              client: new RDSDataService({
-                region: project.config.region,
-                credentials
-              })
+              client: useAWSClient(RDSData)
             }
           })
         });