Skip to content

Commit

Permalink
Merge branch 'main' into fix/images-errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Princesseuh committed Mar 29, 2023
2 parents a5ecd5f + 9e16860 commit 8a1e64e
Show file tree
Hide file tree
Showing 76 changed files with 404 additions and 202 deletions.
5 changes: 0 additions & 5 deletions .changeset/bright-apricots-kiss.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/chilly-dingos-eat.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/dirty-zoos-provide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fix: avoid calling `astro:server:setup` integration hook in production
5 changes: 5 additions & 0 deletions .changeset/eight-humans-push.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fix next and previous links for index routes when using pagination
5 changes: 0 additions & 5 deletions .changeset/flat-baboons-nail.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/fuzzy-tips-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/react': patch
---

Update React README to reference the [new React docs](https://react.dev)
5 changes: 0 additions & 5 deletions .changeset/hip-avocados-grow.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/lovely-owls-sniff.md

This file was deleted.

42 changes: 0 additions & 42 deletions .changeset/metal-cameras-bow.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/perfect-rabbits-repair.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/thick-penguins-turn.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/wet-lemons-rest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/react': patch
---

Add use-immer as a noExternal module
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": "^2.1.7"
"astro": "^2.1.8"
}
}
2 changes: 1 addition & 1 deletion examples/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"@astrojs/mdx": "^0.18.2",
"@astrojs/rss": "^2.3.1",
"@astrojs/sitemap": "^1.2.1"
Expand Down
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": "^2.1.7"
"astro": "^2.1.8"
},
"peerDependencies": {
"astro": "^2.0.0-beta.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/deno/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7"
"astro": "^2.1.8"
},
"devDependencies": {
"@astrojs/deno": "^4.1.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"preact": "^10.7.3",
"react": "^18.1.0",
"react-dom": "^18.1.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-alpine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"alpinejs": "^3.10.2",
"@astrojs/alpinejs": "^0.2.1",
"@types/alpinejs": "^3.7.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-lit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"lit": "^2.2.5",
"@astrojs/lit": "^1.3.0",
"@webcomponents/template-shadowroot": "^0.1.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"preact": "^10.7.3",
"react": "^18.1.0",
"react-dom": "^18.1.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"preact": "^10.7.3",
"@astrojs/preact": "^2.1.0",
"@preact/signals": "^1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"@astrojs/react": "^2.1.0",
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 @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"solid-js": "^1.4.3",
"@astrojs/solid-js": "^2.1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"dependencies": {
"svelte": "^3.48.0",
"@astrojs/svelte": "^2.1.0",
"astro": "^2.1.7"
"astro": "^2.1.8"
}
}
2 changes: 1 addition & 1 deletion examples/framework-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"vue": "^3.2.37",
"@astrojs/vue": "^2.1.0"
}
Expand Down
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": "^5.1.0",
"astro": "^2.1.7"
"astro": "^2.1.8"
}
}
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": "^2.1.7"
"astro": "^2.1.8"
},
"peerDependencies": {
"astro": "^2.0.0-beta.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": "^2.1.7"
"astro": "^2.1.8"
}
}
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": "^2.1.7"
"astro": "^2.1.8"
}
}
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": "^2.1.7"
"astro": "^2.1.8"
}
}
2 changes: 1 addition & 1 deletion examples/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"server": "node dist/server/entry.mjs"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"svelte": "^3.48.0",
"@astrojs/svelte": "^2.1.0",
"@astrojs/node": "^5.1.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/with-markdoc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/markdoc": "^0.0.5",
"astro": "^2.1.7",
"@astrojs/markdoc": "^0.1.0",
"astro": "^2.1.8",
"kleur": "^4.1.5"
}
}
4 changes: 2 additions & 2 deletions examples/with-markdoc/src/content/docs/intro.mdoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ This simple starter showcases Markdoc with Content Collections. All Markdoc feat

{% aside title="Code Challenge" type="tip" %}

Reveal the secret message below by adding `revealSecret: true` to your list of Markdoc variables.
Reveal the secret message below by adding `revealSecret` to your list of Markdoc variables.

_Hint: Try [adding a `variables` object](https://markdoc.dev/docs/variables#global-variables) to your Markdoc config. Check the `astro.config.mjs`._
_Hint: Try passing as a prop to the `<Content />` component in the `src/pages/index.astro` file._

{% if $revealSecret %}

Expand Down
2 changes: 1 addition & 1 deletion examples/with-markdoc/src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const { Content } = await intro.render();
<Layout title={intro.data.title}>
<main>
<h1>{intro.data.title}</h1>
<Content variables={{ revealSecret: true }} />
<Content />
</main>
</Layout>

Expand Down
2 changes: 1 addition & 1 deletion examples/with-markdown-plugins/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"@astrojs/markdown-remark": "^2.1.2",
"hast-util-select": "5.0.1",
"rehype-autolink-headings": "^6.1.1",
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": "^2.1.7"
"astro": "^2.1.8"
}
}
2 changes: 1 addition & 1 deletion examples/with-mdx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"preact": "^10.6.5",
"@astrojs/preact": "^2.1.0",
"@astrojs/mdx": "^0.18.2"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-nanostores/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"preact": "^10.7.3",
"@astrojs/preact": "^2.1.0",
"nanostores": "^0.5.12",
Expand Down
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": "^0.18.2",
"@astrojs/tailwind": "^3.1.1",
"@types/canvas-confetti": "^1.4.3",
"astro": "^2.1.7",
"astro": "^2.1.8",
"autoprefixer": "^10.4.7",
"canvas-confetti": "^1.5.1",
"postcss": "^8.4.14",
Expand Down
2 changes: 1 addition & 1 deletion examples/with-vite-plugin-pwa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^2.1.7",
"astro": "^2.1.8",
"vite-plugin-pwa": "0.11.11",
"workbox-window": "^6.5.3"
}
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": "^2.1.7",
"astro": "^2.1.8",
"vitest": "^0.20.3"
}
}
Loading

0 comments on commit 8a1e64e

Please sign in to comment.