astro 3.0.8 → 3.0.10

package/client.d.ts

@@ -52,6 +52,7 @@ declare module 'astro:assets' {
 				| import('./dist/assets/types.js').ImageTransform
 				| import('./dist/assets/types.js').UnresolvedImageTransform
 		) => Promise<import('./dist/assets/types.js').GetImageResult>;
+		imageConfig: import('./dist/@types/astro').AstroConfig['image'];
 		getConfiguredImageService: typeof import('./dist/assets/index.js').getConfiguredImageService;
 		Image: typeof import('./components/Image.astro').default;
 	};
@@ -69,7 +70,7 @@ declare module 'astro:assets' {
 	export type RemoteImageProps = Simplify<
 		import('./dist/assets/types.js').RemoteImageProps<ImgAttributes>
 	>;
-	export const { getImage, getConfiguredImageService, Image }: AstroAssets;
+	export const { getImage, getConfiguredImageService, imageConfig, Image }: AstroAssets;
 }
 
 type InputFormat = import('./dist/assets/types.js').ImageInputFormat;

package/components/ViewTransitions.astro

@@ -30,9 +30,11 @@ const { fallback = 'animate' } = Astro.props as Props;
 	// The History API does not tell you if navigation is forward or back, so
 	// you can figure it using an index. On pushState the index is incremented so you
 	// can use that to determine popstate if going forward or back.
-	let currentHistoryIndex = history.state?.index || 0;
-	if (!history.state && transitionEnabledOnThisPage()) {
-		persistState({ index: currentHistoryIndex, scrollY: 0 });
+	let currentHistoryIndex = 0;
+	if (history.state) {
+		// we reloaded a page with history state (e.g. back button or browser reload)
+		currentHistoryIndex = history.state.index;
+		scrollTo({ left: 0, top: history.state.scrollY });
 	}
 
 	const throttle = (cb: (...args: any[]) => any, delay: number) => {
@@ -100,14 +102,10 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 	function isInfinite(animation: Animation) {
 		const effect = animation.effect;
-		if(
-			!effect ||
-			!(effect instanceof KeyframeEffect) ||
-			!effect.target
-		) return false;
-    const style = window.getComputedStyle(effect.target, effect.pseudoElement);
-    return style.animationIterationCount === "infinite";
-}
+		if (!effect || !(effect instanceof KeyframeEffect) || !effect.target) return false;
+		const style = window.getComputedStyle(effect.target, effect.pseudoElement);
+		return style.animationIterationCount === 'infinite';
+	}
 
 	const parser = new DOMParser();
 
@@ -234,8 +232,10 @@ const { fallback = 'animate' } = Astro.props as Props;
 			// Trigger the animations
 			const currentAnimations = document.getAnimations();
 			document.documentElement.dataset.astroTransitionFallback = 'old';
-			const newAnimations = document.getAnimations().filter(a => !currentAnimations.includes(a) && !isInfinite(a));
-			const finished = Promise.all(newAnimations.map(a => a.finished));
+			const newAnimations = document
+				.getAnimations()
+				.filter((a) => !currentAnimations.includes(a) && !isInfinite(a));
+			const finished = Promise.all(newAnimations.map((a) => a.finished));
 			const fallbackSwap = () => {
 				swap();
 				document.documentElement.dataset.astroTransitionFallback = 'new';
@@ -352,6 +352,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 				// The current page doesn't haven't View Transitions,
 				// respect that with a full page reload
 				// -- but only for transition managed by us (ev.state is set)
+				history.scrollRestoration && (history.scrollRestoration = 'manual');
 				location.reload();
 				return;
 			}
@@ -362,7 +363,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 			// The browser will handle navigation fine without our help
 			if (ev.state === null) {
 				if (history.scrollRestoration) {
-					history.scrollRestoration = "auto";
+					history.scrollRestoration = 'auto';
 				}
 				return;
 			}
@@ -370,7 +371,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 			// With the default "auto", the browser will jump to the old scroll position
 			// before the ViewTransition is complete.
 			if (history.scrollRestoration) {
-				history.scrollRestoration = "manual";
+				history.scrollRestoration = 'manual';
 			}
 
 			const state: State | undefined = history.state;
@@ -401,13 +402,13 @@ const { fallback = 'animate' } = Astro.props as Props;
 		addEventListener('load', onPageLoad);
 		// There's not a good way to record scroll position before a back button.
 		// So the way we do it is by listening to scrollend if supported, and if not continuously record the scroll position.
-    const updateState = () => {
+		const updateState = () => {
 			// only update history entries that are managed by us
 			// leave other entries alone and do not accidently add state.
 			if (history.state) {
 				persistState({ ...history.state, scrollY });
 			}
-		}
+		};
 		if ('onscrollend' in window) addEventListener('scrollend', updateState);
 		else addEventListener('scroll', throttle(updateState, 300));
 	}

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

@@ -566,7 +566,7 @@ export interface AstroUserConfig {
      * import netlify from '@astrojs/netlify/functions';
      * {
      *   // Example: Build for Netlify serverless deployment
-     * 	 adapter: netlify(),
+     *   adapter: netlify(),
      * }
      * ```
      */
@@ -581,9 +581,9 @@ export interface AstroUserConfig {
      *
      * Specifies the output target for builds.
      *
-     * - 'static' - Building a static site to be deploy to any static host.
-     * - 'server' - Building an app to be deployed to a host supporting SSR (server-side rendering).
-     * - 'hybrid' - Building a static site with a few server-side rendered pages.
+     * - `'static'` - Building a static site to be deploy to any static host.
+     * - `'server'` - Building an app to be deployed to a host supporting SSR (server-side rendering).
+     * - `'hybrid'` - Building a static site with a few server-side rendered pages.
      *
      * ```js
      * import { defineConfig } from 'astro/config';
@@ -607,8 +607,8 @@ export interface AstroUserConfig {
          * @default `'directory'`
          * @description
          * Control the output file format of each page.
-         *   - If 'file', Astro will generate an HTML file (ex: "/foo.html") for each page.
-         *   - If 'directory', Astro will generate a directory with a nested `index.html` file (ex: "/foo/index.html") for each page.
+         *   - If `'file'`, Astro will generate an HTML file (ex: "/foo.html") for each page.
+         *   - If `'directory'`, Astro will generate a directory with a nested `index.html` file (ex: "/foo/index.html") for each page.
          *
          * ```js
          * {
@@ -885,7 +885,7 @@ export interface AstroUserConfig {
     /**
      * @docs
      * @kind heading
-     * @name Image options
+     * @name Image Options
      */
     image?: {
         /**
@@ -895,7 +895,7 @@ export interface AstroUserConfig {
          * @default `{entrypoint: 'astro/assets/services/sharp', config?: {}}`
          * @version 2.1.0
          * @description
-         * Set which image service is used for Astro’s experimental assets support.
+         * Set which image service is used for Astro’s assets support.
          *
          * The value should be an object with an entrypoint for the image service to use and optionally, a config object to pass to the service.
          *
@@ -918,7 +918,7 @@ export interface AstroUserConfig {
          * @default `{domains: []}`
          * @version 2.10.10
          * @description
-         * Defines a list of permitted image source domains for local image optimization. No other remote images will be optimized by Astro.
+         * Defines a list of permitted image source domains for remote image optimization. No other remote images will be optimized by Astro.
          *
          * This option requires an array of individual domain names as strings. Wildcards are not permitted. Instead, use [`image.remotePatterns`](#imageremotepatterns) to define a list of allowed source URL patterns.
          *
@@ -940,7 +940,7 @@ export interface AstroUserConfig {
          * @default `{remotePatterns: []}`
          * @version 2.10.10
          * @description
-         * Defines a list of permitted image source URL patterns for local image optimization.
+         * Defines a list of permitted image source URL patterns for remote image optimization.
          *
          * `remotePatterns` can be configured with four properties:
          * 1. protocol
@@ -1593,11 +1593,11 @@ export type AstroFeatureMap = {
 export interface AstroAssetsFeature {
     supportKind?: SupportsKind;
     /**
-     * Whether if this adapter deploys files in an enviroment that is compatible with the library `sharp`
+     * Whether if this adapter deploys files in an environment that is compatible with the library `sharp`
      */
     isSharpCompatible?: boolean;
     /**
-     * Whether if this adapter deploys files in an enviroment that is compatible with the library `squoosh`
+     * Whether if this adapter deploys files in an environment that is compatible with the library `squoosh`
      */
     isSquooshCompatible?: boolean;
 }

package/dist/assets/build/generate.js

@@ -40,7 +40,7 @@ async function generateImage(pipeline, options, filepath) {
       };
     } else {
       const JSONData = JSON.parse(readFileSync(cachedFileURL, "utf-8"));
-      if (JSONData.expires < Date.now()) {
+      if (JSONData.expires > Date.now()) {
         await fs.promises.writeFile(finalFileURL, Buffer.from(JSONData.data, "base64"));
         return {
           cached: true

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

@@ -6,12 +6,11 @@ import {
   prependForwardSlash,
   removeQueryString
 } from "../core/path.js";
-import { VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
+import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
 import { emitESMImage } from "./utils/emitAsset.js";
 import { hashTransform, propsToFilename } from "./utils/transformToPath.js";
 const resolvedVirtualModuleId = "\0" + VIRTUAL_MODULE_ID;
-const rawRE = /(?:\?|&)raw(?:&|$)/;
-const urlRE = /(\?|&)url(?:&|$)/;
+const assetRegex = new RegExp(`.(${VALID_INPUT_FORMATS.join("|")})$`, "i");
 function assets({
   settings,
   mode
@@ -98,11 +97,10 @@ function assets({
         resolvedConfig = viteConfig;
       },
       async load(id) {
-        if (rawRE.test(id) || urlRE.test(id)) {
+        if (id !== removeQueryString(id)) {
           return;
         }
-        const cleanedUrl = removeQueryString(id);
-        if (/\.(jpeg|jpg|png|tiff|webp|gif|svg)$/.test(cleanedUrl)) {
+        if (assetRegex.test(id)) {
           const meta = await emitESMImage(id, this.meta.watchMode, this.emitFile);
           return `export default ${JSON.stringify(meta)}`;
         }

package/dist/cli/add/index.js

@@ -511,6 +511,8 @@ async function getInstallIntegrationsCommand({
       return { pm: "yarn", command: "add", flags: [], dependencies };
     case "pnpm":
       return { pm: "pnpm", command: "add", flags: [], dependencies };
+    case "bun":
+      return { pm: "bun", command: "add", flags: [], dependencies };
     default:
       return null;
   }

package/dist/cli/install-package.js

@@ -50,6 +50,8 @@ function getInstallCommand(packages, packageManager) {
       return { pm: "yarn", command: "add", flags: [], dependencies: packages };
     case "pnpm":
       return { pm: "pnpm", command: "add", flags: [], dependencies: packages };
+    case "bun":
+      return { pm: "bun", command: "add", flags: [], dependencies: packages };
     default:
       return null;
   }

package/dist/cli/telemetry/index.js

@@ -1,8 +1,10 @@
+import whichPm from "which-pm";
 import * as msg from "../../core/messages.js";
 import { telemetry } from "../../events/index.js";
 async function notify() {
+  const packageManager = (await whichPm(process.cwd())).name ?? "npm";
   await telemetry.notify(() => {
-    console.log(msg.telemetryNotice() + "\n");
+    console.log(msg.telemetryNotice(packageManager) + "\n");
     return true;
   });
 }

package/dist/core/app/index.js

@@ -94,8 +94,6 @@ class App {
     }
     return pathname;
   }
-  // Disable no-unused-vars to avoid breaking signature change
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   match(request, _opts = {}) {
     const url = new URL(request.url);
     if (this.#manifest.assets.has(url.pathname))

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

@@ -148,13 +148,11 @@ function rollupPluginAstroBuildCSS(options) {
     async generateBundle(_outputOptions, bundle) {
       const inlineConfig = settings.config.build.inlineStylesheets;
       const { assetsInlineLimit = 4096 } = settings.config.vite?.build ?? {};
-      Object.entries(bundle).forEach(([id, stylesheet]) => {
+      Object.entries(bundle).forEach(([_, 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;
-        if (toBeInlined)
-          delete bundle[id];
         const sheet = toBeInlined ? { type: "inline", content: stylesheet.source } : { type: "external", src: stylesheet.fileName };
         const pages = Array.from(eachPageData(internals));
         pages.forEach((pageData) => {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "3.0.8";
+const ASTRO_VERSION = "3.0.10";
 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.0.8";
+  const currentVersion = "3.0.10";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

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

@@ -247,8 +247,8 @@ const InvalidDynamicRoute = {
 const MissingSharp = {
   name: "MissingSharp",
   title: "Could not find Sharp.",
-  message: "Could not find Sharp. Please install Sharp (`sharp`) manually into your project.",
-  hint: "See Sharp's installation instructions for more information: https://sharp.pixelplumbing.com/install. If you are not relying on `astro:assets` to optimize, transform, or process any images, you can configure a passthrough image service instead of installing Sharp. See https://docs.astro.build/en/reference/errors/missing-sharp for more information."
+  message: "Could not find Sharp. Please install Sharp (`sharp`) manually into your project or migrate to another image service.",
+  hint: "See Sharp's installation instructions for more information: https://sharp.pixelplumbing.com/install. If you are not relying on `astro:assets` to optimize, transform, or process any images, you can configure a passthrough image service instead of installing Sharp. See https://docs.astro.build/en/reference/errors/missing-sharp for more information.\n\nSee https://docs.astro.build/en/guides/images/#default-image-service for more information on how to migrate to another image service."
 };
 const UnknownViteError = {
   name: "UnknownViteError",

package/dist/core/messages.d.ts

@@ -22,7 +22,7 @@ export declare function serverStart({ startupTime, resolvedUrls, host, base, isR
     base: string;
     isRestart?: boolean;
 }): string;
-export declare function telemetryNotice(): string;
+export declare function telemetryNotice(packageManager?: string): string;
 export declare function telemetryEnabled(): string;
 export declare function telemetryDisabled(): string;
 export declare function telemetryReset(): string;

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.0.8";
+  const version = "3.0.10";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -79,10 +79,10 @@ function serverStart({
   ];
   return messages.filter((msg) => typeof msg === "string").map((msg) => `  ${msg}`).join("\n");
 }
-function telemetryNotice() {
+function telemetryNotice(packageManager = "npm") {
   const headline = `${cyan("\u25C6")} Astro collects completely anonymous usage data.`;
   const why = dim("  This optional program helps shape our roadmap.");
-  const disable = dim("  Run `npm run astro telemetry disable` to opt-out.");
+  const disable = dim(`  Run \`${packageManager} run astro telemetry disable\` to opt-out.`);
   const details = `  Details: ${underline("https://astro.build/telemetry")}`;
   return [headline, why, disable, details].map((v) => "  " + v).join("\n");
 }
@@ -235,7 +235,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"3.0.8"}`
+        `v${"3.0.10"}`
       )} ${headline}`
     );
   }

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

@@ -16,6 +16,8 @@ async function renderChild(destination, child) {
       });
     });
     for (const childRender of childRenders) {
+      if (!childRender)
+        continue;
       await childRender.renderToFinalDestination(destination);
     }
   } else if (typeof child === "function") {

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

@@ -82,7 +82,7 @@ function markdown({ settings, logger }) {
           );
         }
         const code = escapeViteEnvReferences(`
-				import { unescapeHTML, spreadAttributes, createComponent, render, renderComponent } from ${JSON.stringify(
+				import { unescapeHTML, spreadAttributes, createComponent, render, renderComponent, maybeRenderHead } from ${JSON.stringify(
           astroServerRuntimeModulePath
         )};
 				import { AstroError, AstroErrorData } from ${JSON.stringify(astroErrorModulePath)};
@@ -149,9 +149,8 @@ function markdown({ settings, logger }) {
 								'server:root': true,
 							}, {
 								'default': () => render\`\${unescapeHTML(html)}\`
-							})}\`;` : `render\`\${unescapeHTML(html)}\`;`}
+							})}\`;` : `render\`\${maybeRenderHead(result)}\${unescapeHTML(html)}\`;`}
 				});
-				Content[Symbol.for('astro.needsHeadRendering')] = ${layout ? "false" : "true"};
 				export default Content;
 				`);
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.0.8",
+  "version": "3.0.10",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -140,13 +140,12 @@
     "ora": "^7.0.1",
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.2.1",
-    "preferred-pm": "^3.0.3",
+    "preferred-pm": "^3.1.2",
     "prompts": "^2.4.2",
     "rehype": "^12.0.1",
     "resolve": "^1.22.4",
     "semver": "^7.5.4",
     "server-destroy": "^1.0.1",
-    "sharp": "^0.32.5",
     "shiki": "^0.14.3",
     "string-width": "^6.1.0",
     "strip-ansi": "^7.1.0",
@@ -156,13 +155,16 @@
     "vfile": "^5.3.7",
     "vite": "^4.4.9",
     "vitefu": "^0.2.4",
-    "which-pm": "^2.0.0",
+    "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
     "zod": "3.21.1",
     "@astrojs/internal-helpers": "0.2.0",
     "@astrojs/markdown-remark": "3.0.0",
     "@astrojs/telemetry": "3.0.1"
   },
+  "optionalDependencies": {
+    "sharp": "^0.32.5"
+  },
   "devDependencies": {
     "@astrojs/check": "^0.1.0",
     "@playwright/test": "^1.37.1",