astro 5.13.2 → 5.13.3

package/dist/assets/endpoint/generic.js

@@ -31,10 +31,10 @@ const GET = async ({ request }) => {
     }
     let inputBuffer = void 0;
     const isRemoteImage = isRemotePath(transform.src);
-    const sourceUrl = isRemoteImage ? new URL(transform.src) : new URL(transform.src, url.origin);
     if (isRemoteImage && isRemoteAllowed(transform.src, imageConfig) === false) {
       return new Response("Forbidden", { status: 403 });
     }
+    const sourceUrl = new URL(transform.src, url.origin);
     inputBuffer = await loadRemoteImage(sourceUrl, isRemoteImage ? new Headers() : request.headers);
     if (!inputBuffer) {
       return new Response("Not Found", { status: 404 });

package/dist/content/content-layer.js

@@ -164,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.13.2") {
+    if (previousAstroVersion && previousAstroVersion !== "5.13.3") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -172,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.13.2") {
-      await this.#store.metaStore().set("astro-version", "5.13.2");
+    if ("5.13.3") {
+      await this.#store.metaStore().set("astro-version", "5.13.3");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/loaders/file.js

@@ -65,6 +65,9 @@ function file(fileName, options) {
       logger.debug(`Found object with ${entries.length} entries in ${fileName}`);
       store.clear();
       for (const [id, rawItem] of entries) {
+        if (id === "$schema" && typeof rawItem === "string") {
+          continue;
+        }
         const parsedData = await parseData({ id, data: rawItem, filePath });
         store.set({ id, data: parsedData, filePath: normalizedFilePath });
       }

package/dist/content/types-generator.js

@@ -504,6 +504,9 @@ async function generateJSONSchema(fsMod, collectionConfig, collectionKey, collec
   if (!zodSchemaForJson && collectionConfig.type === CONTENT_LAYER_TYPE) {
     zodSchemaForJson = await getContentLayerSchema(collectionConfig, collectionKey);
   }
+  if (collectionConfig.type === CONTENT_LAYER_TYPE && collectionConfig.loader.name === "file-loader") {
+    zodSchemaForJson = z.object({}).catchall(zodSchemaForJson);
+  }
   if (zodSchemaForJson instanceof z.ZodObject) {
     zodSchemaForJson = zodSchemaForJson.extend({
       $schema: z.string().optional()

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.13.2";
+const ASTRO_VERSION = "5.13.3";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "5.13.2";
+  const currentVersion = "5.13.3";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.13.2";
+  const version = "5.13.3";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -274,7 +274,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.13.2"}`
+        `v${"5.13.3"}`
       )} ${headline}`
     );
   }

package/dist/core/sync/index.js

@@ -117,7 +117,7 @@ async function syncInternal({
     settings.timer.end("Sync content layer");
   } else {
     const paths = getContentPaths(settings.config, fs);
-    if (paths.config.exists || // Legacy collections don't require a config file
+    if (paths.config.exists || paths.liveConfig.exists || // Legacy collections don't require a config file
     settings.config.legacy?.collections && fs.existsSync(paths.contentDir)) {
       settings.injectedTypes.push({
         filename: CONTENT_TYPES_FILE

package/dist/i18n/index.d.ts

@@ -74,6 +74,12 @@ export declare function getLocaleByPath(path: string, locales: Locales): string;
  * - transforms all letters to be lower case;
  */
 export declare function normalizeTheLocale(locale: string): string;
+/**
+ *
+ * Given a path or path segment, this function:
+ * - removes the `.html` extension if it exists
+ */
+export declare function normalizeThePath(path: string): string;
 /**
  * Returns an array of only locales, by picking the `code`
  * @param locales

package/dist/i18n/index.js

@@ -10,7 +10,7 @@ function requestHasLocale(locales) {
   };
 }
 function pathHasLocale(path, locales) {
-  const segments = path.split("/");
+  const segments = path.split("/").map(normalizeThePath);
   for (const segment of segments) {
     for (const locale of locales) {
       if (typeof locale === "string") {
@@ -132,6 +132,9 @@ function getLocaleByPath(path, locales) {
 function normalizeTheLocale(locale) {
   return locale.replaceAll("_", "-").toLowerCase();
 }
+function normalizeThePath(path) {
+  return path.endsWith(".html") ? path.slice(0, -5) : path;
+}
 function getAllCodes(locales) {
   const result = [];
   for (const loopLocale of locales) {
@@ -277,6 +280,7 @@ export {
   getLocaleRelativeUrlList,
   getPathByLocale,
   normalizeTheLocale,
+  normalizeThePath,
   notFound,
   pathHasLocale,
   redirectToDefaultLocale,

package/dist/i18n/utils.js

@@ -1,4 +1,4 @@
-import { getAllCodes, normalizeTheLocale } from "./index.js";
+import { getAllCodes, normalizeTheLocale, normalizeThePath } from "./index.js";
 function parseLocale(header) {
   if (header === "*") {
     return [{ locale: header, qualityValue: void 0 }];
@@ -102,7 +102,7 @@ function computePreferredLocaleList(request, locales) {
   return result;
 }
 function computeCurrentLocale(pathname, locales, defaultLocale) {
-  for (const segment of pathname.split("/")) {
+  for (const segment of pathname.split("/").map(normalizeThePath)) {
     for (const locale of locales) {
       if (typeof locale === "string") {
         if (!segment.includes(locale)) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.13.2",
+  "version": "5.13.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",