astro 3.6.2 → 4.0.0-beta.1

package/dist/cli/info/index.js

@@ -5,16 +5,17 @@ import prompts from "prompts";
 import { resolveConfig } from "../../core/config/index.js";
 import { ASTRO_VERSION } from "../../core/constants.js";
 import { flagsToAstroInlineConfig } from "../flags.js";
-async function printInfo({ flags }) {
+async function getInfoOutput({
+  userConfig,
+  print
+}) {
   const rows = [
     ["Astro", `v${ASTRO_VERSION}`],
     ["Node", process.version],
     ["System", getSystem()],
     ["Package Manager", getPackageManager()]
   ];
-  const inlineConfig = flagsToAstroInlineConfig(flags);
   try {
-    const { userConfig } = await resolveConfig(inlineConfig, "info");
     rows.push(["Output", userConfig.output ?? "static"]);
     rows.push(["Adapter", userConfig.adapter?.name ?? "none"]);
     const integrations = (userConfig?.integrations ?? []).filter(Boolean).flat().map((i) => i?.name).filter(Boolean);
@@ -23,9 +24,14 @@ async function printInfo({ flags }) {
   }
   let output = "";
   for (const [label, value] of rows) {
-    output += printRow(label, value);
+    output += printRow(label, value, print);
   }
-  await copyToClipboard(output.trim());
+  return output.trim();
+}
+async function printInfo({ flags }) {
+  const { userConfig } = await resolveConfig(flagsToAstroInlineConfig(flags), "info");
+  const output = await getInfoOutput({ userConfig, print: true });
+  await copyToClipboard(output);
 }
 async function copyToClipboard(text) {
   const system = platform();
@@ -84,7 +90,7 @@ function getPackageManager() {
   return name === "npminstall" ? "cnpm" : name;
 }
 const MAX_PADDING = 25;
-function printRow(label, value) {
+function printRow(label, value, print) {
   const padding = MAX_PADDING - label.length;
   const [first, ...rest] = Array.isArray(value) ? value : [value];
   let plaintext = `${label}${" ".repeat(padding)}${first}`;
@@ -98,9 +104,12 @@ ${" ".repeat(MAX_PADDING)}${colors.green(entry)}`;
     }
   }
   plaintext += "\n";
-  console.log(richtext);
+  if (print) {
+    console.log(richtext);
+  }
   return plaintext;
 }
 export {
+  getInfoOutput,
   printInfo
 };

package/dist/cli/install-package.js

@@ -13,7 +13,7 @@ async function getPackage(packageName, logger, options, otherDeps = []) {
     packageImport = await import(packageName);
   } catch (e) {
     logger.info(
-      "",
+      null,
       `To continue, Astro requires the following dependency to be installed: ${bold(packageName)}.`
     );
     const result = await installPackage([packageName, ...otherDeps], options, logger);

package/dist/cli/telemetry/index.js

@@ -1,15 +1,15 @@
-import whichPm from "which-pm";
 import * as msg from "../../core/messages.js";
 import { telemetry } from "../../events/index.js";
+import { createLoggerFromFlags } from "../flags.js";
 async function notify() {
-  const packageManager = (await whichPm(process.cwd()))?.name ?? "npm";
   await telemetry.notify(() => {
-    console.log(msg.telemetryNotice(packageManager) + "\n");
+    console.log(msg.telemetryNotice() + "\n");
     return true;
   });
 }
 async function update(subcommand, { flags }) {
   const isValid = ["enable", "disable", "reset"].includes(subcommand);
+  const logger = createLoggerFromFlags(flags);
   if (flags.help || flags.h || !isValid) {
     msg.printHelp({
       commandName: "astro telemetry",
@@ -27,17 +27,17 @@ async function update(subcommand, { flags }) {
   switch (subcommand) {
     case "enable": {
       telemetry.setEnabled(true);
-      console.log(msg.telemetryEnabled());
+      logger.info("SKIP_FORMAT", msg.telemetryEnabled());
       return;
     }
     case "disable": {
       telemetry.setEnabled(false);
-      console.log(msg.telemetryDisabled());
+      logger.info("SKIP_FORMAT", msg.telemetryDisabled());
       return;
     }
     case "reset": {
       telemetry.clear();
-      console.log(msg.telemetryReset());
+      logger.info("SKIP_FORMAT", msg.telemetryReset());
       return;
     }
   }

package/dist/content/server-listeners.js

@@ -1,4 +1,4 @@
-import { bold, cyan } from "kleur/colors";
+import { bold, cyan, underline } from "kleur/colors";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { loadTSConfig } from "../core/config/tsconfig.js";
@@ -13,7 +13,7 @@ async function attachContentServerListeners({
 }) {
   const contentPaths = getContentPaths(settings.config, fs);
   if (fs.existsSync(contentPaths.contentDir)) {
-    logger.info(
+    logger.debug(
       "content",
       `Watching ${cyan(
         contentPaths.contentDir.href.replace(settings.config.root.href, "")
@@ -27,7 +27,7 @@ async function attachContentServerListeners({
     viteServer.watcher.on("addDir", contentDirListener);
     async function contentDirListener(dir) {
       if (appendForwardSlash(pathToFileURL(dir).href) === contentPaths.contentDir.href) {
-        logger.info("content", `Content dir found. Watching for changes`);
+        logger.debug("content", `Content directory found. Watching for changes`);
         await attachListeners();
         viteServer.watcher.removeListener("addDir", contentDirListener);
       }
@@ -42,7 +42,7 @@ async function attachContentServerListeners({
       contentConfigObserver: globalContentConfigObserver
     });
     await contentGenerator.init();
-    logger.info("content", "Types generated");
+    logger.debug("content", "Types generated");
     viteServer.watcher.on("add", (entry) => {
       contentGenerator.queueEvent({ name: "add", entry });
     });
@@ -74,9 +74,9 @@ function warnAllowJsIsFalse({
       "true"
     )} in your ${bold(tsConfigFileName)} file to have autocompletion in your ${bold(
       contentConfigFileName
-    )} file.
-See ${bold("https://www.typescriptlang.org/tsconfig#allowJs")} for more information.
-			`
+    )} file. See ${underline(
+      cyan("https://www.typescriptlang.org/tsconfig#allowJs")
+    )} for more information.`
   );
 }
 async function getTSConfigStatsWhenAllowJsFalse({

package/dist/content/types-generator.d.ts

@@ -17,9 +17,6 @@ type CreateContentGeneratorParams = {
     viteServer: ViteDevServer;
     fs: typeof fsMod;
 };
-type EventOpts = {
-    logLevel: 'info' | 'warn';
-};
 export declare function createContentTypesGenerator({ contentConfigObserver, fs, logger, settings, viteServer, }: CreateContentGeneratorParams): Promise<{
     init: () => Promise<{
         typesGenerated: true;
@@ -27,6 +24,6 @@ export declare function createContentTypesGenerator({ contentConfigObserver, fs,
         typesGenerated: false;
         reason: 'no-content-dir';
     }>;
-    queueEvent: (rawEvent: RawContentEvent, opts?: EventOpts) => void;
+    queueEvent: (rawEvent: RawContentEvent) => void;
 }>;
 export {};

package/dist/content/types-generator.js

@@ -1,5 +1,5 @@
 import glob from "fast-glob";
-import { cyan } from "kleur/colors";
+import { bold, cyan } from "kleur/colors";
 import * as path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { normalizePath } from "vite";
@@ -39,10 +39,7 @@ async function createContentTypesGenerator({
     if (!fs.existsSync(contentPaths.contentDir)) {
       return { typesGenerated: false, reason: "no-content-dir" };
     }
-    events.push({
-      type: { name: "add", entry: contentPaths.config.url },
-      opts: { logLevel: "warn" }
-    });
+    events.push({ name: "add", entry: contentPaths.config.url });
     const globResult = await glob("**", {
       cwd: fileURLToPath(contentPaths.contentDir),
       fs: {
@@ -58,19 +55,15 @@ async function createContentTypesGenerator({
       if (entryURL.href.startsWith(contentPaths.config.url.href))
         continue;
       if (entry.dirent.isFile()) {
-        events.push({
-          type: { name: "add", entry: entryURL },
-          opts: { logLevel: "warn" }
-        });
+        events.push({ name: "add", entry: entryURL });
       } else if (entry.dirent.isDirectory()) {
-        events.push({ type: { name: "addDir", entry: entryURL }, opts: { logLevel: "warn" } });
+        events.push({ name: "addDir", entry: entryURL });
       }
     }
     await runEvents();
     return { typesGenerated: true };
   }
-  async function handleEvent(event, opts) {
-    const logLevel = opts?.logLevel ?? "info";
+  async function handleEvent(event) {
     if (event.name === "addDir" || event.name === "unlinkDir") {
       const collection2 = normalizePath(
         path.relative(fileURLToPath(contentPaths.contentDir), fileURLToPath(event.entry))
@@ -82,9 +75,7 @@ async function createContentTypesGenerator({
       switch (event.name) {
         case "addDir":
           collectionEntryMap[JSON.stringify(collection2)] = { type: "unknown", entries: {} };
-          if (logLevel === "info") {
-            logger.info("content", `${cyan(collection2)} collection added`);
-          }
+          logger.debug("content", `${cyan(collection2)} collection added`);
           break;
         case "unlinkDir":
           if (collectionKey2 in collectionEntryMap) {
@@ -125,16 +116,14 @@ async function createContentTypesGenerator({
     const { contentDir } = contentPaths;
     const collection = getEntryCollectionName({ entry, contentDir });
     if (collection === void 0) {
-      if (["info", "warn"].includes(logLevel)) {
-        logger.warn(
-          "content",
-          `${cyan(
-            normalizePath(
-              path.relative(fileURLToPath(contentPaths.contentDir), fileURLToPath(event.entry))
-            )
-          )} must be nested in a collection directory. Skipping.`
-        );
-      }
+      logger.warn(
+        "content",
+        `${bold(
+          normalizePath(
+            path.relative(fileURLToPath(contentPaths.contentDir), fileURLToPath(event.entry))
+          )
+        )} must live in a ${bold("content/...")} collection subdirectory.`
+      );
       return { shouldGenerateTypes: false };
     }
     if (fileType === "data") {
@@ -234,21 +223,18 @@ async function createContentTypesGenerator({
         return { shouldGenerateTypes: false };
     }
   }
-  function queueEvent(rawEvent, opts) {
+  function queueEvent(rawEvent) {
     const event = {
-      type: {
-        entry: pathToFileURL(rawEvent.entry),
-        name: rawEvent.name
-      },
-      opts
+      entry: pathToFileURL(rawEvent.entry),
+      name: rawEvent.name
     };
-    if (!event.type.entry.pathname.startsWith(contentPaths.contentDir.pathname))
+    if (!event.entry.pathname.startsWith(contentPaths.contentDir.pathname))
       return;
     events.push(event);
     debounceTimeout && clearTimeout(debounceTimeout);
     const runEventsSafe = async () => {
       try {
-        await runEvents(opts);
+        await runEvents();
       } catch {
       }
     };
@@ -258,29 +244,23 @@ async function createContentTypesGenerator({
       /* debounce to batch chokidar events */
     );
   }
-  async function runEvents(opts) {
-    const logLevel = opts?.logLevel ?? "info";
+  async function runEvents() {
     const eventResponses = [];
     for (const event of events) {
-      const response = await handleEvent(event.type, event.opts);
+      const response = await handleEvent(event);
       eventResponses.push(response);
     }
     events = [];
-    let unsupportedFiles = [];
     for (const response of eventResponses) {
       if (response.error instanceof UnsupportedFileTypeError) {
-        unsupportedFiles.push(response.error.message);
+        logger.warn(
+          "content",
+          `Unsupported file type ${bold(
+            response.error.message
+          )} found. Prefix filename with an underscore (\`_\`) to ignore.`
+        );
       }
     }
-    if (unsupportedFiles.length > 0 && ["info", "warn"].includes(logLevel)) {
-      logger.warn(
-        "content",
-        `Unsupported file types found. Prefix with an underscore (\`_\`) to ignore:
-- ${unsupportedFiles.join(
-          "\n"
-        )}`
-      );
-    }
     const observable = contentConfigObserver.get();
     if (eventResponses.some((r) => r.shouldGenerateTypes)) {
       await writeContentFiles({
@@ -293,7 +273,7 @@ async function createContentTypesGenerator({
         viteServer
       });
       invalidateVirtualMod(viteServer);
-      if (observable.status === "loaded" && ["info", "warn"].includes(logLevel)) {
+      if (observable.status === "loaded") {
         warnNonexistentCollections({
           logger,
           contentConfig: observable.config,
@@ -424,9 +404,9 @@ function warnNonexistentCollections({
     if (!collectionEntryMap[JSON.stringify(configuredCollection)]) {
       logger.warn(
         "content",
-        `The ${JSON.stringify(
-          configuredCollection
-        )} collection does not have an associated folder in your \`content\` directory. Make sure the folder exists, or check your content config for typos.`
+        `The ${bold(configuredCollection)} collection is defined but no ${bold(
+          "content/" + configuredCollection
+        )} folder exists in the content directory. Create a new folder for the collection, or check your content configuration file for typos.`
       );
     }
   }

package/dist/core/app/index.js

@@ -143,9 +143,7 @@ class App {
       );
       if (i18nMiddleware) {
         if (mod.onRequest) {
-          this.#pipeline.setMiddlewareFunction(
-            sequence(i18nMiddleware, mod.onRequest)
-          );
+          this.#pipeline.setMiddlewareFunction(sequence(i18nMiddleware, mod.onRequest));
         } else {
           this.#pipeline.setMiddlewareFunction(i18nMiddleware);
         }
@@ -160,7 +158,7 @@ class App {
       if (err instanceof EndpointNotFoundError) {
         return this.#renderError(request, { status: 404, response: err.originalResponse });
       } else {
-        this.#logger.error("ssr", err.stack || err.message || String(err));
+        this.#logger.error(null, err.stack || err.message || String(err));
         return this.#renderError(request, { status: 500 });
       }
     }

package/dist/core/build/buildPipeline.js

@@ -114,9 +114,9 @@ class BuildPipeline extends Pipeline {
    */
   retrieveRoutesToGenerate() {
     const pages = /* @__PURE__ */ new Map();
-    for (const [entryPoint, filePath] of this.#internals.entrySpecifierToBundleMap) {
-      if (entryPoint.includes(ASTRO_PAGE_RESOLVED_MODULE_ID) || entryPoint.includes(RESOLVED_SPLIT_MODULE_ID)) {
-        const [, pageName] = entryPoint.split(":");
+    for (const [entrypoint, filePath] of this.#internals.entrySpecifierToBundleMap) {
+      if (entrypoint.includes(ASTRO_PAGE_RESOLVED_MODULE_ID) || entrypoint.includes(RESOLVED_SPLIT_MODULE_ID)) {
+        const [, pageName] = entrypoint.split(":");
         const pageData = this.#internals.pagesByComponent.get(
           `${pageName.replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, ".")}`
         );

package/dist/core/build/generate.js

@@ -1,5 +1,4 @@
-import * as colors from "kleur/colors";
-import { bgGreen, black, cyan, dim, green, magenta } from "kleur/colors";
+import { bgGreen, black, blue, bold, dim, green, magenta, red } from "kleur/colors";
 import fs from "node:fs";
 import os from "node:os";
 import { fileURLToPath } from "node:url";
@@ -79,13 +78,6 @@ async function getEntryForFallbackRoute(route, internals, outFolder) {
   }
   return RedirectSinglePageBuiltModule;
 }
-function shouldSkipDraft(pageModule, settings) {
-  return (
-    // Drafts are disabled
-    !settings.config.markdown.drafts && // This is a draft post
-    "frontmatter" in pageModule && pageModule.frontmatter?.draft === true
-  );
-}
 function rootRelativeFacadeId(facadeId, settings) {
   return facadeId.slice(fileURLToPath(settings.config.root).length);
 }
@@ -103,7 +95,7 @@ function chunkIsPage(settings, output, internals) {
   return false;
 }
 async function generatePages(opts, internals) {
-  const timer = performance.now();
+  const generatePagesTimer = performance.now();
   const ssr = isServerLikeOutput(opts.settings.config);
   let manifest;
   if (ssr) {
@@ -126,7 +118,7 @@ async function generatePages(opts, internals) {
     return;
   }
   const verb = ssr ? "prerendering" : "generating";
-  logger.info(null, `
+  logger.info("SKIP_FORMAT", `
 ${bgGreen(black(` ${verb} static routes `))}`);
   const builtPaths = /* @__PURE__ */ new Set();
   const pagesToGenerate = pipeline.retrieveRoutesToGenerate();
@@ -135,10 +127,7 @@ ${bgGreen(black(` ${verb} static routes `))}`);
       if (pageData.route.prerender) {
         const ssrEntryURLPage = createEntryURL(filePath, outFolder);
         const ssrEntryPage = await import(ssrEntryURLPage.toString());
-        if (
-          // TODO: remove in Astro 4.0
-          opts.settings.config.build.split || opts.settings.adapter?.adapterFeatures?.functionPerRoute
-        ) {
+        if (opts.settings.adapter?.adapterFeatures?.functionPerRoute) {
           const ssrEntry = ssrEntryPage?.pageModule;
           if (ssrEntry) {
             await generatePage(pageData, ssrEntry, builtPaths, pipeline);
@@ -168,12 +157,14 @@ ${bgGreen(black(` ${verb} static routes `))}`);
       }
     }
   }
-  logger.info(null, dim(`Completed in ${getTimeStat(timer, performance.now())}.
-`));
+  logger.info(
+    null,
+    green(`\u2713 Completed in ${getTimeStat(generatePagesTimer, performance.now())}.
+`)
+  );
   const staticImageList = getStaticImageList();
   if (staticImageList.size) {
-    logger.info(null, `
-${bgGreen(black(` generating optimized images `))}`);
+    logger.info("SKIP_FORMAT", `${bgGreen(black(` generating optimized images `))}`);
     const totalCount = Array.from(staticImageList.values()).map((x) => x.transforms.size).reduce((a, b) => a + b, 0);
     const cpuCount = os.cpus().length;
     const assetsCreationEnvironment = await prepareAssetsGenerationEnv(pipeline, totalCount);
@@ -184,7 +175,7 @@ ${bgGreen(black(` generating optimized images `))}`);
     }
     await queue.onIdle();
     const assetsTimeEnd = performance.now();
-    logger.info(null, dim(`Completed in ${getTimeStat(assetsTimer, assetsTimeEnd)}.
+    logger.info(null, green(`\u2713 Completed in ${getTimeStat(assetsTimer, assetsTimeEnd)}.
 `));
     delete globalThis?.astroAsset?.addStaticImage;
   }
@@ -210,9 +201,7 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
   );
   if (config.experimental.i18n && i18nMiddleware) {
     if (onRequest) {
-      pipeline.setMiddlewareFunction(
-        sequence(i18nMiddleware, onRequest)
-      );
+      pipeline.setMiddlewareFunction(sequence(i18nMiddleware, onRequest));
     } else {
       pipeline.setMiddlewareFunction(i18nMiddleware);
     }
@@ -226,14 +215,6 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
     );
   }
   const pageModule = await pageModulePromise();
-  if (shouldSkipDraft(pageModule, pipeline.getSettings())) {
-    logger.info(null, `${magenta("\u26A0\uFE0F")}  Skipping draft ${pageData.route.component}`);
-    logger.warn(
-      "astro",
-      `The drafts feature is deprecated. You should migrate to content collections instead. See https://docs.astro.build/en/guides/content-collections/#filtering-collection-queries for more information.`
-    );
-    return;
-  }
   const generationOptions = {
     pageData,
     linkIds,
@@ -241,7 +222,7 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
     styles,
     mod: pageModule
   };
-  const icon = pageData.route.type === "page" || pageData.route.type === "redirect" || pageData.route.type === "fallback" ? green("\u25B6") : magenta("\u03BB");
+  const icon = pageData.route.type === "page" || pageData.route.type === "redirect" || pageData.route.type === "fallback" ? blue("\u25B6") : magenta("\u03BB");
   if (isRelativePath(pageData.route.component)) {
     logger.info(null, `${icon} ${pageData.route.route}`);
     for (const fallbackRoute of pageData.route.fallbackRoutes) {
@@ -257,10 +238,10 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
     await generatePath(path, generationOptions, pipeline);
     const timeEnd = performance.now();
     const timeChange = getTimeStat(prevTimeEnd, timeEnd);
-    const timeIncrease = `(+${timeChange})`;
+    const timeIncrease = `(${timeChange})`;
     const filePath = getOutputFilename(pipeline.getConfig(), path, pageData.route.type);
     const lineIcon = i === paths.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
-    logger.info(null, `  ${cyan(lineIcon)} ${dim(filePath)} ${dim(timeIncrease)}`);
+    logger.info(null, `  ${blue(lineIcon)} ${dim(filePath)} ${dim(timeIncrease)}`);
     prevTimeEnd = timeEnd;
   }
 }
@@ -292,13 +273,13 @@ async function getPathsForRoute(pageData, mod, pipeline, builtPaths) {
         logger,
         ssr: isServerLikeOutput(opts.settings.config)
       }).catch((err) => {
-        logger.debug("build", `\u251C\u2500\u2500 ${colors.bold(colors.red("\u2717"))} ${route.component}`);
+        logger.debug("build", `\u251C\u2500\u2500 ${bold(red("\u2717"))} ${route.component}`);
         throw err;
       });
       const label = staticPaths.length === 1 ? "page" : "pages";
       logger.debug(
         "build",
-        `\u251C\u2500\u2500 ${colors.bold(colors.green("\u2714"))} ${route.component} \u2192 ${colors.magenta(
+        `\u251C\u2500\u2500 ${bold(green("\u2714"))} ${route.component} \u2192 ${magenta(
           `[${staticPaths.length} ${label}]`
         )}`
       );
@@ -435,7 +416,6 @@ async function generatePath(pathname, gopts, pipeline) {
       defaultLocale: i18n?.defaultLocale
     });
     let body;
-    let encoding;
     let response;
     try {
       response = await pipeline.renderRoute(renderContext, mod);
@@ -472,13 +452,12 @@ async function generatePath(pathname, gopts, pipeline) {
       if (!response.body)
         return;
       body = Buffer.from(await response.arrayBuffer());
-      encoding = response.headers.get("X-Astro-Encoding") ?? "utf-8";
     }
     const outFolder = getOutFolder(pipeline.getConfig(), pathname, route.type);
     const outFile = getOutFile(pipeline.getConfig(), outFolder, pathname, route.type);
     route.distURL = outFile;
     await fs.promises.mkdir(outFolder, { recursive: true });
-    await fs.promises.writeFile(outFile, body, encoding);
+    await fs.promises.writeFile(outFile, body);
   }
 }
 function createBuildManifest(settings, internals, renderers) {

package/dist/core/build/index.js

@@ -1,4 +1,4 @@
-import * as colors from "kleur/colors";
+import { blue, bold, green } from "kleur/colors";
 import fs from "node:fs";
 import { performance } from "node:perf_hooks";
 import { fileURLToPath } from "node:url";
@@ -31,8 +31,9 @@ async function build(inlineConfig, options = {}) {
   if (astroConfig.experimental.contentCollectionCache && options.force) {
     const contentCacheDir = new URL("./content/", astroConfig.cacheDir);
     if (fs.existsSync(contentCacheDir)) {
-      logger.warn("content", "clearing cache");
+      logger.debug("content", "clearing content cache");
       await fs.promises.rm(contentCacheDir, { force: true, recursive: true });
+      logger.warn("content", "content cache cleared (force)");
     }
   }
   const settings = await createSettings(astroConfig, fileURLToPath(astroConfig.root));
@@ -100,9 +101,10 @@ class AstroBuilder {
   async build({ viteConfig }) {
     await runHookBuildStart({ config: this.settings.config, logging: this.logger });
     this.validateConfig();
-    this.logger.info("build", `output target: ${colors.green(this.settings.config.output)}`);
+    this.logger.info("build", `output: ${blue('"' + this.settings.config.output + '"')}`);
+    this.logger.info("build", `directory: ${blue(fileURLToPath(this.settings.config.outDir))}`);
     if (this.settings.adapter) {
-      this.logger.info("build", `deploy adapter: ${colors.green(this.settings.adapter.name)}`);
+      this.logger.info("build", `adapter: ${green(this.settings.adapter.name)}`);
     }
     this.logger.info("build", "Collecting build info...");
     this.timer.loadStart = performance.now();
@@ -116,7 +118,7 @@ class AstroBuilder {
     this.timer.buildStart = performance.now();
     this.logger.info(
       "build",
-      colors.dim(`Completed in ${getTimeStat(this.timer.init, performance.now())}.`)
+      green(`\u2713 Completed in ${getTimeStat(this.timer.init, performance.now())}.`)
     );
     const opts = {
       allPages,
@@ -174,30 +176,6 @@ class AstroBuilder {
         `the outDir cannot be the root folder. Please build to a folder such as dist.`
       );
     }
-    if (config.build.split === true) {
-      if (config.output === "static") {
-        this.logger.warn(
-          "configuration",
-          'The option `build.split` won\'t take effect, because `output` is not `"server"` or `"hybrid"`.'
-        );
-      }
-      this.logger.warn(
-        "configuration",
-        "The option `build.split` is deprecated. Use the adapter options."
-      );
-    }
-    if (config.build.excludeMiddleware === true) {
-      if (config.output === "static") {
-        this.logger.warn(
-          "configuration",
-          'The option `build.excludeMiddleware` won\'t take effect, because `output` is not `"server"` or `"hybrid"`.'
-        );
-      }
-      this.logger.warn(
-        "configuration",
-        "The option `build.excludeMiddleware` is deprecated. Use the adapter options."
-      );
-    }
   }
   /** Stats */
   async printStats({
@@ -209,12 +187,12 @@ class AstroBuilder {
     const total = getTimeStat(timeStart, performance.now());
     let messages = [];
     if (buildMode === "static") {
-      messages = [`${pageCount} page(s) built in`, colors.bold(total)];
+      messages = [`${pageCount} page(s) built in`, bold(total)];
     } else {
-      messages = ["Server built in", colors.bold(total)];
+      messages = ["Server built in", bold(total)];
     }
     logger.info("build", messages.join(" "));
-    logger.info("build", `${colors.bold("Complete!")}`);
+    logger.info("build", `${bold("Complete!")}`);
   }
 }
 export {

package/dist/core/build/internal.js

@@ -99,9 +99,9 @@ function* eachPageFromAllPages(allPages) {
   }
 }
 function* eachPageDataFromEntryPoint(internals) {
-  for (const [entryPoint, filePath] of internals.entrySpecifierToBundleMap) {
-    if (entryPoint.includes(ASTRO_PAGE_RESOLVED_MODULE_ID) || entryPoint.includes(RESOLVED_SPLIT_MODULE_ID)) {
-      const [, pageName] = entryPoint.split(":");
+  for (const [entrypoint, filePath] of internals.entrySpecifierToBundleMap) {
+    if (entrypoint.includes(ASTRO_PAGE_RESOLVED_MODULE_ID) || entrypoint.includes(RESOLVED_SPLIT_MODULE_ID)) {
+      const [, pageName] = entrypoint.split(":");
       const pageData = internals.pagesByComponent.get(
         `${pageName.replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, ".")}`
       );

package/dist/core/build/plugin.d.ts

@@ -31,8 +31,8 @@ export declare function createPluginContainer(options: StaticBuildOptions, inter
     internals: BuildInternals;
     register(plugin: AstroBuildPlugin): void;
     runBeforeHook(target: BuildTarget, input: Set<string>): Promise<{
-        vitePlugins: (VitePlugin | VitePlugin[])[];
-        lastVitePlugins: (VitePlugin | VitePlugin[])[];
+        vitePlugins: (VitePlugin<any> | VitePlugin<any>[])[];
+        lastVitePlugins: (VitePlugin<any> | VitePlugin<any>[])[];
     }>;
     runPostHook(ssrReturn: ViteBuildReturn, clientReturn: ViteBuildReturn | null): Promise<Map<string, {
         targets: BuildTarget[];

package/dist/core/build/plugins/plugin-manifest.js

@@ -76,10 +76,7 @@ function pluginManifest(options, internals) {
           throw new Error(`Did not generate an entry chunk for SSR`);
         }
         const manifest = await createManifest(options, internals);
-        const shouldPassMiddlewareEntryPoint = (
-          // TODO: remove in Astro 4.0
-          options.settings.config.build.excludeMiddleware || options.settings.adapter?.adapterFeatures?.edgeMiddleware
-        );
+        const shouldPassMiddlewareEntryPoint = options.settings.adapter?.adapterFeatures?.edgeMiddleware;
         await runHookBuildSsr({
           config: options.settings.config,
           manifest,