sst 2.0.0-rc.2 → 2.0.0-rc.21

package/bootstrap.js

@@ -2,7 +2,7 @@ import { GetParametersCommand, SSMClient } from "@aws-sdk/client-ssm";
 import { Tags, Stack, RemovalPolicy, App } from "aws-cdk-lib";
 import { BlockPublicAccess, Bucket, BucketEncryption, } from "aws-cdk-lib/aws-s3";
 import { ParameterTier, StringParameter } from "aws-cdk-lib/aws-ssm";
-import { useProject } from "./app.js";
+import { useProject } from "./project.js";
 import { createSpinner } from "./cli/spinner.js";
 import { Context } from "./context/context.js";
 import { useAWSClient } from "./credentials.js";
@@ -25,14 +25,14 @@ export const useBootstrap = Context.memo(async () => {
         const app = new App();
         const stack = new Stack(app, "SSTBootstrap", {
             env: {
-                region: project.region,
+                region: project.config.region,
             },
         });
         const tags = {};
         for (const [key, value] of Object.entries(tags)) {
             Tags.of(app).add(key, value);
         }
-        const bucket = new Bucket(stack, project.region, {
+        const bucket = new Bucket(stack, project.config.region, {
             encryption: BucketEncryption.S3_MANAGED,
             removalPolicy: RemovalPolicy.DESTROY,
             autoDeleteObjects: true,

package/bus.d.ts

@@ -1,12 +1,12 @@
 export interface Events {
 }
-export declare type EventTypes = keyof Events;
-export declare type EventPayload<Type extends EventTypes = EventTypes> = {
+export type EventTypes = keyof Events;
+export type EventPayload<Type extends EventTypes = EventTypes> = {
     type: Type;
     sourceID: string;
     properties: Events[Type];
 };
-declare type Subscription = {
+type Subscription = {
     type: EventTypes;
     cb: (payload: any) => void;
 };

package/cache.js

@@ -1,6 +1,6 @@
 import path from "path";
 import fs from "fs/promises";
-import { useProject } from "./app.js";
+import { useProject } from "./project.js";
 import { Logger } from "./logger.js";
 import { Context } from "./context/context.js";
 export const useCache = Context.memo(async () => {

package/cdk/deploy-stack.d.ts

@@ -4,7 +4,7 @@ import { ISDK, SdkProvider } from "aws-cdk/lib/api/aws-auth/index.js";
 import { ToolkitInfo } from "aws-cdk/lib/api/toolkit-info.js";
 import { ResourcesToImport } from "aws-cdk/lib/api/util/cloudformation.js";
 import { StackActivityProgress } from "aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.js";
-declare type TemplateBodyParameter = {
+type TemplateBodyParameter = {
     TemplateBody?: string;
     TemplateURL?: string;
 };
@@ -166,7 +166,7 @@ export interface DeployStackOptions {
      */
     readonly assetParallelism?: boolean;
 }
-export declare type DeploymentMethod = DirectDeploymentMethod | ChangeSetDeploymentMethod;
+export type DeploymentMethod = DirectDeploymentMethod | ChangeSetDeploymentMethod;
 export interface DirectDeploymentMethod {
     readonly method: "direct";
 }

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/cli/commands/bind.js

@@ -1,4 +1,4 @@
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 export const bind = (program) => program.command("bind <command>", "Binds blah", (yargs) => yargs.positional("command", {
     type: "string",
     describe: "Command to bind to",
@@ -16,7 +16,7 @@ export const bind = (program) => program.command("bind <command>", "Binds blah",
             AWS_ACCESS_KEY_ID: credentials.accessKeyId,
             AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,
             AWS_SESSION_TOKEN: credentials.sessionToken,
-            AWS_REGION: project.region,
+            AWS_REGION: project.config.region,
             PATH: process.env.PATH,
         },
         stdio: "inherit",

package/cli/commands/build.js

@@ -1,11 +1,11 @@
+import { useProject } from "../../project.js";
 import { createSpinner } from "../spinner.js";
-export const build = (program) => program.command("build", "Build stacks code", yargs => yargs.option("from", { type: "string" }), async () => {
+export const build = (program) => program.command("build", "Build stacks code", (yargs) => yargs.option("from", { type: "string" }), async () => {
     const { Stacks } = await import("../../stacks/index.js");
     const spinner = createSpinner("Building stacks").start();
-    const fn = await Stacks.build();
     await Stacks.synth({
-        fn,
-        mode: "deploy"
+        fn: useProject().stacks,
+        mode: "deploy",
     });
     spinner.succeed();
     process.exit(0);

package/cli/commands/deploy.js

@@ -1,4 +1,5 @@
 import { printDeploymentResults } from "../ui/deploy.js";
+import { createSpinner } from "../spinner.js";
 export const deploy = (program) => program.command("deploy [filter]", "Work on your SST app locally", (yargs) => yargs
     .option("from", { type: "string" })
     .option("fullscreen", {
@@ -10,22 +11,24 @@ export const deploy = (program) => program.command("deploy [filter]", "Work on y
     const React = await import("react");
     const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
     const { blue, bold } = await import("colorette");
-    const { useProject } = await import("../../app.js");
+    const { useProject } = await import("../../project.js");
     const { Stacks } = await import("../../stacks/index.js");
     const { render } = await import("ink");
     const { DeploymentUI } = await import("../ui/deploy.js");
+    const project = useProject();
     const assembly = await (async function () {
         if (args.from) {
             const result = new CloudAssembly(args.from);
             return result;
         }
-        const fn = await Stacks.build();
-        return await Stacks.synth({
-            fn,
+        const spinner = createSpinner("Building stacks");
+        const result = await Stacks.synth({
+            fn: project.stacks,
             mode: "deploy",
         });
+        spinner.succeed();
+        return result;
     })();
-    const project = useProject();
     const target = assembly.stacks.filter((s) => !args.filter ||
         s.stackName.toLowerCase().includes(args.filter.toLowerCase()));
     if (!target.length) {
@@ -33,7 +36,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Work on y
         process.exit(1);
         return;
     }
-    console.log(`Deploying ${bold(target.length + " stacks")} for stage ${blue(project.stage)}...`);
+    console.log(`Deploying ${bold(target.length + " stacks")} for stage ${blue(project.config.stage)}...`);
     let component = undefined;
     if (args.fullscreen) {
         process.stdout.write("\x1b[?1049h");
@@ -44,5 +47,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Work on y
         component.unmount();
     process.stdout.write("\x1b[?1049l");
     printDeploymentResults(results);
+    if (Object.values(results).some((stack) => Stacks.isFailed(stack.status)))
+        process.exit(1);
     process.exit(0);
 });

package/cli/commands/dev.js

@@ -4,11 +4,11 @@ import crypto from "crypto";
 import { printDeploymentResults } from "../ui/deploy.js";
 import { useFunctions } from "../../constructs/Function.js";
 import { dim, gray, yellow } from "colorette";
-import { useProject } from "../../app.js";
 import { SiteEnv } from "../../site-env.js";
 import { usePothosBuilder } from "./plugins/pothos.js";
 import { useKyselyTypeGenerator } from "./plugins/kysely.js";
 import { useRDSWarmer } from "./plugins/warmer.js";
+import { useProject } from "../../project.js";
 export const dev = (program) => program.command(["start", "dev"], "Work on your SST app locally", (yargs) => yargs.option("fullscreen", {
     type: "boolean",
     describe: "Disable full screen UI",
@@ -34,13 +34,13 @@ export const dev = (program) => program.command(["start", "dev"], "Work on your
     const useFunctionLogger = Context.memo(async () => {
         const bus = useBus();
         bus.subscribe("function.invoked", async (evt) => {
-            console.log(bold(magenta(`Invoked `)), bold(useFunctions().fromID(evt.properties.functionID).handler));
+            console.log(bold(magenta(`Invoked `)), useFunctions().fromID(evt.properties.functionID).handler);
         });
         bus.subscribe("function.build.success", async (evt) => {
-            console.log(bold(gray(`Built   `)), bold(useFunctions().fromID(evt.properties.functionID).handler));
+            console.log(bold(gray(`Built   `)), useFunctions().fromID(evt.properties.functionID).handler);
         });
         bus.subscribe("function.build.failed", async (evt) => {
-            console.log(bold(red(`Build failed `)), bold(useFunctions().fromID(evt.properties.functionID).handler));
+            console.log(bold(red(`Build failed `)), useFunctions().fromID(evt.properties.functionID).handler);
             console.log(dim(evt.properties.errors.join("\n")));
         });
         bus.subscribe("worker.stdout", async (evt) => {
@@ -50,14 +50,14 @@ export const dev = (program) => program.command(["start", "dev"], "Work on your
                 const line = lines[i];
                 lines[i] = "         " + line;
             }
-            console.log(bold(blue(`Log     `)), bold(useFunctions().fromID(evt.properties.functionID).handler));
+            console.log(bold(blue(`Log     `)), useFunctions().fromID(evt.properties.functionID).handler);
             console.log(dim(lines.join("\n")));
         });
         bus.subscribe("function.success", async (evt) => {
-            console.log(bold(green(`Success `)), bold(useFunctions().fromID(evt.properties.functionID).handler));
+            console.log(bold(green(`Success `)), useFunctions().fromID(evt.properties.functionID).handler);
         });
         bus.subscribe("function.error", async (evt) => {
-            console.log(bold(red(`Error   `)), bold(useFunctions().fromID(evt.properties.functionID).handler), evt.properties.errorMessage);
+            console.log(bold(red(`Error   `)), useFunctions().fromID(evt.properties.functionID).handler, evt.properties.errorMessage);
             for (const line of evt.properties.trace || []) {
                 console.log(`         ${dim(line)}`);
             }
@@ -65,17 +65,19 @@ export const dev = (program) => program.command(["start", "dev"], "Work on your
     });
     const useStackBuilder = Context.memo(async () => {
         const watcher = useWatcher();
-        const bus = useBus();
         const project = useProject();
+        const bus = useBus();
         let lastDeployed;
         let pending;
         let isDeploying = false;
         async function build() {
             const spinner = createSpinner("Building stacks").start();
             try {
-                const fn = await Stacks.build();
+                const [metafile, sstConfig] = await Stacks.load(project.paths.config);
+                project.metafile = metafile;
+                project.stacks = sstConfig.stacks;
                 const assembly = await Stacks.synth({
-                    fn,
+                    fn: project.stacks,
                     outDir: `.sst/cdk.out`,
                     mode: "dev",
                 });
@@ -151,14 +153,10 @@ export const dev = (program) => program.command(["start", "dev"], "Work on your
                 .digest("hex");
             return hash;
         }
-        let metafile;
-        bus.subscribe("stack.built", async (evt) => {
-            metafile = evt.properties.metafile;
-        });
         watcher.subscribe("file.changed", async (evt) => {
-            if (!metafile)
+            if (!project.metafile)
                 return;
-            if (!metafile.inputs[evt.properties.relative])
+            if (!project.metafile.inputs[evt.properties.relative])
                 return;
             build();
         });

package/cli/commands/env.js

@@ -1,4 +1,4 @@
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 import { createSpinner } from "../spinner.js";
 import fs from "fs/promises";
 import path from "path";
@@ -10,17 +10,18 @@ export const env = (program) => program.command("env <command>", "description",
     demandOption: true,
 }), async (args) => {
     const project = useProject();
-    const spinner = createSpinner("Waiting for SST to start").start();
+    let spinner;
     while (true) {
         const exists = await fs
             .access(SiteEnv.valuesFile())
             .then(() => true)
             .catch(() => false);
         if (!exists) {
+            spinner = createSpinner("Waiting for SST to start").start();
             await new Promise((resolve) => setTimeout(resolve, 1000));
             continue;
         }
-        spinner.succeed();
+        spinner?.succeed();
         const sites = await SiteEnv.values();
         const current = path.relative(project.paths.root, process.cwd());
         const env = sites[current] || {};

package/cli/commands/plugins/kysely.js

@@ -5,7 +5,7 @@ import * as fs from "fs/promises";
 import { DatabaseMetadata, EnumCollection, PostgresDialect, Serializer, Transformer, } from "kysely-codegen";
 import { Context } from "../../../context/context.js";
 import { useBus } from "../../../bus.js";
-import { useProject } from "../../../app.js";
+import { useProject } from "../../../project.js";
 export const useKyselyTypeGenerator = Context.memo(async () => {
     let databases = [];
     const bus = useBus();
@@ -21,7 +21,7 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
                     resourceArn: db.clusterArn,
                     database: db.defaultDatabaseName,
                     client: new RDSDataService({
-                        region: project.region,
+                        region: project.config.region,
                     }),
                 },
             }),

package/cli/commands/remove.js

@@ -5,7 +5,7 @@ export const remove = (program) => program.command("remove [filter]", "Remove al
     const React = await import("react");
     const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
     const { blue, bold } = await import("colorette");
-    const { useProject } = await import("../../app.js");
+    const { useProject } = await import("../../project.js");
     const { Stacks } = await import("../../stacks/index.js");
     const { render } = await import("ink");
     const { DeploymentUI } = await import("../ui/deploy.js");
@@ -14,9 +14,9 @@ export const remove = (program) => program.command("remove [filter]", "Remove al
             const result = new CloudAssembly(args.from);
             return result;
         }
-        const fn = await Stacks.build();
+        const project = useProject();
         return await Stacks.synth({
-            fn,
+            fn: project.stacks,
             mode: "remove",
         });
     })();
@@ -26,9 +26,8 @@ export const remove = (program) => program.command("remove [filter]", "Remove al
     if (!target.length) {
         console.log(`No stacks found matching ${blue(args.filter)}`);
         process.exit(1);
-        return;
     }
-    console.log(`Removing ${bold(target.length + " stacks")} for stage ${blue(project.stage)}...`);
+    console.log(`Removing ${bold(target.length + " stacks")} for stage ${blue(project.config.stage)}...`);
     process.stdout.write("\x1b[?1049h");
     const component = render(React.createElement(DeploymentUI, { stacks: target.map((s) => s.stackName) }));
     const results = await Stacks.removeMany(target);

package/cli/commands/update.js

@@ -1,17 +1,17 @@
 import { green, yellow } from "colorette";
 import fs from "fs/promises";
 import path from "path";
-const PACKAGE_MATCH = ["sst", "aws-cdk", "@aws-cdk"];
+const PACKAGE_MATCH = ["sst", "aws-cdk", "@aws-cdk", "constructs"];
 const FIELDS = ["dependencies", "devDependencies"];
 export const update = (program) => program.command("update [ver]", "Update SST and CDK packages to another version", (yargs) => yargs.positional("ver", {
     type: "string",
     describe: "Optional SST version to update to",
 }), async (args) => {
     const { fetch } = await import("undici");
-    const { useProject } = await import("../../app.js");
+    const { useProject } = await import("../../project.js");
     const project = useProject();
     const files = await find(project.paths.root);
-    const metadata = await fetch(`https://registry.npmjs.org/sst/${args.ver || "rc"}`).then((resp) => resp.json());
+    const metadata = await fetch(`https://registry.npmjs.org/sst/${args.ver || "latest"}`).then((resp) => resp.json());
     const results = new Map();
     const tasks = files.map(async (file) => {
         const data = await fs
@@ -25,9 +25,15 @@ export const update = (program) => program.command("update [ver]", "Update SST a
             for (const [pkg, existing] of Object.entries(deps)) {
                 if (!PACKAGE_MATCH.some((x) => pkg.startsWith(x)))
                     continue;
-                const desired = pkg === "sst"
-                    ? metadata.version
-                    : metadata.dependencies["aws-cdk-lib"];
+                const desired = (() => {
+                    if (pkg === "sst")
+                        return metadata.version;
+                    if (pkg === "constructs")
+                        return metadata.dependencies.constructs;
+                    if (pkg.endsWith("alpha"))
+                        return metadata.dependencies["@aws-cdk/aws-apigatewayv2-alpha"];
+                    return metadata.dependencies["aws-cdk-lib"];
+                })();
                 if (existing === desired)
                     continue;
                 let arr = results.get(file);

package/cli/local/router.d.ts

@@ -1,6 +1,6 @@
 import * as trpc from "@trpc/server";
 import { DendriformPatch } from "dendriform-immer-patch-optimiser";
-export declare type State = {
+export type State = {
     app: string;
     stage: string;
     functions: Record<string, FunctionState>;
@@ -9,13 +9,13 @@ export declare type State = {
         status: any;
     };
 };
-export declare type FunctionState = {
+export type FunctionState = {
     state: "idle" | "building" | "checking";
     invocations: Invocation[];
     issues: Record<string, any[]>;
     warm: boolean;
 };
-export declare type Invocation = {
+export type Invocation = {
     id: string;
     request: any;
     response?: any;
@@ -28,15 +28,15 @@ export declare type Invocation = {
         timestamp: number;
     }[];
 };
-export declare type Context = {
+export type Context = {
     state: State;
 };
 export declare const router: import("@trpc/server/dist/declarations/src/router.js").Router<Context, Context, Record<"getCredentials", import("@trpc/server/dist/declarations/src/internals/procedure.js").Procedure<Context, Context, undefined, undefined, {
-    region: string;
+    region: string | undefined;
     credentials: {
         accessKeyId: string;
         secretAccessKey: string;
         sessionToken: string | undefined;
     };
 }>> & Record<"getState", import("@trpc/server/dist/declarations/src/internals/procedure.js").Procedure<Context, Context, undefined, undefined, State>>, Record<"deploy", import("@trpc/server/dist/declarations/src/internals/procedure.js").Procedure<Context, Context, undefined, undefined, void>>, Record<"onStateChange", import("@trpc/server/dist/declarations/src/internals/procedure.js").Procedure<Context, Context, undefined, undefined, trpc.Subscription<DendriformPatch[]>>>, trpc.DefaultErrorShape>;
-export declare type Router = typeof router;
+export type Router = typeof router;

package/cli/local/router.js

@@ -1,5 +1,5 @@
 import * as trpc from "@trpc/server";
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 import { useBus } from "../../bus.js";
 import { useAWSCredentials } from "../../credentials.js";
 export const router = trpc
@@ -9,7 +9,7 @@ export const router = trpc
         const project = useProject();
         const credentials = await useAWSCredentials();
         return {
-            region: project.region,
+            region: project.config.region,
             credentials: {
                 accessKeyId: credentials.accessKeyId,
                 secretAccessKey: credentials.secretAccessKey,
@@ -24,7 +24,7 @@ export const router = trpc
     },
 })
     .mutation("deploy", {
-    async resolve({ ctx }) {
+    async resolve() {
         return;
     },
 })

package/cli/local/server.d.ts

@@ -1,7 +1,7 @@
 import { FunctionState, State } from "./router.js";
 import { WritableDraft } from "immer/dist/internal.js";
 import { DendriformPatch } from "dendriform-immer-patch-optimiser";
-declare type Opts = {
+type Opts = {
     port: number;
     key: any;
     cert: any;

package/cli/local/server.js

@@ -9,13 +9,13 @@ import { applyWSSHandler } from "@trpc/server/adapters/ws/dist/trpc-server-adapt
 import { router } from "./router.js";
 import { optimise } from "dendriform-immer-patch-optimiser";
 import { sync } from "cross-spawn";
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 import { useBus } from "../../bus.js";
 export async function useLocalServer(opts) {
     const project = useProject();
     let state = {
-        app: project.name,
-        stage: project.stage,
+        app: project.config.name,
+        stage: project.config.stage,
         live: opts.live,
         stacks: {
             status: "idle",
@@ -23,17 +23,12 @@ export async function useLocalServer(opts) {
         functions: {},
     };
     const rest = express();
-    /*
     rest.all(`/ping`, (req, res) => {
-      res.header("Access-Control-Allow-Origin", "*");
-      res.header("Access-Control-Allow-Methods", "GET, PUT, PATCH, POST, DELETE");
-      res.header(
-        "Access-Control-Allow-Headers",
-        req.header("access-control-request-headers")
-      );
-      res.sendStatus(200);
+        res.header("Access-Control-Allow-Origin", "*");
+        res.header("Access-Control-Allow-Methods", "GET, PUT, PATCH, POST, DELETE");
+        res.header("Access-Control-Allow-Headers", req.header("access-control-request-headers"));
+        res.sendStatus(200);
     });
-    */
     rest.all(`/proxy*`, express.raw({
         type: "*/*",
         limit: "1024mb",

package/cli/program.d.ts

@@ -6,4 +6,4 @@ export declare const program: import("yargs").Argv<{
 } & {
     region: string | undefined;
 }>;
-export declare type Program = typeof program;
+export type Program = typeof program;

package/cli/program.js

@@ -1,6 +1,6 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { initProject } from "../app.js";
+import { initProject } from "../project.js";
 import { trackCli } from "./telemetry/telemetry.js";
 export const program = yargs(hideBin(process.argv))
     .scriptName("sst")

package/cli/telemetry/environment.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
-declare type EnvironmentData = {
+type EnvironmentData = {
     systemPlatform: NodeJS.Platform;
     systemRelease: string;
     systemArchitecture: string;

package/cli/telemetry/environment.js

@@ -1,6 +1,6 @@
 import os from "os";
 import ciInfo from "ci-info";
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 let data;
 export function getEnvironmentData() {
     if (data) {

package/cli/ui/deploy.js

@@ -3,7 +3,7 @@ import { Box, Text } from "ink";
 import { useBus } from "../../bus.js";
 import { Stacks } from "../../stacks/index.js";
 import inkSpinner from "ink-spinner";
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 import { blue, bold, green, red } from "colorette";
 // @ts-ignore
 const { default: Spinner } = inkSpinner;
@@ -77,7 +77,7 @@ export const DeploymentUI = (props) => {
             "Deploying ",
             React.createElement(Text, { color: "bold" }, props.stacks.length),
             " stacks for stage ",
-            React.createElement(Text, { color: "blue" }, useProject().stage)),
+            React.createElement(Text, { color: "blue" }, useProject().config.stage)),
         Object.entries(stacks).map(([stackID, status]) => {
             return (React.createElement(React.Fragment, { key: stackID },
                 React.createElement(Text, null,