sst 2.5.4 → 2.5.6

package/constructs/Script.d.ts

@@ -8,7 +8,7 @@ export interface ScriptProps {
      *
      * @example
      * ```js
-     * import { Script } from "@serverless-stack/resources";
+     * import { Script } from "sst/constructs";
      *
      * new Script(stack, "Script", {
      *   onCreate: "src/script.create",
@@ -76,7 +76,7 @@ export interface ScriptProps {
  * @example
  *
  * ```js
- * import { Script } from "@serverless-stack/resources";
+ * import { Script } from "sst/constructs";
  *
  * new Script(stack, "Script", {
  *   onCreate: "src/function.create",

package/constructs/Script.js

@@ -14,7 +14,7 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
  * @example
  *
  * ```js
- * import { Script } from "@serverless-stack/resources";
+ * import { Script } from "sst/constructs";
  *
  * new Script(stack, "Script", {
  *   onCreate: "src/function.create",

package/constructs/Secret.d.ts

@@ -8,7 +8,7 @@ import { FunctionBindingProps } from "./util/functionBinding.js";
  * ### Using the minimal config
  *
  * ```js
- * import { Config } from "@serverless-stack/resources";
+ * import { Config } from "sst/constructs";
  *
  * new Config.Secret(stack, "STRIPE_KEY");
  * ```

package/constructs/Secret.js

@@ -8,7 +8,7 @@ import { getParameterPath, getParameterFallbackPath, } from "./util/functionBind
  * ### Using the minimal config
  *
  * ```js
- * import { Config } from "@serverless-stack/resources";
+ * import { Config } from "sst/constructs";
  *
  * new Config.Secret(stack, "STRIPE_KEY");
  * ```

package/constructs/SsrSite.js

@@ -165,10 +165,11 @@ export class SsrSite extends Construct {
      * ```
      */
     attachPermissions(permissions) {
+        this.serverLambdaForDev?.attachPermissions(permissions);
+        this.serverLambdaForEdge?.attachPermissions(permissions);
         if (this.serverLambdaForRegional) {
             attachPermissionsToRole(this.serverLambdaForRegional.role, permissions);
         }
-        this.serverLambdaForEdge?.attachPermissions(permissions);
     }
     /** @internal */
     getConstructMetadata() {
@@ -432,6 +433,9 @@ export class SsrSite extends Construct {
             environment,
             permissions,
             role,
+            // Force enable live dev to prevent the function handler to be built
+            // in the case user set "enableLiveDev: false" on the app or stack.
+            enableLiveDev: true,
         });
         fn._doNotAllowOthersToBind = true;
         return fn;

package/constructs/Stack.d.ts

@@ -11,7 +11,7 @@ export type StackProps = cdk.StackProps;
  * @example
  *
  * ```js
- * import { StackContext } from "@serverless-stack/resources";
+ * import { StackContext } from "sst/constructs";
  *
  * export function MyStack({ stack }: StackContext) {
  *   // Define your stack

package/constructs/Stack.js

@@ -13,7 +13,7 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
  * @example
  *
  * ```js
- * import { StackContext } from "@serverless-stack/resources";
+ * import { StackContext } from "sst/constructs";
  *
  * export function MyStack({ stack }: StackContext) {
  *   // Define your stack

package/constructs/StaticSite.d.ts

@@ -273,7 +273,7 @@ export interface StaticSiteCdkDistributionProps extends BaseSiteCdkDistributionP
  * Deploys a plain HTML website in the `path/to/src` directory.
  *
  * ```js
- * import { StaticSite } from "@serverless-stack/resources";
+ * import { StaticSite } from "sst/constructs";
  *
  * new StaticSite(stack, "Site", {
  *   path: "path/to/src",

package/constructs/StaticSite.js

@@ -34,7 +34,7 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
  * Deploys a plain HTML website in the `path/to/src` directory.
  *
  * ```js
- * import { StaticSite } from "@serverless-stack/resources";
+ * import { StaticSite } from "sst/constructs";
  *
  * new StaticSite(stack, "Site", {
  *   path: "path/to/src",

package/constructs/Table.d.ts

@@ -259,7 +259,7 @@ export interface TableProps {
  * Deploys a plain HTML website in the `path/to/src` directory.
  *
  * ```js
- * import { Table } from "@serverless-stack/resources";
+ * import { Table } from "sst/constructs";
  *
  * new Table(stack, "Notes", {
  *   fields: {

package/constructs/Table.js

@@ -15,7 +15,7 @@ import { Function as Fn, } from "./Function.js";
  * Deploys a plain HTML website in the `path/to/src` directory.
  *
  * ```js
- * import { Table } from "@serverless-stack/resources";
+ * import { Table } from "sst/constructs";
  *
  * new Table(stack, "Notes", {
  *   fields: {

package/constructs/Topic.d.ts

@@ -117,7 +117,7 @@ export interface TopicProps {
  * @example
  *
  * ```js
- * import { Topic } from "@serverless-stack/resources";
+ * import { Topic } from "sst/constructs";
  *
  * new Topic(stack, "Topic", {
  *   subscribers: {

package/constructs/Topic.js

@@ -13,7 +13,7 @@ import { Queue } from "./Queue.js";
  * @example
  *
  * ```js
- * import { Topic } from "@serverless-stack/resources";
+ * import { Topic } from "sst/constructs";
  *
  * new Topic(stack, "Topic", {
  *   subscribers: {

package/constructs/WebSocketApi.d.ts

@@ -202,7 +202,7 @@ export interface WebSocketApiCdkStageProps extends Omit<apig.WebSocketStageProps
  *
  * @example
  * ```js
- * import { WebSocketApi } from "@serverless-stack/resources";
+ * import { WebSocketApi } from "sst/constructs";
  *
  * new WebSocketApi(stack, "Api", {
  *   routes: {

package/constructs/WebSocketApi.js

@@ -18,7 +18,7 @@ import * as apigV2AccessLog from "./util/apiGatewayV2AccessLog.js";
  *
  * @example
  * ```js
- * import { WebSocketApi } from "@serverless-stack/resources";
+ * import { WebSocketApi } from "sst/constructs";
  *
  * new WebSocketApi(stack, "Api", {
  *   routes: {

package/constructs/future/Auth.d.ts

@@ -55,7 +55,7 @@ export interface ApiAttachmentProps {
  * SST Auth is a lightweight authentication solution for your applications. With a simple set of configuration you can deploy a function attached to your API that can handle various authentication flows.  *
  * @example
  * ```
- * import { Auth } from "@serverless-stack/resources"
+ * import { Auth } from "sst/constructs"
  *
  * new Auth(stack, "auth", {
  *   authenticator: "functions/authenticator.handler"

package/constructs/future/Auth.js

@@ -9,7 +9,7 @@ import { CustomResource } from "aws-cdk-lib";
  * SST Auth is a lightweight authentication solution for your applications. With a simple set of configuration you can deploy a function attached to your API that can handle various authentication flows.  *
  * @example
  * ```
- * import { Auth } from "@serverless-stack/resources"
+ * import { Auth } from "sst/constructs"
  *
  * new Auth(stack, "auth", {
  *   authenticator: "functions/authenticator.handler"

package/package.json

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

package/project.d.ts

@@ -33,6 +33,7 @@ interface Project {
     }>;
     version: string;
     cdkVersion: string;
+    constructsVersion: string;
     paths: {
         root: string;
         config: string;
@@ -55,4 +56,10 @@ interface GlobalOptions {
     region?: string;
 }
 export declare function initProject(globals: GlobalOptions): Promise<void>;
+declare function sanitizeStageName(stage: string): string;
+declare function isValidStageName(stage: string): boolean;
+export declare const exportedForTesting: {
+    sanitizeStageName: typeof sanitizeStageName;
+    isValidStageName: typeof isValidStageName;
+};
 export {};

package/project.js

@@ -47,12 +47,16 @@ export async function initProject(globals) {
         config.stage ||
         (await usePersonalStage(out)) ||
         (await promptPersonalStage(out));
-    const [version, cdkVersion] = await (async () => {
+    const [version, cdkVersion, constructsVersion] = await (async () => {
         try {
             const packageJson = JSON.parse(await fs
                 .readFile(url.fileURLToPath(new URL("./package.json", import.meta.url)))
                 .then((x) => x.toString()));
-            return [packageJson.version, packageJson.dependencies["aws-cdk-lib"]];
+            return [
+                packageJson.version,
+                packageJson.dependencies["aws-cdk-lib"],
+                packageJson.dependencies["constructs"],
+            ];
         }
         catch {
             return ["unknown", "unknown"];
@@ -61,6 +65,7 @@ export async function initProject(globals) {
     const project = {
         version,
         cdkVersion,
+        constructsVersion,
         config: {
             ...config,
             stage,
@@ -112,21 +117,29 @@ async function usePersonalStage(out) {
         return;
     }
 }
-async function promptPersonalStage(out) {
+async function promptPersonalStage(out, isRetry) {
     const readline = await import("readline");
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
     });
-    return new Promise((resolve) => {
-        const suggested = os.userInfo().username;
-        rl.question(`Please enter a name you’d like to use for your personal stage. Or hit enter to use ${blue(suggested)}: `, async (input) => {
+    const stage = await new Promise((resolve) => {
+        const suggested = sanitizeStageName(os.userInfo().username) || "local";
+        const instruction = !isRetry
+            ? `Please enter a name you’d like to use for your personal stage.`
+            : `Please enter a name that starts with a letter, followed by letters, numbers, or hyphens.`;
+        rl.question(`${instruction} Or hit enter to use ${blue(suggested)}: `, async (input) => {
             rl.close();
-            const result = input || suggested;
-            await fs.writeFile(path.join(out, "stage"), result);
+            const result = input === "" ? suggested : input;
             resolve(result);
         });
     });
+    // Validate stage name
+    if (isValidStageName(stage)) {
+        await fs.writeFile(path.join(out, "stage"), stage);
+        return stage;
+    }
+    return await promptPersonalStage(out, true);
 }
 async function findRoot() {
     async function find(dir) {
@@ -143,3 +156,17 @@ async function findRoot() {
     const result = await find(process.cwd());
     return result;
 }
+function sanitizeStageName(stage) {
+    return (stage
+        .replace(/[^A-Za-z0-9-]/g, "-")
+        .replace(/--+/g, "-")
+        .replace(/^[^A-Za-z]/, "")
+        .replace(/-$/, "") || "local");
+}
+function isValidStageName(stage) {
+    return Boolean(stage.match(/^[A-Za-z][A-Za-z0-9-]*$/));
+}
+export const exportedForTesting = {
+    sanitizeStageName,
+    isValidStageName,
+};