astro 4.13.1 → 4.13.3

package/dist/actions/utils.js

@@ -1,31 +1,24 @@
-import { AstroError } from "../core/errors/errors.js";
-function hasActionsInternal(locals) {
-  return "_actionsInternal" in locals;
+import {} from "./runtime/utils.js";
+import { deserializeActionResult, getActionQueryString } from "./runtime/virtual/shared.js";
+function hasActionPayload(locals) {
+  return "_actionPayload" in locals;
 }
 function createGetActionResult(locals) {
   return (actionFn) => {
-    if (!hasActionsInternal(locals))
-      throw new AstroError({
-        name: "AstroActionError",
-        message: "Experimental actions are not enabled in your project.",
-        hint: "See https://docs.astro.build/en/reference/configuration-reference/#experimental-flags"
-      });
-    return locals._actionsInternal.getActionResult(actionFn);
+    if (!hasActionPayload(locals) || actionFn.toString() !== getActionQueryString(locals._actionPayload.actionName)) {
+      return void 0;
+    }
+    return deserializeActionResult(locals._actionPayload.actionResult);
   };
 }
-function createCallAction(locals) {
-  return (actionFn, input) => {
-    if (!hasActionsInternal(locals))
-      throw new AstroError({
-        name: "AstroActionError",
-        message: "Experimental actions are not enabled in your project.",
-        hint: "See https://docs.astro.build/en/reference/configuration-reference/#experimental-flags"
-      });
-    return locals._actionsInternal.callAction(actionFn, input);
+function createCallAction(context) {
+  return (baseAction, input) => {
+    const action = baseAction.bind(context);
+    return action(input);
   };
 }
 export {
   createCallAction,
   createGetActionResult,
-  hasActionsInternal
+  hasActionPayload
 };

package/dist/assets/build/generate.js

@@ -63,7 +63,7 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
         );
         await fs.promises.unlink(getFullImagePath(originalFilePath, env));
       }
-    } catch (e) {
+    } catch {
     }
   }
   async function generateImage(originalImage, filepath, options) {

package/dist/assets/endpoint/generic.js

@@ -14,7 +14,7 @@ async function loadRemoteImage(src, headers) {
       return void 0;
     }
     return await res.arrayBuffer();
-  } catch (err) {
+  } catch {
     return void 0;
   }
 }

package/dist/assets/endpoint/node.js

@@ -23,14 +23,14 @@ async function loadLocalImage(src, url) {
       if (!isAbsolute(filePath) || !filePath.startsWith(assetsDirPath)) {
         return void 0;
       }
-    } catch (err) {
+    } catch {
       return void 0;
     }
   }
   let buffer = void 0;
   try {
     buffer = await readFile(fileUrl);
-  } catch (e) {
+  } catch {
     try {
       const sourceUrl = new URL(src, url.origin);
       buffer = await loadRemoteImage(sourceUrl);
@@ -48,7 +48,7 @@ async function loadRemoteImage(src) {
       return void 0;
     }
     return Buffer.from(await res.arrayBuffer());
-  } catch (err) {
+  } catch {
     return void 0;
   }
 }

package/dist/assets/services/sharp.js

@@ -14,7 +14,7 @@ async function loadSharp() {
   let sharpImport;
   try {
     sharpImport = (await import("sharp")).default;
-  } catch (e) {
+  } catch {
     throw new AstroError(AstroErrorData.MissingSharp);
   }
   sharpImport.cache(false);

package/dist/assets/services/vendor/squoosh/avif/avif_node_dec.js

@@ -1332,7 +1332,7 @@ var Module = /* @__PURE__ */ function() {
         wasmMemory.grow(size - buffer.byteLength + 65535 >>> 16);
         updateGlobalBufferAndViews(wasmMemory.buffer);
         return 1;
-      } catch (e) {
+      } catch {
       }
     }
     function _emscripten_resize_heap(requestedSize) {

package/dist/assets/services/vendor/squoosh/avif/avif_node_enc.js

@@ -1473,7 +1473,7 @@ var Module = /* @__PURE__ */ function() {
         wasmMemory.grow(size - buffer.byteLength + 65535 >>> 16);
         updateGlobalBufferAndViews(wasmMemory.buffer);
         return 1;
-      } catch (e) {
+      } catch {
       }
     }
     function _emscripten_resize_heap(requestedSize) {

package/dist/assets/services/vendor/squoosh/mozjpeg/mozjpeg_node_dec.js

@@ -1336,7 +1336,7 @@ var Module = /* @__PURE__ */ function() {
         wasmMemory.grow(size - buffer.byteLength + 65535 >>> 16);
         updateGlobalBufferAndViews(wasmMemory.buffer);
         return 1;
-      } catch (e) {
+      } catch {
       }
     }
     function _emscripten_resize_heap(requestedSize) {

package/dist/assets/services/vendor/squoosh/mozjpeg/mozjpeg_node_enc.js

@@ -1439,7 +1439,7 @@ var Module = /* @__PURE__ */ function() {
         wasmMemory.grow(size - buffer.byteLength + 65535 >>> 16);
         updateGlobalBufferAndViews(wasmMemory.buffer);
         return 1;
-      } catch (e) {
+      } catch {
       }
     }
     function _emscripten_resize_heap(requestedSize) {

package/dist/assets/services/vendor/squoosh/webp/webp_node_dec.js

@@ -1310,7 +1310,7 @@ var Module = /* @__PURE__ */ function() {
         wasmMemory.grow(size - buffer.byteLength + 65535 >>> 16);
         updateGlobalBufferAndViews(wasmMemory.buffer);
         return 1;
-      } catch (e) {
+      } catch {
       }
     }
     function _emscripten_resize_heap(requestedSize) {

package/dist/assets/services/vendor/squoosh/webp/webp_node_enc.js

@@ -1472,7 +1472,7 @@ var Module = /* @__PURE__ */ function() {
         wasmMemory.grow(size - buffer.byteLength + 65535 >>> 16);
         updateGlobalBufferAndViews(wasmMemory.buffer);
         return 1;
-      } catch (e) {
+      } catch {
       }
     }
     function _emscripten_resize_heap(requestedSize) {

package/dist/assets/utils/metadata.js

@@ -17,7 +17,7 @@ async function imageMetadata(data, src) {
       format: type,
       orientation
     };
-  } catch (e) {
+  } catch {
     throw new AstroError({
       ...AstroErrorData.NoImageMetadata,
       message: AstroErrorData.NoImageMetadata.message(src)

package/dist/assets/utils/node/emitAsset.js

@@ -11,7 +11,7 @@ async function emitESMImage(id, _watchMode, fileEmitter) {
   let fileData;
   try {
     fileData = await fs.readFile(url);
-  } catch (err) {
+  } catch {
     return void 0;
   }
   const fileMetadata = await imageMetadata(fileData, id);

package/dist/assets/utils/remoteProbe.js

@@ -27,7 +27,7 @@ async function inferRemoteSize(url) {
           await reader.cancel();
           return dimensions;
         }
-      } catch (error) {
+      } catch {
       }
     }
   }

package/dist/assets/utils/vendor/image-size/lookup.js

@@ -6,7 +6,7 @@ const globalOptions = {
 function lookup(input) {
   const type = detector(input);
   if (typeof type !== "undefined") {
-    if (globalOptions.disabledTypes.indexOf(type) > -1) {
+    if (globalOptions.disabledTypes.includes(type)) {
       throw new TypeError("disabled file type: " + type);
     }
     const size = typeHandlers.get(type).calculate(input);

package/dist/assets/utils/vendor/image-size/types/svg.js

@@ -36,9 +36,9 @@ function parseViewbox(viewbox) {
   };
 }
 function parseAttributes(root) {
-  const width = root.match(extractorRegExps.width);
-  const height = root.match(extractorRegExps.height);
-  const viewbox = root.match(extractorRegExps.viewbox);
+  const width = extractorRegExps.width.exec(root);
+  const height = extractorRegExps.height.exec(root);
+  const viewbox = extractorRegExps.viewbox.exec(root);
   return {
     height: height && parseLength(height[2]),
     viewbox: viewbox && parseViewbox(viewbox[2]),
@@ -74,7 +74,7 @@ const SVG = {
   // Scan only the first kilo-byte to speed up the check on larger files
   validate: (input) => svgReg.test(toUTF8String(input, 0, 1e3)),
   calculate(input) {
-    const root = toUTF8String(input).match(extractorRegExps.root);
+    const root = extractorRegExps.root.exec(toUTF8String(input));
     if (root) {
       const attrs = parseAttributes(root[0]);
       if (attrs.width && attrs.height) {

package/dist/cli/info/index.js

@@ -49,7 +49,7 @@ async function copyToClipboard(text) {
         return;
       }
       command = "xclip -sel clipboard -l 1";
-    } catch (e) {
+    } catch {
       return;
     }
   }
@@ -66,7 +66,7 @@ async function copyToClipboard(text) {
       input: text.trim(),
       encoding: "utf8"
     });
-  } catch (e) {
+  } catch {
     console.error(
       colors.red(`
 Sorry, something went wrong!`) + ` Please copy the text above manually.`

package/dist/cli/install-package.js

@@ -13,7 +13,7 @@ async function getPackage(packageName, logger, options, otherDeps = []) {
     require2.resolve(packageName, { paths: [options.cwd ?? process.cwd()] });
     const packageImport = await import(packageName);
     return packageImport;
-  } catch (e) {
+  } catch {
     if (options.optional) return void 0;
     let message = `To continue, Astro requires the following dependency to be installed: ${bold(
       packageName
@@ -156,7 +156,7 @@ async function getRegistry() {
     const { stdout } = await execa(packageManager, ["config", "get", "registry"]);
     _registry = stdout?.trim()?.replace(/\/$/, "") || fallback;
     if (!new URL(_registry).host) _registry = fallback;
-  } catch (e) {
+  } catch {
     _registry = fallback;
   }
   return _registry;

package/dist/core/app/index.js

@@ -362,7 +362,7 @@ class App {
     });
   }
   #getDefaultStatusCode(routeData, pathname) {
-    if (!routeData.pattern.exec(pathname)) {
+    if (!routeData.pattern.test(pathname)) {
       for (const fallbackRoute of routeData.fallbackRoutes) {
         if (fallbackRoute.pattern.test(pathname)) {
           return 302;

package/dist/core/build/css-asset-name.d.ts

@@ -1,9 +1,9 @@
 import type { GetModuleInfo } from 'rollup';
 import type { AstroSettings } from '../../@types/astro.js';
-export declare function shortHashedName(id: string, ctx: {
+export declare function shortHashedName(settings: AstroSettings): (id: string, ctx: {
     getModuleInfo: GetModuleInfo;
-}): string;
-export declare function createNameHash(baseId: string | undefined, hashIds: string[]): string;
+}) => string;
+export declare function createNameHash(baseId: string | undefined, hashIds: string[], settings: AstroSettings): string;
 export declare function createSlugger(settings: AstroSettings): (id: string, ctx: {
     getModuleInfo: GetModuleInfo;
 }) => string;

package/dist/core/build/css-asset-name.js

@@ -1,20 +1,27 @@
 import crypto from "node:crypto";
 import npath from "node:path";
+import { fileURLToPath } from "node:url";
+import { normalizePath } from "vite";
 import { viteID } from "../util.js";
 import { getTopLevelPageModuleInfos } from "./graph.js";
 const confusingBaseNames = ["404", "500"];
-function shortHashedName(id, ctx) {
-  const parents = getTopLevelPageModuleInfos(id, ctx);
-  return createNameHash(
-    getFirstParentId(parents),
-    parents.map((page) => page.id)
-  );
+function shortHashedName(settings) {
+  return function(id, ctx) {
+    const parents = getTopLevelPageModuleInfos(id, ctx);
+    return createNameHash(
+      getFirstParentId(parents),
+      parents.map((page) => page.id),
+      settings
+    );
+  };
 }
-function createNameHash(baseId, hashIds) {
+function createNameHash(baseId, hashIds, settings) {
   const baseName = baseId ? prettifyBaseName(npath.parse(baseId).name) : "index";
   const hash = crypto.createHash("sha256");
+  const root = fileURLToPath(settings.config.root);
   for (const id of hashIds) {
-    hash.update(id, "utf-8");
+    const relativePath = npath.relative(root, id);
+    hash.update(normalizePath(relativePath), "utf-8");
   }
   const h = hash.digest("hex").slice(0, 8);
   const proposedName = baseName + "." + h;

package/dist/core/build/generate.js

@@ -223,7 +223,7 @@ async function getPathsForRoute(route, mod, pipeline, builtPaths) {
   return paths;
 }
 function getInvalidRouteSegmentError(e, route, staticPath) {
-  const invalidParam = e.message.match(/^Expected "([^"]+)"/)?.[1];
+  const invalidParam = /^Expected "([^"]+)"/.exec(e.message)?.[1];
   const received = invalidParam ? staticPath.params[invalidParam] : void 0;
   let hint = "Learn about dynamic routes at https://docs.astro.build/en/core-concepts/routing/#dynamic-routes";
   if (invalidParam && typeof received === "string") {
@@ -287,7 +287,7 @@ async function generatePath(pathname, pipeline, gopts, route) {
   if (route.type === "fallback" && // If route is index page, continue rendering. The index page should
   // always be rendered
   route.pathname !== "/" && // Check if there is a translated page with the same path
-  Object.values(options.allPages).some((val) => pathname.match(val.route.pattern))) {
+  Object.values(options.allPages).some((val) => val.route.pattern.test(pathname))) {
     return;
   }
   const url = getUrlForPath(
@@ -353,7 +353,7 @@ function getPrettyRouteName(route) {
   if (isRelativePath(route.component)) {
     return route.route;
   } else if (route.component.includes("node_modules/")) {
-    return route.component.match(/.*node_modules\/(.+)/)?.[1] ?? route.component;
+    return /.*node_modules\/(.+)/.exec(route.component)?.[1] ?? route.component;
   } else {
     return route.component;
   }

package/dist/core/build/index.js

@@ -86,7 +86,13 @@ class AstroBuilder {
           middlewareMode: true
         }
       },
-      { settings: this.settings, logger: this.logger, mode: "build", command: "build", sync: false }
+      {
+        settings: this.settings,
+        logger: this.logger,
+        mode: "build",
+        command: "build",
+        sync: false
+      }
     );
     await runHookConfigDone({ settings: this.settings, logger });
     const { syncInternal } = await import("../sync/index.js");

package/dist/core/build/plugins/plugin-css.js

@@ -40,7 +40,7 @@ function rollupPluginAstroBuildCSS(options) {
     outputOptions(outputOptions) {
       const assetFileNames = outputOptions.assetFileNames;
       const namingIncludesHash = assetFileNames?.toString().includes("[hash]");
-      const createNameForParentPages = namingIncludesHash ? assetName.shortHashedName : assetName.createSlugger(settings);
+      const createNameForParentPages = namingIncludesHash ? assetName.shortHashedName(settings) : assetName.createSlugger(settings);
       extendManualChunks(outputOptions, {
         after(id, meta) {
           if (isBuildableCSSRequest(id)) {
@@ -50,7 +50,7 @@ function rollupPluginAstroBuildCSS(options) {
             const ctx = { getModuleInfo: meta.getModuleInfo };
             for (const pageInfo of getParentModuleInfos(id, ctx)) {
               if (hasAssetPropagationFlag(pageInfo.id)) {
-                const chunkId2 = assetName.createNameHash(id, [id]);
+                const chunkId2 = assetName.createNameHash(id, [id], settings);
                 internals.cssModuleToChunkIdMap.set(id, chunkId2);
                 return chunkId2;
               }