Skip to content

Commit

Permalink
Merge branch '5.0.0-beta' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
sarah11918 authored Oct 7, 2024
2 parents 6aecb12 + 7d0a46a commit a9646b7
Show file tree
Hide file tree
Showing 45 changed files with 344 additions and 310 deletions.
2 changes: 1 addition & 1 deletion src/content/docs/de/guides/markdown-content.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ Die von Astro standardmäßig verwendeten Plugins sind [GitHub-flavored Markdown
Astro unterstützt von Haus aus [Shiki](https://shiki.matsu.io/) und [Prism](https://prismjs.com/) und ermöglicht so die Syntaxhervorhebung in folgenden Bereichen:

- Mit Code-Zäunen (\`\`\`) umgebene Inhalte innerhalb von Markdown-Dateien (`.md`) und der [eingebauten `<Markdown />`-Komponente](#markdown-komponente).
- Inhalte innerhalb der [eingebauten `<Code />`-Komponente](/de/reference/api-reference/#code-) (basierend auf Shiki) oder der [`<Prism />`-Komponente](/de/reference/api-reference/#prism-) (basierend auf Prism).
- Inhalte innerhalb der [eingebauten `<Code />`-Komponente](/de/reference/components-reference/#code-) (basierend auf Shiki) oder der [`<Prism />`-Komponente](/de/reference/components-reference/#prism-) (basierend auf Prism).

Shiki ist standardmäßig aktiviert und mit dem Design `github-dark` vorkonfiguriert. Die kompilierte Ausgabe wird auf Inline-Stile ohne überflüssige CSS-Klassen, Stylesheets oder clientseitigen JavaScript-Code beschränkt.

Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/de/guides/troubleshooting.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ Dies kann nützlich sein, um Unterschiede zwischen der SSR-Ausgabe und den hydra

### Astro `<Debug />` Komponente

Um dir das Debuggen deiner Astro-Komponenten zu erleichtern, bietet Astro eine eingebaute [`<Debug />`](/de/reference/api-reference/#debug-) Komponente, die jeden Wert direkt in die HTML-Vorlage deiner Komponente überträgt. Das ist nützlich für das schnelle Debugging im Browser, ohne dass du zwischen deinem Terminal und deinem Browser hin- und herwechseln musst.
Um dir das Debuggen deiner Astro-Komponenten zu erleichtern, bietet Astro eine eingebaute [`<Debug />`](/de/reference/components-reference/#debug-) Komponente, die jeden Wert direkt in die HTML-Vorlage deiner Komponente überträgt. Das ist nützlich für das schnelle Debugging im Browser, ohne dass du zwischen deinem Terminal und deinem Browser hin- und herwechseln musst.

```astro {2,7}
---
Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/en/basics/astro-components.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ import Wrapper from '../components/Wrapper.astro';
Use a `slot="my-slot"` attribute on the child element that you want to pass through to a matching `<slot name="my-slot" />` placeholder in your component.
:::

To pass multiple HTML elements into a component's `<slot/>` placeholder without a wrapping `<div>`, use the `slot=""` attribute on [Astro's `<Fragment/>` component](/en/reference/api-reference/#fragment-):
To pass multiple HTML elements into a component's `<slot/>` placeholder without a wrapping `<div>`, use the `slot=""` attribute on [Astro's `<Fragment/>` component](/en/reference/components-reference/#fragment-):

```astro title="src/components/CustomTable.astro" "<slot name="header"/>" "<slot name="body"/>"
---
Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/en/guides/actions.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ For example, you might return the name of a product in an `addToCart` action, ra
import { defineAction } from 'astro:actions';

export const server = {
addToCard: defineAction({
addToCart: defineAction({
handler: async () => {
/* ... */
return product;
Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/en/guides/imports.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ These aliases are also integrated automatically into [VS Code](https://code.visu

## `import.meta.glob()`

[Vite's `import.meta.glob()`](https://vitejs.dev/guide/features.html#glob-import) is a way to import many files at once using glob patterns to find matching file paths.
[Vite's `import.meta.glob()`](https://vite.dev/guide/features.html#glob-import) is a way to import many files at once using glob patterns to find matching file paths.

`import.meta.glob()` takes a relative [glob pattern](/en/guides/imports/#glob-patterns) matching the local files you'd like to import as a parameter. It returns an array of each matching file's exports. To load all matched modules up front, pass `{ eager: true }` as the second argument:

Expand Down
4 changes: 2 additions & 2 deletions src/content/docs/en/guides/markdown-content.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,8 @@ export default defineConfig({
Astro comes with built-in support for [Shiki](https://shiki.style/) and [Prism](https://prismjs.com/). This provides syntax highlighting for:

- all code fences (\`\`\`) used in a Markdown or MDX file.
- content within the [built-in `<Code />` component](/en/reference/api-reference/#code-) (powered by Shiki).
- content within the [`<Prism />` component](/en/reference/api-reference/#prism-) (powered by Prism).
- content within the [built-in `<Code />` component](/en/reference/components-reference/#code-) (powered by Shiki).
- content within the [`<Prism />` component](/en/reference/components-reference/#prism-) (powered by Prism).

Shiki is enabled by default, preconfigured with the `github-dark` theme. The compiled output will be limited to inline `style`s without any extraneous CSS classes, stylesheets, or client-side JS.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ const randomUser = data.results[0];
---
```

See more about [local files imports with `import.meta.glob()`](https://vitejs.dev/guide/features.html#glob-import), [querying using the Collections API](/en/guides/content-collections/#querying-collections) or [fetching remote data](/en/guides/data-fetching/).
See more about [local files imports with `import.meta.glob()`](https://vite.dev/guide/features.html#glob-import), [querying using the Collections API](/en/guides/content-collections/#querying-collections) or [fetching remote data](/en/guides/data-fetching/).

### Next Styling to Astro

Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/en/guides/routing.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ if (!isLoggedIn(cookie)) {

<p><Since v="4.13.0" /></p>

A rewrite allows you serve a different route without redirecting the browser to a different page. The browser will show the original address in the URL bar, but will instead display the content of the URL provided to [`Astro.rewrite()`](/en/reference/api-reference/#astrorewrite).
A rewrite allows you to serve a different route without redirecting the browser to a different page. The browser will show the original address in the URL bar, but will instead display the content of the URL provided to [`Astro.rewrite()`](/en/reference/api-reference/#astrorewrite).

:::tip
For content that has permanently moved, or to direct your user to a different page with a new URL (e.g. a user dashboard after logging in), use a [redirect](#redirects) instead.
Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/en/guides/troubleshooting.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This can be useful for debugging differences between the SSR output and the hydr

### Astro `<Debug />` component

To help you debug your Astro components, Astro provides a built-in [`<Debug />`](/en/reference/api-reference/#debug-) component which renders any value directly into your component HTML template. This is useful for quick debugging in the browser without having to flip back-and-forth between your terminal and your browser.
To help you debug your Astro components, Astro provides a built-in [`<Debug />`](/en/reference/components-reference/#debug-) component which renders any value directly into your component HTML template. This is useful for quick debugging in the browser without having to flip back-and-forth between your terminal and your browser.

```astro {2,7}
---
Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/en/guides/upgrade-to/v1.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ import { Prism } from '@astrojs/prism';
---
```

Since the `@astrojs/prism` package is still bundled with `astro` core, you won't need to install anything new, nor add Prism as an integration! However, note that we _do_ plan to extract `@astrojs/prism` (and Prism syntax highlighting in general) to a separate, installable package in the future. See [the `<Prism />` component API reference](/en/reference/api-reference/#prism-) for more.
Since the `@astrojs/prism` package is still bundled with `astro` core, you won't need to install anything new, nor add Prism as an integration! However, note that we _do_ plan to extract `@astrojs/prism` (and Prism syntax highlighting in general) to a separate, installable package in the future. See [the `<Prism />` component API reference](/en/reference/components-reference/#prism-) for more details.

### CSS Parser Upgrade

Expand Down
6 changes: 3 additions & 3 deletions src/content/docs/en/guides/upgrade-to/v5.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ The minimum supported version of Node.js in Astro v5.0 is `v18.17.1`

### Vite 6.0

Astro 5.0-beta updates to Vite 6.0-beta as the development server and production bundler. Note: Astro v5 will remain in beta until Vite v6 has been released as stable.
Astro 5.0-beta updates to Vite 6.0-beta as the development server and production bundler. Note: Astro v5 will remain in beta until Vite v6 has been released as stable. During this period, The Vite version is pinned and upgraded by Astro manually to prevent unhandled breaking changes.

#### What should I do?

If you are using Vite-specific plugins, configuration, or APIs, check the [Vite CHANGELOG](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md#600-beta0-2024-09-12) for their breaking changes and upgrade your project as needed.

Vite's current alpha release has no breaking changes for Astro at this time.
Vite's current beta release has no breaking changes for Astro at this time.


### `@astrojs/mdx`
Expand Down Expand Up @@ -188,7 +188,7 @@ Placeholder
#### What should I do?
If you are using Vite-specific plugins, configuration, or APIs, check the [Vite migration guide](https://vitejs.dev/guide/migration) for their breaking changes and upgrade your project as needed. There are no breaking changes to Astro itself.
If you are using Vite-specific plugins, configuration, or APIs, check the [Vite migration guide](https://vite.dev/guide/migration) for their breaking changes and upgrade your project as needed. There are no breaking changes to Astro itself.
*/}

Expand Down
Loading

0 comments on commit a9646b7

Please sign in to comment.