sst 2.0.1 → 2.0.2

package/bootstrap.js

@@ -55,11 +55,21 @@ async function loadCDKStatus() {
         const { Stacks: stacks } = await client.send(new DescribeStacksCommand({
             StackName: "CDKToolkit",
         }));
-        if (stacks &&
-            stacks.length > 0 &&
-            ["CREATE_COMPLETE", "UPDATE_COMPLETE"].includes(stacks[0].StackStatus)) {
-            return true;
+        // Check CDK bootstrap stack exists
+        if (!stacks || stacks.length === 0)
+            return false;
+        // Check CDK bootstrap stack deployed successfully
+        if (!["CREATE_COMPLETE", "UPDATE_COMPLETE"].includes(stacks[0].StackStatus)) {
+            return false;
         }
+        // Check CDK bootstrap stack is up to date
+        // note: there is no a programmatical way to get the minimal required version
+        //       of CDK bootstrap stack. We are going to hardcode it to 14 for now,
+        //       which is the latest version as of CDK v2.62.2
+        const output = stacks[0].Outputs?.find((o) => o.OutputKey === "BootstrapVersion");
+        if (!output || parseInt(output.OutputValue) < 14)
+            return false;
+        return true;
     }
     catch (e) {
         if (e.name === "ValidationError" &&

package/cli/commands/env.js

@@ -10,6 +10,8 @@ export const env = (program) => program.command("env <command>", "Load environme
     const fs = await import("fs/promises");
     const { SiteEnv } = await import("../../site-env.js");
     const { spawnSync } = await import("child_process");
+    const { useAWSCredentials } = await import("../../credentials.js");
+    const { useProject } = await import("../../project.js");
     let spinner;
     while (true) {
         const exists = await fs
@@ -24,10 +26,16 @@ export const env = (program) => program.command("env <command>", "Load environme
         spinner?.succeed();
         const sites = await SiteEnv.values();
         const env = sites[process.cwd()] || {};
+        const project = useProject();
+        const credentials = await useAWSCredentials();
         const result = spawnSync(args.command, {
             env: {
                 ...process.env,
                 ...env,
+                AWS_ACCESS_KEY_ID: credentials.accessKeyId,
+                AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,
+                AWS_SESSION_TOKEN: credentials.sessionToken,
+                AWS_REGION: project.config.region,
             },
             stdio: "inherit",
             shell: process.env.SHELL || true,

package/constructs/ApiGatewayV1Api.js

@@ -569,7 +569,7 @@ export class ApiGatewayV1Api extends Construct {
                     if (!value.userPoolIds) {
                         throw new Error(`Missing "userPoolIds" for "${key}" authorizer`);
                     }
-                    const userPools = value.userPoolIds.map((userPoolId) => cognito.UserPool.fromUserPoolId(this, `${key}-ImportedUserPool`, userPoolId));
+                    const userPools = value.userPoolIds.map((userPoolId) => cognito.UserPool.fromUserPoolId(this, `${key}-${userPoolId}-ImportedUserPool`, userPoolId));
                     this.authorizersData[key] = new apig.CognitoUserPoolsAuthorizer(this, key, {
                         cognitoUserPools: userPools,
                         authorizerName: value.name,

package/constructs/AstroSite.js

@@ -36,14 +36,14 @@ export class AstroSite extends SsrSite {
         super.validateBuildOutput();
     }
     createFunctionForRegional() {
-        const { memorySize, timeout, environment, bind, cdk } = this.props;
+        const { runtime, memorySize, timeout, environment, bind, cdk } = this.props;
         // Create function
         const fn = new Function(this, `ServerFunction`, {
             description: "Server handler",
             handler: path.join(this.props.path, "dist", "server", "entry.handler"),
             bind,
             logRetention: "three_days",
-            runtime: "nodejs16.x",
+            runtime,
             memorySize,
             timeout,
             nodejs: {
@@ -57,7 +57,7 @@ export class AstroSite extends SsrSite {
         return fn;
     }
     createFunctionForEdge() {
-        const { timeout, memorySize, permissions, environment } = this.props;
+        const { runtime, timeout, memorySize, permissions, environment } = this.props;
         // Create a directory that we will use to create the bundled version
         // of the "core server build" along with our custom Lamba server handler.
         const outputPath = path.resolve(path.join(useProject().paths.artifacts, `AstroSiteFunction-${this.node.id}-${this.node.addr}`));
@@ -91,6 +91,7 @@ export class AstroSite extends SsrSite {
             scopeOverride: this,
             bundlePath: outputPath,
             handler: "entry.handler",
+            runtime,
             timeout,
             memorySize,
             permissions,

package/constructs/EdgeFunction.d.ts

@@ -7,6 +7,7 @@ import { Permissions } from "./util/permission.js";
 export interface EdgeFunctionProps {
     bundlePath: string;
     handler: string;
+    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
     timeout: number | Duration;
     memorySize: number | Size;
     permissions?: Permissions;

package/constructs/EdgeFunction.js

@@ -108,7 +108,7 @@ ${exports}
         return role;
     }
     createFunction(asset) {
-        const { timeout, memorySize } = this.props;
+        const { runtime, timeout, memorySize } = this.props;
         const name = this.node.id;
         // Create a S3 bucket in us-east-1 to store Lambda code. Create
         // 1 bucket for all Edge functions.
@@ -122,7 +122,11 @@ ${exports}
                 S3Bucket: asset.s3BucketName,
                 S3Key: asset.s3ObjectKey,
             },
-            Runtime: lambda.Runtime.NODEJS_18_X.name,
+            Runtime: runtime === "nodejs14.x"
+                ? lambda.Runtime.NODEJS_14_X.name
+                : runtime === "nodejs16.x"
+                    ? lambda.Runtime.NODEJS_16_X.name
+                    : lambda.Runtime.NODEJS_18_X.name,
             MemorySize: typeof memorySize === "string"
                 ? toCdkSize(memorySize).toMebibytes()
                 : memorySize,

package/constructs/Function.d.ts

@@ -59,7 +59,7 @@ export interface FunctionProps extends Omit<lambda.FunctionOptions, "functionNam
      * })
      *```
      */
-    copyFiles?: FunctionBundleCopyFilesProps[];
+    copyFiles?: FunctionCopyFilesProps[];
     /**
      * Used to configure nodejs function properties
      */
@@ -112,15 +112,13 @@ export interface FunctionProps extends Omit<lambda.FunctionOptions, "functionNam
      */
     handler?: string;
     /**
-     * Root directory of the project, typically where package.json is located. Set if using a monorepo with multiple subpackages
-     *
-     * @default Defaults to the same directory as sst.json
-     *
+     * The runtime environment for the function.
+     * @default "nodejs16.x"
      * @example
      * ```js
      * new Function(stack, "Function", {
-     *   srcPath: "packages/backend",
      *   handler: "function.handler",
+     *   runtime: "nodejs18.x",
      * })
      *```
      */
@@ -348,7 +346,7 @@ export interface NodeJSProps {
      * @example
      * ```js
      * new Function(stack, "Function", {
-     *   bundle: {
+     *   nodejs: {
      *     loader: {
      *      ".png": "file"
      *     }
@@ -363,7 +361,7 @@ export interface NodeJSProps {
      * @example
      * ```js
      * new Function(stack, "Function", {
-     *   bundle: {
+     *   nodejs: {
      *     nodeModules: ["pg"]
      *   }
      * })
@@ -376,7 +374,7 @@ export interface NodeJSProps {
      * @example
      * ```js
      * new Function(stack, "Function", {
-     *   bundle: {
+     *   nodejs: {
      *     banner: "console.log('Function starting')"
      *   }
      * })
@@ -395,7 +393,7 @@ export interface NodeJSProps {
      * @example
      * ```js
      * new Function(stack, "Function", {
-     *   bundle: {
+     *   nodejs: {
      *     minify: false
      *   }
      * })
@@ -403,14 +401,14 @@ export interface NodeJSProps {
      */
     minify?: boolean;
     /**
-     * Configure bundle format
+     * Configure format
      *
      * @default "cjs"
      *
      * @example
      * ```js
      * new Function(stack, "Function", {
-     *   bundle: {
+     *   nodejs: {
      *     format: "esm"
      *   }
      * })
@@ -425,8 +423,8 @@ export interface NodeJSProps {
      * @example
      * ```js
      * new Function(stack, "Function", {
-     *   bundle: {
-     *   sourcemap: true
+     *   nodejs: {
+     *     sourcemap: true
      *   }
      * })
      * ```
@@ -445,7 +443,7 @@ export interface JavaProps {
      * @example
      * ```js
      * new Function(stack, "Function", {
-     *   bundle: {
+     *   java: {
      *     buildTask: "bundle"
      *   }
      * })
@@ -460,7 +458,7 @@ export interface JavaProps {
      * @example
      * ```js
      * new Function(stack, "Function", {
-     *   bundle: {
+     *   java: {
      *     buildOutputDir: "output"
      *   }
      * })
@@ -475,7 +473,7 @@ export interface JavaProps {
      * @example
      * ```js
      * new Function(stack, "Function", {
-     *   bundle: {
+     *   java: {
      *     experimentalUseProvidedRuntime: "provided.al2"
      *   }
      * })
@@ -483,47 +481,17 @@ export interface JavaProps {
      */
     experimentalUseProvidedRuntime?: "provided" | "provided.al2";
 }
-export type FunctionBundleProp = FunctionBundlePythonProps | boolean;
-interface FunctionBundleBase {
-}
-/**
- * Used to configure Python bundling options
- */
-export interface FunctionBundlePythonProps extends FunctionBundleBase {
-    /**
-     * A list of commands to override the [default installing behavior](Function#bundle) for Python dependencies.
-     *
-     * Each string in the array is a command that'll be run. For example:
-     *
-     * @default "[]"
-     *
-     * @example
-     * ```js
-     * new Function(stack, "Function", {
-     *   bundle: {
-     *     installCommands: [
-     *       'export VARNAME="my value"',
-     *       'pip install --index-url https://domain.com/pypi/myprivatemodule/simple/ --extra-index-url https://pypi.org/simple -r requirements.txt .',
-     *     ]
-     *   }
-     * })
-     * ```
-     */
-    installCommands?: string[];
-}
 /**
  * Used to configure additional files to copy into the function bundle
  *
  * @example
  * ```js
  * new Function(stack, "Function", {
- *   bundle: {
- *     copyFiles: [{ from: "src/index.js" }]
- *   }
+ *   copyFiles: [{ from: "src/index.js" }]
  * })
  *```
  */
-export interface FunctionBundleCopyFilesProps {
+interface FunctionCopyFilesProps {
     /**
      * Source path relative to sst.json
      */
@@ -603,7 +571,6 @@ export declare class Function extends lambda.Function implements SSTConstruct {
     static normalizeMemorySize(memorySize?: number | Size): number;
     static normalizeDiskSize(diskSize?: number | Size): cdk.Size;
     static normalizeTimeout(timeout?: number | Duration): cdk.Duration;
-    static normalizeSrcPath(srcPath: string): string;
     static handleImportedLayer(scope: Construct, layer: lambda.ILayerVersion): lambda.ILayerVersion;
     static isInlineDefinition(definition: any): definition is FunctionInlineDefinition;
     static fromDefinition(scope: Construct, id: string, definition: FunctionDefinition, inheritedProps?: FunctionProps, inheritErrorMessage?: string): Function;

package/constructs/Function.js

@@ -366,9 +366,6 @@ export class Function extends lambda.Function {
         }
         return cdk.Duration.seconds(timeout || 10);
     }
-    static normalizeSrcPath(srcPath) {
-        return srcPath.replace(/\/+$/, "");
-    }
     static handleImportedLayer(scope, layer) {
         const layerStack = Stack.of(layer);
         const currentStack = Stack.of(scope);

package/constructs/NextjsSite.js

@@ -37,11 +37,12 @@ export class NextjsSite extends SsrSite {
         };
     }
     createFunctionForRegional() {
-        const { timeout, memorySize, permissions, environment, cdk } = this.props;
+        const { runtime, timeout, memorySize, permissions, environment, cdk } = this.props;
         const ssrFn = new SsrFunction(this, `ServerFunction`, {
             description: "Server handler for Next.js",
             bundlePath: path.join(this.props.path, ".open-next", "server-function"),
             handler: "index.handler",
+            runtime,
             timeout,
             memorySize,
             permissions,

package/constructs/RemixSite.js

@@ -112,7 +112,7 @@ export class RemixSite extends SsrSite {
         return outputPath;
     }
     createFunctionForRegional() {
-        const { timeout, memorySize, environment, cdk } = this.props;
+        const { runtime, timeout, memorySize, environment, cdk } = this.props;
         const bundlePath = this.createServerLambdaBundle("regional-server.js");
         return new lambda.Function(this, `ServerFunction`, {
             description: "Server handler for Remix",
@@ -122,7 +122,11 @@ export class RemixSite extends SsrSite {
             },
             logRetention: logs.RetentionDays.THREE_DAYS,
             code: lambda.Code.fromAsset(bundlePath),
-            runtime: lambda.Runtime.NODEJS_16_X,
+            runtime: runtime === "nodejs14.x"
+                ? lambda.Runtime.NODEJS_14_X
+                : runtime === "nodejs16.x"
+                    ? lambda.Runtime.NODEJS_16_X
+                    : lambda.Runtime.NODEJS_18_X,
             memorySize: typeof memorySize === "string"
                 ? toCdkSize(memorySize).toMebibytes()
                 : memorySize,
@@ -134,13 +138,14 @@ export class RemixSite extends SsrSite {
         });
     }
     createFunctionForEdge() {
-        const { timeout, memorySize, permissions, environment } = this.props;
+        const { runtime, timeout, memorySize, permissions, environment } = this.props;
         const bundlePath = this.createServerLambdaBundle("edge-server.js");
         return new EdgeFunction(this, `Server`, {
             scopeOverride: this,
             format: "cjs",
             bundlePath,
             handler: "server.handler",
+            runtime,
             timeout,
             memorySize,
             permissions,

package/constructs/SolidStartSite.js

@@ -26,7 +26,7 @@ export class SolidStartSite extends SsrSite {
         };
     }
     createFunctionForRegional() {
-        const { timeout, memorySize, environment, cdk } = this.props;
+        const { runtime, timeout, memorySize, environment, cdk } = this.props;
         // Bundle code
         const handler = path.join(this.props.path, "dist", "server", "index.handler");
         // Create function
@@ -34,7 +34,7 @@ export class SolidStartSite extends SsrSite {
             description: "Server handler",
             handler,
             logRetention: "three_days",
-            runtime: "nodejs16.x",
+            runtime,
             memorySize,
             timeout,
             nodejs: {
@@ -48,7 +48,7 @@ export class SolidStartSite extends SsrSite {
         return fn;
     }
     createFunctionForEdge() {
-        const { timeout, memorySize, permissions, environment } = this.props;
+        const { runtime, timeout, memorySize, permissions, environment } = this.props;
         // Create a directory that we will use to create the bundled version
         // of the "core server build" along with our custom Lamba server handler.
         const outputPath = path.resolve(path.join(useProject().paths.artifacts, `SolidStartSiteFunction-${this.node.id}-${this.node.addr}`));
@@ -83,6 +83,7 @@ export class SolidStartSite extends SsrSite {
             scopeOverride: this,
             bundlePath: outputPath,
             handler: "server.handler",
+            runtime,
             timeout,
             memorySize,
             permissions,

package/constructs/SsrFunction.d.ts

@@ -7,6 +7,7 @@ import { FunctionOptions } from "aws-cdk-lib/aws-lambda";
 export interface SsrFunctionProps extends Omit<FunctionOptions, "memorySize" | "timeout" | "runtime"> {
     bundlePath: string;
     handler: string;
+    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
     timeout: number | Duration;
     memorySize: number | Size;
     permissions?: Permissions;

package/constructs/SsrFunction.js

@@ -30,7 +30,7 @@ export class SsrFunction extends Construct {
         attachPermissionsToRole(this.function.role, permissions);
     }
     createFunction() {
-        const { timeout, memorySize, handler, bundlePath } = this.props;
+        const { runtime, timeout, memorySize, handler, bundlePath } = this.props;
         // Note: cannot point the bundlePath to the `.open-next/server-function`
         //       b/c the folder contains node_modules. And pnpm node_modules
         //       contains symlinks. CDK cannot zip symlinks correctly.
@@ -57,7 +57,11 @@ export class SsrFunction extends Construct {
             handler,
             logRetention: logs.RetentionDays.THREE_DAYS,
             code: lambda.Code.fromBucket(asset.bucket, asset.s3ObjectKey),
-            runtime: lambda.Runtime.NODEJS_18_X,
+            runtime: runtime === "nodejs14.x"
+                ? lambda.Runtime.NODEJS_14_X
+                : runtime === "nodejs16.x"
+                    ? lambda.Runtime.NODEJS_16_X
+                    : lambda.Runtime.NODEJS_18_X,
             architecture: lambda.Architecture.ARM_64,
             memorySize: typeof memorySize === "string"
                 ? toCdkSize(memorySize).toMebibytes()

package/constructs/SsrSite.d.ts

@@ -94,6 +94,15 @@ export interface SsrSiteProps {
      * ```
      */
     memorySize?: number | Size;
+    /**
+     * The runtime environment for the SSR function.
+     * @default nodejs18.x
+     * @example
+     * ```js
+     * runtime: "nodejs16.x",
+     * ```
+     */
+    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
     /**
      * Attaches the given list of permissions to the SSR function. Configuring this property is equivalent to calling `attachPermissions()` after the site is created.
      * @example

package/constructs/SsrSite.js

@@ -57,6 +57,7 @@ export class SsrSite extends Construct {
         this.props = {
             path: ".",
             waitForInvalidation: false,
+            runtime: "nodejs18.x",
             timeout: "10 seconds",
             memorySize: "1024 MB",
             ...props,
@@ -411,11 +412,10 @@ export class SsrSite extends Construct {
     /////////////////////
     validateCloudFrontDistributionSettings() {
         const { cdk } = this.props;
-        const cfDistributionProps = cdk?.distribution || {};
-        if (cfDistributionProps.certificate) {
+        if (cdk?.distribution?.certificate) {
             throw new Error(`Do not configure the "cfDistribution.certificate". Use the "customDomain" to configure the domain certificate.`);
         }
-        if (cfDistributionProps.domainNames) {
+        if (cdk?.distribution?.domainNames) {
             throw new Error(`Do not configure the "cfDistribution.domainNames". Use the "customDomain" to configure the domain name.`);
         }
     }

package/constructs/StaticSite.d.ts

@@ -320,6 +320,8 @@ export declare class StaticSite extends Construct implements SSTConstruct {
     private bundleFilenamesAsset;
     private createS3Bucket;
     private createS3Deployment;
+    private validateCloudFrontDistributionSettings;
+    protected buildDistributionDomainNames(): string[];
     private createCfDistribution;
     private createCloudFrontInvalidation;
     protected validateCustomDomainSettings(): void;

package/constructs/StaticSite.js

@@ -87,6 +87,7 @@ export class StaticSite extends Construct {
         // Create S3 Deployment
         const s3deployCR = this.createS3Deployment(cliLayer, assets, filenamesAsset);
         // Create CloudFront
+        this.validateCloudFrontDistributionSettings();
         this.distribution = this.createCfDistribution();
         this.distribution.node.addDependency(s3deployCR);
         // Invalidate CloudFront
@@ -367,21 +368,20 @@ interface ImportMeta {
     /////////////////////
     // CloudFront Distribution
     /////////////////////
-    createCfDistribution() {
-        const { cdk, customDomain } = this.props;
-        const indexPage = this.props.indexPage || "index.html";
-        const errorPage = this.props.errorPage;
-        // Validate input
+    validateCloudFrontDistributionSettings() {
+        const { cdk, errorPage } = this.props;
         if (cdk?.distribution?.certificate) {
-            throw new Error(`Do not configure the "cfDistribution.certificate". Use the "customDomain" to configure the StaticSite domain certificate.`);
+            throw new Error(`Do not configure the "cfDistribution.certificate". Use the "customDomain" to configure the domain certificate.`);
         }
         if (cdk?.distribution?.domainNames) {
-            throw new Error(`Do not configure the "cfDistribution.domainNames". Use the "customDomain" to configure the StaticSite domain.`);
+            throw new Error(`Do not configure the "cfDistribution.domainNames". Use the "customDomain" to configure the domain name.`);
         }
         if (errorPage && cdk?.distribution?.errorResponses) {
             throw new Error(`Cannot configure the "cfDistribution.errorResponses" when "errorPage" is passed in. Use one or the other to configure the behavior for error pages.`);
         }
-        // Build domainNames
+    }
+    buildDistributionDomainNames() {
+        const { customDomain } = this.props;
         const domainNames = [];
         if (!customDomain) {
             // no domain
@@ -397,18 +397,21 @@ interface ImportMeta {
                 domainNames.push(...customDomain.alternateNames);
             }
         }
-        // Build errorResponses
-        const errorResponses = errorPage === "redirect_to_index_page" || errorPage === undefined
-            ? buildErrorResponsesForRedirectToIndex(indexPage)
-            : buildErrorResponsesFor404ErrorPage(errorPage);
+        return domainNames;
+    }
+    createCfDistribution() {
+        const { cdk, errorPage } = this.props;
+        const indexPage = this.props.indexPage || "index.html";
         // Create CloudFront distribution
         return new cloudfront.Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps
             defaultRootObject: indexPage,
-            errorResponses,
+            errorResponses: !errorPage || errorPage === "redirect_to_index_page"
+                ? buildErrorResponsesForRedirectToIndex(indexPage)
+                : buildErrorResponsesFor404ErrorPage(errorPage),
             ...cdk?.distribution,
             // these values can NOT be overwritten by cfDistributionProps
-            domainNames,
+            domainNames: this.buildDistributionDomainNames(),
             certificate: this.certificate,
             defaultBehavior: {
                 origin: new cfOrigins.S3Origin(this.bucket),

package/package.json

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

package/sst.mjs

@@ -793,70 +793,6 @@ var init_site_env = __esm({
   }
 });
 
-// src/bus.ts
-var bus_exports = {};
-__export(bus_exports, {
-  useBus: () => useBus
-});
-import crypto from "crypto";
-var DO_NOT_LOG, useBus;
-var init_bus = __esm({
-  "src/bus.ts"() {
-    "use strict";
-    init_context();
-    init_logger();
-    DO_NOT_LOG = /* @__PURE__ */ new Set(["stacks.metadata"]);
-    useBus = Context.memo(() => {
-      const subscriptions = {};
-      function subscribers(type) {
-        let arr = subscriptions[type];
-        if (!arr) {
-          arr = [];
-          subscriptions[type] = arr;
-        }
-        return arr;
-      }
-      const sourceID = crypto.randomBytes(16).toString("hex");
-      const result = {
-        sourceID,
-        publish(type, properties) {
-          const payload = {
-            type,
-            properties,
-            sourceID
-          };
-          if (!DO_NOT_LOG.has(type)) {
-            Logger.debug(`Publishing event ${JSON.stringify(payload)}`);
-          }
-          for (const sub of subscribers(type))
-            sub.cb(payload);
-        },
-        unsubscribe(sub) {
-          const arr = subscribers(sub.type);
-          const index = arr.indexOf(sub);
-          if (index < 0)
-            return;
-          arr.splice(index, 1);
-        },
-        subscribe(type, cb) {
-          const sub = {
-            type,
-            cb
-          };
-          subscribers(type).push(sub);
-          return sub;
-        },
-        forward(..._types) {
-          return (type, cb) => {
-            return this.subscribe(type, cb);
-          };
-        }
-      };
-      return result;
-    });
-  }
-});
-
 // ../../node_modules/.pnpm/tslib@2.4.1/node_modules/tslib/tslib.es6.js
 var tslib_es6_exports = {};
 __export(tslib_es6_exports, {
@@ -1614,6 +1550,70 @@ var init_credentials = __esm({
   }
 });
 
+// src/bus.ts
+var bus_exports = {};
+__export(bus_exports, {
+  useBus: () => useBus
+});
+import crypto from "crypto";
+var DO_NOT_LOG, useBus;
+var init_bus = __esm({
+  "src/bus.ts"() {
+    "use strict";
+    init_context();
+    init_logger();
+    DO_NOT_LOG = /* @__PURE__ */ new Set(["stacks.metadata"]);
+    useBus = Context.memo(() => {
+      const subscriptions = {};
+      function subscribers(type) {
+        let arr = subscriptions[type];
+        if (!arr) {
+          arr = [];
+          subscriptions[type] = arr;
+        }
+        return arr;
+      }
+      const sourceID = crypto.randomBytes(16).toString("hex");
+      const result = {
+        sourceID,
+        publish(type, properties) {
+          const payload = {
+            type,
+            properties,
+            sourceID
+          };
+          if (!DO_NOT_LOG.has(type)) {
+            Logger.debug(`Publishing event ${JSON.stringify(payload)}`);
+          }
+          for (const sub of subscribers(type))
+            sub.cb(payload);
+        },
+        unsubscribe(sub) {
+          const arr = subscribers(sub.type);
+          const index = arr.indexOf(sub);
+          if (index < 0)
+            return;
+          arr.splice(index, 1);
+        },
+        subscribe(type, cb) {
+          const sub = {
+            type,
+            cb
+          };
+          subscribers(type).push(sub);
+          return sub;
+        },
+        forward(..._types) {
+          return (type, cb) => {
+            return this.subscribe(type, cb);
+          };
+        }
+      };
+      return result;
+    });
+  }
+});
+
 // src/cli/local/router.ts
 import * as trpc from "@trpc/server";
 var router2;
@@ -2580,9 +2580,17 @@ async function loadCDKStatus() {
         StackName: "CDKToolkit"
       })
     );
-    if (stacks && stacks.length > 0 && ["CREATE_COMPLETE", "UPDATE_COMPLETE"].includes(stacks[0].StackStatus)) {
-      return true;
+    if (!stacks || stacks.length === 0)
+      return false;
+    if (!["CREATE_COMPLETE", "UPDATE_COMPLETE"].includes(stacks[0].StackStatus)) {
+      return false;
     }
+    const output = stacks[0].Outputs?.find(
+      (o) => o.OutputKey === "BootstrapVersion"
+    );
+    if (!output || parseInt(output.OutputValue) < 14)
+      return false;
+    return true;
   } catch (e) {
     if (e.name === "ValidationError" && e.message === "Stack with id CDKToolkit does not exist") {
       return false;
@@ -6239,6 +6247,8 @@ var env = (program2) => program2.command(
     const fs18 = await import("fs/promises");
     const { SiteEnv } = await Promise.resolve().then(() => (init_site_env(), site_env_exports));
     const { spawnSync } = await import("child_process");
+    const { useAWSCredentials: useAWSCredentials2 } = await Promise.resolve().then(() => (init_credentials(), credentials_exports));
+    const { useProject: useProject2 } = await Promise.resolve().then(() => (init_project(), project_exports));
     let spinner;
     while (true) {
       const exists = await fs18.access(SiteEnv.valuesFile()).then(() => true).catch(() => false);
@@ -6252,10 +6262,16 @@ var env = (program2) => program2.command(
       spinner?.succeed();
       const sites = await SiteEnv.values();
       const env2 = sites[process.cwd()] || {};
+      const project = useProject2();
+      const credentials = await useAWSCredentials2();
       const result = spawnSync(args.command, {
         env: {
           ...process.env,
-          ...env2
+          ...env2,
+          AWS_ACCESS_KEY_ID: credentials.accessKeyId,
+          AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,
+          AWS_SESSION_TOKEN: credentials.sessionToken,
+          AWS_REGION: project.config.region
         },
         stdio: "inherit",
         shell: process.env.SHELL || true