Merge branch 'main' into feat/astro-env-sync

withastro · Jun 25, 2024 · f6f1963 · f6f1963
2 parents 3f65960 + 4c4741b
commit f6f1963
Show file tree

Hide file tree

Showing 103 changed files with 683 additions and 1,589 deletions.
diff --git a/.changeset/afraid-rivers-begin.md b/.changeset/afraid-rivers-begin.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Reverts [#11292](https://github.com/withastro/astro/pull/11292), which caused a regression to the input type
diff --git a/.changeset/curvy-emus-mate.md b/.changeset/curvy-emus-mate.md
diff --git a/.changeset/eleven-hats-tell.md b/.changeset/eleven-hats-tell.md
diff --git a/.changeset/funny-cats-sell.md b/.changeset/funny-cats-sell.md
diff --git a/.changeset/lovely-parents-attend.md b/.changeset/lovely-parents-attend.md
diff --git a/.changeset/small-badgers-juggle.md b/.changeset/small-badgers-juggle.md
diff --git a/.changeset/small-sloths-yawn.md b/.changeset/small-sloths-yawn.md
diff --git a/.changeset/tricky-mirrors-carry.md b/.changeset/tricky-mirrors-carry.md
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -15,6 +15,7 @@
     // manually bumping deps
     "@biomejs/biome",
     "@types/node",
+    "@preact/preset-vite", // v2.8.3 starts to use Vite's esbuild for perf, but this conflicts with the react plugin
     "preact-render-to-string", // https://github.com/withastro/astro/pull/10200
     "sharp",
 

diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.11.0"
+    "astro": "^4.11.1"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^3.1.1",
-    "@astrojs/rss": "^4.0.6",
+    "@astrojs/mdx": "^3.1.2",
+    "@astrojs/rss": "^4.0.7",
     "@astrojs/sitemap": "^3.1.6",
-    "astro": "^4.11.0"
+    "astro": "^4.11.1"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.11.0"
+    "astro": "^4.11.1"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "astro": "^4.11.0",
+    "astro": "^4.11.1",
     "@astrojs/react": "^3.6.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/alpinejs": "^0.4.0",
     "@types/alpinejs": "^3.13.10",
-    "alpinejs": "^3.14.0",
-    "astro": "^4.11.0"
+    "alpinejs": "^3.14.1",
+    "astro": "^4.11.1"
   }
 }
diff --git 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.11.0",
+    "astro": "^4.11.1",
     "lit": "^3.1.4"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -18,12 +18,12 @@
     "@astrojs/vue": "^4.5.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "astro": "^4.11.0",
+    "astro": "^4.11.1",
     "preact": "^10.22.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "solid-js": "^1.8.17",
     "svelte": "^4.2.18",
-    "vue": "^3.4.29"
+    "vue": "^3.4.30"
   }
 }
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.5.0",
     "@preact/signals": "^1.2.3",
-    "astro": "^4.11.0",
+    "astro": "^4.11.1",
     "preact": "^10.22.0"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.6.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "astro": "^4.11.0",
+    "astro": "^4.11.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^4.4.0",
-    "astro": "^4.11.0",
+    "astro": "^4.11.1",
     "solid-js": "^1.8.17"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.6.0",
-    "astro": "^4.11.0",
+    "astro": "^4.11.1",
     "svelte": "^4.2.18"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.5.0",
-    "astro": "^4.11.0",
-    "vue": "^3.4.29"
+    "astro": "^4.11.1",
+    "vue": "^3.4.30"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^8.3.1",
-    "astro": "^4.11.0"
+    "@astrojs/node": "^8.3.2",
+    "astro": "^4.11.1"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.11.0"
+    "astro": "^4.11.1"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

diff --git a/examples/middleware/package.json b/examples/middleware/package.json
@@ -12,8 +12,8 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^8.3.1",
-    "astro": "^4.11.0",
+    "@astrojs/node": "^8.3.2",
+    "astro": "^4.11.1",
     "html-minifier": "^4.0.0"
   },
   "devDependencies": {

diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.11.0"
+    "astro": "^4.11.1"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.11.0"
+    "astro": "^4.11.1"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.11.0"
+    "astro": "^4.11.1"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -12,9 +12,9 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^8.3.1",
+    "@astrojs/node": "^8.3.2",
     "@astrojs/svelte": "^5.6.0",
-    "astro": "^4.11.0",
+    "astro": "^4.11.1",
     "svelte": "^4.2.18"
   }
 }
diff --git a/examples/starlog/package.json b/examples/starlog/package.json
@@ -10,8 +10,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.11.0",
-    "sass": "^1.77.5",
+    "astro": "^4.11.1",
+    "sass": "^1.77.6",
     "sharp": "^0.33.3"
   }
 }
diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json
@@ -15,6 +15,6 @@
     "./app": "./dist/app.js"
   },
   "devDependencies": {
-    "astro": "^4.11.0"
+    "astro": "^4.11.1"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@astrojs/tailwind": "^5.1.0",
-    "@astrojs/node": "^8.3.1",
-    "astro": "^4.11.0"
+    "@astrojs/node": "^8.3.2",
+    "astro": "^4.11.1"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdoc": "^0.11.0",
-    "astro": "^4.11.0"
+    "@astrojs/markdoc": "^0.11.1",
+    "astro": "^4.11.1"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdown-remark": "^5.1.0",
-    "astro": "^4.11.0",
+    "@astrojs/markdown-remark": "^5.1.1",
+    "astro": "^4.11.1",
     "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
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.11.0"
+    "astro": "^4.11.1"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^3.1.1",
+    "@astrojs/mdx": "^3.1.2",
     "@astrojs/preact": "^3.5.0",
-    "astro": "^4.11.0",
+    "astro": "^4.11.1",
     "preact": "^10.22.0"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.5.0",
     "@nanostores/preact": "^0.5.1",
-    "astro": "^4.11.0",
+    "astro": "^4.11.1",
     "nanostores": "^0.10.3",
     "preact": "^10.22.0"
   }

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^3.1.1",
+    "@astrojs/mdx": "^3.1.2",
     "@astrojs/tailwind": "^5.1.0",
     "@types/canvas-confetti": "^1.6.4",
-    "astro": "^4.11.0",
+    "astro": "^4.11.1",
     "autoprefixer": "^10.4.19",
     "canvas-confetti": "^1.9.3",
     "postcss": "^8.4.38",

diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.11.0",
+    "astro": "^4.11.1",
     "vitest": "^1.6.0"
   }
 }
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "@astrojs/check": "^0.7.0",
     "@biomejs/biome": "1.8.1",
     "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.5",
+    "@changesets/cli": "^2.27.6",
     "@eslint/eslintrc": "^3.1.0",
     "@types/node": "^18.17.8",
     "esbuild": "^0.21.5",
@@ -68,8 +68,8 @@
     "prettier-plugin-astro": "^0.14.0",
     "tiny-glob": "^0.2.9",
     "turbo": "^1.13.4",
-    "typescript": "~5.4.5",
-    "typescript-eslint": "^7.13.0"
+    "typescript": "~5.5.2",
+    "typescript-eslint": "^7.13.1"
   },
   "pnpm": {
     "packageExtensions": {

diff --git a/packages/astro-rss/CHANGELOG.md b/packages/astro-rss/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/rss
 
+## 4.0.7
+
+### Patch Changes
+
+- [#11299](https://github.com/withastro/astro/pull/11299) [`8ce66f2`](https://github.com/withastro/astro/commit/8ce66f2ef7328546d823f1076f9bab4217a6be7d) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where the `pagesGlobToRssItems` returned an incorrect type for `items`
+
 ## 4.0.6
 
 ### Patch Changes

diff --git a/packages/astro-rss/package.json b/packages/astro-rss/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/rss",
   "description": "Add RSS feeds to your Astro projects",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",