astro 3.1.2 → 3.1.4

package/components/ViewTransitions.astro

@@ -219,13 +219,13 @@ const { fallback = 'animate' } = Astro.props as Props;
 				for (const s2 of newDocument.scripts) {
 					if (
 						// Inline
-						(s1.textContent && s1.textContent === s2.textContent) ||
+						(!s1.src && s1.textContent === s2.textContent) ||
 						// External
-						(s1.type === s2.type && s1.src === s2.src)
+						(s1.src && s1.type === s2.type && s1.src === s2.src)
 					) {
-						s2.remove();
-					} else {
-						s1.remove();
+						// the old script is in the new document: we mark it as executed to prevent re-execution
+						s2.dataset.astroExec = '';
+						break;
 					}
 				}
 			}

package/content-module.template.mjs

@@ -70,7 +70,7 @@ export const getEntryBySlug = createGetEntryBySlug({
 });
 
 export const getDataEntryById = createGetDataEntryById({
-	dataCollectionToEntryMap,
+	getEntryImport: createGlobLookup(dataCollectionToEntryMap),
 });
 
 export const getEntry = createGetEntry({

package/dist/content/runtime.d.ts

@@ -1,5 +1,4 @@
 import type { MarkdownHeading } from '@astrojs/markdown-remark';
-import type { AstroIntegration } from '../@types/astro.js';
 import { type AstroComponentFactory } from '../runtime/server/index.js';
 import type { ContentLookupMap } from './utils.js';
 type LazyImport = () => Promise<any>;
@@ -14,7 +13,7 @@ export declare function createGetCollection({ contentCollectionToEntryMap, dataC
     contentCollectionToEntryMap: CollectionToEntryMap;
     dataCollectionToEntryMap: CollectionToEntryMap;
     getRenderEntryImport: GetEntryImport;
-}): (collection: string, filter?: ((entry: any) => unknown) | undefined) => Promise<any[] | AstroIntegration>;
+}): (collection: string, filter?: ((entry: any) => unknown) | undefined) => Promise<any[] | undefined>;
 export declare function createGetEntryBySlug({ getEntryImport, getRenderEntryImport, }: {
     getEntryImport: GetEntryImport;
     getRenderEntryImport: GetEntryImport;
@@ -26,8 +25,8 @@ export declare function createGetEntryBySlug({ getEntryImport, getRenderEntryImp
     data: any;
     render(): Promise<RenderResult>;
 } | undefined>;
-export declare function createGetDataEntryById({ dataCollectionToEntryMap, }: {
-    dataCollectionToEntryMap: CollectionToEntryMap;
+export declare function createGetDataEntryById({ getEntryImport }: {
+    getEntryImport: GetEntryImport;
 }): (collection: string, id: string) => Promise<{
     id: any;
     collection: any;

package/dist/content/runtime.js

@@ -39,7 +39,10 @@ function createGetCollection({
     } else if (collection in dataCollectionToEntryMap) {
       type = "data";
     } else {
-      return warnOfEmptyCollection(collection);
+      console.warn(
+        `The collection **${collection}** does not exist or is empty. Ensure a collection directory with this name exists.`
+      );
+      return;
     }
     const lazyImports = Object.values(
       type === "content" ? contentCollectionToEntryMap[collection] : dataCollectionToEntryMap[collection]
@@ -105,14 +108,9 @@ function createGetEntryBySlug({
     };
   };
 }
-function createGetDataEntryById({
-  dataCollectionToEntryMap
-}) {
+function createGetDataEntryById({ getEntryImport }) {
   return async function getDataEntryById(collection, id) {
-    const lazyImport = dataCollectionToEntryMap[collection]?.[
-      /*TODO: filePathToIdMap*/
-      id + ".json"
-    ];
+    const lazyImport = await getEntryImport(collection, id);
     if (!lazyImport)
       throw new Error(`Entry ${collection} \u2192 ${id} was not found.`);
     const entry = await lazyImport();
@@ -286,18 +284,6 @@ function createReference({ lookupMap }) {
 function isPropagatedAssetsModule(module) {
   return typeof module === "object" && module != null && "__astroPropagation" in module;
 }
-function warnOfEmptyCollection(collection) {
-  return {
-    name: "astro-collection",
-    hooks: {
-      "astro:server:start": ({ logger }) => {
-        logger.warn(
-          `The collection **${collection}** does not exist or is empty. Ensure a collection directory with this name exists.`
-        );
-      }
-    }
-  };
-}
 export {
   createCollectionToGlobResultMap,
   createGetCollection,

package/dist/core/build/generate.js

@@ -418,7 +418,9 @@ async function generatePath(pathname, gopts, pipeline) {
     if (!pipeline.getConfig().build.redirects) {
       return;
     }
-    const location = getRedirectLocationOrThrow(response.headers);
+    const locationSite = getRedirectLocationOrThrow(response.headers);
+    const siteURL = pipeline.getConfig().site;
+    const location = siteURL ? new URL(locationSite, siteURL) : locationSite;
     const fromPath = new URL(renderContext.request.url).pathname;
     const delay = response.status === 302 ? 2 : 0;
     body = `<!doctype html>
@@ -433,7 +435,7 @@ async function generatePath(pathname, gopts, pipeline) {
       body = body.replaceAll("\n", "");
     }
     if (pageData.route.type !== "redirect") {
-      pageData.route.redirect = location;
+      pageData.route.redirect = location.toString();
     }
   } else {
     if (!response.body)

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "3.1.2";
+const ASTRO_VERSION = "3.1.4";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -20,7 +20,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "3.1.2";
+  const currentVersion = "3.1.4";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

package/dist/core/errors/errors-data.d.ts

@@ -1042,6 +1042,7 @@ export declare const ContentSchemaContainsSlugError: {
 /**
  * @docs
  * @message A collection queried via `getCollection()` does not exist.
+ * @deprecated Collections that do not exist no longer result in an error. A warning is omitted instead.
  * @description
  * When querying a collection, ensure a collection directory with the requested name exists under `src/content/`.
  */

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.1.2";
+  const version = "3.1.4";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -235,7 +235,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"3.1.2"}`
+        `v${"3.1.4"}`
       )} ${headline}`
     );
   }

package/dist/integrations/astroFeaturesValidation.js

@@ -81,14 +81,14 @@ function validateAssetsFeature(assets, adapterName, config, logger) {
     isSquooshCompatible = false
   } = assets;
   if (config?.image?.service?.entrypoint === SHARP_SERVICE && !isSharpCompatible) {
-    logger.error(
+    logger.warn(
       "astro",
       `The currently selected adapter \`${adapterName}\` is not compatible with the image service "Sharp".`
     );
     return false;
   }
   if (config?.image?.service?.entrypoint === SQUOOSH_SERVICE && !isSquooshCompatible) {
-    logger.error(
+    logger.warn(
       "astro",
       `The currently selected adapter \`${adapterName}\` is not compatible with the image service "Squoosh".`
     );

package/dist/integrations/index.js

@@ -152,7 +152,7 @@ async function runHookConfigDone({
                 logger
               );
               for (const [featureName, supported] of Object.entries(validationResult)) {
-                if (!supported) {
+                if (!supported && featureName !== "assets") {
                   logger.error(
                     "astro",
                     `The adapter ${adapter.name} doesn't support the feature ${featureName}. Your project won't be built. You should not use it.`
@@ -160,9 +160,9 @@ async function runHookConfigDone({
                 }
               }
               if (!validationResult.assets) {
-                logger.info(
+                logger.warn(
                   "astro",
-                  `The selected adapter ${adapter.name} does not support Sharp or Squoosh for image processing. To ensure your project is still able to build, image processing has been disabled.`
+                  `The selected adapter ${adapter.name} does not support image optimization. To allow your project to build with the original, unoptimized images, the image service has been automatically switched to the 'noop' option. See https://docs.astro.build/en/reference/configuration-reference/#imageservice`
                 );
                 settings.config.image.service = {
                   entrypoint: "astro/assets/services/noop",

package/dist/runtime/server/scripts.js

@@ -1,5 +1,5 @@
 import islandScript from "./astro-island.prebuilt.js";
-const ISLAND_STYLES = `<style style="display:none">astro-island,astro-slot,astro-static-slot{display:contents}</style>`;
+const ISLAND_STYLES = `<style>astro-island,astro-slot,astro-static-slot{display:contents}</style>`;
 function determineIfNeedsHydrationScript(result) {
   if (result._metadata.hasHydrationScript) {
     return false;
@@ -24,12 +24,12 @@ function getDirectiveScriptText(result, directive) {
 function getPrescripts(result, type, directive) {
   switch (type) {
     case "both":
-      return `${ISLAND_STYLES}<script style="display:none">${getDirectiveScriptText(
+      return `${ISLAND_STYLES}<script>${getDirectiveScriptText(
         result,
         directive
       )};${islandScript}</script>`;
     case "directive":
-      return `<script style="display:none">${getDirectiveScriptText(result, directive)}</script>`;
+      return `<script>${getDirectiveScriptText(result, directive)}</script>`;
   }
   return "";
 }

package/dist/vite-plugin-head/index.js

@@ -23,9 +23,30 @@ function configHeadVitePlugin() {
   }
   return {
     name: "astro:head-metadata",
+    enforce: "pre",
+    apply: "serve",
     configureServer(_server) {
       server = _server;
     },
+    resolveId(source, importer) {
+      if (importer) {
+        return this.resolve(source, importer, { skipSelf: true }).then((result) => {
+          if (result) {
+            let info = this.getModuleInfo(result.id);
+            const astro = info && getAstroMetadata(info);
+            if (astro) {
+              if (astro.propagation === "self" || astro.propagation === "in-tree") {
+                propagateMetadata.call(this, importer, "propagation", "in-tree");
+              }
+              if (astro.containsHead) {
+                propagateMetadata.call(this, importer, "containsHead", true);
+              }
+            }
+          }
+          return result;
+        });
+      }
+    },
     transform(source, id) {
       if (!server) {
         return;

package/dist/vite-plugin-markdown/index.js

@@ -91,11 +91,11 @@ function markdown({ settings, logger }) {
 
 				${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
 				import { getImage } from "astro:assets";
-				${imagePaths.map((entry) => `import Astro__${entry.safeName} from ${JSON.stringify(entry.raw)};`)}
+				${imagePaths.map((entry) => `import Astro__${entry.safeName} from ${JSON.stringify(entry.raw)};`).join("\n")}
 
 				const images = async function() {
 					return {
-						${imagePaths.map((entry) => `"${entry.raw}": await getImage({src: Astro__${entry.safeName}})`).join("\n")}
+						${imagePaths.map((entry) => `"${entry.raw}": await getImage({src: Astro__${entry.safeName}})`).join(",\n")}
 					}
 				}
 

package/package.json

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