sst 2.2.2 → 2.2.4

package/cli/commands/update.js

@@ -82,4 +82,5 @@ export const update = (program) => program.command("update [version]", "Update y
     }
     Colors.gap();
     Colors.line(`${Colors.primary(`➜`)}  ${Colors.warning("Make sure to run: npm install (or pnpm install, or yarn)")}`);
+    process.exit(0);
 });

package/cli/ui/deploy.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" resolution-mode="require"/>
+/// <reference types="react" />
 import { Stacks } from "../../stacks/index.js";
 import type { CloudAssembly } from "aws-cdk-lib/cx-api";
 interface Props {

package/cli/ui/deploy.js

@@ -2,11 +2,9 @@ import React, { useState, useEffect } from "react";
 import { Box, Text } from "ink";
 import { useBus } from "../../bus.js";
 import { Stacks } from "../../stacks/index.js";
-import inkSpinner from "ink-spinner";
+import Spinner from "ink-spinner";
 import { Colors } from "../colors.js";
 import { useProject } from "../../project.js";
-// @ts-ignore
-const { default: Spinner } = inkSpinner;
 export const DeploymentUI = (props) => {
     const [resources, setResources] = useState({});
     useEffect(() => {

package/cli/ui/functions.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" resolution-mode="require"/>
+/// <reference types="react" />
 export declare function Functions(): JSX.Element;

package/cli/ui/functions.js

@@ -1,12 +1,10 @@
 import { dim } from "colorette";
 import { Text } from "ink";
-import inkSpinner from "ink-spinner";
+import Spinner from "ink-spinner";
 import React, { useEffect, useState } from "react";
 import { useBus } from "../../bus.js";
 import { useFunctions } from "../../constructs/Function.js";
 import { Colors } from "../colors.js";
-// @ts-ignore
-const { default: Spinner } = inkSpinner;
 export function Functions() {
     const [functions, setFunctions] = useState({});
     useEffect(() => {

package/constructs/AppSyncApi.d.ts

@@ -507,7 +507,7 @@ export declare class AppSyncApi extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getFunctionBinding(): FunctionBindingProps | undefined;
     private createGraphApi;
     private addDataSource;
     private addResolver;

package/constructs/AppSyncApi.js

@@ -252,6 +252,10 @@ export class AppSyncApi extends Construct {
     }
     /** @internal */
     getFunctionBinding() {
+        // Do not bind imported AppSync APIs b/c we don't know the API URL
+        if (!this.url) {
+            return;
+        }
         return {
             clientPackage: "api",
             variables: {

package/constructs/NextjsSite.js

@@ -147,7 +147,7 @@ export class NextjsSite extends SsrSite {
         };
         // Create default behavior
         // default handler for requests that don't match any other path:
-        //   - try lambda handler first first
+        //   - try lambda handler first
         //   - if failed, fall back to S3
         const fallbackOriginGroup = new OriginGroup({
             primaryOrigin: serverBehavior.origin,
@@ -160,6 +160,7 @@ export class NextjsSite extends SsrSite {
             compress: true,
             cachePolicy: serverBehavior.cachePolicy,
             edgeLambdas: serverBehavior.edgeLambdas,
+            ...(cfDistributionProps.defaultBehavior || {}),
         };
         /**
          * Next.js requests

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -69,15 +69,15 @@
     "graphql": "*",
     "graphql-helix": "^1.12.0",
     "immer": "9",
-    "ink": "^3.2.0",
-    "ink-spinner": "^4.0.3",
+    "ink": "^4.0.0",
+    "ink-spinner": "^5.0.0",
     "kysely": "^0.23.4",
     "kysely-codegen": "^0.9.0",
     "kysely-data-api": "^0.2.0",
     "minimatch": "^6.1.6",
     "openid-client": "^5.1.8",
     "ora": "^6.1.2",
-    "react": "17.0.2",
+    "react": "18.2.0",
     "remeda": "^1.3.0",
     "sst-aws-cdk": "2.62.2-3",
     "undici": "^5.12.0",
@@ -87,11 +87,10 @@
     "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-cloudfront": "^3.279.0",
     "@aws-sdk/client-codebuild": "^3.279.0",
+    "@aws-sdk/client-iam": "^3.279.0",
     "@aws-sdk/types": "^3.272.0",
     "@graphql-tools/merge": "^8.3.16",
     "@sls-next/lambda-at-edge": "^3.7.0",
@@ -109,6 +108,7 @@
     "@types/uuid": "^8.3.4",
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
+    "adm-zip": "^0.5.10",
     "archiver": "^5.3.1",
     "tsx": "^3.12.1",
     "typescript": "^4.9.5",

package/runtime/handlers/go.js

@@ -4,11 +4,10 @@ import { useRuntimeHandlers } from "../handlers.js";
 import { useRuntimeWorkers } from "../workers.js";
 import { Context } from "../../context/context.js";
 import { VisibleError } from "../../error.js";
-import { exec, spawn } from "child_process";
-import { promisify } from "util";
+import { spawn } from "child_process";
 import { useRuntimeServerConfig } from "../server.js";
 import { isChild } from "../../util/fs.js";
-const execAsync = promisify(exec);
+import { execAsync } from "../../util/process.js";
 export const useGoHandler = Context.memo(async () => {
     const workers = await useRuntimeWorkers();
     const server = await useRuntimeServerConfig();
@@ -58,7 +57,7 @@ export const useGoHandler = Context.memo(async () => {
             if (input.mode === "start") {
                 try {
                     const target = path.join(input.out, handlerName);
-                    const result = await execAsync(`go build -ldflags '-s -w' -o ${target} ./${src}`, {
+                    const result = await execAsync(`go build -ldflags '-s -w' -o '${target}' ./${src}`, {
                         cwd: project,
                         env: {
                             ...process.env,
@@ -72,7 +71,7 @@ export const useGoHandler = Context.memo(async () => {
             if (input.mode === "deploy") {
                 try {
                     const target = path.join(input.out, "bootstrap");
-                    await execAsync(`go build -ldflags '-s -w' -o ${target} ./${src}`, {
+                    await execAsync(`go build -ldflags '-s -w' -o '${target}' ./${src}`, {
                         cwd: project,
                         env: {
                             ...process.env,

package/sst.mjs

@@ -4737,8 +4737,7 @@ __export(go_exports, {
 });
 import path10 from "path";
 import fs11 from "fs/promises";
-import { exec as exec3, spawn as spawn2 } from "child_process";
-import { promisify as promisify2 } from "util";
+import { spawn as spawn2 } from "child_process";
 async function find(dir, target) {
   if (dir === "/")
     throw new VisibleError(`Could not find a ${target} file`);
@@ -4746,7 +4745,7 @@ async function find(dir, target) {
     return dir;
   return find(path10.join(dir, ".."), target);
 }
-var execAsync2, useGoHandler;
+var useGoHandler;
 var init_go = __esm({
   "src/runtime/handlers/go.ts"() {
     "use strict";
@@ -4756,7 +4755,7 @@ var init_go = __esm({
     init_error();
     init_server2();
     init_fs();
-    execAsync2 = promisify2(exec3);
+    init_process();
     useGoHandler = Context.memo(async () => {
       const workers = await useRuntimeWorkers();
       const server = await useRuntimeServerConfig();
@@ -4806,8 +4805,8 @@ var init_go = __esm({
           if (input.mode === "start") {
             try {
               const target = path10.join(input.out, handlerName);
-              const result = await execAsync2(
-                `go build -ldflags '-s -w' -o ${target} ./${src}`,
+              const result = await execAsync(
+                `go build -ldflags '-s -w' -o '${target}' ./${src}`,
                 {
                   cwd: project,
                   env: {
@@ -4822,7 +4821,7 @@ var init_go = __esm({
           if (input.mode === "deploy") {
             try {
               const target = path10.join(input.out, "bootstrap");
-              await execAsync2(`go build -ldflags '-s -w' -o ${target} ./${src}`, {
+              await execAsync(`go build -ldflags '-s -w' -o '${target}' ./${src}`, {
                 cwd: project,
                 env: {
                   ...process.env,
@@ -4853,8 +4852,8 @@ __export(rust_exports, {
 import path11 from "path";
 import fs12 from "fs/promises";
 import { exec as exec4, spawn as spawn3 } from "child_process";
-import { promisify as promisify3 } from "util";
-var execAsync3, useRustHandler;
+import { promisify as promisify2 } from "util";
+var execAsync2, useRustHandler;
 var init_rust = __esm({
   "src/runtime/handlers/rust.ts"() {
     "use strict";
@@ -4864,7 +4863,7 @@ var init_rust = __esm({
     init_error();
     init_server2();
     init_fs();
-    execAsync3 = promisify3(exec4);
+    execAsync2 = promisify2(exec4);
     useRustHandler = Context.memo(async () => {
       const workers = await useRuntimeWorkers();
       const server = await useRuntimeServerConfig();
@@ -4922,7 +4921,7 @@ var init_rust = __esm({
           sources.set(input.functionID, project);
           if (input.mode === "start") {
             try {
-              await execAsync3(`cargo build --bin ${parsed.name}`, {
+              await execAsync2(`cargo build --bin ${parsed.name}`, {
                 cwd: project,
                 env: {
                   ...process.env
@@ -4938,7 +4937,7 @@ var init_rust = __esm({
           }
           if (input.mode === "deploy") {
             try {
-              await execAsync3(`cargo lambda build --release --bin ${parsed.name}`, {
+              await execAsync2(`cargo lambda build --release --bin ${parsed.name}`, {
                 cwd: project,
                 env: {
                   ...process.env
@@ -5036,11 +5035,11 @@ __export(python_exports, {
 });
 import path13 from "path";
 import { exec as exec5, spawn as spawn4 } from "child_process";
-import { promisify as promisify4 } from "util";
+import { promisify as promisify3 } from "util";
 import { Runtime } from "aws-cdk-lib/aws-lambda";
 import os3 from "os";
 import url6 from "url";
-var execAsync4, RUNTIME_MAP, usePythonHandler;
+var execAsync3, RUNTIME_MAP, usePythonHandler;
 var init_python = __esm({
   "src/runtime/handlers/python.ts"() {
     "use strict";
@@ -5050,7 +5049,7 @@ var init_python = __esm({
     init_server2();
     init_fs();
     init_pythonBundling();
-    execAsync4 = promisify4(exec5);
+    execAsync3 = promisify3(exec5);
     RUNTIME_MAP = {
       "python2.7": Runtime.PYTHON_2_7,
       "python3.6": Runtime.PYTHON_3_6,
@@ -5973,7 +5972,7 @@ __export(deploy_exports, {
 });
 import React, { useState, useEffect } from "react";
 import { Box, Text } from "ink";
-import inkSpinner from "ink-spinner";
+import Spinner from "ink-spinner";
 function printDeploymentResults(assembly, results, remove4) {
   const success = Object.entries(results).filter(
     ([_stack, result]) => stacks_exports.isSuccess(result.status)
@@ -6058,7 +6057,7 @@ function getApiLogRoleHelper(error2) {
     return `This is a common error when configuring Access Log for WebSocket APIs. The AWS API Gateway service in your AWS account does not have permissions to the CloudWatch logs service. Follow this article to create an IAM role for logging to CloudWatch - https://aws.amazon.com/premiumsupport/knowledge-center/api-gateway-cloudwatch-logs/`;
   }
 }
-var Spinner, DeploymentUI;
+var DeploymentUI;
 var init_deploy2 = __esm({
   "src/cli/ui/deploy.tsx"() {
     "use strict";
@@ -6066,7 +6065,6 @@ var init_deploy2 = __esm({
     init_stacks();
     init_colors();
     init_project();
-    ({ default: Spinner } = inkSpinner);
     DeploymentUI = (props) => {
       const [resources, setResources] = useState({});
       useEffect(() => {
@@ -6292,9 +6290,9 @@ __export(pothos_exports2, {
 });
 import fs16 from "fs/promises";
 import { exec as exec6 } from "child_process";
-import { promisify as promisify5 } from "util";
+import { promisify as promisify4 } from "util";
 import path18 from "path";
-var execAsync5, usePothosBuilder;
+var execAsync4, usePothosBuilder;
 var init_pothos2 = __esm({
   "src/cli/commands/plugins/pothos.ts"() {
     "use strict";
@@ -6302,7 +6300,7 @@ var init_pothos2 = __esm({
     init_context();
     init_pothos();
     init_colors();
-    execAsync5 = promisify5(exec6);
+    execAsync4 = promisify4(exec6);
     usePothosBuilder = Context.memo(() => {
       let routes = [];
       const bus = useBus();
@@ -6313,7 +6311,7 @@ var init_pothos2 = __esm({
           });
           await fs16.writeFile(route.output, schema);
           if (Array.isArray(route.commands) && route.commands.length > 0) {
-            await Promise.all(route.commands.map((cmd) => execAsync5(cmd)));
+            await Promise.all(route.commands.map((cmd) => execAsync4(cmd)));
           }
           Colors.line(Colors.success(`\u2714`), " Pothos: Extracted pothos schema");
         } catch (ex) {
@@ -7671,6 +7669,7 @@ var update = (program2) => program2.command(
         "Make sure to run: npm install (or pnpm install, or yarn)"
       )}`
     );
+    process.exit(0);
   }
 );