diff --git a/.agents/skills/merge/SKILL.md b/.agents/skills/merge/SKILL.md new file mode 100644 index 000000000000..3f2692387c3a --- /dev/null +++ b/.agents/skills/merge/SKILL.md @@ -0,0 +1,14 @@ +--- +name: merge +description: Handle main-to-next merge tasks including conflict resolution, changeset cleanup, and CI fix-ups. Use when merging main into next. +--- + +# Merge + +Handle the main-to-next merge process. This skill has sub-skills for each stage: + +- [resolve-conflicts.md](resolve-conflicts.md) — Resolve git merge conflicts +- [fix-ci.md](fix-ci.md) — Fix build errors, type errors, and test failures +- [clean-changesets.md](clean-changesets.md) — Remove stale changeset files + +When invoked, check the `step` argument to determine which sub-skill to run, then read and follow that file's instructions. diff --git a/.changeset/fix-cf-asset-cache-headers.md b/.changeset/fix-cf-asset-cache-headers.md deleted file mode 100644 index cd09c8f219a6..000000000000 --- a/.changeset/fix-cf-asset-cache-headers.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@astrojs/cloudflare': minor ---- - -Sets immutable cache headers for static assets - -Static assets under `_astro` can be cached to improve performance. The adapter now automatically injects a `Cache-Control` header at build time when possible. diff --git a/.changeset/fix-cloudflare-fetch-circular-import.md b/.changeset/fix-cloudflare-fetch-circular-import.md deleted file mode 100644 index 0c250300ad7a..000000000000 --- a/.changeset/fix-cloudflare-fetch-circular-import.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/cloudflare': patch ---- - -Fixes a build crash when using `experimental.advancedRouting` with a custom `fetchFile` that statically imports `cf` from `@astrojs/cloudflare/fetch`. The circular dependency between `@astrojs/cloudflare/fetch` and `astro/app/entrypoint` caused `createApp` or `createGetEnv` to be `undefined` at module evaluation time. Initialization is now deferred to the first `cf()` call, breaking the cycle. diff --git a/.changeset/fix-node-logger-startup-message.md b/.changeset/fix-node-logger-startup-message.md deleted file mode 100644 index b5b802926037..000000000000 --- a/.changeset/fix-node-logger-startup-message.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@astrojs/node': patch -'astro': patch ---- - -Fixes the `experimental.logger` destination not being used for the "Server listening on..." startup message. The logger is now resolved before the server starts listening, and `adapterLogger` re-creates itself when the underlying logger changes so the startup message uses the correct destination. diff --git a/.changeset/kind-snails-wash.md b/.changeset/kind-snails-wash.md deleted file mode 100644 index 617b736c118f..000000000000 --- a/.changeset/kind-snails-wash.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fixes `Astro.request.url` not reflecting validated `X-Forwarded-Proto`/`X-Forwarded-Host` headers when `security.allowedDomains` is configured. Previously, only `Astro.url` was updated with the forwarded origin while `Astro.request.url` retained the socket-derived URL, causing the two to diverge behind TLS-terminating proxies. diff --git a/.changeset/satteri-prism.md b/.changeset/satteri-prism.md deleted file mode 100644 index 0a28c7a601b6..000000000000 --- a/.changeset/satteri-prism.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -'@astrojs/markdown-satteri': minor -'@astrojs/mdx': patch ---- - -Adds support for Prism syntax highlighting to the Sätteri Markdown and MDX processors. Setting `markdown.syntaxHighlight` to `'prism'` now highlights your code blocks with Prism. - -```js -// astro.config.mjs -import { satteri } from '@astrojs/markdown-satteri'; - -export default defineConfig({ - markdown: { - processor: satteri(), - syntaxHighlight: 'prism', - }, -}); -``` diff --git a/.flue/workflows/fix-verification.ts b/.flue/workflows/fix-verification.ts index 09bb58e6beee..538436403142 100644 --- a/.flue/workflows/fix-verification.ts +++ b/.flue/workflows/fix-verification.ts @@ -117,7 +117,7 @@ Return your classification.`, } // Use the astro-pr-writer skill to generate a good PR title and body. - const { data: prContent } = await session.skill('astro-pr-writer/SKILL.md', { + const { data: prContent } = await session.skill('astro-pr-writer', { args: { issueNumber, issueDetails, diff --git a/.flue/workflows/issue-triage.ts b/.flue/workflows/issue-triage.ts index 84dc25dc97ab..a44ef969ba84 100644 --- a/.flue/workflows/issue-triage.ts +++ b/.flue/workflows/issue-triage.ts @@ -178,8 +178,14 @@ async function runTriagePipeline( fixed: boolean; commitMessage: string | null; }> { - const { data: reproduceResult } = await session.skill('triage/reproduce.md', { - args: { issueNumber, issueDetails }, + const { data: reproduceResult } = await session.skill('triage', { + args: { + issueNumber, + issueDetails, + step: 'reproduce', + instructions: + 'Run only the "reproduce" sub-skill from reproduce.md. Do not continue to diagnose, verify, or fix steps.', + }, result: v.object({ reproducible: v.pipe( v.boolean(), @@ -206,8 +212,13 @@ async function runTriagePipeline( }; } - const { data: diagnoseResult } = await session.skill('triage/diagnose.md', { - args: { issueDetails }, + const { data: diagnoseResult } = await session.skill('triage', { + args: { + issueDetails, + step: 'diagnose', + instructions: + 'Run only the "diagnose" sub-skill from diagnose.md. Do not continue to verify or fix steps.', + }, result: v.object({ confidence: v.pipe( v.nullable(v.picklist(['high', 'medium', 'low'])), @@ -215,8 +226,12 @@ async function runTriagePipeline( ), }), }); - const { data: verifyResult } = await session.skill('triage/verify.md', { - args: { issueDetails }, + const { data: verifyResult } = await session.skill('triage', { + args: { + issueDetails, + step: 'verify', + instructions: 'Run only the "verify" sub-skill from verify.md. Do not continue to fix step.', + }, result: v.object({ verdict: v.pipe( v.picklist(['bug', 'intended-behavior', 'unclear']), @@ -241,8 +256,8 @@ async function runTriagePipeline( }; } - const { data: fixResult } = await session.skill('triage/fix.md', { - args: { issueDetails }, + const { data: fixResult } = await session.skill('triage', { + args: { issueDetails, step: 'fix', instructions: 'Run only the "fix" sub-skill from fix.md.' }, result: v.object({ fixed: v.pipe( v.boolean(), @@ -334,8 +349,16 @@ export async function run({ init, payload }: FlueContext) { assert(packageLabels.length > 0, 'no package labels found'); const branchName = isPushed ? branch : null; - const { data: comment } = await session.skill('triage/comment.md', { - args: { branchName, priorityLabels, issueDetails, previewRelease }, + const { data: comment } = await session.skill('triage', { + args: { + branchName, + priorityLabels, + issueDetails, + previewRelease, + step: 'comment', + instructions: + 'Run only the "comment" sub-skill from comment.md. Generate the GitHub comment from triage findings.', + }, result: v.pipe( v.string(), v.description( diff --git a/.flue/workflows/merge-fix/WORKFLOW.ts b/.flue/workflows/merge-fix/WORKFLOW.ts index db61a673e655..00fe65b60ef8 100644 --- a/.flue/workflows/merge-fix/WORKFLOW.ts +++ b/.flue/workflows/merge-fix/WORKFLOW.ts @@ -35,8 +35,13 @@ export async function run({ init, payload }: FlueContext) { // Conflicts have already been resolved by the merge-resolve workflow. // Dependencies are installed but packages may NOT be built yet — the skill // handles building and fixing any errors that come up. - const { data: fixResult } = await session.skill('merge/fix-ci.md', { - args: { prNumber, ciLogs }, + const { data: fixResult } = await session.skill('merge', { + args: { + prNumber, + ciLogs, + step: 'fix-ci', + instructions: 'Run only the "fix-ci" sub-skill from fix-ci.md.', + }, result: v.object({ ciPass: v.pipe(v.boolean(), v.description('true if build + tests pass after fixes')), fixedFiles: v.pipe( diff --git a/.flue/workflows/merge-resolve/WORKFLOW.ts b/.flue/workflows/merge-resolve/WORKFLOW.ts index fe1394ac0457..7830481694c2 100644 --- a/.flue/workflows/merge-resolve/WORKFLOW.ts +++ b/.flue/workflows/merge-resolve/WORKFLOW.ts @@ -31,8 +31,13 @@ export async function run({ init, payload }: FlueContext) { // conflicts, the working tree has conflict markers in all affected files. // This skill resolves them intelligently — keeping next-side versions but // preserving important changes from main (new deps, bug fixes, etc.) - const { data: resolveResult } = await session.skill('merge/resolve-conflicts.md', { - args: { branch, hasConflicts }, + const { data: resolveResult } = await session.skill('merge', { + args: { + branch, + hasConflicts, + step: 'resolve-conflicts', + instructions: 'Run only the "resolve-conflicts" sub-skill from resolve-conflicts.md.', + }, result: v.object({ resolvedFiles: v.pipe( v.array(v.string()), @@ -42,8 +47,11 @@ export async function run({ init, payload }: FlueContext) { }); // Step 2: Remove stale changesets that were already released on main - const { data: changesetResult } = await session.skill('merge/clean-changesets.md', { - args: {}, + const { data: changesetResult } = await session.skill('merge', { + args: { + step: 'clean-changesets', + instructions: 'Run only the "clean-changesets" sub-skill from clean-changesets.md.', + }, result: v.object({ removedChangesets: v.pipe( v.array(v.string()), diff --git a/examples/advanced-routing/package.json b/examples/advanced-routing/package.json index 05e8d2d0b7ea..6577b3c904ab 100644 --- a/examples/advanced-routing/package.json +++ b/examples/advanced-routing/package.json @@ -13,8 +13,8 @@ "astro": "astro" }, "dependencies": { - "@astrojs/node": "^10.1.3", - "astro": "^6.4.4", + "@astrojs/node": "^10.1.4", + "astro": "^6.4.5", "hono": "^4.12.14" } } diff --git a/examples/basics/package.json b/examples/basics/package.json index 7da5504b3ad2..cef9143e5e45 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -13,6 +13,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^6.4.4" + "astro": "^6.4.5" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 02655aa8289e..23371a34f928 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -13,10 +13,10 @@ "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^6.0.2", + "@astrojs/mdx": "^6.0.3", "@astrojs/rss": "^4.0.18", "@astrojs/sitemap": "^3.7.3", - "astro": "^6.4.4", + "astro": "^6.4.5", "sharp": "^0.34.3" } } diff --git a/examples/component/package.json b/examples/component/package.json index 3313757b8e30..8ffe345c50a3 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -18,7 +18,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^6.4.4" + "astro": "^6.4.5" }, "peerDependencies": { "astro": "^5.0.0 || ^6.0.0" diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json index c3002b50e601..ab3c758b10bc 100644 --- a/examples/container-with-vitest/package.json +++ b/examples/container-with-vitest/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@astrojs/react": "^5.0.7", - "astro": "^6.4.4", + "astro": "^6.4.5", "react": "^18.3.1", "react-dom": "^18.3.1", "vitest": "^4.1.0" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index b32bc3bbf2bf..acb6a5da2aaf 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -16,6 +16,6 @@ "@astrojs/alpinejs": "^0.5.0", "@types/alpinejs": "^3.13.11", "alpinejs": "^3.15.8", - "astro": "^6.4.4" + "astro": "^6.4.5" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index bf8ece2d5e83..b0a7f2a51359 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -20,7 +20,7 @@ "@astrojs/vue": "^6.0.1", "@types/react": "^18.3.28", "@types/react-dom": "^18.3.7", - "astro": "^6.4.4", + "astro": "^6.4.5", "preact": "^10.28.4", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index b8addf1cef89..63d1c9f9fe04 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -15,7 +15,7 @@ "dependencies": { "@astrojs/preact": "^5.1.5", "@preact/signals": "^2.8.1", - "astro": "^6.4.4", + "astro": "^6.4.5", "preact": "^10.28.4" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 0fc95b68dfa5..e2ac29f2f306 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -16,7 +16,7 @@ "@astrojs/react": "^5.0.7", "@types/react": "^18.3.28", "@types/react-dom": "^18.3.7", - "astro": "^6.4.4", + "astro": "^6.4.5", "react": "^18.3.1", "react-dom": "^18.3.1" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 3195f7affbd9..845708001c53 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@astrojs/solid-js": "^6.0.1", - "astro": "^6.4.4", + "astro": "^6.4.5", "solid-js": "^1.9.11" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 9e8d0209d120..8109360f107b 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@astrojs/svelte": "^8.1.2", - "astro": "^6.4.4", + "astro": "^6.4.5", "svelte": "^5.53.5" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 17a7cd0d63a1..1125d08b2f9e 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@astrojs/vue": "^6.0.1", - "astro": "^6.4.4", + "astro": "^6.4.5", "vue": "^3.5.29" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index cbf008d9dfb0..cbc76d6e474b 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -13,7 +13,7 @@ "astro": "astro" }, "dependencies": { - "@astrojs/node": "^10.1.3", - "astro": "^6.4.4" + "@astrojs/node": "^10.1.4", + "astro": "^6.4.5" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 51d64e9c74f8..bbc95daea684 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -18,7 +18,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^6.4.4" + "astro": "^6.4.5" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 07e7a8c232c9..279dda5f0865 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -13,6 +13,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^6.4.4" + "astro": "^6.4.5" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 94546a9c751b..ba0670960a34 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -13,6 +13,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^6.4.4" + "astro": "^6.4.5" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 1f81e877547b..addf418d653d 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,9 +14,9 @@ "server": "node dist/server/entry.mjs" }, "dependencies": { - "@astrojs/node": "^10.1.3", + "@astrojs/node": "^10.1.4", "@astrojs/svelte": "^8.1.2", - "astro": "^6.4.4", + "astro": "^6.4.5", "svelte": "^5.53.5" } } diff --git a/examples/starlog/package.json b/examples/starlog/package.json index fbf9e9f7d90d..df8f64d4a465 100644 --- a/examples/starlog/package.json +++ b/examples/starlog/package.json @@ -9,7 +9,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^6.4.4", + "astro": "^6.4.5", "sass": "^1.97.3", "sharp": "^0.34.3" }, diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json index 3ae6009de43a..aca47b79eb83 100644 --- a/examples/toolbar-app/package.json +++ b/examples/toolbar-app/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "@types/node": "^22.10.6", - "astro": "^6.4.4" + "astro": "^6.4.5" }, "engines": { "node": ">=22.12.0" diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index c3104cca5d2e..4cccb7a80232 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -14,6 +14,6 @@ }, "dependencies": { "@astrojs/markdoc": "^1.0.6", - "astro": "^6.4.4" + "astro": "^6.4.5" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 9511a95eba68..b579fa202906 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,9 +13,9 @@ "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^6.0.2", + "@astrojs/mdx": "^6.0.3", "@astrojs/preact": "^5.1.5", - "astro": "^6.4.4", + "astro": "^6.4.5", "preact": "^10.28.4" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 1cd24d6c6ab5..655bd4350d6f 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -15,7 +15,7 @@ "dependencies": { "@astrojs/preact": "^5.1.5", "@nanostores/preact": "^1.0.0", - "astro": "^6.4.4", + "astro": "^6.4.5", "nanostores": "^1.1.1", "preact": "^10.28.4" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 6d8b2066f339..4a70693eb126 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -13,10 +13,10 @@ "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^6.0.2", + "@astrojs/mdx": "^6.0.3", "@tailwindcss/vite": "^4.2.1", "@types/canvas-confetti": "^1.9.0", - "astro": "^6.4.4", + "astro": "^6.4.5", "canvas-confetti": "^1.9.4", "tailwindcss": "^4.2.1", "vite": "^7.3.2" diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 1b7177563553..8fa543241312 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -14,7 +14,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^6.4.4", + "astro": "^6.4.5", "vitest": "^4.1.0" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index c62ead96df70..4f81be17c32c 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,15 @@ # astro +## 6.4.5 + +### Patch Changes + +- [#16985](https://github.com/withastro/astro/pull/16985) [`4ecff32`](https://github.com/withastro/astro/commit/4ecff3268acb6ee3db719c4b38bbaead703ff4de) Thanks [@maximslo](https://github.com/maximslo)! - Fixes the `experimental.logger` destination not being used for the "Server listening on..." startup message. The logger is now resolved before the server starts listening, and `adapterLogger` re-creates itself when the underlying logger changes so the startup message uses the correct destination. + +- [#16947](https://github.com/withastro/astro/pull/16947) [`e0703a6`](https://github.com/withastro/astro/commit/e0703a6e815be829759ab7912f7024ee8424c3ac) Thanks [@ematipico](https://github.com/ematipico)! - Fixes `Astro.request.url` not reflecting validated `X-Forwarded-Proto`/`X-Forwarded-Host` headers when `security.allowedDomains` is configured. Previously, only `Astro.url` was updated with the forwarded origin while `Astro.request.url` retained the socket-derived URL, causing the two to diverge behind TLS-terminating proxies. + +- [#16997](https://github.com/withastro/astro/pull/16997) [`dc45246`](https://github.com/withastro/astro/commit/dc45246812afcaab60393e5236d27e95f98f5efa) Thanks [@matthewp](https://github.com/matthewp)! - Reverts a change to `isNode` runtime detection that caused a significant build time regression for Cloudflare adapter users with large prerendered sites + ## 6.4.4 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index e799ca9269aa..2aed8dd5aefb 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "6.4.4", + "version": "6.4.5", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/packages/astro/src/runtime/server/render/util.ts b/packages/astro/src/runtime/server/render/util.ts index d56fc8be0efd..a2f30862eb19 100644 --- a/packages/astro/src/runtime/server/render/util.ts +++ b/packages/astro/src/runtime/server/render/util.ts @@ -275,9 +275,7 @@ export interface RendererFlusher { } export const isNode = - typeof process !== 'undefined' && - Object.prototype.toString.call(process) === '[object process]' && - !(typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers'); + typeof process !== 'undefined' && Object.prototype.toString.call(process) === '[object process]'; // @ts-expect-error: Deno is not part of the types. export const isDeno = typeof Deno !== 'undefined'; diff --git a/packages/db/CHANGELOG.md b/packages/db/CHANGELOG.md index 440a4b7f7527..108eddf90bd9 100644 --- a/packages/db/CHANGELOG.md +++ b/packages/db/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/db +## 0.21.3 + +### Patch Changes + +- [#16964](https://github.com/withastro/astro/pull/16964) [`b048826`](https://github.com/withastro/astro/commit/b048826b7a0406c751073c1bd95686d9ffae8edc) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Deprecates the `@astrojs/db` integration. We no longer have the bandwidth to maintain this package, and we recommend that users directly use the database client of their choice (Drizzle, Kysely, etc.) in their Astro projects instead. + ## 0.21.2 ### Patch Changes diff --git a/packages/db/README.md b/packages/db/README.md index 7fe42be9d3f5..f09ba618be35 100644 --- a/packages/db/README.md +++ b/packages/db/README.md @@ -1,14 +1,12 @@ -# @astrojs/db (experimental) 💿 +# @astrojs/db 💿 -This **[Astro integration][astro-integration]** enables the usage of [SQLite](https://www.sqlite.org/) in Astro Projects. - -## Documentation - -Read the [`@astrojs/db` docs][docs] +> ⚠️ **This integration is deprecated** +> +> This integration is no longer maintained and will not receive updates. We recommend directly using the database client (Drizzle, Kysely, etc.) of your choice in your Astro project instead. ## Support -- Get help in the [Astro Discord][discord]. Post questions in our `#support` forum, or visit our dedicated `#dev` channel to discuss current development and more! +- Get help in the [Astro Discord][discord]. Post questions in our `#support` forum, or visit our dedicated `#framework` channel to discuss current development and more! - Check our [Astro Integration Documentation][astro-integration] for more on integrations. @@ -29,10 +27,9 @@ MIT Copyright (c) 2023–present [Astro][astro] [astro]: https://astro.build/ -[docs]: https://docs.astro.build/en/guides/integrations-guide/db/ [contributing]: https://github.com/withastro/astro/blob/main/CONTRIBUTING.md [coc]: https://github.com/withastro/.github/blob/main/CODE_OF_CONDUCT.md [community]: https://github.com/withastro/.github/blob/main/COMMUNITY_GUIDE.md [discord]: https://astro.build/chat/ [issues]: https://github.com/withastro/astro/issues -[astro-integration]: https://docs.astro.build/en/guides/integrations/ +[astro-integration]: https://docs.astro.build/en/guides/integrations-guide/ diff --git a/packages/db/package.json b/packages/db/package.json index 91b31f19ea7e..2a585a4ae01c 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/db", - "version": "0.21.2", + "version": "0.21.3", "description": "Add libSQL support to your Astro site", "license": "MIT", "repository": { diff --git a/packages/integrations/cloudflare/CHANGELOG.md b/packages/integrations/cloudflare/CHANGELOG.md index b30ea4e8361b..1337e9a8178a 100644 --- a/packages/integrations/cloudflare/CHANGELOG.md +++ b/packages/integrations/cloudflare/CHANGELOG.md @@ -1,5 +1,20 @@ # @astrojs/cloudflare +## 13.7.0 + +### Minor Changes + +- [#16571](https://github.com/withastro/astro/pull/16571) [`d4b0cd1`](https://github.com/withastro/astro/commit/d4b0cd111ca0958e5da8772e34dd4fdc3e3a89dc) Thanks [@MA2153](https://github.com/MA2153)! - Sets immutable cache headers for static assets + + Static assets under `_astro` can be cached to improve performance. The adapter now automatically injects a `Cache-Control` header at build time when possible. + +### Patch Changes + +- [#16968](https://github.com/withastro/astro/pull/16968) [`7a5c001`](https://github.com/withastro/astro/commit/7a5c00169ecc3a1ceccf27f457818c04bcc5d12b) Thanks [@astrobot-houston](https://github.com/astrobot-houston)! - Fixes a build crash when using `experimental.advancedRouting` with a custom `fetchFile` that statically imports `cf` from `@astrojs/cloudflare/fetch`. The circular dependency between `@astrojs/cloudflare/fetch` and `astro/app/entrypoint` caused `createApp` or `createGetEnv` to be `undefined` at module evaluation time. Initialization is now deferred to the first `cf()` call, breaking the cycle. + +- Updated dependencies []: + - @astrojs/underscore-redirects@1.0.3 + ## 13.6.1 ### Patch Changes diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 91e21a131fef..f8c269720358 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/cloudflare", "description": "Deploy your site to Cloudflare Workers", - "version": "13.6.1", + "version": "13.7.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md index 68000080e1f4..c32ee6fa515a 100644 --- a/packages/integrations/mdx/CHANGELOG.md +++ b/packages/integrations/mdx/CHANGELOG.md @@ -1,5 +1,23 @@ # @astrojs/mdx +## 6.0.3 + +### Patch Changes + +- [#16969](https://github.com/withastro/astro/pull/16969) [`4a31f90`](https://github.com/withastro/astro/commit/4a31f90c765bcd1c4af8b85160b74a0da338cfe7) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Adds support for Prism syntax highlighting to the Sätteri Markdown and MDX processors. Setting `markdown.syntaxHighlight` to `'prism'` now highlights your code blocks with Prism. + + ```js + // astro.config.mjs + import { satteri } from '@astrojs/markdown-satteri'; + + export default defineConfig({ + markdown: { + processor: satteri(), + syntaxHighlight: 'prism', + }, + }); + ``` + ## 6.0.2 ### Patch Changes diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index 46573a0ae3cd..1326af165174 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": "6.0.2", + "version": "6.0.3", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/node/CHANGELOG.md b/packages/integrations/node/CHANGELOG.md index 2a179fe96280..52ef8174027c 100644 --- a/packages/integrations/node/CHANGELOG.md +++ b/packages/integrations/node/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/node +## 10.1.4 + +### Patch Changes + +- [#16985](https://github.com/withastro/astro/pull/16985) [`4ecff32`](https://github.com/withastro/astro/commit/4ecff3268acb6ee3db719c4b38bbaead703ff4de) Thanks [@maximslo](https://github.com/maximslo)! - Fixes the `experimental.logger` destination not being used for the "Server listening on..." startup message. The logger is now resolved before the server starts listening, and `adapterLogger` re-creates itself when the underlying logger changes so the startup message uses the correct destination. + ## 10.1.3 ### Patch Changes diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 23119c7ab3fd..4427496ebd59 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": "10.1.3", + "version": "10.1.4", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/markdown/satteri/CHANGELOG.md b/packages/markdown/satteri/CHANGELOG.md index 72f98b3765ff..efb750520c87 100644 --- a/packages/markdown/satteri/CHANGELOG.md +++ b/packages/markdown/satteri/CHANGELOG.md @@ -1,5 +1,23 @@ # @astrojs/markdown-satteri +## 0.3.0 + +### Minor Changes + +- [#16969](https://github.com/withastro/astro/pull/16969) [`4a31f90`](https://github.com/withastro/astro/commit/4a31f90c765bcd1c4af8b85160b74a0da338cfe7) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Adds support for Prism syntax highlighting to the Sätteri Markdown and MDX processors. Setting `markdown.syntaxHighlight` to `'prism'` now highlights your code blocks with Prism. + + ```js + // astro.config.mjs + import { satteri } from '@astrojs/markdown-satteri'; + + export default defineConfig({ + markdown: { + processor: satteri(), + syntaxHighlight: 'prism', + }, + }); + ``` + ## 0.2.2 ### Patch Changes diff --git a/packages/markdown/satteri/package.json b/packages/markdown/satteri/package.json index b4eb79137a35..32698a2c67de 100644 --- a/packages/markdown/satteri/package.json +++ b/packages/markdown/satteri/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/markdown-satteri", - "version": "0.2.2", + "version": "0.3.0", "type": "module", "author": "withastro", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7d460a32464f..4e3ce7715f17 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -194,10 +194,10 @@ importers: examples/advanced-routing: dependencies: '@astrojs/node': - specifier: ^10.1.3 + specifier: ^10.1.4 version: link:../../packages/integrations/node astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro hono: specifier: ^4.12.14 @@ -206,13 +206,13 @@ importers: examples/basics: dependencies: astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro examples/blog: dependencies: '@astrojs/mdx': - specifier: ^6.0.2 + specifier: ^6.0.3 version: link:../../packages/integrations/mdx '@astrojs/rss': specifier: ^4.0.18 @@ -221,7 +221,7 @@ importers: specifier: ^3.7.3 version: link:../../packages/integrations/sitemap astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro sharp: specifier: ^0.34.3 @@ -230,7 +230,7 @@ importers: examples/component: devDependencies: astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro examples/container-with-vitest: @@ -239,7 +239,7 @@ importers: specifier: ^5.0.7 version: link:../../packages/integrations/react astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -270,7 +270,7 @@ importers: specifier: ^3.15.8 version: 3.15.8 astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro examples/framework-multiple: @@ -297,7 +297,7 @@ importers: specifier: ^18.3.7 version: 18.3.7(@types/react@18.3.28) astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro preact: specifier: ^10.28.4 @@ -327,7 +327,7 @@ importers: specifier: ^2.8.1 version: 2.8.2(preact@10.29.0) astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro preact: specifier: ^10.28.4 @@ -345,7 +345,7 @@ importers: specifier: ^18.3.7 version: 18.3.7(@types/react@18.3.28) astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -360,7 +360,7 @@ importers: specifier: ^6.0.1 version: link:../../packages/integrations/solid astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro solid-js: specifier: ^1.9.11 @@ -372,7 +372,7 @@ importers: specifier: ^8.1.2 version: link:../../packages/integrations/svelte astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro svelte: specifier: ^5.53.5 @@ -384,7 +384,7 @@ importers: specifier: ^6.0.1 version: link:../../packages/integrations/vue astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro vue: specifier: ^3.5.29 @@ -393,40 +393,40 @@ importers: examples/hackernews: dependencies: '@astrojs/node': - specifier: ^10.1.3 + specifier: ^10.1.4 version: link:../../packages/integrations/node astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro examples/minimal: dependencies: astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro examples/ssr: dependencies: '@astrojs/node': - specifier: ^10.1.3 + specifier: ^10.1.4 version: link:../../packages/integrations/node '@astrojs/svelte': specifier: ^8.1.2 version: link:../../packages/integrations/svelte astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro svelte: specifier: ^5.53.5 @@ -435,7 +435,7 @@ importers: examples/starlog: dependencies: astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro sass: specifier: ^1.97.3 @@ -450,7 +450,7 @@ importers: specifier: ^22.19.0 version: 22.19.19 astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro examples/with-markdoc: @@ -459,19 +459,19 @@ importers: specifier: ^1.0.6 version: link:../../packages/integrations/markdoc astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro examples/with-mdx: dependencies: '@astrojs/mdx': - specifier: ^6.0.2 + specifier: ^6.0.3 version: link:../../packages/integrations/mdx '@astrojs/preact': specifier: ^5.1.5 version: link:../../packages/integrations/preact astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro preact: specifier: ^10.28.4 @@ -486,7 +486,7 @@ importers: specifier: ^1.0.0 version: 1.0.0(nanostores@1.1.1)(preact@10.29.0) astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro nanostores: specifier: ^1.1.1 @@ -498,7 +498,7 @@ importers: examples/with-tailwindcss: dependencies: '@astrojs/mdx': - specifier: ^6.0.2 + specifier: ^6.0.3 version: link:../../packages/integrations/mdx '@tailwindcss/vite': specifier: ^4.2.1 @@ -507,7 +507,7 @@ importers: specifier: ^1.9.0 version: 1.9.0 astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro canvas-confetti: specifier: ^1.9.4 @@ -522,7 +522,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^6.4.4 + specifier: ^6.4.5 version: link:../../packages/astro vitest: specifier: ^4.1.0