Skip to content

Commit 02edc25

Browse files
authored
Merge branch 'v2' into learn-1
2 parents f61582e + 33de7b4 commit 02edc25

File tree

301 files changed

+39934
-2768
lines changed

Some content is hidden

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

301 files changed

+39934
-2768
lines changed

.github/TRANSLATING.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,22 @@ Here are some guidelines to help with the translation.
8686
Remember, the main goal of the translation is to make the content as accessible and clear to the new audience as it was to the original audience. Always prioritize clarity and accuracy.
8787

8888
Thank you for your interest in contributing; we're excited to have you! Reach out on the [`#docs` channel on Discord](https://discord.com/invite/tauri) if you have any questions along the way.
89+
90+
## Language-specific Guidelines
91+
92+
This section was written by the translators themselves, feel free to add your own tips here.
93+
94+
### Basic Procedure of JP Translation(邦訳基本手順)
95+
96+
1. Use On-line Translation for the inital translation. <br />オンライン翻訳にて初期翻訳。
97+
1. Checks on the auto-translation result. Inappropriate translations shall be corrected (such as "Tauri" - which is often translated as the name of the zodiac sign "the Bull"). <br />自動翻訳の内容確認。不適切な訳語は修正(例えば「牡牛座」と訳された "Tauri" など)。
98+
1. Products names, trade names and proper names such as Tauri, Windows, macOS etc. are shown as they are. <br />商品名、会社名、固有名詞などは、
99+
そのまま英語表記とする(必要に応じて括弧書きで「読み」を表示)。
100+
1. The technical terms shall be checked on the on-line terminology sites (Microsoft Terminology Search, etc.) <br />技術専門用語類は、オンライン用語検索サイト(マイクロソフト社等)に記載されている一般的なものを採用するが、カタカナ語に関しては適宜和語に置き換える場合もある。
101+
102+
### Basic Procedure of KO Translation(번역 기본 절차)
103+
104+
1. Use On-line Translation for the inital translation. <br />온라인 번역으로 초기 번역.
105+
1. Checks on the auto-translation result. Inappropriate translations shall be corrected (such as "Tauri" - which is often translated as the name of the zodiac sign "the Bull"). <br />자동 번역 내용 확인. 부적절한 번역어는 수정(예: "황소자리"로 번역된 "Tauri" 등).
106+
1. Products names, trade names and proper names such as Tauri, Windows, macOS etc. are shown as they are. <br />상품명, 회사명, 고유명사 등은 그대로 영어 표기로 함(필요에 따라 괄호 안에 "읽기" 표시).
107+
1. The technical terms shall be checked on the on-line terminology sites (Microsoft Terminology Search, etc.) <br />기술 전문 용어류는 온라인 용어 검색 사이트(마이크로소프트사 등)에 기재된 일반적인 것을 채택하지만, 가타카나어에 관해서는 적절히 한국어로 대체하는 경우도 있음.

.github/labeler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ i18n:
66
- src/content/docs/it/**/*
77
- src/content/docs/zh-cn/**/*
88
- src/content/docs/ja/**/*
9+
- src/content/docs/ko/**/*
910

1011
"i18n: es":
1112
- src/content/docs/es/**/*
@@ -22,3 +23,5 @@ i18n:
2223
"i18n: ja":
2324
- src/content/docs/ja/**/*
2425

26+
"i18n: ko":
27+
- src/content/docs/ko/**/*
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: 'Sync Sponsors Data'
2+
3+
on:
4+
schedule:
5+
# daily
6+
- cron: '0 0 * * *'
7+
workflow_dispatch:
8+
9+
jobs:
10+
sync-sponsors-data:
11+
name: Sync Sponsors Data
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v4
17+
18+
- uses: pnpm/action-setup@v4
19+
20+
- uses: actions/setup-node@v4
21+
with:
22+
node-version: 20
23+
cache: 'pnpm'
24+
25+
- run: pnpm i
26+
27+
- name: sync-sponsors
28+
run: pnpm sync:sponsors
29+
env:
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
32+
- run: pnpm prettier src/data -w
33+
34+
# tauri-docs PR
35+
- name: Git config
36+
run: |
37+
git config --global user.name "tauri-bot"
38+
git config --global user.email "tauri-bot@tauri.app"
39+
40+
- name: Create pull request for updated docs
41+
id: cpr
42+
# soft fork of https://github.com/peter-evans/create-pull-request for security purposes
43+
uses: tauri-apps/create-pull-request@v3.4.1
44+
if: github.event_name != 'pull_request' && github.event_name != 'push'
45+
with:
46+
token: ${{ secrets.ORG_TAURI_BOT_PAT }}
47+
commit-message: 'chore(docs): Update Sponsors Data'
48+
branch: ci/v2/update-sponsors
49+
title: Update Sponsors Data
50+
labels: 'bot'
51+
52+
- name: Automerge
53+
run: gh pr merge --squash --auto ${{ steps.cpr.outputs.pull-request-number }}
54+
env:
55+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.prettierignore

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
# Generated reference docs
99
src/content/docs/reference
10+
src/content/docs/release
1011

1112
# Git Modules
1213
packages/tauri
@@ -25,18 +26,20 @@ pnpm-lock.yaml
2526
src/components/overrides/Header.astro
2627

2728
# TODO: Prettier breaks these pages
28-
src/content/docs/learn/Security/capabilities-for-windows-and-platforms.mdx
29-
src/content/docs/learn/Security/using-plugin-permissions.mdx
30-
src/content/docs/learn/Security/writing-plugin-permissions.mdx
31-
src/content/docs/zh-cn/learn/Security
32-
3329
src/content/docs/start/frontend/qwik.mdx
34-
src/content/docs/ja/start/frontend/qwik.mdx
35-
src/content/docs/es/start/frontend/qwik.mdx
36-
src/content/docs/zh-cn/start/frontend/qwik.mdx
30+
src/content/docs/*/start/frontend/qwik.mdx
31+
32+
src/content/docs/security/http-headers.mdx
33+
src/content/docs/*/security/http-headers.mdx
3734

3835
src/content/docs/learn/splashscreen.mdx
39-
src/content/docs/zh-cn/learn/splashscreen.mdx
36+
src/content/docs/*/learn/splashscreen.mdx
4037

38+
src/content/docs/learn/Security/capabilities-for-windows-and-platforms.mdx
39+
src/content/docs/*/learn/Security/capabilities-for-windows-and-platforms.mdx
4140

42-
src/content/docs/security/http-headers.mdx
41+
src/content/docs/learn/Security/using-plugin-permissions.mdx
42+
src/content/docs/*/learn/Security/using-plugin-permissions.mdx
43+
44+
src/content/docs/learn/Security/writing-plugin-permissions.mdx
45+
src/content/docs/*/learn/Security/writing-plugin-permissions.mdx

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@
33
"prettier.documentSelectors": ["**/*.astro"],
44
"[astro]": {
55
"editor.defaultFormatter": "astro-build.astro-vscode"
6+
},
7+
"[mdx]": {
8+
"editor.defaultFormatter": "esbenp.prettier-vscode"
69
}
710
}

astro.config.mjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ export default defineConfig({
100100
'start',
101101
'start/prerequisites',
102102
'start/create-project',
103+
'start/project-structure',
103104
// {
104105
// label: 'What is Tauri?',
105106
// // translations: {
@@ -178,6 +179,7 @@ export default defineConfig({
178179
'develop/sidecar',
179180
'develop/state-management',
180181
'develop/updating-dependencies',
182+
'develop/icons',
181183
{
182184
label: 'Debug',
183185
collapsed: true,
@@ -413,10 +415,14 @@ export default defineConfig({
413415
},
414416
}),
415417
],
418+
image: {
419+
domains: ['tauri.app', 'images.opencollective.com', 'avatars.githubusercontent.com'],
420+
},
416421
markdown: {
417422
shikiConfig: {
418423
langs: ['powershell', 'ts', 'rust', 'bash', 'json', 'toml', 'html', 'js'],
419424
},
425+
420426
rehypePlugins: [
421427
rehypeHeadingIds,
422428
[

locales.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,9 @@
1818
"ja": {
1919
"label": "日本語",
2020
"lang": "ja"
21+
},
22+
"ko": {
23+
"label": "한국어",
24+
"lang": "ko"
2125
}
2226
}

lunaria.config.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
{
4343
"label": "日本語",
4444
"lang": "ja"
45+
},
46+
{
47+
"label": "한국어",
48+
"lang": "ko"
4549
}
4650
],
4751
"dashboard": {

package.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"dev:setup:tauri": "pnpm install -C packages/tauri/packages/api --ignore-workspace --no-frozen-lockfile",
1010
"dev:setup:plugins-workspace": "pnpm -C packages/plugins-workspace install",
1111
"dev:setup": "pnpm dev:setup:submodules && pnpm dev:setup:tauri && pnpm dev:setup:plugins-workspace && pnpm build:compatibility-table",
12+
"sync:sponsors": "pnpm --filter fetch-sponsors run build sponsors",
13+
"sync:contributors": "pnpm --filter fetch-sponsors run build contributors",
1214
"dev": "astro dev",
1315
"format": "prettier -w --cache --plugin prettier-plugin-astro .",
1416
"format:check": "prettier -c --cache --plugin prettier-plugin-astro .",
@@ -24,27 +26,28 @@
2426
"dependencies": {
2527
"@astrojs/markdown-remark": "^6.3.2",
2628
"@astrojs/rss": "^4.0.12",
27-
"@astrojs/starlight": "0.34.5",
29+
"@astrojs/starlight": "0.36.0",
2830
"@lunariajs/core": "^0.1.1",
2931
"@lunariajs/starlight": "^0.1.1",
3032
"@types/json-schema": "^7.0.15",
31-
"astro": "^5.11.0",
33+
"astro": "^5.15.9",
3234
"astro-d2": "^0.8.0",
3335
"astro-feelback": "^0.3.4",
3436
"astrojs-service-worker": "^2.0.0",
35-
"jsdom": "^26.1.0",
37+
"jsdom": "^27.0.0",
3638
"prettier": "^3.2.5",
3739
"prettier-plugin-astro": "^0.14.1",
3840
"rehype-autolink-headings": "^7.1.0",
3941
"sass": "^1.89.0",
40-
"sharp": "^0.33.5",
42+
"sharp": "^0.34.0",
4143
"shiki": "^3.0.0",
4244
"starlight-blog": "^0.24.0",
4345
"starlight-sidebar-topics": "^0.6.0",
44-
"starlight-links-validator": "^0.17.0"
46+
"starlight-links-validator": "^0.18.0"
4547
},
46-
"packageManager": "pnpm@10.13.1",
48+
"minimumReleaseAge": 4320,
49+
"packageManager": "pnpm@10.24.0",
4750
"engines": {
48-
"pnpm": "^10.0.0"
51+
"pnpm": "^10.16.0"
4952
}
5053
}

0 commit comments

Comments
 (0)