diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/astro.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/astro.ts
index 352a018e11e2..6707459f4c31 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/astro.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/astro.ts
@@ -1,19 +1,90 @@
-import type { DevOverlayPlugin } from '../../../../@types/astro.js';
+import type { DevOverlayMetadata, DevOverlayPlugin } from '../../../../@types/astro.js';
+import { isDefinedIcon, type Icon } from '../ui-library/icons.js';
+import { colorForIntegration, iconForIntegration } from './utils/icons.js';
import { createWindowWithTransition, waitForTransition } from './utils/window.js';
+const astroLogo =
+ '
';
+
+export interface Integration {
+ name: string;
+ title: string;
+ description: string;
+ image?: string;
+ categories: string[];
+ repoUrl: string;
+ npmUrl: string;
+ homepageUrl: string;
+ official: boolean;
+ featured: number;
+ downloads: number;
+}
+
+interface IntegrationData {
+ data: Integration[];
+}
+
+let integrationData: IntegrationData;
+
export default {
id: 'astro',
name: 'Astro',
icon: 'astro:logo',
- init(canvas) {
+ async init(canvas, eventTarget) {
createWindow();
document.addEventListener('astro:after-swap', createWindow);
+ eventTarget.addEventListener('plugin-toggled', async (event) => {
+ resetDebugButton();
+ if (!(event instanceof CustomEvent)) return;
+
+ if (event.detail.state === true) {
+ if (!integrationData)
+ fetch('https://astro.build/api/v1/dev-overlay/', {
+ cache: 'no-cache',
+ })
+ .then((res) => res.json())
+ .then((data) => {
+ integrationData = data;
+ integrationData.data = integrationData.data.map((integration) => {
+ return integration;
+ });
+ refreshIntegrationList();
+ });
+ }
+ });
+
function createWindow() {
- const window = createWindowWithTransition(
- 'Astro',
- 'astro:logo',
+ const links: { icon: Icon; name: string; link: string }[] = [
+ {
+ icon: 'bug',
+ name: 'Report a bug',
+ link: 'https://github.com/withastro/astro/issues/new/choose',
+ },
+ {
+ icon: 'lightbulb',
+ name: 'Suggestions',
+ link: 'https://github.com/withastro/roadmap/discussions/new/choose',
+ },
+ {
+ icon: 'file-search',
+ name: 'Docs',
+ link: 'https://docs.astro.build',
+ },
+ {
+ icon: 'star',
+ name: 'Star on GitHub',
+ link: 'https://github.com/withastro/astro',
+ },
+ {
+ icon: '
',
+ name: 'Our Discord',
+ link: 'https://astro.build/chat',
+ },
+ ];
+
+ const windowComponent = createWindowWithTransition(
`
+
+
+ ${astroLogo}
+ Version ${
+ (window as DevOverlayMetadata).__astro_dev_overlay__.version
+ }
+
+ Copy debug info
+
+
+
-
Welcome to Astro!
-
+
+
-
+
`
);
- canvas.append(window);
+ const copyDebugButton =
+ windowComponent.querySelector
('#copy-debug-button');
+
+ copyDebugButton?.addEventListener('click', () => {
+ navigator.clipboard.writeText(
+ '```\n' + (window as DevOverlayMetadata).__astro_dev_overlay__.debugInfo + '\n```'
+ );
+ copyDebugButton.textContent = 'Copied to clipboard!';
+
+ setTimeout(() => {
+ resetDebugButton();
+ }, 3500);
+ });
+
+ canvas.append(windowComponent);
+ }
+
+ function resetDebugButton() {
+ const copyDebugButton = canvas.querySelector('#copy-debug-button');
+ if (!copyDebugButton) return;
+
+ copyDebugButton.innerHTML = 'Copy debug info ';
+ }
+
+ function refreshIntegrationList() {
+ const integrationList = canvas.querySelector('#integration-list');
+
+ if (!integrationList) return;
+ integrationList.innerHTML = '';
+
+ const fragment = document.createDocumentFragment();
+ for (const integration of integrationData.data) {
+ const integrationComponent = document.createElement('astro-dev-overlay-card');
+ integrationComponent.link = integration.homepageUrl;
+
+ const integrationContainer = document.createElement('div');
+ integrationContainer.className = 'integration-container';
+
+ const integrationImage = document.createElement('div');
+ integrationImage.className = 'integration-image';
+
+ if (integration.image) {
+ const img = document.createElement('img');
+ img.src = integration.image;
+ img.alt = integration.title;
+ integrationImage.append(img);
+ } else {
+ const icon = document.createElement('astro-dev-overlay-icon');
+ icon.icon = iconForIntegration(integration);
+ integrationImage.append(icon);
+ integrationImage.style.setProperty(
+ '--integration-image-background',
+ colorForIntegration()
+ );
+ }
+
+ integrationContainer.append(integrationImage);
+
+ let integrationTitle = document.createElement('h3');
+ integrationTitle.textContent = integration.title;
+ if (integration.official || integration.categories.includes('official')) {
+ integrationTitle.innerHTML +=
+ ' ';
+ }
+ integrationContainer.append(integrationTitle);
+
+ const integrationDescription = document.createElement('p');
+ integrationDescription.textContent =
+ integration.description.length > 90
+ ? integration.description.slice(0, 90) + '…'
+ : integration.description;
+
+ integrationContainer.append(integrationDescription);
+ integrationComponent.append(integrationContainer);
+
+ fragment.append(integrationComponent);
+ }
+
+ integrationList.append(fragment);
}
},
async beforeTogglingOff(canvas) {
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/settings.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/settings.ts
index e0d3384463ef..9f1a279007e2 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/settings.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/settings.ts
@@ -46,9 +46,11 @@ export default {
function createSettingsWindow() {
const window = createWindowWithTransition(
- 'Settings',
- 'gear',
`
+
+
+
+
General
`,
settingsRows.flatMap((setting) => [
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/utils/highlight.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/utils/highlight.ts
index 3af467ecdc15..31c70b724e44 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/utils/highlight.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/utils/highlight.ts
@@ -15,6 +15,19 @@ export function createHighlight(rect: DOMRect, icon?: Icon) {
return highlight;
}
+export function getHighlightZIndex(el: Element) {
+ let highestZIndex = 0;
+ let current: Element | ParentNode | null = el;
+ while(current instanceof Element) {
+ let zIndex = Number(getComputedStyle(current).zIndex);
+ if(!Number.isNaN(zIndex) && zIndex > highestZIndex) {
+ highestZIndex = zIndex;
+ }
+ current = current.parentNode;
+ }
+ return highestZIndex + 1;
+}
+
export function positionHighlight(highlight: DevOverlayHighlight, rect: DOMRect) {
highlight.style.display = 'block';
// Make an highlight that is 10px bigger than the element on all sides
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/utils/icons.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/utils/icons.ts
new file mode 100644
index 000000000000..ec5a34ad89a1
--- /dev/null
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/utils/icons.ts
@@ -0,0 +1,43 @@
+import type { Integration } from '../astro.js';
+
+function randomFromArray(list: T[]) {
+ return list[Math.floor(Math.random() * list.length)];
+}
+
+const categoryIcons = new Map(
+ Object.entries({
+ frameworks: ['puzzle', 'grid'],
+ adapters: ['puzzle', 'grid', 'compress'],
+ 'css+ui': ['compress', 'grid', 'image', 'resizeImage', 'puzzle'],
+ 'performance+seo': ['approveUser', 'checkCircle', 'compress', 'robot', 'searchFile', 'sitemap'],
+ analytics: ['checkCircle', 'compress', 'searchFile'],
+ accessibility: ['approveUser', 'checkCircle'],
+ other: ['checkCircle', 'grid', 'puzzle', 'sitemap'],
+ })
+);
+
+export function iconForIntegration(integration: Integration) {
+ const icons = integration.categories
+ .filter((category: string) => categoryIcons.has(category))
+ .map((category: string) => categoryIcons.get(category)!)
+ .flat();
+
+ return randomFromArray(icons);
+}
+
+const iconColors = [
+ '#BC52EE',
+ '#6D6AF0',
+ '#52EEBD',
+ '#52B7EE',
+ '#52EE55',
+ '#B7EE52',
+ '#EEBD52',
+ '#EE5552',
+ '#EE52B7',
+ '#858B98',
+];
+
+export function colorForIntegration() {
+ return randomFromArray(iconColors);
+}
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/utils/window.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/utils/window.ts
index 04f09d6e6473..38055d72760d 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/utils/window.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/utils/window.ts
@@ -1,48 +1,34 @@
-import type { Icon } from '../../ui-library/icons.js';
-
-export function createWindowWithTransition(
- title: string,
- icon: Icon,
- windowContent: string,
- addedNodes: Node[] = []
-): DocumentFragment {
- const fragment = document.createDocumentFragment();
-
- const style = document.createElement('style');
- style.textContent = `
- :host {
- opacity: 0;
- transition: opacity 0.15s ease-in-out;
- }
-
- :host([data-active]) {
- opacity: 1;
- }
-
- @media screen and (prefers-reduced-motion: no-preference) {
- :host astro-dev-overlay-window {
- transform: translateY(55px) translate(-50%, -50%);
- transition: transform 0.15s ease-in-out;
- transform-origin: center bottom;
- }
-
- :host([data-active]) astro-dev-overlay-window {
- transform: translateY(0) translate(-50%, -50%);
- }
- }
+export function createWindowWithTransition(windowContent: string, addedNodes: Node[] = []) {
+ const windowElement = document.createElement('astro-dev-overlay-window');
+ windowElement.innerHTML = `
+
+ ${windowContent}
`;
- fragment.append(style);
- const window = document.createElement('astro-dev-overlay-window');
- window.windowTitle = title;
- window.windowIcon = icon;
- window.innerHTML = windowContent;
+ windowElement.append(...addedNodes);
- window.append(...addedNodes);
-
- fragment.append(window);
-
- return fragment;
+ return windowElement;
}
export async function waitForTransition(canvas: ShadowRoot): Promise {
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
index ab927bacc235..aff02fc9c11a 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
@@ -1,6 +1,6 @@
import type { DevOverlayMetadata, DevOverlayPlugin } from '../../../../@types/astro.js';
import type { DevOverlayHighlight } from '../ui-library/highlight.js';
-import { attachTooltipToHighlight, createHighlight, positionHighlight } from './utils/highlight.js';
+import { attachTooltipToHighlight, createHighlight, getHighlightZIndex, positionHighlight } from './utils/highlight.js';
const icon =
'';
@@ -41,6 +41,10 @@ export default {
const tooltip = buildIslandTooltip(island);
attachTooltipToHighlight(highlight, tooltip, islandElement);
+ // Set the z-index to be 1 higher than the greatest z-index in the stack.
+ const zIndex = getHighlightZIndex(islandElement);
+ tooltip.style.zIndex = highlight.style.zIndex = zIndex+'';
+
canvas.append(highlight);
islandsOverlays.push({ highlightElement: highlight, island: islandElement });
});
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/badge.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/badge.ts
new file mode 100644
index 000000000000..06d1e5031536
--- /dev/null
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/badge.ts
@@ -0,0 +1,71 @@
+type BadgeSize = 'small' | 'large';
+type BadgeStyle = 'purple' | 'gray' | 'red' | 'green' | 'yellow';
+
+export class DevOverlayBadge extends HTMLElement {
+ size: BadgeSize = 'small';
+ badgeStyle: BadgeStyle = 'purple';
+
+ shadowRoot: ShadowRoot;
+
+ constructor() {
+ super();
+ this.shadowRoot = this.attachShadow({ mode: 'open' });
+
+ if (this.hasAttribute('size')) this.size = this.getAttribute('size') as BadgeSize;
+
+ if (this.hasAttribute('badge-style'))
+ this.badgeStyle = this.getAttribute('badge-style') as BadgeStyle;
+
+ const classes = [`badge--${this.size}`, `badge--${this.badgeStyle}`];
+ this.shadowRoot.innerHTML = `
+
+
+
+
+
+ `;
+ }
+}
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/button.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/button.ts
new file mode 100644
index 000000000000..7c39fdc1d64e
--- /dev/null
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/button.ts
@@ -0,0 +1,88 @@
+type ButtonSize = 'small' | 'medium' | 'large';
+type ButtonStyle = 'ghost' | 'outline' | 'purple' | 'gray' | 'red';
+
+export class DevOverlayButton extends HTMLElement {
+ size: ButtonSize = 'small';
+ buttonStyle: ButtonStyle = 'purple';
+
+ shadowRoot: ShadowRoot;
+
+ constructor() {
+ super();
+ this.shadowRoot = this.attachShadow({ mode: 'open' });
+
+ if (this.hasAttribute('size')) this.size = this.getAttribute('size') as ButtonSize;
+
+ if (this.hasAttribute('button-style'))
+ this.buttonStyle = this.getAttribute('button-style') as ButtonStyle;
+
+ const classes = [`button--${this.size}`, `button--${this.buttonStyle}`];
+
+ this.shadowRoot.innerHTML = `
+
+
+
+ `;
+ }
+}
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/card.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/card.ts
index 9d7062f8babf..90d4739f165f 100644
--- a/packages/astro/src/runtime/client/dev-overlay/ui-library/card.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/card.ts
@@ -1,8 +1,6 @@
-import { getIconElement, isDefinedIcon, type Icon } from './icons.js';
-
export class DevOverlayCard extends HTMLElement {
- icon?: Icon;
link?: string | undefined | null;
+ clickAction?: () => void | (() => Promise);
shadowRoot: ShadowRoot;
constructor() {
@@ -10,26 +8,30 @@ export class DevOverlayCard extends HTMLElement {
this.shadowRoot = this.attachShadow({ mode: 'open' });
this.link = this.getAttribute('link');
- this.icon = this.hasAttribute('icon') ? (this.getAttribute('icon') as Icon) : undefined;
}
connectedCallback() {
- const element = this.link ? 'a' : 'button';
+ const element = this.link ? 'a' : this.clickAction ? 'button' : 'div';
this.shadowRoot.innerHTML = `
- <${element}${this.link ? ` href="${this.link}" target="_blank"` : ``}>
- ${this.icon ? this.getElementForIcon(this.icon) : ''}
-
+ <${element}${this.link ? ` href="${this.link}" target="_blank"` : ``} id="astro-overlay-card">
+
`;
- }
- getElementForIcon(icon: Icon) {
- let iconElement;
- if (isDefinedIcon(icon)) {
- iconElement = getIconElement(icon);
- } else {
- iconElement = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
- iconElement.setAttribute('viewBox', '0 0 16 16');
- iconElement.innerHTML = icon;
+ if (this.clickAction) {
+ this.shadowRoot
+ .getElementById('astro-overlay-card')
+ ?.addEventListener('click', this.clickAction);
}
-
- iconElement?.style.setProperty('height', '24px');
- iconElement?.style.setProperty('width', '24px');
-
- return iconElement?.outerHTML ?? '';
}
}
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/highlight.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/highlight.ts
index 7d91535e0a40..6a1b914a8b01 100644
--- a/packages/astro/src/runtime/client/dev-overlay/ui-library/highlight.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/highlight.ts
@@ -26,6 +26,7 @@ export class DevOverlayHighlight extends HTMLElement {
.icon {
width: 24px;
height: 24px;
+ color: white;
background: linear-gradient(0deg, #B33E66, #B33E66), linear-gradient(0deg, #351722, #351722);
border: 1px solid rgba(53, 23, 34, 1);
border-radius: 9999px;
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/icon.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/icon.ts
new file mode 100644
index 000000000000..34cf3150db51
--- /dev/null
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/icon.ts
@@ -0,0 +1,53 @@
+import { getIconElement, isDefinedIcon, type Icon } from './icons.js';
+
+export class DevOverlayIcon extends HTMLElement {
+ _icon: Icon | undefined = undefined;
+ shadowRoot: ShadowRoot;
+
+ get icon() {
+ return this._icon;
+ }
+ set icon(name: Icon | undefined) {
+ this._icon = name;
+ this.buildTemplate();
+ }
+
+ constructor() {
+ super();
+
+ this.shadowRoot = this.attachShadow({ mode: 'open' });
+
+ if (this.hasAttribute('icon')) {
+ this.icon = this.getAttribute('icon') as Icon;
+ } else {
+ this.buildTemplate();
+ }
+ }
+
+ getIconHTML(icon: Icon | undefined) {
+ if (icon && isDefinedIcon(icon)) {
+ return getIconElement(icon)?.outerHTML ?? '';
+ }
+
+ // If the icon that was passed isn't one of the predefined one, assume that they're passing it in as a slot
+ return '';
+ }
+
+ buildTemplate() {
+ this.shadowRoot.innerHTML = `
+ \n${this.getIconHTML(
+ this._icon
+ )}`;
+ }
+}
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/icons.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/icons.ts
index d9445e44acf8..d712a3d54da1 100644
--- a/packages/astro/src/runtime/client/dev-overlay/ui-library/icons.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/icons.ts
@@ -22,15 +22,41 @@ export function getIconElement(
const icons = {
'astro:logo': ``,
- warning: ``,
+ warning: ``,
'arrow-down':
- '',
- bug: '',
- 'file-search':
- '',
+ '',
+ bug: '',
+ '': '',
'check-circle':
- '',
- gear: '',
+ '',
+ gear: '',
+ lightbulb:
+ '',
+ 'file-search':
+ '',
+ star: '',
+ checkmark:
+ '',
'dots-three':
'',
+ copy: '',
+ compress:
+ '',
+ grid: '',
+ puzzle:
+ '',
+ approveUser:
+ '',
+ checkCircle:
+ '',
+ resizeImage:
+ '',
+ searchFile:
+ '',
+ image:
+ '',
+ robot:
+ '',
+ sitemap:
+ '',
} as const;
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/index.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/index.ts
new file mode 100644
index 000000000000..ba60ecf1e67e
--- /dev/null
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/index.ts
@@ -0,0 +1,8 @@
+export { DevOverlayBadge } from './badge.js';
+export { DevOverlayButton } from './button.js';
+export { DevOverlayCard } from './card.js';
+export { DevOverlayHighlight } from './highlight.js';
+export { DevOverlayTooltip } from './tooltip.js';
+export { DevOverlayWindow } from './window.js';
+export { DevOverlayToggle } from './toggle.js';
+export { DevOverlayIcon } from './icon.js';
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/toggle.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/toggle.ts
index 63dcba65e304..1fb0b686a9d1 100644
--- a/packages/astro/src/runtime/client/dev-overlay/ui-library/toggle.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/toggle.ts
@@ -30,6 +30,14 @@ export class DevOverlayToggle extends HTMLElement {
position: relative;
}
+ @media (forced-colors: active) {
+ input::after {
+ border: 1px solid black;
+ top: 0px;
+ left: 0px;
+ }
+ }
+
input:checked {
border: 1px solid rgba(213, 249, 196, 1);
background-color: rgba(61, 125, 31, 1);
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/window.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/window.ts
index 18b515429ad8..00a4ace86989 100644
--- a/packages/astro/src/runtime/client/dev-overlay/ui-library/window.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/window.ts
@@ -1,18 +1,9 @@
-import { getIconElement, isDefinedIcon, type Icon } from './icons.js';
-
export class DevOverlayWindow extends HTMLElement {
- windowTitle?: string | undefined | null;
- windowIcon?: Icon | undefined | null;
shadowRoot: ShadowRoot;
constructor() {
super();
this.shadowRoot = this.attachShadow({ mode: 'open' });
-
- this.windowTitle = this.getAttribute('window-title');
- this.windowIcon = this.hasAttribute('window-icon')
- ? (this.getAttribute('window-icon') as Icon)
- : undefined;
}
async connectedCallback() {
@@ -32,24 +23,22 @@ export class DevOverlayWindow extends HTMLElement {
color: rgba(204, 206, 216, 1);
position: fixed;
z-index: 999999999;
- top: 55%;
+ /* -7.5em is a magic number that seems to keep it anchored with the dev bar */
+ bottom: calc(7.5% + -150px);
left: 50%;
transform: translate(-50%, -50%);
box-shadow: 0px 0px 0px 0px rgba(19, 21, 26, 0.30), 0px 1px 2px 0px rgba(19, 21, 26, 0.29), 0px 4px 4px 0px rgba(19, 21, 26, 0.26), 0px 10px 6px 0px rgba(19, 21, 26, 0.15), 0px 17px 7px 0px rgba(19, 21, 26, 0.04), 0px 26px 7px 0px rgba(19, 21, 26, 0.01);
}
- ::slotted(h1), ::slotted(h2), ::slotted(h3), ::slotted(h4), ::slotted(h5) {
- font-weight: 600;
- color: #fff;
+ @media (forced-colors: active) {
+ :host {
+ background: white;
+ }
}
- #window-title {
- display: flex;
- align-items: center;
+ ::slotted(h1), ::slotted(h2), ::slotted(h3), ::slotted(h4), ::slotted(h5) {
font-weight: 600;
color: #fff;
- margin: 0;
- font-size: 22px;
}
::slotted(h1) {
@@ -72,37 +61,13 @@ export class DevOverlayWindow extends HTMLElement {
font-size: 14px;
}
- #window-title svg {
- margin-right: 8px;
- height: 1em;
- }
-
hr, ::slotted(hr) {
border: 1px solid rgba(27, 30, 36, 1);
margin: 1em 0;
}
- ${this.windowIcon ? this.getElementForIcon(this.windowIcon) : ''}${
- this.windowTitle ?? ''
- }
-
`;
}
-
- getElementForIcon(icon: Icon) {
- if (isDefinedIcon(icon)) {
- const iconElement = getIconElement(icon);
- iconElement?.style.setProperty('height', '1em');
-
- return iconElement?.outerHTML;
- } else {
- const iconElement = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
- iconElement.setAttribute('viewBox', '0 0 16 16');
- iconElement.innerHTML = icon;
-
- return iconElement.outerHTML;
- }
- }
}
diff --git a/packages/astro/src/runtime/server/endpoint.ts b/packages/astro/src/runtime/server/endpoint.ts
index df415ca67a47..f8fc1c071c78 100644
--- a/packages/astro/src/runtime/server/endpoint.ts
+++ b/packages/astro/src/runtime/server/endpoint.ts
@@ -2,35 +2,11 @@ import { bold } from 'kleur/colors';
import type { APIContext, EndpointHandler, Params } from '../../@types/astro.js';
import type { Logger } from '../../core/logger/core.js';
-function getHandlerFromModule(mod: EndpointHandler, method: string, logger: Logger) {
- const lowerCaseMethod = method.toLowerCase();
-
- // TODO: remove in Astro 4.0
- if (mod[lowerCaseMethod]) {
- logger.warn(
- null,
- `Lower case endpoint names are deprecated and will not be supported in Astro 4.0. Rename the endpoint ${lowerCaseMethod} to ${method}.`
- );
- }
+function getHandlerFromModule(mod: EndpointHandler, method: string) {
// If there was an exact match on `method`, return that function.
if (mod[method]) {
return mod[method];
}
-
- // TODO: remove in Astro 4.0
- if (mod[lowerCaseMethod]) {
- return mod[lowerCaseMethod];
- }
- // TODO: remove in Astro 4.0
- // Handle `del` instead of `delete`, since `delete` is a reserved word in JS.
- if (method === 'delete' && mod['del']) {
- return mod['del'];
- }
- // TODO: remove in Astro 4.0
- // If a single `all` handler was used, return that function.
- if (mod['all']) {
- return mod['all'];
- }
if (mod['ALL']) {
return mod['ALL'];
}
@@ -48,9 +24,8 @@ export async function renderEndpoint(
const { request, url } = context;
const chosenMethod = request.method?.toUpperCase();
- const handler = getHandlerFromModule(mod, chosenMethod, logger);
- // TODO: remove the 'get' check in Astro 4.0
- if (!ssr && ssr === false && chosenMethod && chosenMethod !== 'GET' && chosenMethod !== 'get') {
+ const handler = getHandlerFromModule(mod, chosenMethod);
+ if (!ssr && ssr === false && chosenMethod && chosenMethod !== 'GET') {
logger.warn(
null,
`${url.pathname} ${bold(
diff --git a/packages/astro/src/runtime/server/render/common.ts b/packages/astro/src/runtime/server/render/common.ts
index e5a5d5e860e0..4087ef1a7ec5 100644
--- a/packages/astro/src/runtime/server/render/common.ts
+++ b/packages/astro/src/runtime/server/render/common.ts
@@ -67,8 +67,8 @@ function stringifyChunk(
let prescriptType: PrescriptType = needsHydrationScript
? 'both'
: needsDirectiveScript
- ? 'directive'
- : null;
+ ? 'directive'
+ : null;
if (prescriptType) {
let prescripts = getPrescripts(result, prescriptType, hydration.directive);
return markHTMLString(prescripts);
diff --git a/packages/astro/src/runtime/server/transition.ts b/packages/astro/src/runtime/server/transition.ts
index 17eece1d9819..0fed017dfdc9 100644
--- a/packages/astro/src/runtime/server/transition.ts
+++ b/packages/astro/src/runtime/server/transition.ts
@@ -1,7 +1,9 @@
import type {
SSRResult,
TransitionAnimation,
+ TransitionAnimationPair,
TransitionAnimationValue,
+ TransitionDirectionalAnimations,
} from '../../@types/astro.js';
import { fade, slide } from '../../transitions/index.js';
import { markHTMLString } from './escape.js';
@@ -34,6 +36,19 @@ const getAnimations = (name: TransitionAnimationValue) => {
if (typeof name === 'object') return name;
};
+const addPairs = (
+ animations: TransitionDirectionalAnimations | Record,
+ stylesheet: ViewTransitionStyleSheet
+) => {
+ for (const [direction, images] of Object.entries(animations) as Entries) {
+ for (const [image, rules] of Object.entries(images) as Entries<
+ (typeof animations)[typeof direction]
+ >) {
+ stylesheet.addAnimationPair(direction, image, rules);
+ }
+ }
+};
+
export function renderTransition(
result: SSRResult,
hash: string,
@@ -48,13 +63,7 @@ export function renderTransition(
const animations = getAnimations(animationName);
if (animations) {
- for (const [direction, images] of Object.entries(animations) as Entries) {
- for (const [image, rules] of Object.entries(images) as Entries<
- (typeof animations)[typeof direction]
- >) {
- sheet.addAnimationPair(direction, image, rules);
- }
- }
+ addPairs(animations, sheet);
} else if (animationName === 'none') {
sheet.addFallback('old', 'animation: none; mix-blend-mode: normal;');
sheet.addModern('old', 'animation: none; opacity: 0; mix-blend-mode: normal;');
@@ -65,6 +74,19 @@ export function renderTransition(
return scope;
}
+export function createAnimationScope(
+ transitionName: string,
+ animations: Record
+) {
+ const hash = Math.random().toString(36).slice(2, 8);
+ const scope = `astro-${hash}`;
+ const sheet = new ViewTransitionStyleSheet(scope, transitionName);
+
+ addPairs(animations, sheet);
+
+ return { scope, styles: sheet.toString().replaceAll('"', '') };
+}
+
class ViewTransitionStyleSheet {
private modern: string[] = [];
private fallback: string[] = [];
@@ -113,13 +135,18 @@ class ViewTransitionStyleSheet {
}
addAnimationPair(
- direction: 'forwards' | 'backwards',
+ direction: 'forwards' | 'backwards' | string,
image: 'old' | 'new',
rules: TransitionAnimation | TransitionAnimation[]
) {
const { scope, name } = this;
const animation = stringifyAnimation(rules);
- const prefix = direction === 'backwards' ? `[data-astro-transition=back]` : '';
+ const prefix =
+ direction === 'backwards'
+ ? `[data-astro-transition=back]`
+ : direction === 'forwards'
+ ? ''
+ : `[data-astro-transition=${direction}]`;
this.addRule('modern', `${prefix}::view-transition-${image}(${name}) { ${animation} }`);
this.addRule(
'fallback',
diff --git a/packages/astro/src/transitions/events.ts b/packages/astro/src/transitions/events.ts
new file mode 100644
index 000000000000..b3921b31f0c9
--- /dev/null
+++ b/packages/astro/src/transitions/events.ts
@@ -0,0 +1,184 @@
+import { updateScrollPosition } from './router.js';
+import type { Direction, NavigationTypeString } from './types.js';
+
+export const TRANSITION_BEFORE_PREPARATION = 'astro:before-preparation';
+export const TRANSITION_AFTER_PREPARATION = 'astro:after-preparation';
+export const TRANSITION_BEFORE_SWAP = 'astro:before-swap';
+export const TRANSITION_AFTER_SWAP = 'astro:after-swap';
+export const TRANSITION_PAGE_LOAD = 'astro:page-load';
+
+type Events =
+ | typeof TRANSITION_AFTER_PREPARATION
+ | typeof TRANSITION_AFTER_SWAP
+ | typeof TRANSITION_PAGE_LOAD;
+export const triggerEvent = (name: Events) => document.dispatchEvent(new Event(name));
+export const onPageLoad = () => triggerEvent(TRANSITION_PAGE_LOAD);
+
+/*
+ * Common stuff
+ */
+class BeforeEvent extends Event {
+ readonly from: URL;
+ to: URL;
+ direction: Direction | string;
+ readonly navigationType: NavigationTypeString;
+ readonly sourceElement: Element | undefined;
+ readonly info: any;
+ newDocument: Document;
+
+ constructor(
+ type: string,
+ eventInitDict: EventInit | undefined,
+ from: URL,
+ to: URL,
+ direction: Direction | string,
+ navigationType: NavigationTypeString,
+ sourceElement: Element | undefined,
+ info: any,
+ newDocument: Document
+ ) {
+ super(type, eventInitDict);
+ this.from = from;
+ this.to = to;
+ this.direction = direction;
+ this.navigationType = navigationType;
+ this.sourceElement = sourceElement;
+ this.info = info;
+ this.newDocument = newDocument;
+
+ Object.defineProperties(this, {
+ from: { enumerable: true },
+ to: { enumerable: true, writable: true },
+ direction: { enumerable: true, writable: true },
+ navigationType: { enumerable: true },
+ sourceElement: { enumerable: true },
+ info: { enumerable: true },
+ newDocument: { enumerable: true, writable: true },
+ });
+ }
+}
+
+/*
+ * TransitionBeforePreparationEvent
+
+ */
+export const isTransitionBeforePreparationEvent = (
+ value: any
+): value is TransitionBeforePreparationEvent => value.type === TRANSITION_BEFORE_PREPARATION;
+export class TransitionBeforePreparationEvent extends BeforeEvent {
+ formData: FormData | undefined;
+ loader: () => Promise;
+ constructor(
+ from: URL,
+ to: URL,
+ direction: Direction | string,
+ navigationType: NavigationTypeString,
+ sourceElement: Element | undefined,
+ info: any,
+ newDocument: Document,
+ formData: FormData | undefined,
+ loader: (event: TransitionBeforePreparationEvent) => Promise
+ ) {
+ super(
+ TRANSITION_BEFORE_PREPARATION,
+ { cancelable: true },
+ from,
+ to,
+ direction,
+ navigationType,
+ sourceElement,
+ info,
+ newDocument
+ );
+ this.formData = formData;
+ this.loader = loader.bind(this, this);
+ Object.defineProperties(this, {
+ formData: { enumerable: true },
+ loader: { enumerable: true, writable: true },
+ });
+ }
+}
+
+/*
+ * TransitionBeforeSwapEvent
+ */
+
+export const isTransitionBeforeSwapEvent = (value: any): value is TransitionBeforeSwapEvent =>
+ value.type === TRANSITION_BEFORE_SWAP;
+export class TransitionBeforeSwapEvent extends BeforeEvent {
+ readonly direction: Direction | string;
+ readonly viewTransition: ViewTransition;
+ swap: () => void;
+
+ constructor(
+ afterPreparation: BeforeEvent,
+ viewTransition: ViewTransition,
+ swap: (event: TransitionBeforeSwapEvent) => void
+ ) {
+ super(
+ TRANSITION_BEFORE_SWAP,
+ undefined,
+ afterPreparation.from,
+ afterPreparation.to,
+ afterPreparation.direction,
+ afterPreparation.navigationType,
+ afterPreparation.sourceElement,
+ afterPreparation.info,
+ afterPreparation.newDocument
+ );
+ this.direction = afterPreparation.direction;
+ this.viewTransition = viewTransition;
+ this.swap = swap.bind(this, this);
+
+ Object.defineProperties(this, {
+ direction: { enumerable: true },
+ viewTransition: { enumerable: true },
+ swap: { enumerable: true, writable: true },
+ });
+ }
+}
+
+export async function doPreparation(
+ from: URL,
+ to: URL,
+ direction: Direction | string,
+ navigationType: NavigationTypeString,
+ sourceElement: Element | undefined,
+ info: any,
+ formData: FormData | undefined,
+ defaultLoader: (event: TransitionBeforePreparationEvent) => Promise
+) {
+ const event = new TransitionBeforePreparationEvent(
+ from,
+ to,
+ direction,
+ navigationType,
+ sourceElement,
+ info,
+ window.document,
+ formData,
+ defaultLoader
+ );
+ if (document.dispatchEvent(event)) {
+ await event.loader();
+ if (!event.defaultPrevented) {
+ triggerEvent(TRANSITION_AFTER_PREPARATION);
+ if (event.navigationType !== 'traverse') {
+ // save the current scroll position before we change the DOM and transition to the new page
+ updateScrollPosition({ scrollX, scrollY });
+ }
+ }
+ }
+ return event;
+}
+
+export async function doSwap(
+ afterPreparation: BeforeEvent,
+ viewTransition: ViewTransition,
+ defaultSwap: (event: TransitionBeforeSwapEvent) => void
+) {
+ const event = new TransitionBeforeSwapEvent(afterPreparation, viewTransition, defaultSwap);
+ document.dispatchEvent(event);
+ event.swap();
+ return event;
+}
diff --git a/packages/astro/src/transitions/index.ts b/packages/astro/src/transitions/index.ts
index 0a58d2d4b48a..d87052f2daf2 100644
--- a/packages/astro/src/transitions/index.ts
+++ b/packages/astro/src/transitions/index.ts
@@ -1,4 +1,5 @@
import type { TransitionAnimationPair, TransitionDirectionalAnimations } from '../@types/astro.js';
+export { createAnimationScope } from '../runtime/server/transition.js';
const EASE_IN_OUT_QUART = 'cubic-bezier(0.76, 0, 0.24, 1)';
diff --git a/packages/astro/src/transitions/router.ts b/packages/astro/src/transitions/router.ts
index c4da38c2c8be..92d8bb4a219f 100644
--- a/packages/astro/src/transitions/router.ts
+++ b/packages/astro/src/transitions/router.ts
@@ -1,23 +1,27 @@
-export type Fallback = 'none' | 'animate' | 'swap';
-export type Direction = 'forward' | 'back';
-export type Options = {
- history?: 'auto' | 'push' | 'replace';
- formData?: FormData;
-};
+import {
+ TRANSITION_AFTER_SWAP,
+ TransitionBeforeSwapEvent,
+ doPreparation,
+ doSwap,
+ type TransitionBeforePreparationEvent,
+} from './events.js';
+import type { Direction, Fallback, Options } from './types.js';
type State = {
index: number;
scrollX: number;
scrollY: number;
- intraPage?: boolean;
};
type Events = 'astro:page-load' | 'astro:after-swap';
// only update history entries that are managed by us
// leave other entries alone and do not accidently add state.
-const updateScrollPosition = (positions: { scrollX: number; scrollY: number }) =>
- history.state && history.replaceState({ ...history.state, ...positions }, '');
-
+export const updateScrollPosition = (positions: { scrollX: number; scrollY: number }) => {
+ if (history.state) {
+ history.scrollRestoration = 'manual';
+ history.replaceState({ ...history.state, ...positions }, '');
+ }
+};
const inBrowser = import.meta.env.SSR === false;
export const supportsViewTransitions = inBrowser && !!document.startViewTransition;
@@ -25,8 +29,21 @@ export const supportsViewTransitions = inBrowser && !!document.startViewTransiti
export const transitionEnabledOnThisPage = () =>
inBrowser && !!document.querySelector('[name="astro-view-transitions-enabled"]');
-const samePage = (otherLocation: URL) =>
- location.pathname === otherLocation.pathname && location.search === otherLocation.search;
+const samePage = (thisLocation: URL, otherLocation: URL) =>
+ thisLocation.origin === otherLocation.origin &&
+ thisLocation.pathname === otherLocation.pathname &&
+ thisLocation.search === otherLocation.search;
+
+// When we traverse the history, the window.location is already set to the new location.
+// This variable tells us where we came from
+let originalLocation: URL;
+// The result of startViewTransition (browser or simulation)
+let viewTransition: ViewTransition | undefined;
+// skip transition flag for fallback simulation
+let skipTransition = false;
+// The resolve function of the finished promise for fallback simulation
+let viewTransitionFinished: () => void;
+
const triggerEvent = (name: Events) => document.dispatchEvent(new Event(name));
const onPageLoad = () => triggerEvent('astro:page-load');
const announce = () => {
@@ -48,6 +65,9 @@ const announce = () => {
};
const PERSIST_ATTR = 'data-astro-transition-persist';
+const DIRECTION_ATTR = 'data-astro-transition';
+const OLD_NEW_ATTR = 'data-astro-transition-fallback';
+
const VITE_ID = 'data-vite-dev-id';
let parser: DOMParser;
@@ -66,7 +86,8 @@ if (inBrowser) {
} else if (transitionEnabledOnThisPage()) {
// This page is loaded from the browser addressbar or via a link from extern,
// it needs a state in the history
- history.replaceState({ index: currentHistoryIndex, scrollX, scrollY, intraPage: false }, '');
+ history.replaceState({ index: currentHistoryIndex, scrollX, scrollY }, '');
+ history.scrollRestoration = 'manual';
}
}
@@ -147,50 +168,62 @@ function runScripts() {
return wait;
}
-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';
-}
-
// Add a new entry to the browser history. This also sets the new page in the browser addressbar.
// Sets the scroll position according to the hash fragment of the new location.
-const moveToLocation = (toLocation: URL, replace: boolean, intraPage: boolean) => {
- const fresh = !samePage(toLocation);
+const moveToLocation = (to: URL, from: URL, options: Options, historyState?: State) => {
+ const intraPage = samePage(from, to);
+
let scrolledToTop = false;
- if (toLocation.href !== location.href) {
- if (replace) {
- history.replaceState({ ...history.state }, '', toLocation.href);
+ if (to.href !== location.href && !historyState) {
+ if (options.history === 'replace') {
+ const current = history.state;
+ history.replaceState(
+ {
+ ...options.state,
+ index: current.index,
+ scrollX: current.scrollX,
+ scrollY: current.scrollY,
+ },
+ '',
+ to.href
+ );
} else {
- history.replaceState({ ...history.state, intraPage }, '');
history.pushState(
- { index: ++currentHistoryIndex, scrollX: 0, scrollY: 0 },
+ { ...options.state, index: ++currentHistoryIndex, scrollX: 0, scrollY: 0 },
'',
- toLocation.href
+ to.href
);
}
- // now we are on the new page for non-history navigations!
- // (with history navigation page change happens before popstate is fired)
- // freshly loaded pages start from the top
- if (fresh) {
- scrollTo({ left: 0, top: 0, behavior: 'instant' });
- scrolledToTop = true;
- }
}
- if (toLocation.hash) {
- // because we are already on the target page ...
- // ... what comes next is a intra-page navigation
- // that won't reload the page but instead scroll to the fragment
- location.href = toLocation.href;
+ // now we are on the new page for non-history navigations!
+ // (with history navigation page change happens before popstate is fired)
+ originalLocation = to;
+
+ // freshly loaded pages start from the top
+ if (!intraPage) {
+ scrollTo({ left: 0, top: 0, behavior: 'instant' });
+ scrolledToTop = true;
+ }
+
+ if (historyState) {
+ scrollTo(historyState.scrollX, historyState.scrollY);
} else {
- if (!scrolledToTop) {
- scrollTo({ left: 0, top: 0, behavior: 'instant' });
+ if (to.hash) {
+ // because we are already on the target page ...
+ // ... what comes next is a intra-page navigation
+ // that won't reload the page but instead scroll to the fragment
+ history.scrollRestoration = 'auto';
+ location.href = to.href;
+ } else {
+ if (!scrolledToTop) {
+ scrollTo({ left: 0, top: 0, behavior: 'instant' });
+ }
}
+ history.scrollRestoration = 'manual';
}
};
-function stylePreloadLinks(newDocument: Document) {
+function preloadStyleLinks(newDocument: Document) {
const links: Promise[] = [];
for (const el of newDocument.querySelectorAll('head link[rel=stylesheet]')) {
// Do not preload links that are already on the page.
@@ -221,24 +254,23 @@ function stylePreloadLinks(newDocument: Document) {
// if popState is given, this holds the scroll position for history navigation
// if fallback === "animate" then simulate view transitions
async function updateDOM(
- newDocument: Document,
- toLocation: URL,
+ preparationEvent: TransitionBeforePreparationEvent,
options: Options,
- popState?: State,
+ historyState?: State,
fallback?: Fallback
) {
// Check for a head element that should persist and returns it,
// either because it has the data attribute or is a link el.
// Returns null if the element is not part of the new head, undefined if it should be left alone.
- const persistedHeadElement = (el: HTMLElement): Element | null => {
+ const persistedHeadElement = (el: HTMLElement, newDoc: Document): Element | null => {
const id = el.getAttribute(PERSIST_ATTR);
- const newEl = id && newDocument.head.querySelector(`[${PERSIST_ATTR}="${id}"]`);
+ const newEl = id && newDoc.head.querySelector(`[${PERSIST_ATTR}="${id}"]`);
if (newEl) {
return newEl;
}
if (el.matches('link[rel=stylesheet]')) {
const href = el.getAttribute('href');
- return newDocument.head.querySelector(`link[rel=stylesheet][href="${href}"]`);
+ return newDoc.head.querySelector(`link[rel=stylesheet][href="${href}"]`);
}
return null;
};
@@ -282,22 +314,22 @@ async function updateDOM(
}
};
- const swap = () => {
+ const defaultSwap = (beforeSwapEvent: TransitionBeforeSwapEvent) => {
// swap attributes of the html element
// - delete all attributes from the current document
// - insert all attributes from doc
// - reinsert all original attributes that are named 'data-astro-*'
const html = document.documentElement;
- const astro = [...html.attributes].filter(
+ const astroAttributes = [...html.attributes].filter(
({ name }) => (html.removeAttribute(name), name.startsWith('data-astro-'))
);
- [...newDocument.documentElement.attributes, ...astro].forEach(({ name, value }) =>
- html.setAttribute(name, value)
+ [...beforeSwapEvent.newDocument.documentElement.attributes, ...astroAttributes].forEach(
+ ({ name, value }) => html.setAttribute(name, value)
);
// Replace scripts in both the head and body.
for (const s1 of document.scripts) {
- for (const s2 of newDocument.scripts) {
+ for (const s2 of beforeSwapEvent.newDocument.scripts) {
if (
// Inline
(!s1.src && s1.textContent === s2.textContent) ||
@@ -313,7 +345,7 @@ async function updateDOM(
// Swap head
for (const el of Array.from(document.head.children)) {
- const newEl = persistedHeadElement(el as HTMLElement);
+ const newEl = persistedHeadElement(el as HTMLElement, beforeSwapEvent.newDocument);
// If the element exists in the document already, remove it
// from the new document and leave the current node alone
if (newEl) {
@@ -325,7 +357,7 @@ async function updateDOM(
}
// Everything left in the new head is new, append it all.
- document.head.append(...newDocument.head.children);
+ document.head.append(...beforeSwapEvent.newDocument.head.children);
// Persist elements in the existing body
const oldBody = document.body;
@@ -333,7 +365,7 @@ async function updateDOM(
const savedFocus = saveFocus();
// this will reset scroll Position
- document.body.replaceWith(newDocument.body);
+ document.body.replaceWith(beforeSwapEvent.newDocument.body);
for (const el of oldBody.querySelectorAll(`[${PERSIST_ATTR}]`)) {
const id = el.getAttribute(PERSIST_ATTR);
@@ -345,103 +377,187 @@ async function updateDOM(
}
}
restoreFocus(savedFocus);
-
- if (popState) {
- scrollTo(popState.scrollX, popState.scrollY); // usings 'auto' scrollBehavior
- } else {
- moveToLocation(toLocation, options.history === 'replace', false);
- }
-
- triggerEvent('astro:after-swap');
};
- const links = stylePreloadLinks(newDocument);
- links.length && (await Promise.all(links));
-
- if (fallback === 'animate') {
+ async function animate(phase: string) {
+ 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';
+ }
// 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));
- await finished;
- swap();
- document.documentElement.dataset.astroTransitionFallback = 'new';
+ document.documentElement.setAttribute(OLD_NEW_ATTR, phase);
+ const nextAnimations = document.getAnimations();
+ const newAnimations = nextAnimations.filter(
+ (a) => !currentAnimations.includes(a) && !isInfinite(a)
+ );
+ return Promise.all(newAnimations.map((a) => a.finished));
+ }
+
+ if (!skipTransition) {
+ document.documentElement.setAttribute(DIRECTION_ATTR, preparationEvent.direction);
+
+ if (fallback === 'animate') {
+ await animate('old');
+ }
} else {
- swap();
+ // that's what Chrome does
+ throw new DOMException('Transition was skipped');
+ }
+
+ const swapEvent = await doSwap(preparationEvent, viewTransition!, defaultSwap);
+ moveToLocation(swapEvent.to, swapEvent.from, options, historyState);
+ triggerEvent(TRANSITION_AFTER_SWAP);
+
+ if (fallback === 'animate' && !skipTransition) {
+ animate('new').then(() => viewTransitionFinished());
}
}
async function transition(
direction: Direction,
- toLocation: URL,
+ from: URL,
+ to: URL,
options: Options,
- popState?: State
+ historyState?: State
) {
- let finished: Promise;
- const href = toLocation.href;
- const init: RequestInit = {};
- if (options.formData) {
- init.method = 'POST';
- init.body = options.formData;
+ const navigationType = historyState
+ ? 'traverse'
+ : options.history === 'replace'
+ ? 'replace'
+ : 'push';
+
+ if (samePage(from, to) && !options.formData /* not yet: && to.hash*/) {
+ if (navigationType !== 'traverse') {
+ updateScrollPosition({ scrollX, scrollY });
+ }
+ moveToLocation(to, from, options, historyState);
+ return;
}
- const response = await fetchHTML(href, init);
- // If there is a problem fetching the new page, just do an MPA navigation to it.
- if (response === null) {
- location.href = href;
+
+ const prepEvent = await doPreparation(
+ from,
+ to,
+ direction,
+ navigationType,
+ options.sourceElement,
+ options.info,
+ options.formData,
+ defaultLoader
+ );
+ if (prepEvent.defaultPrevented) {
+ location.href = to.href;
return;
}
- // if there was a redirection, show the final URL in the browser's address bar
- if (response.redirected) {
- toLocation = new URL(response.redirected);
+
+ function pageMustReload(preparationEvent: TransitionBeforePreparationEvent) {
+ return (
+ preparationEvent.to.hash === '' ||
+ !samePage(preparationEvent.from, preparationEvent.to) ||
+ preparationEvent.sourceElement instanceof HTMLFormElement
+ );
}
- parser ??= new DOMParser();
+ async function defaultLoader(preparationEvent: TransitionBeforePreparationEvent) {
+ if (pageMustReload(preparationEvent)) {
+ const href = preparationEvent.to.href;
+ const init: RequestInit = {};
+ if (preparationEvent.formData) {
+ init.method = 'POST';
+ init.body = preparationEvent.formData;
+ }
+ const response = await fetchHTML(href, init);
+ // If there is a problem fetching the new page, just do an MPA navigation to it.
+ if (response === null) {
+ preparationEvent.preventDefault();
+ return;
+ }
+ // if there was a redirection, show the final URL in the browser's address bar
+ if (response.redirected) {
+ preparationEvent.to = new URL(response.redirected);
+ }
+
+ parser ??= new DOMParser();
- const newDocument = parser.parseFromString(response.html, response.mediaType);
- // The next line might look like a hack,
- // but it is actually necessary as noscript elements
- // and their contents are returned as markup by the parser,
- // see https://developer.mozilla.org/en-US/docs/Web/API/DOMParser/parseFromString
- newDocument.querySelectorAll('noscript').forEach((el) => el.remove());
+ preparationEvent.newDocument = parser.parseFromString(response.html, response.mediaType);
+ // The next line might look like a hack,
+ // but it is actually necessary as noscript elements
+ // and their contents are returned as markup by the parser,
+ // see https://developer.mozilla.org/en-US/docs/Web/API/DOMParser/parseFromString
+ preparationEvent.newDocument.querySelectorAll('noscript').forEach((el) => el.remove());
- // If ViewTransitions is not enabled on the incoming page, do a full page load to it.
- // Unless this was a form submission, in which case we do not want to trigger another mutation.
- if (!newDocument.querySelector('[name="astro-view-transitions-enabled"]') && !options.formData) {
- location.href = href;
- return;
- }
+ // If ViewTransitions is not enabled on the incoming page, do a full page load to it.
+ // Unless this was a form submission, in which case we do not want to trigger another mutation.
+ if (
+ !preparationEvent.newDocument.querySelector('[name="astro-view-transitions-enabled"]') &&
+ !preparationEvent.formData
+ ) {
+ preparationEvent.preventDefault();
+ return;
+ }
- if (import.meta.env.DEV) await prepareForClientOnlyComponents(newDocument, toLocation);
+ const links = preloadStyleLinks(preparationEvent.newDocument);
+ links.length && (await Promise.all(links));
- if (!popState) {
- // save the current scroll position before we change the DOM and transition to the new page
- history.replaceState({ ...history.state, scrollX, scrollY }, '');
+ if (import.meta.env.DEV)
+ await prepareForClientOnlyComponents(preparationEvent.newDocument, preparationEvent.to);
+ } else {
+ preparationEvent.newDocument = document;
+ return;
+ }
}
- document.documentElement.dataset.astroTransition = direction;
+
+ skipTransition = false;
if (supportsViewTransitions) {
- finished = document.startViewTransition(() =>
- updateDOM(newDocument, toLocation, options, popState)
- ).finished;
+ viewTransition = document.startViewTransition(
+ async () => await updateDOM(prepEvent, options, historyState)
+ );
} else {
- finished = updateDOM(newDocument, toLocation, options, popState, getFallback());
+ const updateDone = (async () => {
+ // immediatelly paused to setup the ViewTransition object for Fallback mode
+ await new Promise((r) => setTimeout(r));
+ await updateDOM(prepEvent, options, historyState, getFallback());
+ })();
+
+ // When the updateDone promise is settled,
+ // we have run and awaited all swap functions and the after-swap event
+ // This qualifies for "updateCallbackDone".
+ //
+ // For the build in ViewTransition, "ready" settles shortly after "updateCallbackDone",
+ // i.e. after all pseudo elements are created and the animation is about to start.
+ // In simulation mode the "old" animation starts before swap,
+ // the "new" animation starts after swap. That is not really comparable.
+ // Thus we go with "very, very shortly after updateCallbackDone" and make both equal.
+ //
+ // "finished" resolves after all animations are done.
+
+ viewTransition = {
+ updateCallbackDone: updateDone, // this is about correct
+ ready: updateDone, // good enough
+ finished: new Promise((r) => (viewTransitionFinished = r)), // see end of updateDOM
+ skipTransition: () => {
+ skipTransition = true;
+ },
+ };
}
- try {
- await finished;
- } finally {
- // skip this for the moment as it tends to stop fallback animations
- // document.documentElement.removeAttribute('data-astro-transition');
+
+ viewTransition.ready.then(async () => {
await runScripts();
onPageLoad();
announce();
- }
+ });
+ viewTransition.finished.then(() => {
+ document.documentElement.removeAttribute(DIRECTION_ATTR);
+ document.documentElement.removeAttribute(OLD_NEW_ATTR);
+ });
+ await viewTransition.ready;
}
let navigateOnServerWarned = false;
-export function navigate(href: string, options?: Options) {
+export async function navigate(href: string, options?: Options) {
if (inBrowser === false) {
if (!navigateOnServerWarned) {
// instantiate an error for the stacktrace to show to user.
@@ -461,17 +577,7 @@ export function navigate(href: string, options?: Options) {
location.href = href;
return;
}
- const toLocation = new URL(href, location.href);
- // We do not have page transitions on navigations to the same page (intra-page navigation)
- // *unless* they are form posts which have side-effects and so need to happen
- // but we want to handle prevent reload on navigation to the same page
- // Same page means same origin, path and query params (but maybe different hash)
- if (location.origin === toLocation.origin && samePage(toLocation) && !options?.formData) {
- moveToLocation(toLocation, options?.history === 'replace', true);
- } else {
- // different origin will be detected by fetch
- transition('forward', toLocation, options ?? {});
- }
+ await transition('forward', originalLocation, new URL(href, location.href), options ?? {});
}
function onPopState(ev: PopStateEvent) {
@@ -479,10 +585,6 @@ function onPopState(ev: PopStateEvent) {
// The current page doesn't have View Transitions enabled
// but the page we navigate to does (because it set the state).
// Do a full page refresh to reload the client-side router from the new page.
- // Scroll restauration will then happen during the reload when the router's code is re-executed
- if (history.scrollRestoration) {
- history.scrollRestoration = 'manual';
- }
location.reload();
return;
}
@@ -492,28 +594,13 @@ function onPopState(ev: PopStateEvent) {
// Just ignore stateless entries.
// The browser will handle navigation fine without our help
if (ev.state === null) {
- if (history.scrollRestoration) {
- history.scrollRestoration = 'auto';
- }
return;
}
-
- // With the default "auto", the browser will jump to the old scroll position
- // before the ViewTransition is complete.
- if (history.scrollRestoration) {
- history.scrollRestoration = 'manual';
- }
-
const state: State = history.state;
- if (state.intraPage) {
- // this is non transition intra-page scrolling
- scrollTo(state.scrollX, state.scrollY);
- } else {
- const nextIndex = state.index;
- const direction: Direction = nextIndex > currentHistoryIndex ? 'forward' : 'back';
- currentHistoryIndex = nextIndex;
- transition(direction, new URL(location.href), {}, state);
- }
+ const nextIndex = state.index;
+ const direction: Direction = nextIndex > currentHistoryIndex ? 'forward' : 'back';
+ currentHistoryIndex = nextIndex;
+ transition(direction, originalLocation, new URL(location.href), {}, state);
}
// There's not a good way to record scroll position before a back button.
@@ -522,8 +609,10 @@ const onScroll = () => {
updateScrollPosition({ scrollX, scrollY });
};
+// initialization
if (inBrowser) {
if (supportsViewTransitions || getFallback() !== 'none') {
+ originalLocation = new URL(location.href);
addEventListener('popstate', onPopState);
addEventListener('load', onPageLoad);
if ('onscrollend' in window) addEventListener('scrollend', onScroll);
diff --git a/packages/astro/src/transitions/types.ts b/packages/astro/src/transitions/types.ts
new file mode 100644
index 000000000000..0e70825e5967
--- /dev/null
+++ b/packages/astro/src/transitions/types.ts
@@ -0,0 +1,10 @@
+export type Fallback = 'none' | 'animate' | 'swap';
+export type Direction = 'forward' | 'back';
+export type NavigationTypeString = 'push' | 'replace' | 'traverse';
+export type Options = {
+ history?: 'auto' | 'push' | 'replace';
+ info?: any;
+ state?: any;
+ formData?: FormData;
+ sourceElement?: Element; // more than HTMLElement, e.g. SVGAElement
+};
diff --git a/packages/astro/src/transitions/vite-plugin-transitions.ts b/packages/astro/src/transitions/vite-plugin-transitions.ts
index 8d5dbe553804..a3d68ade653c 100644
--- a/packages/astro/src/transitions/vite-plugin-transitions.ts
+++ b/packages/astro/src/transitions/vite-plugin-transitions.ts
@@ -21,13 +21,20 @@ export default function astroTransitions({ settings }: { settings: AstroSettings
load(id) {
if (id === resolvedVirtualModuleId) {
return `
- export * from "astro/transitions";
+ export * from "astro/virtual-modules/transitions.js";
export { default as ViewTransitions } from "astro/components/ViewTransitions.astro";
`;
}
if (id === resolvedVirtualClientModuleId) {
return `
- export * from "astro/transitions/router";
+ export { navigate, supportsViewTransitions, transitionEnabledOnThisPage } from "astro/virtual-modules/transitions-router.js";
+ export * from "astro/virtual-modules/transitions-types.js";
+ export {
+ TRANSITION_BEFORE_PREPARATION, isTransitionBeforePreparationEvent, TransitionBeforePreparationEvent,
+ TRANSITION_AFTER_PREPARATION,
+ TRANSITION_BEFORE_SWAP, isTransitionBeforeSwapEvent, TransitionBeforeSwapEvent,
+ TRANSITION_AFTER_SWAP, TRANSITION_PAGE_LOAD
+ } from "astro/virtual-modules/transitions-events.js";
`;
}
},
diff --git a/packages/astro/src/virtual-modules/README.md b/packages/astro/src/virtual-modules/README.md
new file mode 100644
index 000000000000..137e2e16f59a
--- /dev/null
+++ b/packages/astro/src/virtual-modules/README.md
@@ -0,0 +1,3 @@
+# virtual-modules
+
+This directory contains the entry points for Astro virtual modules. For example, `astro:foobar` would re-export or use `astro/virtual-modules/foobar.js` which maps to the internal file `astro/dist/virtual-modules/foobar.js`.
diff --git a/packages/astro/src/virtual-modules/i18n.ts b/packages/astro/src/virtual-modules/i18n.ts
new file mode 100644
index 000000000000..a55c1f6cfb59
--- /dev/null
+++ b/packages/astro/src/virtual-modules/i18n.ts
@@ -0,0 +1 @@
+export * from '../i18n/index.js';
diff --git a/packages/astro/src/virtual-modules/middleware.ts b/packages/astro/src/virtual-modules/middleware.ts
new file mode 100644
index 000000000000..4874c88d00a4
--- /dev/null
+++ b/packages/astro/src/virtual-modules/middleware.ts
@@ -0,0 +1 @@
+export { defineMiddleware, sequence } from '../core/middleware/index.js';
diff --git a/packages/astro/src/virtual-modules/prefetch.ts b/packages/astro/src/virtual-modules/prefetch.ts
new file mode 100644
index 000000000000..72bc23e2d04e
--- /dev/null
+++ b/packages/astro/src/virtual-modules/prefetch.ts
@@ -0,0 +1 @@
+export * from '../prefetch/index.js';
diff --git a/packages/astro/src/virtual-modules/transitions-events.ts b/packages/astro/src/virtual-modules/transitions-events.ts
new file mode 100644
index 000000000000..35ecaf64f897
--- /dev/null
+++ b/packages/astro/src/virtual-modules/transitions-events.ts
@@ -0,0 +1 @@
+export * from '../transitions/events.js';
diff --git a/packages/astro/src/virtual-modules/transitions-router.ts b/packages/astro/src/virtual-modules/transitions-router.ts
new file mode 100644
index 000000000000..666089f3f6fc
--- /dev/null
+++ b/packages/astro/src/virtual-modules/transitions-router.ts
@@ -0,0 +1 @@
+export * from '../transitions/router.js';
diff --git a/packages/astro/src/virtual-modules/transitions-types.ts b/packages/astro/src/virtual-modules/transitions-types.ts
new file mode 100644
index 000000000000..66dfb1d0ef6c
--- /dev/null
+++ b/packages/astro/src/virtual-modules/transitions-types.ts
@@ -0,0 +1 @@
+export * from '../transitions/types.js';
diff --git a/packages/astro/src/virtual-modules/transitions.ts b/packages/astro/src/virtual-modules/transitions.ts
new file mode 100644
index 000000000000..84aeb3a2cfdf
--- /dev/null
+++ b/packages/astro/src/virtual-modules/transitions.ts
@@ -0,0 +1 @@
+export * from '../transitions/index.js';
diff --git a/packages/astro/src/vite-plugin-astro-server/response.ts b/packages/astro/src/vite-plugin-astro-server/response.ts
index b1c9480956b4..ac36e703b072 100644
--- a/packages/astro/src/vite-plugin-astro-server/response.ts
+++ b/packages/astro/src/vite-plugin-astro-server/response.ts
@@ -68,7 +68,7 @@ export async function writeWebResponse(res: http.ServerResponse, webResponse: Re
// Previously, `headers.entries()` would already have these merged, but it seems like this isn't the case anymore.
if (headers.has('set-cookie')) {
if ('getSetCookie' in headers && typeof headers.getSetCookie === 'function') {
- _headers['set-cookie'] = headers.getSetCookie();
+ _headers['set-cookie'] = headers.getSetCookie().toString();
} else {
_headers['set-cookie'] = headers.get('set-cookie')!;
}
diff --git a/packages/astro/src/vite-plugin-astro-server/route.ts b/packages/astro/src/vite-plugin-astro-server/route.ts
index 0863ad1b4e06..3323749dee9c 100644
--- a/packages/astro/src/vite-plugin-astro-server/route.ts
+++ b/packages/astro/src/vite-plugin-astro-server/route.ts
@@ -2,12 +2,15 @@ import type http from 'node:http';
import { fileURLToPath } from 'node:url';
import type {
ComponentInstance,
+ DevOverlayMetadata,
ManifestData,
- MiddlewareEndpointHandler,
+ MiddlewareHandler,
RouteData,
SSRElement,
SSRManifest,
} from '../@types/astro.js';
+import { getInfoOutput } from '../cli/info/index.js';
+import { ASTRO_VERSION } from '../core/constants.js';
import { AstroErrorData, isAstroError } from '../core/errors/index.js';
import { sequence } from '../core/middleware/index.js';
import { req } from '../core/messages.js';
@@ -215,6 +218,7 @@ export async function handleRoute({
segments: [],
type: 'fallback',
route: '',
+ fallbackRoutes: [],
};
renderContext = await createRenderContext({
request,
@@ -222,6 +226,9 @@ export async function handleRoute({
env,
mod,
route,
+ locales: manifest.i18n?.locales,
+ routingStrategy: manifest.i18n?.routingStrategy,
+ defaultLocale: manifest.i18n?.defaultLocale,
});
} else {
return handle404Response(origin, incomingRequest, incomingResponse);
@@ -278,11 +285,13 @@ export async function handleRoute({
route: options.route,
mod,
env,
- locales: i18n ? i18n.locales : undefined,
+ locales: i18n?.locales,
+ routingStrategy: i18n?.routingStrategy,
+ defaultLocale: i18n?.defaultLocale,
});
}
- const onRequest = middleware?.onRequest as MiddlewareEndpointHandler | undefined;
+ const onRequest = middleware?.onRequest as MiddlewareHandler | undefined;
if (config.experimental.i18n) {
const i18Middleware = createI18nMiddleware(
config.experimental.i18n,
@@ -384,12 +393,18 @@ async function getScriptsAndStyles({ pipeline, filePath }: GetScriptsAndStylesPa
children: '',
});
+ const additionalMetadata: DevOverlayMetadata['__astro_dev_overlay__'] = {
+ root: fileURLToPath(settings.config.root),
+ version: ASTRO_VERSION,
+ debugInfo: await getInfoOutput({ userConfig: settings.config, print: false }),
+ };
+
+ settings.config;
+
// Additional data for the dev overlay
scripts.add({
props: {},
- children: `window.__astro_dev_overlay__ = {root: ${JSON.stringify(
- fileURLToPath(settings.config.root)
- )}}`,
+ children: `window.__astro_dev_overlay__ = ${JSON.stringify(additionalMetadata)}`,
});
}
}
diff --git a/packages/astro/src/vite-plugin-integrations-container/index.ts b/packages/astro/src/vite-plugin-integrations-container/index.ts
index b18d2e5e9956..2125df857d9f 100644
--- a/packages/astro/src/vite-plugin-integrations-container/index.ts
+++ b/packages/astro/src/vite-plugin-integrations-container/index.ts
@@ -34,7 +34,7 @@ async function resolveEntryPoint(
this: PluginContext,
route: InjectedRoute
): Promise {
- const resolvedId = await this.resolve(route.entryPoint)
+ const resolvedId = await this.resolve(route.entrypoint)
.then((res) => res?.id)
.catch(() => undefined);
if (!resolvedId) return route;
diff --git a/packages/astro/src/vite-plugin-scanner/scan.ts b/packages/astro/src/vite-plugin-scanner/scan.ts
index 3eb834ea24db..6c277567d416 100644
--- a/packages/astro/src/vite-plugin-scanner/scan.ts
+++ b/packages/astro/src/vite-plugin-scanner/scan.ts
@@ -72,7 +72,7 @@ export async function scan(
message: AstroErrorData.InvalidPrerenderExport.message(
prefix,
suffix,
- settings?.config.output === 'hybrid' ?? false
+ settings?.config.output === 'hybrid'
),
location: { file: id },
});
diff --git a/packages/astro/test/astro-markdown-drafts.test.js b/packages/astro/test/astro-markdown-drafts.test.js
deleted file mode 100644
index 8f6c753e4c5f..000000000000
--- a/packages/astro/test/astro-markdown-drafts.test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { expect } from 'chai';
-import * as cheerio from 'cheerio';
-import { loadFixture } from './test-utils.js';
-
-describe('Astro Markdown with draft posts disabled', () => {
- let fixture;
-
- before(async () => {
- fixture = await loadFixture({
- root: './fixtures/astro-markdown-drafts/',
- });
- await fixture.build();
- });
- it('Does not render the draft post', async () => {
- let renderedDraft = false;
- try {
- await fixture.readFile('/wip/index.html');
- renderedDraft = true;
- } catch (err) {
- expect(err.code).to.equal('ENOENT');
- }
- expect(renderedDraft).to.equal(false, 'Rendered a draft post');
- });
-});
-
-describe('Astro Markdown with draft posts enabled', () => {
- let fixture;
-
- before(async () => {
- fixture = await loadFixture({
- root: './fixtures/astro-markdown-drafts/',
- markdown: {
- drafts: true,
- },
- });
- await fixture.build();
- });
- it('Renders the draft post', async () => {
- const html = await fixture.readFile('/wip/index.html');
- const $ = cheerio.load(html);
- expect($('h1').length).to.be.ok;
- expect($('h1').text()).to.equal('WIP');
- });
-});
diff --git a/packages/astro/test/astro-markdown-remarkRehype.test.js b/packages/astro/test/astro-markdown-remarkRehype.test.js
index 59b0eeda6f15..17b20b51ea22 100644
--- a/packages/astro/test/astro-markdown-remarkRehype.test.js
+++ b/packages/astro/test/astro-markdown-remarkRehype.test.js
@@ -15,7 +15,7 @@ describe('Astro Markdown without remark-rehype config', () => {
const html = await fixture.readFile('/index.html');
const $ = cheerio.load(html);
expect($('#footnote-label').text()).to.equal('Footnotes');
- expect($('.data-footnote-backref').first().attr('aria-label')).to.equal('Back to content');
+ expect($('.data-footnote-backref').first().attr('aria-label')).to.equal('Back to reference 1');
});
});
diff --git a/packages/astro/test/astro-markdown-shiki.test.js b/packages/astro/test/astro-markdown-shiki.test.js
index 6315edbffbad..459fc646457b 100644
--- a/packages/astro/test/astro-markdown-shiki.test.js
+++ b/packages/astro/test/astro-markdown-shiki.test.js
@@ -95,10 +95,6 @@ describe('Astro Markdown Shiki', () => {
const unknownLang = $('.astro-code').get(1);
expect(unknownLang.attribs.style).to.contain('background-color:#24292e;color:#e1e4e8;');
-
- const caddyLang = $('.astro-code').last();
- const caddySegments = caddyLang.find('.line');
- expect(caddySegments.get(1).children[0].attribs.style).to.contain('color:#B392F0');
});
});
diff --git a/packages/astro/test/astro-scripts.test.js b/packages/astro/test/astro-scripts.test.js
index ae2268d8097f..f36e24d924d3 100644
--- a/packages/astro/test/astro-scripts.test.js
+++ b/packages/astro/test/astro-scripts.test.js
@@ -145,7 +145,7 @@ describe('Scripts (hoisted and not)', () => {
hooks: {
'astro:config:setup': ({ injectRoute, injectScript }) => {
injectScript('page', `import '/src/scripts/something.js';`);
- injectRoute({ pattern: 'injected-route', entryPoint: 'src/external-page.astro' });
+ injectRoute({ pattern: 'injected-route', entrypoint: 'src/external-page.astro' });
},
},
},
diff --git a/packages/astro/test/events.test.js b/packages/astro/test/events.test.js
index b0732a15c61b..c0c6266d9f1e 100644
--- a/packages/astro/test/events.test.js
+++ b/packages/astro/test/events.test.js
@@ -105,7 +105,6 @@ describe('Events', () => {
config: 'path/to/config.mjs',
experimentalSsr: true,
experimentalIntegrations: true,
- drafts: true,
};
const [{ payload }] = events.eventCliSession(
{
@@ -122,7 +121,6 @@ describe('Events', () => {
'config',
'experimentalSsr',
'experimentalIntegrations',
- 'drafts',
]);
});
});
diff --git a/packages/astro/test/featuresSupport.test.js b/packages/astro/test/featuresSupport.test.js
index c25d9d5f8f08..15606b927c1d 100644
--- a/packages/astro/test/featuresSupport.test.js
+++ b/packages/astro/test/featuresSupport.test.js
@@ -10,14 +10,9 @@ describe('Adapter', () => {
fixture = await loadFixture({
root: './fixtures/middleware space/',
output: 'server',
- build: {
- excludeMiddleware: true,
- },
adapter: testAdapter({
extendAdapter: {
- supportsFeatures: {
- edgeMiddleware: 'Unsupported',
- },
+ supportedAstroFeatures: {},
},
}),
});
@@ -34,14 +29,9 @@ describe('Adapter', () => {
fixture = await loadFixture({
root: './fixtures/middleware space/',
output: 'server',
- build: {
- split: true,
- },
adapter: testAdapter({
extendAdapter: {
- supportsFeatures: {
- functionPerPage: 'Unsupported',
- },
+ supportedAstroFeatures: {},
},
}),
});
diff --git a/packages/astro/test/fixtures/0-css/package.json b/packages/astro/test/fixtures/0-css/package.json
index 6ecfb1d9e925..fca80fd91b26 100644
--- a/packages/astro/test/fixtures/0-css/package.json
+++ b/packages/astro/test/fixtures/0-css/package.json
@@ -9,7 +9,7 @@
"astro": "workspace:*",
"react": "^18.1.0",
"react-dom": "^18.1.0",
- "svelte": "^4.2.0",
- "vue": "^3.3.4"
+ "svelte": "^4.2.5",
+ "vue": "^3.3.8"
}
}
diff --git a/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json b/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json
index a708628bbc15..a632b84638dc 100644
--- a/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json
+++ b/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json
@@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/svelte": "workspace:*",
"astro": "workspace:*",
- "svelte": "^4.2.0"
+ "svelte": "^4.2.5"
}
}
diff --git a/packages/astro/test/fixtures/alias-tsconfig/package.json b/packages/astro/test/fixtures/alias-tsconfig/package.json
index e27fc9130d95..80033bdf9e01 100644
--- a/packages/astro/test/fixtures/alias-tsconfig/package.json
+++ b/packages/astro/test/fixtures/alias-tsconfig/package.json
@@ -6,6 +6,6 @@
"@astrojs/svelte": "workspace:*",
"@test/namespace-package": "workspace:*",
"astro": "workspace:*",
- "svelte": "^4.2.0"
+ "svelte": "^4.2.5"
}
}
diff --git a/packages/astro/test/fixtures/alias/package.json b/packages/astro/test/fixtures/alias/package.json
index e23fb4d581ef..74351e6e39e6 100644
--- a/packages/astro/test/fixtures/alias/package.json
+++ b/packages/astro/test/fixtures/alias/package.json
@@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/svelte": "workspace:*",
"astro": "workspace:*",
- "svelte": "^4.2.0"
+ "svelte": "^4.2.5"
}
}
diff --git a/packages/astro/test/fixtures/api-routes/src/pages/context/data/[param].json.js b/packages/astro/test/fixtures/api-routes/src/pages/context/data/[param].json.js
index d18eb086f9a5..cb9308ba4554 100644
--- a/packages/astro/test/fixtures/api-routes/src/pages/context/data/[param].json.js
+++ b/packages/astro/test/fixtures/api-routes/src/pages/context/data/[param].json.js
@@ -15,10 +15,10 @@ export function getStaticPaths() {
}
export function GET({ params, request }) {
- return {
- body: JSON.stringify({
+ return new Response(
+ JSON.stringify({
param: params.param,
pathname: new URL(request.url).pathname
})
- };
+ );
}
diff --git a/packages/astro/test/fixtures/astro-basic/package.json b/packages/astro/test/fixtures/astro-basic/package.json
index c2e0be656281..417636229c93 100644
--- a/packages/astro/test/fixtures/astro-basic/package.json
+++ b/packages/astro/test/fixtures/astro-basic/package.json
@@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/astro-children/package.json b/packages/astro/test/fixtures/astro-children/package.json
index 5fc2951be597..1ed097ea1271 100644
--- a/packages/astro/test/fixtures/astro-children/package.json
+++ b/packages/astro/test/fixtures/astro-children/package.json
@@ -7,8 +7,8 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1",
- "svelte": "^4.2.0",
- "vue": "^3.3.4"
+ "preact": "^10.19.2",
+ "svelte": "^4.2.5",
+ "vue": "^3.3.8"
}
}
diff --git a/packages/astro/test/fixtures/astro-client-only/package.json b/packages/astro/test/fixtures/astro-client-only/package.json
index a550b3a7b636..2d55fe99cb4c 100644
--- a/packages/astro/test/fixtures/astro-client-only/package.json
+++ b/packages/astro/test/fixtures/astro-client-only/package.json
@@ -9,6 +9,6 @@
"astro": "workspace:*",
"react": "^18.1.0",
"react-dom": "^18.1.0",
- "svelte": "^4.2.0"
+ "svelte": "^4.2.5"
}
}
diff --git a/packages/astro/test/fixtures/astro-dynamic/package.json b/packages/astro/test/fixtures/astro-dynamic/package.json
index 2dc810458302..6209dabe9120 100644
--- a/packages/astro/test/fixtures/astro-dynamic/package.json
+++ b/packages/astro/test/fixtures/astro-dynamic/package.json
@@ -8,6 +8,6 @@
"astro": "workspace:*",
"react": "^18.1.0",
"react-dom": "^18.1.0",
- "svelte": "^4.2.0"
+ "svelte": "^4.2.5"
}
}
diff --git a/packages/astro/test/fixtures/astro-envs/package.json b/packages/astro/test/fixtures/astro-envs/package.json
index c46f4d6814ac..86bad5a8713c 100644
--- a/packages/astro/test/fixtures/astro-envs/package.json
+++ b/packages/astro/test/fixtures/astro-envs/package.json
@@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
- "vue": "^3.3.4"
+ "vue": "^3.3.8"
}
}
diff --git a/packages/astro/test/fixtures/astro-expr/package.json b/packages/astro/test/fixtures/astro-expr/package.json
index c6dce6e21a6a..ac553abf2fe7 100644
--- a/packages/astro/test/fixtures/astro-expr/package.json
+++ b/packages/astro/test/fixtures/astro-expr/package.json
@@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/astro-fallback/package.json b/packages/astro/test/fixtures/astro-fallback/package.json
index ea2281e0811d..8726d73a91aa 100644
--- a/packages/astro/test/fixtures/astro-fallback/package.json
+++ b/packages/astro/test/fixtures/astro-fallback/package.json
@@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/astro-get-static-paths/src/pages/data/[slug].json.ts b/packages/astro/test/fixtures/astro-get-static-paths/src/pages/data/[slug].json.ts
index 32a0fd140f12..21df537cd4a2 100644
--- a/packages/astro/test/fixtures/astro-get-static-paths/src/pages/data/[slug].json.ts
+++ b/packages/astro/test/fixtures/astro-get-static-paths/src/pages/data/[slug].json.ts
@@ -1,14 +1,12 @@
export async function getStaticPaths() {
- return [
+ return [
{ params: { slug: 'thing1' } },
{ params: { slug: 'thing2' } }
];
}
export async function GET() {
- return {
- body: JSON.stringify({
- title: '[slug]'
- }, null, 4)
- };
+ return Response.json({
+ title: '[slug]',
+ });
}
diff --git a/packages/astro/test/fixtures/astro-markdown-drafts/package.json b/packages/astro/test/fixtures/astro-markdown-drafts/package.json
deleted file mode 100644
index fa376d6f134f..000000000000
--- a/packages/astro/test/fixtures/astro-markdown-drafts/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "name": "@test/astro-markdown-drafts",
- "version": "0.0.0",
- "private": true,
- "dependencies": {
- "astro": "workspace:*"
- }
-}
diff --git a/packages/astro/test/fixtures/astro-markdown-drafts/src/pages/index.md b/packages/astro/test/fixtures/astro-markdown-drafts/src/pages/index.md
deleted file mode 100644
index 0e06444da3cc..000000000000
--- a/packages/astro/test/fixtures/astro-markdown-drafts/src/pages/index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-foo: bar
----
-
-# Hello world
-
-This should be visible.
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/astro-markdown-drafts/src/pages/wip.md b/packages/astro/test/fixtures/astro-markdown-drafts/src/pages/wip.md
deleted file mode 100644
index 27b8296140d7..000000000000
--- a/packages/astro/test/fixtures/astro-markdown-drafts/src/pages/wip.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-foo: bar
-draft: true
----
-
-# WIP
-
-This is a draft. Don't build me!
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/astro-markdown-frontmatter-injection/src/pages/glob.json.js b/packages/astro/test/fixtures/astro-markdown-frontmatter-injection/src/pages/glob.json.js
index 3aae6d89a8a9..1916378c93c0 100644
--- a/packages/astro/test/fixtures/astro-markdown-frontmatter-injection/src/pages/glob.json.js
+++ b/packages/astro/test/fixtures/astro-markdown-frontmatter-injection/src/pages/glob.json.js
@@ -1,6 +1,4 @@
export async function GET() {
const docs = await import.meta.glob('./*.md', { eager: true });
- return {
- body: JSON.stringify(Object.values(docs).map(doc => doc.frontmatter)),
- }
+ return Response.json(Object.values(docs).map((doc) => doc.frontmatter));
}
diff --git a/packages/astro/test/fixtures/astro-markdown-plugins/package.json b/packages/astro/test/fixtures/astro-markdown-plugins/package.json
index a7953b785825..bd48d532e241 100644
--- a/packages/astro/test/fixtures/astro-markdown-plugins/package.json
+++ b/packages/astro/test/fixtures/astro-markdown-plugins/package.json
@@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"astro": "workspace:*",
- "hast-util-select": "^6.0.0",
- "rehype-slug": "^5.0.1"
+ "hast-util-select": "^6.0.2",
+ "rehype-slug": "^6.0.0"
}
}
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/langs/astro.config.mjs b/packages/astro/test/fixtures/astro-markdown-shiki/langs/astro.config.mjs
index 9a5f2eced552..130596b0c4c5 100644
--- a/packages/astro/test/fixtures/astro-markdown-shiki/langs/astro.config.mjs
+++ b/packages/astro/test/fixtures/astro-markdown-shiki/langs/astro.config.mjs
@@ -13,14 +13,6 @@ export default {
grammar: riGrammar,
aliases: ['ri'],
},
- {
- id: 'caddy',
- scopeName: 'source.Caddyfile',
- // shiki compat: resolves from astro package directory.
- // careful as astro is linked, this relative path is based on astro/packages/astro.
- // it's weird but we're testing to prevent regressions.
- path: './test/fixtures/astro-markdown-shiki/langs/src/caddyfile.tmLanguage.json',
- },
],
},
},
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/langs/src/caddyfile.tmLanguage.json b/packages/astro/test/fixtures/astro-markdown-shiki/langs/src/caddyfile.tmLanguage.json
deleted file mode 100644
index 8a9f87c870cb..000000000000
--- a/packages/astro/test/fixtures/astro-markdown-shiki/langs/src/caddyfile.tmLanguage.json
+++ /dev/null
@@ -1,365 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
-
- "name": "Caddyfile",
- "fileTypes": ["Caddyfile"],
- "scopeName": "source.Caddyfile",
-
- "patterns": [
- { "include": "#comments" },
- { "include": "#strings" },
- { "include": "#domains" },
- { "include": "#status_codes" },
- { "include": "#path" },
- { "include": "#global_options" },
- { "include": "#matchers" },
- { "include": "#directive" },
- { "include": "#site_block_common" }
- ],
-
- "repository": {
- "comments": {
- "patterns": [
- {
- "name": "comment.line.Caddyfile",
- "match": "\\s#.*"
- },
- {
- "name": "comment.line.Caddyfile",
- "match": "^#.*"
- }
- ]
- },
-
- "strings": {
- "patterns": [
- {
- "comment": "Double Quoted Strings",
- "begin": "\"",
- "end": "\"",
- "name": "string.quoted.double.Caddyfile",
- "patterns": [
- {
- "name": "constant.character.escape.Caddyfile",
- "match": "\\\\\""
- }
- ]
- },
- {
- "comment": "Backtick Strings",
- "begin": "`",
- "end": "`",
- "name": "string.quoted.single.Caddyfile"
- }
- ]
- },
-
- "status_codes": {
- "patterns": [
- {
- "name": "constant.numeric.decimal",
- "match": "\\s[0-9]{3}(?!\\.)"
- }
- ]
- },
-
- "path": {
- "patterns": [
- {
- "name": "keyword.control.caddyfile",
- "match": "(unix/)*/[a-zA-Z0-9_\\-./*]+"
- },
- {
- "name": "variable.other.property.caddyfile",
- "match": "\\*.[a-z]{1,5}"
- },
- {
- "name": "variable.other.property.caddyfile",
- "match": "\\*/?"
- },
- {
- "name": "variable.other.property.caddyfile",
- "match": "\\?/"
- }
- ]
- },
-
- "domains": {
- "patterns": [
- {
- "comment": "Domains and URLs",
- "name": "keyword.control.caddyfile",
- "match": "(https?://)*[a-z0-9-\\*]*(?:\\.[a-zA-Z]{2,})+(:[0-9]+)*\\S*"
- },
- {
- "comment": "localhost",
- "name": "keyword.control.caddyfile",
- "match": "localhost(:[0-9]+)*"
- },
- {
- "comment": "IPv4",
- "name": "keyword.control.caddyfile",
- "match": "((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
- },
- {
- "comment": "IPv6",
- "name": "keyword.control.caddyfile",
- "match": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))"
- },
- {
- "comment": "Ports",
- "name": "keyword.control.caddyfile",
- "match": ":[0-9]+"
- }
- ]
- },
-
- "global_options": {
- "patterns": [
- {
- "begin": "^(\\{)$",
- "end": "^(\\})$",
-
- "beginCaptures": {
- "0": { "name": "punctuation.definition.dictionary.begin" }
- },
-
- "endCaptures": {
- "0": { "name": "punctuation.definition.dictionary.end" }
- },
-
- "patterns": [
- { "include": "#comments" },
- {
- "name": "support.constant.Caddyfile",
- "match": "^\\s*(debug|https?_port|default_bind|order|storage|storage_clean_interval|renew_interval|ocsp_interval|admin|log|grace_period|shutdown_delay|auto_https|email|default_sni|local_certs|skip_install_trust|acme_ca|acme_ca_root|acme_eab|acme_dns|on_demand_tls|key_type|cert_issuer|ocsp_stapling|preferred_chains|servers|pki|events)"
- }
- ]
- }
- ]
- },
-
- "site_block_common": {
- "patterns": [{ "include": "#placeholders" }, { "include": "#block" }]
- },
-
- "matchers": {
- "patterns": [
- {
- "comment": "Matchers",
- "name": "support.function.Caddyfile",
- "match": "@[^\\s]+(?=\\s)"
- }
- ]
- },
-
- "placeholders": {
- "patterns": [
- {
- "name": "keyword.control.Caddyfile",
- "match": "\\{[\\[\\]\\w.\\$+-]+\\}"
- }
- ]
- },
-
- "directive": {
- "patterns": [
- {
- "name": "entity.name.function.Caddyfile",
- "match": "^\\s*[a-zA-Z_\\-+]+"
- },
- { "include": "#content_types" },
- { "include": "#heredoc" }
- ]
- },
-
- "content_types": {
- "patterns": [
- {
- "comment": "Content Types",
- "name": "variable.other.property.caddyfile",
- "match": "(application|audio|example|font|image|message|model|multipart|text|video)/[a-zA-Z0-9*+\\-.]+;* *[a-zA-Z0-9=\\-]*"
- }
- ]
- },
-
- "block": {
- "patterns": [
- {
- "begin": "\\{",
- "end": "\\}",
-
- "patterns": [{ "include": "#block_content" }]
- }
- ]
- },
-
- "block_content": {
- "patterns": [
- {
- "patterns": [
- { "include": "#comments" },
- { "include": "#strings" },
- { "include": "#domains" },
- { "include": "#status_codes" },
- { "include": "#path" },
- { "include": "#matchers" },
- { "include": "#placeholders" },
- { "include": "#directive" },
- { "include": "#block" }
- ]
- }
- ]
- },
-
- "heredoc": {
- "patterns": [
- {
- "begin": "(?i)(?=<<\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*$)",
- "end": "(?!\\G)",
- "name": "string.unquoted.heredoc.caddyfile",
- "patterns": [{ "include": "#heredoc_interior" }]
- }
- ]
- },
-
- "heredoc_interior": {
- "patterns": [
- {
- "comment": "CSS",
-
- "name": "meta.embedded.css",
- "contentName": "source.css",
-
- "begin": "(<<)\\s*(CSS)(\\s*)$",
- "beginCaptures": {
- "0": { "name": "punctuation.section.embedded.begin.caddyfile" },
- "1": { "name": "punctuation.definition.string.begin" },
- "2": { "name": "keyword.operator.heredoc.caddyfile" },
- "4": { "name": "invalid.illegal.trailing-whitespace.caddyfile" }
- },
-
- "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
- "endCaptures": {
- "0": { "name": "punctuation.section.embedded.end.caddyfile" },
- "1": { "name": "keyword.operator.heredoc.caddyfile" }
- },
-
- "patterns": [{ "include": "source.css" }]
- },
-
- {
- "comment": "HTML",
-
- "name": "meta.embedded.html",
- "contentName": "text.html",
-
- "begin": "(<<)\\s*(HTML)(\\s*)$",
- "beginCaptures": {
- "0": { "name": "punctuation.section.embedded.begin.caddyfile" },
- "1": { "name": "punctuation.definition.string.begin" },
- "2": { "name": "keyword.operator.heredoc.caddyfile" },
- "4": { "name": "invalid.illegal.trailing-whitespace.caddyfile" }
- },
-
- "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
- "endCaptures": {
- "0": { "name": "punctuation.section.embedded.end.caddyfile" },
- "1": { "name": "keyword.operator.heredoc.caddyfile" }
- },
-
- "patterns": [{ "include": "text.html.basic" }]
- },
-
- {
- "comment": "JavaScript",
-
- "name": "meta.embedded.js",
- "contentName": "source.js",
-
- "begin": "(<<)\\s*(JAVASCRIPT|JS)(\\s*)$",
- "beginCaptures": {
- "0": { "name": "punctuation.section.embedded.begin.caddyfile" },
- "1": { "name": "punctuation.definition.string.begin" },
- "2": { "name": "keyword.operator.heredoc.caddyfile" },
- "4": { "name": "invalid.illegal.trailing-whitespace.caddyfile" }
- },
-
- "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
- "endCaptures": {
- "0": { "name": "punctuation.section.embedded.end.caddyfile" },
- "1": { "name": "keyword.operator.heredoc.caddyfile" }
- },
-
- "patterns": [{ "include": "source.js" }]
- },
-
- {
- "comment": "JSON",
-
- "name": "meta.embedded.json",
- "contentName": "source.json",
-
- "begin": "(<<)\\s*(JSON)(\\s*)$",
- "beginCaptures": {
- "0": { "name": "punctuation.section.embedded.begin.caddyfile" },
- "1": { "name": "punctuation.definition.string.begin" },
- "2": { "name": "keyword.operator.heredoc.caddyfile" },
- "4": { "name": "invalid.illegal.trailing-whitespace.caddyfile" }
- },
-
- "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
- "endCaptures": {
- "0": { "name": "punctuation.section.embedded.end.caddyfile" },
- "1": { "name": "keyword.operator.heredoc.caddyfile" }
- },
-
- "patterns": [{ "include": "source.json" }]
- },
-
- {
- "comment": "XML",
-
- "name": "meta.embedded.xml",
- "contentName": "text.xml",
-
- "begin": "(<<)\\s*(XML)(\\s*)$",
- "beginCaptures": {
- "0": { "name": "punctuation.section.embedded.begin.caddyfile" },
- "1": { "name": "punctuation.definition.string.begin" },
- "2": { "name": "keyword.operator.heredoc.caddyfile" },
- "4": { "name": "invalid.illegal.trailing-whitespace.caddyfile" }
- },
-
- "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
- "endCaptures": {
- "0": { "name": "punctuation.section.embedded.end.caddyfile" },
- "1": { "name": "keyword.operator.heredoc.caddyfile" }
- },
-
- "patterns": [{ "include": "text.xml" }]
- },
-
- {
- "comment": "Any other heredoc",
-
- "begin": "(?i)(<<)\\s*([a-z_\\x{7f}-\\x{10ffff}]+[a-z0-9_\\x{7f}-\\x{10ffff}]*)(\\s*)",
- "beginCaptures": {
- "0": { "name": "punctuation.section.embedded.begin.caddyfile" },
- "1": { "name": "punctuation.definition.string.caddyfile" },
- "2": { "name": "keyword.operator.heredoc.caddyfile" },
- "4": { "name": "invalid.illegal.trailing-whitespace.caddyfile" }
- },
-
- "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
- "endCaptures": {
- "0": { "name": "punctuation.section.embedded.end.caddyfile" },
- "1": { "name": "keyword.operator.heredoc.caddyfile" }
- },
-
- "patterns": []
- }
- ]
- }
- }
-}
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/langs/src/pages/index.md b/packages/astro/test/fixtures/astro-markdown-shiki/langs/src/pages/index.md
index cdd74060f3a8..d2d756b95dc1 100644
--- a/packages/astro/test/fixtures/astro-markdown-shiki/langs/src/pages/index.md
+++ b/packages/astro/test/fixtures/astro-markdown-shiki/langs/src/pages/index.md
@@ -24,12 +24,3 @@ fin
```unknown
This language does not exist
```
-
-```caddy
-example.com {
- root * /var/www/wordpress
- encode gzip
- php_fastcgi unix//run/php/php-version-fpm.sock
- file_server
-}
-```
diff --git a/packages/astro/test/fixtures/astro-markdown/src/pages/headings-glob.json.js b/packages/astro/test/fixtures/astro-markdown/src/pages/headings-glob.json.js
index b2c9ea6ea25f..3cc852c6f565 100644
--- a/packages/astro/test/fixtures/astro-markdown/src/pages/headings-glob.json.js
+++ b/packages/astro/test/fixtures/astro-markdown/src/pages/headings-glob.json.js
@@ -1,9 +1,7 @@
import { getHeadings } from './with-layout.md';
export async function GET() {
- return {
- body: JSON.stringify({
- headings: getHeadings(),
- }),
- }
+ return Response.json({
+ headings: getHeadings(),
+ });
}
diff --git a/packages/astro/test/fixtures/astro-markdown/src/pages/raw-content.json.js b/packages/astro/test/fixtures/astro-markdown/src/pages/raw-content.json.js
index 82977443dc11..cf499bb39c01 100644
--- a/packages/astro/test/fixtures/astro-markdown/src/pages/raw-content.json.js
+++ b/packages/astro/test/fixtures/astro-markdown/src/pages/raw-content.json.js
@@ -1,10 +1,8 @@
import { rawContent, compiledContent } from './basic.md';
export async function GET() {
- return {
- body: JSON.stringify({
- raw: rawContent(),
- compiled: await compiledContent(),
- }),
- }
+ return Response.json({
+ raw: rawContent(),
+ compiled: await compiledContent(),
+ });
}
diff --git a/packages/astro/test/fixtures/astro-markdown/src/pages/vite-env-vars-glob.json.js b/packages/astro/test/fixtures/astro-markdown/src/pages/vite-env-vars-glob.json.js
index 7a5d00f47ac0..7dfe96294701 100644
--- a/packages/astro/test/fixtures/astro-markdown/src/pages/vite-env-vars-glob.json.js
+++ b/packages/astro/test/fixtures/astro-markdown/src/pages/vite-env-vars-glob.json.js
@@ -1,7 +1,5 @@
import { frontmatter } from './vite-env-vars.md';
export async function GET() {
- return {
- body: JSON.stringify(frontmatter),
- }
+ return Response.json(frontmatter);
}
diff --git a/packages/astro/test/fixtures/astro-markdown/src/pages/vite-env-vars.md b/packages/astro/test/fixtures/astro-markdown/src/pages/vite-env-vars.md
index f4983af2c75b..5fac52727244 100644
--- a/packages/astro/test/fixtures/astro-markdown/src/pages/vite-env-vars.md
+++ b/packages/astro/test/fixtures/astro-markdown/src/pages/vite-env-vars.md
@@ -21,7 +21,7 @@ This should also work outside of code blocks:
// src/pages/rss.xml.js
import rss from '@astrojs/rss';
-export const get = () => rss({
+export const GET = () => rss({
// Use Vite env vars with import.meta.env
site: import.meta.env.SITE,
title: import.meta.env.TITLE,
diff --git a/packages/astro/test/fixtures/astro-slot-with-client/package.json b/packages/astro/test/fixtures/astro-slot-with-client/package.json
index 830c205cfaf9..eb88bae982ff 100644
--- a/packages/astro/test/fixtures/astro-slot-with-client/package.json
+++ b/packages/astro/test/fixtures/astro-slot-with-client/package.json
@@ -4,6 +4,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/astro-slots-nested/package.json b/packages/astro/test/fixtures/astro-slots-nested/package.json
index e40fa03968cb..2e1a6bef901c 100644
--- a/packages/astro/test/fixtures/astro-slots-nested/package.json
+++ b/packages/astro/test/fixtures/astro-slots-nested/package.json
@@ -9,11 +9,11 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1",
+ "preact": "^10.19.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
- "solid-js": "^1.7.11",
- "svelte": "^4.2.0",
- "vue": "^3.3.4"
+ "solid-js": "^1.8.5",
+ "svelte": "^4.2.5",
+ "vue": "^3.3.8"
}
}
diff --git a/packages/astro/test/fixtures/before-hydration/package.json b/packages/astro/test/fixtures/before-hydration/package.json
index a49804cd70e5..cf419345b9af 100644
--- a/packages/astro/test/fixtures/before-hydration/package.json
+++ b/packages/astro/test/fixtures/before-hydration/package.json
@@ -4,6 +4,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/build-assets/package.json b/packages/astro/test/fixtures/build-assets/package.json
index 3a8c744ed0f0..b09d02c66826 100644
--- a/packages/astro/test/fixtures/build-assets/package.json
+++ b/packages/astro/test/fixtures/build-assets/package.json
@@ -4,6 +4,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/component-library-shared/package.json b/packages/astro/test/fixtures/component-library-shared/package.json
index b6d1bdfe87e9..b91ef821600d 100644
--- a/packages/astro/test/fixtures/component-library-shared/package.json
+++ b/packages/astro/test/fixtures/component-library-shared/package.json
@@ -18,7 +18,7 @@
"astro": "workspace:*"
},
"dependencies": {
- "preact": "^10.17.1",
+ "preact": "^10.19.2",
"react": "^18.2.0"
}
}
diff --git a/packages/astro/test/fixtures/component-library/package.json b/packages/astro/test/fixtures/component-library/package.json
index 3697c7a7ef76..14a8cb44a657 100644
--- a/packages/astro/test/fixtures/component-library/package.json
+++ b/packages/astro/test/fixtures/component-library/package.json
@@ -8,9 +8,9 @@
"@astrojs/svelte": "workspace:*",
"@test/component-library-shared": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1",
+ "preact": "^10.19.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
- "svelte": "^4.2.0"
+ "svelte": "^4.2.5"
}
}
diff --git a/packages/astro/test/fixtures/content-collections/src/pages/collections.json.js b/packages/astro/test/fixtures/content-collections/src/pages/collections.json.js
index e335d2b05d7c..b7b7d847253e 100644
--- a/packages/astro/test/fixtures/content-collections/src/pages/collections.json.js
+++ b/packages/astro/test/fixtures/content-collections/src/pages/collections.json.js
@@ -8,7 +8,7 @@ export async function GET() {
const withSlugConfig = stripAllRenderFn(await getCollection('with-custom-slugs'));
const withUnionSchema = stripAllRenderFn(await getCollection('with-union-schema'));
- return {
- body: devalue.stringify({withoutConfig, withSchemaConfig, withSlugConfig, withUnionSchema}),
- }
+ return new Response(
+ devalue.stringify({ withoutConfig, withSchemaConfig, withSlugConfig, withUnionSchema })
+ );
}
diff --git a/packages/astro/test/fixtures/content-collections/src/pages/entries.json.js b/packages/astro/test/fixtures/content-collections/src/pages/entries.json.js
index 311b76cc8bca..a05a9138b1d8 100644
--- a/packages/astro/test/fixtures/content-collections/src/pages/entries.json.js
+++ b/packages/astro/test/fixtures/content-collections/src/pages/entries.json.js
@@ -5,10 +5,17 @@ import { stripRenderFn } from '../utils.js';
export async function GET() {
const columbiaWithoutConfig = stripRenderFn(await getEntryBySlug('without-config', 'columbia'));
const oneWithSchemaConfig = stripRenderFn(await getEntryBySlug('with-schema-config', 'one'));
- const twoWithSlugConfig = stripRenderFn(await getEntryBySlug('with-custom-slugs', 'interesting-two'));
+ const twoWithSlugConfig = stripRenderFn(
+ await getEntryBySlug('with-custom-slugs', 'interesting-two')
+ );
const postWithUnionSchema = stripRenderFn(await getEntryBySlug('with-union-schema', 'post'));
- return {
- body: devalue.stringify({columbiaWithoutConfig, oneWithSchemaConfig, twoWithSlugConfig, postWithUnionSchema}),
- }
+ return new Response(
+ devalue.stringify({
+ columbiaWithoutConfig,
+ oneWithSchemaConfig,
+ twoWithSlugConfig,
+ postWithUnionSchema,
+ })
+ );
}
diff --git a/packages/astro/test/fixtures/core-image-ssr/src/pages/api.ts b/packages/astro/test/fixtures/core-image-ssr/src/pages/api.ts
index 7847baf62cb8..261fb6bb7dc7 100644
--- a/packages/astro/test/fixtures/core-image-ssr/src/pages/api.ts
+++ b/packages/astro/test/fixtures/core-image-ssr/src/pages/api.ts
@@ -3,8 +3,5 @@ import type { APIRoute } from "../../../../../src/@types/astro";
export const GET = (async ({ params, request }) => {
const url = new URL(request.url);
const src = url.searchParams.get("src");
-
- return {
- body: "An image: " + JSON.stringify(src),
- };
+ return new Response("An image: " + JSON.stringify(src));
}) satisfies APIRoute;
diff --git a/packages/astro/test/fixtures/css-dangling-references/package.json b/packages/astro/test/fixtures/css-dangling-references/package.json
index 9ac28d282214..03878694edd0 100644
--- a/packages/astro/test/fixtures/css-dangling-references/package.json
+++ b/packages/astro/test/fixtures/css-dangling-references/package.json
@@ -1,11 +1,10 @@
{
- "name": "@test/css-dangling-references",
- "version": "0.0.0",
- "private": true,
- "dependencies": {
- "astro": "workspace:*",
- "@astrojs/svelte": "workspace:*",
- "svelte": "4"
- }
+ "name": "@test/css-dangling-references",
+ "version": "0.0.0",
+ "private": true,
+ "dependencies": {
+ "@astrojs/svelte": "workspace:*",
+ "astro": "workspace:*",
+ "svelte": "^4.2.5"
}
-
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/custom-404-injected-from-dep/astro.config.mjs b/packages/astro/test/fixtures/custom-404-injected-from-dep/astro.config.mjs
index 840a9524cbdb..15a3b3e79509 100644
--- a/packages/astro/test/fixtures/custom-404-injected-from-dep/astro.config.mjs
+++ b/packages/astro/test/fixtures/custom-404-injected-from-dep/astro.config.mjs
@@ -9,7 +9,7 @@ export default defineConfig({
'astro:config:setup': ({ injectRoute }) => {
injectRoute({
pattern: '404',
- entryPoint: '@test/custom-404-pkg/404.astro',
+ entrypoint: '@test/custom-404-pkg/404.astro',
});
},
},
diff --git a/packages/astro/test/fixtures/custom-404-injected/astro.config.mjs b/packages/astro/test/fixtures/custom-404-injected/astro.config.mjs
index d46ce7eb77c9..ae0d4e111a2e 100644
--- a/packages/astro/test/fixtures/custom-404-injected/astro.config.mjs
+++ b/packages/astro/test/fixtures/custom-404-injected/astro.config.mjs
@@ -9,7 +9,7 @@ export default defineConfig({
'astro:config:setup': ({ injectRoute }) => {
injectRoute({
pattern: '404',
- entryPoint: 'src/404.astro',
+ entrypoint: 'src/404.astro',
});
},
},
diff --git a/packages/astro/test/fixtures/data-collections/src/pages/authors/[id].json.js b/packages/astro/test/fixtures/data-collections/src/pages/authors/[id].json.js
index 76f4d57606d2..8d5365a2eb2d 100644
--- a/packages/astro/test/fixtures/data-collections/src/pages/authors/[id].json.js
+++ b/packages/astro/test/fixtures/data-collections/src/pages/authors/[id].json.js
@@ -1,9 +1,9 @@
import { getEntry } from 'astro:content';
-const ids = ['Ben Holmes', 'Fred K Schott', 'Nate Moore']
+const ids = ['Ben Holmes', 'Fred K Schott', 'Nate Moore'];
export function getStaticPaths() {
- return ids.map(id => ({ params: { id } }))
+ return ids.map((id) => ({ params: { id } }));
}
/** @param {import('astro').APIContext} params */
@@ -11,12 +11,8 @@ export async function GET({ params }) {
const { id } = params;
const author = await getEntry('authors-without-config', id);
if (!author) {
- return {
- body: JSON.stringify({ error: `Author ${id} Not found` }),
- }
+ return Response.json({ error: `Author ${id} Not found` });
} else {
- return {
- body: JSON.stringify(author),
- }
+ return Response.json(author);
}
}
diff --git a/packages/astro/test/fixtures/data-collections/src/pages/authors/all.json.js b/packages/astro/test/fixtures/data-collections/src/pages/authors/all.json.js
index 5b5007fedb70..79dd8cd9dd3c 100644
--- a/packages/astro/test/fixtures/data-collections/src/pages/authors/all.json.js
+++ b/packages/astro/test/fixtures/data-collections/src/pages/authors/all.json.js
@@ -2,8 +2,5 @@ import { getCollection } from 'astro:content';
export async function GET() {
const authors = await getCollection('authors-without-config');
-
- return {
- body: JSON.stringify(authors),
- }
+ return Response.json(authors);
}
diff --git a/packages/astro/test/fixtures/data-collections/src/pages/translations/[lang].json.js b/packages/astro/test/fixtures/data-collections/src/pages/translations/[lang].json.js
index ab8cc764e353..c6b0cfff669b 100644
--- a/packages/astro/test/fixtures/data-collections/src/pages/translations/[lang].json.js
+++ b/packages/astro/test/fixtures/data-collections/src/pages/translations/[lang].json.js
@@ -1,9 +1,9 @@
import { getEntry } from 'astro:content';
-const langs = ['en', 'es', 'fr']
+const langs = ['en', 'es', 'fr'];
export function getStaticPaths() {
- return langs.map(lang => ({ params: { lang } }))
+ return langs.map((lang) => ({ params: { lang } }));
}
/** @param {import('astro').APIContext} params */
@@ -11,12 +11,8 @@ export async function GET({ params }) {
const { lang } = params;
const translations = await getEntry('i18n', lang);
if (!translations) {
- return {
- body: JSON.stringify({ error: `Translation ${lang} Not found` }),
- }
+ return Response.json({ error: `Translation ${lang} Not found` });
} else {
- return {
- body: JSON.stringify(translations),
- }
+ return Response.json(translations);
}
}
diff --git a/packages/astro/test/fixtures/data-collections/src/pages/translations/all.json.js b/packages/astro/test/fixtures/data-collections/src/pages/translations/all.json.js
index e8a1fee92908..f1ebb15b761e 100644
--- a/packages/astro/test/fixtures/data-collections/src/pages/translations/all.json.js
+++ b/packages/astro/test/fixtures/data-collections/src/pages/translations/all.json.js
@@ -2,8 +2,5 @@ import { getCollection } from 'astro:content';
export async function GET() {
const translations = await getCollection('i18n');
-
- return {
- body: JSON.stringify(translations),
- }
+ return Response.json(translations);
}
diff --git a/packages/astro/test/fixtures/data-collections/src/pages/translations/by-id.json.js b/packages/astro/test/fixtures/data-collections/src/pages/translations/by-id.json.js
index f7b84752dd3f..5f71c80e9f7b 100644
--- a/packages/astro/test/fixtures/data-collections/src/pages/translations/by-id.json.js
+++ b/packages/astro/test/fixtures/data-collections/src/pages/translations/by-id.json.js
@@ -2,8 +2,5 @@ import { getDataEntryById } from 'astro:content';
export async function GET() {
const item = await getDataEntryById('i18n', 'en');
-
- return {
- body: JSON.stringify(item),
- }
+ return Response.json(item);
}
diff --git a/packages/astro/test/fixtures/dynamic-endpoint-collision/src/pages/api/catch/[...slug].ts b/packages/astro/test/fixtures/dynamic-endpoint-collision/src/pages/api/catch/[...slug].ts
index 8fccd6695a8c..96a9d56f6cb4 100644
--- a/packages/astro/test/fixtures/dynamic-endpoint-collision/src/pages/api/catch/[...slug].ts
+++ b/packages/astro/test/fixtures/dynamic-endpoint-collision/src/pages/api/catch/[...slug].ts
@@ -1,15 +1,13 @@
-import type { APIRoute } from "astro";
+import type { APIRoute } from 'astro';
-const slugs = ["one", undefined];
+const slugs = ['one', undefined];
export const GET: APIRoute = ({ params }) => {
- return {
- body: JSON.stringify({
- slug: params.slug || "index",
- }),
- };
+ return Response.json({
+ slug: params.slug || 'index',
+ });
};
export function getStaticPaths() {
- return slugs.map((u) => ({ params: { slug: u } }));
+ return slugs.map((u) => ({ params: { slug: u } }));
}
diff --git a/packages/astro/test/fixtures/entry-file-names/package.json b/packages/astro/test/fixtures/entry-file-names/package.json
index a405afb9eac8..bfd58eae787e 100644
--- a/packages/astro/test/fixtures/entry-file-names/package.json
+++ b/packages/astro/test/fixtures/entry-file-names/package.json
@@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/fetch/package.json b/packages/astro/test/fixtures/fetch/package.json
index 2d215ec89118..60cfd4166c4b 100644
--- a/packages/astro/test/fixtures/fetch/package.json
+++ b/packages/astro/test/fixtures/fetch/package.json
@@ -7,8 +7,8 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1",
- "svelte": "^4.2.0",
- "vue": "^3.3.4"
+ "preact": "^10.19.2",
+ "svelte": "^4.2.5",
+ "vue": "^3.3.8"
}
}
diff --git a/packages/astro/test/fixtures/fontsource-package/package.json b/packages/astro/test/fixtures/fontsource-package/package.json
index 7cfd6d26cf44..55140976cb6e 100644
--- a/packages/astro/test/fixtures/fontsource-package/package.json
+++ b/packages/astro/test/fixtures/fontsource-package/package.json
@@ -3,8 +3,8 @@
"version": "0.0.0",
"private": true,
"dependencies": {
- "@fontsource/monofett": "5.0.9",
- "@fontsource/montserrat": "5.0.8",
+ "@fontsource/monofett": "5.0.17",
+ "@fontsource/montserrat": "5.0.15",
"astro": "workspace:*"
}
}
diff --git a/packages/astro/test/fixtures/hydration-race/package.json b/packages/astro/test/fixtures/hydration-race/package.json
index aa0a5d47ef8d..08319bc2be2c 100644
--- a/packages/astro/test/fixtures/hydration-race/package.json
+++ b/packages/astro/test/fixtures/hydration-race/package.json
@@ -9,6 +9,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/i18n-routing-fallback/src/pages/index.astro b/packages/astro/test/fixtures/i18n-routing-fallback/src/pages/index.astro
index 05faf7b0bcce..34b39fcd6747 100644
--- a/packages/astro/test/fixtures/i18n-routing-fallback/src/pages/index.astro
+++ b/packages/astro/test/fixtures/i18n-routing-fallback/src/pages/index.astro
@@ -1,8 +1,13 @@
Astro
+
Hello
+
+
diff --git a/packages/astro/test/fixtures/i18n-routing-prefix-always/src/pages/en/start.astro b/packages/astro/test/fixtures/i18n-routing-prefix-always/src/pages/en/start.astro
index 990baecd9a8c..92e189636e78 100644
--- a/packages/astro/test/fixtures/i18n-routing-prefix-always/src/pages/en/start.astro
+++ b/packages/astro/test/fixtures/i18n-routing-prefix-always/src/pages/en/start.astro
@@ -1,8 +1,13 @@
+---
+const currentLocale = Astro.currentLocale;
+---
Astro
Start
+Current Locale: {currentLocale ? currentLocale : "none"}
+
diff --git a/packages/astro/test/fixtures/i18n-routing-prefix-always/src/pages/pt/start.astro b/packages/astro/test/fixtures/i18n-routing-prefix-always/src/pages/pt/start.astro
index 5a4a84c2cf0c..6f82c3790f44 100644
--- a/packages/astro/test/fixtures/i18n-routing-prefix-always/src/pages/pt/start.astro
+++ b/packages/astro/test/fixtures/i18n-routing-prefix-always/src/pages/pt/start.astro
@@ -1,8 +1,12 @@
+---
+const currentLocale = Astro.currentLocale;
+---
Astro
Oi essa e start
+Current Locale: {currentLocale ? currentLocale : "none"}
diff --git a/packages/astro/test/fixtures/i18n-routing/src/pages/current-locale.astro b/packages/astro/test/fixtures/i18n-routing/src/pages/current-locale.astro
new file mode 100644
index 000000000000..64af0118bae7
--- /dev/null
+++ b/packages/astro/test/fixtures/i18n-routing/src/pages/current-locale.astro
@@ -0,0 +1,12 @@
+---
+const currentLocale = Astro.currentLocale;
+---
+
+
+
+ Astro
+
+
+ Current Locale: {currentLocale ? currentLocale : "none"}
+
+
diff --git a/packages/astro/test/fixtures/i18n-routing/src/pages/dynamic/[id].astro b/packages/astro/test/fixtures/i18n-routing/src/pages/dynamic/[id].astro
new file mode 100644
index 000000000000..58141fec05ce
--- /dev/null
+++ b/packages/astro/test/fixtures/i18n-routing/src/pages/dynamic/[id].astro
@@ -0,0 +1,19 @@
+
+---
+export function getStaticPaths() {
+ return [
+ { id: "lorem" }
+ ]
+}
+const currentLocale = Astro.currentLocale;
+
+---
+
+
+
+ Astro
+
+
+Current Locale: {currentLocale ? currentLocale : "none"}
+
+
diff --git a/packages/astro/test/fixtures/i18n-routing/src/pages/pt/start.astro b/packages/astro/test/fixtures/i18n-routing/src/pages/pt/start.astro
index 15a63a7b87f5..9a37428ca626 100644
--- a/packages/astro/test/fixtures/i18n-routing/src/pages/pt/start.astro
+++ b/packages/astro/test/fixtures/i18n-routing/src/pages/pt/start.astro
@@ -1,8 +1,12 @@
+---
+const currentLocale = Astro.currentLocale;
+---
Astro
Hola
+Current Locale: {currentLocale ? currentLocale : "none"}
diff --git a/packages/astro/test/fixtures/jsx/package.json b/packages/astro/test/fixtures/jsx/package.json
index 73113746da07..f4b89d76e9f6 100644
--- a/packages/astro/test/fixtures/jsx/package.json
+++ b/packages/astro/test/fixtures/jsx/package.json
@@ -12,11 +12,11 @@
"astro": "workspace:*"
},
"dependencies": {
- "preact": "^10.17.1",
+ "preact": "^10.19.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
- "solid-js": "^1.7.11",
- "svelte": "^4.2.0",
- "vue": "^3.3.4"
+ "solid-js": "^1.8.5",
+ "svelte": "^4.2.5",
+ "vue": "^3.3.8"
}
}
diff --git a/packages/astro/test/fixtures/large-array/package.json b/packages/astro/test/fixtures/large-array/package.json
index e4559b4aeff6..69f74d040637 100644
--- a/packages/astro/test/fixtures/large-array/package.json
+++ b/packages/astro/test/fixtures/large-array/package.json
@@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/solid-js": "workspace:*",
"astro": "workspace:*",
- "solid-js": "^1.7.11"
+ "solid-js": "^1.8.5"
}
}
diff --git a/packages/astro/test/fixtures/non-html-pages/src/pages/about-object.json.ts b/packages/astro/test/fixtures/non-html-pages/src/pages/about-object.json.ts
deleted file mode 100644
index 3936cbe85ba7..000000000000
--- a/packages/astro/test/fixtures/non-html-pages/src/pages/about-object.json.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// NOTE: test deprecated object form
-// Returns the file body for this non-HTML file.
-// The content type is based off of the extension in the filename,
-// in this case: about.json.
-export async function GET() {
- return {
- body: JSON.stringify({
- name: 'Astro',
- url: 'https://astro.build/',
- }),
- };
-}
diff --git a/packages/astro/test/fixtures/non-html-pages/src/pages/placeholder-object.png.ts b/packages/astro/test/fixtures/non-html-pages/src/pages/placeholder-object.png.ts
deleted file mode 100644
index 11415900400c..000000000000
--- a/packages/astro/test/fixtures/non-html-pages/src/pages/placeholder-object.png.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { promises as fs } from 'node:fs';
-
-import type { APIRoute } from 'astro';
-
-// NOTE: test deprecated object form
-export const GET: APIRoute = async function get() {
- try {
- // Image is in the public domain. Sourced from
- // https://en.wikipedia.org/wiki/File:Portrait_placeholder.png
- const buffer = await fs.readFile('./test/fixtures/non-html-pages/src/images/placeholder.png');
- return {
- body: buffer.toString('binary'),
- encoding: 'binary',
- } as const;
- } catch (error: unknown) {
- throw new Error(`Something went wrong in placeholder.png route!: ${error as string}`);
- }
-};
diff --git a/packages/astro/test/fixtures/non-html-pages/src/pages/placeholder.png.ts b/packages/astro/test/fixtures/non-html-pages/src/pages/placeholder.png.ts
index 50c6b877b09f..1ac93597e62b 100644
--- a/packages/astro/test/fixtures/non-html-pages/src/pages/placeholder.png.ts
+++ b/packages/astro/test/fixtures/non-html-pages/src/pages/placeholder.png.ts
@@ -2,12 +2,13 @@ import { promises as fs } from 'node:fs';
import type { APIRoute } from 'astro';
-export const GET: APIRoute = async function get({ ResponseWithEncoding }) {
+export const GET: APIRoute = async function get() {
try {
// Image is in the public domain. Sourced from
// https://en.wikipedia.org/wiki/File:Portrait_placeholder.png
const buffer = await fs.readFile('./test/fixtures/non-html-pages/src/images/placeholder.png');
- return new ResponseWithEncoding(buffer.toString('binary'), undefined, 'binary')
+ // NOTE: SSG only so not Content-Type needed
+ return new Response(buffer.buffer)
} catch (error: unknown) {
throw new Error(`Something went wrong in placeholder.png route!: ${error as string}`);
}
diff --git a/packages/astro/test/fixtures/postcss/package.json b/packages/astro/test/fixtures/postcss/package.json
index c9e4ba833cda..db86ba46c61c 100644
--- a/packages/astro/test/fixtures/postcss/package.json
+++ b/packages/astro/test/fixtures/postcss/package.json
@@ -9,11 +9,11 @@
"astro": "workspace:*",
"autoprefixer": "^10.4.15",
"postcss": "^8.4.28",
- "solid-js": "^1.7.11",
- "svelte": "^4.2.0",
- "vue": "^3.3.4"
+ "solid-js": "^1.8.5",
+ "svelte": "^4.2.5",
+ "vue": "^3.3.8"
},
"devDependencies": {
- "postcss-preset-env": "^9.1.1"
+ "postcss-preset-env": "^9.3.0"
}
}
diff --git a/packages/astro/test/fixtures/preact-compat-component/package.json b/packages/astro/test/fixtures/preact-compat-component/package.json
index bbab4a6299a4..68de1f1b7fd9 100644
--- a/packages/astro/test/fixtures/preact-compat-component/package.json
+++ b/packages/astro/test/fixtures/preact-compat-component/package.json
@@ -6,6 +6,6 @@
"@astrojs/preact": "workspace:*",
"@test/react-lib": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/preact-component/package.json b/packages/astro/test/fixtures/preact-component/package.json
index bdb2524aabfa..43e8fd8f8463 100644
--- a/packages/astro/test/fixtures/preact-component/package.json
+++ b/packages/astro/test/fixtures/preact-component/package.json
@@ -6,6 +6,6 @@
"@astrojs/preact": "workspace:*",
"@preact/signals": "1.2.1",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/react-and-solid/package.json b/packages/astro/test/fixtures/react-and-solid/package.json
index 01ac7866e634..a585a2c95073 100644
--- a/packages/astro/test/fixtures/react-and-solid/package.json
+++ b/packages/astro/test/fixtures/react-and-solid/package.json
@@ -7,6 +7,6 @@
"astro": "workspace:*",
"react": "^18.2.0",
"react-dom": "^18.1.0",
- "solid-js": "^1.7.11"
+ "solid-js": "^1.8.5"
}
}
diff --git a/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json b/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json
index 0a7f6e7cf6bd..1388cc07a307 100644
--- a/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json
+++ b/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json
@@ -4,6 +4,6 @@
"dependencies": {
"@astrojs/preact": "workspace:",
"astro": "workspace:",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/routing-priority/integration.mjs b/packages/astro/test/fixtures/routing-priority/integration.mjs
index 213812790e64..57ecc307336c 100644
--- a/packages/astro/test/fixtures/routing-priority/integration.mjs
+++ b/packages/astro/test/fixtures/routing-priority/integration.mjs
@@ -5,15 +5,15 @@ export default function() {
'astro:config:setup': ({ injectRoute }) => {
injectRoute({
pattern: '/injected',
- entryPoint: './src/to-inject.astro'
+ entrypoint: './src/to-inject.astro'
});
injectRoute({
pattern: '/_injected',
- entryPoint: './src/_to-inject.astro'
+ entrypoint: './src/_to-inject.astro'
});
injectRoute({
pattern: '/[id]',
- entryPoint: './src/[id].astro'
+ entrypoint: './src/[id].astro'
});
}
}
diff --git a/packages/astro/test/fixtures/routing-priority/src/pages/api/catch/[...slug].json.ts b/packages/astro/test/fixtures/routing-priority/src/pages/api/catch/[...slug].json.ts
index bc7e1b774698..4b26f41e56a0 100644
--- a/packages/astro/test/fixtures/routing-priority/src/pages/api/catch/[...slug].json.ts
+++ b/packages/astro/test/fixtures/routing-priority/src/pages/api/catch/[...slug].json.ts
@@ -1,11 +1,11 @@
import type { APIRoute } from 'astro';
export const GET: APIRoute = async ({ params }) => {
- return {
- body: JSON.stringify({
+ return new Response(
+ JSON.stringify({
path: params.slug,
- }),
- };
+ })
+ );
};
export function getStaticPaths() {
diff --git a/packages/astro/test/fixtures/routing-priority/src/pages/api/catch/[foo]-[bar].json.ts b/packages/astro/test/fixtures/routing-priority/src/pages/api/catch/[foo]-[bar].json.ts
index b06efff6f213..b9d2f0cabff1 100644
--- a/packages/astro/test/fixtures/routing-priority/src/pages/api/catch/[foo]-[bar].json.ts
+++ b/packages/astro/test/fixtures/routing-priority/src/pages/api/catch/[foo]-[bar].json.ts
@@ -1,12 +1,12 @@
import type { APIRoute } from 'astro';
export const GET: APIRoute = async ({ params }) => {
- return {
- body: JSON.stringify({
+ return new Response(
+ JSON.stringify({
foo: params.foo,
- bar: params.bar,
- }),
- };
+ bar: params.bar,
+ })
+ );
};
export function getStaticPaths() {
diff --git a/packages/astro/test/fixtures/slots-preact/package.json b/packages/astro/test/fixtures/slots-preact/package.json
index 33dcf78bccec..bcd612323fd7 100644
--- a/packages/astro/test/fixtures/slots-preact/package.json
+++ b/packages/astro/test/fixtures/slots-preact/package.json
@@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/slots-solid/package.json b/packages/astro/test/fixtures/slots-solid/package.json
index 87b0e75bf01c..688101adf72f 100644
--- a/packages/astro/test/fixtures/slots-solid/package.json
+++ b/packages/astro/test/fixtures/slots-solid/package.json
@@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/solid-js": "workspace:*",
"astro": "workspace:*",
- "solid-js": "^1.7.11"
+ "solid-js": "^1.8.5"
}
}
diff --git a/packages/astro/test/fixtures/slots-svelte/package.json b/packages/astro/test/fixtures/slots-svelte/package.json
index f166a1fc9162..5335dd2add8f 100644
--- a/packages/astro/test/fixtures/slots-svelte/package.json
+++ b/packages/astro/test/fixtures/slots-svelte/package.json
@@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/svelte": "workspace:*",
"astro": "workspace:*",
- "svelte": "^4.2.0"
+ "svelte": "^4.2.5"
}
}
diff --git a/packages/astro/test/fixtures/slots-vue/package.json b/packages/astro/test/fixtures/slots-vue/package.json
index e61cf2bbec64..4beb43ad927d 100644
--- a/packages/astro/test/fixtures/slots-vue/package.json
+++ b/packages/astro/test/fixtures/slots-vue/package.json
@@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
- "vue": "^3.3.4"
+ "vue": "^3.3.8"
}
}
diff --git a/packages/astro/test/fixtures/solid-component/deps/solid-jsx-component/package.json b/packages/astro/test/fixtures/solid-component/deps/solid-jsx-component/package.json
index e9d0ed6c027f..59568a514382 100644
--- a/packages/astro/test/fixtures/solid-component/deps/solid-jsx-component/package.json
+++ b/packages/astro/test/fixtures/solid-component/deps/solid-jsx-component/package.json
@@ -10,6 +10,6 @@
}
},
"dependencies": {
- "solid-js": "^1.7.11"
+ "solid-js": "^1.8.5"
}
}
diff --git a/packages/astro/test/fixtures/solid-component/package.json b/packages/astro/test/fixtures/solid-component/package.json
index 9cd5517550fe..8a8696964ace 100644
--- a/packages/astro/test/fixtures/solid-component/package.json
+++ b/packages/astro/test/fixtures/solid-component/package.json
@@ -4,9 +4,9 @@
"private": true,
"dependencies": {
"@astrojs/solid-js": "workspace:*",
- "@solidjs/router": "^0.8.3",
+ "@solidjs/router": "^0.9.1",
"@test/solid-jsx-component": "file:./deps/solid-jsx-component",
"astro": "workspace:*",
- "solid-js": "^1.7.11"
+ "solid-js": "^1.8.5"
}
}
diff --git a/packages/astro/test/fixtures/ssr-api-route/src/pages/binary.js b/packages/astro/test/fixtures/ssr-api-route/src/pages/binary.js
index 796bf4616be3..b5f1b013617e 100644
--- a/packages/astro/test/fixtures/ssr-api-route/src/pages/binary.js
+++ b/packages/astro/test/fixtures/ssr-api-route/src/pages/binary.js
@@ -4,7 +4,7 @@ export function GET() {
return new Response('ok')
}
-export async function post({ request }) {
+export async function POST({ request }) {
const data = await request.formData();
const file = data.get('file');
diff --git a/packages/astro/test/fixtures/ssr-api-route/src/pages/context/[param].js b/packages/astro/test/fixtures/ssr-api-route/src/pages/context/[param].js
index ba110ee13f4d..d5c9f4033d67 100644
--- a/packages/astro/test/fixtures/ssr-api-route/src/pages/context/[param].js
+++ b/packages/astro/test/fixtures/ssr-api-route/src/pages/context/[param].js
@@ -1,18 +1,16 @@
/**
- * @param {import('astro').APIContext} api
+ * @param {import('astro').APIContext} api
*/
export function GET(ctx) {
- return {
- body: JSON.stringify({
- cookiesExist: !!ctx.cookies,
- requestExist: !!ctx.request,
- redirectExist: !!ctx.redirect,
- propsExist: !!ctx.props,
- params: ctx.params,
- site: ctx.site?.toString(),
- generator: ctx.generator,
- url: ctx.url.toString(),
- clientAddress: ctx.clientAddress,
- })
- };
+ return Response.json({
+ cookiesExist: !!ctx.cookies,
+ requestExist: !!ctx.request,
+ redirectExist: !!ctx.redirect,
+ propsExist: !!ctx.props,
+ params: ctx.params,
+ site: ctx.site?.toString(),
+ generator: ctx.generator,
+ url: ctx.url.toString(),
+ clientAddress: ctx.clientAddress,
+ });
}
diff --git a/packages/astro/test/fixtures/ssr-api-route/src/pages/food-object.json.js b/packages/astro/test/fixtures/ssr-api-route/src/pages/food-object.json.js
deleted file mode 100644
index 7992e697aacc..000000000000
--- a/packages/astro/test/fixtures/ssr-api-route/src/pages/food-object.json.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// NOTE: test deprecated object form
-export function GET() {
- return {
- body: JSON.stringify([
- { name: 'lettuce' },
- { name: 'broccoli' },
- { name: 'pizza' }
- ])
- };
-}
diff --git a/packages/astro/test/fixtures/ssr-dynamic/src/pages/api/products/[id].js b/packages/astro/test/fixtures/ssr-dynamic/src/pages/api/products/[id].js
index 8c7c393029c1..8956f0d4ccc3 100644
--- a/packages/astro/test/fixtures/ssr-dynamic/src/pages/api/products/[id].js
+++ b/packages/astro/test/fixtures/ssr-dynamic/src/pages/api/products/[id].js
@@ -1,6 +1,3 @@
-
export function GET({ params }) {
- return {
- body: JSON.stringify(params)
- };
+ return Response.json(params);
}
diff --git a/packages/astro/test/fixtures/ssr-env/package.json b/packages/astro/test/fixtures/ssr-env/package.json
index 9a78d42135d4..4cc5e8ea5523 100644
--- a/packages/astro/test/fixtures/ssr-env/package.json
+++ b/packages/astro/test/fixtures/ssr-env/package.json
@@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/ssr-prerender-get-static-paths/src/pages/data/[slug].json.ts b/packages/astro/test/fixtures/ssr-prerender-get-static-paths/src/pages/data/[slug].json.ts
index d969873c54d1..7a1b6af28241 100644
--- a/packages/astro/test/fixtures/ssr-prerender-get-static-paths/src/pages/data/[slug].json.ts
+++ b/packages/astro/test/fixtures/ssr-prerender-get-static-paths/src/pages/data/[slug].json.ts
@@ -1,16 +1,14 @@
export const prerender = true;
export async function getStaticPaths() {
- return [
+ return [
{ params: { slug: 'thing1' } },
{ params: { slug: 'thing2' } }
];
}
export async function GET() {
- return {
- body: JSON.stringify({
- title: '[slug]'
- }, null, 4)
- };
+ return Response.json({
+ title: '[slug]',
+ });
}
diff --git a/packages/astro/test/fixtures/ssr-scripts/package.json b/packages/astro/test/fixtures/ssr-scripts/package.json
index 5b4a8abb7624..3489d3ba4248 100644
--- a/packages/astro/test/fixtures/ssr-scripts/package.json
+++ b/packages/astro/test/fixtures/ssr-scripts/package.json
@@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/static-build-frameworks/package.json b/packages/astro/test/fixtures/static-build-frameworks/package.json
index 4df7c2b12642..f2ba47078a67 100644
--- a/packages/astro/test/fixtures/static-build-frameworks/package.json
+++ b/packages/astro/test/fixtures/static-build-frameworks/package.json
@@ -6,7 +6,7 @@
"@astrojs/preact": "workspace:*",
"@astrojs/react": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1",
+ "preact": "^10.19.2",
"react": "^18.1.0",
"react-dom": "^18.1.0"
}
diff --git a/packages/astro/test/fixtures/static-build/package.json b/packages/astro/test/fixtures/static-build/package.json
index df47dd1ef6fc..e8eaa87d3501 100644
--- a/packages/astro/test/fixtures/static-build/package.json
+++ b/packages/astro/test/fixtures/static-build/package.json
@@ -6,6 +6,6 @@
"@astrojs/preact": "workspace:*",
"@test/static-build-pkg": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/astro/test/fixtures/static-build/src/pages/company.json.ts b/packages/astro/test/fixtures/static-build/src/pages/company.json.ts
index 08f45a7b87f8..6a08cc9399bb 100644
--- a/packages/astro/test/fixtures/static-build/src/pages/company.json.ts
+++ b/packages/astro/test/fixtures/static-build/src/pages/company.json.ts
@@ -1,8 +1,6 @@
-export async function GET() {
- return {
- body: JSON.stringify({
- name: 'Astro Technology Company',
- url: 'https://astro.build/'
- })
- }
+export function GET() {
+ return Response.json({
+ name: 'Astro Technology Company',
+ url: 'https://astro.build/',
+ });
}
diff --git a/packages/astro/test/fixtures/static-build/src/pages/data/[slug].json.ts b/packages/astro/test/fixtures/static-build/src/pages/data/[slug].json.ts
index 2fa13ac1820e..2c78812ec107 100644
--- a/packages/astro/test/fixtures/static-build/src/pages/data/[slug].json.ts
+++ b/packages/astro/test/fixtures/static-build/src/pages/data/[slug].json.ts
@@ -6,11 +6,9 @@ export async function getStaticPaths() {
}
export async function GET({ params }) {
- return {
- body: JSON.stringify({
- slug: params.slug,
- name: 'Astro Technology Company',
- url: 'https://astro.build/'
- })
- }
+ return Response.json({
+ slug: params.slug,
+ name: 'Astro Technology Company',
+ url: 'https://astro.build/'
+ });
}
diff --git a/packages/astro/test/fixtures/static-build/src/pages/posts.json.js b/packages/astro/test/fixtures/static-build/src/pages/posts.json.js
index aefbbffff72c..b72a000d9638 100644
--- a/packages/astro/test/fixtures/static-build/src/pages/posts.json.js
+++ b/packages/astro/test/fixtures/static-build/src/pages/posts.json.js
@@ -15,8 +15,5 @@ async function fetchPosts() {
export async function GET() {
const posts = await fetchPosts();
-
- return {
- body: JSON.stringify(posts, null, 4),
- };
+ return Response.json(posts);
}
diff --git a/packages/astro/test/fixtures/svelte-component/package.json b/packages/astro/test/fixtures/svelte-component/package.json
index eb6c574703a9..bc4d8b5aa6ea 100644
--- a/packages/astro/test/fixtures/svelte-component/package.json
+++ b/packages/astro/test/fixtures/svelte-component/package.json
@@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/svelte": "workspace:*",
"astro": "workspace:*",
- "svelte": "^4.2.0"
+ "svelte": "^4.2.5"
}
}
diff --git a/packages/astro/test/fixtures/tailwindcss-ts/package.json b/packages/astro/test/fixtures/tailwindcss-ts/package.json
index a54b4779ec03..98ca7985cddb 100644
--- a/packages/astro/test/fixtures/tailwindcss-ts/package.json
+++ b/packages/astro/test/fixtures/tailwindcss-ts/package.json
@@ -6,6 +6,6 @@
"@astrojs/tailwind": "workspace:*",
"astro": "workspace:*",
"postcss": "^8.4.28",
- "tailwindcss": "^3.3.3"
+ "tailwindcss": "^3.3.5"
}
}
diff --git a/packages/astro/test/fixtures/tailwindcss/package.json b/packages/astro/test/fixtures/tailwindcss/package.json
index 6117883a9571..7815a3b2eee2 100644
--- a/packages/astro/test/fixtures/tailwindcss/package.json
+++ b/packages/astro/test/fixtures/tailwindcss/package.json
@@ -8,6 +8,6 @@
"astro": "workspace:*",
"autoprefixer": "^10.4.15",
"postcss": "^8.4.28",
- "tailwindcss": "^3.3.3"
+ "tailwindcss": "^3.3.5"
}
}
diff --git a/packages/astro/test/fixtures/third-party-astro/package.json b/packages/astro/test/fixtures/third-party-astro/package.json
index cd9d0743c178..01bdf2b209e6 100644
--- a/packages/astro/test/fixtures/third-party-astro/package.json
+++ b/packages/astro/test/fixtures/third-party-astro/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"astro": "workspace:*",
- "astro-embed": "^0.5.1"
+ "astro-embed": "^0.6.0"
}
}
diff --git a/packages/astro/test/fixtures/vue-component/package.json b/packages/astro/test/fixtures/vue-component/package.json
index b1f716dd65fc..7913b77208d0 100644
--- a/packages/astro/test/fixtures/vue-component/package.json
+++ b/packages/astro/test/fixtures/vue-component/package.json
@@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
- "vue": "^3.3.4"
+ "vue": "^3.3.8"
}
}
diff --git a/packages/astro/test/fixtures/vue-jsx/package.json b/packages/astro/test/fixtures/vue-jsx/package.json
index e04e8077d66c..76bd57acfa42 100644
--- a/packages/astro/test/fixtures/vue-jsx/package.json
+++ b/packages/astro/test/fixtures/vue-jsx/package.json
@@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
- "vue": "^3.3.4"
+ "vue": "^3.3.8"
}
}
diff --git a/packages/astro/test/fixtures/vue-with-multi-renderer/package.json b/packages/astro/test/fixtures/vue-with-multi-renderer/package.json
index 476c7f680fb6..adc755525994 100644
--- a/packages/astro/test/fixtures/vue-with-multi-renderer/package.json
+++ b/packages/astro/test/fixtures/vue-with-multi-renderer/package.json
@@ -6,7 +6,7 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
- "svelte": "^4.2.0",
- "vue": "^3.3.4"
+ "svelte": "^4.2.5",
+ "vue": "^3.3.8"
}
}
diff --git a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/[slug].json.ts b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/[slug].json.ts
index 783031605467..3c1408300f25 100644
--- a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/[slug].json.ts
+++ b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/[slug].json.ts
@@ -6,10 +6,8 @@ export async function getStaticPaths() {
}
export async function GET({ params }) {
- return {
- body: JSON.stringify({
- slug: params.slug,
- title: '[slug]'
- })
- };
+ return Response.json({
+ slug: params.slug,
+ title: '[slug]'
+ });
}
diff --git a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/data/[slug].json.ts b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/data/[slug].json.ts
index 707c39fa9c9c..26cd9b065c34 100644
--- a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/data/[slug].json.ts
+++ b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/data/[slug].json.ts
@@ -6,10 +6,8 @@ export async function getStaticPaths() {
}
export async function GET({ params }) {
- return {
- body: JSON.stringify({
- slug: params.slug,
- title: 'data [slug]'
- })
- };
+ return Response.json({
+ slug: params.slug,
+ title: 'data [slug]'
+ });
}
diff --git a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/home.json.ts b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/home.json.ts
index 5eaac42f1d57..2bee50a8e328 100644
--- a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/home.json.ts
+++ b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/home.json.ts
@@ -1,7 +1,3 @@
export async function GET() {
- return {
- body: JSON.stringify({
- title: 'home'
- })
- };
+ return Response.json({ title: 'home' });
}
diff --git a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/[image].svg.ts b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/[image].svg.ts
index c6fa88711671..cef9dd60855d 100644
--- a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/[image].svg.ts
+++ b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/[image].svg.ts
@@ -1,14 +1,16 @@
export async function getStaticPaths() {
- return [
- { params: { image: 1 } },
- { params: { image: 2 } },
- ];
+ return [{ params: { image: 1 } }, { params: { image: 2 } }];
}
export async function GET({ params }) {
- return {
- body: ``,
+ {
+ headers: {
+ 'content-type': 'image/svg+xml',
+ },
+ }
+ );
}
diff --git a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/hex.ts b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/hex.ts
index 84dd6dcaa19a..c258c3091c2d 100644
--- a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/hex.ts
+++ b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/hex.ts
@@ -1,9 +1,6 @@
-import { readFileSync } from "node:fs";
+import { readFile } from 'node:fs/promises';
-export async function GET({ params, request }) {
- const buffer = readFileSync(new URL('../../astro.png', import.meta.url));
- return {
- body: buffer.toString('hex'),
- encoding: 'hex',
- };
+export async function GET() {
+ const buffer = await readFile(new URL('../../astro.png', import.meta.url));
+ return new Response(buffer.buffer);
}
diff --git a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/static.svg.ts b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/static.svg.ts
index 93fcf40228bc..423f258f8c17 100644
--- a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/static.svg.ts
+++ b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/static.svg.ts
@@ -1,7 +1,12 @@
-export async function GET() {
- return {
- body: ``,
+ {
+ headers: {
+ 'content-type': 'image/svg+xml',
+ },
+ }
+ );
}
diff --git a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/invalid-redirect.json.ts b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/invalid-redirect.json.ts
index b1b48634f145..9e8e40580ea8 100644
--- a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/invalid-redirect.json.ts
+++ b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/invalid-redirect.json.ts
@@ -1,4 +1,4 @@
-export const get = () => {
+export const GET = () => {
return new Response(
undefined,
{
diff --git a/packages/astro/test/i18-routing.test.js b/packages/astro/test/i18n-routing.test.js
similarity index 89%
rename from packages/astro/test/i18-routing.test.js
rename to packages/astro/test/i18n-routing.test.js
index a7e8b318d371..52ebeda23ae1 100644
--- a/packages/astro/test/i18-routing.test.js
+++ b/packages/astro/test/i18n-routing.test.js
@@ -639,6 +639,71 @@ describe('[SSG] i18n routing', () => {
return true;
}
});
+
+ it('should render the page with client scripts', async () => {
+ let html = await fixture.readFile('/index.html');
+ let $ = cheerio.load(html);
+ expect($('script').text()).includes('console.log("this is a script")');
+ });
+ });
+
+ describe('i18n routing with fallback and [prefix-always]', () => {
+ /** @type {import('./test-utils').Fixture} */
+ let fixture;
+
+ before(async () => {
+ fixture = await loadFixture({
+ root: './fixtures/i18n-routing-prefix-always/',
+ experimental: {
+ i18n: {
+ defaultLocale: 'en',
+ locales: ['en', 'pt', 'it'],
+ fallback: {
+ it: 'en',
+ },
+ routingStrategy: 'prefix-always',
+ },
+ },
+ });
+ await fixture.build();
+ });
+
+ // TODO: enable once we fix fallback
+ it.skip('should render the en locale', async () => {
+ let html = await fixture.readFile('/it/start/index.html');
+ expect(html).to.include('http-equiv="refresh');
+ expect(html).to.include('url=/new-site/en/start');
+ });
+ });
+
+ describe('i18n routing with fallback and redirect', () => {
+ /** @type {import('./test-utils').Fixture} */
+ let fixture;
+
+ before(async () => {
+ fixture = await loadFixture({
+ root: './fixtures/i18n-routing-fallback/',
+ redirects: {
+ '/': '/en',
+ },
+ experimental: {
+ i18n: {
+ defaultLocale: 'en',
+ locales: ['en', 'pt', 'it'],
+ fallback: {
+ it: 'en',
+ },
+ },
+ },
+ });
+ await fixture.build();
+ });
+
+ it('should render the en locale', async () => {
+ let html = await fixture.readFile('/index.html');
+ expect(html).to.include('http-equiv="refresh');
+ expect(html).to.include('Redirecting to: /en');
+ });
});
});
describe('[SSR] i18n routing', () => {
@@ -991,6 +1056,73 @@ describe('[SSR] i18n routing', () => {
});
});
});
+
+ describe('current locale', () => {
+ describe('with [prefix-other-locales]', () => {
+ /** @type {import('./test-utils').Fixture} */
+ let fixture;
+
+ before(async () => {
+ fixture = await loadFixture({
+ root: './fixtures/i18n-routing/',
+ output: 'server',
+ adapter: testAdapter(),
+ });
+ await fixture.build();
+ app = await fixture.loadTestAdapterApp();
+ });
+
+ it('should return the default locale', async () => {
+ let request = new Request('http://example.com/current-locale', {});
+ let response = await app.render(request);
+ expect(response.status).to.equal(200);
+ expect(await response.text()).includes('Current Locale: en');
+ });
+
+ it('should return the default locale of the current URL', async () => {
+ let request = new Request('http://example.com/pt/start', {});
+ let response = await app.render(request);
+ expect(response.status).to.equal(200);
+ expect(await response.text()).includes('Current Locale: pt');
+ });
+
+ it('should return the default locale when a route is dynamic', async () => {
+ let request = new Request('http://example.com/dynamic/lorem', {});
+ let response = await app.render(request);
+ expect(response.status).to.equal(200);
+ expect(await response.text()).includes('Current Locale: en');
+ });
+ });
+
+ describe('with [prefix-always]', () => {
+ /** @type {import('./test-utils').Fixture} */
+ let fixture;
+
+ before(async () => {
+ fixture = await loadFixture({
+ root: './fixtures/i18n-routing-prefix-always/',
+ output: 'server',
+ adapter: testAdapter(),
+ });
+ await fixture.build();
+ app = await fixture.loadTestAdapterApp();
+ });
+
+ it('should return the locale of the current URL (en)', async () => {
+ let request = new Request('http://example.com/en/start', {});
+ let response = await app.render(request);
+ expect(response.status).to.equal(200);
+ expect(await response.text()).includes('Current Locale: en');
+ });
+
+ it('should return the locale of the current URL (pt)', async () => {
+ let request = new Request('http://example.com/pt/start', {});
+ let response = await app.render(request);
+ expect(response.status).to.equal(200);
+ expect(await response.text()).includes('Current Locale: pt');
+ });
+ });
+ });
});
describe('i18n routing does not break assets and endpoints', () => {
diff --git a/packages/astro/test/middleware.test.js b/packages/astro/test/middleware.test.js
index 8332dfe41949..c858f37a826e 100644
--- a/packages/astro/test/middleware.test.js
+++ b/packages/astro/test/middleware.test.js
@@ -251,8 +251,8 @@ describe('Middleware API in PROD mode, SSR', () => {
it('should correctly call the middleware function for 404', async () => {
const request = new Request('http://example.com/funky-url');
- const routeData = app.match(request, { matchNotFound: true });
- const response = await app.render(request, routeData);
+ const routeData = app.match(request);
+ const response = await app.render(request, { routeData });
const text = await response.text();
expect(text.includes('Error')).to.be.true;
expect(text.includes('bar')).to.be.true;
@@ -260,7 +260,7 @@ describe('Middleware API in PROD mode, SSR', () => {
it('should render 500.astro when the middleware throws an error', async () => {
const request = new Request('http://example.com/throw');
- const routeData = app.match(request, { matchNotFound: true });
+ const routeData = app.match(request);
const response = await app.render(request, routeData);
expect(response).to.deep.include({ status: 500 });
@@ -277,6 +277,11 @@ describe('Middleware API in PROD mode, SSR', () => {
excludeMiddleware: true,
},
adapter: testAdapter({
+ extendAdapter: {
+ adapterFeatures: {
+ edgeMiddleware: true,
+ },
+ },
setMiddlewareEntryPoint(entryPointsOrMiddleware) {
middlewarePath = entryPointsOrMiddleware;
},
@@ -317,7 +322,9 @@ describe('Middleware with tailwind', () => {
});
});
-describe('Middleware, split middleware option', () => {
+// `loadTestAdapterApp()` does not understand how to load the page with `functionPerRoute`
+// since there's no `entry.mjs`. Skip for now.
+describe.skip('Middleware supports functionPerRoute feature', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
@@ -325,10 +332,13 @@ describe('Middleware, split middleware option', () => {
fixture = await loadFixture({
root: './fixtures/middleware space/',
output: 'server',
- build: {
- excludeMiddleware: true,
- },
- adapter: testAdapter({}),
+ adapter: testAdapter({
+ extendAdapter: {
+ adapterFeatures: {
+ functionPerRoute: true,
+ },
+ },
+ }),
});
await fixture.build();
});
diff --git a/packages/astro/test/non-html-pages.test.js b/packages/astro/test/non-html-pages.test.js
index 2cf5811041bc..9f050ae96f35 100644
--- a/packages/astro/test/non-html-pages.test.js
+++ b/packages/astro/test/non-html-pages.test.js
@@ -15,12 +15,6 @@ describe('Non-HTML Pages', () => {
expect(json).to.have.property('name', 'Astro');
expect(json).to.have.property('url', 'https://astro.build/');
});
-
- it('should match contents (deprecated object form)', async () => {
- const json = JSON.parse(await fixture.readFile('/about-object.json'));
- expect(json).to.have.property('name', 'Astro');
- expect(json).to.have.property('url', 'https://astro.build/');
- });
});
describe('png', () => {
@@ -40,22 +34,5 @@ describe('Non-HTML Pages', () => {
'iVBORw0KGgoAAAANSUhEUgAAAGQAAACWCAMAAAAfZt10AAAABlBMVEXd3d3+/v7B/CFgAAAA3UlEQVR42u3ZMQ7DIBQFQeb+l06bNgUbG/5eYApLFjzWNE3TNE3TNE035av9AhAQEBBQGAQEFAaFQWFQGBQGhUGCKAwKgwQpDJ6JECgCRYIEikH8YAyCRyEGyRCDvBWRIPNNBpm/8G6kUM45EhXKlQfuFSHFpbFH+jt2j/S7xwqUYvBaCRIozZy6X2km7v1K8uwQIIWBwkBAQEBg3Tyj3z4LnzRBKgwKg8KgMEgQhaEwSBCFQWBEiMIgQQqDBCkMEqQw+APixYgcsa0TERs7D/F6xGmIAxCD/Iw4AvEB92Ec3ZAPdlMAAAAASUVORK5CYII='
);
});
-
- it('should not have had its encoding mangled (deprecated object form)', async () => {
- const buffer = await fixture.readFile('/placeholder-object.png', 'base64');
-
- // Sanity check the first byte
- const hex = Buffer.from(buffer, 'base64').toString('hex');
- const firstHexByte = hex.slice(0, 2);
- // If we accidentally utf8 encode the png, the first byte (in hex) will be 'c2'
- expect(firstHexByte).to.not.equal('c2');
- // and if correctly encoded in binary, it should be '89'
- expect(firstHexByte).to.equal('89');
-
- // Make sure the whole buffer (in base64) matches this snapshot
- expect(buffer).to.equal(
- 'iVBORw0KGgoAAAANSUhEUgAAAGQAAACWCAMAAAAfZt10AAAABlBMVEXd3d3+/v7B/CFgAAAA3UlEQVR42u3ZMQ7DIBQFQeb+l06bNgUbG/5eYApLFjzWNE3TNE3TNE035av9AhAQEBBQGAQEFAaFQWFQGBQGhUGCKAwKgwQpDJ6JECgCRYIEikH8YAyCRyEGyRCDvBWRIPNNBpm/8G6kUM45EhXKlQfuFSHFpbFH+jt2j/S7xwqUYvBaCRIozZy6X2km7v1K8uwQIIWBwkBAQEBg3Tyj3z4LnzRBKgwKg8KgMEgQhaEwSBCFQWBEiMIgQQqDBCkMEqQw+APixYgcsa0TERs7D/F6xGmIAxCD/Iw4AvEB92Ec3ZAPdlMAAAAASUVORK5CYII='
- );
- });
});
});
diff --git a/packages/astro/test/parallel.js b/packages/astro/test/parallel.test.js
similarity index 100%
rename from packages/astro/test/parallel.js
rename to packages/astro/test/parallel.test.js
diff --git a/packages/astro/test/ssr-404-500-pages.test.js b/packages/astro/test/ssr-404-500-pages.test.js
index 253f9bc1ca99..1c735e88995d 100644
--- a/packages/astro/test/ssr-404-500-pages.test.js
+++ b/packages/astro/test/ssr-404-500-pages.test.js
@@ -56,7 +56,7 @@ describe('404 and 500 pages', () => {
it('404 page returned when a route does not match and passing routeData', async () => {
const app = await fixture.loadTestAdapterApp();
const request = new Request('http://example.com/some/fake/route');
- const routeData = app.match(request, { matchNotFound: true });
+ const routeData = app.match(request);
const response = await app.render(request, routeData);
expect(response.status).to.equal(404);
const html = await response.text();
diff --git a/packages/astro/test/ssr-adapter-build-config.test.js b/packages/astro/test/ssr-adapter-build-config.test.js
index d739cee3cd09..5d2221c31298 100644
--- a/packages/astro/test/ssr-adapter-build-config.test.js
+++ b/packages/astro/test/ssr-adapter-build-config.test.js
@@ -47,6 +47,7 @@ describe('Integration buildConfig hook', () => {
name: 'my-ssr-adapter',
serverEntrypoint: '@my-ssr',
exports: ['manifest', 'createApp'],
+ supportedAstroFeatures: {},
});
},
},
diff --git a/packages/astro/test/ssr-api-route.test.js b/packages/astro/test/ssr-api-route.test.js
index fbaafc82275c..e15993b88681 100644
--- a/packages/astro/test/ssr-api-route.test.js
+++ b/packages/astro/test/ssr-api-route.test.js
@@ -33,17 +33,6 @@ describe('API routes in SSR', () => {
expect(body.length).to.equal(3);
});
- it('Can load the API route too (deprecated object form)', async () => {
- const app = await fixture.loadTestAdapterApp();
- const request = new Request('http://example.com/food-object.json');
- const response = await app.render(request);
- expect(response.status).to.equal(200);
- expect(response.headers.get('Content-Type')).to.equal('application/json;charset=utf-8');
- expect(response.headers.get('Content-Length')).to.not.be.empty;
- const body = await response.json();
- expect(body.length).to.equal(3);
- });
-
it('Has valid api context', async () => {
const app = await fixture.loadTestAdapterApp();
const request = new Request('http://example.com/context/any');
@@ -96,13 +85,6 @@ describe('API routes in SSR', () => {
expect(res.status).to.equal(200);
});
- it('Infer content type with charset for { body } shorthand (deprecated object form)', async () => {
- const response = await fixture.fetch('/food-object.json', {
- method: 'GET',
- });
- expect(response.headers.get('Content-Type')).to.equal('application/json;charset=utf-8');
- });
-
it('Can set multiple headers of the same type', async () => {
const response = await new Promise((resolve) => {
let { port } = devServer.address;
diff --git a/packages/astro/test/ssr-dynamic.test.js b/packages/astro/test/ssr-dynamic.test.js
index 62e67e410d32..f867ff999d71 100644
--- a/packages/astro/test/ssr-dynamic.test.js
+++ b/packages/astro/test/ssr-dynamic.test.js
@@ -18,7 +18,7 @@ describe('Dynamic pages in SSR', () => {
'astro:config:setup': ({ injectRoute }) => {
injectRoute({
pattern: '/path-alias/[id]',
- entryPoint: './src/pages/api/products/[id].js',
+ entrypoint: './src/pages/api/products/[id].js',
});
},
},
diff --git a/packages/astro/test/ssr-locals.test.js b/packages/astro/test/ssr-locals.test.js
index 41e5710fbbb8..68e628990859 100644
--- a/packages/astro/test/ssr-locals.test.js
+++ b/packages/astro/test/ssr-locals.test.js
@@ -20,7 +20,7 @@ describe('SSR Astro.locals from server', () => {
const app = await fixture.loadTestAdapterApp();
const request = new Request('http://example.com/foo');
const locals = { foo: 'bar' };
- const response = await app.render(request, undefined, locals);
+ const response = await app.render(request, { locals });
const html = await response.text();
const $ = cheerio.load(html);
diff --git a/packages/astro/test/ssr-split-manifest.test.js b/packages/astro/test/ssr-split-manifest.test.js
index 89c8e00ef898..74d2fe74e574 100644
--- a/packages/astro/test/ssr-split-manifest.test.js
+++ b/packages/astro/test/ssr-split-manifest.test.js
@@ -109,7 +109,6 @@ describe('astro:ssr-manifest, split', () => {
const request = new Request('http://example.com/');
const response = await app.render(request);
const html = await response.text();
- console.log(html);
expect(html.includes('Testing')).to.be.true;
});
});
diff --git a/packages/astro/test/test-adapter.js b/packages/astro/test/test-adapter.js
index 0090b6d9da92..0a30583b22e7 100644
--- a/packages/astro/test/test-adapter.js
+++ b/packages/astro/test/test-adapter.js
@@ -77,15 +77,7 @@ export default function (
name: 'my-ssr-adapter',
serverEntrypoint: '@my-ssr',
exports: ['manifest', 'createApp'],
- supportedFeatures: {
- assets: {
- supportKind: 'Stable',
- isNodeCompatible: true,
- },
- serverOutput: 'Stable',
- staticOutput: 'Stable',
- hybridOutput: 'Stable',
- },
+ supportedAstroFeatures: {},
...extendAdapter,
});
},
diff --git a/packages/astro/test/units/dev/dev.test.js b/packages/astro/test/units/dev/dev.test.js
index 810d8d1c3084..52fb203c3ad6 100644
--- a/packages/astro/test/units/dev/dev.test.js
+++ b/packages/astro/test/units/dev/dev.test.js
@@ -133,7 +133,7 @@ describe('dev container', () => {
'astro:config:setup': ({ injectRoute }) => {
injectRoute({
pattern: '/another-[slug]',
- entryPoint: './src/components/test.astro',
+ entrypoint: './src/components/test.astro',
});
},
},
@@ -184,7 +184,7 @@ describe('dev container', () => {
'astro:config:setup': ({ injectRoute }) => {
injectRoute({
pattern: '/404',
- entryPoint: './src/components/404.astro',
+ entrypoint: './src/components/404.astro',
});
},
},
@@ -199,7 +199,6 @@ describe('dev container', () => {
container.handle(r.req, r.res);
await r.done;
const doc = await r.text();
- console.log(doc);
expect(doc).to.match(/Regular page/);
expect(r.res.statusCode).to.equal(200);
}
diff --git a/packages/astro/test/units/i18n/astro_i18n.js b/packages/astro/test/units/i18n/astro_i18n.test.js
similarity index 99%
rename from packages/astro/test/units/i18n/astro_i18n.js
rename to packages/astro/test/units/i18n/astro_i18n.test.js
index f90ad14e69ef..63e2df83326d 100644
--- a/packages/astro/test/units/i18n/astro_i18n.js
+++ b/packages/astro/test/units/i18n/astro_i18n.test.js
@@ -636,6 +636,7 @@ describe('getLocaleAbsoluteUrl', () => {
...config.experimental.i18n,
trailingSlash: 'never',
format: 'directory',
+ site: 'https://example.com',
})
).to.eq('https://example.com/blog');
expect(
@@ -645,6 +646,7 @@ describe('getLocaleAbsoluteUrl', () => {
...config.experimental.i18n,
trailingSlash: 'always',
format: 'directory',
+ site: 'https://example.com',
})
).to.eq('https://example.com/blog/es/');
@@ -655,6 +657,7 @@ describe('getLocaleAbsoluteUrl', () => {
...config.experimental.i18n,
trailingSlash: 'ignore',
format: 'directory',
+ site: 'https://example.com',
})
).to.eq('https://example.com/blog/');
@@ -666,6 +669,7 @@ describe('getLocaleAbsoluteUrl', () => {
...config.experimental.i18n,
trailingSlash: 'never',
format: 'file',
+ site: 'https://example.com',
})
).to.eq('https://example.com/blog');
expect(
@@ -675,6 +679,7 @@ describe('getLocaleAbsoluteUrl', () => {
...config.experimental.i18n,
trailingSlash: 'always',
format: 'file',
+ site: 'https://example.com',
})
).to.eq('https://example.com/blog/es/');
@@ -686,6 +691,7 @@ describe('getLocaleAbsoluteUrl', () => {
...config.experimental.i18n,
trailingSlash: 'ignore',
format: 'file',
+ site: 'https://example.com',
})
).to.eq('https://example.com/blog');
});
diff --git a/packages/astro/test/units/integrations/api.test.js b/packages/astro/test/units/integrations/api.test.js
index a4a76975a341..8960e662dcb9 100644
--- a/packages/astro/test/units/integrations/api.test.js
+++ b/packages/astro/test/units/integrations/api.test.js
@@ -106,7 +106,7 @@ describe('Astro feature map', function () {
it('should not support the feature when not provided', () => {
let result = validateSupportedFeatures(
'test',
- undefined,
+ {},
{
output: 'hybrid',
},
diff --git a/packages/create-astro/CHANGELOG.md b/packages/create-astro/CHANGELOG.md
index d50bb1c7f8b1..76b53508976e 100644
--- a/packages/create-astro/CHANGELOG.md
+++ b/packages/create-astro/CHANGELOG.md
@@ -1,5 +1,11 @@
# create-astro
+## 4.5.2-beta.0
+
+### Patch Changes
+
+- [#9105](https://github.com/withastro/astro/pull/9105) [`6201bbe96`](https://github.com/withastro/astro/commit/6201bbe96c2a083fb201e4a43a9bd88499821a3e) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Stop clearing the console on start
+
## 4.5.1
### Patch Changes
diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json
index 7aa1b62f6e2e..2699b11948a0 100644
--- a/packages/create-astro/package.json
+++ b/packages/create-astro/package.json
@@ -1,6 +1,6 @@
{
"name": "create-astro",
- "version": "4.5.1",
+ "version": "4.5.2-beta.0",
"type": "module",
"author": "withastro",
"license": "MIT",
@@ -32,7 +32,7 @@
"//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES",
"dependencies": {
"@astrojs/cli-kit": "^0.3.1",
- "giget": "1.1.2"
+ "giget": "1.1.3"
},
"devDependencies": {
"arg": "^5.0.2",
diff --git a/packages/create-astro/src/actions/dependencies.ts b/packages/create-astro/src/actions/dependencies.ts
index e920fcf8e482..26557d5a2f1d 100644
--- a/packages/create-astro/src/actions/dependencies.ts
+++ b/packages/create-astro/src/actions/dependencies.ts
@@ -51,6 +51,14 @@ async function install({ packageManager, cwd }: { packageManager: string; cwd: s
return shell(packageManager, ['install'], { cwd, timeout: 90_000, stdio: 'ignore' });
}
+/**
+ * Yarn Berry (PnP) versions will throw an error if there isn't an existing `yarn.lock` file
+ * If a `yarn.lock` file doesn't exist, this function writes an empty `yarn.lock` one.
+ * Unfortunately this hack is required to run `yarn install`.
+ *
+ * The empty `yarn.lock` file is immediately overwritten by the installation process.
+ * See https://github.com/withastro/astro/pull/8028
+ */
async function ensureYarnLock({ cwd }: { cwd: string }) {
const yarnLock = path.join(cwd, 'yarn.lock');
if (fs.existsSync(yarnLock)) return;
diff --git a/packages/create-astro/test/typescript.test.js b/packages/create-astro/test/typescript.test.js
index 498d3384b8a8..461a3ed63745 100644
--- a/packages/create-astro/test/typescript.test.js
+++ b/packages/create-astro/test/typescript.test.js
@@ -5,7 +5,6 @@ import { fileURLToPath } from 'node:url';
import { typescript, setupTypeScript } from '../dist/index.js';
import { setup, resetFixtures } from './utils.js';
-import { describe } from 'node:test';
describe('typescript', () => {
const fixture = setup();
diff --git a/packages/integrations/lit/package.json b/packages/integrations/lit/package.json
index 252a412d17ef..dd29cde62b44 100644
--- a/packages/integrations/lit/package.json
+++ b/packages/integrations/lit/package.json
@@ -59,7 +59,7 @@
"cheerio": "1.0.0-rc.12",
"lit": "^2.8.0",
"mocha": "^10.2.0",
- "sass": "^1.66.1"
+ "sass": "^1.69.5"
},
"peerDependencies": {
"@webcomponents/template-shadowroot": "^0.2.1",
diff --git a/packages/integrations/markdoc/CHANGELOG.md b/packages/integrations/markdoc/CHANGELOG.md
index 574607c2859a..57916bc436b1 100644
--- a/packages/integrations/markdoc/CHANGELOG.md
+++ b/packages/integrations/markdoc/CHANGELOG.md
@@ -1,5 +1,12 @@
# @astrojs/markdoc
+## 1.0.0-beta.0
+
+### Patch Changes
+
+- Updated dependencies [[`abf601233`](https://github.com/withastro/astro/commit/abf601233f8188d118a8cb063c777478d8d9f1a3), [`6201bbe96`](https://github.com/withastro/astro/commit/6201bbe96c2a083fb201e4a43a9bd88499821a3e), [`cdabf6ef0`](https://github.com/withastro/astro/commit/cdabf6ef02be7220fd2b6bdcef924ceca089381e), [`1c48ed286`](https://github.com/withastro/astro/commit/1c48ed286538ab9e354eca4e4dcd7c6385c96721), [`37697a2c5`](https://github.com/withastro/astro/commit/37697a2c5511572dc29c0a4ea46f90c2f62be8e6), [`bd0c2e9ae`](https://github.com/withastro/astro/commit/bd0c2e9ae3389a9d3085050c1e8134ae98dff299), [`0fe3a7ed5`](https://github.com/withastro/astro/commit/0fe3a7ed5d7bb1a9fce1623e84ba14104b51223c), [`710be505c`](https://github.com/withastro/astro/commit/710be505c9ddf416e77a75343d8cae9c497d72c6), [`153a5abb9`](https://github.com/withastro/astro/commit/153a5abb905042ac68b712514dc9ec387d3e6b17)]:
+ - astro@4.0.0-beta.0
+
## 0.7.2
### Patch Changes
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index 19657879dff2..2254c5247359 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -1,7 +1,7 @@
{
"name": "@astrojs/markdoc",
"description": "Add support for Markdoc in your Astro site",
- "version": "0.7.2",
+ "version": "1.0.0-beta.0",
"type": "module",
"types": "./dist/index.d.ts",
"author": "withastro",
@@ -65,29 +65,29 @@
"dependencies": {
"@astrojs/internal-helpers": "workspace:*",
"@astrojs/prism": "workspace:*",
- "@markdoc/markdoc": "^0.3.0",
- "esbuild": "^0.19.2",
+ "@markdoc/markdoc": "^0.3.5",
+ "esbuild": "^0.19.6",
"github-slugger": "^2.0.0",
"gray-matter": "^4.0.3",
"htmlparser2": "^9.0.0",
"kleur": "^4.1.5",
- "shikiji": "^0.6.8",
+ "shikiji": "^0.6.13",
"zod": "^3.22.4"
},
"peerDependencies": {
- "astro": "^3.0.0"
+ "astro": "^4.0.0-beta.0"
},
"devDependencies": {
"@astrojs/markdown-remark": "workspace:*",
- "@types/chai": "^4.3.5",
- "@types/html-escaper": "^3.0.0",
- "@types/markdown-it": "^13.0.0",
- "@types/mocha": "^10.0.1",
+ "@types/chai": "^4.3.10",
+ "@types/html-escaper": "^3.0.2",
+ "@types/markdown-it": "^13.0.6",
+ "@types/mocha": "^10.0.4",
"astro": "workspace:*",
"astro-scripts": "workspace:*",
"chai": "^4.3.7",
"devalue": "^4.3.2",
- "linkedom": "^0.15.1",
+ "linkedom": "^0.16.4",
"mocha": "^10.2.0",
"vite": "^5.0.0"
},
diff --git a/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/collection.json.js b/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/collection.json.js
index 98ae36a58247..cb3c84652622 100644
--- a/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/collection.json.js
+++ b/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/collection.json.js
@@ -2,9 +2,7 @@ import { getCollection } from 'astro:content';
import { stringify } from 'devalue';
import { stripAllRenderFn } from '../../utils.js';
-export async function get() {
+export async function GET() {
const posts = await getCollection('blog');
- return {
- body: stringify(stripAllRenderFn(posts))
- };
+ return new Response(stringify(stripAllRenderFn(posts)));
}
diff --git a/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/entry.json.js b/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/entry.json.js
index 7899a757a929..53dd17013ba7 100644
--- a/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/entry.json.js
+++ b/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/entry.json.js
@@ -2,9 +2,7 @@ import { getEntryBySlug } from 'astro:content';
import { stringify } from 'devalue';
import { stripRenderFn } from '../../utils.js';
-export async function get() {
+export async function GET() {
const post = await getEntryBySlug('blog', 'post-1');
- return {
- body: stringify(stripRenderFn(post)),
- };
+ return new Response(stringify(stripRenderFn(post)));
}
diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md
index 80febcb54e0e..11632d110a1e 100644
--- a/packages/integrations/mdx/CHANGELOG.md
+++ b/packages/integrations/mdx/CHANGELOG.md
@@ -1,5 +1,19 @@
# @astrojs/mdx
+## 2.0.0-beta.0
+
+### Major Changes
+
+- [#9138](https://github.com/withastro/astro/pull/9138) [`abf601233`](https://github.com/withastro/astro/commit/abf601233f8188d118a8cb063c777478d8d9f1a3) Thanks [@bluwy](https://github.com/bluwy)! - Updates the unified, remark, and rehype dependencies to latest. Make sure to update your custom remark and rehype plugins as well to be compatible with the latest versions.
+
+ **Potentially breaking change:** The default value of `markdown.remarkRehype.footnoteBackLabel` is changed from `"Back to content"` to `"Back to reference 1"`. See the `mdast-util-to-hast` [commit](https://github.com/syntax-tree/mdast-util-to-hast/commit/56c88e45690be138fad9f0bf367b939d09816863) for more information.
+
+### Patch Changes
+
+- Updated dependencies [[`abf601233`](https://github.com/withastro/astro/commit/abf601233f8188d118a8cb063c777478d8d9f1a3), [`6201bbe96`](https://github.com/withastro/astro/commit/6201bbe96c2a083fb201e4a43a9bd88499821a3e), [`cdabf6ef0`](https://github.com/withastro/astro/commit/cdabf6ef02be7220fd2b6bdcef924ceca089381e), [`addb57c8e`](https://github.com/withastro/astro/commit/addb57c8e80b7b67ec61224666f3a1db5c44410c), [`1c48ed286`](https://github.com/withastro/astro/commit/1c48ed286538ab9e354eca4e4dcd7c6385c96721), [`37697a2c5`](https://github.com/withastro/astro/commit/37697a2c5511572dc29c0a4ea46f90c2f62be8e6), [`bd0c2e9ae`](https://github.com/withastro/astro/commit/bd0c2e9ae3389a9d3085050c1e8134ae98dff299), [`c7953645e`](https://github.com/withastro/astro/commit/c7953645eeaaf9e87c6db4494b0023d2c1878ff0), [`0fe3a7ed5`](https://github.com/withastro/astro/commit/0fe3a7ed5d7bb1a9fce1623e84ba14104b51223c), [`710be505c`](https://github.com/withastro/astro/commit/710be505c9ddf416e77a75343d8cae9c497d72c6), [`153a5abb9`](https://github.com/withastro/astro/commit/153a5abb905042ac68b712514dc9ec387d3e6b17)]:
+ - @astrojs/markdown-remark@4.0.0-beta.0
+ - astro@4.0.0-beta.0
+
## 1.1.5
### Patch Changes
diff --git a/packages/integrations/mdx/README.md b/packages/integrations/mdx/README.md
index df0458ce9e27..150ada5e8da3 100644
--- a/packages/integrations/mdx/README.md
+++ b/packages/integrations/mdx/README.md
@@ -83,11 +83,7 @@ You can configure how your MDX is rendered with the following options:
### Options inherited from Markdown config
-All [`markdown` configuration options](https://docs.astro.build/en/reference/configuration-reference/#markdown-options) except `drafts` can be configured separately in the MDX integration. This includes remark and rehype plugins, syntax highlighting, and more. Options will default to those in your Markdown config ([see the `extendMarkdownConfig` option](#extendmarkdownconfig) to modify this).
-
-:::note
-There is no separate MDX configuration for [including pages marked as draft in the build](https://docs.astro.build/en/reference/configuration-reference/#markdowndrafts). This Markdown setting will be respected by both Markdown and MDX files and cannot be overridden for MDX files specifically.
-:::
+All [`markdown` configuration options](https://docs.astro.build/en/reference/configuration-reference/#markdown-options) can be configured separately in the MDX integration. This includes remark and rehype plugins, syntax highlighting, and more. Options will default to those in your Markdown config ([see the `extendMarkdownConfig` option](#extendmarkdownconfig) to modify this).
```js
// astro.config.mjs
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index 20948fe617bc..3f5b6d559a6c 100644
--- a/packages/integrations/mdx/package.json
+++ b/packages/integrations/mdx/package.json
@@ -1,7 +1,7 @@
{
"name": "@astrojs/mdx",
"description": "Add support for MDX pages in your Astro site",
- "version": "1.1.5",
+ "version": "2.0.0-beta.0",
"type": "module",
"types": "./dist/index.d.ts",
"author": "withastro",
@@ -35,46 +35,46 @@
},
"dependencies": {
"@astrojs/markdown-remark": "workspace:*",
- "@mdx-js/mdx": "^2.3.0",
- "acorn": "^8.10.0",
- "es-module-lexer": "^1.3.0",
- "estree-util-visit": "^1.2.1",
+ "@mdx-js/mdx": "^3.0.0",
+ "acorn": "^8.11.2",
+ "es-module-lexer": "^1.4.1",
+ "estree-util-visit": "^2.0.0",
"github-slugger": "^2.0.0",
"gray-matter": "^4.0.3",
- "hast-util-to-html": "^8.0.4",
+ "hast-util-to-html": "^9.0.0",
"kleur": "^4.1.4",
- "rehype-raw": "^6.1.1",
- "remark-gfm": "^3.0.1",
+ "rehype-raw": "^7.0.0",
+ "remark-gfm": "^4.0.0",
"remark-smartypants": "^2.0.0",
"source-map": "^0.7.4",
- "unist-util-visit": "^4.1.2",
- "vfile": "^5.3.7"
+ "unist-util-visit": "^5.0.0",
+ "vfile": "^6.0.1"
},
"peerDependencies": {
- "astro": "^3.0.0"
+ "astro": "^4.0.0-beta.0"
},
"devDependencies": {
- "@types/chai": "^4.3.5",
- "@types/estree": "^1.0.1",
- "@types/mdast": "^3.0.12",
- "@types/mocha": "^10.0.1",
- "@types/yargs-parser": "^21.0.0",
+ "@types/chai": "^4.3.10",
+ "@types/estree": "^1.0.5",
+ "@types/mdast": "^4.0.3",
+ "@types/mocha": "^10.0.4",
+ "@types/yargs-parser": "^21.0.3",
"astro": "workspace:*",
"astro-scripts": "workspace:*",
"chai": "^4.3.7",
"cheerio": "1.0.0-rc.12",
- "linkedom": "^0.15.1",
- "mdast-util-mdx": "^2.0.1",
- "mdast-util-to-string": "^3.2.0",
+ "linkedom": "^0.16.4",
+ "mdast-util-mdx": "^3.0.0",
+ "mdast-util-to-string": "^4.0.0",
"mocha": "^10.2.0",
"reading-time": "^1.5.0",
- "rehype-mathjax": "^4.0.3",
- "rehype-pretty-code": "^0.10.0",
- "remark-math": "^5.1.1",
- "remark-rehype": "^10.1.0",
+ "rehype-mathjax": "^5.0.0",
+ "rehype-pretty-code": "^0.10.2",
+ "remark-math": "^6.0.0",
+ "remark-rehype": "^11.0.0",
"remark-shiki-twoslash": "^3.1.3",
- "remark-toc": "^8.0.1",
- "unified": "^10.1.2",
+ "remark-toc": "^9.0.0",
+ "unified": "^11.0.4",
"vite": "^5.0.0"
},
"engines": {
diff --git a/packages/integrations/mdx/src/index.ts b/packages/integrations/mdx/src/index.ts
index fd330625e137..3fc00a7236bc 100644
--- a/packages/integrations/mdx/src/index.ts
+++ b/packages/integrations/mdx/src/index.ts
@@ -1,8 +1,8 @@
import { markdownConfigDefaults, setVfileFrontmatter } from '@astrojs/markdown-remark';
-import type { PluggableList } from '@mdx-js/mdx/lib/core.js';
import type { AstroIntegration, ContentEntryType, HookParameters, SSRError } from 'astro';
import astroJSXRenderer from 'astro/jsx/renderer.js';
import { parse as parseESM } from 'es-module-lexer';
+import type { PluggableList } from 'unified';
import fs from 'node:fs/promises';
import { fileURLToPath } from 'node:url';
import type { Options as RemarkRehypeOptions } from 'remark-rehype';
@@ -190,7 +190,10 @@ export default function mdx(partialMdxOptions: Partial = {}): AstroI
componentsCode += ' }';
// Make `Content` the default export so we can wrap `MDXContent` and pass in `Fragment`
- code = code.replace('export default MDXContent;', '');
+ code = code.replace(
+ 'export default function MDXContent',
+ 'function MDXContent'
+ );
code += `\nexport const Content = (props = {}) => MDXContent({
...props,
components: ${componentsCode},
diff --git a/packages/integrations/mdx/src/plugins.ts b/packages/integrations/mdx/src/plugins.ts
index 3286a9fd877b..e6584aacf13d 100644
--- a/packages/integrations/mdx/src/plugins.ts
+++ b/packages/integrations/mdx/src/plugins.ts
@@ -5,12 +5,11 @@ import {
remarkShiki,
} from '@astrojs/markdown-remark';
import { createProcessor, nodeTypes } from '@mdx-js/mdx';
-import type { PluggableList } from '@mdx-js/mdx/lib/core.js';
import rehypeRaw from 'rehype-raw';
import remarkGfm from 'remark-gfm';
import remarkSmartypants from 'remark-smartypants';
import { SourceMapGenerator } from 'source-map';
-import type { Processor } from 'unified';
+import type { PluggableList } from 'unified';
import type { MdxOptions } from './index.js';
import { recmaInjectImportMetaEnv } from './recma-inject-import-meta-env.js';
import { rehypeApplyFrontmatterExport } from './rehype-apply-frontmatter-export.js';
@@ -27,10 +26,7 @@ interface MdxProcessorExtraOptions {
importMetaEnv: Record;
}
-export function createMdxProcessor(
- mdxOptions: MdxOptions,
- extraOptions: MdxProcessorExtraOptions
-): Processor {
+export function createMdxProcessor(mdxOptions: MdxOptions, extraOptions: MdxProcessorExtraOptions) {
return createProcessor({
remarkPlugins: getRemarkPlugins(mdxOptions),
rehypePlugins: getRehypePlugins(mdxOptions),
diff --git a/packages/integrations/mdx/src/remark-images-to-component.ts b/packages/integrations/mdx/src/remark-images-to-component.ts
index f83f5d76abf9..810056deff0a 100644
--- a/packages/integrations/mdx/src/remark-images-to-component.ts
+++ b/packages/integrations/mdx/src/remark-images-to-component.ts
@@ -15,7 +15,7 @@ export function remarkImageToComponent() {
const importsStatements: MdxjsEsm[] = [];
const importedImages = new Map();
- visit(tree, 'image', (node: Image, index: number | null, parent: Parent | null) => {
+ visit(tree, 'image', (node: Image, index: number | undefined, parent: Parent | null) => {
// Use the imagePaths set from the remark-collect-images so we don't have to duplicate the logic for
// checking if an image should be imported or not
if (file.data.imagePaths?.has(node.url)) {
diff --git a/packages/integrations/mdx/src/utils.ts b/packages/integrations/mdx/src/utils.ts
index 3425c50e3484..a5b198116a9e 100644
--- a/packages/integrations/mdx/src/utils.ts
+++ b/packages/integrations/mdx/src/utils.ts
@@ -1,10 +1,10 @@
-import type { PluggableList } from '@mdx-js/mdx/lib/core.js';
import type { Options as AcornOpts } from 'acorn';
import { parse } from 'acorn';
import type { AstroConfig, SSRError } from 'astro';
import matter from 'gray-matter';
import { bold, yellow } from 'kleur/colors';
import type { MdxjsEsm } from 'mdast-util-mdx';
+import type { PluggableList } from 'unified';
function appendForwardSlash(path: string) {
return path.endsWith('/') ? path : path + '/';
@@ -75,8 +75,8 @@ export function jsToTreeNode(
type: 'mdxjsEsm',
value: '',
data: {
+ // @ts-expect-error `parse` return types is incompatible but it should work in runtime
estree: {
- body: [],
...parse(jsString, acornOpts),
type: 'Program',
sourceType: 'module',
diff --git a/packages/integrations/mdx/test/fixtures/mdx-frontmatter-injection/src/pages/glob.json.js b/packages/integrations/mdx/test/fixtures/mdx-frontmatter-injection/src/pages/glob.json.js
index b73cd234d75d..63248dc56f88 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-frontmatter-injection/src/pages/glob.json.js
+++ b/packages/integrations/mdx/test/fixtures/mdx-frontmatter-injection/src/pages/glob.json.js
@@ -1,6 +1,6 @@
-export async function get() {
+export async function GET() {
const docs = await import.meta.glob('./*.mdx', { eager: true });
- return {
- body: JSON.stringify(Object.values(docs).map(doc => doc.frontmatter)),
- }
+ return new Response(
+ JSON.stringify(Object.values(docs).map(doc => doc.frontmatter))
+ );
}
diff --git a/packages/integrations/mdx/test/fixtures/mdx-frontmatter/src/pages/glob.json.js b/packages/integrations/mdx/test/fixtures/mdx-frontmatter/src/pages/glob.json.js
index a1d6a4ac42dd..d82d9f770517 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-frontmatter/src/pages/glob.json.js
+++ b/packages/integrations/mdx/test/fixtures/mdx-frontmatter/src/pages/glob.json.js
@@ -1,9 +1,6 @@
-export async function get() {
+export async function GET() {
const mdxPages = await import.meta.glob('./*.mdx', { eager: true });
-
- return {
- body: JSON.stringify({
- titles: Object.values(mdxPages ?? {}).map(v => v?.frontmatter?.title),
- })
- }
+ return Response.json({
+ titles: Object.values(mdxPages ?? {}).map((v) => v?.frontmatter?.title),
+ });
}
diff --git a/packages/integrations/mdx/test/fixtures/mdx-get-headings/src/pages/pages.json.js b/packages/integrations/mdx/test/fixtures/mdx-get-headings/src/pages/pages.json.js
index 940e5c141c38..e57192c6151d 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-get-headings/src/pages/pages.json.js
+++ b/packages/integrations/mdx/test/fixtures/mdx-get-headings/src/pages/pages.json.js
@@ -1,11 +1,8 @@
-export async function get() {
+export async function GET() {
const mdxPages = await import.meta.glob('./*.mdx', { eager: true });
-
- return {
- body: JSON.stringify({
- headingsByPage: Object.fromEntries(
- Object.entries(mdxPages ?? {}).map(([k, v]) => [k, v?.getHeadings()])
- ),
- }),
- }
+ return Response.json({
+ headingsByPage: Object.fromEntries(
+ Object.entries(mdxPages ?? {}).map(([k, v]) => [k, v?.getHeadings()])
+ ),
+ });
}
diff --git a/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json b/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json
index d2fb7a75d0f5..a00e19d5b220 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json
+++ b/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json
@@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
}
}
diff --git a/packages/integrations/mdx/test/fixtures/mdx-url-export/src/pages/pages.json.js b/packages/integrations/mdx/test/fixtures/mdx-url-export/src/pages/pages.json.js
index 36b6f7af69aa..02cff64a8af1 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-url-export/src/pages/pages.json.js
+++ b/packages/integrations/mdx/test/fixtures/mdx-url-export/src/pages/pages.json.js
@@ -1,9 +1,6 @@
-export async function get() {
+export async function GET() {
const mdxPages = await import.meta.glob('./*.mdx', { eager: true });
-
- return {
- body: JSON.stringify({
- urls: Object.values(mdxPages ?? {}).map(v => v?.url),
- })
- }
+ return Response.json({
+ urls: Object.values(mdxPages ?? {}).map((v) => v?.url),
+ });
}
diff --git a/packages/integrations/mdx/test/fixtures/mdx-vite-env-vars/src/pages/frontmatter.json.js b/packages/integrations/mdx/test/fixtures/mdx-vite-env-vars/src/pages/frontmatter.json.js
index ce3cf81e5cf8..152285b9cf94 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-vite-env-vars/src/pages/frontmatter.json.js
+++ b/packages/integrations/mdx/test/fixtures/mdx-vite-env-vars/src/pages/frontmatter.json.js
@@ -1,7 +1,5 @@
import { frontmatter } from './vite-env-vars.mdx';
-export function get() {
- return {
- body: JSON.stringify(frontmatter),
- }
+export function GET() {
+ return Response.json(frontmatter);
}
diff --git a/packages/integrations/mdx/test/mdx-astro-markdown-remarkRehype.test.js b/packages/integrations/mdx/test/mdx-astro-markdown-remarkRehype.test.js
index ddcce4ba5976..eab2c61b089c 100644
--- a/packages/integrations/mdx/test/mdx-astro-markdown-remarkRehype.test.js
+++ b/packages/integrations/mdx/test/mdx-astro-markdown-remarkRehype.test.js
@@ -79,7 +79,7 @@ describe('MDX with Astro Markdown remark-rehype config', () => {
expect(document.querySelector('#footnote-label').textContent).to.equal('Catatan kaki');
expect(document.querySelector('.data-footnote-backref').getAttribute('aria-label')).to.equal(
- 'Back to content'
+ 'Back to reference 1'
);
});
});
diff --git a/packages/integrations/mdx/test/mdx-math.test.js b/packages/integrations/mdx/test/mdx-math.test.js
index f39ea42c8399..52ee94a46919 100644
--- a/packages/integrations/mdx/test/mdx-math.test.js
+++ b/packages/integrations/mdx/test/mdx-math.test.js
@@ -4,7 +4,7 @@ import { parseHTML } from 'linkedom';
import { loadFixture } from '../../../astro/test/test-utils.js';
import remarkMath from 'remark-math';
import rehypeMathjaxSvg from 'rehype-mathjax';
-import rehypeMathjaxChtml from 'rehype-mathjax/chtml.js';
+import rehypeMathjaxChtml from 'rehype-mathjax/chtml';
const FIXTURE_ROOT = new URL('./fixtures/mdx-math/', import.meta.url);
diff --git a/packages/integrations/mdx/test/mdx-slots.js b/packages/integrations/mdx/test/mdx-slots.test.js
similarity index 100%
rename from packages/integrations/mdx/test/mdx-slots.js
rename to packages/integrations/mdx/test/mdx-slots.test.js
diff --git a/packages/integrations/node/CHANGELOG.md b/packages/integrations/node/CHANGELOG.md
index 8ef4b80ac473..87a115fcd71c 100644
--- a/packages/integrations/node/CHANGELOG.md
+++ b/packages/integrations/node/CHANGELOG.md
@@ -1,5 +1,12 @@
# @astrojs/node
+## 7.0.0-beta.0
+
+### Patch Changes
+
+- Updated dependencies [[`abf601233`](https://github.com/withastro/astro/commit/abf601233f8188d118a8cb063c777478d8d9f1a3), [`6201bbe96`](https://github.com/withastro/astro/commit/6201bbe96c2a083fb201e4a43a9bd88499821a3e), [`cdabf6ef0`](https://github.com/withastro/astro/commit/cdabf6ef02be7220fd2b6bdcef924ceca089381e), [`1c48ed286`](https://github.com/withastro/astro/commit/1c48ed286538ab9e354eca4e4dcd7c6385c96721), [`37697a2c5`](https://github.com/withastro/astro/commit/37697a2c5511572dc29c0a4ea46f90c2f62be8e6), [`bd0c2e9ae`](https://github.com/withastro/astro/commit/bd0c2e9ae3389a9d3085050c1e8134ae98dff299), [`0fe3a7ed5`](https://github.com/withastro/astro/commit/0fe3a7ed5d7bb1a9fce1623e84ba14104b51223c), [`710be505c`](https://github.com/withastro/astro/commit/710be505c9ddf416e77a75343d8cae9c497d72c6), [`153a5abb9`](https://github.com/withastro/astro/commit/153a5abb905042ac68b712514dc9ec387d3e6b17)]:
+ - astro@4.0.0-beta.0
+
## 6.0.4
### Patch Changes
diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json
index b50b3e1757f0..babc33a8a6ca 100644
--- a/packages/integrations/node/package.json
+++ b/packages/integrations/node/package.json
@@ -1,7 +1,7 @@
{
"name": "@astrojs/node",
"description": "Deploy your site to a Node.js server",
- "version": "6.0.4",
+ "version": "7.0.0-beta.0",
"type": "module",
"types": "./dist/index.d.ts",
"author": "withastro",
@@ -37,12 +37,12 @@
"server-destroy": "^1.0.1"
},
"peerDependencies": {
- "astro": "^3.0.0"
+ "astro": "^4.0.0-beta.0"
},
"devDependencies": {
"@types/node": "^18.17.8",
- "@types/send": "^0.17.1",
- "@types/server-destroy": "^1.0.1",
+ "@types/send": "^0.17.4",
+ "@types/server-destroy": "^1.0.3",
"astro": "workspace:*",
"astro-scripts": "workspace:*",
"chai": "^4.3.7",
diff --git a/packages/integrations/node/src/createOutgoingHttpHeaders.ts b/packages/integrations/node/src/createOutgoingHttpHeaders.ts
index 781a74de6e90..44bbf81ca993 100644
--- a/packages/integrations/node/src/createOutgoingHttpHeaders.ts
+++ b/packages/integrations/node/src/createOutgoingHttpHeaders.ts
@@ -23,8 +23,7 @@ export const createOutgoingHttpHeaders = (
// if there is > 1 set-cookie header, we have to fix it to be an array of values
if (headers.has('set-cookie')) {
- // @ts-expect-error
- const cookieHeaders = headers.getSetCookie() as string[];
+ const cookieHeaders = headers.getSetCookie();
if (cookieHeaders.length > 1) {
// the Headers.entries() API already normalized all header names to lower case so we can safely index this as 'set-cookie'
nodeHeaders['set-cookie'] = cookieHeaders;
diff --git a/packages/integrations/node/src/nodeMiddleware.ts b/packages/integrations/node/src/nodeMiddleware.ts
index 4fd0a4bc23f5..0b9381f1d0a2 100644
--- a/packages/integrations/node/src/nodeMiddleware.ts
+++ b/packages/integrations/node/src/nodeMiddleware.ts
@@ -30,10 +30,10 @@ export default function (app: NodeApp, mode: Options['mode']) {
}
try {
- const route = app.match(req);
- if (route) {
+ const routeData = app.match(req);
+ if (routeData) {
try {
- const response = await app.render(req, route, locals);
+ const response = await app.render(req, { routeData, locals });
await writeWebResponse(app, res, response);
} catch (err: unknown) {
if (next) {
diff --git a/packages/integrations/node/test/bad-urls.test.js b/packages/integrations/node/test/bad-urls.test.js
index de7484b808e1..894729e3679b 100644
--- a/packages/integrations/node/test/bad-urls.test.js
+++ b/packages/integrations/node/test/bad-urls.test.js
@@ -2,7 +2,7 @@ import { expect } from 'chai';
import nodejs from '../dist/index.js';
import { loadFixture } from './test-utils.js';
-describe('API routes', () => {
+describe('Bad URLs', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
let devPreview;
diff --git a/packages/integrations/node/test/fixtures/node-middleware/src/pages/ssr.ts b/packages/integrations/node/test/fixtures/node-middleware/src/pages/ssr.ts
index 93543190f1e2..423db341a46e 100644
--- a/packages/integrations/node/test/fixtures/node-middleware/src/pages/ssr.ts
+++ b/packages/integrations/node/test/fixtures/node-middleware/src/pages/ssr.ts
@@ -1,9 +1,7 @@
-export async function get() {
+export async function GET() {
let number = Math.random();
- return {
- body: JSON.stringify({
- number,
- message: `Here's a random number: ${number}`,
- }),
- };
+ return Response.json({
+ number,
+ message: `Here's a random number: ${number}`,
+ });
}
diff --git a/packages/integrations/node/test/headers.test.js.js b/packages/integrations/node/test/headers.test.js
similarity index 100%
rename from packages/integrations/node/test/headers.test.js.js
rename to packages/integrations/node/test/headers.test.js
diff --git a/packages/integrations/preact/package.json b/packages/integrations/preact/package.json
index 29a10439aa66..84043fb762a7 100644
--- a/packages/integrations/preact/package.json
+++ b/packages/integrations/preact/package.json
@@ -37,15 +37,15 @@
"dependencies": {
"@babel/plugin-transform-react-jsx": "^7.22.5",
"@babel/plugin-transform-react-jsx-development": "^7.22.5",
- "@preact/preset-vite": "^2.5.0",
+ "@preact/preset-vite": "^2.7.0",
"@preact/signals": "^1.2.1",
"babel-plugin-transform-hook-names": "^1.0.2",
- "preact-render-to-string": "^6.2.1"
+ "preact-render-to-string": "^6.3.1"
},
"devDependencies": {
"astro": "workspace:*",
"astro-scripts": "workspace:*",
- "preact": "^10.17.1"
+ "preact": "^10.19.2"
},
"peerDependencies": {
"preact": "^10.6.5"
diff --git a/packages/integrations/prefetch/package.json b/packages/integrations/prefetch/package.json
index da199b43a5b9..3291eb1a7cea 100644
--- a/packages/integrations/prefetch/package.json
+++ b/packages/integrations/prefetch/package.json
@@ -34,7 +34,7 @@
"test:match": "playwright test -g"
},
"devDependencies": {
- "@playwright/test": "^1.37.1",
+ "@playwright/test": "^1.40.0",
"astro": "workspace:*",
"astro-scripts": "workspace:*"
},
diff --git a/packages/integrations/react/CHANGELOG.md b/packages/integrations/react/CHANGELOG.md
index 5b127b75337e..7dcf8dc2a027 100644
--- a/packages/integrations/react/CHANGELOG.md
+++ b/packages/integrations/react/CHANGELOG.md
@@ -1,5 +1,17 @@
# @astrojs/react
+## 3.0.7-beta.0
+
+### Patch Changes
+
+- [#9122](https://github.com/withastro/astro/pull/9122) [`1c48ed286`](https://github.com/withastro/astro/commit/1c48ed286538ab9e354eca4e4dcd7c6385c96721) Thanks [@bluwy](https://github.com/bluwy)! - Adds Vite 5 support. There are no breaking changes from Astro. Check the [Vite migration guide](https://vitejs.dev/guide/migration.html) for details of the breaking changes from Vite instead.
+
+## 3.0.6
+
+### Patch Changes
+
+- [#9141](https://github.com/withastro/astro/pull/9141) [`af43fb517`](https://github.com/withastro/astro/commit/af43fb51726fa2242cec03cb019fa4fa4a4403ef) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes an issue where slotting self-closing elements (img, br, hr) into react components with `experimentalReactChildren` enabled led to an error.
+
## 3.0.5
### Patch Changes
diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json
index 21e86e8118de..0721d37f3208 100644
--- a/packages/integrations/react/package.json
+++ b/packages/integrations/react/package.json
@@ -1,7 +1,7 @@
{
"name": "@astrojs/react",
"description": "Use React components within Astro",
- "version": "3.0.5",
+ "version": "3.0.7-beta.0",
"type": "module",
"types": "./dist/index.d.ts",
"author": "withastro",
@@ -42,22 +42,24 @@
"scripts": {
"build": "astro-scripts build \"src/**/*.ts\" && tsc",
"build:ci": "astro-scripts build \"src/**/*.ts\"",
- "dev": "astro-scripts dev \"src/**/*.ts\""
+ "dev": "astro-scripts dev \"src/**/*.ts\"",
+ "test": "mocha --exit --timeout 20000"
},
"dependencies": {
"@vitejs/plugin-react": "^4.2.0",
"ultrahtml": "^1.3.0"
},
"devDependencies": {
- "@types/react": "^18.2.21",
- "@types/react-dom": "^18.2.7",
+ "@types/react": "^18.2.37",
+ "@types/react-dom": "^18.2.15",
"astro": "workspace:*",
"astro-scripts": "workspace:*",
"chai": "^4.3.7",
"cheerio": "1.0.0-rc.12",
"react": "^18.1.0",
"react-dom": "^18.1.0",
- "vite": "^5.0.0"
+ "vite": "^5.0.0",
+ "mocha": "^10.2.0"
},
"peerDependencies": {
"@types/react": "^17.0.50 || ^18.0.21",
diff --git a/packages/integrations/react/test/fixtures/react-component/package.json b/packages/integrations/react/test/fixtures/react-component/package.json
index cf7b2b057fce..e7b7ac5d9b5c 100644
--- a/packages/integrations/react/test/fixtures/react-component/package.json
+++ b/packages/integrations/react/test/fixtures/react-component/package.json
@@ -8,6 +8,6 @@
"astro": "workspace:*",
"react": "^18.1.0",
"react-dom": "^18.1.0",
- "vue": "^3.3.4"
+ "vue": "^3.3.8"
}
}
diff --git a/packages/integrations/react/test/parsed-react-children.test.js b/packages/integrations/react/test/parsed-react-children.test.js
new file mode 100644
index 000000000000..1c845836f37f
--- /dev/null
+++ b/packages/integrations/react/test/parsed-react-children.test.js
@@ -0,0 +1,15 @@
+import { expect } from 'chai';
+import convert from '../vnode-children.js';
+
+describe('experimental react children', () => {
+ it('has undefined as children for direct children', () => {
+ const [imgVNode] = convert('
');
+ expect(imgVNode.props).to.deep.include({ children: undefined });
+ });
+
+ it('has undefined as children for nested children', () => {
+ const [divVNode] = convert('