astro 3.2.2 → 3.2.4

package/astro.js

@@ -3,7 +3,6 @@
 
 // ISOMORPHIC FILE: NO TOP-LEVEL IMPORT/REQUIRE() ALLOWED
 // This file has to run as both ESM and CJS on older Node.js versions
-// Needed for Stackblitz: https://github.com/stackblitz/webcontainer-core/issues/281
 
 const CI_INSTRUCTIONS = {
 	NETLIFY: 'https://docs.netlify.com/configure-builds/manage-dependencies/#node-js-and-javascript',
@@ -16,15 +15,11 @@ const CI_INSTRUCTIONS = {
 const engines = '>=18.14.1';
 const skipSemverCheckIfAbove = 19;
 
-// HACK (2023-08-18) Stackblitz does not support Node 18 yet, so we'll fake Node 16 support for some time until it's supported
-// TODO: Remove when Node 18 is supported on Stackblitz
-const isStackblitz = process.env.SHELL === '/bin/jsh' && process.versions.webcontainer != null;
-
 /** `astro *` */
 async function main() {
 	const version = process.versions.node;
 	// Fast-path for higher Node.js versions
-	if (!isStackblitz && (parseInt(version) || 0) <= skipSemverCheckIfAbove) {
+	if ((parseInt(version) || 0) <= skipSemverCheckIfAbove) {
 		try {
 			const semver = await import('semver');
 			if (!semver.satisfies(version, engines)) {
@@ -37,6 +32,13 @@ async function main() {
 		}
 	}
 
+	// windows drive letters can sometimes be lowercase, which vite cannot process
+	if (process.platform === 'win32') {
+		const cwd = process.cwd();
+		const correctedCwd = cwd.slice(0, 1).toUpperCase() + cwd.slice(1);
+		if (correctedCwd !== cwd) process.chdir(correctedCwd);
+	}
+
 	return import('./dist/cli/index.js')
 		.then(({ cli }) => cli(process.argv))
 		.catch((error) => {

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

@@ -559,7 +559,7 @@ export interface AstroUserConfig {
      * @see output
      * @description
      *
-     * Deploy to your favorite server, serverless, or edge host with build adapters. Import one of our first-party adapters for [Netlify](https://docs.astro.build/en/guides/deploy/netlify/#adapter-for-ssredge), [Vercel](https://docs.astro.build/en/guides/deploy/vercel/#adapter-for-ssr), and more to engage Astro SSR.
+     * Deploy to your favorite server, serverless, or edge host with build adapters. Import one of our first-party adapters for [Netlify](https://docs.astro.build/en/guides/deploy/netlify/#adapter-for-ssr), [Vercel](https://docs.astro.build/en/guides/deploy/vercel/#adapter-for-ssr), and more to engage Astro SSR.
      *
      * [See our Server-side Rendering guide](https://docs.astro.build/en/guides/server-side-rendering/) for more on SSR, and [our deployment guides](https://docs.astro.build/en/guides/deploy/) for a complete list of hosts.
      *
@@ -1075,10 +1075,10 @@ export interface AstroUserConfig {
          * Pass [rehype plugins](https://github.com/remarkjs/remark-rehype) to customize how your Markdown's output HTML is processed. You can import and apply the plugin function (recommended), or pass the plugin name as a string.
          *
          * ```js
-         * import rehypeMinifyHtml from 'rehype-minify';
+         * import { rehypeAccessibleEmojis } from 'rehype-accessible-emojis';
          * {
          *   markdown: {
-         *     rehypePlugins: [rehypeMinifyHtml]
+         *     rehypePlugins: [rehypeAccessibleEmojis]
          *   }
          * }
          * ```

package/dist/assets/internal.js

@@ -65,7 +65,7 @@ async function getImage(options, imageConfig) {
     rawOptions: resolvedOptions,
     options: validatedOptions,
     src: imageURL,
-    attributes: service.getHTMLAttributes !== void 0 ? service.getHTMLAttributes(validatedOptions, imageConfig) : {}
+    attributes: service.getHTMLAttributes !== void 0 ? await service.getHTMLAttributes(validatedOptions, imageConfig) : {}
   };
 }
 export {

package/dist/cli/add/index.js

@@ -37,7 +37,7 @@ const ASTRO_CONFIG_STUB = `import { defineConfig } from 'astro/config';
 
 export default defineConfig({});`;
 const TAILWIND_CONFIG_STUB = `/** @type {import('tailwindcss').Config} */
-module.exports = {
+export default {
 	content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],
 	theme: {
 		extend: {},
@@ -58,8 +58,7 @@ const OFFICIAL_ADAPTER_TO_IMPORT_MAP = {
   netlify: "@astrojs/netlify/functions",
   vercel: "@astrojs/vercel/serverless",
   cloudflare: "@astrojs/cloudflare",
-  node: "@astrojs/node",
-  deno: "@astrojs/deno"
+  node: "@astrojs/node"
 };
 async function getRegistry() {
   const packageManager = (await preferredPM(process.cwd()))?.name || "npm";
@@ -134,7 +133,7 @@ async function add(names, { flags }) {
             "./tailwind.config.mjs",
             "./tailwind.config.js"
           ],
-          defaultConfigFile: "./tailwind.config.cjs",
+          defaultConfigFile: "./tailwind.config.mjs",
           defaultConfigContent: TAILWIND_CONFIG_STUB
         });
       }

package/dist/cli/info/index.js

@@ -27,11 +27,20 @@ async function printInfo({ flags }) {
   }
   await copyToClipboard(output.trim());
 }
-const SUPPORTED_SYSTEM = /* @__PURE__ */ new Set(["darwin", "win32"]);
 async function copyToClipboard(text) {
   const system = platform();
-  if (!SUPPORTED_SYSTEM.has(system))
-    return;
+  let command = "";
+  if (system === "darwin") {
+    command = "pbcopy";
+  } else if (system === "win32") {
+    command = "clip";
+  } else {
+    const output = execSync("which xclip", { encoding: "utf8" });
+    if (output[0] !== "/") {
+      return;
+    }
+    command = "xclip -sel clipboard -l 1";
+  }
   console.log();
   const { shouldCopy } = await prompts({
     type: "confirm",
@@ -41,11 +50,10 @@ async function copyToClipboard(text) {
   });
   if (!shouldCopy)
     return;
-  const command = system === "darwin" ? "pbcopy" : "clip";
   try {
-    execSync(`echo ${JSON.stringify(text.trim())} | ${command}`, {
-      encoding: "utf8",
-      stdio: "ignore"
+    execSync(command, {
+      input: text.trim(),
+      encoding: "utf8"
     });
   } catch (e) {
     console.error(

package/dist/content/vite-plugin-content-imports.js

@@ -103,9 +103,15 @@ export const _internal = {
             }
             for (const modUrl of viteServer.moduleGraph.urlToModuleMap.keys()) {
               if (hasContentFlag(modUrl, CONTENT_FLAG) || hasContentFlag(modUrl, DATA_FLAG) || Boolean(getContentRendererByViteId(modUrl, settings))) {
-                const mod = await viteServer.moduleGraph.getModuleByUrl(modUrl);
-                if (mod) {
-                  viteServer.moduleGraph.invalidateModule(mod);
+                try {
+                  const mod = await viteServer.moduleGraph.getModuleByUrl(modUrl);
+                  if (mod) {
+                    viteServer.moduleGraph.invalidateModule(mod);
+                  }
+                } catch (e) {
+                  if (e.code === "ERR_CLOSED_SERVER")
+                    break;
+                  throw e;
                 }
               }
             }

package/dist/core/build/css-asset-name.d.ts

@@ -3,6 +3,7 @@ import type { AstroSettings } from '../../@types/astro.js';
 export declare function shortHashedName(id: string, ctx: {
     getModuleInfo: GetModuleInfo;
 }): string;
+export declare function createNameHash(baseId: string | undefined, hashIds: string[]): string;
 export declare function createSlugger(settings: AstroSettings): (id: string, ctx: {
     getModuleInfo: GetModuleInfo;
 }) => string;

package/dist/core/build/css-asset-name.js

@@ -2,16 +2,22 @@ import crypto from "node:crypto";
 import npath from "node:path";
 import { viteID } from "../util.js";
 import { getTopLevelPages } from "./graph.js";
+const confusingBaseNames = ["404", "500"];
 function shortHashedName(id, ctx) {
   const parents = Array.from(getTopLevelPages(id, ctx));
-  const firstParentId = parents[0]?.[0].id;
-  const firstParentName = firstParentId ? npath.parse(firstParentId).name : "index";
+  return createNameHash(
+    getFirstParentId(parents),
+    parents.map(([page]) => page.id)
+  );
+}
+function createNameHash(baseId, hashIds) {
+  const baseName = baseId ? prettifyBaseName(npath.parse(baseId).name) : "index";
   const hash = crypto.createHash("sha256");
-  for (const [page] of parents) {
-    hash.update(page.id, "utf-8");
+  for (const id of hashIds) {
+    hash.update(id, "utf-8");
   }
   const h = hash.digest("hex").slice(0, 8);
-  const proposedName = firstParentName + "." + h;
+  const proposedName = baseName + "." + h;
   return proposedName;
 }
 function createSlugger(settings) {
@@ -22,7 +28,7 @@ function createSlugger(settings) {
   return function(id, ctx) {
     const parents = Array.from(getTopLevelPages(id, ctx));
     const allParentsKey = parents.map(([page]) => page.id).sort().join("-");
-    const firstParentId = parents[0]?.[0].id || indexPage;
+    const firstParentId = getFirstParentId(parents) || indexPage;
     let dir = firstParentId;
     let key = "";
     let i = 0;
@@ -30,7 +36,7 @@ function createSlugger(settings) {
       if (dir === pagesDir) {
         break;
       }
-      const name2 = npath.parse(npath.basename(dir)).name;
+      const name2 = prettifyBaseName(npath.parse(npath.basename(dir)).name);
       key = key.length ? name2 + sep + key : name2;
       dir = npath.dirname(dir);
       i++;
@@ -54,7 +60,23 @@ function createSlugger(settings) {
     return name;
   };
 }
+function getFirstParentId(parents) {
+  for (const parent of parents) {
+    const id = parent[0].id;
+    const baseName = npath.parse(id).name;
+    if (!confusingBaseNames.includes(baseName)) {
+      return id;
+    }
+  }
+  return parents[0]?.[0].id;
+}
+const charsToReplaceRe = /[.\[\]]/g;
+const underscoresRe = /_+/g;
+function prettifyBaseName(str) {
+  return str.replace(charsToReplaceRe, "_").replace(underscoresRe, "_");
+}
 export {
+  createNameHash,
   createSlugger,
   shortHashedName
 };

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

@@ -1,5 +1,3 @@
-import * as crypto from "node:crypto";
-import * as npath from "node:path";
 import {} from "vite";
 import { isBuildableCSSRequest } from "../../../vite-plugin-astro-server/util.js";
 import { PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
@@ -52,7 +50,7 @@ function rollupPluginAstroBuildCSS(options) {
               getModuleInfo: meta.getModuleInfo
             })) {
               if (new URL(pageInfo.id, "file://").searchParams.has(PROPAGATED_ASSET_FLAG)) {
-                const chunkId2 = createNameHash(id, [id]);
+                const chunkId2 = assetName.createNameHash(id, [id]);
                 internals.cssModuleToChunkIdMap.set(id, chunkId2);
                 return chunkId2;
               }
@@ -148,17 +146,21 @@ function rollupPluginAstroBuildCSS(options) {
     async generateBundle(_outputOptions, bundle) {
       const inlineConfig = settings.config.build.inlineStylesheets;
       const { assetsInlineLimit = 4096 } = settings.config.vite?.build ?? {};
-      Object.entries(bundle).forEach(([_, stylesheet]) => {
+      Object.entries(bundle).forEach(([id, stylesheet]) => {
         if (stylesheet.type !== "asset" || stylesheet.name?.endsWith(".css") !== true || typeof stylesheet.source !== "string")
           return;
         const assetSize = new TextEncoder().encode(stylesheet.source).byteLength;
         const toBeInlined = inlineConfig === "always" ? true : inlineConfig === "never" ? false : assetSize <= assetsInlineLimit;
         const sheet = toBeInlined ? { type: "inline", content: stylesheet.source } : { type: "external", src: stylesheet.fileName };
         const pages = Array.from(eachPageData(internals));
+        let sheetAddedToPage = false;
         pages.forEach((pageData) => {
           const orderingInfo = pagesToCss[pageData.moduleSpecifier]?.[stylesheet.fileName];
-          if (orderingInfo !== void 0)
-            return pageData.styles.push({ ...orderingInfo, sheet });
+          if (orderingInfo !== void 0) {
+            pageData.styles.push({ ...orderingInfo, sheet });
+            sheetAddedToPage = true;
+            return;
+          }
           const propagatedPaths = pagesToPropagatedCss[pageData.moduleSpecifier];
           if (propagatedPaths === void 0)
             return;
@@ -169,23 +171,22 @@ function rollupPluginAstroBuildCSS(options) {
               return;
             const propagatedStyles = pageData.propagatedStyles.get(pageInfoId) ?? pageData.propagatedStyles.set(pageInfoId, /* @__PURE__ */ new Set()).get(pageInfoId);
             propagatedStyles.add(sheet);
+            sheetAddedToPage = true;
           });
         });
+        if (toBeInlined && sheetAddedToPage) {
+          delete bundle[id];
+          for (const chunk of Object.values(bundle)) {
+            if (chunk.type === "chunk") {
+              chunk.viteMetadata?.importedCss?.delete(id);
+            }
+          }
+        }
       });
     }
   };
   return [cssBuildPlugin, singleCssPlugin, inlineStylesheetsPlugin];
 }
-function createNameHash(baseId, hashIds) {
-  const baseName = baseId ? npath.parse(baseId).name : "index";
-  const hash = crypto.createHash("sha256");
-  for (const id of hashIds) {
-    hash.update(id, "utf-8");
-  }
-  const h = hash.digest("hex").slice(0, 8);
-  const proposedName = baseName + "." + h;
-  return proposedName;
-}
 function* getParentClientOnlys(id, ctx, internals) {
   for (const [info] of walkParentInfos(id, ctx)) {
     yield* getPageDatasByClientOnlyID(internals, info.id);

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

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

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

@@ -15,27 +15,8 @@ type CreateAPIContext = {
  */
 export declare function createAPIContext({ request, params, site, props, adapterName, }: CreateAPIContext): APIContext;
 type ResponseParameters = ConstructorParameters<typeof Response>;
-export declare let ResponseWithEncoding: ReturnType<typeof initResponseWithEncoding>;
-declare let initResponseWithEncoding: () => {
-    new (body: ResponseParameters[0], init: ResponseParameters[1], encoding?: BufferEncoding): {
-        readonly headers: Headers;
-        readonly ok: boolean;
-        readonly redirected: boolean;
-        readonly status: number;
-        readonly statusText: string;
-        readonly type: ResponseType;
-        readonly url: string;
-        clone(): Response;
-        readonly body: ReadableStream<Uint8Array> | null;
-        readonly bodyUsed: boolean;
-        arrayBuffer(): Promise<ArrayBuffer>;
-        blob(): Promise<Blob>;
-        formData(): Promise<FormData>;
-        json(): Promise<any>;
-        text(): Promise<string>;
-    };
-    error(): Response;
-    redirect(url: string | URL, status?: number | undefined): Response;
-};
+export declare class ResponseWithEncoding extends Response {
+    constructor(body: ResponseParameters[0], init: ResponseParameters[1], encoding?: BufferEncoding);
+}
 export declare function callEndpoint<MiddlewareResult = Response | EndpointOutput>(mod: EndpointHandler, env: Environment, ctx: RenderContext, onRequest?: MiddlewareHandler<MiddlewareResult> | undefined): Promise<Response>;
 export {};

package/dist/core/endpoint/index.js

@@ -14,7 +14,6 @@ function createAPIContext({
   props,
   adapterName
 }) {
-  initResponseWithEncoding();
   const context = {
     cookies: new AstroCookies(request),
     request,
@@ -61,28 +60,21 @@ function createAPIContext({
   });
   return context;
 }
-let ResponseWithEncoding;
-let initResponseWithEncoding = () => {
-  class LocalResponseWithEncoding extends Response {
-    constructor(body, init, encoding) {
-      if (typeof body === "string") {
-        if (typeof Buffer !== "undefined" && Buffer.from) {
-          body = Buffer.from(body, encoding);
-        } else if (encoding == null || encoding === "utf8" || encoding === "utf-8") {
-          body = encoder.encode(body);
-        }
-      }
-      super(body, init);
-      if (encoding) {
-        this.headers.set("X-Astro-Encoding", encoding);
+class ResponseWithEncoding extends Response {
+  constructor(body, init, encoding) {
+    if (typeof body === "string") {
+      if (typeof Buffer !== "undefined" && Buffer.from) {
+        body = Buffer.from(body, encoding);
+      } else if (encoding == null || encoding === "utf8" || encoding === "utf-8") {
+        body = encoder.encode(body);
       }
     }
+    super(body, init);
+    if (encoding) {
+      this.headers.set("X-Astro-Encoding", encoding);
+    }
   }
-  ResponseWithEncoding = LocalResponseWithEncoding;
-  initResponseWithEncoding = () => {
-  };
-  return LocalResponseWithEncoding;
-};
+}
 async function callEndpoint(mod, env, ctx, onRequest) {
   const context = createAPIContext({
     request: ctx.request,

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

@@ -1042,7 +1042,7 @@ export declare const ContentSchemaContainsSlugError: {
 /**
  * @docs
  * @message A collection queried via `getCollection()` does not exist.
- * @deprecated Collections that do not exist no longer result in an error. A warning is omitted instead.
+ * @deprecated Collections that do not exist no longer result in an error. A warning is given instead.
  * @description
  * When querying a collection, ensure a collection directory with the requested name exists under `src/content/`.
  */

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.2.2";
+  const version = "3.2.4";
   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.2.2"}`
+        `v${"3.2.4"}`
       )} ${headline}`
     );
   }

package/dist/core/module-loader/vite.js

@@ -1,14 +1,41 @@
 import { EventEmitter } from "node:events";
+import path from "node:path";
 function createViteLoader(viteServer) {
   const events = new EventEmitter();
-  viteServer.watcher.on("add", (...args) => events.emit("file-add", args));
-  viteServer.watcher.on("unlink", (...args) => events.emit("file-unlink", args));
-  viteServer.watcher.on("change", (...args) => events.emit("file-change", args));
-  wrapMethod(viteServer.ws, "send", (msg) => {
+  let isTsconfigUpdated = false;
+  function isTsconfigUpdate(filePath) {
+    const result = path.basename(filePath) === "tsconfig.json";
+    if (result)
+      isTsconfigUpdated = true;
+    return result;
+  }
+  viteServer.watcher.on("add", (...args) => {
+    if (!isTsconfigUpdate(args[0])) {
+      events.emit("file-add", args);
+    }
+  });
+  viteServer.watcher.on("unlink", (...args) => {
+    if (!isTsconfigUpdate(args[0])) {
+      events.emit("file-unlink", args);
+    }
+  });
+  viteServer.watcher.on("change", (...args) => {
+    if (!isTsconfigUpdate(args[0])) {
+      events.emit("file-change", args);
+    }
+  });
+  const _wsSend = viteServer.ws.send;
+  viteServer.ws.send = function(...args) {
+    if (isTsconfigUpdated) {
+      isTsconfigUpdated = false;
+      return;
+    }
+    const msg = args[0];
     if (msg?.type === "error") {
       events.emit("hmr-error", msg);
     }
-  });
+    _wsSend.apply(this, args);
+  };
   return {
     import(src) {
       return viteServer.ssrLoadModule(src);
@@ -50,13 +77,6 @@ function createViteLoader(viteServer) {
     events
   };
 }
-function wrapMethod(object, method, newFn) {
-  const orig = object[method];
-  object[method] = function(...args) {
-    newFn.apply(this, args);
-    return orig.apply(this, args);
-  };
-}
 export {
   createViteLoader
 };

package/dist/core/polyfill.js

@@ -1,53 +1,6 @@
+import buffer from "node:buffer";
 import crypto from "node:crypto";
-import {
-  ByteLengthQueuingStrategy,
-  CountQueuingStrategy,
-  ReadableByteStreamController,
-  ReadableStream,
-  ReadableStreamBYOBReader,
-  ReadableStreamBYOBRequest,
-  ReadableStreamDefaultController,
-  ReadableStreamDefaultReader,
-  TransformStream,
-  WritableStream,
-  WritableStreamDefaultController,
-  WritableStreamDefaultWriter
-} from "node:stream/web";
-import { File, FormData, Headers, Request, Response, fetch } from "undici";
-const isStackblitz = process.env.SHELL === "/bin/jsh" && process.versions.webcontainer != null;
 function apply() {
-  if (isStackblitz) {
-    const neededPolyfills = {
-      ByteLengthQueuingStrategy,
-      CountQueuingStrategy,
-      ReadableByteStreamController,
-      ReadableStream,
-      ReadableStreamBYOBReader,
-      ReadableStreamBYOBRequest,
-      ReadableStreamDefaultController,
-      ReadableStreamDefaultReader,
-      TransformStream,
-      WritableStream,
-      WritableStreamDefaultController,
-      WritableStreamDefaultWriter,
-      File,
-      FormData,
-      Headers,
-      Request,
-      Response,
-      fetch
-    };
-    for (let polyfillName of Object.keys(neededPolyfills)) {
-      if (Object.hasOwnProperty.call(globalThis, polyfillName))
-        continue;
-      Object.defineProperty(globalThis, polyfillName, {
-        configurable: true,
-        enumerable: true,
-        writable: true,
-        value: neededPolyfills[polyfillName]
-      });
-    }
-  }
   if (!globalThis.crypto) {
     Object.defineProperty(globalThis, "crypto", {
       value: crypto.webcrypto
@@ -55,7 +8,7 @@ function apply() {
   }
   if (!globalThis.File) {
     Object.defineProperty(globalThis, "File", {
-      value: File
+      value: buffer.File
     });
   }
 }

package/dist/runtime/server/hydration.d.ts

@@ -7,12 +7,14 @@ export interface HydrationMetadata {
         value: string;
     };
 }
+type Props = Record<string | number | symbol, any>;
 interface ExtractedProps {
     isPage: boolean;
     hydration: HydrationMetadata | null;
-    props: Record<string | number | symbol, any>;
+    props: Props;
+    propsWithoutTransitionAttributes: Props;
 }
-export declare function extractDirectives(inputProps: Record<string | number | symbol, any>, clientDirectives: SSRResult['clientDirectives']): ExtractedProps;
+export declare function extractDirectives(inputProps: Props, clientDirectives: SSRResult['clientDirectives']): ExtractedProps;
 interface HydrateScriptOptions {
     renderer: SSRLoadedRenderer;
     result: SSRResult;

package/dist/runtime/server/hydration.js

@@ -9,7 +9,8 @@ function extractDirectives(inputProps, clientDirectives) {
   let extracted = {
     isPage: false,
     hydration: null,
-    props: {}
+    props: {},
+    propsWithoutTransitionAttributes: {}
   };
   for (const [key, value] of Object.entries(inputProps)) {
     if (key.startsWith("server:")) {
@@ -58,10 +59,14 @@ function extractDirectives(inputProps, clientDirectives) {
       }
     } else {
       extracted.props[key] = value;
+      if (!transitionDirectivesToCopyOnIsland.includes(key)) {
+        extracted.propsWithoutTransitionAttributes[key] = value;
+      }
     }
   }
   for (const sym of Object.getOwnPropertySymbols(inputProps)) {
     extracted.props[sym] = inputProps[sym];
+    extracted.propsWithoutTransitionAttributes[sym] = inputProps[sym];
   }
   return extracted;
 }
@@ -69,9 +74,10 @@ async function generateHydrateScript(scriptOptions, metadata) {
   const { renderer, result, astroId, props, attrs } = scriptOptions;
   const { hydrate, componentUrl, componentExport } = metadata;
   if (!componentExport.value) {
-    throw new Error(
-      `Unable to resolve a valid export for "${metadata.displayName}"! Please open an issue at https://astro.build/issues!`
-    );
+    throw new AstroError({
+      ...AstroErrorData.NoMatchingImport,
+      message: AstroErrorData.NoMatchingImport.message(metadata.displayName)
+    });
   }
   const island = {
     children: "",

package/dist/runtime/server/render/component.js

@@ -67,7 +67,10 @@ Did you forget to import the component or is it possible there is a typo?`
     astroStaticSlot: true,
     displayName
   };
-  const { hydration, isPage, props } = extractDirectives(_props, clientDirectives);
+  const { hydration, isPage, props, propsWithoutTransitionAttributes } = extractDirectives(
+    _props,
+    clientDirectives
+  );
   let html = "";
   let attrs = void 0;
   if (hydration) {
@@ -169,7 +172,7 @@ Did you forget to import the component or is it possible there is a typo?`
         ({ html, attrs } = await renderer.ssr.renderToStaticMarkup.call(
           { result },
           Component,
-          props,
+          propsWithoutTransitionAttributes,
           children,
           metadata
         ));
@@ -194,7 +197,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
       ({ html, attrs } = await renderer.ssr.renderToStaticMarkup.call(
         { result },
         Component,
-        props,
+        propsWithoutTransitionAttributes,
         children,
         metadata
       ));

package/dist/transitions/router.js

@@ -26,10 +26,6 @@ const announce = () => {
 };
 const PERSIST_ATTR = "data-astro-transition-persist";
 const parser = new DOMParser();
-let noopEl;
-if (import.meta.env.DEV) {
-  noopEl = document.createElement("div");
-}
 let currentHistoryIndex = 0;
 if (history.state) {
   currentHistoryIndex = history.state.index;
@@ -115,21 +111,29 @@ function isInfinite(animation) {
 }
 const updateHistoryAndScrollPosition = (toLocation, replace, intraPage) => {
   const fresh = !samePage(toLocation);
+  let scrolledToTop = false;
   if (toLocation.href !== location.href) {
     if (replace) {
       history.replaceState({ ...history.state }, "", toLocation.href);
     } else {
       history.replaceState({ ...history.state, intraPage }, "");
-      history.pushState({ index: ++currentHistoryIndex, scrollX, scrollY }, "", toLocation.href);
+      history.pushState(
+        { index: ++currentHistoryIndex, scrollX: 0, scrollY: 0 },
+        "",
+        toLocation.href
+      );
     }
     if (fresh) {
       scrollTo({ left: 0, top: 0, behavior: "instant" });
+      scrolledToTop = true;
     }
   }
   if (toLocation.hash) {
     location.href = toLocation.href;
   } else {
-    scrollTo({ left: 0, top: 0, behavior: "instant" });
+    if (!scrolledToTop) {
+      scrollTo({ left: 0, top: 0, behavior: "instant" });
+    }
   }
 };
 async function updateDOM(newDocument, toLocation, options, popState, fallback) {
@@ -143,13 +147,6 @@ async function updateDOM(newDocument, toLocation, options, popState, fallback) {
       const href = el.getAttribute("href");
       return newDocument.head.querySelector(`link[rel=stylesheet][href="${href}"]`);
     }
-    if (import.meta.env.DEV) {
-      if (el.tagName === "STYLE" && el.dataset.viteDevId) {
-        const devId = el.dataset.viteDevId;
-        return newDocument.querySelector(`style[data-vite-dev-id="${devId}"]`) || // Otherwise, keep it anyways. This is client:only styles.
-        noopEl;
-      }
-    }
     return null;
   };
   const swap = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -152,7 +152,6 @@
     "string-width": "^6.1.0",
     "strip-ansi": "^7.1.0",
     "tsconfig-resolver": "^3.0.1",
-    "undici": "^5.23.0",
     "unist-util-visit": "^4.1.2",
     "vfile": "^5.3.7",
     "vite": "^4.4.9",
@@ -160,9 +159,9 @@
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
     "zod": "3.21.1",
-    "@astrojs/internal-helpers": "0.2.0",
-    "@astrojs/markdown-remark": "3.2.0",
-    "@astrojs/telemetry": "3.0.2"
+    "@astrojs/internal-helpers": "0.2.1",
+    "@astrojs/markdown-remark": "3.2.1",
+    "@astrojs/telemetry": "3.0.3"
   },
   "optionalDependencies": {
     "sharp": "^0.32.5"
@@ -214,6 +213,9 @@
     "node": ">=18.14.1",
     "npm": ">=6.14.0"
   },
+  "publishConfig": {
+    "provenance": true
+  },
   "scripts": {
     "prebuild": "astro-scripts prebuild --to-string \"src/runtime/server/astro-island.ts\" \"src/runtime/client/{idle,load,media,only,visible}.ts\"",
     "build": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" && tsc && pnpm run postbuild",