sst 2.0.0-rc.15 → 2.0.0-rc.17

package/cli/local/server.js

@@ -23,17 +23,12 @@ export async function useLocalServer(opts) {
         functions: {},
     };
     const rest = express();
-    /*
     rest.all(`/ping`, (req, res) => {
-      res.header("Access-Control-Allow-Origin", "*");
-      res.header("Access-Control-Allow-Methods", "GET, PUT, PATCH, POST, DELETE");
-      res.header(
-        "Access-Control-Allow-Headers",
-        req.header("access-control-request-headers")
-      );
-      res.sendStatus(200);
+        res.header("Access-Control-Allow-Origin", "*");
+        res.header("Access-Control-Allow-Methods", "GET, PUT, PATCH, POST, DELETE");
+        res.header("Access-Control-Allow-Headers", req.header("access-control-request-headers"));
+        res.sendStatus(200);
     });
-    */
     rest.all(`/proxy*`, express.raw({
         type: "*/*",
         limit: "1024mb",

package/constructs/NextjsSite.d.ts

@@ -16,7 +16,7 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "edge"> {
  * ```
  */
 export declare class NextjsSite extends SsrSite {
-    constructor(scope: Construct, id: string, props: NextjsSiteProps);
+    constructor(scope: Construct, id: string, props?: NextjsSiteProps);
     protected initBuildConfig(): {
         serverBuildOutputFile: string;
         clientBuildOutputDir: string;

package/constructs/ReactStaticSite.d.ts

@@ -16,5 +16,5 @@ export declare type ReactStaticSiteProps = StaticSiteProps;
  * ```
  */
 export declare class ReactStaticSite extends StaticSite implements SSTConstruct {
-    constructor(scope: Construct, id: string, props: ReactStaticSiteProps);
+    constructor(scope: Construct, id: string, props?: ReactStaticSiteProps);
 }

package/constructs/ReactStaticSite.js

@@ -19,7 +19,8 @@ import { StaticSite } from "./StaticSite.js";
  */
 export class ReactStaticSite extends StaticSite {
     constructor(scope, id, props) {
-        const { path: sitePath, environment } = props || {};
+        const { path: pathRaw, environment } = props || {};
+        const sitePath = pathRaw || ".";
         // Validate environment
         Object.keys(environment || {}).forEach((key) => {
             if (!key.startsWith("REACT_APP_")) {

package/constructs/SsrSite.d.ts

@@ -28,8 +28,9 @@ export interface SsrSiteProps {
     edge?: boolean;
     /**
      * Path to the directory where the app is located.
+     * @default "."
      */
-    path: string;
+    path?: string;
     /**
      * The command for building the website
      * @default `npm run build`
@@ -161,7 +162,9 @@ export declare class SsrSite extends Construct implements SSTConstruct {
          */
         certificate?: acm.ICertificate;
     };
-    protected props: SsrSiteProps;
+    protected props: Omit<SsrSiteProps, "path"> & {
+        path: string;
+    };
     /**
      * Determines if a placeholder site should be deployed instead. We will set
      * this to `true` by default when performing local development, although the
@@ -176,7 +179,7 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     private serverLambdaForEdge?;
     protected serverLambdaForRegional?: lambda.Function;
     private awsCliLayer;
-    constructor(scope: Construct, id: string, props: SsrSiteProps);
+    constructor(scope: Construct, id: string, props?: SsrSiteProps);
     /**
      * The CloudFront URL of the website.
      */

package/constructs/SsrSite.js

@@ -60,13 +60,13 @@ export class SsrSite extends Construct {
     serverLambdaForRegional;
     awsCliLayer;
     constructor(scope, id, props) {
-        super(scope, props.cdk?.id || id);
-        this.id = id;
+        super(scope, props?.cdk?.id || id);
         const app = scope.node.root;
+        this.id = id;
+        this.props = { path: ".", ...props };
         this.isPlaceholder =
-            (app.local || app.skipBuild) && !props.disablePlaceholder;
+            (app.local || app.skipBuild) && !this.props.disablePlaceholder;
         this.sstBuildDir = useProject().paths.artifacts;
-        this.props = props;
         this.cdk = {};
         this.awsCliLayer = new AwsCliLayer(this, "AwsCliLayer");
         this.validateSiteExists();
@@ -79,7 +79,7 @@ export class SsrSite extends Construct {
         // Create Bucket which will be utilised to contain the statics
         this.cdk.bucket = this.createS3Bucket();
         // Create Server functions
-        if (props.edge) {
+        if (this.props.edge) {
             this.serverLambdaForEdge = this.createFunctionForEdge();
             this.createFunctionPermissionsForEdge();
         }
@@ -99,7 +99,7 @@ export class SsrSite extends Construct {
         const s3deployCR = this.createS3Deployment(assets);
         // Create CloudFront
         this.validateCloudFrontDistributionSettings();
-        if (props.edge) {
+        if (this.props.edge) {
             this.cdk.distribution = this.isPlaceholder
                 ? this.createCloudFrontDistributionForStub()
                 : this.createCloudFrontDistributionForEdge();

package/constructs/StaticSite.d.ts

@@ -14,7 +14,7 @@ export interface StaticSiteFileOptions {
 export interface StaticSiteProps {
     /**
      * Path to the directory where the website source is located.
-     *
+     * @default "."
      * @example
      * ```js
      * new StaticSite(stack, "Site", {
@@ -22,7 +22,7 @@ export interface StaticSiteProps {
      * });
      * ```
      */
-    path: string;
+    path?: string;
     /**
      * The name of the index page (e.g. "index.html") of the website.
      * @default "index.html"
@@ -300,7 +300,7 @@ export declare class StaticSite extends Construct implements SSTConstruct {
     private assets;
     private filenamesAsset?;
     private awsCliLayer;
-    constructor(scope: Construct, id: string, props: StaticSiteProps);
+    constructor(scope: Construct, id: string, props?: StaticSiteProps);
     /**
      * The CloudFront URL of the website.
      */

package/constructs/StaticSite.js

@@ -51,19 +51,19 @@ export class StaticSite extends Construct {
     filenamesAsset;
     awsCliLayer;
     constructor(scope, id, props) {
-        super(scope, props.cdk?.id || id);
+        super(scope, props?.cdk?.id || id);
+        const app = scope.node.root;
         this.id = id;
-        const root = scope.node.root;
+        this.props = { path: ".", ...props };
+        this.cdk = {};
         // Local development or skip build => stub asset
         this.isPlaceholder =
-            (root.local || root.skipBuild) && !props.disablePlaceholder;
-        const fileSizeLimit = root.isRunningSSTTest()
+            (app.local || app.skipBuild) && !this.props.disablePlaceholder;
+        const fileSizeLimit = app.isRunningSSTTest()
             ? // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore: "sstTestFileSizeLimitOverride" not exposed in props
-                props.sstTestFileSizeLimitOverride || 200
+                this.props.sstTestFileSizeLimitOverride || 200
             : 200;
-        this.props = props;
-        this.cdk = {};
         this.awsCliLayer = new AwsCliLayer(this, "AwsCliLayer");
         this.registerSiteEnvironment();
         // Validate input
@@ -237,7 +237,7 @@ interface ImportMeta {
             throw new Error(`No build output found at "${siteOutputPath}" for the "${this.node.id}" StaticSite.`);
         }
         // create zip files
-        const script = path.join(__dirname, "../support/base-site-archiver.cjs");
+        const script = path.join(__dirname, "../support/base-site-archiver.mjs");
         const zipPath = path.resolve(path.join(useProject().paths.artifacts, `StaticSite-${this.node.id}-${this.node.addr}`));
         // clear zip path to ensure no partX.zip remain from previous build
         fs.rmSync(zipPath, {

package/constructs/ViteStaticSite.d.ts

@@ -28,5 +28,5 @@ export interface ViteStaticSiteProps extends StaticSiteProps {
  * ```
  */
 export declare class ViteStaticSite extends StaticSite {
-    constructor(scope: Construct, id: string, props: ViteStaticSiteProps);
+    constructor(scope: Construct, id: string, props?: ViteStaticSiteProps);
 }

package/constructs/ViteStaticSite.js

@@ -19,7 +19,8 @@ import { StaticSite } from "./StaticSite.js";
  */
 export class ViteStaticSite extends StaticSite {
     constructor(scope, id, props) {
-        const { path: sitePath, environment, typesPath } = props || {};
+        const { path: pathRaw, environment, typesPath } = props || {};
+        const sitePath = pathRaw || ".";
         // generate buildCommand
         let defaultBuildCommand = "npm run build";
         if (fs.existsSync(path.join(sitePath, "yarn.lock"))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.15",
+  "version": "2.0.0-rc.17",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -20263,6 +20263,15 @@ async function useLocalServer(opts) {
     functions: {}
   };
   const rest = express2();
+  rest.all(`/ping`, (req, res) => {
+    res.header("Access-Control-Allow-Origin", "*");
+    res.header("Access-Control-Allow-Methods", "GET, PUT, PATCH, POST, DELETE");
+    res.header(
+      "Access-Control-Allow-Headers",
+      req.header("access-control-request-headers")
+    );
+    res.sendStatus(200);
+  });
   rest.all(
     `/proxy*`,
     express2.raw({