Skip to content

Commit a094ac9

Browse files
jsparkdevjsparkdev
authored
Merge branch 'main' into netlify
2 parents f86388b + 67546ca commit a094ac9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2578
-882
lines changed

‎.github/actions/install/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
using: composite
66
steps:
77
- name: Setup PNPM
8-
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
8+
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
99

1010
- name: Setup Node
1111
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0

‎src/content/docs/en/concepts/islands.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ import Avatar from "../components/Avatar.astro";
114114

115115
This breaks up your page with smaller areas of server-rendered content that each load in parallel.
116116

117-
Your page's main content can be rendered immediately with placeholder content, such as a generic avatar until your island's own content is available. With server islands, having small components of personalized content does not delay the rendering of an otherwise static page.
117+
Your page's main content can be rendered immediately with placeholder content, such as a generic avatar, until your island's own content is available. With server islands, having small components of personalized content does not delay the rendering of an otherwise static page.
118118

119119
This rendering pattern was built to be portable. It does not depend on any server infrastructure so it will work with any host, from a Node.js server in a Docker container to the serverless provider of your choice.
120120

‎src/content/docs/en/guides/content-collections.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ You can provide your entries as an array of objects with an `id` property, or in
256256

257257
#### Parsing other data formats
258258

259-
Support for parsing single JSON, YAML, and TOML files into collection entries withe the `file()` loader is built-in (unless you have a [nested JSON document](#nested-json-documents)). To load your collection from unsupported file types, such as `.csv`, you will need to create a [parser function](/en/reference/content-loader-reference/#parser). This function can be made async if required (e.g. to fetch files from the web, or if your parser is asyncronous).
259+
Support for parsing single JSON, YAML, and TOML files into collection entries with the `file()` loader is built-in (unless you have a [nested JSON document](#nested-json-documents)). To load your collection from unsupported file types, such as `.csv`, you will need to create a [parser function](/en/reference/content-loader-reference/#parser). This function can be made async if required (e.g. to fetch files from the web, or if your parser is asyncronous).
260260

261261
The following example shows importing a third-party CSV parser then passing a custom `parser` function to the `file()` loader:
262262

‎src/content/docs/en/guides/fonts.mdx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ This example will demonstrate adding a custom font using the font file `DistantG
6464

6565
Astro supports [several font providers](/en/reference/font-provider-reference/#built-in-providers) out of the box, including support for [Fontsource](https://fontsource.org/) that simplifies using Google Fonts and other open-source fonts.
6666

67-
The following example will use Fontsource to add custom font support, but the process is similar for any of Astro's built-in font providers (e.g. [Adobe](https://fonts.adobe.com/), [Bunny](https://fonts.bunny)).
67+
The following example will use Fontsource to add custom font support, but the process is similar for any of Astro's built-in font providers (e.g. [Adobe](https://fonts.adobe.com/), [Bunny](https://fonts.bunny.net/)).
6868

6969
<Steps>
7070

@@ -102,7 +102,7 @@ After [a font is configured](#configuring-custom-fonts), it must be added to you
102102
103103
<html>
104104
<head>
105-
<Font cssVariable="--font-distant-galaxy" preload />
105+
<Font cssVariable="--font-distant-galaxy" />
106106
</head>
107107
<body>
108108
<slot />
@@ -147,7 +147,7 @@ Instead, after [configuring your custom font](#configuring-custom-fonts) and [ad
147147
@import "tailwindcss";
148148

149149
@theme inline {
150-
--font-sans: var(--font-roboto);
150+
--font-sans: var(--font-roboto);
151151
}
152152
```
153153

@@ -158,22 +158,22 @@ Instead, after [configuring your custom font](#configuring-custom-fonts) and [ad
158158
```js title="tailwind.config.mjs" ins={6-8}
159159
/** @type {import("tailwindcss").Config} */
160160
export default {
161-
content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"],
162-
theme: {
161+
content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"],
162+
theme: {
163163
extend: {},
164164
fontFamily: {
165-
sans: ["var(--font-roboto)"]
165+
sans: ["var(--font-roboto)"]
166166
}
167-
},
168-
plugins: []
167+
},
168+
plugins: []
169169
};
170170
```
171171

172172
</TabItem>
173173

174174
</Tabs>
175175

176-
See [Tailwind's docs on adding custom font families](https://tailwindcss.com/docs/font-family#using-custom-values) for more information.
176+
See [Tailwind's docs on adding custom font families](https://tailwindcss.com/docs/font-family#using-a-custom-value) for more information.
177177

178178

179179
## Accessing font data programmatically

‎src/content/docs/en/guides/integrations-guide/cloudflare.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,14 +493,14 @@ On-demand rendered pages are not affected by this option and continue to run in
493493

494494
The new workerd environment does not support CommonJS syntax, including Node.js specific syntax such as `require` and `module.exports`. This means that some of your project dependencies may throw errors in the development server or during the build.
495495

496-
If you have control over the dependency, you can create a Vite plugin and pre-compile the dependency using the `optimiseDeps.include` option.
496+
If you have control over the dependency, you can create a Vite plugin and pre-compile the dependency using the `optimizeDeps.include` option.
497497

498498
For example, you can create a Vite plugin to pre-compile the dependency `postcss` in order to use the Expressive Code syntax highlighter:
499499

500500
```js ins={8-14}
501501
function noExternalPlugin() {
502502
return {
503-
name: "optimise-dependencies",
503+
name: "optimize-dependencies",
504504
configEnvironment(environment) {
505505
// We're only interested in server environments
506506
if (environment !== 'client') {

‎src/content/docs/en/guides/upgrade-to/v6.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ Replace both methods with [`getEntry()`](/en/reference/modules/astro-content/#ge
646646
647647
<details>
648648
<summary>legacy collection querying and rendering methods that depend on a `slug` property / ([`ContentSchemaContainsSlugError`](/en/reference/errors/content-schema-contains-slug-error/))</summary>
649-
Previously, the `id` was based on the filename, and there was a `slug` property that could be used in a URL. Now the [CollectionEntry](/en/reference/modules/astro-content/#collectionentry) `id` is a slug. If you need access to the filename (previously available as the `id`), use the `filePath` property. Replace instances of `slug` with `id`:
649+
Previously, the `id` was based on the filename, and there was a `slug` property that could be used in a URL. Now the [`CollectionEntry`](/en/reference/modules/astro-content/#collectionentry) `id` is a slug. If you need access to the filename (previously available as the `id`), use the `filePath` property. Replace instances of `slug` with `id`:
650650
651651
```astro ins={6} del={5} title="src/pages/[slug].astro"
652652
---

‎src/content/docs/en/reference/content-loader-reference.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ import { z } from 'astro/zod';
222222
import { loadFeedData } from "./feed.js";
223223

224224
// 2. Define any options that your loader needs
225-
export function myLoader(options: { url: string, apiKey: string }) {
225+
export function feedLoader(options: { url: string, apiKey: string }) {
226226
const feedUrl = new URL(options.url);
227227
// 3. Return a loader object
228228
return {

‎src/content/docs/en/reference/modules/astro-assets.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ With this component, you have control over which font family is used on which pa
569569
import { Font } from "astro:assets";
570570
---
571571
572-
<Font cssVariable="--font-roboto" preload />
572+
<Font cssVariable="--font-roboto" />
573573
```
574574

575575
The `<Font />` component accepts the following properties:
@@ -610,7 +610,7 @@ import { Font } from "astro:assets";
610610
<Font cssVariable="--font-roboto" preload />
611611
```
612612

613-
You may not always want to preload every font link, as this can block loading other important resources or may download fonts that are not needed for the current page.
613+
Be very intentional about which fonts you preload. Preloading too many fonts can impact performance, as this can block loading other important resources or may download fonts that are not needed for the current page.
614614

615615
To selectively control which font files are preloaded, you can provide an array of objects describing any combination of font `weight`, `style`, or `subset` to preload:
616616

‎src/content/docs/fr/guides/cms/cloudcannon.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ L'exemple suivant créera un nouvel article de blog à partir de la collection
144144

145145
## Affichage du contenu de CloudCannon
146146

147-
Utilisez l'API des collections de contenu d'Astro pour [interroger et afficher vos articles et collections](/fr/guides/content-collections/#interroger-les-collections), comme vous le feriez dans n'importe quel projet Astro.
147+
Utilisez l'API des collections de contenu d'Astro pour [interroger et afficher vos articles et collections](/fr/guides/content-collections/#interroger-les-collections-consommées-lors-de-la-compilation), comme vous le feriez dans n'importe quel projet Astro.
148148

149149
### Affichage d'une liste pour une collection
150150

‎src/content/docs/fr/guides/cms/keystatic.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ Visitez `http://127.0.0.1:4321/keystatic` dans le navigateur pour voir l'interfa
183183

184184
## Rendu du contenu Keystatic
185185

186-
[Interrogez et affichez vos articles et collections](/fr/guides/content-collections/#interroger-les-collections), comme vous le feriez dans n'importe quel projet Astro.
186+
[Interrogez et affichez vos articles et collections](/fr/guides/content-collections/#interroger-les-collections-consommées-lors-de-la-compilation), comme vous le feriez dans n'importe quel projet Astro.
187187

188188
### Affichage d'une liste de collections
189189

0 commit comments

Comments
 (0)