diff options
35 files changed, 71 insertions, 73 deletions
diff --git a/.changeset/happy-ways-sin.md b/.changeset/happy-ways-sin.md deleted file mode 100644 index e100a3135..000000000 --- a/.changeset/happy-ways-sin.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'astro': patch ---- - -Fix getStaticPaths regression - -This reverts a previous change meant to remove a dependency, to fix a regression with multiple nested spread routes. diff --git a/.changeset/two-suns-admire.md b/.changeset/two-suns-admire.md deleted file mode 100644 index 36fb5f5ba..000000000 --- a/.changeset/two-suns-admire.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Add wayland (wl-copy) support to `astro info` diff --git a/examples/basics/package.json b/examples/basics/package.json index 20320658e..5a98b09e9 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.15.5" + "astro": "^4.15.6" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index c8bebd190..b73b0087e 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^3.1.6", "@astrojs/rss": "^4.0.7", "@astrojs/sitemap": "^3.1.6", - "astro": "^4.15.5" + "astro": "^4.15.6" } } diff --git a/examples/component/package.json b/examples/component/package.json index 1ca79c5fb..c7eb2b45d 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.15.5" + "astro": "^4.15.6" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json index 45ca685d4..32501eb1e 100644 --- a/examples/container-with-vitest/package.json +++ b/examples/container-with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest run" }, "dependencies": { - "astro": "^4.15.5", + "astro": "^4.15.6", "@astrojs/react": "^3.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index a08659d18..9c3da7834 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.4.0", "@types/alpinejs": "^3.13.10", "alpinejs": "^3.14.1", - "astro": "^4.15.5" + "astro": "^4.15.6" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 2c2a88d09..a8025e392 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^4.3.0", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^4.15.5", + "astro": "^4.15.6", "lit": "^3.2.0" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index c99a3ba72..12dcbd7b6 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -18,7 +18,7 @@ "@astrojs/vue": "^4.5.0", "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", - "astro": "^4.15.5", + "astro": "^4.15.6", "preact": "^10.23.2", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 222c29ccf..99ad59c37 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.5.3", "@preact/signals": "^1.3.0", - "astro": "^4.15.5", + "astro": "^4.15.6", "preact": "^10.23.2" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index ac96d6c9d..a9c2675bc 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^3.6.2", "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", - "astro": "^4.15.5", + "astro": "^4.15.6", "react": "^18.3.1", "react-dom": "^18.3.1" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 351cd4d30..774dd74be 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^4.4.1", - "astro": "^4.15.5", + "astro": "^4.15.6", "solid-js": "^1.8.22" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 1b983c3a1..7fd20eff2 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^5.7.0", - "astro": "^4.15.5", + "astro": "^4.15.6", "svelte": "^4.2.19" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 7300890f9..e1c419a8d 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^4.5.0", - "astro": "^4.15.5", + "astro": "^4.15.6", "vue": "^3.5.3" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 932de940d..e12108fe4 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^8.3.3", - "astro": "^4.15.5" + "astro": "^4.15.6" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 57f581772..0de1e543d 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.15.5" + "astro": "^4.15.6" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index d3abf0315..d6a484b2f 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^8.3.3", - "astro": "^4.15.5", + "astro": "^4.15.6", "html-minifier": "^4.0.0" }, "devDependencies": { diff --git a/examples/minimal/package.json b/examples/minimal/package.json index e35446517..e84a14866 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.15.5" + "astro": "^4.15.6" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 8b1af1116..1a2e3ca2a 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.15.5" + "astro": "^4.15.6" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 490e0a3b2..164e52e45 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.15.5" + "astro": "^4.15.6" } } diff --git a/examples/server-islands/package.json b/examples/server-islands/package.json index d9ecb186a..f1e6dd40d 100644 --- a/examples/server-islands/package.json +++ b/examples/server-islands/package.json @@ -17,7 +17,7 @@ "@tailwindcss/forms": "^0.5.9", "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", - "astro": "^4.15.5", + "astro": "^4.15.6", "postcss": "^8.4.45", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 9b1c4cb80..2b6a36ea4 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^8.3.3", "@astrojs/svelte": "^5.7.0", - "astro": "^4.15.5", + "astro": "^4.15.6", "svelte": "^4.2.19" } } diff --git a/examples/starlog/package.json b/examples/starlog/package.json index 378426cfb..75b8cae54 100644 --- a/examples/starlog/package.json +++ b/examples/starlog/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.15.5", + "astro": "^4.15.6", "sass": "^1.78.0", "sharp": "^0.33.3" } diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json index beec943bb..b2b4124c6 100644 --- a/examples/toolbar-app/package.json +++ b/examples/toolbar-app/package.json @@ -15,6 +15,6 @@ "./app": "./dist/app.js" }, "devDependencies": { - "astro": "^4.15.5" + "astro": "^4.15.6" } } diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json index 13484ffe7..ad54f9502 100644 --- a/examples/view-transitions/package.json +++ b/examples/view-transitions/package.json @@ -12,6 +12,6 @@ "devDependencies": { "@astrojs/tailwind": "^5.1.0", "@astrojs/node": "^8.3.3", - "astro": "^4.15.5" + "astro": "^4.15.6" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 26a5afadc..e5cb9c3f0 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.11.4", - "astro": "^4.15.5" + "astro": "^4.15.6" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index bb472654c..f9bf06d5e 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^5.2.0", - "astro": "^4.15.5", + "astro": "^4.15.6", "hast-util-select": "^6.0.2", "rehype-autolink-headings": "^7.1.0", "rehype-slug": "^6.0.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 5b7beef2a..af964ce1d 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.15.5" + "astro": "^4.15.6" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 290686f59..db071dae8 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^3.1.6", "@astrojs/preact": "^3.5.3", - "astro": "^4.15.5", + "astro": "^4.15.6", "preact": "^10.23.2" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index ea17f24b3..b20b2fa11 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.5.3", "@nanostores/preact": "^0.5.2", - "astro": "^4.15.5", + "astro": "^4.15.6", "nanostores": "^0.11.3", "preact": "^10.23.2" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 55a63847b..c33d87566 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^3.1.6", "@astrojs/tailwind": "^5.1.0", "@types/canvas-confetti": "^1.6.4", - "astro": "^4.15.5", + "astro": "^4.15.6", "autoprefixer": "^10.4.20", "canvas-confetti": "^1.9.3", "postcss": "^8.4.45", diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index bd30c3df8..6a2dfbce8 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^4.15.5", + "astro": "^4.15.6", "vitest": "^2.0.5" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index cfe6474f0..f01187d74 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,15 @@ # astro +## 4.15.6 + +### Patch Changes + +- [#11993](https://github.com/withastro/astro/pull/11993) [`ffba5d7`](https://github.com/withastro/astro/commit/ffba5d716edcdfc42899afaa4188b7a4cd0c91eb) Thanks [@matthewp](https://github.com/matthewp)! - Fix getStaticPaths regression + + This reverts a previous change meant to remove a dependency, to fix a regression with multiple nested spread routes. + +- [#11964](https://github.com/withastro/astro/pull/11964) [`06eff60`](https://github.com/withastro/astro/commit/06eff60cabb55d91fe4075421b1693b1ab33225c) Thanks [@TheOtterlord](https://github.com/TheOtterlord)! - Add wayland (wl-copy) support to `astro info` + ## 4.15.5 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index bd9bcc717..d338b037c 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "4.15.5", + "version": "4.15.6", "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 a054e7f2b..6c5752503 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -116,7 +116,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/blog: @@ -131,13 +131,13 @@ importers: specifier: ^3.1.6 version: link:../../packages/integrations/sitemap astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/container-with-vitest: @@ -146,7 +146,7 @@ importers: specifier: ^3.6.2 version: link:../../packages/integrations/react astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -177,7 +177,7 @@ importers: specifier: ^3.14.1 version: 3.14.1 astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/framework-lit: @@ -189,7 +189,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro lit: specifier: ^3.2.0 @@ -219,7 +219,7 @@ importers: specifier: ^18.3.0 version: 18.3.0 astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro preact: specifier: ^10.23.2 @@ -249,7 +249,7 @@ importers: specifier: ^1.3.0 version: 1.3.0(preact@10.23.2) astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro preact: specifier: ^10.23.2 @@ -267,7 +267,7 @@ importers: specifier: ^18.3.0 version: 18.3.0 astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -282,7 +282,7 @@ importers: specifier: ^4.4.1 version: link:../../packages/integrations/solid astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro solid-js: specifier: ^1.8.22 @@ -294,7 +294,7 @@ importers: specifier: ^5.7.0 version: link:../../packages/integrations/svelte astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro svelte: specifier: ^4.2.19 @@ -306,7 +306,7 @@ importers: specifier: ^4.5.0 version: link:../../packages/integrations/vue astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro vue: specifier: ^3.5.3 @@ -318,13 +318,13 @@ importers: specifier: ^8.3.3 version: 8.3.3(astro@packages+astro) astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/middleware: @@ -333,7 +333,7 @@ importers: specifier: ^8.3.3 version: 8.3.3(astro@packages+astro) astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -346,19 +346,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/server-islands: @@ -385,7 +385,7 @@ importers: specifier: ^18.3.0 version: 18.3.0 astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro postcss: specifier: ^8.4.45 @@ -409,7 +409,7 @@ importers: specifier: ^5.7.0 version: link:../../packages/integrations/svelte astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro svelte: specifier: ^4.2.19 @@ -418,7 +418,7 @@ importers: examples/starlog: dependencies: astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro sass: specifier: ^1.78.0 @@ -430,7 +430,7 @@ importers: examples/toolbar-app: devDependencies: astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/view-transitions: @@ -442,7 +442,7 @@ importers: specifier: ^5.1.0 version: link:../../packages/integrations/tailwind astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/with-markdoc: @@ -451,7 +451,7 @@ importers: specifier: ^0.11.4 version: link:../../packages/integrations/markdoc astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/with-markdown-plugins: @@ -460,7 +460,7 @@ importers: specifier: ^5.2.0 version: link:../../packages/markdown/remark astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro hast-util-select: specifier: ^6.0.2 @@ -481,7 +481,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro examples/with-mdx: @@ -493,7 +493,7 @@ importers: specifier: ^3.5.3 version: link:../../packages/integrations/preact astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro preact: specifier: ^10.23.2 @@ -508,7 +508,7 @@ importers: specifier: ^0.5.2 version: 0.5.2(nanostores@0.11.3)(preact@10.23.2) astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro nanostores: specifier: ^0.11.3 @@ -529,7 +529,7 @@ importers: specifier: ^1.6.4 version: 1.6.4 astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro autoprefixer: specifier: ^10.4.20 @@ -547,7 +547,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^4.15.5 + specifier: ^4.15.6 version: link:../../packages/astro vitest: specifier: ^2.0.5 |