sst 2.1.35 → 2.2.1

package/constructs/Function.js

@@ -100,16 +100,36 @@ export class Function extends CDKFunction {
         const tracing = Tracing[(props.tracing || "active").toUpperCase()];
         const logRetention = props.logRetention &&
             RetentionDays[props.logRetention.toUpperCase()];
-        const isLiveDevEnabled = props.enableLiveDev === false ? false : true;
+        const isLiveDevEnabled = app.mode === "dev" && (props.enableLiveDev === false ? false : true);
         Function.validateHandlerSet(id, props);
         Function.validateVpcSettings(id, props);
+        // Handle inactive stacks
+        if (!stack.isActive) {
+            // Note: need to override runtime as CDK does not support inline code
+            //       for some runtimes.
+            super(scope, id, {
+                ...props,
+                architecture,
+                code: Code.fromInline("export function placeholder() {}"),
+                handler: "index.placeholder",
+                functionName,
+                runtime: CDKRuntime.NODEJS_16_X,
+                memorySize,
+                ephemeralStorageSize: diskSize,
+                timeout,
+                tracing,
+                environment: props.environment,
+                layers: Function.buildLayers(scope, id, props),
+                logRetention,
+            });
+        }
         // Handle local development (ie. sst start)
         // - set runtime to nodejs12.x for non-Node runtimes (b/c the stub is in Node)
         // - set retry to 0. When the debugger is disconnected, the Cron construct
         //   will still try to periodically invoke the Lambda, and the requests would
         //   fail and retry. So when launching `sst start`, a couple of retry requests
         //   from recent failed request will be received. And this behavior is confusing.
-        if (isLiveDevEnabled && app.mode === "dev") {
+        else if (isLiveDevEnabled) {
             // If debugIncreaseTimeout is enabled:
             //   set timeout to 900s. This will give people more time to debug the function
             //   without timing out the request. Note API Gateway requests have a maximum
@@ -147,26 +167,6 @@ export class Function extends CDKFunction {
                 }),
             ]);
         }
-        // Handle remove (ie. sst remove)
-        else if (app.skipBuild) {
-            // Note: need to override runtime as CDK does not support inline code
-            //       for some runtimes.
-            super(scope, id, {
-                ...props,
-                architecture,
-                code: Code.fromInline("export function placeholder() {}"),
-                handler: "index.placeholder",
-                functionName,
-                runtime: CDKRuntime.NODEJS_16_X,
-                memorySize,
-                ephemeralStorageSize: diskSize,
-                timeout,
-                tracing,
-                environment: props.environment,
-                layers: Function.buildLayers(scope, id, props),
-                logRetention,
-            });
-        }
         // Handle build
         else {
             super(scope, id, {
@@ -193,12 +193,22 @@ export class Function extends CDKFunction {
                         ...result.errors,
                     ].join("\n"));
                 }
+                // Update code
+                const cfnFunction = this.node.defaultChild;
                 const code = AssetCode.fromAsset(result.out);
-                // Update function's code
                 const codeConfig = code.bind(this);
-                const cfnFunction = this.node.defaultChild;
-                cfnFunction.runtime =
-                    supportedRuntimes[props.runtime].toString();
+                cfnFunction.code = {
+                    s3Bucket: codeConfig.s3Location?.bucketName,
+                    s3Key: codeConfig.s3Location?.objectKey,
+                    s3ObjectVersion: codeConfig.s3Location?.objectVersion,
+                };
+                cfnFunction.handler = result.handler;
+                code.bindToResource(cfnFunction);
+                // Update runtime
+                // @ts-ignore - override "runtime" private property
+                this.runtime =
+                    supportedRuntimes[props.runtime];
+                cfnFunction.runtime = this.runtime.toString();
                 /*
                 if (isJavaRuntime) {
                   const providedRuntime = (bundle as FunctionBundleJavaProps)
@@ -208,13 +218,6 @@ export class Function extends CDKFunction {
                   }
                 }
                 */
-                cfnFunction.code = {
-                    s3Bucket: codeConfig.s3Location?.bucketName,
-                    s3Key: codeConfig.s3Location?.objectKey,
-                    s3ObjectVersion: codeConfig.s3Location?.objectVersion,
-                };
-                cfnFunction.handler = result.handler;
-                code.bindToResource(cfnFunction);
             });
         }
         this.id = id;

package/constructs/Job.js

@@ -41,6 +41,7 @@ export class Job extends Construct {
     constructor(scope, id, props) {
         super(scope, props.cdk?.id || id);
         const app = this.node.root;
+        const stack = Stack.of(scope);
         this.id = id;
         this.props = props;
         useFunctions().add(this.node.addr, {
@@ -52,10 +53,13 @@ export class Job extends Construct {
             .replace(/\$/g, "-")
             .replace(/\//g, "-")
             .replace(/\./g, "-");
-        const isLiveDevEnabled = app.local && (this.props.enableLiveDev === false ? false : true);
+        const isLiveDevEnabled = app.mode === "dev" && (this.props.enableLiveDev === false ? false : true);
         this.job = this.createCodeBuildProject();
         this.createLogRetention();
-        if (isLiveDevEnabled) {
+        if (!stack.isActive) {
+            this._jobInvoker = this.createCodeBuildInvoker();
+        }
+        else if (isLiveDevEnabled) {
             this._jobInvoker = this.createLocalInvoker();
         }
         else {
@@ -175,9 +179,6 @@ export class Job extends Construct {
     }
     buildCodeBuildProjectCode() {
         const app = this.node.root;
-        // Handle remove (ie. sst remove)
-        if (app.mode === "remove")
-            return;
         useDeferredTasks().add(async () => {
             // Build function
             const bundle = await useRuntimeHandlers().build(this.node.addr, "deploy");

package/constructs/RDS.js

@@ -274,7 +274,7 @@ export class RDS extends Construct {
                 RDS_ENGINE_MODE: engine.includes("postgres") ? "postgres" : "mysql",
                 // for live development, perserve the migrations path so the migrator
                 // can locate the migration files
-                RDS_MIGRATIONS_PATH: app.local ? migrations : migrationsDestination,
+                RDS_MIGRATIONS_PATH: app.mode === "dev" ? migrations : migrationsDestination,
             },
             // Note that we need to generate a relative path of the migrations off the
             // srcPath because sst.Function internally builds the copy "from" path by
@@ -313,17 +313,13 @@ export class RDS extends Construct {
         //       infrastructure. Otherwise, there will always be a change when
         //       rebuilding infrastructure b/c the "BuildAt" property changes on
         //       each build.
-        const hash = app.local ? 0 : this.generateMigrationsHash(migrations);
+        const hash = app.mode === "dev" ? 0 : this.generateMigrationsHash(migrations);
         new cdk.CustomResource(this, "MigrationResource", {
             serviceToken: handler.functionArn,
             resourceType: "Custom::SSTScript",
             properties: {
-                UserCreateFunction: app.local
-                    ? undefined
-                    : this.migratorFunction?.functionName,
-                UserUpdateFunction: app.local
-                    ? undefined
-                    : this.migratorFunction?.functionName,
+                UserCreateFunction: app.mode === "dev" ? undefined : this.migratorFunction?.functionName,
+                UserUpdateFunction: app.mode === "dev" ? undefined : this.migratorFunction?.functionName,
                 UserParams: JSON.stringify({}),
                 MigrationsHash: hash,
             },

package/constructs/Script.js

@@ -133,7 +133,7 @@ export class Script extends Construct {
         //       when rebuilding infrastructure. Otherwise, there will always be
         //       a change when rebuilding infrastructure b/c the "BuildAt" property
         //       changes on each build.
-        const builtAt = app.local ? app.debugStartedAt : Date.now();
+        const builtAt = app.mode === "dev" ? app.debugStartedAt : Date.now();
         new cdk.CustomResource(this, "ScriptResource", {
             serviceToken: crFunction.functionArn,
             resourceType: "Custom::SSTScript",

package/constructs/SsrSite.js

@@ -52,6 +52,7 @@ export class SsrSite extends Construct {
     constructor(scope, id, props) {
         super(scope, props?.cdk?.id || id);
         const app = scope.node.root;
+        const stack = Stack.of(this);
         this.id = id;
         this.props = {
             path: ".",
@@ -61,7 +62,8 @@ export class SsrSite extends Construct {
             memorySize: "1024 MB",
             ...props,
         };
-        this.doNotDeploy = (app.local || app.skipBuild) && !this.props.dev?.deploy;
+        this.doNotDeploy =
+            !stack.isActive || (app.mode === "dev" && !this.props.dev?.deploy);
         this.validateSiteExists();
         this.registerSiteEnvironment();
         if (this.doNotDeploy) {

package/constructs/Stack.d.ts

@@ -28,9 +28,17 @@ export declare class Stack extends cdk.Stack {
      */
     readonly defaultFunctionProps: FunctionProps[];
     /**
+     * Create a custom resource handler per stack. This handler will
+     * be used by all the custom resources in the stack.
      * @internal
      */
     readonly customResourceHandler: lambda.Function;
+    /**
+     * Skip building Function/Site code when stack is not active
+     * ie. `sst remove` and `sst deploy PATTERN` (pattern not matched)
+     * @internal
+     */
+    readonly isActive: boolean;
     constructor(scope: Construct, id: string, props?: StackProps);
     /**
      * The default function props to be applied to all the Lambda functions in the stack.

package/constructs/Stack.js

@@ -30,27 +30,36 @@ export class Stack extends cdk.Stack {
      */
     defaultFunctionProps;
     /**
+     * Create a custom resource handler per stack. This handler will
+     * be used by all the custom resources in the stack.
      * @internal
      */
     customResourceHandler;
+    /**
+     * Skip building Function/Site code when stack is not active
+     * ie. `sst remove` and `sst deploy PATTERN` (pattern not matched)
+     * @internal
+     */
+    isActive;
     constructor(scope, id, props) {
-        const root = scope.node.root;
-        const stackId = root.logicalPrefixedName(id);
+        const app = scope.node.root;
+        const stackId = app.logicalPrefixedName(id);
         Stack.checkForPropsIsConstruct(id, props);
         Stack.checkForEnvInProps(id, props);
         super(scope, stackId, {
             ...props,
             env: {
-                account: root.account,
-                region: root.region,
+                account: app.account,
+                region: app.region,
             },
             synthesizer: props?.synthesizer || Stack.buildSynthesizer(),
         });
-        this.stage = root.stage;
-        this.defaultFunctionProps = root.defaultFunctionProps.map((dfp) => typeof dfp === "function" ? dfp(this) : dfp);
-        // Create a custom resource handler per stack. This handler will
-        // be used by all the custom resources in the stack.
+        this.stage = app.stage;
+        this.defaultFunctionProps = app.defaultFunctionProps.map((dfp) => typeof dfp === "function" ? dfp(this) : dfp);
         this.customResourceHandler = this.createCustomResourceHandler();
+        this.isActive =
+            app.mode !== "remove" &&
+                (!app.isActiveStack || app.isActiveStack?.(this.stackName) === true);
     }
     /**
      * The default function props to be applied to all the Lambda functions in the stack.

package/constructs/StaticSite.js

@@ -53,13 +53,15 @@ export class StaticSite extends Construct {
     constructor(scope, id, props) {
         super(scope, props?.cdk?.id || id);
         const app = scope.node.root;
+        const stack = Stack.of(this);
         this.id = id;
         this.props = {
             path: ".",
             waitForInvalidation: false,
             ...props,
         };
-        this.doNotDeploy = (app.local || app.skipBuild) && !this.props.dev?.deploy;
+        this.doNotDeploy =
+            !stack.isActive || (app.mode === "dev" && !this.props.dev?.deploy);
         this.validateCustomDomainSettings();
         this.registerSiteEnvironment();
         this.generateViteTypes();

package/constructs/deprecated/NextjsSite.js

@@ -117,9 +117,10 @@ export class NextjsSite extends Construct {
         super(scope, props.cdk?.id || id);
         this.id = id;
         const app = scope.node.root;
+        const stack = Stack.of(this);
         // Local development or skip build => stub asset
         this.isPlaceholder =
-            (app.local || app.skipBuild) && !props.disablePlaceholder;
+            !stack.isActive && app.mode === "dev" && !props.disablePlaceholder;
         this.sstBuildDir = useProject().paths.artifacts;
         const fileSizeLimit = app.isRunningSSTTest()
             ? // eslint-disable-next-line @typescript-eslint/ban-ts-comment

package/credentials.d.ts

@@ -3,7 +3,7 @@ import { Client } from "@aws-sdk/smithy-client";
 import { RegionInputConfig } from "@aws-sdk/config-resolver";
 import { RetryInputConfig } from "@aws-sdk/middleware-retry";
 import { AwsAuthInputConfig } from "@aws-sdk/middleware-signing";
-import { SdkProvider } from "aws-cdk/lib/api/aws-auth/sdk-provider.js";
+import { SdkProvider } from "sst-aws-cdk/lib/api/aws-auth/sdk-provider.js";
 type Config = RegionInputConfig & RetryInputConfig & AwsAuthInputConfig & HostHeaderConditionConfig;
 export declare const useAWSCredentialsProvider: () => import("@aws-sdk/types").AwsCredentialIdentityProvider;
 export declare const useAWSCredentials: () => Promise<import("@aws-sdk/types").AwsCredentialIdentity>;

package/credentials.js

@@ -3,7 +3,7 @@ import { Context } from "./context/context.js";
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers";
 import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
 import { Logger } from "./logger.js";
-import { SdkProvider } from "aws-cdk/lib/api/aws-auth/sdk-provider.js";
+import { SdkProvider } from "sst-aws-cdk/lib/api/aws-auth/sdk-provider.js";
 import { StandardRetryStrategy } from "@aws-sdk/middleware-retry";
 export const useAWSCredentialsProvider = Context.memo(() => {
     const project = useProject();

package/node/future/auth/index.d.ts

@@ -6,5 +6,6 @@ export * from "./adapter/google.js";
 export * from "./adapter/link.js";
 export * from "./adapter/github.js";
 export * from "./adapter/oauth.js";
+export type { Adapter } from "./adapter/adapter.js";
 export * from "./session.js";
 export * from "./handler.js";

package/node/future/auth/session.js

@@ -12,14 +12,7 @@ const SessionMemo = /* @__PURE__ */ Context.memo(() => {
     if (cookie)
         token = cookie;
     if (token) {
-        try {
-            const jwt = createVerifier({
-                algorithms: ["RS512"],
-                key: getPublicKey(),
-            })(token);
-            return jwt;
-        }
-        catch { }
+        return Session.verify(token);
     }
     return {
         type: "public",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.1.35",
+  "version": "2.2.1",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -30,11 +30,7 @@
     "@aws-cdk/cloud-assembly-schema": "2.62.2",
     "@aws-cdk/cloudformation-diff": "2.62.2",
     "@aws-cdk/cx-api": "2.62.2",
-    "@aws-cdk/region-info": "2.62.2",
-    "@aws-sdk/client-api-gateway": "^3.208.0",
     "@aws-sdk/client-cloudformation": "^3.279.0",
-    "@aws-sdk/client-cloudfront": "^3.279.0",
-    "@aws-sdk/client-iam": "^3.279.0",
     "@aws-sdk/client-iot": "^3.279.0",
     "@aws-sdk/client-iot-data-plane": "^3.279.0",
     "@aws-sdk/client-lambda": "^3.279.0",
@@ -51,16 +47,12 @@
     "@babel/core": "^7.0.0-0",
     "@babel/generator": "^7.20.5",
     "@trpc/server": "9.16.0",
-    "adm-zip": "^0.5.10",
-    "archiver": "^5.3.1",
-    "aws-cdk": "2.62.2",
     "aws-cdk-lib": "2.62.2",
     "aws-iot-device-sdk": "^2.2.12",
-    "aws-iot-device-sdk-v2": "^1.9.5",
     "aws-sdk": "^2.1326.0",
     "builtin-modules": "3.2.0",
     "cdk-assets": "2.62.2",
-    "chalk": "^4.1.2",
+    "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
     "ci-info": "^3.7.0",
     "colorette": "^2.0.19",
@@ -85,17 +77,20 @@
     "minimatch": "^6.1.6",
     "openid-client": "^5.1.8",
     "ora": "^6.1.2",
-    "promptly": "^3.2.0",
     "react": "17.0.2",
     "remeda": "^1.3.0",
+    "sst-aws-cdk": "2.62.2-3",
     "undici": "^5.12.0",
     "uuid": "^9.0.0",
     "ws": "^8.11.0",
-    "yaml": "1.10.2",
     "yargs": "^17.6.2",
     "zip-local": "^0.3.5"
   },
   "devDependencies": {
+    "adm-zip": "^0.5.10",
+    "@aws-sdk/client-iam": "^3.279.0",
+    "@aws-sdk/client-cloudfront": "^3.279.0",
+    "@aws-sdk/client-api-gateway": "^3.208.0",
     "@aws-sdk/client-codebuild": "^3.279.0",
     "@aws-sdk/types": "^3.272.0",
     "@graphql-tools/merge": "^8.3.16",
@@ -114,6 +109,7 @@
     "@types/uuid": "^8.3.4",
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
+    "archiver": "^5.3.1",
     "tsx": "^3.12.1",
     "typescript": "^4.9.5",
     "vitest": "^0.28.3"

package/runtime/handlers/node.js

@@ -33,7 +33,6 @@ export const useNodeHandler = Context.memo(async () => {
             new Promise(async () => {
                 const worker = new Worker(url.fileURLToPath(new URL("../../support/nodejs-runtime/index.mjs", import.meta.url)), {
                     env: {
-                        ...process.env,
                         ...input.environment,
                         IS_LOCAL: "true",
                     },

package/runtime/server.js

@@ -73,8 +73,10 @@ export const useRuntimeServer = Context.memo(async () => {
             "Lambda-Runtime-Aws-Request-Id": payload.context.awsRequestId,
             "Lambda-Runtime-Deadline-Ms": Date.now() + payload.deadline,
             "Lambda-Runtime-Invoked-Function-Arn": payload.context.invokedFunctionArn,
-            "Lambda-Runtime-Client-Context": JSON.stringify(payload.context.clientContext || {}),
-            "Lambda-Runtime-Cognito-Identity": JSON.stringify(payload.context.identity || {}),
+            "Lambda-Runtime-Client-Context": JSON.stringify(payload.context.clientContext || null),
+            "Lambda-Runtime-Cognito-Identity": JSON.stringify(payload.context.identity || null),
+            "Lambda-Runtime-Log-Group-Name": payload.context.logGroupName,
+            "Lambda-Runtime-Log-Stream-Name": payload.context.logStreamName,
         });
         res.json(payload.event);
     });

package/sst.mjs

@@ -1595,7 +1595,7 @@ __export(credentials_exports, {
 });
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers";
 import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
-import { SdkProvider } from "aws-cdk/lib/api/aws-auth/sdk-provider.js";
+import { SdkProvider } from "sst-aws-cdk/lib/api/aws-auth/sdk-provider.js";
 import { StandardRetryStrategy } from "@aws-sdk/middleware-retry";
 import stupid from "aws-sdk/lib/maintenance_mode_message.js";
 import aws from "aws-sdk";
@@ -2415,11 +2415,13 @@ var init_server2 = __esm({
             "Lambda-Runtime-Deadline-Ms": Date.now() + payload.deadline,
             "Lambda-Runtime-Invoked-Function-Arn": payload.context.invokedFunctionArn,
             "Lambda-Runtime-Client-Context": JSON.stringify(
-              payload.context.clientContext || {}
+              payload.context.clientContext || null
             ),
             "Lambda-Runtime-Cognito-Identity": JSON.stringify(
-              payload.context.identity || {}
-            )
+              payload.context.identity || null
+            ),
+            "Lambda-Runtime-Log-Group-Name": payload.context.logGroupName,
+            "Lambda-Runtime-Log-Stream-Name": payload.context.logStreamName
           });
           res.json(payload.event);
         }
@@ -2917,14 +2919,14 @@ var init_util = __esm({
 import * as cxapi from "@aws-cdk/cx-api";
 import fs8 from "fs/promises";
 import * as uuid from "uuid";
-import { addMetadataAssetsToManifest } from "aws-cdk/lib/assets.js";
-import { debug, error, print } from "aws-cdk/lib/logging.js";
-import { toYAML } from "aws-cdk/lib/serialize.js";
-import { AssetManifestBuilder } from "aws-cdk/lib/util/asset-manifest-builder.js";
-import { publishAssets } from "aws-cdk/lib/util/asset-publishing.js";
-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 { addMetadataAssetsToManifest } from "sst-aws-cdk/lib/assets.js";
+import { debug, error, print } from "sst-aws-cdk/lib/logging.js";
+import { toYAML } from "sst-aws-cdk/lib/serialize.js";
+import { AssetManifestBuilder } from "sst-aws-cdk/lib/util/asset-manifest-builder.js";
+import { publishAssets } from "sst-aws-cdk/lib/util/asset-publishing.js";
+import { contentHash } from "sst-aws-cdk/lib/util/content-hash.js";
+import { CfnEvaluationException } from "sst-aws-cdk/lib/api/evaluate-cloudformation-template.js";
+import { tryHotswapDeployment } from "sst-aws-cdk/lib/api/hotswap-deployments.js";
 import {
   changeSetHasNoChanges,
   CloudFormationStack,
@@ -2932,7 +2934,7 @@ import {
   waitForChangeSet,
   waitForStackDeploy,
   waitForStackDelete
-} from "aws-cdk/lib/api/util/cloudformation.js";
+} from "sst-aws-cdk/lib/api/util/cloudformation.js";
 import { blue as blue2 } from "colorette";
 async function deployStack(options) {
   const stackArtifact = options.stack;
@@ -3441,21 +3443,21 @@ __export(cloudformation_deployments_exports, {
 });
 import * as cxapi2 from "@aws-cdk/cx-api";
 import { AssetManifest } from "cdk-assets";
-import { debug as debug2, warning } from "aws-cdk/lib/logging.js";
+import { debug as debug2, warning } from "sst-aws-cdk/lib/logging.js";
 import {
   buildAssets,
   publishAssets as publishAssets2
-} from "aws-cdk/lib/util/asset-publishing.js";
-import { Mode } from "aws-cdk/lib/api/aws-auth/credentials.js";
+} from "sst-aws-cdk/lib/util/asset-publishing.js";
+import { Mode } from "sst-aws-cdk/lib/api/aws-auth/credentials.js";
 import {
   loadCurrentTemplateWithNestedStacks,
   loadCurrentTemplate
-} from "aws-cdk/lib/api/nested-stack-helpers.js";
-import { ToolkitInfo } from "aws-cdk/lib/api/toolkit-info.js";
+} from "sst-aws-cdk/lib/api/nested-stack-helpers.js";
+import { ToolkitInfo } from "sst-aws-cdk/lib/api/toolkit-info.js";
 import {
   CloudFormationStack as CloudFormationStack2
-} from "aws-cdk/lib/api/util/cloudformation.js";
-import { replaceEnvPlaceholders } from "aws-cdk/lib/api/util/placeholders.js";
+} from "sst-aws-cdk/lib/api/util/cloudformation.js";
+import { replaceEnvPlaceholders } from "sst-aws-cdk/lib/api/util/placeholders.js";
 async function prepareSdkWithLookupRoleFor(sdkProvider, stack) {
   const resolvedEnvironment = await sdkProvider.resolveEnvironment(
     stack.environment
@@ -3764,16 +3766,16 @@ var cloudformation_deployments_wrapper_exports = {};
 __export(cloudformation_deployments_wrapper_exports, {
   publishDeployAssets: () => publishDeployAssets
 });
-import { debug as debug3 } from "aws-cdk/lib/logging.js";
+import { debug as debug3 } from "sst-aws-cdk/lib/logging.js";
 import {
   CloudFormationStack as CloudFormationStack3,
   TemplateParameters as TemplateParameters2,
   waitForStackDelete as waitForStackDelete2
-} from "aws-cdk/lib/api/util/cloudformation.js";
-import { ToolkitInfo as ToolkitInfo2 } from "aws-cdk/lib/api/toolkit-info.js";
-import { addMetadataAssetsToManifest as addMetadataAssetsToManifest2 } from "aws-cdk/lib/assets.js";
-import { publishAssets as publishAssets3 } from "aws-cdk/lib/util/asset-publishing.js";
-import { AssetManifestBuilder as AssetManifestBuilder2 } from "aws-cdk/lib/util/asset-manifest-builder.js";
+} from "sst-aws-cdk/lib/api/util/cloudformation.js";
+import { ToolkitInfo as ToolkitInfo2 } from "sst-aws-cdk/lib/api/toolkit-info.js";
+import { addMetadataAssetsToManifest as addMetadataAssetsToManifest2 } from "sst-aws-cdk/lib/assets.js";
+import { publishAssets as publishAssets3 } from "sst-aws-cdk/lib/util/asset-publishing.js";
+import { AssetManifestBuilder as AssetManifestBuilder2 } from "sst-aws-cdk/lib/util/asset-manifest-builder.js";
 async function publishDeployAssets(sdkProvider, options) {
   const {
     deployment,
@@ -4525,7 +4527,6 @@ var init_node = __esm({
               ),
               {
                 env: {
-                  ...process.env,
                   ...input.environment,
                   IS_LOCAL: "true"
                 },
@@ -5271,7 +5272,7 @@ var init_java = __esm({
 });
 
 // src/stacks/synth.ts
-import * as contextproviders from "aws-cdk/lib/context-providers/index.js";
+import * as contextproviders from "sst-aws-cdk/lib/context-providers/index.js";
 import path15 from "path";
 async function synth(opts) {
   Logger.debug("Synthesizing stacks...");
@@ -5287,7 +5288,7 @@ async function synth(opts) {
   useJavaHandler2();
   useDotnetHandler();
   useRustHandler2();
-  const { Configuration } = await import("aws-cdk/lib/settings.js");
+  const { Configuration } = await import("sst-aws-cdk/lib/settings.js");
   const project = useProject();
   const identity = await useSTSIdentity();
   opts = {
@@ -5306,7 +5307,7 @@ async function synth(opts) {
         region: project.config.region,
         mode: opts.mode,
         debugIncreaseTimeout: opts.increaseTimeout,
-        skipBuild: opts.mode === "remove"
+        isActiveStack: opts.isActiveStack
       },
       {
         outdir: opts.buildDir,
@@ -5611,7 +5612,7 @@ async function bootstrapSST() {
       path16.resolve(__dirname2, "support/bootstrap-metadata-function")
     ),
     handler: "index.handler",
-    runtime: region?.startsWith("us-gov-") ? Runtime2.NODEJS_16_X : Runtime2.NODEJS_18_X,
+    runtime: region?.startsWith("us-gov-") || region?.startsWith("cn-") ? Runtime2.NODEJS_16_X : Runtime2.NODEJS_18_X,
     environment: {
       BUCKET_NAME: bucket.bucketName
     },
@@ -6117,7 +6118,7 @@ var init_deploy2 = __esm({
           evt.LogicalResourceId
         );
         return /* @__PURE__ */ React.createElement(Box, { key: index }, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(Spinner, null), "  ", readable ? `${stackNameToId(evt.StackName)} ${readable} ${evt.ResourceType}` : `${stackNameToId(evt.StackName)} ${evt.ResourceType}`, " "), /* @__PURE__ */ React.createElement(Text, { color: color(evt.ResourceStatus || "") }, evt.ResourceStatus));
-      }), Object.entries(resources).length === 0 && /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(Spinner, null), "  ", /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "Deploying..."))));
+      }), Object.entries(resources).length === 0 && /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(Spinner, null), "  ", /* @__PURE__ */ React.createElement(Text, { dimColor: true }, props.remove ? "Removing..." : "Deploying..."))));
     };
   }
 });
@@ -7273,6 +7274,7 @@ var deploy2 = (program2) => program2.command(
     Colors.line(`   ${Colors.bold("Region:")}  ${project.config.region}`);
     Colors.line(`   ${Colors.bold("Account:")} ${identity.Account}`);
     Colors.gap();
+    const isActiveStack = (stackId) => !args.filter || stackId.toLowerCase().replace(project.config.name.toLowerCase(), "").replace(project.config.stage.toLowerCase(), "").includes(args.filter.toLowerCase());
     const assembly = await async function() {
       if (args.from) {
         const result2 = await loadAssembly2(args.from);
@@ -7283,14 +7285,13 @@ var deploy2 = (program2) => program2.command(
       });
       const result = await Stacks.synth({
         fn: project.stacks,
-        mode: "deploy"
+        mode: "deploy",
+        isActiveStack
       });
       spinner.succeed();
       return result;
     }();
-    const target = assembly.stacks.filter(
-      (s) => !args.filter || s.id.toLowerCase().replace(project.config.name.toLowerCase(), "").replace(project.config.stage.toLowerCase(), "").includes(args.filter.toLowerCase())
-    );
+    const target = assembly.stacks.filter((s) => isActiveStack(s.id));
     if (!target.length) {
       Colors.line(`No stacks found matching ${blue4(args.filter)}`);
       process.exit(1);
@@ -7377,7 +7378,9 @@ var remove2 = (program2) => program2.command(
       console.log(`No stacks found matching ${blue4(args.filter)}`);
       process.exit(1);
     }
-    const component = render(/* @__PURE__ */ React2.createElement(DeploymentUI2, { assembly }));
+    const component = render(
+      /* @__PURE__ */ React2.createElement(DeploymentUI2, { assembly, remove: true })
+    );
     const results = await Stacks.removeMany(target);
     component.clear();
     component.unmount();

package/stacks/synth.d.ts

@@ -2,10 +2,10 @@ import type { App } from "../constructs/App.js";
 interface SynthOptions {
     buildDir?: string;
     outDir?: string;
-    skipBuild?: boolean;
     increaseTimeout?: boolean;
     mode: App["mode"];
     fn: (app: App) => Promise<void> | void;
+    isActiveStack?: (stackName: string) => boolean;
 }
 export declare function synth(opts: SynthOptions): Promise<import("aws-cdk-lib/cx-api").CloudAssembly>;
 export {};