astro 3.6.2 → 4.0.0-beta.1

package/dist/runtime/server/endpoint.js

@@ -1,35 +1,24 @@
-function getHandlerFromModule(mod, method, logger) {
-  const lowerCaseMethod = method.toLowerCase();
-  if (mod[lowerCaseMethod]) {
-    logger.warn(
-      "astro",
-      `Lower case endpoint names are deprecated and will not be supported in Astro 4.0. Rename the endpoint ${lowerCaseMethod} to ${method}.`
-    );
-  }
+import { bold } from "kleur/colors";
+function getHandlerFromModule(mod, method) {
   if (mod[method]) {
     return mod[method];
   }
-  if (mod[lowerCaseMethod]) {
-    return mod[lowerCaseMethod];
-  }
-  if (method === "delete" && mod["del"]) {
-    return mod["del"];
-  }
-  if (mod["all"]) {
-    return mod["all"];
-  }
   if (mod["ALL"]) {
     return mod["ALL"];
   }
   return void 0;
 }
 async function renderEndpoint(mod, context, ssr, logger) {
-  const { request } = context;
+  const { request, url } = context;
   const chosenMethod = request.method?.toUpperCase();
-  const handler = getHandlerFromModule(mod, chosenMethod, logger);
-  if (!ssr && ssr === false && chosenMethod && chosenMethod !== "GET" && chosenMethod !== "get") {
-    console.warn(`
-${chosenMethod} requests are not available when building a static site. Update your config to \`output: 'server'\` or \`output: 'hybrid'\` with an \`export const prerender = false\` to handle ${chosenMethod} requests.`);
+  const handler = getHandlerFromModule(mod, chosenMethod);
+  if (!ssr && ssr === false && chosenMethod && chosenMethod !== "GET") {
+    logger.warn(
+      null,
+      `${url.pathname} ${bold(
+        chosenMethod
+      )} requests are not available for a static site. Update your config to \`output: 'server'\` or \`output: 'hybrid'\` to enable.`
+    );
   }
   if (!handler || typeof handler !== "function") {
     let response = new Response(null, {

package/dist/transitions/vite-plugin-transitions.js

@@ -17,20 +17,20 @@ function astroTransitions({ settings }) {
     load(id) {
       if (id === resolvedVirtualModuleId) {
         return `
-				export * from "astro/transitions";
+				export * from "astro/virtual-modules/transitions.js";
 				export { default as ViewTransitions } from "astro/components/ViewTransitions.astro";
 			`;
       }
       if (id === resolvedVirtualClientModuleId) {
         return `
-				export { navigate, supportsViewTransitions, transitionEnabledOnThisPage } from "astro/transitions/router";
-				export * from "astro/transitions/types";
+				export { navigate, supportsViewTransitions, transitionEnabledOnThisPage } from "astro/virtual-modules/transitions-router.js";
+				export * from "astro/virtual-modules/transitions-types.js";
 				export {
 					TRANSITION_BEFORE_PREPARATION, isTransitionBeforePreparationEvent, TransitionBeforePreparationEvent,
 					TRANSITION_AFTER_PREPARATION,
 					TRANSITION_BEFORE_SWAP, isTransitionBeforeSwapEvent, TransitionBeforeSwapEvent,
 					TRANSITION_AFTER_SWAP, TRANSITION_PAGE_LOAD
-				} from "astro/transitions/events";
+				} from "astro/virtual-modules/transitions-events.js";
 			`;
       }
     },

package/dist/virtual-modules/i18n.d.ts

@@ -0,0 +1 @@
+export * from '../i18n/index.js';

package/dist/virtual-modules/i18n.js

@@ -0,0 +1 @@
+export * from "../i18n/index.js";

package/dist/virtual-modules/middleware.d.ts

@@ -0,0 +1 @@
+export { defineMiddleware, sequence } from '../core/middleware/index.js';

package/dist/virtual-modules/middleware.js

@@ -0,0 +1,5 @@
+import { defineMiddleware, sequence } from "../core/middleware/index.js";
+export {
+  defineMiddleware,
+  sequence
+};

package/dist/virtual-modules/prefetch.d.ts

@@ -0,0 +1 @@
+export * from '../prefetch/index.js';

package/dist/virtual-modules/prefetch.js

@@ -0,0 +1 @@
+export * from "../prefetch/index.js";

package/dist/virtual-modules/transitions-events.d.ts

@@ -0,0 +1 @@
+export * from '../transitions/events.js';

package/dist/virtual-modules/transitions-events.js

@@ -0,0 +1 @@
+export * from "../transitions/events.js";

package/dist/virtual-modules/transitions-router.d.ts

@@ -0,0 +1 @@
+export * from '../transitions/router.js';

package/dist/virtual-modules/transitions-router.js

@@ -0,0 +1 @@
+export * from "../transitions/router.js";

package/dist/virtual-modules/transitions-types.d.ts

@@ -0,0 +1 @@
+export * from '../transitions/types.js';

package/dist/virtual-modules/transitions-types.js

@@ -0,0 +1 @@
+export * from "../transitions/types.js";

package/dist/virtual-modules/transitions.d.ts

@@ -0,0 +1 @@
+export * from '../transitions/index.js';

package/dist/virtual-modules/transitions.js

@@ -0,0 +1 @@
+export * from "../transitions/index.js";

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

@@ -5,7 +5,6 @@ import {
   invalidateCompilation,
   isCached
 } from "../core/compile/index.js";
-import * as msg from "../core/messages.js";
 import { isAstroScript } from "./query.js";
 const PKG_PREFIX = fileURLToPath(new URL("../../", import.meta.url));
 const E2E_PREFIX = fileURLToPath(new URL("../../e2e", import.meta.url));
@@ -47,18 +46,17 @@ async function handleHotUpdate(ctx, { config, logger, compile, source }) {
       }
     }
   }
-  for (const file2 of files) {
-    if (isStyleOnlyChange && file2 === ctx.file)
+  for (const file of files) {
+    if (isStyleOnlyChange && file === ctx.file)
       continue;
-    invalidateCompilation(config, file2);
-    if (file2.endsWith(".astro")) {
-      ctx.server.moduleGraph.onFileChange(file2);
+    invalidateCompilation(config, file);
+    if (file.endsWith(".astro")) {
+      ctx.server.moduleGraph.onFileChange(file);
     }
   }
   const mods = [...filtered].filter((m) => !m.url.endsWith("="));
-  const file = ctx.file.replace(slash(fileURLToPath(config.root)), "/");
   if (isStyleOnlyChange) {
-    logger.info("astro", msg.hmr({ file, style: true }));
+    logger.debug("watch", "style-only change");
     return mods.filter((mod) => mod.id !== ctx.file && !mod.id?.endsWith(".ts"));
   }
   for (const mod of mods) {
@@ -69,12 +67,8 @@ async function handleHotUpdate(ctx, { config, logger, compile, source }) {
     }
   }
   const isSelfAccepting = mods.every((m) => m.isSelfAccepting || m.url.endsWith(".svelte"));
-  if (isSelfAccepting) {
-    if (/astro\.config\.[cm][jt]s$/.test(file))
-      return mods;
-    logger.info("astro", msg.hmr({ file }));
-  } else {
-    logger.info("astro", msg.reload({ file }));
+  if (!isSelfAccepting) {
+    logger.debug("watch", "full page reload triggered");
   }
   return mods;
 }

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

@@ -1,3 +1,4 @@
+import { fileURLToPath } from "url";
 import { normalizePath } from "vite";
 import {
   cachedCompilation,
@@ -9,6 +10,22 @@ import { cachedFullCompilation } from "./compile.js";
 import { handleHotUpdate } from "./hmr.js";
 import { parseAstroRequest } from "./query.js";
 import { getAstroMetadata } from "./metadata.js";
+const PKG_PREFIX = fileURLToPath(new URL("../../", import.meta.url));
+const E2E_PREFIX = fileURLToPath(new URL("../../e2e", import.meta.url));
+const isPkgFile = (id) => {
+  return id?.startsWith(PKG_PREFIX) && !id.startsWith(E2E_PREFIX);
+};
+const dedupeHotUpdateLogsCache = /* @__PURE__ */ new Map();
+function dedupeHotUpdateLogs(filename) {
+  if (dedupeHotUpdateLogsCache.has(filename)) {
+    return false;
+  }
+  dedupeHotUpdateLogsCache.set(
+    filename,
+    setTimeout(() => dedupeHotUpdateLogsCache.delete(filename), 150)
+  );
+  return true;
+}
 function astro({ settings, logger }) {
   const { config } = settings;
   let resolvedConfig;
@@ -144,18 +161,23 @@ File: ${id}`
     async handleHotUpdate(context) {
       if (context.server.config.isProduction)
         return;
-      const compileProps = {
+      const filename = context.file;
+      const isSkipLog = /astro\.config\.[cm][jt]s$/.test(filename) || /(\/|\\)\.astro(\/|\\)/.test(filename) || isPkgFile(filename);
+      if (!isSkipLog && dedupeHotUpdateLogs(filename)) {
+        logger.info("watch", filename.replace(config.root.pathname, "/"));
+      }
+      const source = await context.read();
+      const compile = () => cachedCompilation({
         astroConfig: config,
         viteConfig: resolvedConfig,
-        filename: context.file,
-        source: await context.read()
-      };
-      const compile = () => cachedCompilation(compileProps);
+        filename,
+        source
+      });
       return handleHotUpdate(context, {
         config,
         logger,
         compile,
-        source: compileProps.source
+        source
       });
     }
   };

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

@@ -1,6 +1,6 @@
+import { bold } from "kleur/colors";
 import * as fs from "node:fs";
 import notFoundTemplate, { subpathNotUsedTemplate } from "../template/4xx.js";
-import { log404 } from "./common.js";
 import { writeHtmlResponse } from "./response.js";
 function baseMiddleware(settings, logger) {
   const { config } = settings;
@@ -16,12 +16,10 @@ function baseMiddleware(settings, logger) {
       return next();
     }
     if (pathname === "/" || pathname === "/index.html") {
-      log404(logger, pathname);
       const html = subpathNotUsedTemplate(devRoot, pathname);
       return writeHtmlResponse(res, 404, html);
     }
     if (req.headers.accept?.includes("text/html")) {
-      log404(logger, pathname);
       const html = notFoundTemplate({
         statusCode: 404,
         title: "Not found",
@@ -35,8 +33,10 @@ function baseMiddleware(settings, logger) {
       if (stats) {
         const expectedLocation = new URL("." + url, devRootURL).pathname;
         logger.warn(
-          "dev",
-          `Requests for items in your public folder must also include your base. ${url} should be ${expectedLocation}. Omitting the base will break in production.`
+          "router",
+          `Request URLs for ${bold(
+            "public/"
+          )} assets must also include your base. "${expectedLocation}" expected, but received "${url}".`
         );
         res.writeHead(301, {
           Location: expectedLocation

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

@@ -45,7 +45,7 @@ async function writeWebResponse(res, webResponse) {
   const _headers = Object.fromEntries(headers.entries());
   if (headers.has("set-cookie")) {
     if ("getSetCookie" in headers && typeof headers.getSetCookie === "function") {
-      _headers["set-cookie"] = headers.getSetCookie();
+      _headers["set-cookie"] = headers.getSetCookie().toString();
     } else {
       _headers["set-cookie"] = headers.get("set-cookie");
     }

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

@@ -1,6 +1,9 @@
 import { fileURLToPath } from "node:url";
+import { getInfoOutput } from "../cli/info/index.js";
+import { ASTRO_VERSION } from "../core/constants.js";
 import { AstroErrorData, isAstroError } from "../core/errors/index.js";
 import { sequence } from "../core/middleware/index.js";
+import { req } from "../core/messages.js";
 import { loadMiddleware } from "../core/middleware/loadMiddleware.js";
 import {
   createRenderContext,
@@ -13,13 +16,15 @@ import { createI18nMiddleware, i18nPipelineHook } from "../i18n/middleware.js";
 import { getSortedPreloadedMatches } from "../prerender/routing.js";
 import { isServerLikeOutput } from "../prerender/utils.js";
 import { PAGE_SCRIPT_ID } from "../vite-plugin-scripts/index.js";
-import { log404 } from "./common.js";
 import { getStylesForURL } from "./css.js";
 import { preload } from "./index.js";
 import { getComponentMetadata } from "./metadata.js";
 import { handle404Response, writeSSRResult, writeWebResponse } from "./response.js";
 import { getScriptsForURL } from "./scripts.js";
 const clientLocalsSymbol = Symbol.for("astro.locals");
+function isLoggedRequest(url) {
+  return url !== "/favicon.ico";
+}
 function getCustom404Route(manifestData) {
   const route404 = /^\/404\/?$/;
   return manifestData.routes.find((r) => route404.test(r.route));
@@ -64,7 +69,7 @@ async function matchRoute(pathname, manifestData, pipeline) {
   if (matches.length) {
     const possibleRoutes = matches.flatMap((route) => route.component);
     pipeline.logger.warn(
-      "getStaticPaths",
+      "router",
       `${AstroErrorData.NoMatchingStaticPathFound.message(
         pathname
       )}
@@ -72,7 +77,6 @@ async function matchRoute(pathname, manifestData, pipeline) {
 ${AstroErrorData.NoMatchingStaticPathFound.hint(possibleRoutes)}`
     );
   }
-  log404(logger, pathname);
   const custom404 = getCustom404Route(manifestData);
   if (custom404) {
     const filePath = new URL(`./${custom404.component}`, pipeline.getConfig().root);
@@ -100,11 +104,15 @@ async function handleRoute({
   incomingResponse,
   manifest
 }) {
+  const timeStart = performance.now();
   const env = pipeline.getEnvironment();
   const config = pipeline.getConfig();
   const moduleLoader = pipeline.getModuleLoader();
   const { logger } = env;
   if (!matchedRoute && !config.experimental.i18n) {
+    if (isLoggedRequest(pathname)) {
+      logger.info(null, req({ url: pathname, method: incomingRequest.method, statusCode: 404 }));
+    }
     return handle404Response(origin, incomingRequest, incomingResponse);
   }
   const buildingToSSR = isServerLikeOutput(config);
@@ -227,6 +235,18 @@ async function handleRoute({
     pipeline.setMiddlewareFunction(onRequest);
   }
   let response = await pipeline.renderRoute(renderContext, mod);
+  if (isLoggedRequest(pathname)) {
+    const timeEnd = performance.now();
+    logger.info(
+      null,
+      req({
+        url: pathname,
+        method: incomingRequest.method,
+        statusCode: response.status,
+        reqTime: timeEnd - timeStart
+      })
+    );
+  }
   if (response.status === 404 && has404Route(manifestData)) {
     const fourOhFourRoute = await matchRoute("/404", manifestData, pipeline);
     if (options && fourOhFourRoute?.route !== options.route)
@@ -281,11 +301,15 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
         },
         children: ""
       });
+      const additionalMetadata = {
+        root: fileURLToPath(settings.config.root),
+        version: ASTRO_VERSION,
+        debugInfo: await getInfoOutput({ userConfig: settings.config, print: false })
+      };
+      settings.config;
       scripts.add({
         props: {},
-        children: `window.__astro_dev_overlay__ = {root: ${JSON.stringify(
-          fileURLToPath(settings.config.root)
-        )}}`
+        children: `window.__astro_dev_overlay__ = ${JSON.stringify(additionalMetadata)}`
       });
     }
   }

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

@@ -41,7 +41,7 @@ async function setUpEnvTs({
         'types="astro/client"'
       );
       await fs.promises.writeFile(envTsPath, typesEnvContents, "utf-8");
-      logger.info("assets", `Removed ${bold(envTsPathRelativetoRoot)} types`);
+      logger.info("types", `Removed ${bold(envTsPathRelativetoRoot)} type declarations`);
     }
     if (!fs.existsSync(dotAstroDir))
       return;
@@ -50,7 +50,7 @@ async function setUpEnvTs({
       typesEnvContents = `${expectedTypeReference}
 ${typesEnvContents}`;
       await fs.promises.writeFile(envTsPath, typesEnvContents, "utf-8");
-      logger.info("content", `Added ${bold(envTsPathRelativetoRoot)} types`);
+      logger.info("types", `Added ${bold(envTsPathRelativetoRoot)} type declarations`);
     }
   } else {
     let referenceDefs = [];
@@ -60,7 +60,7 @@ ${typesEnvContents}`;
     }
     await fs.promises.mkdir(settings.config.srcDir, { recursive: true });
     await fs.promises.writeFile(envTsPath, referenceDefs.join("\n"), "utf-8");
-    logger.info("astro", `Added ${bold(envTsPathRelativetoRoot)} types`);
+    logger.info("types", `Added ${bold(envTsPathRelativetoRoot)} type declarations`);
   }
 }
 export {

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

@@ -21,7 +21,7 @@ function astroIntegrationsContainerPlugin({
   };
 }
 async function resolveEntryPoint(route) {
-  const resolvedId = await this.resolve(route.entryPoint).then((res) => res?.id).catch(() => void 0);
+  const resolvedId = await this.resolve(route.entrypoint).then((res) => res?.id).catch(() => void 0);
   if (!resolvedId)
     return route;
   const resolvedEntryPoint = new URL(`file://${normalizePath(resolvedId)}`);

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

@@ -1,6 +1,7 @@
 import nodeFs from "node:fs";
 import npath from "node:path";
 import { slash } from "../core/path.js";
+import { cleanUrl } from "../vite-plugin-utils/index.js";
 function loadFallbackPlugin({
   fs,
   root
@@ -59,9 +60,6 @@ function loadFallbackPlugin({
     }
   ];
 }
-const queryRE = /\?.*$/s;
-const hashRE = /#.*$/s;
-const cleanUrl = (url) => url.replace(hashRE, "").replace(queryRE, "");
 export {
   loadFallbackPlugin as default
 };

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

@@ -34,14 +34,11 @@ function astroScannerPlugin({
       }
       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))) {
-        const reason = ` because \`output: "${settings.config.output}"\` is set`;
         logger.warn(
-          "getStaticPaths",
-          `The getStaticPaths() statement in ${bold(
+          "router",
+          `getStaticPaths() ignored in dynamic page ${bold(
             rootRelativePath(settings.config.root, fileURL, true)
-          )} has been ignored${reason}.
-
-Add \`export const prerender = true;\` to prerender this page.`
+          )}. Add \`export const prerender = true;\` to prerender the page as static HTML during the build process.`
         );
       }
       const { meta = {} } = this.getModuleInfo(id) ?? {};

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

@@ -29,7 +29,7 @@ function astroScriptsPlugin({ settings }) {
     },
     buildStart() {
       const hasHydrationScripts = settings.scripts.some((s) => s.stage === "before-hydration");
-      const isSsrBuild = env?.ssrBuild || env?.isSsrBuild;
+      const isSsrBuild = env?.isSsrBuild;
       if (hasHydrationScripts && env?.command === "build" && !isSsrBuild) {
         this.emitFile({
           type: "chunk",

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

@@ -18,3 +18,4 @@ export declare function getFileInfo(id: string, config: AstroConfig): {
  * as absolute file paths with forward slashes.
  */
 export declare function normalizeFilename(filename: string, root: URL): string;
+export declare function cleanUrl(url: string): string;

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

@@ -32,7 +32,12 @@ function normalizeFilename(filename, root) {
   }
   return removeLeadingForwardSlashWindows(filename);
 }
+const postfixRE = /[?#].*$/s;
+function cleanUrl(url) {
+  return url.replace(postfixRE, "");
+}
 export {
+  cleanUrl,
   escapeViteEnvReferences,
   getFileInfo,
   normalizeFilename