astro 4.0.4 → 4.0.6

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.0.4";
+const ASTRO_VERSION = "4.0.6";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/create-vite.js

@@ -31,6 +31,7 @@ import { vitePluginSSRManifest } from "../vite-plugin-ssr-manifest/index.js";
 import { createViteLogger } from "./logger/vite.js";
 import { vitePluginMiddleware } from "./middleware/vite-plugin.js";
 import { joinPaths } from "./path.js";
+import vitePluginFileURL from "../vite-plugin-fileurl/index.js";
 const ALWAYS_NOEXTERNAL = [
   // This is only because Vite's native ESM doesn't resolve "exports" correctly.
   "astro",
@@ -113,6 +114,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       astroPrefetch({ settings }),
       astroTransitions({ settings }),
       astroDevOverlay({ settings, logger }),
+      vitePluginFileURL({}),
       !!settings.config.i18n && astroInternationalization({ settings })
     ],
     publicDir: fileURLToPath(settings.config.publicDir),

package/dist/core/dev/container.js

@@ -1,6 +1,6 @@
 import nodeFs from "node:fs";
 import * as vite from "vite";
-import { injectImageEndpoint } from "../../assets/internal.js";
+import { injectImageEndpoint } from "../../assets/endpoint/config.js";
 import {
   runHookConfigDone,
   runHookConfigSetup,

package/dist/core/dev/dev.js

@@ -21,7 +21,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.0.4";
+  const currentVersion = "4.0.6";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/errors/errors-data.d.ts

@@ -1155,3 +1155,9 @@ export declare const UnknownError: {
     name: string;
     title: string;
 };
+export declare const UnhandledRejection: {
+    name: string;
+    title: string;
+    message: (stack: string) => string;
+    hint: string;
+};

package/dist/core/errors/errors-data.js

@@ -230,8 +230,8 @@ const ResponseSentError = {
 };
 const MiddlewareNoDataOrNextCalled = {
   name: "MiddlewareNoDataOrNextCalled",
-  title: "The middleware didn't return a response or call `next`.",
-  message: "The middleware needs to either return a `Response` object or call the `next` function."
+  title: "The middleware didn't return a `Response`.",
+  message: "Make sure your middleware returns a `Response` object, either directly or by returning the `Response` from calling the `next` function."
 };
 const MiddlewareNotAResponse = {
   name: "MiddlewareNotAResponse",
@@ -440,6 +440,15 @@ const CantRenderPage = {
   hint: "If you expect to find a route here, this may be an Astro bug. Please file an issue/restart the dev server"
 };
 const UnknownError = { name: "UnknownError", title: "Unknown Error." };
+const UnhandledRejection = {
+  name: "UnhandledRejection",
+  title: "Unhandled rejection",
+  message: (stack) => {
+    return `Astro detected an unhandled rejection. Here's the stack trace:
+${stack}`;
+  },
+  hint: "Make sure your promises all have an `await` or a `.catch()` handler."
+};
 export {
   AstroGlobNoMatch,
   AstroGlobUsedOutside,
@@ -503,6 +512,7 @@ export {
   ResponseSentError,
   StaticClientAddressNotAvailable,
   StaticRedirectNotAvailable,
+  UnhandledRejection,
   UnknownCLIError,
   UnknownCSSError,
   UnknownCompilerError,

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.0.4";
+  const version = "4.0.6";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -258,7 +258,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.0.4"}`
+        `v${"4.0.6"}`
       )} ${headline}`
     );
   }

package/dist/core/routing/manifest/create.js

@@ -318,7 +318,7 @@ This route collides with: "${collision.component}".`
       if (/^https?:\/\//.test(destination)) {
         logger.warn(
           "redirects",
-          `Redirecting to an external URL is not officially supported: ${from} -> ${to}`
+          `Redirecting to an external URL is not officially supported: ${from} -> ${destination}`
         );
       }
     }

package/dist/integrations/astroFeaturesValidation.js

@@ -43,9 +43,9 @@ function validateSupportKind(supportKind, adapterName, logger, featureName, hasC
   if (supportKind === STABLE) {
     return true;
   } else if (supportKind === DEPRECATED) {
-    featureIsDeprecated(adapterName, logger);
+    featureIsDeprecated(adapterName, logger, featureName);
   } else if (supportKind === EXPERIMENTAL) {
-    featureIsExperimental(adapterName, logger);
+    featureIsExperimental(adapterName, logger, featureName);
   }
   if (hasCorrectConfig() && supportKind === UNSUPPORTED) {
     featureIsUnsupported(adapterName, logger, featureName);
@@ -55,18 +55,18 @@ function validateSupportKind(supportKind, adapterName, logger, featureName, hasC
   }
 }
 function featureIsUnsupported(adapterName, logger, featureName) {
-  logger.error("config", `The feature ${featureName} is not supported (used by ${adapterName}).`);
+  logger.error("config", `The feature "${featureName}" is not supported (used by ${adapterName}).`);
 }
-function featureIsExperimental(adapterName, logger) {
+function featureIsExperimental(adapterName, logger, featureName) {
   logger.warn(
     "config",
-    `The feature is experimental and subject to change (used by ${adapterName}).`
+    `The feature "${featureName}" is experimental and subject to change (used by ${adapterName}).`
   );
 }
-function featureIsDeprecated(adapterName, logger) {
+function featureIsDeprecated(adapterName, logger, featureName) {
   logger.warn(
     "config",
-    `The feature is deprecated and will be removed in the future (used by ${adapterName}).`
+    `The feature "${featureName}" is deprecated and will be removed in the future (used by ${adapterName}).`
   );
 }
 const SHARP_SERVICE = "astro/assets/services/sharp";

package/dist/transitions/router.js

@@ -1,11 +1,13 @@
 import { TRANSITION_AFTER_SWAP, doPreparation, doSwap } from "./events.js";
+const inBrowser = import.meta.env.SSR === false;
+const pushState = inBrowser && history.pushState.bind(history);
+const replaceState = inBrowser && history.replaceState.bind(history);
 const updateScrollPosition = (positions) => {
   if (history.state) {
     history.scrollRestoration = "manual";
-    history.replaceState({ ...history.state, ...positions }, "");
+    replaceState({ ...history.state, ...positions }, "");
   }
 };
-const inBrowser = import.meta.env.SSR === false;
 const supportsViewTransitions = inBrowser && !!document.startViewTransition;
 const transitionEnabledOnThisPage = () => inBrowser && !!document.querySelector('[name="astro-view-transitions-enabled"]');
 const samePage = (thisLocation, otherLocation) => thisLocation.pathname === otherLocation.pathname && thisLocation.search === otherLocation.search;
@@ -43,7 +45,7 @@ if (inBrowser) {
     currentHistoryIndex = history.state.index;
     scrollTo({ left: history.state.scrollX, top: history.state.scrollY });
   } else if (transitionEnabledOnThisPage()) {
-    history.replaceState({ index: currentHistoryIndex, scrollX, scrollY }, "");
+    replaceState({ index: currentHistoryIndex, scrollX, scrollY }, "");
     history.scrollRestoration = "manual";
   }
 }
@@ -117,7 +119,7 @@ const moveToLocation = (to, from, options, historyState) => {
   if (to.href !== location.href && !historyState) {
     if (options.history === "replace") {
       const current = history.state;
-      history.replaceState(
+      replaceState(
         {
           ...options.state,
           index: current.index,
@@ -128,7 +130,7 @@ const moveToLocation = (to, from, options, historyState) => {
         to.href
       );
     } else {
-      history.pushState(
+      pushState(
         { ...options.state, index: ++currentHistoryIndex, scrollX: 0, scrollY: 0 },
         "",
         to.href

package/dist/vite-plugin-astro-server/error.d.ts

@@ -0,0 +1,7 @@
+import type { ModuleLoader } from '../core/module-loader/index.js';
+import type { AstroConfig } from '../@types/astro.js';
+import type DevPipeline from './devPipeline.js';
+export declare function recordServerError(loader: ModuleLoader, config: AstroConfig, pipeline: DevPipeline, _err: unknown): {
+    error: Error;
+    errorWithMetadata: import("../core/errors/errors.js").ErrorWithMetadata;
+};

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

@@ -0,0 +1,24 @@
+import { collectErrorMetadata } from "../core/errors/dev/index.js";
+import { createSafeError } from "../core/errors/index.js";
+import { formatErrorMessage } from "../core/messages.js";
+import { eventError, telemetry } from "../events/index.js";
+function recordServerError(loader, config, pipeline, _err) {
+  const err = createSafeError(_err);
+  try {
+    loader.fixStacktrace(err);
+  } catch {
+  }
+  const errorWithMetadata = collectErrorMetadata(err, config.root);
+  telemetry.record(eventError({ cmd: "dev", err: errorWithMetadata, isFatal: false }));
+  pipeline.logger.error(
+    null,
+    formatErrorMessage(errorWithMetadata, pipeline.logger.level() === "debug")
+  );
+  return {
+    error: err,
+    errorWithMetadata
+  };
+}
+export {
+  recordServerError
+};

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

@@ -5,6 +5,12 @@ import { baseMiddleware } from "./base.js";
 import { createController } from "./controller.js";
 import DevPipeline from "./devPipeline.js";
 import { handleRequest } from "./request.js";
+import { AstroError, AstroErrorData } from "../core/errors/index.js";
+import { getViteErrorPayload } from "../core/errors/dev/index.js";
+import { AsyncLocalStorage } from "node:async_hooks";
+import { IncomingMessage } from "node:http";
+import { setRouteError } from "./server-state.js";
+import { recordServerError } from "./error.js";
 function createVitePluginAstroServer({
   settings,
   logger,
@@ -18,6 +24,7 @@ function createVitePluginAstroServer({
       const pipeline = new DevPipeline({ logger, manifest, settings, loader });
       let manifestData = createRouteManifest({ settings, fsMod }, logger);
       const controller = createController({ loader });
+      const localStorage = new AsyncLocalStorage();
       function rebuildManifest(needsManifestRebuild) {
         pipeline.clearRouteCache();
         if (needsManifestRebuild) {
@@ -27,6 +34,23 @@ function createVitePluginAstroServer({
       viteServer.watcher.on("add", rebuildManifest.bind(null, true));
       viteServer.watcher.on("unlink", rebuildManifest.bind(null, true));
       viteServer.watcher.on("change", rebuildManifest.bind(null, false));
+      function handleUnhandledRejection(rejection) {
+        const error = new AstroError({
+          ...AstroErrorData.UnhandledRejection,
+          message: AstroErrorData.UnhandledRejection.message(rejection?.stack || rejection)
+        });
+        const store = localStorage.getStore();
+        if (store instanceof IncomingMessage) {
+          const request = store;
+          setRouteError(controller.state, request.url, error);
+        }
+        const { errorWithMetadata } = recordServerError(loader, settings.config, pipeline, error);
+        setTimeout(
+          async () => loader.webSocketSend(await getViteErrorPayload(errorWithMetadata)),
+          200
+        );
+      }
+      process.on("unhandledRejection", handleUnhandledRejection);
       return () => {
         viteServer.middlewares.stack.unshift({
           route: "",
@@ -38,13 +62,15 @@ function createVitePluginAstroServer({
             response.end();
             return;
           }
-          handleRequest({
-            pipeline,
-            manifestData,
-            controller,
-            incomingRequest: request,
-            incomingResponse: response,
-            manifest
+          localStorage.run(request, () => {
+            handleRequest({
+              pipeline,
+              manifestData,
+              controller,
+              incomingRequest: request,
+              incomingResponse: response,
+              manifest
+            });
           });
         });
       };

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

@@ -1,12 +1,9 @@
-import { collectErrorMetadata } from "../core/errors/dev/index.js";
-import { createSafeError } from "../core/errors/index.js";
-import { formatErrorMessage } from "../core/messages.js";
 import { collapseDuplicateSlashes, removeTrailingForwardSlash } from "../core/path.js";
-import { eventError, telemetry } from "../events/index.js";
 import { isServerLikeOutput } from "../prerender/utils.js";
 import { runWithErrorHandling } from "./controller.js";
 import { handle500Response } from "./response.js";
 import { handleRoute, matchRoute } from "./route.js";
+import { recordServerError } from "./error.js";
 async function handleRequest({
   pipeline,
   manifestData,
@@ -64,19 +61,9 @@ async function handleRequest({
       });
     },
     onError(_err) {
-      const err = createSafeError(_err);
-      try {
-        moduleLoader.fixStacktrace(err);
-      } catch {
-      }
-      const errorWithMetadata = collectErrorMetadata(err, config.root);
-      telemetry.record(eventError({ cmd: "dev", err: errorWithMetadata, isFatal: false }));
-      pipeline.logger.error(
-        null,
-        formatErrorMessage(errorWithMetadata, pipeline.logger.level() === "debug")
-      );
+      const { error, errorWithMetadata } = recordServerError(moduleLoader, config, pipeline, _err);
       handle500Response(moduleLoader, incomingResponse, errorWithMetadata);
-      return err;
+      return error;
     }
   });
 }

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

@@ -0,0 +1,2 @@
+import type { Plugin as VitePlugin } from 'vite';
+export default function vitePluginFileURL({}: {}): VitePlugin;

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

@@ -0,0 +1,14 @@
+function vitePluginFileURL({}) {
+  return {
+    name: "astro:vite-plugin-file-url",
+    resolveId(source, importer) {
+      if (source.startsWith("file://")) {
+        const rest = source.slice(7);
+        return this.resolve(rest, importer);
+      }
+    }
+  };
+}
+export {
+  vitePluginFileURL as default
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.0.4",
+  "version": "4.0.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -99,7 +99,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.3.2",
+    "@astrojs/compiler": "^2.3.4",
     "@babel/core": "^7.23.3",
     "@babel/generator": "^7.23.3",
     "@babel/parser": "^7.23.3",