From 7c485ffc862f976834b40e724c5ebb6a311a9db4 Mon Sep 17 00:00:00 2001 From: Eva Decker Date: Wed, 22 Nov 2023 16:48:15 -0500 Subject: [PATCH 1/8] Fix View Transitions code block formatting (#9174) --- packages/astro/CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 1e6a1769a0..57e512af77 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -9,9 +9,9 @@ Three new events now complement the existing `astro:after-swap` and `astro:page-load` events: ```javascript - astro: before - preparation; // Control how the DOM and other resources of the target page are loaded - astro: after - preparation; // Last changes before taking off? Remove that loading indicator? Here you go! - astro: before - swap; // Control how the DOM is updated to match the new page + astro:before-preparation; // Control how the DOM and other resources of the target page are loaded + astro:after-preparation; // Last changes before taking off? Remove that loading indicator? Here you go! + astro:before-swap; // Control how the DOM is updated to match the new page ``` The `astro:before-*` events allow you to change properties and strategies of the view transition implementation. From ae4d949e7d91d735c4419d72d1e96fb6a85014d6 Mon Sep 17 00:00:00 2001 From: Eva Decker Date: Wed, 22 Nov 2023 21:49:55 +0000 Subject: [PATCH 2/8] [ci] format --- packages/astro/CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 57e512af77..1e6a1769a0 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -9,9 +9,9 @@ Three new events now complement the existing `astro:after-swap` and `astro:page-load` events: ```javascript - astro:before-preparation; // Control how the DOM and other resources of the target page are loaded - astro:after-preparation; // Last changes before taking off? Remove that loading indicator? Here you go! - astro:before-swap; // Control how the DOM is updated to match the new page + astro: before - preparation; // Control how the DOM and other resources of the target page are loaded + astro: after - preparation; // Last changes before taking off? Remove that loading indicator? Here you go! + astro: before - swap; // Control how the DOM is updated to match the new page ``` The `astro:before-*` events allow you to change properties and strategies of the view transition implementation. From 481c13a08c2d6a5bc1b4a8fe4259714d868eb514 Mon Sep 17 00:00:00 2001 From: Martin Trapp <94928215+martrapp@users.noreply.github.com> Date: Thu, 23 Nov 2023 00:20:33 +0100 Subject: [PATCH 3/8] fix: Changelog formatting for 3.6.0 View Transition events (#9176) Co-authored-by: Eva Decker --- packages/astro/CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 1e6a1769a0..a02b12312b 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -9,9 +9,9 @@ Three new events now complement the existing `astro:after-swap` and `astro:page-load` events: ```javascript - astro: before - preparation; // Control how the DOM and other resources of the target page are loaded - astro: after - preparation; // Last changes before taking off? Remove that loading indicator? Here you go! - astro: before - swap; // Control how the DOM is updated to match the new page + 'astro:before-preparation'; // Control how the DOM and other resources of the target page are loaded + 'astro:after-preparation'; // Last changes before taking off? Remove that loading indicator? Here you go! + 'astro:before-swap'; // Control how the DOM is updated to match the new page ``` The `astro:before-*` events allow you to change properties and strategies of the view transition implementation. From 04fdc1c613171409ed1a2bd887326e26cdb8b5ef Mon Sep 17 00:00:00 2001 From: Arsh <69170106+lilnasy@users.noreply.github.com> Date: Thu, 23 Nov 2023 01:43:18 +0000 Subject: [PATCH 4/8] fix(middleware): rename internal middleware id (#9173) * rename internal middleware id * add changeset --- .changeset/great-hats-drive.md | 5 +++++ packages/astro/src/core/middleware/vite-plugin.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/great-hats-drive.md diff --git a/.changeset/great-hats-drive.md b/.changeset/great-hats-drive.md new file mode 100644 index 0000000000..75bcd2581d --- /dev/null +++ b/.changeset/great-hats-drive.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fixes an issue where having a middleware prevented the SSR app from being deployed on Netlify. diff --git a/packages/astro/src/core/middleware/vite-plugin.ts b/packages/astro/src/core/middleware/vite-plugin.ts index 0447134910..918c7c9526 100644 --- a/packages/astro/src/core/middleware/vite-plugin.ts +++ b/packages/astro/src/core/middleware/vite-plugin.ts @@ -7,7 +7,7 @@ import type { BuildInternals } from '../build/internal.js'; import type { StaticBuildOptions } from '../build/types.js'; import { MIDDLEWARE_PATH_SEGMENT_NAME } from '../constants.js'; -export const MIDDLEWARE_MODULE_ID = '@astro-middleware'; +export const MIDDLEWARE_MODULE_ID = '\0astro-internal:middleware'; const EMPTY_MIDDLEWARE = '\0empty-middleware'; export function vitePluginMiddleware({ settings }: { settings: AstroSettings }): VitePlugin { From 607542c7cf9fe9813c06f1d96615d6c793262d22 Mon Sep 17 00:00:00 2001 From: Martin Trapp <94928215+martrapp@users.noreply.github.com> Date: Thu, 23 Nov 2023 19:08:37 +0100 Subject: [PATCH 5/8] fix scroll restoration issue on webKit browsers (#9186) * fix scroll restoration issue on webKit browsers * add changeset * Update .changeset/shaggy-socks-glow.md * Update .changeset/shaggy-socks-glow.md Co-authored-by: Sarah Rainsberger --------- Co-authored-by: Sarah Rainsberger --- .changeset/shaggy-socks-glow.md | 5 +++++ packages/astro/src/transitions/router.ts | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .changeset/shaggy-socks-glow.md diff --git a/.changeset/shaggy-socks-glow.md b/.changeset/shaggy-socks-glow.md new file mode 100644 index 0000000000..409d029085 --- /dev/null +++ b/.changeset/shaggy-socks-glow.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fixes a view transition issue on webKit browsers that prevented scrolling to #fragments diff --git a/packages/astro/src/transitions/router.ts b/packages/astro/src/transitions/router.ts index a97abfcf77..6ff0efc01d 100644 --- a/packages/astro/src/transitions/router.ts +++ b/packages/astro/src/transitions/router.ts @@ -194,7 +194,6 @@ const moveToLocation = (to: URL, from: URL, options: Options, historyState?: Sta to.href ); } - history.scrollRestoration = 'manual'; } // now we are on the new page for non-history navigations! // (with history navigation page change happens before popstate is fired) @@ -213,12 +212,14 @@ const moveToLocation = (to: URL, from: URL, options: Options, historyState?: Sta // 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'; } }; From ecbb5ed799874204ff6991b6dc36334c0f30836a Mon Sep 17 00:00:00 2001 From: Guspan Tanadi <36249910+guspan-tanadi@users.noreply.github.com> Date: Fri, 24 Nov 2023 14:06:11 +0700 Subject: [PATCH 6/8] style: highlight markdown Tip Note section CONTRIBUTING (#9123) --- CONTRIBUTING.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 47c9aa6b2a..4637fb3725 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,8 +2,8 @@ We welcome contributions of any size and skill level. As an open source project, we believe in giving back to our contributors and are happy to help with guidance on PRs, technical writing, and turning any feature idea into a reality. -> **Tip for new contributors:** -> Take a look at [https://github.com/firstcontributions/first-contributions](https://github.com/firstcontributions/first-contributions) for helpful information on contributing +> [!Tip] +> **For new contributors:** Take a look at [https://github.com/firstcontributions/first-contributions](https://github.com/firstcontributions/first-contributions) for helpful information on contributing ## Quick Guide @@ -46,7 +46,8 @@ To get started, create a codespace for this repository by clicking this 👇 Your new codespace will open in a web-based version of Visual Studio Code. All development dependencies will be preinstalled, and the tests will run automatically ensuring you've got a green base from which to start working. -**Note**: Dev containers is now an open spec which is supported by [GitHub Codespaces](https://github.com/codespaces) and [other supporting tools](https://containers.dev/supporting). +> [!Note] +> Dev containers is now an open spec which is supported by [GitHub Codespaces](https://github.com/codespaces) and [other supporting tools](https://containers.dev/supporting). ### Development @@ -187,7 +188,7 @@ Understanding in which environment code runs, and at which stage in the process, Active Astro development happens on the [`main`](https://github.com/withastro/astro/tree/main) branch. `main` always reflects the latest code. -> **Note:** +> [!Note] > During certain periods, we put `main` into a [**prerelease**](https://github.com/changesets/changesets/blob/main/docs/prereleases.md#prereleases) state. Read more about [Releasing Astro](#releasing-astro). ### `latest` @@ -198,7 +199,8 @@ By default, `create-astro` and [astro.new](https://astro.new) point to this bran ## Releasing Astro -_Note: Only [core maintainers (L3+)](https://github.com/withastro/.github/blob/main/GOVERNANCE.md#level-3-l3---core) can release new versions of Astro._ +> [!Note] +> Only [core maintainers (L3+)](https://github.com/withastro/.github/blob/main/GOVERNANCE.md#level-3-l3---core) can release new versions of Astro. The repo is set up with automatic releases, using the changeset GitHub action & bot. From ae29fad70b8f5d32baca00625e1e8ed94fee47f6 Mon Sep 17 00:00:00 2001 From: Guspan Tanadi Date: Fri, 24 Nov 2023 07:07:45 +0000 Subject: [PATCH 7/8] [ci] format --- CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4637fb3725..93c348b26f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,8 +2,7 @@ We welcome contributions of any size and skill level. As an open source project, we believe in giving back to our contributors and are happy to help with guidance on PRs, technical writing, and turning any feature idea into a reality. -> [!Tip] -> **For new contributors:** Take a look at [https://github.com/firstcontributions/first-contributions](https://github.com/firstcontributions/first-contributions) for helpful information on contributing +> [!Tip] > **For new contributors:** Take a look at [https://github.com/firstcontributions/first-contributions](https://github.com/firstcontributions/first-contributions) for helpful information on contributing ## Quick Guide From 2ef75fe752b4fbd63f98ca8ee294b135f6bec804 Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Mon, 27 Nov 2023 07:34:52 -0800 Subject: [PATCH 8/8] [ci] release (#9180) Co-authored-by: github-actions[bot] --- .changeset/great-hats-drive.md | 5 -- .changeset/shaggy-socks-glow.md | 5 -- examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/hackernews/package.json | 2 +- examples/integration/package.json | 2 +- examples/middleware/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/view-transitions/package.json | 2 +- examples/with-markdoc/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 8 +++ packages/astro/package.json | 2 +- pnpm-lock.yaml | 54 ++++++++++----------- 32 files changed, 63 insertions(+), 65 deletions(-) delete mode 100644 .changeset/great-hats-drive.md delete mode 100644 .changeset/shaggy-socks-glow.md diff --git a/.changeset/great-hats-drive.md b/.changeset/great-hats-drive.md deleted file mode 100644 index 75bcd2581d..0000000000 --- a/.changeset/great-hats-drive.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fixes an issue where having a middleware prevented the SSR app from being deployed on Netlify. diff --git a/.changeset/shaggy-socks-glow.md b/.changeset/shaggy-socks-glow.md deleted file mode 100644 index 409d029085..0000000000 --- a/.changeset/shaggy-socks-glow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fixes a view transition issue on webKit browsers that prevented scrolling to #fragments diff --git a/examples/basics/package.json b/examples/basics/package.json index df75ae3d15..6266329c8a 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.6.0" + "astro": "^3.6.1" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index f52fb29403..4525c6707c 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^1.1.5", "@astrojs/rss": "^3.0.0", "@astrojs/sitemap": "^3.0.3", - "astro": "^3.6.0" + "astro": "^3.6.1" } } diff --git a/examples/component/package.json b/examples/component/package.json index b91bdea712..0bbbf990b3 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.6.0" + "astro": "^3.6.1" }, "peerDependencies": { "astro": "^3.0.0" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 0b69a0eab4..b521d82ffd 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.3.1", "@types/alpinejs": "^3.7.2", "alpinejs": "^3.12.3", - "astro": "^3.6.0" + "astro": "^3.6.1" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 91f9cfaa85..2dce29b26d 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^3.0.3", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^3.6.0", + "astro": "^3.6.1", "lit": "^2.8.0" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 515e2b8b6a..338a286615 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -16,7 +16,7 @@ "@astrojs/solid-js": "^3.0.2", "@astrojs/svelte": "^4.0.4", "@astrojs/vue": "^3.0.4", - "astro": "^3.6.0", + "astro": "^3.6.1", "preact": "^10.17.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index c9b099a6ec..f9fabe2a81 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.0.1", "@preact/signals": "^1.2.1", - "astro": "^3.6.0", + "astro": "^3.6.1", "preact": "^10.17.1" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index d6f3f6791b..3b1d69dd16 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^3.0.6", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", - "astro": "^3.6.0", + "astro": "^3.6.1", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index e052bf7603..26b0a490cf 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^3.0.2", - "astro": "^3.6.0", + "astro": "^3.6.1", "solid-js": "^1.7.11" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 0ad0f8aa1a..b3206de3cd 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^4.0.4", - "astro": "^3.6.0", + "astro": "^3.6.1", "svelte": "^4.2.0" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 2f24cf0db0..71564a36d0 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^3.0.4", - "astro": "^3.6.0", + "astro": "^3.6.1", "vue": "^3.3.4" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 527678f4b6..ac3b7796c0 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^6.0.4", - "astro": "^3.6.0" + "astro": "^3.6.1" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 463e0dfa6a..7c6428076e 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.6.0" + "astro": "^3.6.1" }, "peerDependencies": { "astro": "^3.0.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index efa7572e1a..d87656e981 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^6.0.4", - "astro": "^3.6.0", + "astro": "^3.6.1", "html-minifier": "^4.0.0" } } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index c2cd8766bd..3343b8be2a 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.6.0" + "astro": "^3.6.1" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 80da364de1..3eab4227b1 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.6.0" + "astro": "^3.6.1" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 427e47fd4c..750de6f3f1 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.6.0" + "astro": "^3.6.1" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 514f95ec92..035278d6c5 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^6.0.4", "@astrojs/svelte": "^4.0.4", - "astro": "^3.6.0", + "astro": "^3.6.1", "svelte": "^4.2.0" } } diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json index 03790360ef..6d98e9e797 100644 --- a/examples/view-transitions/package.json +++ b/examples/view-transitions/package.json @@ -12,6 +12,6 @@ "devDependencies": { "@astrojs/tailwind": "^5.0.2", "@astrojs/node": "^6.0.4", - "astro": "^3.6.0" + "astro": "^3.6.1" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 1ff0c3e23a..a30398b31b 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.7.2", - "astro": "^3.6.0" + "astro": "^3.6.1" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 44650474de..d0e3812625 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^3.5.0", - "astro": "^3.6.0", + "astro": "^3.6.1", "hast-util-select": "^5.0.5", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.1.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index f69cbf5551..e83c920b96 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.6.0" + "astro": "^3.6.1" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index b113759fe5..0d17bd8a68 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^1.1.5", "@astrojs/preact": "^3.0.1", - "astro": "^3.6.0", + "astro": "^3.6.1", "preact": "^10.17.1" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index cc63a60ef1..012af26123 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.0.1", "@nanostores/preact": "^0.5.0", - "astro": "^3.6.0", + "astro": "^3.6.1", "nanostores": "^0.9.3", "preact": "^10.17.1" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 9288f0e8ee..ce4d4b0cc4 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^1.1.5", "@astrojs/tailwind": "^5.0.2", "@types/canvas-confetti": "^1.6.0", - "astro": "^3.6.0", + "astro": "^3.6.1", "autoprefixer": "^10.4.15", "canvas-confetti": "^1.6.0", "postcss": "^8.4.28", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index dfdcf7ce8d..8366a9b42e 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.6.0", + "astro": "^3.6.1", "vite-plugin-pwa": "0.16.4", "workbox-window": "^7.0.0" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 277d7eb94c..7b11a1fd3d 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^3.6.0", + "astro": "^3.6.1", "vitest": "^0.34.2" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index a02b12312b..08eb254055 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,13 @@ # astro +## 3.6.1 + +### Patch Changes + +- [#9173](https://github.com/withastro/astro/pull/9173) [`04fdc1c61`](https://github.com/withastro/astro/commit/04fdc1c613171409ed1a2bd887326e26cdb8b5ef) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes an issue where having a middleware prevented the SSR app from being deployed on Netlify. + +- [#9186](https://github.com/withastro/astro/pull/9186) [`607542c7c`](https://github.com/withastro/astro/commit/607542c7cf9fe9813c06f1d96615d6c793262d22) Thanks [@martrapp](https://github.com/martrapp)! - Fixes a view transition issue on webKit browsers that prevented scrolling to #fragments + ## 3.6.0 ### Minor Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 95c8b1d887..f8097bb1d5 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "3.6.0", + "version": "3.6.1", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5701b7ffee..302b0272d9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -125,7 +125,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro examples/blog: @@ -140,13 +140,13 @@ importers: specifier: ^3.0.3 version: link:../../packages/integrations/sitemap astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro examples/framework-alpine: @@ -161,7 +161,7 @@ importers: specifier: ^3.12.3 version: 3.13.2 astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro examples/framework-lit: @@ -173,7 +173,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro lit: specifier: ^2.8.0 @@ -197,7 +197,7 @@ importers: specifier: ^3.0.4 version: link:../../packages/integrations/vue astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -227,7 +227,7 @@ importers: specifier: ^1.2.1 version: 1.2.1(preact@10.18.1) astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -245,7 +245,7 @@ importers: specifier: ^18.2.7 version: 18.2.14 astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -260,7 +260,7 @@ importers: specifier: ^3.0.2 version: link:../../packages/integrations/solid astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro solid-js: specifier: ^1.7.11 @@ -272,7 +272,7 @@ importers: specifier: ^4.0.4 version: link:../../packages/integrations/svelte astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -284,7 +284,7 @@ importers: specifier: ^3.0.4 version: link:../../packages/integrations/vue astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro vue: specifier: ^3.3.4 @@ -296,13 +296,13 @@ importers: specifier: ^6.0.4 version: link:../../packages/integrations/node astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro examples/middleware: @@ -311,7 +311,7 @@ importers: specifier: ^6.0.4 version: link:../../packages/integrations/node astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -320,19 +320,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro examples/ssr: @@ -344,7 +344,7 @@ importers: specifier: ^4.0.4 version: link:../../packages/integrations/svelte astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -359,7 +359,7 @@ importers: specifier: ^5.0.2 version: link:../../packages/integrations/tailwind astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro examples/with-markdoc: @@ -368,7 +368,7 @@ importers: specifier: ^0.7.2 version: link:../../packages/integrations/markdoc astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro examples/with-markdown-plugins: @@ -377,7 +377,7 @@ importers: specifier: ^3.5.0 version: link:../../packages/markdown/remark astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro hast-util-select: specifier: ^5.0.5 @@ -398,7 +398,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro examples/with-mdx: @@ -410,7 +410,7 @@ importers: specifier: ^3.0.1 version: link:../../packages/integrations/preact astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -425,7 +425,7 @@ importers: specifier: ^0.5.0 version: 0.5.0(nanostores@0.9.4)(preact@10.18.1) astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro nanostores: specifier: ^0.9.3 @@ -446,7 +446,7 @@ importers: specifier: ^1.6.0 version: 1.6.2 astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro autoprefixer: specifier: ^10.4.15 @@ -464,7 +464,7 @@ importers: examples/with-vite-plugin-pwa: dependencies: astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro vite-plugin-pwa: specifier: 0.16.4 @@ -476,7 +476,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^3.6.0 + specifier: ^3.6.1 version: link:../../packages/astro vitest: specifier: ^0.34.2