astro 3.3.1 → 3.3.3

package/dist/@types/astro.d.ts

@@ -506,7 +506,28 @@ export interface AstroUserConfig {
      *
      * When using this option, all of your static asset imports and URLs should add the base as a prefix. You can access this value via `import.meta.env.BASE_URL`.
      *
-     * The value of `import.meta.env.BASE_URL` respects your `trailingSlash` config and will include a trailing slash if you explicitly include one or if `trailingSlash: "always"` is set. If `trailingSlash: "never"` is set, `BASE_URL` will not include a trailing slash, even if `base` includes one.
+     * The value of `import.meta.env.BASE_URL` will be determined by your `trailingSlash` config, no matter what value you have set for `base`.
+     *
+     * A trailing slash is always included if `trailingSlash: "always"` is set. If `trailingSlash: "never"` is set, `BASE_URL` will not include a trailing slash, even if `base` includes one.
+     *
+     * Additionally, Astro will internally manipulate the configured value of `config.base` before making it available to integrations. The value of `config.base` as read by integrations will also be determined by your `trailingSlash` configuration in the same way.
+     *
+     * In the example below, the values of `import.meta.env.BASE_URL` and `config.base` when processed will both be `/docs`:
+     * ```js
+     * {
+     * 	 base: '/docs/',
+     * 	 trailingSlash: "never"
+     * }
+     * ```
+     *
+     * In the example below, the values of `import.meta.env.BASE_URL` and `config.base` when processed will both be `/docs/`:
+     *
+     * ```js
+     * {
+     * 	 base: '/docs',
+     * 	 trailingSlash: "always"
+     * }
+     * ```
      */
     base?: string;
     /**

package/dist/assets/endpoint/node.js

@@ -1,11 +1,15 @@
 import { isRemotePath, removeQueryString } from "@astrojs/internal-helpers/path";
 import { readFile } from "fs/promises";
 import mime from "mime/lite.js";
+import os from "os";
 import { getConfiguredImageService, isRemoteAllowed } from "../internal.js";
 import { etag } from "../utils/etag.js";
 import { assetsDir, imageConfig } from "astro:assets";
+function replaceFileSystemReferences(src) {
+  return os.platform().includes("win32") ? src.replace(/^\/@fs\//, "") : src.replace(/^\/@fs/, "");
+}
 async function loadLocalImage(src, url) {
-  const filePath = import.meta.env.DEV ? removeQueryString(src.slice("/@fs".length)) : new URL("." + src, assetsDir);
+  const filePath = import.meta.env.DEV ? removeQueryString(replaceFileSystemReferences(src)) : new URL("." + src, assetsDir);
   let buffer = void 0;
   try {
     buffer = await readFile(filePath);

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

@@ -86,7 +86,7 @@ function assets({
       },
       // In build, rewrite paths to ESM imported images in code to their final location
       async renderChunk(code) {
-        const assetUrlRE = /__ASTRO_ASSET_IMAGE__([a-z\d]{8})__(?:_(.*?)__)?/g;
+        const assetUrlRE = /__ASTRO_ASSET_IMAGE__([\w$]{8})__(?:_(.*?)__)?/g;
         let match;
         let s;
         while (match = assetUrlRE.exec(code)) {

package/dist/cli/add/index.js

@@ -583,7 +583,11 @@ ${message}`
             ...inheritedFlags,
             ...installCommand.dependencies
           ],
-          { cwd }
+          {
+            cwd,
+            // reset NODE_ENV to ensure install command run in dev mode
+            env: { NODE_ENV: void 0 }
+          }
         );
         spinner.succeed();
         return 1 /* updated */;

package/dist/core/app/index.d.ts

@@ -8,6 +8,10 @@ export interface RenderErrorOptions {
     routeData?: RouteData;
     response?: Response;
     status: 404 | 500;
+    /**
+     * Whether to skip onRequest() while rendering the error page. Defaults to false.
+     */
+    skipMiddleware?: boolean;
 }
 export declare class App {
     #private;

package/dist/core/app/index.js

@@ -208,7 +208,7 @@ class App {
    * If it is a known error code, try sending the according page (e.g. 404.astro / 500.astro).
    * This also handles pre-rendered /404 or /500 routes
    */
-  async #renderError(request, { status, response: originalResponse }) {
+  async #renderError(request, { status, response: originalResponse, skipMiddleware = false }) {
     const errorRouteData = matchRoute("/" + status, this.#manifestData);
     const url = new URL(request.url);
     if (errorRouteData) {
@@ -232,12 +232,22 @@ class App {
           status
         );
         const page = await mod.page();
-        if (mod.onRequest) {
+        if (skipMiddleware === false && mod.onRequest) {
           this.#pipeline.setMiddlewareFunction(mod.onRequest);
         }
+        if (skipMiddleware) {
+          this.#pipeline.unsetMiddlewareFunction();
+        }
         const response2 = await this.#pipeline.renderRoute(newRenderContext, page);
         return this.#mergeResponses(response2, originalResponse);
       } catch {
+        if (skipMiddleware === false && mod.onRequest) {
+          return this.#renderError(request, {
+            status,
+            response: originalResponse,
+            skipMiddleware: true
+          });
+        }
       }
     }
     const response = this.#mergeResponses(new Response(null, { status }), originalResponse);

package/dist/core/constants.js

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

package/dist/core/create-vite.js

@@ -69,6 +69,8 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
     }
   });
   const commonConfig = {
+    // Tell Vite not to combine config from vite.config.js with our provided inline config
+    configFile: false,
     cacheDir: fileURLToPath(new URL("./node_modules/.vite/", settings.config.root)),
     // using local caches allows Astro to be used in monorepos, etc.
     clearScreen: false,

package/dist/core/dev/dev.js

@@ -20,7 +20,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "3.3.1";
+  const currentVersion = "3.3.3";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.3.1";
+  const version = "3.3.3";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -235,7 +235,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"3.3.1"}`
+        `v${"3.3.3"}`
       )} ${headline}`
     );
   }

package/dist/core/pipeline.d.ts

@@ -25,6 +25,10 @@ export declare class Pipeline {
      * A middleware function that will be called before each request.
      */
     setMiddlewareFunction(onRequest: MiddlewareEndpointHandler): void;
+    /**
+     * Removes the current middleware function. Subsequent requests won't trigger any middleware.
+     */
+    unsetMiddlewareFunction(): void;
     /**
      * Returns the current environment
      */

package/dist/core/pipeline.js

@@ -33,6 +33,12 @@ class Pipeline {
   setMiddlewareFunction(onRequest) {
     this.#onRequest = onRequest;
   }
+  /**
+   * Removes the current middleware function. Subsequent requests won't trigger any middleware.
+   */
+  unsetMiddlewareFunction() {
+    this.#onRequest = void 0;
+  }
   /**
    * Returns the current environment
    */

package/dist/transitions/router.js

@@ -26,6 +26,7 @@ const announce = () => {
   );
 };
 const PERSIST_ATTR = "data-astro-transition-persist";
+const VITE_ID = "data-vite-dev-id";
 let parser;
 let currentHistoryIndex = 0;
 if (inBrowser) {
@@ -142,6 +143,8 @@ const updateHistoryAndScrollPosition = (toLocation, replace, intraPage) => {
 async function updateDOM(newDocument, toLocation, options, popState, fallback) {
   const persistedHeadElement = (el) => {
     const id = el.getAttribute(PERSIST_ATTR);
+    if (id === "")
+      return void 0;
     const newEl = id && newDocument.head.querySelector(`[${PERSIST_ATTR}="${id}"]`);
     if (newEl) {
       return newEl;
@@ -154,7 +157,7 @@ async function updateDOM(newDocument, toLocation, options, popState, fallback) {
   };
   const saveFocus = () => {
     const activeElement = document.activeElement;
-    if (activeElement?.closest("[data-astro-transition-persist]")) {
+    if (activeElement?.closest(`[${PERSIST_ATTR}]`)) {
       if (activeElement instanceof HTMLInputElement || activeElement instanceof HTMLTextAreaElement) {
         const start = activeElement.selectionStart;
         const end = activeElement.selectionEnd;
@@ -198,7 +201,7 @@ async function updateDOM(newDocument, toLocation, options, popState, fallback) {
       const newEl = persistedHeadElement(el);
       if (newEl) {
         newEl.remove();
-      } else {
+      } else if (newEl === null) {
         el.remove();
       }
     }
@@ -274,6 +277,8 @@ async function transition(direction, toLocation, options, popState) {
     location.href = href;
     return;
   }
+  if (import.meta.env.DEV)
+    await prepareForClientOnlyComponents(newDocument, toLocation);
   if (!popState) {
     history.replaceState({ ...history.state, scrollX, scrollY }, "");
   }
@@ -359,6 +364,41 @@ if (inBrowser) {
     markScriptsExec();
   }
 }
+async function prepareForClientOnlyComponents(newDocument, toLocation) {
+  if (newDocument.body.querySelector(`astro-island[client='only']`)) {
+    const nextPage = document.createElement("iframe");
+    nextPage.setAttribute("src", toLocation.href);
+    nextPage.style.display = "none";
+    document.body.append(nextPage);
+    await hydrationDone(nextPage);
+    const nextHead = nextPage.contentDocument?.head;
+    if (nextHead) {
+      document.head.querySelectorAll(`style[${PERSIST_ATTR}=""]`).forEach((s) => s.removeAttribute(PERSIST_ATTR));
+      const viteIds = [...nextHead.querySelectorAll(`style[${VITE_ID}]`)].map(
+        (style) => style.getAttribute(VITE_ID)
+      );
+      viteIds.forEach((id) => {
+        const style = document.head.querySelector(`style[${VITE_ID}="${id}"]`);
+        if (style && !newDocument.head.querySelector(`style[${VITE_ID}="${id}"]`)) {
+          style.setAttribute(PERSIST_ATTR, "");
+        }
+      });
+    }
+    async function hydrationDone(loadingPage) {
+      await new Promise(
+        (r) => loadingPage.contentWindow?.addEventListener("load", r, { once: true })
+      );
+      return new Promise(async (r) => {
+        for (let count = 0; count <= 20; ++count) {
+          if (!loadingPage.contentDocument.body.querySelector("astro-island[ssr]"))
+            break;
+          await new Promise((r2) => setTimeout(r2, 50));
+        }
+        r();
+      });
+    }
+  }
+}
 export {
   navigate,
   supportsViewTransitions,

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

@@ -1,3 +1,4 @@
+import { slash } from "@astrojs/internal-helpers/path";
 import { fileURLToPath } from "node:url";
 import {
   cachedCompilation,
@@ -55,7 +56,7 @@ async function handleHotUpdate(ctx, { config, logger, compile, source }) {
     }
   }
   const mods = [...filtered].filter((m) => !m.url.endsWith("="));
-  const file = ctx.file.replace(config.root.pathname, "/");
+  const file = ctx.file.replace(slash(fileURLToPath(config.root)), "/");
   if (isStyleOnlyChange) {
     logger.info("astro", msg.hmr({ file, style: true }));
     return mods.filter((mod) => mod.id !== ctx.file && !mod.id?.endsWith(".ts"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.3.1",
+  "version": "3.3.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",