sst 2.5.7 → 2.7.0

package/node/site/index.js

@@ -1,19 +1,18 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const StaticSite = createProxy("StaticSite");
-export const ReactStaticSite = createProxy("ReactStaticSite");
-export const ViteStaticSite = createProxy("ViteStaticSite");
-export const RemixSite = createProxy("RemixSite");
-export const NextjsSite = createProxy("NextjsSite");
-export const SolidStartSite = createProxy("SolidStartSite");
-const staticSiteData = getVariables("StaticSite");
-const reactSiteData = getVariables("ReactStaticSite");
-const viteSiteData = getVariables("ViteStaticSite");
-const nextjsSiteData = getVariables("NextjsSite");
-const remixSiteData = getVariables("RemixSite");
-const solidStartSiteData = getVariables("SolidStartSite");
-Object.assign(StaticSite, staticSiteData);
-Object.assign(ReactStaticSite, reactSiteData);
-Object.assign(ViteStaticSite, viteSiteData);
-Object.assign(NextjsSite, nextjsSiteData);
-Object.assign(RemixSite, remixSiteData);
-Object.assign(SolidStartSite, solidStartSiteData);
+import { createProxy } from "../util/index.js";
+export const StaticSite = 
+/* @__PURE__ */ createProxy("StaticSite");
+export const ReactStaticSite = 
+/* @__PURE__ */
+createProxy("ReactStaticSite");
+export const ViteStaticSite = 
+/* @__PURE__ */
+createProxy("ViteStaticSite");
+export const RemixSite = 
+/* @__PURE__ */
+createProxy("RemixSite");
+export const NextjsSite = 
+/* @__PURE__ */
+createProxy("NextjsSite");
+export const SolidStartSite = 
+/* @__PURE__ */
+createProxy("SolidStartSite");

package/node/table/index.js

@@ -1,3 +1,4 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const Table = createProxy("Table");
-Object.assign(Table, getVariables("Table"));
+import { createProxy } from "../util/index.js";
+export const Table = 
+/* @__PURE__ */
+createProxy("Table");

package/node/topic/index.js

@@ -1,3 +1,4 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const Topic = createProxy("Topic");
-Object.assign(Topic, getVariables("Topic"));
+import { createProxy } from "../util/index.js";
+export const Topic = 
+/* @__PURE__ */
+createProxy("Topic");

package/node/util/index.d.ts

@@ -1,2 +1,2 @@
 export declare function createProxy<T extends object>(constructName: string): T;
-export declare function getVariables(constructName: string): Record<string, Record<string, string>>;
+export declare function getVariables2(constructName: string): Record<string, Record<string, string>>;

package/node/util/index.js

@@ -14,7 +14,7 @@ let allVariables = {};
 //       https://discord.com/channels/983865673656705025/1089184080534446110
 const _placeholder = await parseEnvironment();
 export function createProxy(constructName) {
-    return new Proxy({}, {
+    const result = new Proxy({}, {
         get(target, prop) {
             if (typeof prop === "string") {
                 // normalize prop to convert kebab cases like `my-table` to `my_table`
@@ -27,8 +27,10 @@ export function createProxy(constructName) {
             return Reflect.get(target, prop);
         },
     });
+    Object.assign(result, getVariables2(constructName));
+    return result;
 }
-export function getVariables(constructName) {
+export function getVariables2(constructName) {
     return allVariables[constructName] || {};
 }
 async function parseEnvironment() {

package/package.json

@@ -1,6 +1,7 @@
 {
+  "sideEffects": false,
   "name": "sst",
-  "version": "2.5.7",
+  "version": "2.7.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -9,7 +10,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/serverless-stack/sst.git",
+    "url": "git+https://github.com/estyrke/serverless-stack.git",
     "directory": "packages/cli"
   },
   "exports": {
@@ -67,7 +68,7 @@
     "get-port": "^6.1.2",
     "glob": "^8.0.3",
     "graphql": "*",
-    "graphql-helix": "^1.12.0",
+    "graphql-yoga": "^3.9.0",
     "immer": "9",
     "ink": "^4.0.0",
     "ink-spinner": "^5.0.0",

package/sst.mjs

@@ -6698,18 +6698,18 @@ var init_config = __esm({
         );
       }
       Config2.removeSecret = removeSecret;
-      async function restart(key) {
+      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"
-        ).filter((c) => c.data.secrets.includes(key));
+        ).filter((c) => keys.some((key) => c.data.secrets.includes(key)));
         const siteDataPlaceholder = siteData.filter(
           (c) => c.data.mode === "placeholder"
         );
         const siteDataEdge = siteData.filter((c) => c.data.mode === "deployed").filter((c) => c.data.edge);
         const siteDataRegional = siteData.filter((c) => c.data.mode === "deployed").filter((c) => !c.data.edge);
         const regionalSiteArns = siteData.map((s) => s.data.server);
-        const functionData = Object.values(metadata3).flat().filter((c) => c.type === "Function").filter((c) => !regionalSiteArns.includes(c.data.arn)).filter((c) => c.data.secrets.includes(key));
+        const functionData = Object.values(metadata3).flat().filter((c) => c.type === "Function").filter((c) => !regionalSiteArns.includes(c.data.arn)).filter((c) => keys.some((key) => c.data.secrets.includes(key)));
         const restartedSites = (await Promise.all(
           siteDataRegional.map(async (s) => {
             const restarted = await restartFunction(s.data.server);
@@ -7721,6 +7721,60 @@ var list = (program2) => program2.command(
   }
 );
 
+// src/cli/commands/secrets/load.ts
+var load2 = (program2) => program2.command(
+  "load <filename>",
+  "Loads secrets from an .env file",
+  (yargs2) => yargs2.positional("filename", {
+    type: "string",
+    demandOption: true
+  }),
+  async (args) => {
+    const { Config: Config2 } = await Promise.resolve().then(() => (init_config(), config_exports));
+    const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
+    const { blue: blue4 } = await import("colorette");
+    const { createSpinner: createSpinner2 } = await Promise.resolve().then(() => (init_spinner(), spinner_exports));
+    const { parse: parse2 } = await import("dotenv");
+    const fs18 = await import("fs/promises");
+    const fileContent = await fs18.readFile(args.filename, "utf-8");
+    const envVars = parse2(fileContent);
+    const setting = createSpinner2(
+      ` Setting secrets from "${args.filename}"`
+    ).start();
+    for (const [key, value] of Object.entries(envVars)) {
+      await Config2.setSecret({ key, value });
+    }
+    setting.succeed();
+    const envNames = Object.keys(envVars);
+    const restarting = createSpinner2(
+      ` Restarting all resources using ${blue4(envNames.join(", "))}...`
+    ).start();
+    const { edgeSites, sites, placeholderSites, functions } = await Config2.restart(envNames);
+    restarting.stop().clear();
+    const siteCount = sites.length + placeholderSites.length;
+    if (siteCount > 0) {
+      Colors2.line(
+        Colors2.success(`\u2714 `),
+        siteCount === 1 ? `Reloaded ${siteCount} site` : `Reloaded ${siteCount} sites`
+      );
+    }
+    const functionCount = functions.length;
+    if (functionCount > 0) {
+      Colors2.line(
+        Colors2.success(`\u2714 `),
+        functionCount === 1 ? `Reloaded ${functionCount} function` : `Reloaded ${functionCount} functions`
+      );
+    }
+    edgeSites.forEach(({ id, type }) => {
+      Colors2.line(
+        Colors2.primary(`\u279C `),
+        `Redeploy the "${id}" ${type} to use the new secret`
+      );
+    });
+    process.exit(0);
+  }
+);
+
 // src/cli/commands/secrets/remove.ts
 var remove3 = (program2) => program2.command(
   "remove <name>",
@@ -7779,7 +7833,7 @@ var set = (program2) => program2.command(
     const restarting = createSpinner2(
       ` Reloading all resources using ${blue4(args.name)}...`
     ).start();
-    const { edgeSites, sites, placeholderSites, functions } = await Config2.restart(args.name);
+    const { edgeSites, sites, placeholderSites, functions } = await Config2.restart([args.name]);
     restarting.stop().clear();
     const siteCount = sites.length + placeholderSites.length;
     if (siteCount > 0) {
@@ -7811,6 +7865,7 @@ function secrets(program2) {
     yargs2.demandCommand(1);
     set(yargs2);
     get(yargs2);
+    load2(yargs2);
     list(yargs2);
     remove3(yargs2);
     return yargs2;