astro 4.7.1 → 4.8.0

package/dist/vite-plugin-astro-server/plugin.js

@@ -23,16 +23,17 @@ function createVitePluginAstroServer({
     configureServer(viteServer) {
       const loader = createViteLoader(viteServer);
       const manifest = createDevelopmentManifest(settings);
-      const pipeline = DevPipeline.create({ loader, logger, manifest, settings });
       let manifestData = ensure404Route(
         createRouteManifest({ settings, fsMod }, logger)
       );
+      const pipeline = DevPipeline.create(manifestData, { loader, logger, manifest, settings });
       const controller = createController({ loader });
       const localStorage = new AsyncLocalStorage();
       function rebuildManifest(needsManifestRebuild) {
         pipeline.clearRouteCache();
         if (needsManifestRebuild) {
           manifestData = ensure404Route(createRouteManifest({ settings }, logger));
+          pipeline.setManifestData(manifestData);
         }
       }
       viteServer.watcher.on("add", rebuildManifest.bind(null, true));
@@ -79,10 +80,8 @@ function createVitePluginAstroServer({
       };
     },
     transform(code, id, opts = {}) {
-      if (opts.ssr)
-        return;
-      if (!id.includes("vite/dist/client/client.mjs"))
-        return;
+      if (opts.ssr) return;
+      if (!id.includes("vite/dist/client/client.mjs")) return;
       return patchOverlay(code);
     }
   };
@@ -105,7 +104,7 @@ function createDevelopmentManifest(settings) {
     assets: /* @__PURE__ */ new Set(),
     entryModules: {},
     routes: [],
-    adapterName: "",
+    adapterName: settings?.adapter?.name || "",
     clientDirectives: settings.clientDirectives,
     renderers: [],
     base: settings.config.base,
@@ -115,6 +114,7 @@ function createDevelopmentManifest(settings) {
     inlinedScripts: /* @__PURE__ */ new Map(),
     i18n: i18nManifest,
     checkOrigin: settings.config.experimental.security?.csrfProtection?.origin ?? false,
+    rewritingEnabled: settings.config.experimental.rewriting,
     middleware(_, next) {
       return next();
     }

package/dist/vite-plugin-astro-server/response.js

@@ -78,8 +78,7 @@ async function writeWebResponse(res, webResponse) {
       });
       while (true) {
         const { done, value } = await reader.read();
-        if (done)
-          break;
+        if (done) break;
         if (value) {
           res.write(value);
         }

package/dist/vite-plugin-astro-server/route.js

@@ -78,7 +78,7 @@ ${AstroErrorData.NoMatchingStaticPathFound.hint(possibleRoutes)}`
   }
   if (custom404) {
     const filePath = new URL(`./${custom404.component}`, config.root);
-    const preloadedComponent = await pipeline.preload(filePath);
+    const preloadedComponent = await pipeline.preload(custom404, filePath);
     return {
       route: custom404,
       filePath,
@@ -139,40 +139,38 @@ async function handleRoute({
       if (!pathNameHasLocale && pathname !== "/") {
         return handle404Response(origin, incomingRequest, incomingResponse);
       }
-      request = createRequest({
-        base: config.base,
-        url,
-        headers: incomingRequest.headers,
-        logger,
-        // no route found, so we assume the default for rendering the 404 page
-        staticLike: config.output === "static" || config.output === "hybrid"
-      });
-      route = {
-        component: "",
-        generate(_data) {
-          return "";
-        },
-        params: [],
-        // Disable eslint as we only want to generate an empty RegExp
-        // eslint-disable-next-line prefer-regex-literals
-        pattern: new RegExp(""),
-        prerender: false,
-        segments: [],
-        type: "fallback",
-        route: "",
-        fallbackRoutes: [],
-        isIndex: false
-      };
-      renderContext = RenderContext.create({
-        pipeline,
-        pathname,
-        middleware,
-        request,
-        routeData: route
-      });
-    } else {
-      return handle404Response(origin, incomingRequest, incomingResponse);
     }
+    request = createRequest({
+      base: config.base,
+      url,
+      headers: incomingRequest.headers,
+      logger,
+      // no route found, so we assume the default for rendering the 404 page
+      staticLike: config.output === "static" || config.output === "hybrid"
+    });
+    route = {
+      component: "",
+      generate(_data) {
+        return "";
+      },
+      params: [],
+      // Disable eslint as we only want to generate an empty RegExp
+      // eslint-disable-next-line prefer-regex-literals
+      pattern: new RegExp(""),
+      prerender: false,
+      segments: [],
+      type: "fallback",
+      route: "",
+      fallbackRoutes: [],
+      isIndex: false
+    };
+    renderContext = RenderContext.create({
+      pipeline,
+      pathname,
+      middleware,
+      request,
+      routeData: route
+    });
   } else {
     const filePath = matchedRoute.filePath;
     const { preloadedComponent } = matchedRoute;
@@ -188,8 +186,7 @@ async function handleRoute({
       staticLike: config.output === "static" || route.prerender
     });
     for (const [name, value] of Object.entries(config.server.headers ?? {})) {
-      if (value)
-        incomingResponse.setHeader(name, value);
+      if (value) incomingResponse.setHeader(name, value);
     }
     options = {
       pipeline,
@@ -258,12 +255,9 @@ async function handleRoute({
   await writeSSRResult(request, response, incomingResponse);
 }
 function getStatus(matchedRoute) {
-  if (!matchedRoute)
-    return 404;
-  if (matchedRoute.route.route === "/404")
-    return 404;
-  if (matchedRoute.route.route === "/500")
-    return 500;
+  if (!matchedRoute) return 404;
+  if (matchedRoute.route.route === "/404") return 404;
+  if (matchedRoute.route.route === "/500") return 500;
 }
 export {
   handleRoute,

package/dist/vite-plugin-astro-server/vite.js

@@ -28,8 +28,7 @@ async function* crawlGraph(loader, _id, isRootFile, scanned = /* @__PURE__ */ ne
         continue;
       }
       for (const importedModule of entry.importedModules) {
-        if (!importedModule.id)
-          continue;
+        if (!importedModule.id) continue;
         const importedModulePathname = importedModule.id.replace(STRIP_QUERY_PARAMS_REGEX, "");
         const isFileTypeNeedingSSR = fileExtensionsToSSR.has(npath.extname(importedModulePathname));
         const isPropagationStoppingPoint = ASTRO_PROPAGATED_ASSET_REGEX.test(importedModule.id);

package/dist/vite-plugin-config-alias/index.js

@@ -2,11 +2,9 @@ import path from "node:path";
 import { normalizePath } from "vite";
 const getConfigAlias = (settings) => {
   const { tsConfig, tsConfigPath } = settings;
-  if (!tsConfig || !tsConfigPath || !tsConfig.compilerOptions)
-    return null;
+  if (!tsConfig || !tsConfigPath || !tsConfig.compilerOptions) return null;
   const { baseUrl, paths } = tsConfig.compilerOptions;
-  if (!baseUrl)
-    return null;
+  if (!baseUrl) return null;
   const resolvedBaseUrl = path.resolve(path.dirname(tsConfigPath), baseUrl);
   const aliases = [];
   if (paths) {
@@ -33,8 +31,7 @@ function configAliasVitePlugin({
   settings
 }) {
   const configAlias = getConfigAlias(settings);
-  if (!configAlias)
-    return null;
+  if (!configAlias) return null;
   const plugin = {
     name: "astro:tsconfig-alias",
     // use post to only resolve ids that all other plugins before it can't
@@ -43,8 +40,7 @@ function configAliasVitePlugin({
       patchCreateResolver(config, plugin);
     },
     async resolveId(id, importer, options) {
-      if (isVirtualId(id))
-        return;
+      if (isVirtualId(id)) return;
       for (const alias of configAlias) {
         if (alias.find.test(id)) {
           const updatedId = id.replace(alias.find, alias.replacement);
@@ -52,8 +48,7 @@ function configAliasVitePlugin({
             return updatedId;
           }
           const resolved = await this.resolve(updatedId, importer, { skipSelf: true, ...options });
-          if (resolved)
-            return resolved;
+          if (resolved) return resolved;
         }
       }
     }
@@ -80,15 +75,13 @@ function patchCreateResolver(config, postPlugin) {
         ssr
       };
       const result = await resolver.apply(_createResolver, args2);
-      if (result)
-        return result;
+      if (result) return result;
       const resolved = await postPlugin.resolveId.apply(fakePluginContext, [
         id,
         importer,
         fakeResolveIdOpts
       ]);
-      if (resolved)
-        return resolved;
+      if (resolved) return resolved;
     };
   };
 }

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

@@ -4,8 +4,7 @@ const injectExp = /(?:^\/\/|\/\/!)\s*astro-head-inject/;
 function configHeadVitePlugin() {
   let server;
   function propagateMetadata(id, prop, value, seen = /* @__PURE__ */ new Set()) {
-    if (seen.has(id))
-      return;
+    if (seen.has(id)) return;
     seen.add(id);
     const mod = server.moduleGraph.getModuleById(id);
     const info = this.getModuleInfo(id);
@@ -80,8 +79,7 @@ function astroHeadBuildPlugin(internals) {
             generateBundle(_opts, bundle) {
               const map = internals.componentMetadata;
               function getOrCreateMetadata(id) {
-                if (map.has(id))
-                  return map.get(id);
+                if (map.has(id)) return map.get(id);
                 const metadata = {
                   propagation: "none",
                   containsHead: false
@@ -90,8 +88,7 @@ function astroHeadBuildPlugin(internals) {
                 return metadata;
               }
               for (const [, output] of Object.entries(bundle)) {
-                if (output.type !== "chunk")
-                  continue;
+                if (output.type !== "chunk") continue;
                 for (const [id, mod] of Object.entries(output.modules)) {
                   const modinfo = this.getModuleInfo(id);
                   if (modinfo) {

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

@@ -6,8 +6,7 @@ function html() {
       options.plugins = options.plugins?.filter((p) => p.name !== "vite:build-html");
     },
     async transform(source, id) {
-      if (!id.endsWith(".html"))
-        return;
+      if (!id.endsWith(".html")) return;
       return await transform(source, id);
     }
   };

package/dist/vite-plugin-html/transform/escape.js

@@ -12,14 +12,12 @@ const rehypeEscape = ({ s }) => {
           );
         }
       } else if (node.type === "element") {
-        if (!node.properties)
-          return;
+        if (!node.properties) return;
         for (let [key, value] of Object.entries(node.properties)) {
           key = key.replace(/([A-Z])/g, "-$1").toLowerCase();
           const newKey = needsEscape(key) ? escapeTemplateLiteralCharacters(key) : key;
           const newValue = needsEscape(value) ? escapeTemplateLiteralCharacters(value) : value;
-          if (newKey === key && newValue === value)
-            continue;
+          if (newKey === key && newValue === value) continue;
           replaceAttribute(s, node, key, value === "" ? newKey : `${newKey}="${newValue}"`);
         }
       }

package/dist/vite-plugin-html/transform/slots.js

@@ -4,8 +4,7 @@ const rehypeSlots = ({ s }) => {
   return (tree, file) => {
     visit(tree, (node) => {
       if (node.type === "element" && node.tagName === "slot") {
-        if (typeof node.properties?.["is:inline"] !== "undefined")
-          return;
+        if (typeof node.properties?.["is:inline"] !== "undefined") return;
         const name = node.properties?.["name"] ?? "default";
         const start = node.position?.start.offset ?? 0;
         const end = node.position?.end.offset ?? 0;

package/dist/vite-plugin-html/transform/utils.js

@@ -3,8 +3,7 @@ function replaceAttribute(s, node, key, newValue) {
   splitAttrsTokenizer.lastIndex = 0;
   const text = s.original.slice(node.position?.start.offset ?? 0, node.position?.end.offset ?? 0).toString();
   const offset = text.indexOf(key);
-  if (offset === -1)
-    return;
+  if (offset === -1) return;
   const start = node.position.start.offset + offset;
   const tokens = text.slice(offset).split(splitAttrsTokenizer);
   const token = tokens[0].replace(/([^>])>[\s\S]*$/gm, "$1");

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

@@ -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}';
 `);