sst 2.26.2 → 2.26.4

package/constructs/StaticSite.js

@@ -59,6 +59,7 @@ export class StaticSite extends Construct {
         if (this.doNotDeploy) {
             // @ts-ignore
             this.bucket = this.distribution = null;
+            app.registerTypes(this);
             return;
         }
         this.bucket = this.createS3Bucket();
@@ -75,6 +76,7 @@ export class StaticSite extends Construct {
             // Invalidate CloudFront
             this.distribution.createInvalidation(this.generateInvalidationId(assets));
         });
+        app.registerTypes(this);
     }
     /**
      * The CloudFront URL of the website.

package/constructs/SvelteKitSite.d.ts

@@ -1,6 +1,4 @@
 import { SsrSite } from "./SsrSite.js";
-import { SsrFunction } from "./SsrFunction.js";
-import { EdgeFunction } from "./EdgeFunction.js";
 /**
  * The `SvelteKitSite` construct is a higher level CDK construct that makes it easy to create a SvelteKit app.
  * @example
@@ -13,17 +11,87 @@ import { EdgeFunction } from "./EdgeFunction.js";
  * ```
  */
 export declare class SvelteKitSite extends SsrSite {
-    protected initBuildConfig(): {
-        typesPath: string;
-        serverBuildOutputFile: string;
-        serverCFFunctionInjection: string;
-        clientBuildOutputDir: string;
-        clientBuildVersionedSubDir: string;
-        prerenderedBuildOutputDir: string;
+    protected typesPath: string;
+    protected plan(): {
+        cloudFrontFunctions?: {
+            serverCfFunction: {
+                constructId: string;
+                injections: string[];
+            };
+        } | undefined;
+        edgeFunctions?: {
+            edgeServer: {
+                constructId: string;
+                function: {
+                    description: string;
+                    handler: string;
+                    nodejs: {
+                        esbuild: {
+                            minify: boolean;
+                            sourcemap: boolean | "inline";
+                            define: {
+                                "process.env.SST_DEBUG": string;
+                            };
+                        };
+                    };
+                    copyFiles: {
+                        from: string;
+                        to: string;
+                    }[];
+                    scopeOverride: SvelteKitSite;
+                };
+            };
+        } | undefined;
+        origins: {
+            s3: {
+                type: "s3";
+                copy: ({
+                    from: string;
+                    to: string;
+                    cached: true;
+                    versionedSubDir: string;
+                } | {
+                    from: string;
+                    to: string;
+                    cached: false;
+                    versionedSubDir?: undefined;
+                })[];
+            };
+            regionalServer?: {
+                type: "function";
+                constructId: string;
+                function: {
+                    description: string;
+                    handler: string;
+                    nodejs: {
+                        esbuild: {
+                            minify: boolean;
+                            sourcemap: boolean | "inline";
+                            define: {
+                                "process.env.SST_DEBUG": string;
+                            };
+                        };
+                    };
+                    copyFiles: {
+                        from: string;
+                        to: string;
+                    }[];
+                };
+            } | undefined;
+        };
+        behaviors: {
+            cacheType: "server" | "static";
+            pattern?: string | undefined;
+            origin: "s3" | "regionalServer";
+            cfFunction?: "serverCfFunction" | undefined;
+            edgeFunction?: "edgeServer" | undefined;
+        }[];
+        cachePolicyAllowedHeaders?: string[] | undefined;
+        buildId?: string | undefined;
+        warmerConfig?: {
+            function: string;
+        } | undefined;
     };
-    protected createFunctionForRegional(): SsrFunction;
-    protected createFunctionForEdge(): EdgeFunction;
-    protected generateBuildId(): any;
     getConstructMetadata(): {
         data: {
             mode: "placeholder" | "deployed";

package/constructs/SvelteKitSite.js

@@ -1,8 +1,6 @@
 import fs from "fs";
 import path from "path";
 import { SsrSite } from "./SsrSite.js";
-import { SsrFunction } from "./SsrFunction.js";
-import { EdgeFunction } from "./EdgeFunction.js";
 /**
  * The `SvelteKitSite` construct is a higher level CDK construct that makes it easy to create a SvelteKit app.
  * @example
@@ -15,88 +13,116 @@ import { EdgeFunction } from "./EdgeFunction.js";
  * ```
  */
 export class SvelteKitSite extends SsrSite {
-    initBuildConfig() {
-        return {
-            typesPath: "src",
-            serverBuildOutputFile: ".svelte-kit/svelte-kit-sst/server/lambda-handler/index.js",
-            // Note: form action requests contain "/" in request query string
-            //       ie. POST request with query string "?/action"
-            //       CloudFront does not allow query string with "/". It needs to be encoded.
-            serverCFFunctionInjection: `
-        for (var key in request.querystring) {
-          if (key.includes("/")) {
-            request.querystring[encodeURIComponent(key)] = request.querystring[key];
-            delete request.querystring[key];
-          }
-        }
-      `,
-            clientBuildOutputDir: ".svelte-kit/svelte-kit-sst/client",
-            clientBuildVersionedSubDir: "_app",
-            prerenderedBuildOutputDir: ".svelte-kit/svelte-kit-sst/prerendered",
-        };
-    }
-    createFunctionForRegional() {
-        const { runtime, timeout, memorySize, permissions, environment, nodejs, bind, cdk, } = this.props;
-        return new SsrFunction(this, `ServerFunction`, {
+    typesPath = "src";
+    plan() {
+        const { path: sitePath, edge } = this.props;
+        const serverDir = ".svelte-kit/svelte-kit-sst/server";
+        const clientDir = ".svelte-kit/svelte-kit-sst/client";
+        const prerenderedDir = ".svelte-kit/svelte-kit-sst/prerendered";
+        const serverConfig = {
             description: "Server handler for SvelteKit",
-            handler: path.join(this.props.path, ".svelte-kit", "svelte-kit-sst", "server", "lambda-handler", "index.handler"),
-            runtime,
-            memorySize,
-            timeout,
-            bind,
-            environment,
-            permissions,
+            handler: path.join(sitePath, serverDir, "lambda-handler", "index.handler"),
             nodejs: {
-                format: "esm",
-                ...nodejs,
                 esbuild: {
                     minify: process.env.SST_DEBUG ? false : true,
                     sourcemap: process.env.SST_DEBUG ? "inline" : false,
                     define: {
                         "process.env.SST_DEBUG": process.env.SST_DEBUG ? "true" : "false",
                     },
-                    ...nodejs?.esbuild,
                 },
             },
             copyFiles: [
                 {
-                    from: path.join(this.props.path, ".svelte-kit", "svelte-kit-sst", "prerendered"),
+                    from: path.join(sitePath, prerenderedDir),
                     to: "prerendered",
                 },
             ],
-            ...cdk?.server,
-        });
-    }
-    createFunctionForEdge() {
-        const { runtime, timeout, memorySize, bind, permissions, environment, nodejs, } = this.props;
-        return new EdgeFunction(this, `Server`, {
-            scopeOverride: this,
-            handler: path.join(this.props.path, ".svelte-kit", "svelte-kit-sst", "server", "lambda-handler", "index.handler"),
-            runtime,
-            timeout,
-            memorySize,
-            bind,
-            environment,
-            permissions,
-            nodejs: {
-                format: "esm",
-                ...nodejs,
-                esbuild: {
-                    minify: process.env.SST_DEBUG ? false : true,
-                    sourcemap: process.env.SST_DEBUG ? "inline" : false,
-                    define: {
-                        "process.env.SST_DEBUG": process.env.SST_DEBUG ? "true" : "false",
+        };
+        return this.validatePlan({
+            buildId: JSON.parse(fs
+                .readFileSync(path.join(sitePath, clientDir, "_app/version.json"))
+                .toString()).version,
+            cloudFrontFunctions: {
+                serverCfFunction: {
+                    constructId: "CloudFrontFunction",
+                    injections: [
+                        this.useCloudFrontFunctionHostHeaderInjection(),
+                        // Note: form action requests contain "/" in request query string
+                        //       ie. POST request with query string "?/action"
+                        //       CloudFront does not allow query string with "/". It needs to be encoded.
+                        `for (var key in request.querystring) {`,
+                        `  if (key.includes("/")) {`,
+                        `    request.querystring[encodeURIComponent(key)] = request.querystring[key];`,
+                        `    delete request.querystring[key];`,
+                        `  }`,
+                        `}`,
+                    ],
+                },
+            },
+            edgeFunctions: edge
+                ? {
+                    edgeServer: {
+                        constructId: "Server",
+                        function: {
+                            scopeOverride: this,
+                            ...serverConfig,
+                        },
                     },
-                    ...nodejs?.esbuild,
+                }
+                : undefined,
+            origins: {
+                ...(edge
+                    ? {}
+                    : {
+                        regionalServer: {
+                            type: "function",
+                            constructId: "ServerFunction",
+                            function: serverConfig,
+                        },
+                    }),
+                s3: {
+                    type: "s3",
+                    copy: [
+                        {
+                            from: clientDir,
+                            to: "",
+                            cached: true,
+                            versionedSubDir: "_app",
+                        },
+                        {
+                            from: prerenderedDir,
+                            to: "",
+                            cached: false,
+                        },
+                    ],
                 },
             },
+            behaviors: [
+                edge
+                    ? {
+                        cacheType: "server",
+                        cfFunction: "serverCfFunction",
+                        edgeFunction: "edgeServer",
+                        origin: "s3",
+                    }
+                    : {
+                        cacheType: "server",
+                        cfFunction: "serverCfFunction",
+                        origin: "regionalServer",
+                    },
+                // create 1 behaviour for each top level asset file/folder
+                ...fs.readdirSync(path.join(sitePath, clientDir)).map((item) => ({
+                    cacheType: "static",
+                    pattern: fs
+                        .statSync(path.join(sitePath, clientDir, item))
+                        .isDirectory()
+                        ? `${item}/*`
+                        : item,
+                    origin: "s3",
+                })),
+            ],
         });
     }
-    generateBuildId() {
-        const filePath = path.join(this.props.path, ".svelte-kit/svelte-kit-sst/client/_app/version.json");
-        const content = fs.readFileSync(filePath).toString();
-        return JSON.parse(content).version;
-    }
     getConstructMetadata() {
         return {
             type: "SvelteKitSite",

package/constructs/Table.js

@@ -60,6 +60,8 @@ export class Table extends Construct {
         }
         // Create Kinesis Stream
         this.buildKinesisStreamSpec(kinesisStream);
+        const app = this.node.root;
+        app.registerTypes(this);
     }
     /**
      * The ARN of the internally created DynamoDB Table.

package/constructs/Topic.js

@@ -37,6 +37,8 @@ export class Topic extends Construct {
         this.cdk = {};
         this.createTopic();
         this.addSubscribers(this, props?.subscribers || {});
+        const app = this.node.root;
+        app.registerTypes(this);
     }
     /**
      * The ARN of the internally created SNS Topic.

package/constructs/WebSocketApi.js

@@ -57,6 +57,8 @@ export class WebSocketApi extends Construct {
                 resources: [this._connectionsArn],
             }),
         ]);
+        const app = this.node.root;
+        app.registerTypes(this);
     }
     /**
      * Url of the WebSocket API

package/constructs/deprecated/NextjsSite.js

@@ -167,6 +167,7 @@ export class NextjsSite extends Construct {
         invalidationCR.node.addDependency(this.cdk.distribution);
         // Connect Custom Domain to CloudFront Distribution
         this.createRoute53Records();
+        app.registerTypes(this);
     }
     /**
      * The CloudFront URL of the website.

package/constructs/future/Auth.js

@@ -91,6 +91,7 @@ export class Auth extends Construct {
             },
         });
         resource.node.addDependency(policy);
+        app.registerTypes(this);
     }
     get url() {
         return this.api.customDomainUrl || this.api.url;

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.26.2",
+  "version": "2.26.4",
   "bin": {
     "sst": "cli/sst.js"
   },

package/support/remix-site-function/edge-server.js

@@ -7,8 +7,6 @@ import { installGlobals } from "@remix-run/node";
 installGlobals();
 
 import {
-  Headers as NodeHeaders,
-  Request as NodeRequest,
   createRequestHandler as createNodeRequestHandler,
   readableStreamToString,
 } from "@remix-run/node";
@@ -96,7 +94,7 @@ function convertCfRequestToNode(event) {
   );
 
   // Build headers
-  const headers = new NodeHeaders();
+  const headers = new Headers();
   for (const [key, values] of Object.entries(request.headers)) {
     for (const { value } of values) {
       if (value) {
@@ -105,7 +103,7 @@ function convertCfRequestToNode(event) {
     }
   }
 
-  return new NodeRequest(url.toString(), {
+  return new Request(url.toString(), {
     method: request.method,
     headers,
     body: request.body?.data

package/support/remix-site-function/regional-server.js

@@ -7,8 +7,6 @@ import { installGlobals } from "@remix-run/node";
 installGlobals();
 
 import {
-  Headers as NodeHeaders,
-  Request as NodeRequest,
   createRequestHandler as createNodeRequestHandler,
   readableStreamToString,
 } from "@remix-run/node";
@@ -94,14 +92,14 @@ function convertApigRequestToNode(event) {
   );
 
   // Build headers
-  const headers = new NodeHeaders();
+  const headers = new Headers();
   for (let [header, value] of Object.entries(event.headers)) {
     if (value) {
       headers.append(header, value);
     }
   }
 
-  return new NodeRequest(url.href, {
+  return new Request(url.href, {
     method: event.requestContext.http.method,
     headers,
     body: