Merge branch 'sst:dev' into dev

README.md

@@ -61,6 +61,22 @@ Here's how you can contribute:
 - Find a bug? Open an issue
 - Feature request? Submit a PR 
 
+## Running Locally
+
+1. Clone the repo
+2. `bun install`
+3. `cd platform && bun run build`
+
+Now you can run the CLI locally on any of the `examples/` apps.
+
+```bash
+cd examples/aws-api
+go run ../../cmd/sst <command>
+```
+
+If you want to build the CLI, you can run `go build ./cmd/sst` from the root. This will create a
+`sst` binary that you can use.
+
 ---
 
 **Join our community** [Discord](https://sst.dev/discord) | [YouTube](https://www.youtube.com/c/sst-dev) | [Twitter](https://twitter.com/SST_dev)

cmd/sst/init.go

@@ -110,6 +110,13 @@ func CmdInit(cli *cli.Cli) error {
 		template = "remix"
 		break
 
+	case slices.ContainsFunc(hints, func(s string) bool { return (strings.HasPrefix(s, "vite.config") && fileContains(s, "@analogjs/platform")) }):
+		fmt.Println("  Analog detected. This will...")
+		fmt.Println("   - create an sst.config.ts")
+		fmt.Println("   - add sst to package.json")
+		template = "analog"
+		break
+
 	case slices.ContainsFunc(hints, func(s string) bool { return strings.HasPrefix(s, "angular.json") }):
 		fmt.Println("  Angular detected. This will...")
 		fmt.Println("   - create an sst.config.ts")

cmd/sst/main.go

@@ -469,8 +469,8 @@ var root = &cli.Command{
 				{
 					Name: "target",
 					Description: cli.Description{
-						Short: "Comma seperated list of target URNs",
-						Long:  "Comma seperated list of target URNs.",
+						Short: "Comma separated list of target URNs",
+						Long:  "Comma separated list of target URNs.",
 					},
 				},
 			},
@@ -501,7 +501,7 @@ var root = &cli.Command{
 					"This is useful for cases when you pull some changes from a teammate and want to",
 					"see what will be deployed; before doing the actual deploy.",
 					"",
-					"Optionall, you can diff a specific set of resources by passing in a list of their URNs.",
+					"Optionally, you can diff a specific set of resources by passing in a list of their URNs.",
 					"",
 					"```bash frame=\"none\"",
 					"sst diff --target urn:pulumi:prod::www::sst:aws:Astro::Astro,urn:pulumi:prod::www::sst:aws:Bucket::Assets",
@@ -522,8 +522,8 @@ var root = &cli.Command{
 				{
 					Name: "target",
 					Description: cli.Description{
-						Short: "Comma seperated list of target URNs",
-						Long:  "Comma seperated list of target URNs.",
+						Short: "Comma separated list of target URNs",
+						Long:  "Comma separated list of target URNs.",
 					},
 				},
 				{
@@ -852,8 +852,8 @@ var root = &cli.Command{
 					Name: "target",
 					Type: "string",
 					Description: cli.Description{
-						Short: "Comma seperated list of target URNs",
-						Long:  "Comma seperated list of target URNs.",
+						Short: "Comma separated list of target URNs",
+						Long:  "Comma separated list of target URNs.",
 					},
 				},
 			},
@@ -991,8 +991,8 @@ var root = &cli.Command{
 					Name: "target",
 					Type: "string",
 					Description: cli.Description{
-						Short: "Comma seperated list of target URNs",
-						Long:  "Comma seperated list of target URNs.",
+						Short: "Comma separated list of target URNs",
+						Long:  "Comma separated list of target URNs.",
 					},
 				},
 			},

cmd/sst/mosaic/multiplexer/tcell-term/parse.go

@@ -428,7 +428,7 @@ func csiEntry(r rune, p *Parser) stateFn {
 		return ground
 	default:
 		// Return to ground on unexpected characters
-		p.emit(fmt.Errorf("unexpected characted: %c", r))
+		p.emit(fmt.Errorf("unexpected character: %c", r))
 		return ground
 	}
 }
@@ -462,7 +462,7 @@ func csiParam(r rune, p *Parser) stateFn {
 		return csiIgnore
 	default:
 		// Return to ground on unexpected characters
-		p.emit(fmt.Errorf("unexpected characted: %c", r))
+		p.emit(fmt.Errorf("unexpected character: %c", r))
 		return ground
 	}
 }
@@ -521,7 +521,7 @@ func csiIntermediate(r rune, p *Parser) stateFn {
 		return ground
 	default:
 		// Return to ground on unexpected characters
-		p.emit(fmt.Errorf("unexpected characted: %c", r))
+		p.emit(fmt.Errorf("unexpected character: %c", r))
 		return ground
 	}
 }
@@ -586,7 +586,7 @@ func dcsIntermediate(r rune, p *Parser) stateFn {
 		return dcsPassthrough
 	default:
 		// Return to ground on unexpected characters
-		p.emit(fmt.Errorf("unexpected characted: %c", r))
+		p.emit(fmt.Errorf("unexpected character: %c", r))
 		return ground
 	}
 }
@@ -617,7 +617,7 @@ func dcsParam(r rune, p *Parser) stateFn {
 		return dcsPassthrough
 	default:
 		// Return to ground on unexpected characters
-		p.emit(fmt.Errorf("unexpected characted: %c", r))
+		p.emit(fmt.Errorf("unexpected character: %c", r))
 		return ground
 	}
 }

cmd/sst/mosaic/ui/error.go

@@ -12,10 +12,22 @@ func parseError(input string) []string {
 		input = regexp.MustCompile(`<ref \*\d+>\s*`).ReplaceAllString(input, "")
 		input = strings.TrimSpace(input)
 		lines := strings.Split(input, "\n")
-		if strings.HasPrefix(lines[0], "VisibleError") {
-			stripped := strings.SplitN(lines[0], ": ", 2)
-			return stripped[1:]
+
+		// Remove the "VisibleError: " prefix from the first line if it exists
+		if strings.HasPrefix(lines[0], "VisibleError: ") {
+			lines[0] = strings.TrimPrefix(lines[0], "VisibleError: ")
+
+			// Find the first line that starts with spaces followed by "at" and
+			// remove that line and all following lines
+			for i, line := range lines {
+				trimmed := strings.TrimLeft(line, " ")
+				if strings.HasPrefix(trimmed, "at") {
+					// Remove all lines starting from this point
+					return lines[:i]
+				}
+			}
 		}
+
 		return lines
 	}
 

cmd/sst/mosaic/ui/ui.go

@@ -412,7 +412,9 @@ func (u *UI) Event(unknown interface{}) {
 				if status.URN != "" {
 					u.println(TEXT_DANGER_BOLD.Render("   " + u.FormatURN(status.URN)))
 				}
-				u.print(TEXT_NORMAL.Render("   " + strings.Join(parseError(status.Message), "\n   ")))
+				for _, line := range parseError(status.Message) {
+					u.println(TEXT_NORMAL.Render("   " + line))
+				}
 				importDiffs, ok := evt.ImportDiffs[status.URN]
 				if ok {
 					isSSTComponent := strings.Contains(status.URN, "::sst")

cmd/sst/secret.go

@@ -192,6 +192,7 @@ var CmdSecretLoad = &cli.Command{
 		url, _ := server.Discover(p.PathConfig(), p.App().Stage)
 		if url != "" {
 			dev.Deploy(c.Context, url)
+			return nil
 		}
 
 		ui.Success("Run \"sst deploy\" to update.")
@@ -349,15 +350,17 @@ var CmdSecretSet = &cli.Command{
 			return util.NewReadableError(err, "Could not set secret")
 		}
 		url, _ := server.Discover(p.PathConfig(), p.App().Stage)
+		suffix := " Run \"sst deploy\" to update."
 		if url != "" {
+			suffix = ""
 			dev.Deploy(c.Context, url)
 		}
 
 		if c.Bool("fallback") {
-			ui.Success(fmt.Sprintf("Set fallback value for \"%s\". Run \"sst deploy\" to update.", key))
+			ui.Success(fmt.Sprintf("Set fallback value for \"%s\".%s", key, suffix))
 			return nil
 		}
-		ui.Success(fmt.Sprintf("Set \"%s\" for stage \"%s\". Run \"sst deploy\" to update.", key, p.App().Stage))
+		ui.Success(fmt.Sprintf("Set \"%s\" for stage \"%s\".%s", key, p.App().Stage, suffix))
 		return nil
 	},
 }
@@ -438,14 +441,16 @@ var CmdSecretRemove = &cli.Command{
 			return util.NewReadableError(err, "Could not set secret")
 		}
 		url, _ := server.Discover(p.PathConfig(), p.App().Stage)
+		suffix := " Run \"sst deploy\" to update."
 		if url != "" {
+			suffix = ""
 			dev.Deploy(c.Context, url)
 		}
 		if c.Bool("fallback") {
-			ui.Success(fmt.Sprintf("Removed fallback value for \"%s\"", key))
+			ui.Success(fmt.Sprintf("Removed fallback value for \"%s\".%s", key, suffix))
 			return nil
 		}
-		ui.Success(fmt.Sprintf("Removed \"%s\" for stage \"%s\"", key, p.App().Stage))
+		ui.Success(fmt.Sprintf("Removed \"%s\" for stage \"%s\".%s", key, p.App().Stage, suffix))
 		return nil
 	},
 }

examples/aws-analog/.editorconfig

@@ -0,0 +1,16 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.ts]
+quote_type = single
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

examples/aws-analog/.gitignore

@@ -0,0 +1,48 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# Compiled output
+/dist
+/tmp
+/out-tsc
+/bazel-out
+
+# Node
+/node_modules
+npm-debug.log
+yarn-error.log
+
+# IDEs and editors
+.idea/
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# Miscellaneous
+/.angular/cache
+/.nx/cache
+/.nx/workspace-data
+.sass-cache/
+/connect.lock
+/coverage
+/libpeerconnection.log
+testem.log
+/typings
+
+# System files
+.DS_Store
+Thumbs.db
+
+# sst
+.sst
+.output

examples/aws-analog/.vscode/extensions.json

@@ -0,0 +1,4 @@
+{
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
+  "recommendations": ["angular.ng-template", "analogjs.vscode-analog"]
+}

examples/aws-analog/.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "ng serve",
+      "type": "chrome",
+      "request": "launch",
+      "preLaunchTask": "npm: start",
+      "url": "http://localhost:5173/"
+    },
+    {
+      "name": "ng test",
+      "type": "chrome",
+      "request": "launch",
+      "preLaunchTask": "npm: test"
+    }
+  ]
+}

examples/aws-analog/.vscode/tasks.json

@@ -0,0 +1,42 @@
+{
+  // For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "npm",
+      "script": "start",
+      "isBackground": true,
+      "problemMatcher": {
+        "owner": "typescript",
+        "pattern": "$tsc",
+        "background": {
+          "activeOnStart": true,
+          "beginsPattern": {
+            "regexp": "(.*?)"
+          },
+          "endsPattern": {
+            "regexp": "bundle generation complete"
+          }
+        }
+      }
+    },
+    {
+      "type": "npm",
+      "script": "test",
+      "isBackground": true,
+      "problemMatcher": {
+        "owner": "typescript",
+        "pattern": "$tsc",
+        "background": {
+          "activeOnStart": true,
+          "beginsPattern": {
+            "regexp": "(.*?)"
+          },
+          "endsPattern": {
+            "regexp": "bundle generation complete"
+          }
+        }
+      }
+    }
+  ]
+}

examples/aws-analog/README.md

@@ -0,0 +1,26 @@
+# Analog App
+
+This project was generated with [Analog](https://analogjs.org), the fullstack meta-framework for Angular.
+
+## Setup
+
+Run `npm install` to install the application dependencies.
+
+## Development
+
+Run `npm start` for a dev server. Navigate to `http://localhost:5173/`. The application automatically reloads if you change any of the source files.
+
+## Build
+
+Run `npm run build` to build the client/server project. The client build artifacts are located in the `dist/analog/public` directory. The server for the API build artifacts are located in the `dist/analog/server` directory.
+
+## Test
+
+Run `npm run test` to run unit tests with [Vitest](https://vitest.dev).
+
+## Community
+
+- Visit and Star the [GitHub Repo](https://github.com/analogjs/analog)
+- Join the [Discord](https://chat.analogjs.org)
+- Follow us on [Twitter](https://twitter.com/analogjs)
+- Become a [Sponsor](https://github.com/sponsors/brandonroberts)