astro 3.2.3 → 3.2.4

package/astro.js

@@ -32,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/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/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;
               }
@@ -189,16 +187,6 @@ function rollupPluginAstroBuildCSS(options) {
   };
   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.3";
+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.3";
+  const currentVersion = "3.2.4";
   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.2.3";
+  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.3"}`
+        `v${"3.2.4"}`
       )} ${headline}`
     );
   }

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;
 }

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.3",
+  "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",