Skip to content

Commit 16aac30

Browse files
authored
Merge branch 'main' into update-021205
2 parents e81b90b + 6965077 commit 16aac30

10 files changed

Lines changed: 69 additions & 43 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"@astrojs/sitemap": "^3.6.0",
6262
"@astrojs/starlight": "^0.37.1",
6363
"@expressive-code/plugin-collapsible-sections": "^0.41.3",
64-
"@lunariajs/core": "https://pkg.pr.new/lunariajs/lunaria/@lunariajs/core@f07e1a3",
64+
"@lunariajs/core": "https://pkg.pr.new/lunariajs/lunaria/@lunariajs/core@722c34c",
6565
"canvas-confetti": "^1.6.0",
6666
"jsdoc-api": "^9.3.5",
6767
"rehype-slug": "^6.0.0",

pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/content/docs/en/reference/error-reference.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ The following reference is a complete list of the errors you may encounter while
4545
- [**InvalidImageService**](/en/reference/errors/invalid-image-service/)<br/>Error while loading image service.
4646
- [**MissingImageDimension**](/en/reference/errors/missing-image-dimension/)<br/>Missing image dimensions
4747
- [**FailedToFetchRemoteImageDimensions**](/en/reference/errors/failed-to-fetch-remote-image-dimensions/)<br/>Failed to retrieve remote image dimensions
48+
- [**RemoteImageNotAllowed**](/en/reference/errors/remote-image-not-allowed/)<br/>Remote image is not allowed
4849
- [**UnsupportedImageFormat**](/en/reference/errors/unsupported-image-format/)<br/>Unsupported image format
4950
- [**UnsupportedImageConversion**](/en/reference/errors/unsupported-image-conversion/)<br/>Unsupported image conversion
5051
- [**PrerenderDynamicEndpointPathCollide**](/en/reference/errors/prerender-dynamic-endpoint-path-collide/)<br/>Prerendered dynamic endpoint has path collision.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
# NOTE: This file is auto-generated from 'scripts/error-docgen.mjs'
3+
# Do not make edits to it directly, they will be overwritten.
4+
# Instead, change this file: https://github.com/withastro/astro/blob/main/packages/astro/src/core/errors/errors-data.ts
5+
# Translators, please remove this note and the <DontEditWarning/> component.
6+
7+
title: Remote image is not allowed
8+
i18nReady: true
9+
githubURL: https://github.com/withastro/astro/blob/main/packages/astro/src/core/errors/errors-data.ts
10+
---
11+
import DontEditWarning from '~/components/DontEditWarning.astro'
12+
13+
<DontEditWarning />
14+
15+
16+
> Remote image `IMAGE_URL` is not allowed by your image configuration.
17+
18+
## What went wrong?
19+
The remote image URL does not match your configured `image.domains` or `image.remotePatterns`.
20+
21+
22+

src/content/docs/es/reference/errors/unknown-vite-error.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ Vite encontró un error desconocido mientras renderizaba tu proyecto. Desafortun
1515
Si puedes reproducir de forma confiable este error, nos gustaría que [abrieras una issue](https://astro.build/issues/)
1616

1717
**Ver también:**
18-
- [Guía de solución de problemas de Vite](https://vite.dev/guide/troubleshooting.html)
18+
- [Guía de solución de problemas de Vite](https://es.vite.dev/guide/troubleshooting)

src/content/docs/fr/tutorial/2-pages/4.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ La balise `<style>` d'Astro peut également référencer toutes les variables de
134134

135135
<Box icon="puzzle-piece">
136136

137-
## Essayer par vous-même - Définisser des variables CSS
137+
## Essayer par vous-même - Définir des variables CSS
138138

139139
<Steps>
140140
1. Mettez à jour la balise `<style>` sur votre page À propos pour qu'elle corresponde à celle ci-dessous.

src/content/docs/zh-cn/guides/cms/index.mdx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ sidebar:
55
label: CMS 概览
66
---
77
import CMSGuidesNav from '~/components/CMSGuidesNav.astro';
8+
import FeaturedCMSGuidesNav from '~/components/FeaturedCMSGuidesNav.astro';
89
import ReadMore from '~/components/ReadMore.astro';
910
import Badge from "~/components/Badge.astro"
1011

@@ -14,6 +15,10 @@ import Badge from "~/components/Badge.astro"
1415
在我们的集成目录中找到 [社区维护的集成](https://astro.build/integrations/?search=cms),用于将 CMS 连接到你的项目。
1516
:::
1617

18+
## 精选 CMS 合作伙伴
19+
20+
<FeaturedCMSGuidesNav />
21+
1722
## CMS 指南
1823

1924
请注意,其中许多页面都是 **断续的**:这些资源等着你来贡献!

src/content/docs/zh-cn/guides/content-collections.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Astro 提供了 [两个内置的加载器函数(`glob()` 和 `file()`)](/zh-
9292

9393
[`glob()` 加载器](/zh-cn/reference/content-loader-reference/#glob-加载器) 可以从文件系统的任何地方创建 Markdown、MDX、Markdoc、JSON、YAML 或 TOML 文件的目录条目。它基于 [micromatch](https://github.com/micromatch/micromatch#matching-features) 的 glob 模式支持来接受一个匹配条目文件的 `pattern`,以及你的文件所在的 `base` 文件路径。每个条目的 `id` 将从其文件名自动生成。当每个条目对应一个文件时,请使用此加载器。
9494

95-
[`file()` 加载器](/zh-cn/reference/content-loader-reference/#file-加载器) 从单个本地文件创建多个条目。文件中的每个条目必须有一个唯一的 `id` 键属性。它接受一个 相对你的文件的 `base` 文件路径,以及一个可选的 [`parser` 函数](#parser-函数) 用于它无法自动解析的数据文件。当你的数据文件可以解析为对象数组时,请使用此加载器。
95+
[`file()` 加载器](/zh-cn/reference/content-loader-reference/#file-加载器) 从单个本地文件创建多个条目。文件中的每个条目必须有一个唯一的 `id` 键属性。它接受一个相对你的文件的 `base` 文件路径,以及一个可选的 [`parser` 函数](#parser-函数) 用于它无法自动解析的数据文件或用于异步解析数据。当你的数据文件可以解析为对象数组时,请使用此加载器。
9696

9797
```ts title="src/content.config.ts" {6,10}
9898
import { defineCollection } from 'astro:content';

src/content/i18n/zh-CN.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ deploy.altSectionTitle: 更多部署指南
2020
deploy.ssrTag: SSR
2121
deploy.staticTag: 静态
2222
# CMS Guides vocabulary
23+
cms.featuredSubheading: 精选 CMS 合作伙伴
24+
cms.allSubheading: 全部 CMS 指南
2325
cms.navTitle: 更多 CMS 指南
2426
# Media Guides vocabulary
2527
media.navTitle: 更多托管媒体指南

src/data/contributors.json

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,16 @@
108108
"login": "AitorMT"
109109
},
110110
{
111-
"id": 70939128,
112-
"login": "jp-knj"
111+
"id": 602478,
112+
"login": "ematipico"
113113
},
114114
{
115115
"id": 45708948,
116116
"login": "kecrily"
117117
},
118118
{
119-
"id": 602478,
120-
"login": "ematipico"
119+
"id": 70939128,
120+
"login": "jp-knj"
121121
},
122122
{
123123
"id": 8216525,
@@ -131,10 +131,6 @@
131131
"id": 13069,
132132
"login": "kyosuke"
133133
},
134-
{
135-
"id": 54233296,
136-
"login": "alexnguyennz"
137-
},
138134
{
139135
"id": 10626596,
140136
"login": "jasikpark"
@@ -460,8 +456,8 @@
460456
"login": "agriffard"
461457
},
462458
{
463-
"id": 18169566,
464-
"login": "deining"
459+
"id": 37566594,
460+
"login": "tejapaturu"
465461
},
466462
{
467463
"id": 92775570,
@@ -499,10 +495,18 @@
499495
"id": 30383579,
500496
"login": "Adammatthiesen"
501497
},
498+
{
499+
"id": 18169566,
500+
"login": "deining"
501+
},
502502
{
503503
"id": 25793187,
504504
"login": "arisa-fukuzaki"
505505
},
506+
{
507+
"id": 66757451,
508+
"login": "avilyre"
509+
},
506510
{
507511
"id": 14830190,
508512
"login": "caioferrarezi"
@@ -548,12 +552,8 @@
548552
"login": "sujang958"
549553
},
550554
{
551-
"id": 37566594,
552-
"login": "tejapaturu"
553-
},
554-
{
555-
"id": 81039882,
556-
"login": "Njong392"
555+
"id": 190183925,
556+
"login": "ankddev"
557557
},
558558
{
559559
"id": 58347116,
@@ -599,10 +599,6 @@
599599
"id": 17983739,
600600
"login": "imbant"
601601
},
602-
{
603-
"id": 190183925,
604-
"login": "ankddev"
605-
},
606602
{
607603
"id": 59626670,
608604
"login": "angelmarfil"
@@ -611,10 +607,6 @@
611607
"id": 16765690,
612608
"login": "bandantonio"
613609
},
614-
{
615-
"id": 66757451,
616-
"login": "avilyre"
617-
},
618610
{
619611
"id": 100040151,
620612
"login": "BassamXYZ"
@@ -635,6 +627,14 @@
635627
"id": 49127376,
636628
"login": "IgorKowalczyk"
637629
},
630+
{
631+
"id": 24290044,
632+
"login": "Singebob"
633+
},
634+
{
635+
"id": 81039882,
636+
"login": "Njong392"
637+
},
638638
{
639639
"id": 77222233,
640640
"login": "NightFeather0615"
@@ -652,25 +652,21 @@
652652
"login": "tinymachine"
653653
},
654654
{
655-
"id": 5558193,
656-
"login": "mhstrkmp"
655+
"id": 79452224,
656+
"login": "Kenzo-Wada"
657657
},
658658
{
659-
"id": 24290044,
660-
"login": "Singebob"
659+
"id": 15347255,
660+
"login": "lorenzolewis"
661661
},
662662
{
663-
"id": 79452224,
664-
"login": "Kenzo-Wada"
663+
"id": 5558193,
664+
"login": "mhstrkmp"
665665
},
666666
{
667667
"id": 56328053,
668668
"login": "marsidev"
669669
},
670-
{
671-
"id": 15347255,
672-
"login": "lorenzolewis"
673-
},
674670
{
675671
"id": 49699333,
676672
"login": "dependabot[bot]"

0 commit comments

Comments
 (0)