0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2024-12-30 22:03:56 -05:00

Merge branch 'main' into next

This commit is contained in:
bluwy 2024-10-01 11:21:48 +08:00
commit e748c480a7
134 changed files with 1835 additions and 1907 deletions

View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Adds missing filePath property on content layer entries

View file

@ -0,0 +1,5 @@
---
'astro': patch
---
View transitions: Fixes Astro's fade animation to prevent flashing during morph transitions.

View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixes injected endpoint `prerender` option detection

View file

@ -41,7 +41,7 @@ jobs:
- name: Get changed files in the .changeset folder
id: changed-files
uses: tj-actions/changed-files@v44
uses: tj-actions/changed-files@v45
if: steps.blocked.outputs.result != 'true'
with:
files: |

View file

@ -8,7 +8,7 @@
},
"dependencies": {
"@astrojs/mdx": "workspace:*",
"@astrojs/node": "^8.3.3",
"@astrojs/node": "^8.3.4",
"@benchmark/timer": "workspace:*",
"astro": "workspace:*",
"autocannon": "^7.15.0",

View file

@ -16,10 +16,10 @@
"@astrojs/react": "^3.6.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vitest": "^2.0.5"
"vitest": "^2.1.1"
},
"devDependencies": {
"@types/react": "^18.3.5",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0"
}
}

View file

@ -16,14 +16,14 @@
"@astrojs/solid-js": "^4.4.2",
"@astrojs/svelte": "^6.0.0-beta.0",
"@astrojs/vue": "^5.0.0-beta.0",
"@types/react": "^18.3.3",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "^5.0.0-beta.2",
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.22",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -14,6 +14,6 @@
"@astrojs/preact": "^3.5.3",
"@preact/signals": "^1.3.0",
"astro": "^5.0.0-beta.2",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/react": "^3.6.2",
"@types/react": "^18.3.5",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "^5.0.0-beta.2",
"react": "^18.3.1",

View file

@ -13,6 +13,6 @@
"dependencies": {
"@astrojs/solid-js": "^4.4.2",
"astro": "^5.0.0-beta.2",
"solid-js": "^1.8.22"
"solid-js": "^1.9.1"
}
}

View file

@ -13,6 +13,6 @@
"dependencies": {
"@astrojs/vue": "^5.0.0-beta.0",
"astro": "^5.0.0-beta.2",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -15,12 +15,12 @@
"@astrojs/tailwind": "^5.1.1",
"@fortawesome/fontawesome-free": "^6.6.0",
"@tailwindcss/forms": "^0.5.9",
"@types/react": "^18.3.5",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "^5.0.0-beta.2",
"postcss": "^8.4.45",
"postcss": "^8.4.47",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.10"
"tailwindcss": "^3.4.13"
}
}

View file

@ -11,7 +11,7 @@
},
"dependencies": {
"astro": "^5.0.0-beta.2",
"sass": "^1.78.0",
"sass": "^1.79.4",
"sharp": "^0.33.3"
}
}

View file

@ -14,6 +14,6 @@
"@astrojs/mdx": "^4.0.0-beta.1",
"@astrojs/preact": "^3.5.3",
"astro": "^5.0.0-beta.2",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -15,6 +15,6 @@
"@nanostores/preact": "^0.5.2",
"astro": "^5.0.0-beta.2",
"nanostores": "^0.11.3",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -17,7 +17,7 @@
"astro": "^5.0.0-beta.2",
"autoprefixer": "^10.4.20",
"canvas-confetti": "^1.9.3",
"postcss": "^8.4.45",
"tailwindcss": "^3.4.10"
"postcss": "^8.4.47",
"tailwindcss": "^3.4.13"
}
}

View file

@ -13,6 +13,6 @@
},
"dependencies": {
"astro": "^5.0.0-beta.2",
"vitest": "^2.0.5"
"vitest": "^2.1.1"
}
}

View file

@ -58,15 +58,15 @@
"@changesets/cli": "^2.27.8",
"@types/node": "^18.17.8",
"esbuild": "^0.21.5",
"eslint": "^9.10.0",
"eslint": "^9.11.1",
"eslint-plugin-regexp": "^2.6.0",
"globby": "^14.0.2",
"only-allow": "^1.2.1",
"prettier": "^3.3.3",
"prettier-plugin-astro": "^0.14.1",
"turbo": "^2.1.1",
"typescript": "~5.5.4",
"typescript-eslint": "^8.4.0"
"turbo": "^2.1.2",
"typescript": "~5.6.2",
"typescript-eslint": "^8.7.0"
},
"pnpm": {
"peerDependencyRules": {

View file

@ -10,12 +10,22 @@
@keyframes astroFadeIn {
from {
opacity: 0;
mix-blend-mode: plus-lighter;
}
to {
opacity: 1;
mix-blend-mode: plus-lighter;
}
}
@keyframes astroFadeOut {
from {
opacity: 1;
mix-blend-mode: plus-lighter;
}
to {
opacity: 0;
mix-blend-mode: plus-lighter;
}
}

View file

@ -12,13 +12,13 @@
"dependencies": {
"@astrojs/check": "^0.9.3",
"@astrojs/db": "workspace:*",
"@astrojs/node": "^8.3.3",
"@astrojs/node": "^8.3.4",
"@astrojs/react": "workspace:*",
"@types/react": "^18.3.5",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "workspace:*",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.5.4"
"typescript": "^5.6.2"
}
}

View file

@ -12,14 +12,14 @@
"dependencies": {
"@astrojs/check": "^0.9.3",
"@astrojs/db": "workspace:*",
"@astrojs/node": "^8.3.3",
"@astrojs/node": "^8.3.4",
"@astrojs/react": "workspace:*",
"@types/react": "npm:types-react",
"@types/react-dom": "npm:types-react-dom",
"astro": "workspace:*",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-dom": "19.0.0-rc-fb9a90fa48-20240614",
"typescript": "^5.5.4"
"typescript": "^5.6.2"
},
"overrides": {
"@types/react": "npm:types-react",

View file

@ -6,6 +6,6 @@
"@astrojs/preact": "workspace:*",
"@e2e/astro-linked-lib": "link:../_deps/astro-linked-lib",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.22",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"astro": "workspace:*",
"sass": "^1.78.0"
"sass": "^1.79.4"
}
}

View file

@ -9,12 +9,12 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sass": "^1.78.0",
"solid-js": "^1.8.22",
"sass": "^1.79.4",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -4,6 +4,6 @@
"private": true,
"devDependencies": {
"astro": "workspace:*",
"sass": "^1.78.0"
"sass": "^1.79.4"
}
}

View file

@ -9,6 +9,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -13,11 +13,11 @@
"dependencies": {
"@webcomponents/template-shadowroot": "^0.2.1",
"lit": "^3.2.0",
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.22",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -8,6 +8,6 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.22",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.22",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.22",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.22",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.22",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -11,12 +11,12 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.22",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
},
"scripts": {
"dev": "astro dev"

View file

@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -7,6 +7,6 @@
},
"dependencies": {
"astro": "workspace:*",
"@astrojs/node": "^8.3.3"
"@astrojs/node": "^8.3.4"
}
}

View file

@ -9,7 +9,7 @@
"@astrojs/react": "workspace:*",
"astro": "workspace:*",
"@astrojs/mdx": "workspace:*",
"@astrojs/node": "^8.3.3",
"@astrojs/node": "^8.3.4",
"react": "^18.3.1",
"react-dom": "^18.3.1"
}

View file

@ -7,6 +7,6 @@
"astro": "workspace:*"
},
"devDependencies": {
"solid-js": "^1.8.22"
"solid-js": "^1.9.1"
}
}

View file

@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/solid-js": "workspace:*",
"astro": "workspace:*",
"solid-js": "^1.8.22"
"solid-js": "^1.9.1"
}
}

View file

@ -7,6 +7,6 @@
"astro": "workspace:*"
},
"devDependencies": {
"solid-js": "^1.8.22"
"solid-js": "^1.9.1"
}
}

View file

@ -6,7 +6,7 @@
"@astrojs/tailwind": "workspace:*",
"astro": "workspace:*",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.45",
"tailwindcss": "^3.4.10"
"postcss": "^8.4.47",
"tailwindcss": "^3.4.13"
}
}

View file

@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"@astrojs/node": "^8.3.3",
"@astrojs/node": "^8.3.4",
"@astrojs/react": "workspace:*",
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
@ -12,7 +12,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"svelte": "^4.2.19",
"vue": "^3.5.3",
"solid-js": "^1.8.0"
"vue": "^3.5.10",
"solid-js": "^1.9.1"
}
}

View file

@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -1,7 +1,7 @@
import { expect } from '@playwright/test';
import { scrollToElement, testFactory, waitForHydrate } from './test-utils.js';
export function prepareTestFactory(testFile, opts, { canReplayClicks = false } = {}) {
export function prepareTestFactory(testFile, opts) {
const test = testFactory(testFile, opts);
let devServer;
@ -104,16 +104,7 @@ export function prepareTestFactory(testFile, opts, { canReplayClicks = false } =
await waitForHydrate(page, counter);
await inc.click();
if (canReplayClicks) {
// SolidJS has a hydration script that automatically captures
// and replays click and input events on Hydration:
// https://www.solidjs.com/docs/latest#hydrationscript
// so in total there are two click events.
await expect(count, 'count incremented by 2').toHaveText('2');
} else {
await expect(count, 'count incremented by 1').toHaveText('1');
}
await expect(count, 'count incremented by 1').toHaveText('1');
});
test('client:only', async ({ page, astro }) => {

View file

@ -1,12 +1,8 @@
import { prepareTestFactory } from './shared-component-tests.js';
const { test, createTests } = prepareTestFactory(
import.meta.url,
{ root: './fixtures/solid-component/' },
{
canReplayClicks: true,
},
);
const { test, createTests } = prepareTestFactory(import.meta.url, {
root: './fixtures/solid-component/',
});
const config = {
componentFilePath: './src/components/SolidComponent.jsx',

View file

@ -127,13 +127,13 @@
"@astrojs/markdown-remark": "workspace:*",
"@astrojs/telemetry": "workspace:*",
"@babel/types": "^7.25.6",
"@oslojs/encoding": "^1.0.0",
"@rollup/pluginutils": "^5.1.0",
"@oslojs/encoding": "^1.1.0",
"@rollup/pluginutils": "^5.1.2",
"@types/cookie": "^0.6.0",
"acorn": "^8.12.1",
"aria-query": "^5.3.0",
"aria-query": "^5.3.2",
"axobject-query": "^4.1.0",
"boxen": "7.1.1",
"boxen": "8.0.1",
"ci-info": "^4.0.0",
"clsx": "^2.1.1",
"common-ancestor-path": "^1.0.1",
@ -141,10 +141,10 @@
"cssesc": "^3.0.0",
"debug": "^4.3.7",
"deterministic-object-hash": "^2.0.2",
"devalue": "^5.0.0",
"devalue": "^5.1.1",
"diff": "^5.2.0",
"dlv": "^1.1.3",
"dset": "^3.1.3",
"dset": "^3.1.4",
"es-module-lexer": "^1.5.4",
"esbuild": "^0.21.5",
"estree-walker": "^3.0.3",
@ -165,23 +165,23 @@
"p-queue": "^8.0.1",
"preferred-pm": "^4.0.0",
"prompts": "^2.4.2",
"rehype": "^13.0.1",
"rehype": "^13.0.2",
"semver": "^7.6.3",
"shiki": "^1.16.2",
"shiki": "^1.21.0",
"string-width": "^7.2.0",
"strip-ansi": "^7.1.0",
"tinyexec": "^0.3.0",
"tsconfck": "^3.1.3",
"unist-util-visit": "^5.0.0",
"vfile": "^6.0.3",
"vite": "^5.4.3",
"vite": "^5.4.8",
"vitefu": "^1.0.2",
"which-pm": "^3.0.0",
"xxhash-wasm": "^1.0.2",
"yargs-parser": "^21.1.1",
"yocto-spinner": "^0.1.0",
"zod": "^3.23.8",
"zod-to-json-schema": "^3.23.2",
"zod-to-json-schema": "^3.23.3",
"zod-to-ts": "^1.2.0"
},
"optionalDependencies": {
@ -189,14 +189,13 @@
},
"devDependencies": {
"@astrojs/check": "^0.9.3",
"@playwright/test": "^1.47.0",
"@playwright/test": "^1.47.2",
"@types/aria-query": "^5.0.4",
"@types/common-ancestor-path": "^1.0.2",
"@types/cssesc": "^3.0.2",
"@types/debug": "^4.1.12",
"@types/diff": "^5.2.2",
"@types/dlv": "^1.1.4",
"@types/dom-view-transitions": "^1.0.5",
"@types/hast": "^3.0.4",
"@types/html-escaper": "^3.0.2",
"@types/http-cache-semantics": "^4.0.4",
@ -212,15 +211,15 @@
"expect-type": "^0.20.0",
"mdast-util-mdx": "^3.0.0",
"mdast-util-mdx-jsx": "^3.1.3",
"memfs": "^4.11.1",
"node-mocks-http": "^1.15.1",
"memfs": "^4.12.0",
"node-mocks-http": "^1.16.0",
"parse-srcset": "^1.0.2",
"rehype-autolink-headings": "^7.1.0",
"rehype-slug": "^6.0.0",
"rehype-toc": "^3.0.2",
"remark-code-titles": "^0.1.2",
"rollup": "^4.21.2",
"sass": "^1.78.0",
"rollup": "^4.22.5",
"sass": "^1.79.4",
"undici": "^6.19.8",
"unified": "^11.0.5",
"vitest": "^2.1.1"

View file

@ -16,7 +16,7 @@
"dependencies": {
"@astrojs/react": "workspace:*",
"@performance/utils": "workspace:*",
"@types/react": "^18.3.5",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "workspace:*",
"react": "^18.3.1",

View file

@ -17,7 +17,7 @@
"@astrojs/markdoc": "workspace:*",
"@astrojs/react": "workspace:*",
"@performance/utils": "workspace:*",
"@types/react": "^18.3.5",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "workspace:*",
"react": "^18.3.1",

View file

@ -17,7 +17,7 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/react": "workspace:*",
"@performance/utils": "workspace:*",
"@types/react": "^18.3.5",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "workspace:*",
"react": "^18.3.1",

View file

@ -501,7 +501,7 @@ async function writeContentFiles({
contentTypesStr += `};\n`;
break;
case CONTENT_LAYER_TYPE:
dataTypesStr += `${collectionKey}: Record<string, {\n id: string;\n collection: ${collectionKey};\n data: ${dataType};\n rendered?: RenderedContent \n}>;\n`;
dataTypesStr += `${collectionKey}: Record<string, {\n id: string;\n collection: ${collectionKey};\n data: ${dataType};\n rendered?: RenderedContent;\n filePath?: string \n}>;\n`;
break;
case 'data':
if (collectionEntryKeys.length === 0) {

View file

@ -19,7 +19,7 @@ type EsbuildMessage = ESBuildTransformResult['warnings'][number];
* Takes any error-like object and returns a standardized Error + metadata object.
* Useful for consistent reporting regardless of where the error surfaced from.
*/
export function collectErrorMetadata(e: any, rootFolder?: URL | undefined): ErrorWithMetadata {
export function collectErrorMetadata(e: any, rootFolder?: URL): ErrorWithMetadata {
const err =
AggregateError.is(e) || Array.isArray(e.errors) ? (e.errors as SSRError[]) : [e as SSRError];

View file

@ -153,7 +153,7 @@ export function isPage(file: URL, settings: AstroSettings): boolean {
}
export function isEndpoint(file: URL, settings: AstroSettings): boolean {
if (!isInPagesDir(file, settings.config)) return false;
if (!isInPagesDir(file, settings.config) && !isInjectedRoute(file, settings)) return false;
if (!isPublicRoute(file, settings.config)) return false;
return !endsWithPageExt(file, settings) && !file.toString().includes('?astro');
}

View file

@ -132,8 +132,15 @@ function parseImports(children: RootContent[]) {
return { local: spec.local.name, imported: 'default' };
case 'ImportNamespaceSpecifier':
return { local: spec.local.name, imported: '*' };
case 'ImportSpecifier':
return { local: spec.local.name, imported: spec.imported.name };
case 'ImportSpecifier': {
return {
local: spec.local.name,
imported:
spec.imported.type === 'Identifier'
? spec.imported.name
: String(spec.imported.value),
};
}
default:
throw new Error('Unknown import declaration specifier: ' + spec);
}

View file

@ -490,6 +490,7 @@ async function transition(
// Immediately paused to setup the ViewTransition object for Fallback mode
await Promise.resolve(); // hop through the micro task queue
await updateDOM(prepEvent, options, currentTransition, historyState, getFallback());
return undefined;
})();
// When the updateDone promise is settled,
@ -509,7 +510,7 @@ async function transition(
ready: updateDone, // good enough
// Finished promise could have been done better: finished rejects iff updateDone does.
// Our simulation always resolves, never rejects.
finished: new Promise((r) => (currentTransition.viewTransitionFinished = r)), // see end of updateDOM
finished: new Promise((r) => (currentTransition.viewTransitionFinished = r as () => void)), // see end of updateDOM
skipTransition: () => {
currentTransition.transitionSkipped = true;
// This cancels all animations of the simulation
@ -519,14 +520,14 @@ async function transition(
}
// In earlier versions was then'ed on viewTransition.ready which would not execute
// if the visual part of the transition has errors or was skipped
currentTransition.viewTransition.updateCallbackDone.finally(async () => {
currentTransition.viewTransition?.updateCallbackDone.finally(async () => {
await runScripts();
onPageLoad();
announce();
});
// finished.ready and finished.finally are the same for the simulation but not
// necessarily for native view transition, where finished rejects when updateCallbackDone does.
currentTransition.viewTransition.finished.finally(() => {
currentTransition.viewTransition?.finished.finally(() => {
currentTransition.viewTransition = undefined;
if (currentTransition === mostRecentTransition) mostRecentTransition = undefined;
if (currentNavigation === mostRecentNavigation) mostRecentNavigation = undefined;
@ -537,7 +538,7 @@ async function transition(
// Compatibility:
// In an earlier version we awaited viewTransition.ready, which includes animation setup.
// Scripts that depend on the view transition pseudo elements should hook on viewTransition.ready.
await currentTransition.viewTransition.updateCallbackDone;
await currentTransition.viewTransition?.updateCallbackDone;
} catch (e) {
// This log doesn't make it worse than before, where we got error messages about uncaught exceptions, which can't be caught when the trigger was a click or history traversal.
// Needs more investigation on root causes if errors still occur sporadically

View file

@ -10,6 +10,6 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -7,8 +7,8 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2",
"preact": "^10.24.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -4,6 +4,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -9,11 +9,11 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.22",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -4,6 +4,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -4,6 +4,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"@astrojs/node": "^8.3.3",
"@astrojs/node": "^8.3.4",
"astro": "workspace:*"
}
}

View file

@ -18,7 +18,7 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1"
}
}

View file

@ -8,7 +8,7 @@
"@astrojs/svelte": "workspace:*",
"@test/component-library-shared": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"svelte": "^4.2.19"

View file

@ -9,6 +9,6 @@
"astro": "workspace:*",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -6,6 +6,6 @@
"@astrojs/markdoc": "workspace:*",
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"astro": "workspace:*",
"@astrojs/node": "^8.3.3"
"@astrojs/node": "^8.3.4"
}
}

View file

@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -7,8 +7,8 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2",
"preact": "^10.24.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -3,8 +3,8 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"@fontsource/monofett": "5.0.22",
"@fontsource/montserrat": "5.0.20",
"@fontsource/monofett": "5.1.0",
"@fontsource/montserrat": "5.1.0",
"astro": "workspace:*"
}
}

View file

@ -9,6 +9,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -12,11 +12,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.2",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.22",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/solid-js": "workspace:*",
"astro": "workspace:*",
"solid-js": "^1.8.22"
"solid-js": "^1.9.1"
}
}

View file

@ -8,12 +8,12 @@
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.45",
"solid-js": "^1.8.22",
"postcss": "^8.4.47",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.3"
"vue": "^3.5.10"
},
"devDependencies": {
"postcss-preset-env": "^10.0.2"
"postcss-preset-env": "^10.0.5"
}
}

View file

@ -6,6 +6,6 @@
"@astrojs/preact": "workspace:*",
"@test/react-lib": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -6,6 +6,6 @@
"@astrojs/preact": "workspace:*",
"@preact/signals": "1.3.0",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -7,6 +7,6 @@
"astro": "workspace:*",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.22"
"solid-js": "^1.9.1"
}
}

View file

@ -4,6 +4,6 @@
"dependencies": {
"@astrojs/preact": "workspace:",
"astro": "workspace:",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/solid-js": "workspace:*",
"astro": "workspace:*",
"solid-js": "^1.8.22"
"solid-js": "^1.9.1"
}
}

View file

@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.5.3"
"vue": "^3.5.10"
}
}

View file

@ -10,6 +10,6 @@
}
},
"dependencies": {
"solid-js": "^1.8.22"
"solid-js": "^1.9.1"
}
}

View file

@ -4,9 +4,9 @@
"private": true,
"dependencies": {
"@astrojs/solid-js": "workspace:*",
"@solidjs/router": "^0.14.3",
"@solidjs/router": "^0.14.7",
"@test/solid-jsx-component": "file:./deps/solid-jsx-component",
"astro": "workspace:*",
"solid-js": "^1.8.22"
"solid-js": "^1.9.1"
}
}

View file

@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"@astrojs/node": "^8.3.3",
"@astrojs/node": "^8.3.4",
"astro": "workspace:*"
}
}

View file

@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

View file

@ -0,0 +1,22 @@
import { defineConfig } from 'astro/config';
import testAdapter from '../../test-adapter.js';
import { fileURLToPath } from 'url';
export default defineConfig({
output: 'server',
adapter: testAdapter(),
integrations: [
{
name: 'test',
hooks: {
'astro:config:setup'({ injectRoute }) {
injectRoute({
entrypoint: fileURLToPath(new URL('./entrypoint-test.js', import.meta.url)),
pattern: '[...slug]',
prerender: true,
});
},
},
},
],
});

View file

@ -0,0 +1,9 @@
export const prerender = true;
export function getStaticPaths() {
return [{ params: { slug: 'test' } }];
}
export function GET() {
return new Response('OK — test');
}

View file

@ -1,17 +0,0 @@
---
import { manifest } from 'astro:ssr-manifest';
---
<html>
<head>
<title>Testing</title>
<style>
body {
background: green;
}
</style>
</head>
<body>
<h1>Testing</h1>
<div id="assets" set:html={JSON.stringify([...manifest.assets])}></div>
</body>
</html>

View file

@ -0,0 +1,5 @@
import { manifest } from 'astro:ssr-manifest';
export function GET() {
return Response.json(manifest);
}

View file

@ -5,7 +5,7 @@
"dependencies": {
"@astrojs/react": "workspace:*",
"@test/ssr-prerender-chunks-test-adapter": "link:./deps/test-adapter",
"@types/react": "^18.3.5",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "workspace:*",
"react": "^18.3.1",

View file

@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:",
"astro": "workspace:*",
"preact": "^10.23.2"
"preact": "^10.24.1"
}
}

Some files were not shown because too many files have changed in this diff Show more