Skip to content

Commit

Permalink
Merge branch 'main' into ci/docgen
Browse files Browse the repository at this point in the history
  • Loading branch information
sarah11918 authored Sep 5, 2023
2 parents de2e4c3 + a04eb4f commit 42b9076
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/content/docs/en/concepts/islands.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import MyReactComponent from '../components/MyReactComponent.jsx';
<MyReactComponent />
```

But sometimes, client-side JavaScript is required for creating interactive UI. Instead of forcing your entire page to become an SPA-like JavaScript application, Astro asks you to create an island.
But sometimes, client-side JavaScript is required for creating interactive UI. Instead of forcing your entire page to become a single-page JavaScript application (SPA), Astro asks you to create an island.

```astro title="src/pages/index.astro" ins="client:load"
---
Expand Down
4 changes: 2 additions & 2 deletions src/content/docs/en/core-concepts/astro-components.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const { greeting, name } = Astro.props;
<h2>{greeting}, {name}!</h2>
```

This component, when imported and rendered in other Astro components, layouts or pages, can be passed these props as attributes:
This component, when imported and rendered in other Astro components, layouts or pages, can pass these props as attributes:

```astro /(\w+)=\S+/
---
Expand Down Expand Up @@ -350,4 +350,4 @@ A [`<slot />` element](/en/core-concepts/astro-components/#slots) inside an HTML

## Next Steps

📚 Learn about using [UI framework components](/en/core-concepts/framework-components/) in your Astro project.
📚 Learn about using [UI framework components](/en/core-concepts/framework-components/) in your Astro project.
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,26 @@ Use the `create astro` command for your package manager to launch Astro's CLI wi
### Add integrations and dependencies
Add the React integration using the `astro add` command for your package manager. If your app uses Tailwind or MDX, you can add multiple Astro integrations using the same command:

```sh
# Using NPM
npx astro add react
npx astro add react tailwind mdx
# Using Yarn
yarn astro add react
yarn astro add react tailwind mdx
# Using PNPM
pnpm astro add react
pnpm astro add react tailwind mdx
```
<PackageManagerTabs>
<Fragment slot="npm">
```shell
npx astro add react
npx astro add react tailwind mdx
```
</Fragment>
<Fragment slot="pnpm">
```shell
pnpm astro add react
pnpm astro add react tailwind mdx
```
</Fragment>
<Fragment slot="yarn">
```shell
yarn astro add react
yarn astro add react tailwind mdx
```
</Fragment>
</PackageManagerTabs>

If your CRA requires any dependencies (e.g. NPM packages), then install them individually using the command line or by adding them to your new Astro project's `package.json` manually and then running an install command. Note that many, but not all, React dependencies will work in Astro.

Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/en/recipes.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Add your own here! See our [recipes contributing guide](https://github.com/witha
- [Use UnoCSS in Astro](https://www.elian.codes/blog/23-02-11-implementing-unocss-in-astro/)
- [Build a table of contents from Astro's Markdown headings](https://kld.dev/building-table-of-contents/)
- [Create a Remark plugin to remove runts from your Markdown files](https://eatmon.co/blog/remove-runts-markdown/)
- [Add searching to your site with Pagefind](https://blog.otterlord.dev/post/astro-search/)
- [Add searching to your site with Pagefind](https://blog.otterlord.dev/posts/astro-search/)
- [Add searching to your site with Fuse.js](https://www.youtube.com/watch?v=XnV_2MWqAhQ)
- [Get VSCode, ESLint & Prettier working with Astro](https://patheticgeek.dev/blog/astro-prettier-eslint-vscode)
- [Enhance your Astro builds: modify HTML files post-build](https://straffesites.com/en/blog/optimize-astro-html-post-build)
Expand Down

0 comments on commit 42b9076

Please sign in to comment.