Skip to content

Commit

Permalink
Merge branch 'feat/astro-env-sync' of https://github.com/withastro/astro
Browse files Browse the repository at this point in the history
 into feat/astro-env-sync
  • Loading branch information
florian-lefebvre committed Jun 25, 2024
2 parents 61dd748 + f6f1963 commit c7bd61d
Show file tree
Hide file tree
Showing 103 changed files with 683 additions and 1,589 deletions.
5 changes: 5 additions & 0 deletions .changeset/afraid-rivers-begin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Reverts [#11292](https://github.com/withastro/astro/pull/11292), which caused a regression to the input type
5 changes: 0 additions & 5 deletions .changeset/curvy-emus-mate.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/eleven-hats-tell.md

This file was deleted.

16 changes: 0 additions & 16 deletions .changeset/funny-cats-sell.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/lovely-parents-attend.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/small-badgers-juggle.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/small-sloths-yawn.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/tricky-mirrors-carry.md

This file was deleted.

1 change: 1 addition & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -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",

Expand Down
2 changes: 1 addition & 1 deletion examples/basics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.11.0"
"astro": "^4.11.1"
}
}
6 changes: 3 additions & 3 deletions examples/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion examples/component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^4.11.0"
"astro": "^4.11.1"
},
"peerDependencies": {
"astro": "^4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/container-with-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions examples/framework-alpine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion examples/framework-lit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion examples/framework-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/solid-js": "^4.4.0",
"astro": "^4.11.0",
"astro": "^4.11.1",
"solid-js": "^1.8.17"
}
}
2 changes: 1 addition & 1 deletion examples/framework-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/svelte": "^5.6.0",
"astro": "^4.11.0",
"astro": "^4.11.1",
"svelte": "^4.2.18"
}
}
4 changes: 2 additions & 2 deletions examples/framework-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions examples/hackernews/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion examples/integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^4.11.0"
"astro": "^4.11.1"
},
"peerDependencies": {
"astro": "^4.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/middleware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.11.0"
"astro": "^4.11.1"
}
}
2 changes: 1 addition & 1 deletion examples/non-html-pages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.11.0"
"astro": "^4.11.1"
}
}
2 changes: 1 addition & 1 deletion examples/portfolio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.11.0"
"astro": "^4.11.1"
}
}
4 changes: 2 additions & 2 deletions examples/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions examples/starlog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion examples/toolbar-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"./app": "./dist/app.js"
},
"devDependencies": {
"astro": "^4.11.0"
"astro": "^4.11.1"
}
}
4 changes: 2 additions & 2 deletions examples/view-transitions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions examples/with-markdoc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions examples/with-markdown-plugins/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/with-markdown-shiki/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.11.0"
"astro": "^4.11.1"
}
}
4 changes: 2 additions & 2 deletions examples/with-mdx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion examples/with-nanostores/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/with-tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/with-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"test": "vitest"
},
"dependencies": {
"astro": "^4.11.0",
"astro": "^4.11.1",
"vitest": "^1.6.0"
}
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down
6 changes: 6 additions & 0 deletions packages/astro-rss/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/astro-rss/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Loading

0 comments on commit c7bd61d

Please sign in to comment.