astro 3.0.0-beta.3 → 3.0.0-rc.5

package/components/ViewTransitions.astro

@@ -101,9 +101,8 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 	const parser = new DOMParser();
 
-	async function updateDOM(dir: Direction, html: string, state?: State, fallback?: Fallback) {
+	async function updateDOM(html: string, state?: State, fallback?: Fallback) {
 		const doc = parser.parseFromString(html, 'text/html');
-		doc.documentElement.dataset.astroTransition = dir;
 
 		// Check for a head element that should persist, either because it has the data
 		// attribute or is a link el.
@@ -233,15 +232,17 @@ const { fallback = 'animate' } = Astro.props as Props;
 			location.href = href;
 			return;
 		}
+		document.documentElement.dataset.astroTransition = dir;
 		if (supportsViewTransitions) {
-			finished = document.startViewTransition(() => updateDOM(dir, html, state)).finished;
+			finished = document.startViewTransition(() => updateDOM(html, state)).finished;
 		} else {
-			finished = updateDOM(dir, html, state, getFallback());
+			finished = updateDOM(html, state, getFallback());
 		}
 		try {
 			await finished;
 		} finally {
-			document.documentElement.removeAttribute('data-astro-transition');
+			// skip this for the moment as it tends to stop fallback animations
+			// document.documentElement.removeAttribute('data-astro-transition');
 			await runScripts();
 			markScriptsExec();
 			onload();
@@ -291,8 +292,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 				transitionEnabledOnThisPage()
 			) {
 				ev.preventDefault();
-				navigate('forward', link.href, { index: currentHistoryIndex, scrollY: 0 });
-				currentHistoryIndex++;
+				navigate('forward', link.href, { index: ++currentHistoryIndex, scrollY: 0 });
 				const newState: State = { index: currentHistoryIndex, scrollY };
 				persistState({ index: currentHistoryIndex - 1, scrollY });
 				history.pushState(newState, '', link.href);
@@ -306,10 +306,11 @@ const { fallback = 'animate' } = Astro.props as Props;
 				return;
 			}
 
-			// hash change creates no state.
+			// History entries without state are created by the browser (e.g. for hash links)
+			// Our view transition entries always have state.
+			// Just ignore stateless entries.
+			// The browser will handle navigation fine without our help
 			if (ev.state === null) {
-				persistState({ index: currentHistoryIndex, scrollY });
-				ev.preventDefault();
 				return;
 			}
 
@@ -344,6 +345,8 @@ const { fallback = 'animate' } = Astro.props as Props;
 		addEventListener(
 			'scroll',
 			throttle(() => {
+				// only updste history entries that are managed by us
+				// leave other entries alone and do not accidently add state.
 				if (history.state) {
 					persistState({ ...history.state, scrollY });
 				}

package/components/shiki-themes.js

@@ -34,10 +34,4 @@ export const themes = {
 	'solarized-light': () => import('shiki/themes/solarized-light.json').then(mod => mod.default),
 	'vitesse-dark': () => import('shiki/themes/vitesse-dark.json').then(mod => mod.default),
 	'vitesse-light': () => import('shiki/themes/vitesse-light.json').then(mod => mod.default),
-	// old theme names for compat
-	'material-darker': () => import('shiki/themes/material-theme-darker').then(mod => mod.default),
-	'material-default': () => import('shiki/themes/material-theme').then(mod => mod.default),
-	'material-lighter': () => import('shiki/themes/material-theme-lighter').then(mod => mod.default),
-	'material-ocean': () => import('shiki/themes/material-theme-ocean').then(mod => mod.default),
-	'material-palenight': () => import('shiki/themes/material-theme-palenight').then(mod => mod.default),
 };

package/content-types.template.d.ts

@@ -14,25 +14,6 @@ declare module 'astro:content' {
 	type Flatten<T> = T extends { [K: string]: infer U } ? U : never;
 	export type CollectionEntry<C extends keyof AnyEntryMap> = Flatten<AnyEntryMap[C]>;
 
-	// TODO: Remove this when having this fallback is no longer relevant. 2.3? 3.0? - erika, 2023-04-04
-	/**
-	 * @deprecated
-	 * `astro:content` no longer provide `image()`.
-	 *
-	 * Please use it through `schema`, like such:
-	 * ```ts
-	 * import { defineCollection, z } from "astro:content";
-	 *
-	 * defineCollection({
-	 *   schema: ({ image }) =>
-	 *     z.object({
-	 *       image: image(),
-	 *     }),
-	 * });
-	 * ```
-	 */
-	export const image: never;
-
 	// This needs to be in sync with ImageMetadata
 	export type ImageFunction = () => import('astro/zod').ZodObject<{
 		src: import('astro/zod').ZodString;
@@ -53,12 +34,9 @@ declare module 'astro:content' {
 
 	type BaseSchemaWithoutEffects =
 		| import('astro/zod').AnyZodObject
-		| import('astro/zod').ZodUnion<import('astro/zod').AnyZodObject[]>
+		| import('astro/zod').ZodUnion<[BaseSchemaWithoutEffects, ...BaseSchemaWithoutEffects[]]>
 		| import('astro/zod').ZodDiscriminatedUnion<string, import('astro/zod').AnyZodObject[]>
-		| import('astro/zod').ZodIntersection<
-				import('astro/zod').AnyZodObject,
-				import('astro/zod').AnyZodObject
-		  >;
+		| import('astro/zod').ZodIntersection<BaseSchemaWithoutEffects, BaseSchemaWithoutEffects>;
 
 	type BaseSchema =
 		| BaseSchemaWithoutEffects

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

@@ -18,6 +18,7 @@ import type { LogOptions, LoggerLevel } from '../core/logger/core';
 import type { AstroIntegrationLogger } from '../core/logger/core';
 import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/server';
 import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
+import type { ResponseWithEncoding } from '../core/endpoint/index.js';
 export type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/markdown-remark';
 export type { ExternalImageService, ImageService, LocalImageService, } from '../assets/services/service';
 export type { GetImageResult, ImageInputFormat, ImageMetadata, ImageOutputFormat, ImageQuality, ImageQualityPreset, ImageTransform, } from '../assets/types';
@@ -63,14 +64,10 @@ export interface AstroDefineVarsAttribute {
     'define:vars'?: any;
 }
 export interface AstroStyleAttributes {
-    /** @deprecated Use `is:global` instead */
-    global?: boolean;
     'is:global'?: boolean;
     'is:inline'?: boolean;
 }
 export interface AstroScriptAttributes {
-    /** @deprecated Hoist is now the default behavior */
-    hoist?: boolean;
     'is:inline'?: boolean;
 }
 export interface AstroComponentMetadata {
@@ -540,7 +537,7 @@ export interface AstroUserConfig {
      * @docs
      * @name scopedStyleStrategy
      * @type {('where' | 'class' | 'attribute')}
-     * @default `'where'`
+     * @default `'attribute'`
      * @version 2.4
      * @description
      *
@@ -551,7 +548,7 @@ export interface AstroUserConfig {
      *
      * Using `'class'` is helpful when you want to ensure that element selectors within an Astro component override global style defaults (e.g. from a global stylesheet).
      * Using `'where'` gives you more control over specifity, but requires that you use higher-specifity selectors, layers, and other tools to control which selectors are applied.
-     * Using `'attribute'` is useful in case there's manipulation of the class attributes, so the styling emitted by Astro doesn't go in conflict with the user's business logic.
+     * Using 'attribute' is useful when you are manipulating the `class` attribute of elements and need to avoid conflicts between your own styling logic and Astro's application of styles.
      */
     scopedStyleStrategy?: 'where' | 'class' | 'attribute';
     /**
@@ -787,22 +784,12 @@ export interface AstroUserConfig {
          * @name build.split
          * @type {boolean}
          * @default `false`
-         * @version 2.7.0
+         * @deprecated Deprecated since version 3.0.
          * @description
-         * Defines how the SSR code should be bundled when built.
+         * The build config option `build.split` has been replaced by the adapter configuration option [`functionPerRoute`](/en/reference/adapter-reference/#functionperroute).
          *
-         * When `split` is `true`, Astro will emit a file for each page.
-         * Each file emitted will render only one page. The pages will be emitted
-         * inside a `dist/pages/` directory, and the emitted files will keep the same file paths
-         * of the `src/pages` directory.
+         * Please see your [SSR adapter's documentation](/en/guides/integrations-guide/#official-integrations) for using `functionPerRoute` to define how your SSR code is bundled.
          *
-         * ```js
-         * {
-         *   build: {
-         *     split: true
-         *   }
-         * }
-         * ```
          */
         split?: boolean;
         /**
@@ -810,19 +797,11 @@ export interface AstroUserConfig {
          * @name build.excludeMiddleware
          * @type {boolean}
          * @default `false`
-         * @version 2.8.0
+         * @deprecated Deprecated since version 3.0.
          * @description
-         * Defines whether or not any SSR middleware code will be bundled when built.
+         * The build config option `build.excludeMiddleware` has been replaced by the adapter configuration option [`edgeMiddleware`](/en/reference/adapter-reference/#edgemiddleware).
          *
-         * When enabled, middleware code is not bundled and imported by all pages during the build. To instead execute and import middleware code manually, set `build.excludeMiddleware: true`:
-         *
-         * ```js
-         * {
-         *   build: {
-         *     excludeMiddleware: true
-         *   }
-         * }
-         * ```
+         * Please see your [SSR adapter's documentation](/en/guides/integrations-guide/#official-integrations) for using `edgeMiddleware` to define whether or not any SSR middleware code will be bundled when built.
          */
         excludeMiddleware?: boolean;
     };
@@ -1004,6 +983,7 @@ export interface AstroUserConfig {
          * @name markdown.drafts
          * @type {boolean}
          * @default `false`
+         * @deprecated Deprecated since version 3.0. Use content collections instead.
          * @description
          * Control whether Markdown draft pages should be included in the build.
          *
@@ -1142,7 +1122,7 @@ export interface AstroUserConfig {
      * @name Integrations
      * @description
      *
-     * Extend Astro with custom integrations. Integrations are your one-stop-shop for adding framework support (like Solid.js), new features (like sitemaps), and new libraries (like Partytown and Turbolinks).
+     * Extend Astro with custom integrations. Integrations are your one-stop-shop for adding framework support (like Solid.js), new features (like sitemaps), and new libraries (like Partytown).
      *
      * Read our [Integrations Guide](https://docs.astro.build/en/guides/integrations-guide/) for help getting started with Astro Integrations.
      *
@@ -1250,26 +1230,6 @@ export interface AstroUserConfig {
          */
         optimizeHoistedScript?: boolean;
     };
-    /** @deprecated - Use "integrations" instead. Run Astro to learn more about migrating. */
-    renderers?: never;
-    /** @deprecated `projectRoot` has been renamed to `root` */
-    projectRoot?: never;
-    /** @deprecated `src` has been renamed to `srcDir` */
-    src?: never;
-    /** @deprecated `pages` has been removed. It is no longer configurable. */
-    pages?: never;
-    /** @deprecated `public` has been renamed to `publicDir` */
-    public?: never;
-    /** @deprecated `dist` has been renamed to `outDir` */
-    dist?: never;
-    /** @deprecated `styleOptions` has been renamed to `style` */
-    styleOptions?: never;
-    /** @deprecated `markdownOptions` has been renamed to `markdown` */
-    markdownOptions?: never;
-    /** @deprecated `buildOptions` has been renamed to `build` */
-    buildOptions?: never;
-    /** @deprecated `devOptions` has been renamed to `server` */
-    devOptions?: never;
 }
 /**
  * IDs for different stages of JS script injection:
@@ -1430,6 +1390,10 @@ export interface ComponentInstance {
     default: AstroComponentFactory;
     css?: string[];
     prerender?: boolean;
+    /**
+     * Only used for logging if deprecated drafts feature is used
+     */
+    frontmatter?: Record<string, any>;
     getStaticPaths?: (options: GetStaticPathsOptions) => GetStaticPathsResult;
 }
 export interface AstroInstance {
@@ -1788,10 +1752,11 @@ export interface APIContext<Props extends Record<string, any> = Record<string, a
      * ```
      */
     locals: App.Locals;
+    ResponseWithEncoding: typeof ResponseWithEncoding;
 }
 export type EndpointOutput = {
     body: Body;
-    encoding?: Exclude<BufferEncoding, 'binary'>;
+    encoding?: BufferEncoding;
 } | {
     body: Uint8Array;
     encoding: 'binary';

package/dist/content/utils.js

@@ -136,7 +136,10 @@ function getDataEntryId({
   collection
 }) {
   const relativePath = getRelativeEntryPath(entry, collection, contentDir);
-  const withoutFileExt = relativePath.replace(new RegExp(path.extname(relativePath) + "$"), "");
+  const withoutFileExt = normalizePath(relativePath).replace(
+    new RegExp(path.extname(relativePath) + "$"),
+    ""
+  );
   return withoutFileExt;
 }
 function getContentEntryIdAndSlug({

package/dist/core/app/index.js

@@ -137,7 +137,7 @@ class App {
         return this.#renderError(request, { status: 500 });
       }
     }
-    if (SSRRoutePipeline.isResponse(response, routeData.type)) {
+    if (routeData.type === "page" || routeData.type === "redirect") {
       if (STATUS_CODES.has(response.status)) {
         return this.#renderError(request, {
           response,

package/dist/core/app/ssrPipeline.js

@@ -1,5 +1,3 @@
-import mime from "mime";
-import { attachCookiesToResponse } from "../cookies/index.js";
 import { Pipeline } from "../pipeline.js";
 class EndpointNotFoundError extends Error {
   originalResponse;
@@ -9,36 +7,16 @@ class EndpointNotFoundError extends Error {
   }
 }
 class SSRRoutePipeline extends Pipeline {
-  #encoder = new TextEncoder();
   constructor(env) {
     super(env);
     this.setEndpointHandler(this.#ssrEndpointHandler);
   }
   // This function is responsible for handling the result coming from an endpoint.
   async #ssrEndpointHandler(request, response) {
-    if (response.type === "response") {
-      if (response.response.headers.get("X-Astro-Response") === "Not-Found") {
-        throw new EndpointNotFoundError(response.response);
-      }
-      return response.response;
-    } else {
-      const url = new URL(request.url);
-      const headers = new Headers();
-      const mimeType = mime.getType(url.pathname);
-      if (mimeType) {
-        headers.set("Content-Type", `${mimeType};charset=utf-8`);
-      } else {
-        headers.set("Content-Type", "text/plain;charset=utf-8");
-      }
-      const bytes = response.encoding !== "binary" ? this.#encoder.encode(response.body) : response.body;
-      headers.set("Content-Length", bytes.byteLength.toString());
-      const newResponse = new Response(bytes, {
-        status: 200,
-        headers
-      });
-      attachCookiesToResponse(newResponse, response.cookies);
-      return newResponse;
+    if (response.headers.get("X-Astro-Response") === "Not-Found") {
+      throw new EndpointNotFoundError(response);
     }
+    return response;
   }
 }
 export {

package/dist/core/build/buildPipeline.d.ts

@@ -2,8 +2,7 @@ import { Pipeline } from '../pipeline.js';
 import type { BuildInternals } from './internal';
 import type { PageBuildData, StaticBuildOptions } from './types';
 import type { SSRManifest } from '../app/types';
-import type { AstroConfig, AstroSettings, RouteType } from '../../@types/astro';
-import type { BufferEncoding } from 'vfile';
+import type { AstroConfig, AstroSettings } from '../../@types/astro';
 /**
  * This pipeline is responsible to gather the files emitted by the SSR build and generate the pages by executing these files.
  */
@@ -35,8 +34,4 @@ export declare class BuildPipeline extends Pipeline {
      * It returns a map of page information and their relative entry point as a string.
      */
     retrieveRoutesToGenerate(): Map<PageBuildData, string>;
-    computeBodyAndEncoding(routeType: RouteType, response: Response): Promise<{
-        body: string | Uint8Array;
-        encoding: BufferEncoding;
-    }>;
 }

package/dist/core/build/buildPipeline.js

@@ -10,7 +10,6 @@ class BuildPipeline extends Pipeline {
   #internals;
   #staticBuildOptions;
   #manifest;
-  #currentEndpointBody;
   constructor(staticBuildOptions, internals, manifest) {
     const ssr = isServerLikeOutput(staticBuildOptions.settings.config);
     super(
@@ -123,43 +122,8 @@ class BuildPipeline extends Pipeline {
     }
     return pages;
   }
-  async #handleEndpointResult(request, response) {
-    if (response.type === "response") {
-      if (!response.response.body) {
-        return new Response(null);
-      }
-      const ab = await response.response.arrayBuffer();
-      const body = new Uint8Array(ab);
-      this.#currentEndpointBody = {
-        body,
-        encoding: "utf-8"
-      };
-      return response.response;
-    } else {
-      if (response.encoding) {
-        this.#currentEndpointBody = {
-          body: response.body,
-          encoding: response.encoding
-        };
-        const headers = new Headers();
-        headers.set("X-Astro-Encoding", response.encoding);
-        return new Response(response.body, {
-          headers
-        });
-      } else {
-        return new Response(response.body);
-      }
-    }
-  }
-  async computeBodyAndEncoding(routeType, response) {
-    const encoding = response.headers.get("X-Astro-Encoding") ?? "utf-8";
-    if (this.#currentEndpointBody) {
-      const currentEndpointBody = this.#currentEndpointBody;
-      this.#currentEndpointBody = void 0;
-      return currentEndpointBody;
-    } else {
-      return { body: await response.text(), encoding };
-    }
+  async #handleEndpointResult(_, response) {
+    return response;
   }
 }
 export {

package/dist/core/build/generate.js

@@ -190,6 +190,10 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline, logger) {
   const pageModule = await pageModulePromise();
   if (shouldSkipDraft(pageModule, pipeline.getSettings())) {
     logger.info(null, `${magenta("\u26A0\uFE0F")}  Skipping draft ${pageData.route.component}`);
+    logger.warn(
+      "astro",
+      `The drafts feature is deprecated. You should migrate to content collections instead. See https://docs.astro.build/en/guides/content-collections/#filtering-collection-queries for more information.`
+    );
     return;
   }
   const generationOptions = {
@@ -211,15 +215,17 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline, logger) {
     pipeline.getStaticBuildOptions(),
     builtPaths
   );
+  let prevTimeEnd = timeStart;
   for (let i = 0; i < paths.length; i++) {
     const path = paths[i];
     await generatePath(path, generationOptions, pipeline);
     const timeEnd = performance.now();
-    const timeChange = getTimeStat(timeStart, timeEnd);
+    const timeChange = getTimeStat(prevTimeEnd, timeEnd);
     const timeIncrease = `(+${timeChange})`;
     const filePath = getOutputFilename(pipeline.getConfig(), path, pageData.route.type);
     const lineIcon = i === paths.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
     logger.info(null, `  ${cyan(lineIcon)} ${dim(filePath)} ${dim(timeIncrease)}`);
+    prevTimeEnd = timeEnd;
   }
 }
 async function getPathsForRoute(pageData, mod, opts, builtPaths) {
@@ -417,19 +423,14 @@ async function generatePath(pathname, gopts, pipeline) {
   } else {
     if (!response.body)
       return;
-    const result = await pipeline.computeBodyAndEncoding(renderContext.route.type, response);
-    body = result.body;
-    encoding = result.encoding;
+    body = Buffer.from(await response.arrayBuffer());
+    encoding = response.headers.get("X-Astro-Encoding") ?? "utf-8";
   }
   const outFolder = getOutFolder(pipeline.getConfig(), pathname, pageData.route.type);
   const outFile = getOutFile(pipeline.getConfig(), outFolder, pathname, pageData.route.type);
   pageData.route.distURL = outFile;
-  const possibleEncoding = response.headers.get("X-Astro-Encoding");
-  if (possibleEncoding) {
-    encoding = possibleEncoding;
-  }
   await fs.promises.mkdir(outFolder, { recursive: true });
-  await fs.promises.writeFile(outFile, body, encoding ?? "utf-8");
+  await fs.promises.writeFile(outFile, body, encoding);
 }
 function createBuildManifest(settings, internals, renderers) {
   return {

package/dist/core/config/config.js

@@ -10,59 +10,7 @@ import { formatConfigErrorMessage } from "../messages.js";
 import { mergeConfig } from "./merge.js";
 import { createRelativeSchema } from "./schema.js";
 import { loadConfigWithVite } from "./vite-load.js";
-const LEGACY_ASTRO_CONFIG_KEYS = /* @__PURE__ */ new Set([
-  "projectRoot",
-  "src",
-  "pages",
-  "public",
-  "dist",
-  "styleOptions",
-  "markdownOptions",
-  "buildOptions",
-  "devOptions"
-]);
 async function validateConfig(userConfig, root, cmd) {
-  if (userConfig.hasOwnProperty("renderers")) {
-    console.error('Astro "renderers" are now "integrations"!');
-    console.error("Update your configuration and install new dependencies:");
-    try {
-      const rendererKeywords = userConfig.renderers.map(
-        (r) => r.replace("@astrojs/renderer-", "")
-      );
-      const rendererImports = rendererKeywords.map((r) => `  import ${r} from '@astrojs/${r === "solid" ? "solid-js" : r}';`).join("\n");
-      const rendererIntegrations = rendererKeywords.map((r) => `    ${r}(),`).join("\n");
-      console.error("");
-      console.error(colors.dim("  // astro.config.js"));
-      if (rendererImports.length > 0) {
-        console.error(colors.green(rendererImports));
-      }
-      console.error("");
-      console.error(colors.dim("  // ..."));
-      if (rendererIntegrations.length > 0) {
-        console.error(colors.green("  integrations: ["));
-        console.error(colors.green(rendererIntegrations));
-        console.error(colors.green("  ],"));
-      } else {
-        console.error(colors.green("  integrations: [],"));
-      }
-      console.error("");
-    } catch (err) {
-    }
-    process.exit(1);
-  }
-  let legacyConfigKey;
-  for (const key of Object.keys(userConfig)) {
-    if (LEGACY_ASTRO_CONFIG_KEYS.has(key)) {
-      legacyConfigKey = key;
-      break;
-    }
-  }
-  if (legacyConfigKey) {
-    throw new AstroError({
-      ...AstroErrorData.ConfigLegacyKey,
-      message: AstroErrorData.ConfigLegacyKey.message(legacyConfigKey)
-    });
-  }
   const AstroConfigRelativeSchema = createRelativeSchema(cmd, root);
   let result;
   try {