sst 2.7.1 → 2.8.0

package/constructs/util/appSyncApiDomain.js

@@ -1,5 +1,6 @@
-import { Token, Lazy } from "aws-cdk-lib";
+import { Token } from "aws-cdk-lib";
 import * as route53 from "aws-cdk-lib/aws-route53";
+import * as route53Targets from "aws-cdk-lib/aws-route53-targets";
 import * as acm from "aws-cdk-lib/aws-certificatemanager";
 export function buildCustomDomainData(scope, customDomain) {
     if (customDomain === undefined) {
@@ -18,6 +19,14 @@ export function buildCustomDomainData(scope, customDomain) {
     // customDomain.domainName not exists
     throw new Error(`Missing "domainName" in sst.AppSyncApi's customDomain setting`);
 }
+export function cleanup(scope, domainData) {
+    const cfnDomainName = getCfnDomainName(scope);
+    const cfnDomainNameApiAssociation = getCfnDomainNameApiAssociation(scope);
+    if (domainData.hostedZone) {
+        createRecords(scope, domainData.domainName, domainData.hostedZone, domainData.recordType, cfnDomainName);
+    }
+    fixDomainResourceDependencies(cfnDomainName, cfnDomainNameApiAssociation);
+}
 function buildDataForStringInput(scope, customDomain) {
     // validate: customDomain is a TOKEN string
     // ie. imported SSM value: ssm.StringParameter.valueForStringParameter()
@@ -29,10 +38,10 @@ function buildDataForStringInput(scope, customDomain) {
     const hostedZoneDomain = domainName.split(".").slice(1).join(".");
     const hostedZone = lookupHostedZone(scope, hostedZoneDomain);
     const certificate = createCertificate(scope, domainName, hostedZone);
-    createRecord(scope, hostedZone, domainName);
     return {
         certificate,
         domainName,
+        hostedZone,
     };
 }
 function buildDataForInternalDomainInput(scope, customDomain) {
@@ -69,10 +78,11 @@ function buildDataForInternalDomainInput(scope, customDomain) {
     const certificate = customDomain.cdk?.certificate
         ? customDomain.cdk.certificate
         : createCertificate(scope, domainName, hostedZone);
-    createRecord(scope, hostedZone, domainName);
     return {
         certificate,
         domainName,
+        hostedZone,
+        recordType: customDomain.recordType,
     };
 }
 function buildDataForExternalDomainInput(scope, customDomain) {
@@ -103,25 +113,60 @@ function createCertificate(scope, domainName, hostedZone) {
         validation: acm.CertificateValidation.fromDns(hostedZone),
     });
 }
-function createRecord(scope, hostedZone, domainName) {
+function createRecords(scope, domainName, hostedZone, recordType, cfnDomainName) {
     // create DNS record
-    const record = new route53.CnameRecord(scope, "CnameRecord", {
+    const aRecordProps = {
         recordName: domainName,
         zone: hostedZone,
-        domainName: Lazy.string({
-            produce() {
-                return scope._cfnDomainName.attrAppSyncDomainName;
+        target: route53.RecordTarget.fromAlias({
+            bind() {
+                return {
+                    hostedZoneId: route53Targets.CloudFrontTarget.CLOUDFRONT_ZONE_ID,
+                    dnsName: cfnDomainName.attrAppSyncDomainName,
+                };
             },
         }),
-    });
+    };
+    const records = (recordType || "CNAME") === "CNAME"
+        ? [
+            new route53.CnameRecord(scope, "CnameRecord", {
+                recordName: domainName,
+                zone: hostedZone,
+                domainName: cfnDomainName.attrAppSyncDomainName,
+            }),
+        ]
+        : [
+            new route53.ARecord(scope, "AliasRecord", aRecordProps),
+            new route53.AaaaRecord(scope, "AliasRecordAAAA", aRecordProps),
+        ];
     // note: If domainName is a TOKEN string ie. ${TOKEN..}, the route53.ARecord
     //       construct will append ".${hostedZoneName}" to the end of the domain.
     //       This is because the construct tries to check if the record name
     //       ends with the domain name. If not, it will append the domain name.
     //       So, we need remove this behavior.
     if (Token.isUnresolved(domainName)) {
-        const cfnRecord = record.node.defaultChild;
-        cfnRecord.name = domainName;
+        records.forEach((record) => {
+            const cfnRecord = record.node.defaultChild;
+            cfnRecord.name = domainName;
+        });
+    }
+}
+function getCfnDomainName(scope) {
+    return scope.cdk.graphqlApi.node.children.find((child) => child.cfnResourceType === "AWS::AppSync::DomainName");
+}
+function getCfnDomainNameApiAssociation(scope) {
+    return scope.cdk.graphqlApi.node.children.find((child) => child.cfnResourceType ===
+        "AWS::AppSync::DomainNameApiAssociation");
+}
+function fixDomainResourceDependencies(cfnDomainName, cfnDomainNameApiAssociation) {
+    // note: As of CDK 2.20.0, the "AWS::AppSync::DomainNameApiAssociation" resource
+    //       is not dependent on the "AWS::AppSync::DomainName" resource. This leads
+    //       CloudFormation deploy error if DomainNameApiAssociation is created before
+    //       DomainName is created.
+    //       https://github.com/aws/aws-cdk/issues/18395#issuecomment-1099455502
+    //       To workaround this issue, we need to add a dependency manually.
+    if (cfnDomainName && cfnDomainNameApiAssociation) {
+        cfnDomainNameApiAssociation.node.addDependency(cfnDomainName);
     }
 }
 function assertDomainNameIsLowerCase(domainName) {

package/node/config/index.js

@@ -8,15 +8,6 @@ Object.assign(Config, metadata, parameters, secrets);
 // Functions
 ///////////////
 function parseMetadataEnvironment() {
-    // If SST_APP and SST_STAGE are not set, it is likely the
-    // user is using an older version of SST.
-    const errorMsg = "This is usually the case when you are using an older version of SST. Please update SST to the latest version to use the SST Config feature.";
-    if (!process.env.SST_APP) {
-        throw new Error(`Cannot find the SST_APP environment variable. ${errorMsg}`);
-    }
-    if (!process.env.SST_STAGE) {
-        throw new Error(`Cannot find the SST_STAGE environment variable. ${errorMsg}`);
-    }
     return {
         APP: process.env.SST_APP,
         STAGE: process.env.SST_STAGE,

package/node/site/index.d.ts

@@ -1,18 +1,18 @@
 export interface StaticSiteResources {
 }
-export interface ReactStaticSiteResources {
-}
-export interface ViteStaticSiteResources {
-}
 export interface NextjsSiteResources {
 }
+export interface AstroSiteResources {
+}
 export interface RemixSiteResources {
 }
 export interface SolidStartSiteResources {
 }
+export interface SvelteKitSiteResources {
+}
 export declare const StaticSite: StaticSiteResources;
-export declare const ReactStaticSite: ReactStaticSiteResources;
-export declare const ViteStaticSite: ViteStaticSiteResources;
+export declare const AstroSite: AstroSiteResources;
 export declare const RemixSite: RemixSiteResources;
 export declare const NextjsSite: NextjsSiteResources;
 export declare const SolidStartSite: SolidStartSiteResources;
+export declare const SvelteKitSite: SvelteKitSiteResources;

package/node/site/index.js

@@ -1,12 +1,9 @@
 import { createProxy } from "../util/index.js";
 export const StaticSite = 
 /* @__PURE__ */ createProxy("StaticSite");
-export const ReactStaticSite = 
+export const AstroSite = 
 /* @__PURE__ */
-createProxy("ReactStaticSite");
-export const ViteStaticSite = 
-/* @__PURE__ */
-createProxy("ViteStaticSite");
+createProxy("AstroSite");
 export const RemixSite = 
 /* @__PURE__ */
 createProxy("RemixSite");
@@ -16,3 +13,6 @@ createProxy("NextjsSite");
 export const SolidStartSite = 
 /* @__PURE__ */
 createProxy("SolidStartSite");
+export const SvelteKitSite = 
+/* @__PURE__ */
+createProxy("SvelteKitSite");

package/node/util/index.js

@@ -17,6 +17,17 @@ export function createProxy(constructName) {
     const result = new Proxy({}, {
         get(target, prop) {
             if (typeof prop === "string") {
+                // If SST_APP and SST_STAGE are not set, it is likely the
+                // user is using an older version of SST.
+                // Note: cannot run this check at the top level b/c SvelteKit
+                //       run code analysis after build. The code analysis runs
+                //       the top level code, and would fail b/c "SST_APP" and
+                //       "SST_STAGE" are undefined at build time.
+                for (const builtInEnv of ["SST_APP", "SST_STAGE"]) {
+                    if (!process.env[builtInEnv]) {
+                        throw new Error(`Cannot find the ${builtInEnv} environment variable. This is usually the case when you are using an older version of SST. Please update SST to the latest version to use the SST Config feature.`);
+                    }
+                }
                 // normalize prop to convert kebab cases like `my-table` to `my_table`
                 const normProp = normalizeId(prop);
                 if (!(normProp in target)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.7.1",
+  "version": "2.8.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -10,7 +10,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/estyrke/serverless-stack.git",
+    "url": "git+https://github.com/serverless-stack/sst.git",
     "directory": "packages/cli"
   },
   "exports": {

package/runtime/handlers.js

@@ -25,6 +25,11 @@ export const useRuntimeHandlers = Context.memo(() => {
         async build(functionID, mode) {
             async function task() {
                 const func = useFunctions().fromID(functionID);
+                if (!func)
+                    return {
+                        type: "error",
+                        errors: [`Function with ID "${functionID}" not found`],
+                    };
                 const handler = result.for(func.runtime);
                 const out = path.join(project.paths.artifacts, functionID);
                 await fs.rm(out, { recursive: true, force: true });
@@ -100,6 +105,8 @@ export const useFunctionBuilder = Context.memo(() => {
         },
         build: async (functionID) => {
             const result = await handlers.build(functionID, "start");
+            if (!result)
+                return;
             if (result.type === "error")
                 return;
             artifacts.set(functionID, result);

package/runtime/workers.js

@@ -13,6 +13,8 @@ export const useRuntimeWorkers = Context.memo(async () => {
         for (const [_, worker] of workers) {
             if (worker.functionID === evt.properties.functionID) {
                 const props = useFunctions().fromID(worker.functionID);
+                if (!props)
+                    return;
                 const handler = handlers.for(props.runtime);
                 await handler?.stopWorker(worker.workerID);
                 bus.publish("worker.stopped", worker);
@@ -30,6 +32,8 @@ export const useRuntimeWorkers = Context.memo(async () => {
         if (worker)
             return;
         const props = useFunctions().fromID(evt.properties.functionID);
+        if (!props)
+            return;
         const handler = handlers.for(props.runtime);
         if (!handler)
             return;

package/sst.mjs

@@ -576,15 +576,33 @@ var init_project_id = __esm({
   }
 });
 
+// src/cli/ci-info.ts
+var ci_info_exports = {};
+__export(ci_info_exports, {
+  getCiInfo: () => getCiInfo
+});
+import ciInfo from "ci-info";
+function getCiInfo() {
+  const isSeed = !!process.env.SEED_APP_NAME;
+  return {
+    isCI: ciInfo.isCI || isSeed,
+    name: (isSeed ? "Seed" : ciInfo.name) || null
+  };
+}
+var init_ci_info = __esm({
+  "src/cli/ci-info.ts"() {
+    "use strict";
+  }
+});
+
 // src/cli/telemetry/environment.ts
 import os2 from "os";
-import ciInfo from "ci-info";
 function getEnvironmentData() {
   if (data) {
     return data;
   }
   const cpus = os2.cpus() || [];
-  const isSeed = !!process.env.SEED_APP_NAME;
+  const ciInfo2 = getCiInfo();
   data = {
     systemPlatform: os2.platform(),
     systemRelease: os2.release(),
@@ -593,8 +611,8 @@ function getEnvironmentData() {
     cpuModel: cpus.length ? cpus[0].model : null,
     cpuSpeed: cpus.length ? cpus[0].speed : null,
     memoryInMb: Math.trunc(os2.totalmem() / Math.pow(1024, 2)),
-    isCI: ciInfo.isCI || isSeed,
-    ciName: (isSeed ? "Seed" : ciInfo.name) || null,
+    isCI: ciInfo2.isCI,
+    ciName: ciInfo2.name,
     sstVersion: useProject().version
   };
   return data;
@@ -603,6 +621,7 @@ var data;
 var init_environment = __esm({
   "src/cli/telemetry/environment.ts"() {
     "use strict";
+    init_ci_info();
     init_project();
   }
 });
@@ -3569,6 +3588,11 @@ var init_handlers = __esm({
         async build(functionID, mode) {
           async function task() {
             const func = useFunctions().fromID(functionID);
+            if (!func)
+              return {
+                type: "error",
+                errors: [`Function with ID "${functionID}" not found`]
+              };
             const handler = result.for(func.runtime);
             const out = path7.join(project.paths.artifacts, functionID);
             await fs7.rm(out, { recursive: true, force: true });
@@ -3647,6 +3671,8 @@ var init_handlers = __esm({
         },
         build: async (functionID) => {
           const result2 = await handlers.build(functionID, "start");
+          if (!result2)
+            return;
           if (result2.type === "error")
             return;
           artifacts.set(functionID, result2);
@@ -3896,6 +3922,8 @@ var init_workers = __esm({
         for (const [_, worker] of workers) {
           if (worker.functionID === evt.properties.functionID) {
             const props = useFunctions2().fromID(worker.functionID);
+            if (!props)
+              return;
             const handler = handlers.for(props.runtime);
             await handler?.stopWorker(worker.workerID);
             bus.publish("worker.stopped", worker);
@@ -3913,6 +3941,8 @@ var init_workers = __esm({
         if (worker)
           return;
         const props = useFunctions2().fromID(evt.properties.functionID);
+        if (!props)
+          return;
         const handler = handlers.for(props.runtime);
         if (!handler)
           return;
@@ -6701,7 +6731,7 @@ var init_config = __esm({
       async function restart(keys) {
         const metadata3 = await stacks_exports.metadata();
         const siteData = Object.values(metadata3).flat().filter(
-          (c) => c.type === "AstroSite" || c.type === "NextjsSite" || c.type === "RemixSite" || c.type === "SolidStartSite"
+          (c) => c.type === "AstroSite" || c.type === "NextjsSite" || c.type === "RemixSite" || c.type === "SolidStartSite" || c.type === "SvelteKitSite"
         ).filter((c) => keys.some((key) => c.data.secrets.includes(key)));
         const siteDataPlaceholder = siteData.filter(
           (c) => c.data.mode === "placeholder"
@@ -6841,6 +6871,7 @@ var dev = (program2) => program2.command(
     const { useMetadata: useMetadata2 } = await Promise.resolve().then(() => (init_metadata(), metadata_exports));
     const { useIOT: useIOT2 } = await Promise.resolve().then(() => (init_iot(), iot_exports));
     const { clear: clear2 } = await Promise.resolve().then(() => (init_terminal(), terminal_exports));
+    const { getCiInfo: getCiInfo2 } = await Promise.resolve().then(() => (init_ci_info(), ci_info_exports));
     if (args._[0] === "start") {
       console.log(
         yellow(
@@ -6893,12 +6924,16 @@ var dev = (program2) => program2.command(
       });
       bus.subscribe("function.build.success", async (evt) => {
         const info = useFunctions3().fromID(evt.properties.functionID);
+        if (!info)
+          return;
         if (info.enableLiveDev === false)
           return;
         Colors2.line(Colors2.dim(Colors2.prefix, "Built", info.handler));
       });
       bus.subscribe("function.build.failed", async (evt) => {
         const info = useFunctions3().fromID(evt.properties.functionID);
+        if (!info)
+          return;
         if (info.enableLiveDev === false)
           return;
         Colors2.gap();
@@ -6938,7 +6973,6 @@ var dev = (program2) => program2.command(
     const useStackBuilder = Context2.memo(async () => {
       const watcher = useWatcher2();
       const project = useProject2();
-      const bus = useBus2();
       let lastDeployed;
       let isWorking = false;
       let isDirty = false;
@@ -7004,7 +7038,7 @@ var dev = (program2) => program2.command(
         if (!lastDeployed) {
           await saveAppMetadata2({ mode: "dev" });
           useSites().all.filter(({ props }) => props.dev?.deploy !== true).forEach(({ type, props }) => {
-            const framework = type === "AstroSite" ? "Astro" : type === "NextjsSite" ? "Next.js" : type === "RemixSite" ? "Remix" : type === "SolidStartSite" ? "SolidStart" : void 0;
+            const framework = type === "AstroSite" ? "Astro" : type === "NextjsSite" ? "Next.js" : type === "RemixSite" ? "Remix" : type === "SolidStartSite" ? "SolidStart" : type === "SvelteKitSite" ? "SvelteKit" : void 0;
             if (framework) {
               const cdCmd = path20.resolve(props.path) === process.cwd() ? "" : `cd ${props.path} && `;
               Colors2.line(
@@ -7108,7 +7142,7 @@ Are you sure you want to run this stage in dev mode? [y/N] `,
         );
       });
     }
-    if (appMetadata && appMetadata.mode !== "dev") {
+    if (!getCiInfo2().isCI && appMetadata && appMetadata.mode !== "dev") {
       if (!await promptChangeMode()) {
         process.exit(0);
       }
@@ -7317,6 +7351,7 @@ var bind = (program2) => program2.command(
           "AstroSite",
           "RemixSite",
           "SolidStartSite",
+          "SvelteKitSite",
           "SlsNextjsSite"
         ].includes(c.type)
       ).find((c) => {
@@ -7469,6 +7504,7 @@ var deploy2 = (program2) => program2.command(
     const { dim: dim2, blue: blue4, bold: bold2 } = await import("colorette");
     const { useProject: useProject2 } = await Promise.resolve().then(() => (init_project(), project_exports));
     const { loadAssembly: loadAssembly2, useAppMetadata: useAppMetadata2, saveAppMetadata: saveAppMetadata2, Stacks } = await Promise.resolve().then(() => (init_stacks(), stacks_exports));
+    const { getCiInfo: getCiInfo2 } = await Promise.resolve().then(() => (init_ci_info(), ci_info_exports));
     const { render } = await import("ink");
     const { DeploymentUI: DeploymentUI2 } = await Promise.resolve().then(() => (init_deploy2(), deploy_exports));
     const { mapValues } = await import("remeda");
@@ -7496,7 +7532,7 @@ Are you sure you want to deploy to this stage? (y/N) `,
         );
       });
     }
-    if (appMetadata && appMetadata.mode !== "deploy") {
+    if (!getCiInfo2().isCI && appMetadata && appMetadata.mode !== "deploy") {
       if (!await promptChangeMode()) {
         process.exit(0);
       }
@@ -7879,6 +7915,7 @@ var PACKAGE_MATCH = [
   "aws-cdk",
   "@aws-cdk",
   "constructs",
+  "svelte-kit-sst",
   "solid-start-sst"
 ];
 var FIELDS = ["dependencies", "devDependencies"];
@@ -8066,7 +8103,6 @@ var diff2 = (program2) => program2.command(
     const { useAWSClient: useAWSClient2 } = await Promise.resolve().then(() => (init_credentials(), credentials_exports));
     const { CloudFormationClient: CloudFormationClient4, GetTemplateCommand } = await import("@aws-sdk/client-cloudformation");
     const { createSpinner: createSpinner2 } = await Promise.resolve().then(() => (init_spinner(), spinner_exports));
-    const { green } = await import("colorette");
     const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
     const project = useProject2();
     const assembly = await Stacks.synth({
@@ -8080,12 +8116,17 @@ var diff2 = (program2) => program2.command(
       const spinner = createSpinner2(
         `${stack.stackName}: Checking for changes...`
       );
-      const response = await cfn.send(
-        new GetTemplateCommand({
-          StackName: stack.stackName
-        })
-      );
-      const oldTemplate = JSON.parse(response.TemplateBody);
+      const oldTemplate = await getTemplate(stack.stackName);
+      if (!oldTemplate) {
+        spinner.clear();
+        Colors2.line(
+          `\u279C  ${Colors2.dim.bold(
+            stackNameToId2(stack.stackName) + ":"
+          )} New stack`
+        );
+        Colors2.gap();
+        continue;
+      }
       const { count, diff: diff3 } = await Stacks.diff(stack, oldTemplate);
       spinner.clear();
       if (count === 0) {
@@ -8128,6 +8169,19 @@ var diff2 = (program2) => program2.command(
       );
     }
     process.exit(0);
+    async function getTemplate(stackName) {
+      try {
+        const response = await cfn.send(
+          new GetTemplateCommand({ StackName: stackName })
+        );
+        return JSON.parse(response.TemplateBody);
+      } catch (e) {
+        if (e.name === "ValidationError" && e.message.includes("does not exist")) {
+          return;
+        }
+        throw e;
+      }
+    }
   }
 );