Skip to content

Commit

Permalink
Merge branch 'main' into 11821-inferSize-error-local-image
Browse files Browse the repository at this point in the history
  • Loading branch information
Princesseuh authored Oct 16, 2024
2 parents e60d305 + 5a4edeb commit 63fcf6f
Show file tree
Hide file tree
Showing 177 changed files with 2,316 additions and 2,559 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ package-lock.json

packages/astro/src/**/*.prebuilt.ts
packages/astro/src/**/*.prebuilt-dev.ts
!packages/astro/vendor/vite/dist
packages/astro/test/units/_temp-fixtures/*
!packages/astro/test/units/_temp-fixtures/package.json
packages/integrations/**/.netlify/

# exclude IntelliJ/WebStorm stuff
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ We welcome contributions of any size and skill level. As an open source project,

```shell
node: "^>=18.17.1"
pnpm: "^9.3.0"
pnpm: "^9.12.1"
# otherwise, your build will fail
```

Expand Down
1 change: 1 addition & 0 deletions biome.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"**/dist/**",
"**/smoke/**",
"**/fixtures/**",
"**/_temp-fixtures/**",
"**/vendor/**",
"**/.vercel/**",
],
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.16.2"
"astro": "^4.16.5"
}
}
6 changes: 3 additions & 3 deletions examples/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
},
"dependencies": {
"@astrojs/mdx": "^3.1.8",
"@astrojs/rss": "^4.0.8",
"@astrojs/sitemap": "^3.2.0",
"astro": "^4.16.2"
"@astrojs/rss": "^4.0.9",
"@astrojs/sitemap": "^3.2.1",
"astro": "^4.16.5"
}
}
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.16.2"
"astro": "^4.16.5"
},
"peerDependencies": {
"astro": "^4.0.0"
Expand Down
6 changes: 3 additions & 3 deletions examples/container-with-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"test": "vitest run"
},
"dependencies": {
"astro": "^4.16.2",
"astro": "^4.16.5",
"@astrojs/react": "^3.6.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vitest": "^2.1.2"
"vitest": "^2.1.3"
},
"devDependencies": {
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0"
"@types/react-dom": "^18.3.1"
}
}
2 changes: 1 addition & 1 deletion examples/framework-alpine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"@astrojs/alpinejs": "^0.4.0",
"@types/alpinejs": "^3.13.10",
"alpinejs": "^3.14.1",
"astro": "^4.16.2"
"astro": "^4.16.5"
}
}
4 changes: 2 additions & 2 deletions 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.16.2",
"lit": "^3.2.0"
"astro": "^4.16.5",
"lit": "^3.2.1"
}
}
10 changes: 5 additions & 5 deletions examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
"@astrojs/svelte": "^5.7.2",
"@astrojs/vue": "^4.5.2",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"astro": "^4.16.2",
"preact": "^10.24.2",
"@types/react-dom": "^18.3.1",
"astro": "^4.16.5",
"preact": "^10.24.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"solid-js": "^1.9.2",
"svelte": "^4.2.19",
"vue": "^3.5.11"
"vue": "^3.5.12"
}
}
4 changes: 2 additions & 2 deletions 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.3",
"@preact/signals": "^1.3.0",
"astro": "^4.16.2",
"preact": "^10.24.2"
"astro": "^4.16.5",
"preact": "^10.24.3"
}
}
4 changes: 2 additions & 2 deletions examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"dependencies": {
"@astrojs/react": "^3.6.2",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"astro": "^4.16.2",
"@types/react-dom": "^18.3.1",
"astro": "^4.16.5",
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
Expand Down
4 changes: 2 additions & 2 deletions 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.2",
"astro": "^4.16.2",
"solid-js": "^1.9.1"
"astro": "^4.16.5",
"solid-js": "^1.9.2"
}
}
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.7.2",
"astro": "^4.16.2",
"astro": "^4.16.5",
"svelte": "^4.2.19"
}
}
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.2",
"astro": "^4.16.2",
"vue": "^3.5.11"
"astro": "^4.16.5",
"vue": "^3.5.12"
}
}
2 changes: 1 addition & 1 deletion examples/hackernews/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
},
"dependencies": {
"@astrojs/node": "^8.3.4",
"astro": "^4.16.2"
"astro": "^4.16.5"
}
}
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.16.2"
"astro": "^4.16.5"
},
"peerDependencies": {
"astro": "^4.0.0"
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.16.2"
"astro": "^4.16.5"
}
}
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.16.2"
"astro": "^4.16.5"
}
}
2 changes: 1 addition & 1 deletion examples/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@astrojs/node": "^8.3.4",
"@astrojs/svelte": "^5.7.2",
"astro": "^4.16.2",
"astro": "^4.16.5",
"svelte": "^4.2.19"
}
}
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.16.2",
"sass": "^1.79.4",
"astro": "^4.16.5",
"sass": "^1.79.5",
"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.16.2"
"astro": "^4.16.5"
}
}
2 changes: 1 addition & 1 deletion examples/with-markdoc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
},
"dependencies": {
"@astrojs/markdoc": "^0.11.5",
"astro": "^4.16.2"
"astro": "^4.16.5"
}
}
4 changes: 2 additions & 2 deletions examples/with-mdx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@astrojs/mdx": "^3.1.8",
"@astrojs/preact": "^3.5.3",
"astro": "^4.16.2",
"preact": "^10.24.2"
"astro": "^4.16.5",
"preact": "^10.24.3"
}
}
4 changes: 2 additions & 2 deletions examples/with-nanostores/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"dependencies": {
"@astrojs/preact": "^3.5.3",
"@nanostores/preact": "^0.5.2",
"astro": "^4.16.2",
"astro": "^4.16.5",
"nanostores": "^0.11.3",
"preact": "^10.24.2"
"preact": "^10.24.3"
}
}
2 changes: 1 addition & 1 deletion examples/with-tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@astrojs/mdx": "^3.1.8",
"@astrojs/tailwind": "^5.1.2",
"@types/canvas-confetti": "^1.6.4",
"astro": "^4.16.2",
"astro": "^4.16.5",
"autoprefixer": "^10.4.20",
"canvas-confetti": "^1.9.3",
"postcss": "^8.4.47",
Expand Down
4 changes: 2 additions & 2 deletions 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.16.2",
"vitest": "^2.1.2"
"astro": "^4.16.5",
"vitest": "^2.1.3"
}
}
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"engines": {
"node": "^18.17.1 || ^20.3.0 || >=21.0.0"
},
"packageManager": "pnpm@9.6.0",
"packageManager": "pnpm@9.12.1",
"dependencies": {
"astro-benchmark": "workspace:*"
},
Expand All @@ -67,8 +67,8 @@
"prettier": "^3.3.3",
"prettier-plugin-astro": "^0.14.1",
"turbo": "^2.1.3",
"typescript": "~5.6.2",
"typescript-eslint": "^8.8.0"
"typescript": "~5.6.3",
"typescript-eslint": "^8.9.0"
},
"pnpm": {
"peerDependencyRules": {
Expand All @@ -87,6 +87,9 @@
"allowAny": [
"astro"
]
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]"
}
}
}
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.9

### Patch Changes

- [#12157](https://github.com/withastro/astro/pull/12157) [`925cff3`](https://github.com/withastro/astro/commit/925cff31bc040874e73decd6a6b3a5ba84c60258) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Improves README configuration reference.

## 4.0.8

### Patch Changes
Expand Down
Loading

0 comments on commit 63fcf6f

Please sign in to comment.