Skip to content

Commit db5e867

Browse files
charlesschaefercharlesschaefer
authored
Merge branch 'tauri-apps:v2' into v2
2 parents 10ecb0b + 2740695 commit db5e867

File tree

120 files changed

+5988
-941
lines changed

Some content is hidden

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

120 files changed

+5988
-941
lines changed

‎astro.config.mjs‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ const authors = {
5858
title: 'Tauri Security',
5959
picture: '/authors/chip.png',
6060
},
61+
tony: {
62+
name: 'Tony',
63+
title: 'Tauri Development',
64+
picture: '/authors/tony.jpeg',
65+
},
6166
};
6267

6368
const site = 'https://v2.tauri.app';
@@ -145,41 +150,47 @@ export default defineConfig({
145150
label: 'Guides',
146151
translations: {
147152
'zh-CN': '指引',
153+
es: 'Guías',
148154
},
149155
collapsed: true,
150156
items: [
151157
{
152158
label: 'Quick Start',
153159
translations: {
154160
'zh-CN': '快速开始',
161+
es: 'Guía rápida',
155162
},
156163
collapsed: true,
157164
items: [
158165
{
159166
label: 'What is Tauri?',
160167
translations: {
161168
'zh-CN': '什么是 Tauri？',
169+
es: '¿Qué es Tauri?',
162170
},
163171
link: '/start/',
164172
},
165173
{
166174
label: 'Prerequisites',
167175
translations: {
168176
'zh-CN': '前置条件',
177+
es: 'Requisitos previos',
169178
},
170179
link: '/start/prerequisites/',
171180
},
172181
{
173182
label: 'Create a Project',
174183
translations: {
175184
'zh-CN': '创建项目',
185+
es: 'Crea un proyecto',
176186
},
177187
link: '/start/create-project/',
178188
},
179189
{
180190
label: 'Frontend Configuration',
181191
translations: {
182192
'zh-CN': '前端配置',
193+
es: 'Configuración del frontend',
183194
},
184195
collapsed: true,
185196
autogenerate: { directory: 'start/frontend' },
@@ -188,6 +199,7 @@ export default defineConfig({
188199
label: 'Upgrade & Migrate',
189200
translations: {
190201
'zh-CN': '升级和迁移',
202+
es: 'Actualizar y migrar',
191203
},
192204
collapsed: true,
193205
autogenerate: { directory: 'start/migrate' },
@@ -198,6 +210,7 @@ export default defineConfig({
198210
label: 'Core Concepts',
199211
translations: {
200212
'zh-CN': '核心概念',
213+
es: 'Conceptos básicos',
201214
},
202215
collapsed: true,
203216
autogenerate: { directory: 'concept' },
@@ -206,6 +219,7 @@ export default defineConfig({
206219
label: 'Security',
207220
translations: {
208221
'zh-CN': '安全',
222+
es: 'Seguridad',
209223
},
210224
collapsed: true,
211225
autogenerate: { directory: 'security' },
@@ -214,14 +228,40 @@ export default defineConfig({
214228
label: 'Develop',
215229
translations: {
216230
'zh-CN': '开发',
231+
es: 'Desarrollo',
217232
},
218233
collapsed: true,
219-
autogenerate: { directory: 'develop' },
234+
items: [
235+
'develop',
236+
'develop/configuration-files',
237+
'develop/calling-rust',
238+
'develop/calling-frontend',
239+
'develop/resources',
240+
'develop/sidecar',
241+
'develop/state-management',
242+
'develop/updating-dependencies',
243+
{
244+
label: 'Debug',
245+
collapsed: true,
246+
autogenerate: { directory: 'develop/Debug' },
247+
},
248+
{
249+
label: 'Plugins',
250+
collapsed: true,
251+
autogenerate: { directory: 'develop/Plugins' },
252+
},
253+
{
254+
label: 'Tests',
255+
collapsed: true,
256+
autogenerate: { directory: 'develop/Tests' },
257+
},
258+
],
220259
},
221260
{
222261
label: 'Distribute',
223262
translations: {
224263
'zh-CN': '分发',
264+
es: 'Distribuir',
225265
},
226266
collapsed: true,
227267
autogenerate: { directory: 'distribute' },
@@ -230,6 +270,7 @@ export default defineConfig({
230270
label: 'Learn',
231271
translations: {
232272
'zh-CN': '学习',
273+
es: 'Aprende',
233274
},
234275
collapsed: true,
235276
autogenerate: { directory: 'learn' },
@@ -238,6 +279,7 @@ export default defineConfig({
238279
label: 'Plugins',
239280
translations: {
240281
'zh-CN': '插件',
282+
es: 'Plugins',
241283
},
242284
collapsed: true,
243285
autogenerate: { directory: 'plugin' },
@@ -246,6 +288,7 @@ export default defineConfig({
246288
label: 'About',
247289
translations: {
248290
'zh-CN': '关于',
291+
es: 'Acerca de',
249292
},
250293
collapsed: true,
251294
autogenerate: { directory: 'about' },
@@ -256,13 +299,15 @@ export default defineConfig({
256299
label: 'References',
257300
translations: {
258301
'zh-CN': '参考',
302+
es: 'Referencias',
259303
},
260304
collapsed: true,
261305
items: [
262306
{
263307
label: 'Security',
264308
translations: {
265309
'zh-CN': '安全',
310+
es: 'Seguridad',
266311
},
267312
collapsed: true,
268313
autogenerate: { directory: 'reference/acl' },
@@ -271,34 +316,39 @@ export default defineConfig({
271316
label: 'Command Line Interface',
272317
translations: {
273318
'zh-CN': '命令行接口（CLI）',
319+
es: 'Interfaz de línea de comandos',
274320
},
275321
link: '/reference/cli/',
276322
},
277323
{
278324
label: 'Configuration',
279325
translations: {
280326
'zh-CN': '配置',
327+
es: 'Configuración',
281328
},
282329
link: '/reference/config/',
283330
},
284331
{
285332
label: 'Environment Variables',
286333
translations: {
287334
'zh-CN': '环境变量',
335+
es: 'Variables de entorno',
288336
},
289337
link: '/reference/environment-variables/',
290338
},
291339
{
292340
label: 'Webview Versions',
293341
translations: {
294342
'zh-CN': 'Webview 版本',
343+
es: 'Versiones de Webview',
295344
},
296345
link: '/reference/webview-versions/',
297346
},
298347
{
299348
label: 'Releases',
300349
translations: {
301350
'zh-CN': '发行版',
351+
es: 'Lanzamientos',
302352
},
303353
collapsed: true,
304354
autogenerate: { directory: 'release' },
@@ -318,6 +368,7 @@ export default defineConfig({
318368
label: 'Blog',
319369
translations: {
320370
'zh-CN': '博客',
371+
es: 'Blog',
321372
},
322373
collapsed: true,
323374
items: [

‎locales.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"zh-cn": {
1515
"label": "简体中文",
16-
"lang": "zh-cn"
16+
"lang": "zh-CN"
1717
},
1818
"ja": {
1919
"label": "日本語",

‎lunaria/components.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export function TranslationNeedsReview() {
2525
<need-review-element></need-review-element>
2626
<script nonce="abc123">
2727
class NeedReviewElement extends HTMLElement {
28-
url = 'https://api.github.com/repos/tauri-apps/tauri-docs/pulls?state=open&per_page=100';
28+
url = 'https://api.github.com/repos/tauri-apps/tauri-docs/pulls?state=open&per_page=100&base=v2';
2929
constructor() {
3030
super();
3131

‎lunaria/style.css‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
:root {
22
color-scheme: dark;
33

4-
--font-fallback: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif,
5-
Apple Color Emoji, Segoe UI Emoji;
4+
--font-fallback:
5+
-apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji,
6+
Segoe UI Emoji;
67
--font-body: system-ui, var(--font-fallback);
78
--theme-accent: hsl(186, 100%, 87%);
89
--theme-bg: hsl(186, 13%, 10%);

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@
3333
"astro-d2": "^0.6.0",
3434
"astro-feelback": "^0.3.4",
3535
"astrojs-service-worker": "^2.0.0",
36-
"jsdom": "^26.0.0",
36+
"jsdom": "^26.1.0",
3737
"prettier": "^3.2.5",
3838
"prettier-plugin-astro": "^0.14.0",
3939
"rehype-autolink-headings": "^7.1.0",
40-
"sass": "^1.77.2",
41-
"sharp": "^0.33.2",
42-
"shiki": "^1.1.7",
40+
"sass": "^1.89.0",
41+
"sharp": "^0.33.5",
42+
"shiki": "^3.0.0",
4343
"starlight-blog": "^0.15.0",
4444
"starlight-links-validator": "^0.13.0"
4545
},
46-
"packageManager": "pnpm@9.15.4",
46+
"packageManager": "pnpm@10.11.0",
4747
"engines": {
48-
"pnpm": "^9.0.0"
48+
"pnpm": "^10.0.0"
4949
},
5050
"pnpm": {
5151
"patchedDependencies": {

‎packages/awesome-tauri‎

‎packages/cli-generator/build.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ function generateCommandDoc(command: string, level: number, subcommandList: Comm
5757
yarn="yarn tauri ${command}"
5858
pnpm="pnpm tauri ${command}"
5959
deno="deno task tauri ${command}"
60+
bun="bun tauri ${command}"
6061
cargo="cargo tauri ${command}"
6162
/>
6263

‎packages/cli-generator/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "",
1313
"license": "MIT",
1414
"dependencies": {
15-
"@tauri-apps/cli": "2.2.7",
15+
"@tauri-apps/cli": "2.5.0",
1616
"@types/node": "^22.0.0",
1717
"github-slugger": "^2.0.0",
1818
"tsm": "^2.3.0",

‎packages/plugins-workspace‎

Submodule plugins-workspace updated 210 files

‎packages/tauri‎

Submodule tauri updated 326 files

0 commit comments

Comments
 (0)