sst 2.45.0 → 2.45.1

package/cli/commands/deploy.js

@@ -9,7 +9,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
 })
     .positional("filter", {
     type: "string",
-    describe: "Optionally filter stacks to deploy",
+    describe: "Optionally filter stacks to deploy using a regex pattern",
 }), async (args) => {
     const React = await import("react");
     const { printDeploymentResults } = await import("../ui/deploy.js");
@@ -59,12 +59,12 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
         Colors.line(`   ${Colors.bold("Region:")}  ${project.config.region}`);
         Colors.line(`   ${Colors.bold("Account:")} ${identity.Account}`);
         Colors.gap();
-        const isActiveStack = (stackId) => !args.filter ||
-            stackId
+        const filter = !!args.filter && new RegExp(args.filter, "i");
+        const isActiveStack = (stackId) => !filter ||
+            filter.test(stackId
                 .toLowerCase()
                 .replace(project.config.name.toLowerCase(), "")
-                .replace(project.config.stage.toLowerCase(), "")
-                .includes(args.filter.toLowerCase());
+                .replace(project.config.stage.toLowerCase(), ""));
         // Generate cloud assembly
         // - if --from is specified, we will use the existing cloud assembly
         // - if --from is not specified, we will call synth to generate

package/cli/commands/remove.js

@@ -1,6 +1,6 @@
 export const remove = (program) => program.command("remove [filter]", "Remove your app from AWS", (yargs) => yargs.option("from", { type: "string" }).positional("filter", {
     type: "string",
-    describe: "Optionally filter stacks to remove",
+    describe: "Optionally filter stacks to remove using a regex pattern",
 }), async (args) => {
     const React = await import("react");
     const { dim, blue, bold } = await import("colorette");
@@ -33,12 +33,12 @@ export const remove = (program) => program.command("remove [filter]", "Remove yo
                 mode: "remove",
             });
         })();
-        const target = assembly.stacks.filter((s) => !args.filter ||
-            s.id
+        const filter = !!args.filter && new RegExp(args.filter, "i");
+        const target = assembly.stacks.filter((s) => !filter ||
+            filter.test(s.id
                 .toLowerCase()
                 .replace(project.config.name.toLowerCase(), "")
-                .replace(project.config.stage.toLowerCase(), "")
-                .includes(args.filter.toLowerCase()));
+                .replace(project.config.stage.toLowerCase(), "")));
         if (!target.length) {
             console.log(`No stacks found matching ${blue(args.filter)}`);
             throw new SilentError(`No stacks found matching ${args.filter}`);

package/constructs/NextjsSite.js

@@ -9,12 +9,13 @@ import { Queue } from "aws-cdk-lib/aws-sqs";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { Stack } from "./Stack.js";
 import { SsrSite, } from "./SsrSite.js";
+import { compareSemver } from "./util/compareSemver.js";
 import { toCdkSize } from "./util/size.js";
 import { PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { VisibleError } from "../error.js";
 import { Logger } from "../logger.js";
-const DEFAULT_OPEN_NEXT_VERSION = "3.0.2";
+const DEFAULT_OPEN_NEXT_VERSION = "3.2.2";
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.
  * @example
@@ -35,11 +36,14 @@ export class NextjsSite extends SsrSite {
     prerenderManifest;
     openNextOutput;
     constructor(scope, id, props = {}) {
+        const openNextVersion = props.openNextVersion ?? DEFAULT_OPEN_NEXT_VERSION;
         super(scope, id, {
             buildCommand: [
                 "npx",
                 "--yes",
-                `open-next@${props?.openNextVersion ?? DEFAULT_OPEN_NEXT_VERSION}`,
+                `${compareSemver(openNextVersion, "3.1.3") <= 0
+                    ? "open-next"
+                    : "@opennextjs/aws"}@${openNextVersion}`,
                 "build",
             ].join(" "),
             ...props,

package/constructs/util/compareSemver.d.ts

@@ -0,0 +1 @@
+export declare function compareSemver(v1: string, v2: string): number;

package/constructs/util/compareSemver.js

@@ -0,0 +1,17 @@
+export function compareSemver(v1, v2) {
+    if (v1 === "latest")
+        return 1;
+    if (/^[^\d]/.test(v1)) {
+        v1 = v1.substring(1);
+    }
+    if (/^[^\d]/.test(v2)) {
+        v2 = v2.substring(1);
+    }
+    const [major1, minor1, patch1] = v1.split(".").map(Number);
+    const [major2, minor2, patch2] = v2.split(".").map(Number);
+    if (major1 !== major2)
+        return major1 - major2;
+    if (minor1 !== minor2)
+        return minor1 - minor2;
+    return patch1 - patch2;
+}

package/package.json

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