sst 2.35.0 → 2.36.0

package/constructs/NextjsSite.d.ts

@@ -21,10 +21,10 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
      * How the logs are stored in CloudWatch
      * - "combined" - Logs from all routes are stored in the same log group.
      * - "per-route" - Logs from each route are stored in a separate log group.
-     * @default "combined"
+     * @default "per-route"
      * @example
      * ```js
-     * logging: "per-route",
+     * logging: "combined",
      * ```
      */
     logging?: "combined" | "per-route";
@@ -134,7 +134,7 @@ export declare class NextjsSite extends SsrSite {
     private appPathsManifest?;
     private pagesManifest?;
     private prerenderManifest?;
-    constructor(scope: Construct, id: string, props?: NextjsSiteProps);
+    constructor(scope: Construct, id: string, rawProps?: NextjsSiteProps);
     static buildDefaultServerCachePolicyProps(): CachePolicyProps;
     protected plan(bucket: Bucket): {
         cloudFrontFunctions?: {
@@ -205,10 +205,10 @@ export declare class NextjsSite extends SsrSite {
                      * How the logs are stored in CloudWatch
                      * - "combined" - Logs from all routes are stored in the same log group.
                      * - "per-route" - Logs from each route are stored in a separate log group.
-                     * @default "combined"
+                     * @default "per-route"
                      * @example
                      * ```js
-                     * logging: "per-route",
+                     * logging: "combined",
                      * ```
                      */
                     environment?: Record<string, string> | undefined;
@@ -312,10 +312,10 @@ export declare class NextjsSite extends SsrSite {
                      * How the logs are stored in CloudWatch
                      * - "combined" - Logs from all routes are stored in the same log group.
                      * - "per-route" - Logs from each route are stored in a separate log group.
-                     * @default "combined"
+                     * @default "per-route"
                      * @example
                      * ```js
-                     * logging: "per-route",
+                     * logging: "combined",
                      * ```
                      */
                     environment?: Record<string, string> | undefined;

package/constructs/NextjsSite.js

@@ -20,7 +20,7 @@ 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.0";
+const DEFAULT_OPEN_NEXT_VERSION = "2.3.1";
 const DEFAULT_CACHE_POLICY_ALLOWED_HEADERS = [
     "accept",
     "rsc",
@@ -46,21 +46,28 @@ export class NextjsSite extends SsrSite {
     appPathsManifest;
     pagesManifest;
     prerenderManifest;
-    constructor(scope, id, props) {
-        const streaming = props?.experimental?.streaming ?? false;
-        const disableDynamoDBCache = props?.experimental?.disableDynamoDBCache ?? false;
-        const disableIncrementalCache = props?.experimental?.disableIncrementalCache ?? false;
+    constructor(scope, id, rawProps) {
+        const props = {
+            logging: rawProps?.logging ?? "per-route",
+            experimental: {
+                streaming: rawProps?.experimental?.streaming ?? false,
+                disableDynamoDBCache: rawProps?.experimental?.disableDynamoDBCache ?? false,
+                disableIncrementalCache: rawProps?.experimental?.disableIncrementalCache ?? false,
+                ...rawProps?.experimental,
+            },
+            ...rawProps,
+        };
         super(scope, id, {
             buildCommand: [
                 "npx",
                 "--yes",
                 `open-next@${props?.openNextVersion ?? DEFAULT_OPEN_NEXT_VERSION}`,
                 "build",
-                ...(streaming ? ["--streaming"] : []),
-                ...(disableDynamoDBCache
+                ...(props.experimental.streaming ? ["--streaming"] : []),
+                ...(props.experimental.disableDynamoDBCache
                     ? ["--dangerously-disable-dynamodb-cache"]
                     : []),
-                ...(disableIncrementalCache
+                ...(props.experimental.disableIncrementalCache
                     ? ["--dangerously-disable-incremental-cache"]
                     : []),
             ].join(" "),
@@ -70,9 +77,9 @@ export class NextjsSite extends SsrSite {
             this.disableDefaultLogging();
             this.uploadSourcemaps();
         }
-        if (!disableIncrementalCache) {
+        if (!props.experimental.disableIncrementalCache) {
             this.createRevalidationQueue();
-            if (!disableDynamoDBCache) {
+            if (!props.experimental.disableDynamoDBCache) {
                 this.createRevalidationTable();
             }
         }
@@ -564,8 +571,6 @@ export class NextjsSite extends SsrSite {
             this.props.logging === "per-route");
     }
     disableDefaultLogging() {
-        // Note: keep default logs enabled
-        return;
         const stack = Stack.of(this);
         const server = this.serverFunction;
         const policy = new Policy(this, "DisableLoggingPolicy", {

package/constructs/RemixSite.d.ts

@@ -1,4 +1,5 @@
 import { SsrSite, SsrSiteNormalizedProps, SsrSiteProps } from "./SsrSite.js";
+import { Construct } from "constructs";
 export interface RemixSiteProps extends SsrSiteProps {
     /**
      * The server function is deployed to Lambda in a single region. Alternatively, you can enable this option to deploy to Lambda@Edge.
@@ -22,6 +23,7 @@ type RemixSiteNormalizedProps = RemixSiteProps & SsrSiteNormalizedProps;
  */
 export declare class RemixSite extends SsrSite {
     props: RemixSiteNormalizedProps;
+    constructor(scope: Construct, id: string, props?: RemixSiteProps);
     protected plan(): {
         cloudFrontFunctions?: {
             serverCfFunction: {

package/constructs/RemixSite.js

@@ -21,6 +21,9 @@ const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
  * ```
  */
 export class RemixSite extends SsrSite {
+    constructor(scope, id, props) {
+        super(scope, id, props);
+    }
     plan() {
         const { path: sitePath, edge } = this.props;
         const { handler, inject } = this.createServerLambdaBundle(edge ? "edge-server.js" : "regional-server.js");

package/constructs/SolidStartSite.d.ts

@@ -1,4 +1,5 @@
 import { SsrSite, SsrSiteNormalizedProps, SsrSiteProps } from "./SsrSite.js";
+import { Construct } from "constructs";
 export interface SolidStartSiteProps extends SsrSiteProps {
     /**
      * The server function is deployed to Lambda in a single region. Alternatively, you can enable this option to deploy to Lambda@Edge.
@@ -20,6 +21,7 @@ type SolidStartSiteNormalizedProps = SolidStartSiteProps & SsrSiteNormalizedProp
  */
 export declare class SolidStartSite extends SsrSite {
     props: SolidStartSiteNormalizedProps;
+    constructor(scope: Construct, id: string, props?: SolidStartSiteProps);
     protected plan(): {
         cloudFrontFunctions?: {
             serverCfFunction: {

package/constructs/SolidStartSite.js

@@ -13,6 +13,9 @@ import { SsrSite } from "./SsrSite.js";
  * ```
  */
 export class SolidStartSite extends SsrSite {
+    constructor(scope, id, props) {
+        super(scope, id, props);
+    }
     plan() {
         const { path: sitePath, edge } = this.props;
         const serverConfig = {

package/constructs/SsrSite.d.ts

@@ -2,6 +2,7 @@ import { Construct } from "constructs";
 import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
 import { Function as CdkFunction, FunctionProps as CdkFunctionProps } from "aws-cdk-lib/aws-lambda";
 import { ICachePolicy, IResponseHeadersPolicy, ViewerProtocolPolicy, AllowedMethods, CachePolicyProps, ErrorResponse } from "aws-cdk-lib/aws-cloudfront";
+import { S3OriginProps } from "aws-cdk-lib/aws-cloudfront-origins";
 import { Schedule } from "aws-cdk-lib/aws-events";
 import { DistributionDomainProps } from "./Distribution.js";
 import { SSTConstruct } from "./Construct.js";
@@ -329,6 +330,20 @@ export interface SsrSiteProps {
          * create the CDK `Distribution` internally.
          */
         distribution?: SsrCdkDistributionProps;
+        /**
+         * Override the CloudFront S3 origin properties.
+         * @example
+         * ```js
+         * import { OriginAccessIdenty } from "aws-cdk-lib/aws-cloudfront";
+         *
+         * cdk: {
+         *   s3Origin: {
+         *     originAccessIdentity: OriginAccessIdentity.fromOriginAccessIdentityId(stack, "OriginAccessIdentity", "XXXXXXXX" ),
+         *   },
+         * }
+         * ```
+         */
+        s3Origin?: S3OriginProps;
         /**
          * Override the CloudFront cache policy properties for responses from the
          * server rendering Lambda.
@@ -341,12 +356,12 @@ export interface SsrSiteProps {
          *
          * ```js
          * serverCachePolicy: new CachePolicy(this, "ServerCache", {
-         *   queryStringBehavior: CacheQueryStringBehavior.all()
-         *   headerBehavior: CacheHeaderBehavior.none()
-         *   cookieBehavior: CacheCookieBehavior.none()
-         *   defaultTtl: Duration.days(0)
-         *   maxTtl: Duration.days(365)
-         *   minTtl: Duration.days(0)
+         *   queryStringBehavior: CacheQueryStringBehavior.all(),
+         *   headerBehavior: CacheHeaderBehavior.none(),
+         *   cookieBehavior: CacheCookieBehavior.none(),
+         *   defaultTtl: Duration.days(0),
+         *   maxTtl: Duration.days(365),
+         *   minTtl: Duration.days(0),
          * })
          * ```
          */

package/constructs/SsrSite.js

@@ -414,6 +414,7 @@ function handler(event) {
         function createS3Origin(props) {
             const s3Origin = new S3Origin(bucket, {
                 originPath: "/" + (props.originPath ?? ""),
+                ...(cdk?.s3Origin ?? {}),
             });
             const assets = createS3OriginAssets(props.copy);
             const s3deployCR = createS3OriginDeployment(props.copy, assets);

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.35.0",
+  "version": "2.36.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -120,7 +120,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.35.0",
+    "astro-sst": "2.36.0",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",