astro 2.8.5 → 2.9.1

package/dist/vite-plugin-astro-server/request.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type http from 'node:http';
 import type { ManifestData, SSRManifest } from '../@types/astro';
-import type { DevelopmentEnvironment } from '../core/render/dev/index';
+import type { DevelopmentEnvironment } from '../core/render/index';
 import type { DevServerController } from './controller';
 type HandleRequest = {
     env: DevelopmentEnvironment;

package/dist/{core/render/dev → vite-plugin-astro-server}/resolve.d.ts

@@ -1,2 +1,2 @@
-import type { ModuleLoader } from '../../module-loader/index';
+import type { ModuleLoader } from '../core/module-loader';
 export declare function createResolve(loader: ModuleLoader, root: URL): (s: string) => Promise<string>;

package/dist/{core/render/dev → vite-plugin-astro-server}/resolve.js

@@ -1,4 +1,4 @@
-import { resolveIdToUrl } from "../../util.js";
+import { resolveIdToUrl } from "../core/util.js";
 function createResolve(loader, root) {
   return async function(s) {
     return await resolveIdToUrl(loader, s, root);

package/dist/vite-plugin-astro-server/route.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type http from 'node:http';
 import type { ComponentInstance, ManifestData, RouteData, SSRManifest } from '../@types/astro';
-import type { DevelopmentEnvironment } from '../core/render/dev/index';
+import { type DevelopmentEnvironment } from '../core/render/index.js';
 type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (...args: any) => Promise<infer R> ? R : any;
 export interface MatchedRoute {
     route: RouteData;

package/dist/vite-plugin-astro-server/route.js

@@ -1,18 +1,25 @@
 import mime from "mime";
 import { attachToResponse } from "../core/cookies/index.js";
-import { call as callEndpoint } from "../core/endpoint/dev/index.js";
-import { throwIfRedirectNotAllowed } from "../core/endpoint/index.js";
 import { AstroErrorData, isAstroError } from "../core/errors/index.js";
 import { warn } from "../core/logger/core.js";
 import { loadMiddleware } from "../core/middleware/loadMiddleware.js";
-import { preload, renderPage } from "../core/render/dev/index.js";
-import { getParamsAndProps } from "../core/render/index.js";
+import {
+  createRenderContext,
+  getParamsAndProps,
+  tryRenderRoute
+} from "../core/render/index.js";
 import { createRequest } from "../core/request.js";
 import { matchAllRoutes } from "../core/routing/index.js";
+import { isPage, resolveIdToUrl, viteID } from "../core/util.js";
 import { getSortedPreloadedMatches } from "../prerender/routing.js";
 import { isServerLikeOutput } from "../prerender/utils.js";
+import { PAGE_SCRIPT_ID } from "../vite-plugin-scripts/index.js";
 import { log404 } from "./common.js";
+import { getStylesForURL } from "./css.js";
+import { preload } from "./index.js";
+import { getComponentMetadata } from "./metadata.js";
 import { handle404Response, writeSSRResult, writeWebResponse } from "./response.js";
+import { getScriptsForURL } from "./scripts.js";
 const clientLocalsSymbol = Symbol.for("astro.locals");
 function getCustom404Route(manifest) {
   const route404 = /^\/404\/?$/;
@@ -90,19 +97,11 @@ async function handleRoute({
   incomingResponse,
   manifest
 }) {
+  var _a;
   const { logging, settings } = env;
   if (!matchedRoute) {
     return handle404Response(origin, incomingRequest, incomingResponse);
   }
-  if (matchedRoute.route.type === "redirect" && !settings.config.experimental.redirects) {
-    writeWebResponse(
-      incomingResponse,
-      new Response(`To enable redirect set experimental.redirects to \`true\`.`, {
-        status: 400
-      })
-    );
-    return;
-  }
   const { config } = settings;
   const filePath = matchedRoute.filePath;
   const { route, preloadedComponent } = matchedRoute;
@@ -134,8 +133,25 @@ async function handleRoute({
   if (middleware) {
     options.middleware = middleware;
   }
-  if (route.type === "endpoint") {
-    const result = await callEndpoint(options);
+  const mod = options.preload;
+  const { scripts, links, styles, metadata } = await getScriptsAndStyles({
+    env: options.env,
+    filePath: options.filePath
+  });
+  const renderContext = await createRenderContext({
+    request: options.request,
+    pathname: options.pathname,
+    scripts,
+    links,
+    styles,
+    componentMetadata: metadata,
+    route: options.route,
+    mod,
+    env
+  });
+  const onRequest = (_a = options.middleware) == null ? void 0 : _a.onRequest;
+  const result = await tryRenderRoute(route.type, renderContext, env, mod, onRequest);
+  if (route.type === "endpoint" && !(result instanceof Response)) {
     if (result.type === "response") {
       if (result.response.headers.get("X-Astro-Response") === "Not-Found") {
         const fourOhFourRoute = await matchRoute("/404", env, manifestData);
@@ -153,7 +169,6 @@ async function handleRoute({
           manifest
         });
       }
-      throwIfRedirectNotAllowed(result.response, config);
       await writeWebResponse(incomingResponse, result.response);
     } else {
       let contentType = "text/plain";
@@ -171,8 +186,7 @@ async function handleRoute({
       attachToResponse(response, result.cookies);
       await writeWebResponse(incomingResponse, response);
     }
-  } else {
-    const result = await renderPage(options);
+  } else if (result instanceof Response) {
     if (result.status === 404) {
       const fourOhFourRoute = await matchRoute("/404", env, manifestData);
       return handleRoute({
@@ -189,13 +203,72 @@ async function handleRoute({
         manifest
       });
     }
-    throwIfRedirectNotAllowed(result, config);
     let response = result;
     if (status && response.status !== status) {
       response = new Response(result.body, { ...result, status });
     }
-    return await writeSSRResult(request, response, incomingResponse);
+    await writeSSRResult(request, response, incomingResponse);
+  }
+}
+async function getScriptsAndStyles({ env, filePath }) {
+  const scripts = await getScriptsForURL(filePath, env.settings.config.root, env.loader);
+  if (isPage(filePath, env.settings) && env.mode === "development") {
+    scripts.add({
+      props: { type: "module", src: "/@vite/client" },
+      children: ""
+    });
+    scripts.add({
+      props: {
+        type: "module",
+        src: await resolveIdToUrl(env.loader, "astro/runtime/client/hmr.js")
+      },
+      children: ""
+    });
+  }
+  for (const script of env.settings.scripts) {
+    if (script.stage === "head-inline") {
+      scripts.add({
+        props: {},
+        children: script.content
+      });
+    } else if (script.stage === "page" && isPage(filePath, env.settings)) {
+      scripts.add({
+        props: { type: "module", src: `/@id/${PAGE_SCRIPT_ID}` },
+        children: ""
+      });
+    }
   }
+  const { urls: styleUrls, stylesMap } = await getStylesForURL(filePath, env.loader, env.mode);
+  let links = /* @__PURE__ */ new Set();
+  [...styleUrls].forEach((href) => {
+    links.add({
+      props: {
+        rel: "stylesheet",
+        href
+      },
+      children: ""
+    });
+  });
+  let styles = /* @__PURE__ */ new Set();
+  [...stylesMap].forEach(([url, content]) => {
+    scripts.add({
+      props: {
+        type: "module",
+        src: url
+      },
+      children: ""
+    });
+    styles.add({
+      props: {
+        type: "text/css",
+        // Track the ID so we can match it to Vite's injected style later
+        "data-astro-dev-id": viteID(new URL(`.${url}`, env.settings.config.root))
+      },
+      children: content
+    });
+  });
+  const metadata = await getComponentMetadata(filePath, env.loader);
+  return { scripts, styles, links, metadata };
 }
 function getStatus(matchedRoute) {
   if (!matchedRoute)

package/dist/vite-plugin-astro-server/scripts.d.ts

@@ -0,0 +1,3 @@
+import type { SSRElement } from '../@types/astro';
+import type { ModuleLoader } from '../core/module-loader';
+export declare function getScriptsForURL(filePath: URL, root: URL, loader: ModuleLoader): Promise<Set<SSRElement>>;

package/dist/{core/render/dev → vite-plugin-astro-server}/scripts.js

@@ -1,5 +1,5 @@
-import { rootRelativePath, viteID } from "../../util.js";
-import { createModuleScriptElementWithSrc } from "../ssr-element.js";
+import { createModuleScriptElementWithSrc } from "../core/render/ssr-element.js";
+import { rootRelativePath, viteID } from "../core/util.js";
 import { crawlGraph } from "./vite.js";
 async function getScriptsForURL(filePath, root, loader) {
   const elements = /* @__PURE__ */ new Set();

package/dist/{core/render/dev → vite-plugin-astro-server}/vite.d.ts

@@ -1,3 +1,3 @@
-import type { ModuleLoader, ModuleNode } from '../../module-loader/index';
+import type { ModuleLoader, ModuleNode } from '../core/module-loader/index';
 /** recursively crawl the module graph to get all style files imported by parent id */
 export declare function crawlGraph(loader: ModuleLoader, _id: string, isRootFile: boolean, scanned?: Set<string>): AsyncGenerator<ModuleNode, void, unknown>;

package/dist/{core/render/dev → vite-plugin-astro-server}/vite.js

@@ -1,6 +1,6 @@
 import npath from "node:path";
-import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "../../constants.js";
-import { unwrapId } from "../../util.js";
+import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "../core/constants.js";
+import { unwrapId } from "../core/util.js";
 import { isCSSRequest } from "./util.js";
 const fileExtensionsToSSR = /* @__PURE__ */ new Set([".astro", ".mdoc", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS]);
 const STRIP_QUERY_PARAMS_REGEX = /\?.*$/;

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

@@ -118,7 +118,7 @@ function markdown({ settings, logging }) {
 
 				function updateImageReferences(html) {
 					return html.replaceAll(
-						/__ASTRO_IMAGE_="(.+)"/gm,
+						/__ASTRO_IMAGE_="([^"]+)"/gm,
 						(full, imagePath) => spreadAttributes({src: images[imagePath].src, ...images[imagePath].attributes})
 					);
 				}

package/dist/vite-plugin-scanner/index.d.ts

@@ -1,5 +1,8 @@
-import { type Plugin as VitePlugin } from 'vite';
+import type { Plugin as VitePlugin } from 'vite';
 import type { AstroSettings } from '../@types/astro.js';
-export default function astroScannerPlugin({ settings }: {
+import { type LogOptions } from '../core/logger/core.js';
+export interface AstroPluginScannerOptions {
     settings: AstroSettings;
-}): VitePlugin;
+    logging: LogOptions;
+}
+export default function astroScannerPlugin({ settings, logging, }: AstroPluginScannerOptions): VitePlugin;

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

@@ -1,8 +1,13 @@
+import { bold } from "kleur/colors";
 import { normalizePath } from "vite";
-import { isEndpoint, isPage } from "../core/util.js";
-import { getPrerenderDefault } from "../prerender/utils.js";
+import { warn } from "../core/logger/core.js";
+import { isEndpoint, isPage, rootRelativePath } from "../core/util.js";
+import { getPrerenderDefault, isServerLikeOutput } from "../prerender/utils.js";
 import { scan } from "./scan.js";
-function astroScannerPlugin({ settings }) {
+function astroScannerPlugin({
+  settings,
+  logging
+}) {
   return {
     name: "astro:scanner",
     enforce: "post",
@@ -21,10 +26,22 @@ function astroScannerPlugin({ settings }) {
       if (!(fileIsPage || fileIsEndpoint))
         return;
       const defaultPrerender = getPrerenderDefault(settings.config);
-      const pageOptions = await scan(code, id, settings.config.output === "hybrid");
+      const pageOptions = await scan(code, id, settings);
       if (typeof pageOptions.prerender === "undefined") {
         pageOptions.prerender = defaultPrerender;
       }
+      if (!pageOptions.prerender && isServerLikeOutput(settings.config) && code.includes("getStaticPaths")) {
+        const reason = ` because \`output: "${settings.config.output}"\` is set`;
+        warn(
+          logging,
+          "getStaticPaths",
+          `The getStaticPaths() statement in ${bold(
+            rootRelativePath(settings.config.root, fileURL, true)
+          )} has been ignored${reason}.
+
+Add \`export const prerender = true;\` to prerender this page.`
+        );
+      }
       const { meta = {} } = this.getModuleInfo(id) ?? {};
       return {
         code,

package/dist/vite-plugin-scanner/scan.d.ts

@@ -1,2 +1,3 @@
+import type { AstroSettings } from '../@types/astro.js';
 import type { PageOptions } from '../vite-plugin-astro/types.js';
-export declare function scan(code: string, id: string, isHybridOutput?: boolean): Promise<PageOptions>;
+export declare function scan(code: string, id: string, settings?: AstroSettings): Promise<PageOptions>;

package/dist/vite-plugin-scanner/scan.js

@@ -24,7 +24,7 @@ function isFalsy(value) {
   return value === "false" || value === "0";
 }
 let didInit = false;
-async function scan(code, id, isHybridOutput = false) {
+async function scan(code, id, settings) {
   if (!includesExport(code))
     return {};
   if (!didInit) {
@@ -41,7 +41,11 @@ async function scan(code, id, isHybridOutput = false) {
       if (prefix !== "const" || !(isTruthy(suffix) || isFalsy(suffix))) {
         throw new AstroError({
           ...AstroErrorData.InvalidPrerenderExport,
-          message: AstroErrorData.InvalidPrerenderExport.message(prefix, suffix, isHybridOutput),
+          message: AstroErrorData.InvalidPrerenderExport.message(
+            prefix,
+            suffix,
+            (settings == null ? void 0 : settings.config.output) === "hybrid"
+          ),
           location: { file: id }
         });
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.8.5",
+  "version": "2.9.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -71,7 +71,8 @@
     "./middleware": {
       "types": "./dist/core/middleware/index.d.ts",
       "default": "./dist/core/middleware/index.js"
-    }
+    },
+    "./transitions": "./dist/transitions/index.js"
   },
   "imports": {
     "#astro/*": "./dist/*.js"
@@ -101,7 +102,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^1.5.3",
+    "@astrojs/compiler": "^1.6.0",
     "@astrojs/internal-helpers": "^0.1.1",
     "@astrojs/language-server": "^1.0.0",
     "@astrojs/markdown-remark": "^2.2.1",
@@ -114,6 +115,7 @@
     "@babel/traverse": "^7.22.5",
     "@babel/types": "^7.22.5",
     "@types/babel__core": "^7.20.1",
+    "@types/dom-view-transitions": "^1.0.1",
     "@types/yargs-parser": "^21.0.0",
     "acorn": "^8.9.0",
     "boxen": "^6.2.1",
@@ -137,6 +139,7 @@
     "kleur": "^4.1.4",
     "magic-string": "^0.27.0",
     "mime": "^3.0.0",
+    "network-information-types": "^0.1.1",
     "ora": "^6.3.1",
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.2.1",

package/dist/core/render/dev/environment.d.ts

@@ -1,9 +0,0 @@
-import type { AstroSettings, SSRManifest } from '../../../@types/astro';
-import type { LogOptions } from '../../logger/core.js';
-import type { ModuleLoader } from '../../module-loader/index';
-import type { Environment } from '../index';
-export type DevelopmentEnvironment = Environment & {
-    loader: ModuleLoader;
-    settings: AstroSettings;
-};
-export declare function createDevelopmentEnvironment(manifest: SSRManifest, settings: AstroSettings, logging: LogOptions, loader: ModuleLoader): DevelopmentEnvironment;

package/dist/core/render/dev/index.d.ts

@@ -1,27 +0,0 @@
-import type { AstroMiddlewareInstance, ComponentInstance, RouteData } from '../../../@types/astro';
-import type { DevelopmentEnvironment } from './environment';
-export { createDevelopmentEnvironment } from './environment.js';
-export type { DevelopmentEnvironment };
-export interface SSROptions {
-    /** The environment instance */
-    env: DevelopmentEnvironment;
-    /** location of file on disk */
-    filePath: URL;
-    /** the web request (needed for dynamic routes) */
-    pathname: string;
-    /** The runtime component instance */
-    preload: ComponentInstance;
-    /** Request */
-    request: Request;
-    /** optional, in case we need to render something outside of a dev server */
-    route?: RouteData;
-    /**
-     * Optional middlewares
-     */
-    middleware?: AstroMiddlewareInstance<unknown>;
-}
-export declare function preload({ env, filePath, }: {
-    env: DevelopmentEnvironment;
-    filePath: URL;
-}): Promise<ComponentInstance>;
-export declare function renderPage(options: SSROptions): Promise<Response>;

package/dist/core/render/dev/index.js

@@ -1,112 +0,0 @@
-import { PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
-import { enhanceViteSSRError } from "../../errors/dev/index.js";
-import { AggregateError, CSSError, MarkdownError } from "../../errors/index.js";
-import { isPage, resolveIdToUrl, viteID } from "../../util.js";
-import { createRenderContext, loadRenderers, tryRenderPage } from "../index.js";
-import { getStylesForURL } from "./css.js";
-import { getComponentMetadata } from "./metadata.js";
-import { getScriptsForURL } from "./scripts.js";
-import { createDevelopmentEnvironment } from "./environment.js";
-async function preload({
-  env,
-  filePath
-}) {
-  const renderers = await loadRenderers(env.settings, env.loader);
-  env.renderers = renderers;
-  try {
-    const mod = await env.loader.import(viteID(filePath));
-    return mod;
-  } catch (error) {
-    if (MarkdownError.is(error) || CSSError.is(error) || AggregateError.is(error)) {
-      throw error;
-    }
-    throw enhanceViteSSRError({ error, filePath, loader: env.loader });
-  }
-}
-async function getScriptsAndStyles({ env, filePath }) {
-  const scripts = await getScriptsForURL(filePath, env.settings.config.root, env.loader);
-  if (isPage(filePath, env.settings) && env.mode === "development") {
-    scripts.add({
-      props: { type: "module", src: "/@vite/client" },
-      children: ""
-    });
-    scripts.add({
-      props: {
-        type: "module",
-        src: await resolveIdToUrl(env.loader, "astro/runtime/client/hmr.js")
-      },
-      children: ""
-    });
-  }
-  for (const script of env.settings.scripts) {
-    if (script.stage === "head-inline") {
-      scripts.add({
-        props: {},
-        children: script.content
-      });
-    } else if (script.stage === "page" && isPage(filePath, env.settings)) {
-      scripts.add({
-        props: { type: "module", src: `/@id/${PAGE_SCRIPT_ID}` },
-        children: ""
-      });
-    }
-  }
-  const { urls: styleUrls, stylesMap } = await getStylesForURL(filePath, env.loader, env.mode);
-  let links = /* @__PURE__ */ new Set();
-  [...styleUrls].forEach((href) => {
-    links.add({
-      props: {
-        rel: "stylesheet",
-        href
-      },
-      children: ""
-    });
-  });
-  let styles = /* @__PURE__ */ new Set();
-  [...stylesMap].forEach(([url, content]) => {
-    scripts.add({
-      props: {
-        type: "module",
-        src: url
-      },
-      children: ""
-    });
-    styles.add({
-      props: {
-        type: "text/css",
-        // Track the ID so we can match it to Vite's injected style later
-        "data-astro-dev-id": viteID(new URL(`.${url}`, env.settings.config.root))
-      },
-      children: content
-    });
-  });
-  const metadata = await getComponentMetadata(filePath, env.loader);
-  return { scripts, styles, links, metadata };
-}
-async function renderPage(options) {
-  var _a;
-  const mod = options.preload;
-  const { scripts, links, styles, metadata } = await getScriptsAndStyles({
-    env: options.env,
-    filePath: options.filePath
-  });
-  const { env } = options;
-  const renderContext = await createRenderContext({
-    request: options.request,
-    pathname: options.pathname,
-    scripts,
-    links,
-    styles,
-    componentMetadata: metadata,
-    route: options.route,
-    mod,
-    env
-  });
-  const onRequest = (_a = options.middleware) == null ? void 0 : _a.onRequest;
-  return tryRenderPage(renderContext, env, mod, onRequest);
-}
-export {
-  createDevelopmentEnvironment,
-  preload,
-  renderPage
-};

package/dist/core/render/dev/scripts.d.ts

@@ -1,3 +0,0 @@
-import type { SSRElement } from '../../../@types/astro';
-import type { ModuleLoader } from '../../module-loader/index';
-export declare function getScriptsForURL(filePath: URL, root: URL, loader: ModuleLoader): Promise<Set<SSRElement>>;