sst 2.36.6 → 2.36.8

package/constructs/AstroSite.js

@@ -28,38 +28,34 @@ export class AstroSite extends SsrSite {
         return JSON.parse(readFileSync(filePath, "utf-8"));
     }
     static getCFRoutingFunction({ routes, pageResolution, }) {
-        const serializedRoutes = "[\n" +
-            routes
-                .map((route) => {
-                return `    {route: "${route.route}", pattern: ${route.pattern}, type: "${route.type}", ${typeof route.prerender !== "undefined"
-                    ? `prerender: ${route.prerender}, `
-                    : ``}${route.redirectPath ? `redirectPath: "${route.redirectPath}", ` : ""}${route.redirectStatus
-                    ? `redirectStatus: ${route.redirectStatus}`
-                    : ""} }`;
-            })
-                .join(",\n") +
-            "\n  ]";
-        return `  // AstroSite CF Routing Function
-  var astroRoutes = ${serializedRoutes};
-  var matchedRoute = astroRoutes.find((route) => route.pattern.test(request.uri));
-  if (matchedRoute) {
-    if (matchedRoute.type === "redirect") {
-      var redirectPath = matchedRoute.redirectPath;
-      matchedRoute.pattern.exec(request.uri).forEach((match, index) => {
-        redirectPath = redirectPath.replace(\`\\\${\${index}}\`, match);
+        const serializedRoutes = routes.map((route) => ({
+            rt: route.route,
+            pt: route.pattern,
+            t: route.type,
+            pr: route.prerender === true ? true : undefined,
+            rp: route.redirectPath,
+            rs: route.redirectStatus,
+        }));
+        return `
+  var routes = ${JSON.stringify(serializedRoutes)}
+  var match = routes.find((route) => new RegExp(route.pt).test(request.uri));
+  if (match) {
+    if (match.t === "redirect") {
+      var redirectPath = match.rp;
+      new RegExp(match.pt).exec(request.uri)?.forEach((match, index) => {
+        redirectPath = redirectPath.replace(\`\\\${\${index}}\`, match)
       });
-      var statusCode = matchedRoute.redirectStatus || 308;
       return {
-        statusCode,
+        statusCode: match.rs || 308,
         headers: { location: { value: redirectPath } },
       };
-    } else if (matchedRoute.type === "page" && matchedRoute.prerender) {
+    } else if (match.t === "page" && match.pr) {
       ${pageResolution === "file"
             ? `request.uri = request.uri === "/" ? "/index.html" : request.uri.replace(/\\/?$/, ".html");`
             : `request.uri = request.uri.replace(/\\/?$/, "/index.html");`}
     }
   }
-  // End AstroSite CF Routing Function`;
+`;
     }
     plan() {
         const { path: sitePath } = this.props;

package/node/util/loader.js

@@ -9,10 +9,11 @@ export function createLoader(batchFn) {
         const batch = current;
         if (!batch)
             return;
-        const result = await batchFn(batch.keys);
-        for (let i = 0; i < result.length; i++) {
-            batch.promises[i](result[i]);
-        }
+        batchFn(batch.keys).then((result) => {
+            for (let i = 0; i < result.length; i++) {
+                batch.promises[i](result[i]);
+            }
+        });
         current = undefined;
     }
     function getBatch() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.36.6",
+  "version": "2.36.8",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -120,7 +120,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.36.6",
+    "astro-sst": "2.36.8",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",