astro 3.6.2 → 4.0.0-beta.1

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

@@ -66,9 +66,6 @@ function vitePluginPages(opts, internals) {
   };
 }
 function shouldBundleMiddleware(settings) {
-  if (settings.config.build.excludeMiddleware === true) {
-    return false;
-  }
   if (settings.adapter?.adapterFeatures?.edgeMiddleware === true) {
     return false;
   }

package/dist/core/build/plugins/plugin-renderers.d.ts

@@ -2,6 +2,6 @@ import type { Plugin as VitePlugin } from 'vite';
 import type { AstroBuildPlugin } from '../plugin.js';
 import type { StaticBuildOptions } from '../types.js';
 export declare const RENDERERS_MODULE_ID = "@astro-renderers";
-export declare const RESOLVED_RENDERERS_MODULE_ID: string;
+export declare const RESOLVED_RENDERERS_MODULE_ID = "\0@astro-renderers";
 export declare function vitePluginRenderers(opts: StaticBuildOptions): VitePlugin;
 export declare function pluginRenderers(opts: StaticBuildOptions): AstroBuildPlugin;

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

@@ -80,8 +80,7 @@ function pluginSSR(options, internals) {
     targets: ["server"],
     hooks: {
       "build:before": () => {
-        let vitePlugin = ssr && // TODO: Remove in Astro 4.0
-        options.settings.config.build.split === false && functionPerRouteEnabled === false ? vitePluginSSR(internals, options.settings.adapter, options) : void 0;
+        let vitePlugin = ssr && functionPerRouteEnabled === false ? vitePluginSSR(internals, options.settings.adapter, options) : void 0;
         return {
           enforce: "after-user-plugins",
           vitePlugin
@@ -91,7 +90,7 @@ function pluginSSR(options, internals) {
         if (!ssr) {
           return;
         }
-        if (options.settings.config.build.split || functionPerRouteEnabled) {
+        if (functionPerRouteEnabled) {
           return;
         }
         if (!internals.ssrEntryChunk) {
@@ -110,7 +109,7 @@ function vitePluginSSRSplit(internals, adapter, options) {
     name: "@astrojs/vite-plugin-astro-ssr-split",
     enforce: "post",
     options(opts) {
-      if (options.settings.config.build.split || functionPerRouteEnabled) {
+      if (functionPerRouteEnabled) {
         const inputs = /* @__PURE__ */ new Set();
         for (const [path, pageData] of eachPageFromAllPages(options.allPages)) {
           if (routeIsRedirect(pageData.route)) {
@@ -172,7 +171,7 @@ function pluginSSRSplit(options, internals) {
     targets: ["server"],
     hooks: {
       "build:before": () => {
-        let vitePlugin = ssr && (options.settings.config.build.split || functionPerRouteEnabled) ? vitePluginSSRSplit(internals, options.settings.adapter, options) : void 0;
+        let vitePlugin = ssr && functionPerRouteEnabled ? vitePluginSSRSplit(internals, options.settings.adapter, options) : void 0;
         return {
           enforce: "after-user-plugins",
           vitePlugin
@@ -185,7 +184,7 @@ function generateSSRCode(config, adapter) {
   const imports = [];
   const contents = [];
   let pageMap;
-  if (config.build.split || isFunctionPerRouteEnabled(adapter)) {
+  if (isFunctionPerRouteEnabled(adapter)) {
     pageMap = "pageModule";
   } else {
     pageMap = "pageMap";

package/dist/core/build/static-build.js

@@ -1,7 +1,7 @@
 import { teardown } from "@astrojs/compiler";
 import * as eslexer from "es-module-lexer";
 import glob from "fast-glob";
-import { bgGreen, bgMagenta, black, dim } from "kleur/colors";
+import { bgGreen, bgMagenta, black, green } from "kleur/colors";
 import fs from "node:fs";
 import path, { extname } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -55,7 +55,7 @@ async function viteBuild(opts) {
   const ssrTime = performance.now();
   opts.logger.info("build", `Building ${settings.config.output} entrypoints...`);
   const ssrOutput = await ssrBuild(opts, internals, pageInput, container);
-  opts.logger.info("build", dim(`Completed in ${getTimeStat(ssrTime, performance.now())}.`));
+  opts.logger.info("build", green(`\u2713 Completed in ${getTimeStat(ssrTime, performance.now())}.`));
   settings.timer.end("SSR build");
   settings.timer.start("Client build");
   const rendererClientEntrypoints = settings.renderers.map((r) => r.clientEntrypoint).filter((a) => typeof a === "string");
@@ -209,7 +209,6 @@ async function ssrBuild(opts, internals, input, container) {
 }
 async function clientBuild(opts, internals, input, container) {
   const { settings, viteConfig } = opts;
-  const timer = performance.now();
   const ssr = isServerLikeOutput(settings.config);
   const out = ssr ? settings.config.build.client : getOutDirWithinCwd(settings.config.outDir);
   if (!input.size) {
@@ -219,8 +218,8 @@ async function clientBuild(opts, internals, input, container) {
     return null;
   }
   const { lastVitePlugins, vitePlugins } = await container.runBeforeHook("client", input);
-  opts.logger.info(null, `
-${bgGreen(black(" building client "))}`);
+  opts.logger.info("SKIP_FORMAT", `
+${bgGreen(black(" building client (vite) "))}`);
   const viteBuildConfig = {
     ...viteConfig,
     mode: viteConfig.mode || "production",
@@ -256,8 +255,6 @@ ${bgGreen(black(" building client "))}`);
     logger: opts.logger
   });
   const buildResult = await vite.build(viteBuildConfig);
-  opts.logger.info(null, dim(`Completed in ${getTimeStat(timer, performance.now())}.
-`));
   return buildResult;
 }
 async function runPostBuildHooks(container, ssrReturn, clientReturn) {

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

@@ -49,7 +49,7 @@ export interface SinglePageBuiltModule {
     /**
      * The `onRequest` hook exported by the middleware
      */
-    onRequest?: MiddlewareHandler<unknown>;
+    onRequest?: MiddlewareHandler;
     renderers: SSRLoadedRenderer[];
 }
 export type ViteBuildReturn = Awaited<ReturnType<typeof vite.build>>;

package/dist/core/build/util.js

@@ -1,6 +1,6 @@
 function getTimeStat(timeStart, timeEnd) {
   const buildTime = timeEnd - timeStart;
-  return buildTime < 750 ? `${Math.round(buildTime)}ms` : `${(buildTime / 1e3).toFixed(2)}s`;
+  return buildTime < 1e3 ? `${Math.round(buildTime)}ms` : `${(buildTime / 1e3).toFixed(2)}s`;
 }
 function shouldAppendForwardSlash(trailingSlash, buildFormat) {
   switch (trailingSlash) {

package/dist/core/config/config.js

@@ -36,8 +36,7 @@ function resolveFlags(flags) {
     port: typeof flags.port === "number" ? flags.port : void 0,
     open: typeof flags.open === "boolean" ? flags.open : void 0,
     config: typeof flags.config === "string" ? flags.config : void 0,
-    host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0,
-    drafts: typeof flags.drafts === "boolean" ? flags.drafts : void 0
+    host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0
   };
 }
 function resolveRoot(cwd) {