astro 4.7.0 → 4.8.0

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

@@ -2,7 +2,9 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { bold } from "kleur/colors";
 import { normalizePath } from "vite";
-import { getContentPaths, getDotAstroTypeReference } from "../content/index.js";
+import { ACTIONS_TYPES_FILE } from "../actions/consts.js";
+import { CONTENT_TYPES_FILE } from "../content/consts.js";
+import { getContentPaths } from "../content/index.js";
 import {} from "../core/logger/core.js";
 function getEnvTsPath({ srcDir }) {
   return new URL("env.d.ts", srcDir);
@@ -29,31 +31,55 @@ async function setUpEnvTs({
 }) {
   const envTsPath = getEnvTsPath(settings.config);
   const dotAstroDir = getContentPaths(settings.config).cacheDir;
-  const dotAstroTypeReference = getDotAstroTypeReference(settings.config);
-  const envTsPathRelativetoRoot = normalizePath(
+  const dotAstroTypeReferences = getDotAstroTypeReferences({
+    root: settings.config.root,
+    srcDir: settings.config.srcDir,
+    fs
+  });
+  const envTsPathRelativeToRoot = normalizePath(
     path.relative(fileURLToPath(settings.config.root), fileURLToPath(envTsPath))
   );
   if (fs.existsSync(envTsPath)) {
     let typesEnvContents = await fs.promises.readFile(envTsPath, "utf-8");
-    if (!fs.existsSync(dotAstroDir))
-      return;
-    const expectedTypeReference = getDotAstroTypeReference(settings.config);
-    if (!typesEnvContents.includes(expectedTypeReference)) {
-      typesEnvContents = `${expectedTypeReference}
+    let addedTypes = false;
+    for (const typeReference of dotAstroTypeReferences) {
+      if (typesEnvContents.includes(typeReference)) continue;
+      typesEnvContents = `${typeReference}
 ${typesEnvContents}`;
       await fs.promises.writeFile(envTsPath, typesEnvContents, "utf-8");
-      logger.info("types", `Added ${bold(envTsPathRelativetoRoot)} type declarations`);
+      addedTypes = true;
+    }
+    if (addedTypes) {
+      logger.info("types", `Added ${bold(envTsPathRelativeToRoot)} type declarations`);
     }
   } else {
     let referenceDefs = [];
     referenceDefs.push('/// <reference types="astro/client" />');
     if (fs.existsSync(dotAstroDir)) {
-      referenceDefs.push(dotAstroTypeReference);
+      referenceDefs.push(...dotAstroTypeReferences);
     }
     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`);
+    logger.info("types", `Added ${bold(envTsPathRelativeToRoot)} type declarations`);
+  }
+}
+function getDotAstroTypeReferences({
+  fs,
+  root,
+  srcDir
+}) {
+  const { cacheDir } = getContentPaths({ root, srcDir });
+  let referenceDefs = [];
+  const typesFiles = [CONTENT_TYPES_FILE, ACTIONS_TYPES_FILE];
+  for (const typesFile of typesFiles) {
+    const url = new URL(typesFile, cacheDir);
+    if (!fs.existsSync(url)) continue;
+    const typesRelativeToSrcDir = normalizePath(
+      path.relative(fileURLToPath(srcDir), fileURLToPath(url))
+    );
+    referenceDefs.push(`/// <reference path=${JSON.stringify(typesRelativeToSrcDir)} />`);
   }
+  return referenceDefs;
 }
 export {
   astroInjectEnvTsPlugin,

package/dist/vite-plugin-integrations-container/index.js

@@ -1,5 +1,5 @@
 import { normalizePath } from "vite";
-import { runHookServerSetup } from "../integrations/index.js";
+import { runHookServerSetup } from "../integrations/hooks.js";
 function astroIntegrationsContainerPlugin({
   settings,
   logger
@@ -7,13 +7,11 @@ function astroIntegrationsContainerPlugin({
   return {
     name: "astro:integration-container",
     async configureServer(server) {
-      if (server.config.isProduction)
-        return;
+      if (server.config.isProduction) return;
       await runHookServerSetup({ config: settings.config, server, logger });
     },
     async buildStart() {
-      if (settings.injectedRoutes.length === settings.resolvedInjectedRoutes.length)
-        return;
+      if (settings.injectedRoutes.length === settings.resolvedInjectedRoutes.length) return;
       settings.resolvedInjectedRoutes = await Promise.all(
         settings.injectedRoutes.map((route) => resolveEntryPoint.call(this, route))
       );
@@ -22,8 +20,7 @@ function astroIntegrationsContainerPlugin({
 }
 async function resolveEntryPoint(route) {
   const resolvedId = await this.resolve(route.entrypoint).then((res) => res?.id).catch(() => void 0);
-  if (!resolvedId)
-    return route;
+  if (!resolvedId) return route;
   const resolvedEntryPoint = new URL(`file://${normalizePath(resolvedId)}`);
   return { ...route, resolvedEntryPoint };
 }

package/dist/vite-plugin-load-fallback/index.js

@@ -52,8 +52,7 @@ function loadFallbackPlugin({
         const read = context.read;
         context.read = async () => {
           const source = await tryLoadModule(context.file);
-          if (source)
-            return source;
+          if (source) return source;
           return read.call(context);
         };
       }

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

@@ -31,8 +31,7 @@ function markdown({ settings, logger }) {
     async resolveId(source, importer, options) {
       if (importer?.endsWith(".md") && source[0] !== "/") {
         let resolved = await this.resolve(source, importer, options);
-        if (!resolved)
-          resolved = await this.resolve("./" + source, importer, options);
+        if (!resolved) resolved = await this.resolve("./" + source, importer, options);
         return resolved;
       }
     },

package/dist/vite-plugin-mdx/index.d.ts

@@ -1,2 +1,5 @@
 import { type Plugin } from 'vite';
+/**
+ * @deprecated This plugin is no longer used. Remove in Astro 5.0
+ */
 export default function mdxVitePlugin(): Plugin;

package/dist/vite-plugin-mdx/tag.d.ts

@@ -6,5 +6,7 @@ import type { PluginObj } from '@babel/core';
  *
  * This plugin crawls each export in the file and "tags" each export with a given `rendererName`.
  * This allows us to automatically match a component to a renderer and skip the usual `check()` calls.
+ *
+ * @deprecated This plugin is no longer used. Remove in Astro 5.0
  */
 export declare const tagExportsPlugin: PluginObj;

package/dist/vite-plugin-mdx/tag.js

@@ -45,8 +45,7 @@ const tagExportsPlugin = {
        */
       enter(path) {
         const node = path.node;
-        if (!t.isExportDefaultDeclaration(node))
-          return;
+        if (!t.isExportDefaultDeclaration(node)) return;
         if (t.isArrowFunctionExpression(node.declaration) || t.isCallExpression(node.declaration)) {
           const varName = t.isArrowFunctionExpression(node.declaration) ? "_arrow_function" : "_hoc_function";
           const uidIdentifier = path.scope.generateUidIdentifier(varName);
@@ -61,10 +60,8 @@ const tagExportsPlugin = {
       },
       exit(path, state) {
         const node = path.node;
-        if (node.exportKind === "type")
-          return;
-        if (t.isExportAllDeclaration(node))
-          return;
+        if (node.exportKind === "type") return;
+        if (t.isExportAllDeclaration(node)) return;
         const addTag = (id) => {
           const tags = state.get("astro:tags") ?? [];
           state.set("astro:tags", [...tags, id]);

package/dist/vite-plugin-mdx/transform-jsx.d.ts

@@ -1,2 +1,5 @@
 import type { TransformResult } from 'rollup';
+/**
+ * @deprecated This function is no longer used. Remove in Astro 5.0
+ */
 export declare function transformJSX(code: string, id: string, ssr?: boolean): Promise<TransformResult>;

package/dist/vite-plugin-mdx/transform-jsx.js

@@ -17,8 +17,7 @@ async function transformJSX(code, id, ssr) {
     browserslistConfigFile: false,
     inputSourceMap: options.inputSourceMap
   });
-  if (!result)
-    return null;
+  if (!result) return null;
   const { astro } = result.metadata;
   return {
     code: result.code || "",

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

@@ -2,8 +2,8 @@ import { extname } from "node:path";
 import { bold } from "kleur/colors";
 import { normalizePath } from "vite";
 import {} from "../core/logger/core.js";
-import { isEndpoint, isPage, rootRelativePath } from "../core/util.js";
-import { getPrerenderDefault, isServerLikeOutput } from "../prerender/utils.js";
+import { isEndpoint, isPage, isServerLikeOutput, rootRelativePath } from "../core/util.js";
+import { getPrerenderDefault } from "../prerender/utils.js";
 import { scan } from "./scan.js";
 const KNOWN_FILE_EXTENSIONS = [".astro", ".js", ".ts"];
 function astroScannerPlugin({
@@ -14,8 +14,7 @@ function astroScannerPlugin({
     name: "astro:scanner",
     enforce: "post",
     async transform(code, id, options) {
-      if (!options?.ssr)
-        return;
+      if (!options?.ssr) return;
       const filename = normalizePath(id);
       let fileURL;
       try {
@@ -25,8 +24,7 @@ function astroScannerPlugin({
       }
       const fileIsPage = isPage(fileURL, settings);
       const fileIsEndpoint = isEndpoint(fileURL, settings);
-      if (!(fileIsPage || fileIsEndpoint))
-        return;
+      if (!(fileIsPage || fileIsEndpoint)) return;
       const defaultPrerender = getPrerenderDefault(settings.config);
       const pageOptions = await scan(code, id, settings);
       if (typeof pageOptions.prerender === "undefined") {

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

@@ -3,8 +3,7 @@ import { AstroError, AstroErrorData } from "../core/errors/index.js";
 const BOOLEAN_EXPORTS = /* @__PURE__ */ new Set(["prerender"]);
 function includesExport(code) {
   for (const name of BOOLEAN_EXPORTS) {
-    if (code.includes(name))
-      return true;
+    if (code.includes(name)) return true;
   }
   return false;
 }
@@ -25,8 +24,7 @@ function isFalsy(value) {
 }
 let didInit = false;
 async function scan(code, id, settings) {
-  if (!includesExport(code))
-    return {};
+  if (!includesExport(code)) return {};
   if (!didInit) {
     await eslexer.init;
     didInit = true;

package/dist/vite-plugin-scripts/page-ssr.js

@@ -9,11 +9,9 @@ function astroScriptsPostPlugin({
     name: "astro:scripts:page-ssr",
     enforce: "post",
     transform(code, id, options) {
-      if (!options?.ssr)
-        return;
+      if (!options?.ssr) return;
       const hasInjectedScript = settings.scripts.some((s2) => s2.stage === "page-ssr");
-      if (!hasInjectedScript)
-        return;
+      if (!hasInjectedScript) return;
       const filename = normalizePath(id);
       let fileURL;
       try {
@@ -22,8 +20,7 @@ function astroScriptsPostPlugin({
         return;
       }
       const fileIsPage = isPage(fileURL, settings);
-      if (!fileIsPage)
-        return;
+      if (!fileIsPage) return;
       const s = new MagicString(code, { filename });
       s.prepend(`import '${PAGE_SSR_SCRIPT_ID}';
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -54,6 +54,7 @@
     "./components": "./components/index.ts",
     "./components/*": "./components/*",
     "./toolbar": "./dist/toolbar/index.js",
+    "./actions/runtime/*": "./dist/actions/runtime/*",
     "./assets": "./dist/assets/index.js",
     "./assets/utils": "./dist/assets/utils/index.js",
     "./assets/endpoint/*": "./dist/assets/endpoint/*.js",
@@ -85,6 +86,7 @@
     "components",
     "tsconfigs",
     "dist",
+    "types",
     "astro.js",
     "index.d.ts",
     "config.d.ts",
@@ -96,20 +98,20 @@
     "jsx-runtime.d.ts",
     "content-types.template.d.ts",
     "content-module.template.mjs",
+    "templates",
     "astro-jsx.d.ts",
-    "types/content.d.ts",
     "types.d.ts",
     "README.md",
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.7.1",
-    "@babel/core": "^7.24.4",
-    "@babel/generator": "^7.24.4",
-    "@babel/parser": "^7.24.4",
+    "@astrojs/compiler": "^2.8.0",
+    "@babel/core": "^7.24.5",
+    "@babel/generator": "^7.24.5",
+    "@babel/parser": "^7.24.5",
     "@babel/plugin-transform-react-jsx": "^7.23.4",
-    "@babel/traverse": "^7.24.1",
-    "@babel/types": "^7.24.0",
+    "@babel/traverse": "^7.24.5",
+    "@babel/types": "^7.24.5",
     "@types/babel__core": "^7.20.5",
     "@types/cookie": "^0.6.0",
     "acorn": "^8.11.3",
@@ -118,7 +120,7 @@
     "boxen": "^7.1.1",
     "chokidar": "^3.6.0",
     "ci-info": "^4.0.0",
-    "clsx": "^2.1.0",
+    "clsx": "^2.1.1",
     "common-ancestor-path": "^1.0.1",
     "cookie": "^0.6.0",
     "cssesc": "^3.0.0",
@@ -128,8 +130,8 @@
     "diff": "^5.2.0",
     "dlv": "^1.1.3",
     "dset": "^3.1.3",
-    "es-module-lexer": "^1.5.0",
-    "esbuild": "^0.20.2",
+    "es-module-lexer": "^1.5.2",
+    "esbuild": "^0.21.1",
     "estree-walker": "^3.0.3",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
@@ -150,19 +152,19 @@
     "prompts": "^2.4.2",
     "rehype": "^13.0.1",
     "resolve": "^1.22.8",
-    "semver": "^7.6.0",
-    "shiki": "^1.3.0",
+    "semver": "^7.6.1",
+    "shiki": "^1.5.0",
     "string-width": "^7.1.0",
     "strip-ansi": "^7.1.0",
     "tsconfck": "^3.0.3",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.1",
-    "vite": "^5.2.10",
+    "vite": "^5.2.11",
     "vitefu": "^0.2.5",
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
-    "zod": "^3.23.0",
-    "zod-to-json-schema": "^3.22.5",
+    "zod": "^3.23.8",
+    "zod-to-json-schema": "^3.23.0",
     "@astrojs/internal-helpers": "0.4.0",
     "@astrojs/markdown-remark": "5.1.0",
     "@astrojs/telemetry": "3.1.0"
@@ -171,8 +173,8 @@
     "sharp": "^0.33.3"
   },
   "devDependencies": {
-    "@astrojs/check": "^0.5.10",
-    "@playwright/test": "^1.43.1",
+    "@astrojs/check": "^0.6.0",
+    "@playwright/test": "^1.44.0",
     "@types/aria-query": "^5.0.4",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__traverse": "^7.20.5",
@@ -180,7 +182,7 @@
     "@types/connect": "^3.4.38",
     "@types/cssesc": "^3.0.2",
     "@types/debug": "^4.1.12",
-    "@types/diff": "^5.2.0",
+    "@types/diff": "^5.2.1",
     "@types/dlv": "^1.1.4",
     "@types/dom-view-transitions": "^1.0.4",
     "@types/hast": "^3.0.4",
@@ -196,15 +198,17 @@
     "@types/yargs-parser": "^21.0.3",
     "cheerio": "1.0.0-rc.12",
     "eol": "^0.9.1",
-    "memfs": "^4.8.2",
+    "mdast-util-mdx": "^3.0.0",
+    "mdast-util-mdx-jsx": "^3.1.2",
+    "memfs": "^4.9.2",
     "node-mocks-http": "^1.14.1",
     "parse-srcset": "^1.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.16.1",
-    "sass": "^1.75.0",
+    "rollup": "^4.17.2",
+    "sass": "^1.77.0",
     "srcset-parse": "^1.1.0",
     "unified": "^11.0.4",
     "astro-scripts": "0.0.14"

package/templates/actions.mjs

@@ -0,0 +1,61 @@
+import { ActionError, callSafely } from 'astro:actions';
+
+function toActionProxy(actionCallback = {}, aggregatedPath = '/_actions/') {
+	return new Proxy(actionCallback, {
+		get(target, objKey) {
+			if (objKey in target) {
+				return target[objKey];
+			}
+			const path = aggregatedPath + objKey.toString();
+			const action = (clientParam) => actionHandler(clientParam, path);
+			action.toString = () => path;
+			action.safe = (input) => {
+				return callSafely(() => action(input));
+			};
+			// recurse to construct queries for nested object paths
+			// ex. actions.user.admins.auth()
+			return toActionProxy(action, path + '.');
+		},
+	});
+}
+
+/**
+ * @param {*} clientParam argument passed to the action when used on the client.
+ * @param {string} path Built path to call action on the server.
+ * Usage: `actions.[name](clientParam)`.
+ */
+async function actionHandler(clientParam, path) {
+	if (import.meta.env.SSR) {
+		throw new ActionError({
+			code: 'BAD_REQUEST',
+			message:
+				'Action unexpectedly called on the server. If this error is unexpected, share your feedback on our RFC discussion: https://github.com/withastro/roadmap/pull/912',
+		});
+	}
+	const headers = new Headers();
+	headers.set('Accept', 'application/json');
+	let body = clientParam;
+	if (!(body instanceof FormData)) {
+		try {
+			body = clientParam ? JSON.stringify(clientParam) : undefined;
+		} catch (e) {
+			throw new ActionError({
+				code: 'BAD_REQUEST',
+				message: `Failed to serialize request body to JSON. Full error: ${e.message}`,
+			});
+		}
+		headers.set('Content-Type', 'application/json');
+	}
+	const res = await fetch(path, {
+		method: 'POST',
+		body,
+		headers,
+	});
+	if (!res.ok) {
+		throw await ActionError.fromResponse(res);
+	}
+	const json = await res.json();
+	return json;
+}
+
+export const actions = toActionProxy();

package/types/actions.d.ts

@@ -0,0 +1,3 @@
+declare module 'astro:actions' {
+	export * from 'astro/actions/runtime/virtual/server.js';
+}

package/types/content.d.ts

@@ -26,7 +26,7 @@ declare module 'astro:content' {
 		| import('astro/zod').ZodDiscriminatedUnion<string, import('astro/zod').AnyZodObject[]>
 		| import('astro/zod').ZodIntersection<BaseSchemaWithoutEffects, BaseSchemaWithoutEffects>;
 
-	type BaseSchema =
+	export type BaseSchema =
 		| BaseSchemaWithoutEffects
 		| import('astro/zod').ZodEffects<BaseSchemaWithoutEffects>;
 
@@ -42,7 +42,7 @@ declare module 'astro:content' {
 		schema?: S | ((context: SchemaContext) => S);
 	};
 
-	type CollectionConfig<S extends BaseSchema> =
+	export type CollectionConfig<S extends BaseSchema> =
 		| ContentCollectionConfig<S>
 		| DataCollectionConfig<S>;