sst 2.8.10 → 2.8.12

package/constructs/Job.js

@@ -183,14 +183,18 @@ export class Job extends Construct {
         const app = this.node.root;
         useDeferredTasks().add(async () => {
             // Build function
-            const bundle = await useRuntimeHandlers().build(this.node.addr, "deploy");
+            const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
             // create wrapper that calls the handler
-            if (bundle.type === "error")
-                throw new Error(`Failed to build job "${this.props.handler}"`);
-            const parsed = path.parse(bundle.handler);
+            if (result.type === "error") {
+                throw new Error([
+                    `Failed to build job "${this.props.handler}"`,
+                    ...result.errors,
+                ].join("\n"));
+            }
+            const parsed = path.parse(result.handler);
             const importName = parsed.ext.substring(1);
             const importPath = `./${path.join(parsed.dir, parsed.name)}.mjs`;
-            await fs.writeFile(path.join(bundle.out, "handler-wrapper.mjs"), [
+            await fs.writeFile(path.join(result.out, "handler-wrapper.mjs"), [
                 `console.log("")`,
                 `console.log("//////////////////////")`,
                 `console.log("// Start of the job //")`,
@@ -209,7 +213,7 @@ export class Job extends Construct {
                 `console.log("//////////////////////")`,
                 `console.log("")`,
             ].join("\n"));
-            const code = AssetCode.fromAsset(bundle.out);
+            const code = AssetCode.fromAsset(result.out);
             this.updateCodeBuildProjectCode(code, "handler-wrapper.mjs");
             // This should always be true b/c runtime is always Node.js
         });

package/constructs/SsrSite.js

@@ -267,6 +267,7 @@ export class SsrSite extends Construct {
                 cwd: sitePath,
                 stdio: "inherit",
                 env: {
+                    SST: "1",
                     ...process.env,
                     ...getBuildCmdEnvironment(environment),
                 },

package/constructs/SvelteKitSite.js

@@ -18,7 +18,7 @@ export class SvelteKitSite extends SsrSite {
     initBuildConfig() {
         return {
             typesPath: "src",
-            serverBuildOutputFile: ".svelte-kit-sst/server/lambda-handler/index.js",
+            serverBuildOutputFile: ".svelte-kit/svelte-kit-sst/server/lambda-handler/index.js",
             // Note: form action requests contain "/" in request query string
             //       ie. POST request with query string "?/action"
             //       CloudFront does not allow query string with "/". It needs to be encoded.
@@ -30,16 +30,16 @@ export class SvelteKitSite extends SsrSite {
           }
         }
       `,
-            clientBuildOutputDir: ".svelte-kit-sst/client",
+            clientBuildOutputDir: ".svelte-kit/svelte-kit-sst/client",
             clientBuildVersionedSubDir: "_app",
-            prerenderedBuildOutputDir: ".svelte-kit-sst/prerendered",
+            prerenderedBuildOutputDir: ".svelte-kit/svelte-kit-sst/prerendered",
         };
     }
     createFunctionForRegional() {
         const { runtime, timeout, memorySize, permissions, environment, nodejs, bind, cdk, } = this.props;
         const ssrFn = new SsrFunction(this, `ServerFunction`, {
             description: "Server handler for SvelteKit",
-            handler: path.join(this.props.path, ".svelte-kit-sst", "server", "lambda-handler", "index.handler"),
+            handler: path.join(this.props.path, ".svelte-kit", "svelte-kit-sst", "server", "lambda-handler", "index.handler"),
             runtime,
             memorySize,
             timeout,
@@ -60,7 +60,7 @@ export class SvelteKitSite extends SsrSite {
             },
             copyFiles: [
                 {
-                    from: path.join(this.props.path, ".svelte-kit-sst", "prerendered"),
+                    from: path.join(this.props.path, ".svelte-kit", "svelte-kit-sst", "prerendered"),
                     to: "prerendered",
                 },
             ],
@@ -72,7 +72,7 @@ export class SvelteKitSite extends SsrSite {
         const { runtime, timeout, memorySize, bind, permissions, environment, nodejs, } = this.props;
         return new EdgeFunction(this, `Server`, {
             scopeOverride: this,
-            handler: path.join(this.props.path, ".svelte-kit-sst", "server", "lambda-handler", "index.handler"),
+            handler: path.join(this.props.path, ".svelte-kit", "svelte-kit-sst", "server", "lambda-handler", "index.handler"),
             runtime,
             timeout,
             memorySize,
@@ -94,7 +94,7 @@ export class SvelteKitSite extends SsrSite {
         });
     }
     generateBuildId() {
-        const filePath = path.join(this.props.path, ".svelte-kit-sst/client/_app/version.json");
+        const filePath = path.join(this.props.path, ".svelte-kit/svelte-kit-sst/client/_app/version.json");
         const content = fs.readFileSync(filePath).toString();
         return JSON.parse(content).version;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.8.10",
+  "version": "2.8.12",
   "bin": {
     "sst": "cli/sst.js"
   },