sst 2.0.0-rc.4 → 2.0.0-rc.6

package/cdk/deploy-stack.js

@@ -10,7 +10,6 @@ import { contentHash } from "aws-cdk/lib/util/content-hash.js";
 import { CfnEvaluationException } from "aws-cdk/lib/api/evaluate-cloudformation-template.js";
 import { tryHotswapDeployment } from "aws-cdk/lib/api/hotswap-deployments.js";
 import { changeSetHasNoChanges, CloudFormationStack, TemplateParameters, waitForChangeSet, waitForStackDeploy, waitForStackDelete, } from "aws-cdk/lib/api/util/cloudformation.js";
-import { StackActivityMonitor, } from "aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.js";
 import { blue } from "colorette";
 const LARGE_TEMPLATE_SIZE_KB = 50;
 export async function deployStack(options) {
@@ -261,14 +260,19 @@ class FullCloudFormationDeployment {
         }
     }
     async monitorDeployment(startTime, expectedChanges) {
-        const monitor = this.options.quiet
-            ? undefined
-            : StackActivityMonitor.withDefaultPrinter(this.cfn, this.stackName, this.stackArtifact, {
-                resourcesTotal: expectedChanges,
-                progress: this.options.progress,
-                changeSetCreationTime: startTime,
-                ci: this.options.ci,
-            }).start();
+        // const monitor = this.options.quiet
+        //   ? undefined
+        //   : StackActivityMonitor.withDefaultPrinter(
+        //       this.cfn,
+        //       this.stackName,
+        //       this.stackArtifact,
+        //       {
+        //         resourcesTotal: expectedChanges,
+        //         progress: this.options.progress,
+        //         changeSetCreationTime: startTime,
+        //         ci: this.options.ci,
+        //       }
+        //     ).start();
         let finalState = this.cloudFormationStack;
         try {
             const successStack = await waitForStackDeploy(this.cfn, this.stackName);
@@ -279,10 +283,10 @@ class FullCloudFormationDeployment {
             finalState = successStack;
         }
         catch (e) {
-            throw new Error(suffixWithErrors(e.message, monitor?.errors));
+            throw new Error(suffixWithErrors(e.message /*, monitor?.errors*/));
         }
         finally {
-            await monitor?.stop();
+            // await monitor?.stop();
         }
         debug("Stack %s has completed updating", this.stackName);
         return {
@@ -399,11 +403,13 @@ export async function destroyStack(options) {
     if (!currentStack.exists) {
         return;
     }
+    /*
     const monitor = options.quiet
-        ? undefined
-        : StackActivityMonitor.withDefaultPrinter(cfn, deployName, options.stack, {
-            ci: options.ci,
+      ? undefined
+      : StackActivityMonitor.withDefaultPrinter(cfn, deployName, options.stack, {
+          ci: options.ci,
         }).start();
+    */
     try {
         await cfn
             .deleteStack({ StackName: deployName, RoleARN: options.roleArn })
@@ -415,12 +421,14 @@ export async function destroyStack(options) {
         }
     }
     catch (e) {
-        throw new Error(suffixWithErrors(e.message, monitor?.errors));
+        throw new Error(suffixWithErrors(e.message /* , monitor?.errors */));
     }
     finally {
+        /*
         if (monitor) {
-            await monitor.stop();
+          await monitor.stop();
         }
+        */
     }
 }
 /**

package/package.json

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

package/sst.mjs

@@ -1131,7 +1131,7 @@ async function build() {
     format: "esm",
     external: [
       "aws-cdk-lib",
-      "@serverless-stack/*",
+      "sst",
       ...Object.keys({
         ...pkg.devDependencies,
         ...pkg.dependencies,
@@ -1324,9 +1324,6 @@ import {
   waitForStackDeploy,
   waitForStackDelete
 } from "aws-cdk/lib/api/util/cloudformation.js";
-import {
-  StackActivityMonitor
-} from "aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.js";
 import { blue as blue2 } from "colorette";
 async function deployStack(options) {
   const stackArtifact = options.stack;
@@ -1507,9 +1504,6 @@ async function destroyStack(options) {
   if (!currentStack.exists) {
     return;
   }
-  const monitor2 = options.quiet ? void 0 : StackActivityMonitor.withDefaultPrinter(cfn, deployName, options.stack, {
-    ci: options.ci
-  }).start();
   try {
     await cfn.deleteStack({ StackName: deployName, RoleARN: options.roleArn }).promise();
     const destroyedStack = await waitForStackDelete(cfn, deployName);
@@ -1519,11 +1513,8 @@ async function destroyStack(options) {
       );
     }
   } catch (e) {
-    throw new Error(suffixWithErrors(e.message, monitor2?.errors));
+    throw new Error(suffixWithErrors(e.message));
   } finally {
-    if (monitor2) {
-      await monitor2.stop();
-    }
   }
 }
 async function canSkipDeploy(deployStackOptions, cloudFormationStack, parameterChanges) {
@@ -1780,17 +1771,6 @@ var init_deploy_stack = __esm({
         }
       }
       async monitorDeployment(startTime, expectedChanges) {
-        const monitor2 = this.options.quiet ? void 0 : StackActivityMonitor.withDefaultPrinter(
-          this.cfn,
-          this.stackName,
-          this.stackArtifact,
-          {
-            resourcesTotal: expectedChanges,
-            progress: this.options.progress,
-            changeSetCreationTime: startTime,
-            ci: this.options.ci
-          }
-        ).start();
         let finalState = this.cloudFormationStack;
         try {
           const successStack = await waitForStackDeploy(this.cfn, this.stackName);
@@ -1801,9 +1781,8 @@ var init_deploy_stack = __esm({
           }
           finalState = successStack;
         } catch (e) {
-          throw new Error(suffixWithErrors(e.message, monitor2?.errors));
+          throw new Error(suffixWithErrors(e.message));
         } finally {
-          await monitor2?.stop();
         }
         debug("Stack %s has completed updating", this.stackName);
         return {

package/stacks/build.js

@@ -23,7 +23,7 @@ export async function build() {
         format: "esm",
         external: [
             "aws-cdk-lib",
-            "@serverless-stack/*",
+            "sst",
             ...Object.keys({
                 ...pkg.devDependencies,
                 ...pkg.dependencies,