sst 2.0.0-rc.69 → 2.0.0-rc.70

package/bootstrap.d.ts

@@ -1,15 +1,4 @@
-export declare const BootstrapContext: {
-    use(): {
-        version: string;
-        bucket: string;
-    };
-    provide(value: {
-        version: string;
-        bucket: string;
-    }): void;
-};
-export declare const useBootstrap: () => {
+export declare const useBootstrap: () => Promise<{
     version: string;
     bucket: string;
-};
-export declare function initBootstrap(): Promise<void>;
+}>;

package/bootstrap.js

@@ -23,9 +23,7 @@ const OUTPUT_VERSION = "Version";
 const OUTPUT_BUCKET = "BucketName";
 const LATEST_VERSION = "6";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
-export const BootstrapContext = Context.create("Bootstrap");
-export const useBootstrap = BootstrapContext.use;
-export async function initBootstrap() {
+export const useBootstrap = Context.memo(async () => {
     Logger.debug("Initializing bootstrap context");
     let [cdkStatus, sstStatus] = await Promise.all([
         loadCDKStatus(),
@@ -48,9 +46,9 @@ export async function initBootstrap() {
         }
         spinner.succeed();
     }
-    BootstrapContext.provide(sstStatus);
     Logger.debug("Bootstrap context initialized", sstStatus);
-}
+    return sstStatus;
+}, "Bootstrap");
 async function loadCDKStatus() {
     const client = useAWSClient(CloudFormationClient);
     try {
@@ -100,6 +98,9 @@ async function bootstrapSST() {
         code: Code.fromAsset(path.resolve(__dirname, "support/bootstrap-metadata-function")),
         handler: "index.handler",
         runtime: Runtime.NODEJS_18_X,
+        environment: {
+            BUCKET_NAME: bucket.bucketName,
+        },
         initialPolicy: [
             new PolicyStatement({
                 actions: ["cloudformation:DescribeStacks"],

package/cli/commands/bootstrap.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="yargs" />
+import type { Program } from "../program.js";
+export declare const bootstrap: (program: Program) => import("yargs").Argv<{
+    stage: string | undefined;
+} & {
+    profile: string | undefined;
+} & {
+    region: string | undefined;
+} & {
+    verbose: boolean | undefined;
+} & {
+    role: string | undefined;
+}>;

package/cli/commands/bootstrap.js

@@ -0,0 +1,4 @@
+export const bootstrap = (program) => program.command("bootstrap", "Create the SST bootstrap stack", (yargs) => yargs, async () => {
+    const { useBootstrap } = await import("../../bootstrap.js");
+    await useBootstrap();
+});

package/cli/sst.js

@@ -25,6 +25,7 @@ import { transform } from "./commands/transform.js";
 import { diff } from "./commands/diff.js";
 import { version } from "./commands/version.js";
 import { telemetry } from "./commands/telemetry.js";
+import { bootstrap } from "./commands/bootstrap.js";
 dev(program);
 deploy(program);
 build(program);
@@ -38,6 +39,7 @@ consoleCommand(program);
 diff(program);
 version(program);
 telemetry(program);
+bootstrap(program);
 if ("setSourceMapsEnabled" in process) {
     // @ts-expect-error
     process.setSourceMapsEnabled(true);

package/constructs/App.js

@@ -14,7 +14,6 @@ import { createRequire } from "module";
 import { Auth } from "./Auth.js";
 import { useDeferredTasks } from "./deferred_task.js";
 import { AppContext } from "./context.js";
-import { useBootstrap } from "../bootstrap.js";
 import { useProject } from "../project.js";
 import { Logger } from "../logger.js";
 import { SiteEnv } from "../site-env.js";
@@ -290,7 +289,6 @@ export class App extends cdk.App {
                         app: this.name,
                         stage: this.stage,
                         version: useProject().version,
-                        bootstrapBucket: useBootstrap().bucket,
                         metadata: byStack[stackName] || [],
                     }),
                 });

package/constructs/Function.js

@@ -186,8 +186,12 @@ export class Function extends lambda.Function {
             useDeferredTasks().add(async () => {
                 // Build function
                 const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
-                if (result.type === "error")
-                    throw new Error(`Failed to build function "${props.handler}"`);
+                if (result.type === "error") {
+                    throw new Error([
+                        `Failed to build function "${props.handler}"`,
+                        ...result.errors,
+                    ].join("\n"));
+                }
                 const code = lambda.AssetCode.fromAsset(result.out);
                 // Update function's code
                 const codeConfig = code.bind(this);

package/package.json

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

package/project.js

@@ -81,8 +81,6 @@ export async function initProject(globals) {
         },
     };
     ProjectContext.provide(project);
-    const { initBootstrap } = await import("./bootstrap.js");
-    await initBootstrap();
     dotenv.config({
         path: path.join(project.paths.root, `.env.${project.config.stage}`),
         override: true,