astro 4.13.4 → 4.14.1

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

@@ -1,5 +1,6 @@
 import { fileURLToPath } from "node:url";
 import { transform } from "esbuild";
+import { bold } from "kleur/colors";
 import MagicString from "magic-string";
 import { loadEnv } from "vite";
 const importMetaEnvOnlyRe = /\bimport\.meta\.env\b(?!\.)/;
@@ -71,7 +72,7 @@ async function replaceDefine(code, id, define, config) {
     map: result.map || null
   };
 }
-function envVitePlugin({ settings }) {
+function envVitePlugin({ settings, logger }) {
   let privateEnv;
   let defaultDefines;
   let isDev;
@@ -114,13 +115,22 @@ function envVitePlugin({ settings }) {
           devImportMetaEnvPrepend += "});";
         }
         s.prepend(devImportMetaEnvPrepend);
+        let exportConstPrerenderStr;
         s.replace(exportConstPrerenderRe, (m, key) => {
+          exportConstPrerenderStr = m;
           if (privateEnv[key] != null) {
             return `export const prerender = ${privateEnv[key]}`;
           } else {
             return m;
           }
         });
+        if (exportConstPrerenderStr) {
+          logger.warn(
+            "router",
+            `Exporting dynamic values from prerender is deprecated. Please use an integration with the "astro:route:setup" hook to update the route's \`prerender\` option instead. This allows for better treeshaking and bundling configuration in the future. See https://docs.astro.build/en/reference/integrations-reference/#astroroutesetup for a migration example.
+Found \`${bold(exportConstPrerenderStr)}\` in ${bold(id)}.`
+          );
+        }
         return {
           code: s.toString(),
           map: s.generateMap({ hires: "boundary" })

package/dist/vite-plugin-markdown/content-entry-type.js

@@ -1,4 +1,5 @@
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { createMarkdownProcessor } from "@astrojs/markdown-remark";
 import { safeParseFrontmatter } from "../content/utils.js";
 const markdownContentEntryType = {
   extensions: [".md"],
@@ -12,7 +13,29 @@ const markdownContentEntryType = {
     };
   },
   // We need to handle propagation for Markdown because they support layouts which will bring in styles.
-  handlePropagation: true
+  handlePropagation: true,
+  async getRenderFunction(settings) {
+    const processor = await createMarkdownProcessor(settings.config.markdown);
+    return async function renderToString(entry) {
+      if (!entry.body) {
+        return {
+          html: ""
+        };
+      }
+      const result = await processor.render(entry.body, {
+        frontmatter: entry.data,
+        // @ts-expect-error Internal API
+        fileURL: entry.filePath ? pathToFileURL(entry.filePath) : void 0
+      });
+      return {
+        html: result.code,
+        metadata: {
+          ...result.metadata,
+          imagePaths: Array.from(result.metadata.imagePaths)
+        }
+      };
+    };
+  }
 };
 export {
   markdownContentEntryType

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

@@ -4,6 +4,7 @@ import { normalizePath } from "vite";
 import {} from "../core/logger/core.js";
 import { isEndpoint, isPage, isServerLikeOutput } from "../core/util.js";
 import { rootRelativePath } from "../core/viteUtils.js";
+import { runHookRouteSetup } from "../integrations/hooks.js";
 import { getPrerenderDefault } from "../prerender/utils.js";
 import { scan } from "./scan.js";
 const KNOWN_FILE_EXTENSIONS = [".astro", ".js", ".ts"];
@@ -26,11 +27,7 @@ function astroScannerPlugin({
       const fileIsPage = isPage(fileURL, settings);
       const fileIsEndpoint = isEndpoint(fileURL, settings);
       if (!(fileIsPage || fileIsEndpoint)) return;
-      const defaultPrerender = getPrerenderDefault(settings.config);
-      const pageOptions = await scan(code, id, settings);
-      if (typeof pageOptions.prerender === "undefined") {
-        pageOptions.prerender = defaultPrerender;
-      }
+      const pageOptions = await getPageOptions(code, id, fileURL, settings, logger);
       if (!pageOptions.prerender && isServerLikeOutput(settings.config) && code.includes("getStaticPaths") && // this should only be valid for `.astro`, `.js` and `.ts` files
       KNOWN_FILE_EXTENSIONS.includes(extname(filename))) {
         logger.warn(
@@ -55,6 +52,19 @@ function astroScannerPlugin({
     }
   };
 }
+async function getPageOptions(code, id, fileURL, settings, logger) {
+  const pageOptions = await scan(code, id, settings);
+  const route = {
+    component: rootRelativePath(settings.config.root, fileURL, false),
+    prerender: pageOptions.prerender
+  };
+  await runHookRouteSetup({ route, settings, logger });
+  pageOptions.prerender = route.prerender;
+  if (typeof pageOptions.prerender === "undefined") {
+    pageOptions.prerender = getPrerenderDefault(settings.config);
+  }
+  return pageOptions;
+}
 export {
   astroScannerPlugin as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.13.4",
+  "version": "4.14.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -68,6 +68,7 @@
     "./assets/services/sharp": "./dist/assets/services/sharp.js",
     "./assets/services/squoosh": "./dist/assets/services/squoosh.js",
     "./assets/services/noop": "./dist/assets/services/noop.js",
+    "./loaders": "./dist/content/loaders/index.js",
     "./content/runtime": "./dist/content/runtime.js",
     "./content/runtime-assets": "./dist/content/runtime-assets.js",
     "./debug": "./components/Debug.astro",
@@ -114,6 +115,7 @@
     "@babel/plugin-transform-react-jsx": "^7.25.2",
     "@babel/traverse": "^7.25.3",
     "@babel/types": "^7.25.2",
+    "@rollup/pluginutils": "^5.1.0",
     "@oslojs/encoding": "^0.4.1",
     "@types/babel__core": "^7.20.5",
     "@types/cookie": "^0.6.0",
@@ -145,7 +147,9 @@
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.5",
     "magic-string": "^0.30.11",
+    "micromatch": "^4.0.7",
     "mrmime": "^2.0.0",
+    "neotraverse": "^0.6.9",
     "ora": "^8.0.1",
     "p-limit": "^6.1.0",
     "p-queue": "^8.0.1",
@@ -163,12 +167,13 @@
     "vite": "^5.4.0",
     "vitefu": "^0.2.5",
     "which-pm": "^3.0.0",
-    "yargs-parser": "^21.1.1",
+    "xxhash-wasm": "^1.0.2",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.2",
-    "@astrojs/markdown-remark": "5.2.0",
+    "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/telemetry": "3.1.0"
+    "@astrojs/telemetry": "3.1.0",
+    "@astrojs/markdown-remark": "5.2.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"
@@ -189,9 +194,9 @@
     "@types/html-escaper": "^3.0.2",
     "@types/http-cache-semantics": "^4.0.4",
     "@types/js-yaml": "^4.0.9",
+    "@types/micromatch": "^4.0.9",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.5.8",
-    "@types/yargs-parser": "^21.0.3",
     "cheerio": "1.0.0",
     "eol": "^0.9.1",
     "expect-type": "^0.19.0",

package/templates/content/module.mjs

@@ -9,7 +9,7 @@ import {
 	createReference,
 } from 'astro/content/runtime';
 
-export { defineCollection } from 'astro/content/runtime';
+export { defineCollection, renderEntry as render } from 'astro/content/runtime';
 export { z } from 'astro/zod';
 
 const contentDir = '@@CONTENT_DIR@@';
@@ -33,6 +33,8 @@ const collectionToEntryMap = createCollectionToGlobResultMap({
 let lookupMap = {};
 /* @@LOOKUP_MAP_ASSIGNMENT@@ */
 
+const collectionNames = new Set(Object.keys(lookupMap));
+
 function createGlobLookup(glob) {
 	return async (collection, lookupId) => {
 		const filePath = lookupMap[collection]?.entries[lookupId];
@@ -59,15 +61,18 @@ export const getCollection = createGetCollection({
 export const getEntryBySlug = createGetEntryBySlug({
 	getEntryImport: createGlobLookup(contentCollectionToEntryMap),
 	getRenderEntryImport: createGlobLookup(collectionToRenderEntryMap),
+	collectionNames,
 });
 
 export const getDataEntryById = createGetDataEntryById({
 	getEntryImport: createGlobLookup(dataCollectionToEntryMap),
+	collectionNames,
 });
 
 export const getEntry = createGetEntry({
 	getEntryImport: createGlobLookup(collectionToEntryMap),
 	getRenderEntryImport: createGlobLookup(collectionToRenderEntryMap),
+	collectionNames,
 });
 
 export const getEntries = createGetEntries(getEntry);

package/templates/content/types.d.ts

@@ -1,10 +1,19 @@
 declare module 'astro:content' {
+	interface RenderResult {
+		Content: import('astro/runtime/server/index.js').AstroComponentFactory;
+		headings: import('astro').MarkdownHeading[];
+		remarkPluginFrontmatter: Record<string, any>;
+	}
 	interface Render {
-		'.md': Promise<{
-			Content: import('astro').MarkdownInstance<{}>['Content'];
-			headings: import('astro').MarkdownHeading[];
-			remarkPluginFrontmatter: Record<string, any>;
-		}>;
+		'.md': Promise<RenderResult>;
+	}
+
+	export interface RenderedContent {
+		html: string;
+		metadata?: {
+			imagePaths: Array<string>;
+			[key: string]: unknown;
+		};
 	}
 }
 
@@ -100,6 +109,10 @@ declare module 'astro:content' {
 		}[],
 	): Promise<CollectionEntry<C>[]>;
 
+	export function render<C extends keyof AnyEntryMap>(
+		entry: AnyEntryMap[C][string],
+	): Promise<RenderResult>;
+
 	export function reference<C extends keyof AnyEntryMap>(
 		collection: C,
 	): import('astro/zod').ZodEffects<

package/types/content.d.ts

@@ -20,6 +20,31 @@ declare module 'astro:content' {
 		>;
 	}>;
 
+	export interface DataEntry {
+		id: string;
+		data: Record<string, unknown>;
+		filePath?: string;
+		body?: string;
+	}
+
+	export interface DataStore {
+		get: (key: string) => DataEntry;
+		entries: () => Array<[id: string, DataEntry]>;
+		set: (key: string, data: Record<string, unknown>, body?: string, filePath?: string) => void;
+		values: () => Array<DataEntry>;
+		keys: () => Array<string>;
+		delete: (key: string) => void;
+		clear: () => void;
+		has: (key: string) => boolean;
+	}
+
+	export interface MetaStore {
+		get: (key: string) => string | undefined;
+		set: (key: string, value: string) => void;
+		delete: (key: string) => void;
+		has: (key: string) => boolean;
+	}
+
 	type BaseSchemaWithoutEffects =
 		| import('astro/zod').AnyZodObject
 		| import('astro/zod').ZodUnion<[BaseSchemaWithoutEffects, ...BaseSchemaWithoutEffects[]]>
@@ -32,6 +57,12 @@ declare module 'astro:content' {
 
 	export type SchemaContext = { image: ImageFunction };
 
+	type ContentLayerConfig<S extends BaseSchema, TData extends { id: string } = { id: string }> = {
+		type?: 'content_layer';
+		schema?: S | ((context: SchemaContext) => S);
+		loader: import('astro/loaders').Loader | (() => Array<TData> | Promise<Array<TData>>);
+	};
+
 	type DataCollectionConfig<S extends BaseSchema> = {
 		type: 'data';
 		schema?: S | ((context: SchemaContext) => S);
@@ -40,11 +71,13 @@ declare module 'astro:content' {
 	type ContentCollectionConfig<S extends BaseSchema> = {
 		type?: 'content';
 		schema?: S | ((context: SchemaContext) => S);
+		loader?: never;
 	};
 
 	export type CollectionConfig<S extends BaseSchema> =
 		| ContentCollectionConfig<S>
-		| DataCollectionConfig<S>;
+		| DataCollectionConfig<S>
+		| ContentLayerConfig<S>;
 
 	export function defineCollection<S extends BaseSchema>(
 		input: CollectionConfig<S>,

package/dist/core/sync/setup-env-ts.d.ts

@@ -1,8 +0,0 @@
-import type fsMod from 'node:fs';
-import type { AstroSettings } from '../../@types/astro.js';
-import { type Logger } from '../logger/core.js';
-export declare function setUpEnvTs({ settings, logger, fs, }: {
-    settings: AstroSettings;
-    logger: Logger;
-    fs: typeof fsMod;
-}): Promise<void>;

package/dist/core/sync/setup-env-ts.js

@@ -1,79 +0,0 @@
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { bold } from "kleur/colors";
-import { normalizePath } from "vite";
-import { ACTIONS_TYPES_FILE } from "../../actions/consts.js";
-import { CONTENT_TYPES_FILE } from "../../content/consts.js";
-import { ENV_TYPES_FILE } from "../../env/constants.js";
-import {} from "../logger/core.js";
-function getDotAstroTypeReference({
-  settings,
-  filename
-}) {
-  const relativePath = normalizePath(
-    path.relative(
-      fileURLToPath(settings.config.srcDir),
-      fileURLToPath(new URL(filename, settings.dotAstroDir))
-    )
-  );
-  return `/// <reference path=${JSON.stringify(relativePath)} />`;
-}
-async function setUpEnvTs({
-  settings,
-  logger,
-  fs
-}) {
-  const envTsPath = new URL("env.d.ts", settings.config.srcDir);
-  const envTsPathRelativetoRoot = normalizePath(
-    path.relative(fileURLToPath(settings.config.root), fileURLToPath(envTsPath))
-  );
-  const injectedTypes = [
-    {
-      filename: CONTENT_TYPES_FILE,
-      meetsCondition: () => fs.existsSync(new URL(CONTENT_TYPES_FILE, settings.dotAstroDir))
-    },
-    {
-      filename: ACTIONS_TYPES_FILE,
-      meetsCondition: () => fs.existsSync(new URL(ACTIONS_TYPES_FILE, settings.dotAstroDir))
-    }
-  ];
-  if (settings.config.experimental.env) {
-    injectedTypes.push({
-      filename: ENV_TYPES_FILE
-    });
-  }
-  if (fs.existsSync(envTsPath)) {
-    const initialEnvContents = await fs.promises.readFile(envTsPath, "utf-8");
-    let typesEnvContents = initialEnvContents;
-    for (const injectedType of injectedTypes) {
-      if (!injectedType.meetsCondition || await injectedType.meetsCondition?.()) {
-        const expectedTypeReference = getDotAstroTypeReference({
-          settings,
-          filename: injectedType.filename
-        });
-        if (!typesEnvContents.includes(expectedTypeReference)) {
-          typesEnvContents = `${expectedTypeReference}
-${typesEnvContents}`;
-        }
-      }
-    }
-    if (initialEnvContents !== typesEnvContents) {
-      logger.info("types", `Updated ${bold(envTsPathRelativetoRoot)} type declarations.`);
-      await fs.promises.writeFile(envTsPath, typesEnvContents, "utf-8");
-    }
-  } else {
-    let referenceDefs = [];
-    referenceDefs.push('/// <reference types="astro/client" />');
-    for (const injectedType of injectedTypes) {
-      if (!injectedType.meetsCondition || await injectedType.meetsCondition?.()) {
-        referenceDefs.push(getDotAstroTypeReference({ settings, filename: injectedType.filename }));
-      }
-    }
-    await fs.promises.mkdir(settings.config.srcDir, { recursive: true });
-    await fs.promises.writeFile(envTsPath, referenceDefs.join("\n"), "utf-8");
-    logger.info("types", `Added ${bold(envTsPathRelativetoRoot)} type declarations`);
-  }
-}
-export {
-  setUpEnvTs
-};