Skip to content

Commit

Permalink
Merge branch 'main' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
Princesseuh committed Oct 7, 2024
2 parents dcc1e89 + 46cbf10 commit b75758f
Show file tree
Hide file tree
Showing 110 changed files with 1,252 additions and 1,128 deletions.
5 changes: 0 additions & 5 deletions .changeset/beige-rice-tap.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/beige-students-compete.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changeset/large-phones-compare.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/ninety-monkeys-complain.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/strange-cats-notice.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/swift-snakes-hope.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/thin-trains-fold.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/wise-pumas-fry.md

This file was deleted.

2 changes: 1 addition & 1 deletion examples/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@astrojs/mdx": "^4.0.0-beta.2",
"@astrojs/rss": "^4.0.7",
"@astrojs/sitemap": "^3.1.6",
"@astrojs/sitemap": "^3.2.0",
"astro": "^5.0.0-beta.3"
}
}
4 changes: 2 additions & 2 deletions examples/container-with-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"@astrojs/react": "^3.6.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vitest": "^2.1.1"
"vitest": "^2.1.2"
},
"devDependencies": {
"@types/react": "^18.3.10",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0"
}
}
6 changes: 3 additions & 3 deletions examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
"@astrojs/solid-js": "^4.4.2",
"@astrojs/svelte": "^6.0.0-beta.0",
"@astrojs/vue": "^5.0.0-beta.0",
"@types/react": "^18.3.10",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"astro": "^5.0.0-beta.3",
"preact": "^10.24.1",
"preact": "^10.24.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.10"
"vue": "^3.5.11"
}
}
2 changes: 1 addition & 1 deletion examples/framework-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"@astrojs/preact": "^3.5.3",
"@preact/signals": "^1.3.0",
"astro": "^5.0.0-beta.3",
"preact": "^10.24.1"
"preact": "^10.24.2"
}
}
2 changes: 1 addition & 1 deletion examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/react": "^3.6.2",
"@types/react": "^18.3.10",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"astro": "^5.0.0-beta.3",
"react": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"dependencies": {
"@astrojs/vue": "^5.0.0-beta.0",
"astro": "^5.0.0-beta.3",
"vue": "^3.5.10"
"vue": "^3.5.11"
}
}
2 changes: 1 addition & 1 deletion examples/server-islands/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@astrojs/tailwind": "^5.1.1",
"@fortawesome/fontawesome-free": "^6.6.0",
"@tailwindcss/forms": "^0.5.9",
"@types/react": "^18.3.10",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"astro": "^5.0.0-beta.3",
"postcss": "^8.4.47",
Expand Down
2 changes: 1 addition & 1 deletion examples/with-mdx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"@astrojs/mdx": "^4.0.0-beta.2",
"@astrojs/preact": "^3.5.3",
"astro": "^5.0.0-beta.3",
"preact": "^10.24.1"
"preact": "^10.24.2"
}
}
2 changes: 1 addition & 1 deletion examples/with-nanostores/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"@nanostores/preact": "^0.5.2",
"astro": "^5.0.0-beta.3",
"nanostores": "^0.11.3",
"preact": "^10.24.1"
"preact": "^10.24.2"
}
}
2 changes: 1 addition & 1 deletion examples/with-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
},
"dependencies": {
"astro": "^5.0.0-beta.3",
"vitest": "^2.1.1"
"vitest": "^2.1.2"
}
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,21 @@
"astro-benchmark": "workspace:*"
},
"devDependencies": {
"@astrojs/check": "^0.9.3",
"@astrojs/check": "^0.9.4",
"@biomejs/biome": "1.8.3",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.8",
"@changesets/cli": "^2.27.9",
"@types/node": "^18.17.8",
"esbuild": "^0.21.5",
"eslint": "^9.11.1",
"eslint": "^9.12.0",
"eslint-plugin-regexp": "^2.6.0",
"globby": "^14.0.2",
"only-allow": "^1.2.1",
"prettier": "^3.3.3",
"prettier-plugin-astro": "^0.14.1",
"turbo": "^2.1.2",
"turbo": "^2.1.3",
"typescript": "~5.6.2",
"typescript-eslint": "^8.7.0"
"typescript-eslint": "^8.8.0"
},
"pnpm": {
"overrides": {
Expand Down
20 changes: 20 additions & 0 deletions packages/astro/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,26 @@

- [#11974](https://github.com/withastro/astro/pull/11974) [`60211de`](https://github.com/withastro/astro/commit/60211defbfb2992ba17d1369e71c146d8928b09a) Thanks [@ascorbic](https://github.com/ascorbic)! - Exports the `RenderResult` type

## 4.15.12

### Patch Changes

- [#12121](https://github.com/withastro/astro/pull/12121) [`2490ceb`](https://github.com/withastro/astro/commit/2490cebdb93f13ee552cffa72b2e274d64e6b4a7) Thanks [@ascorbic](https://github.com/ascorbic)! - Support passing the values `Infinity` and `-Infinity` as island props.

- [#12118](https://github.com/withastro/astro/pull/12118) [`f47b347`](https://github.com/withastro/astro/commit/f47b347da899c6e1dcd0b2e7887f7fce6ec8e270) Thanks [@Namchee](https://github.com/Namchee)! - Removes the `strip-ansi` dependency in favor of the native Node API

- [#12126](https://github.com/withastro/astro/pull/12126) [`6e1dfeb`](https://github.com/withastro/astro/commit/6e1dfeb76bec09d24928bab798c6ad3280f42e84) Thanks [@ascorbic](https://github.com/ascorbic)! - Clear content layer cache when astro version changes

- [#12117](https://github.com/withastro/astro/pull/12117) [`a46839a`](https://github.com/withastro/astro/commit/a46839a5c818b7de63c36d0c7e27f1a8f3b773dc) Thanks [@ArmandPhilippot](https://github.com/ArmandPhilippot)! - Updates Vite links to use their new domain

- [#12124](https://github.com/withastro/astro/pull/12124) [`499fbc9`](https://github.com/withastro/astro/commit/499fbc91a6bdad8c86ff13a8caf1fa09433796b9) Thanks [@ascorbic](https://github.com/ascorbic)! - Allows special characters in Action names

- [#12123](https://github.com/withastro/astro/pull/12123) [`b8673df`](https://github.com/withastro/astro/commit/b8673df51c6cc4ce6a288f8eb609b7a438a07d82) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fixes missing `body` property on CollectionEntry types for content layer entries

- [#12132](https://github.com/withastro/astro/pull/12132) [`de35daa`](https://github.com/withastro/astro/commit/de35daa8517555c1b9c72bc7fe9cc955c4997a83) Thanks [@jcayzac](https://github.com/jcayzac)! - Updates the [`cookie`](https://npmjs.com/package/cookie) dependency to avoid the [CVE 2024-47764](https://nvd.nist.gov/vuln/detail/CVE-2024-47764) vulnerability.

- [#12113](https://github.com/withastro/astro/pull/12113) [`a54e520`](https://github.com/withastro/astro/commit/a54e520d3c139fa123e7029c5933951b5c7f5a39) Thanks [@ascorbic](https://github.com/ascorbic)! - Adds a helpful error when attempting to render an undefined collection entry

## 4.15.11

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/astro/e2e/fixtures/actions-blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/check": "^0.9.3",
"@astrojs/check": "^0.9.4",
"@astrojs/db": "workspace:*",
"@astrojs/node": "^8.3.4",
"@astrojs/react": "workspace:*",
"@types/react": "^18.3.10",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"astro": "workspace:*",
"react": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/actions-react-19/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/check": "^0.9.3",
"@astrojs/check": "^0.9.4",
"@astrojs/db": "workspace:*",
"@astrojs/node": "^8.3.4",
"@astrojs/react": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/astro-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/preact": "workspace:*",
"@e2e/astro-linked-lib": "link:../_deps/astro-linked-lib",
"astro": "workspace:*",
"preact": "^10.24.1"
"preact": "^10.24.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/astro-envs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.5.10"
"vue": "^3.5.11"
}
}
4 changes: 2 additions & 2 deletions packages/astro/e2e/fixtures/client-only/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.24.1",
"preact": "^10.24.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.10"
"vue": "^3.5.11"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/dev-toolbar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.24.1"
"preact": "^10.24.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/error-cyclic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.24.1"
"preact": "^10.24.2"
}
}
4 changes: 2 additions & 2 deletions packages/astro/e2e/fixtures/errors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"preact": "^10.24.1",
"preact": "^10.24.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sass": "^1.79.4",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.10"
"vue": "^3.5.11"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/hydration-race/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.24.1"
"preact": "^10.24.2"
}
}
4 changes: 2 additions & 2 deletions packages/astro/e2e/fixtures/multiple-frameworks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"dependencies": {
"@webcomponents/template-shadowroot": "^0.2.1",
"lit": "^3.2.0",
"preact": "^10.24.1",
"preact": "^10.24.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.10"
"vue": "^3.5.11"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.24.1"
"preact": "^10.24.2"
}
}
4 changes: 2 additions & 2 deletions packages/astro/e2e/fixtures/nested-in-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.24.1",
"preact": "^10.24.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.10"
"vue": "^3.5.11"
}
}
4 changes: 2 additions & 2 deletions packages/astro/e2e/fixtures/nested-in-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.24.1",
"preact": "^10.24.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.10"
"vue": "^3.5.11"
}
}
4 changes: 2 additions & 2 deletions packages/astro/e2e/fixtures/nested-in-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.24.1",
"preact": "^10.24.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.10"
"vue": "^3.5.11"
}
}
4 changes: 2 additions & 2 deletions packages/astro/e2e/fixtures/nested-in-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.24.1",
"preact": "^10.24.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.10"
"vue": "^3.5.11"
}
}
4 changes: 2 additions & 2 deletions packages/astro/e2e/fixtures/nested-in-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.24.1",
"preact": "^10.24.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.10"
"vue": "^3.5.11"
}
}
Loading

0 comments on commit b75758f

Please sign in to comment.