Skip to content

Commit 5ff7099

Browse files
lucasfernoglucasfernog
committed
Merge remote-tracking branch 'origin/v2' into biometric-docs
2 parents a30b0ec + 20063e2 commit 5ff7099

File tree

124 files changed

+6036
-2336
lines changed

Some content is hidden

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

124 files changed

+6036
-2336
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#### Description
44
<!-- Translators, try to follow this pattern when naming your PRs:
5-
"i18(language code): (short description)" -->
5+
"i18n(language code): (short description)" -->
66
- What does this PR change? Give us a brief description. <!-- If it's an update try adding the commits as reference -->
77
- Closes # <!-- Add an issue number if this PR will close it or remove it. -->
88

‎.github/workflows/assign.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: 'Auto Assign'
2+
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
7+
jobs:
8+
auto_assign:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Auto-assign PR to author
12+
env:
13+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14+
# The gh cli currently does not consider the pr author an assignable user if they aren't part of the org
15+
run: gh api -X POST /repos/tauri-apps/tauri-docs/issues/${{ github.event.pull_request.number }}/assignees -f "assignees[]=${{ github.event.pull_request.user.login }}"
16+
#run: gh pr edit ${{ github.event.pull_request.number }} --add-assignee ${{ github.event.pull_request.user.login }} -R ${{ github.repository }}

‎.github/workflows/check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Adapted from https://github.com/withastro/starlight/blob/main/.github/workflows/format.yml
22

3-
name: Check formatting
3+
name: 'Check formatting'
44

55
on:
66
pull_request:

‎.github/workflows/congrats.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Congrats
1+
name: 'Congrats'
22

33
on:
44
push:

‎.github/workflows/labeler.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name: 'Pull Request Labeler'
2+
23
on:
3-
- pull_request_target
4+
pull_request_target:
45

56
jobs:
6-
triage:
7+
add_labels:
78
permissions:
89
contents: read
910
pull-requests: write

‎.github/workflows/priority.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: 'Priority Updater'
2+
3+
on:
4+
issues:
5+
types: [opened]
6+
pull_request_target:
7+
types: [opened]
8+
9+
jobs:
10+
set_statuses:
11+
runs-on: ubuntu-latest
12+
if: ${{ !contains(github.event.issue.labels.*.name, 'manual') && !contains(github.event.pull_request.labels.*.name, 'manual') }}
13+
steps:
14+
- name: Get project data
15+
env:
16+
GH_TOKEN: ${{ secrets.TEST_TOKEN }}
17+
run: |
18+
echo "PROJECT_ID=$(gh project view 27 --owner tauri-apps --format json --jq '.id')" >> $GITHUB_ENV
19+
gh project field-list 27 --owner tauri-apps --format json > project_data.json
20+
echo 'PRIORITY_FIELD_ID='$(jq '.fields[] | select(.name== "Priority") | .id' project_data.json) >> $GITHUB_ENV
21+
echo 'LOW_PRIORITY_ID='$(jq '.fields[] | select(.name== "Priority") | .options[] | select(.name=="Low") | .id' project_data.json) >> $GITHUB_ENV
22+
echo 'MEDIUM_PRIORITY_ID='$(jq '.fields[] | select(.name== "Priority") | .options[] | select(.name=="Medium") | .id' project_data.json) >> $GITHUB_ENV
23+
echo 'HIGH_PRIORITY_ID='$(jq '.fields[] | select(.name== "Priority") | .options[] | select(.name=="High") | .id' project_data.json) >> $GITHUB_ENV
24+
echo 'CRITICAL_PRIORITY_ID='$(jq '.fields[] | select(.name== "Priority") | .options[] | select(.name=="Critical") | .id' project_data.json) >> $GITHUB_ENV
25+
26+
- name: Default priority
27+
run: |
28+
echo 'PRIORITY_ID='${{ env.LOW_PRIORITY_ID }} >> $GITHUB_ENV
29+
30+
- name: Add project item / Get item id
31+
env:
32+
GH_TOKEN: ${{ secrets.TEST_TOKEN }}
33+
run: |
34+
echo "ITEM_ID=$(gh project item-add 27 --owner tauri-apps --url https://github.com/tauri-apps/tauri-docs/issues/${{ github.event.pull_request.number || github.event.issue.number }} --format json --jq '.id')" >> $GITHUB_ENV
35+
36+
- name: Set fields
37+
env:
38+
GH_TOKEN: ${{ secrets.TEST_TOKEN }}
39+
run: |
40+
gh project item-edit --id ${{ env.ITEM_ID }} --project-id ${{ env.PROJECT_ID }} --field-id ${{ env.PRIORITY_FIELD_ID }} --single-select-option-id ${{ env.PRIORITY_ID }}

‎.github/workflows/status.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: 'Status Updater'
2+
3+
on:
4+
issues:
5+
pull_request_target:
6+
7+
jobs:
8+
set_statuses:
9+
runs-on: ubuntu-latest
10+
if: ${{ !contains(github.event.issue.labels.*.name, 'manual') && !contains(github.event.pull_request.labels.*.name, 'manual') }}
11+
steps:
12+
- name: Get project data
13+
env:
14+
GH_TOKEN: ${{ secrets.TEST_TOKEN }}
15+
run: |
16+
echo "PROJECT_ID=$(gh project view 27 --owner tauri-apps --format json --jq '.id')" >> $GITHUB_ENV
17+
gh project field-list 27 --owner tauri-apps --format json > project_data.json
18+
echo 'STATUS_FIELD_ID='$(jq '.fields[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
19+
echo 'BACKLOG_STATUS_ID='$(jq '.fields[] | select(.name== "Status") | .options[] | select(.name=="🪵 Backlog") | .id' project_data.json) >> $GITHUB_ENV
20+
echo 'READY_STATUS_ID='$(jq '.fields[] | select(.name== "Status") | .options[] | select(.name=="💪 Ready") | .id' project_data.json) >> $GITHUB_ENV
21+
echo 'IN_PROGRESS_STATUS_ID='$(jq '.fields[] | select(.name== "Status") | .options[] | select(.name=="🏗️ In progress") | .id' project_data.json) >> $GITHUB_ENV
22+
echo 'IN_REVIEW_STATUS_ID='$(jq '.fields[] | select(.name== "Status") | .options[] | select(.name=="📋 In review") | .id' project_data.json) >> $GITHUB_ENV
23+
echo 'DONE_STATUS_ID='$(jq '.fields[] | select(.name== "Status") | .options[] | select(.name=="✅ Done") | .id' project_data.json) >> $GITHUB_ENV
24+
25+
- name: Add project item / Get item id
26+
env:
27+
GH_TOKEN: ${{ secrets.TEST_TOKEN }}
28+
run: echo "ITEM_ID=$(gh project item-add 27 --owner tauri-apps --url https://github.com/tauri-apps/tauri-docs/issues/${{ github.event.pull_request.number || github.event.issue.number }} --format json --jq '.id')" >> $GITHUB_ENV
29+
30+
#===== PULL REQUESTS =====#
31+
- name: Is In progress
32+
if: ${{ github.event_name == 'pull_request_target' && (github.event.pull_request.draft == true || github.event.pull_request.mergeable == false) }}
33+
run: echo 'STATUS_ID='${{ env.IN_PROGRESS_STATUS_ID }} >> $GITHUB_ENV
34+
35+
- name: Is In review
36+
if: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.draft == false && github.event.pull_request.mergeable == true }}
37+
run: echo 'STATUS_ID='${{ env.IN_REVIEW_STATUS_ID }} >> $GITHUB_ENV
38+
#===== END PULL REQUESTS =====#
39+
40+
#===== ISSUES =====#
41+
- name: Is Ready
42+
if: ${{ github.event_name == 'issues' && (github.event.issue.labels[0] != null && github.event.issue.milestone != null) }}
43+
run: echo 'STATUS_ID='${{ env.READY_STATUS_ID }} >> $GITHUB_ENV
44+
45+
- name: Is In progress
46+
if: ${{ github.event_name == 'issues' && (github.event.issue.labels[0] != null && github.event.issue.milestone != null && github.event.issue.assignees[0] != null) }}
47+
run: echo 'STATUS_ID='${{ env.IN_PROGRESS_STATUS_ID }} >> $GITHUB_ENV
48+
49+
- name: Is In review
50+
if: ${{ github.event_name == 'issues' && (github.event.issue.labels[0] != null && github.event.issue.pull_request.merged_at != null) }}
51+
run: echo 'STATUS_ID='${{ env.IN_REVIEW_STATUS_ID }} >> $GITHUB_ENV
52+
53+
- name: Is Backlog
54+
if: ${{ github.event_name == 'issues' && (github.event.issue.labels[0] == null || github.event.issue.milestone == null || contains(github.event.issue.labels.*.name, 'upstream') || contains(github.event.issue.labels.*.name, 'discuss')) }}
55+
run: echo 'STATUS_ID='${{ env.BACKLOG_STATUS_ID }} >> $GITHUB_ENV
56+
#===== END ISSUES =====#
57+
58+
- name: Set fields
59+
env:
60+
GH_TOKEN: ${{ secrets.TEST_TOKEN }}
61+
run: gh project item-edit --id ${{ env.ITEM_ID }} --project-id ${{ env.PROJECT_ID }} --field-id ${{ env.STATUS_FIELD_ID }} --single-select-option-id ${{ env.STATUS_ID }}

‎astro.config.mjs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ export default defineConfig({
7575
},
7676
}),
7777
starlightBlog({ authors }),
78-
starlightLinksValidator({ errorOnRelativeLinks: false }),
78+
starlightLinksValidator({
79+
errorOnRelativeLinks: false,
80+
exclude: ['/plugin/*/#default-permission', '/plugin/*/#permission-table'],
81+
}),
7982
],
8083
title: 'Tauri',
8184
description: 'The cross-platform app building toolkit',
@@ -304,7 +307,7 @@ export default defineConfig({
304307
},
305308
{
306309
label: 'Rust (docs.rs)',
307-
link: 'https://docs.rs/tauri/2.0.0-beta.22/tauri/index.html',
310+
link: 'https://docs.rs/tauri/2.0.0-rc/tauri/index.html',
308311
},
309312
],
310313
},

‎package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
"build:references": "pnpm --filter js-api-generator run build",
1616
"build:releases": "pnpm --filter releases-generator run build",
1717
"build:config": "pnpm --filter config-generator run build",
18+
"build:cli": "pnpm --filter cli-generator run build",
1819
"build:astro": "astro build",
1920
"build:i18n": "pnpm --filter docs-i18n-tracker run build",
20-
"build": "pnpm dev:setup && pnpm build:references && pnpm build:config && pnpm build:releases && pnpm build:astro && pnpm build:i18n",
21+
"build": "pnpm dev:setup && pnpm build:references && pnpm build:config && pnpm build:cli && pnpm build:releases && pnpm build:astro && pnpm build:i18n",
2122
"preview": "astro preview"
2223
},
2324
"dependencies": {
@@ -27,7 +28,7 @@
2728
"@lorenzo_lewis/starlight-utils": "^0.1.0",
2829
"@types/json-schema": "^7.0.15",
2930
"astro": "^4.4.4",
30-
"astro-d2": "^0.3.0",
31+
"astro-d2": "^0.4.0",
3132
"astro-feelback": "^0.3.4",
3233
"astrojs-service-worker": "^2.0.0",
3334
"jsdom": "^24.0.0",
@@ -39,9 +40,9 @@
3940
"sharp": "^0.33.2",
4041
"shiki": "^1.1.7",
4142
"starlight-blog": "^0.11.0",
42-
"starlight-links-validator": "^0.9.0"
43+
"starlight-links-validator": "^0.10.0"
4344
},
44-
"packageManager": "pnpm@9.5.0",
45+
"packageManager": "pnpm@9.6.0",
4546
"engines": {
4647
"pnpm": "^9.0.0"
4748
},

‎packages/awesome-tauri‎

0 commit comments

Comments
 (0)