Skip to content

Commit a585be7

Browse files
authored
Merge branch 'v2' into ws-patch
2 parents 3fd36ed + d467313 commit a585be7

File tree

254 files changed

+6386
-3004
lines changed

Some content is hidden

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

254 files changed

+6386
-3004
lines changed

.changes/add-total-transferred-field.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changes/config.json

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,20 @@
1414
"command": "pnpm build",
1515
"dryRunCommand": "pnpm build"
1616
},
17+
{
18+
"command": "echo '<details>\n<summary><em><h4>PNPM Publish</h4></em></summary>\n\n```'",
19+
"dryRunCommand": true,
20+
"pipe": true
21+
},
1722
{
1823
"command": "npm publish --provenance --access public",
1924
"dryRunCommand": "npm publish --provenance --access public --dry-run",
2025
"pipe": true
26+
},
27+
{
28+
"command": "echo '```\n\n</details>\n'",
29+
"dryRunCommand": true,
30+
"pipe": true
2131
}
2232
]
2333
},
@@ -56,12 +66,13 @@
5666
"dependencies": [
5767
"barcode-scanner",
5868
"biometric",
59-
"log-plugin",
69+
"log",
6070
"cli",
6171
"clipboard-manager",
6272
"dialog",
6373
"fs",
6474
"global-shortcut",
75+
"opener",
6576
"http",
6677
"nfc",
6778
"notification",
@@ -87,6 +98,7 @@
8798
"dialog-js",
8899
"fs-js",
89100
"global-shortcut-js",
101+
"opener-js",
90102
"http-js",
91103
"nfc-js",
92104
"notification-js",
@@ -168,7 +180,8 @@
168180
},
169181
"dialog-js": {
170182
"path": "./plugins/dialog",
171-
"manager": "javascript"
183+
"manager": "javascript",
184+
"dependencies": ["fs-js"]
172185
},
173186
"geolocation": {
174187
"path": "./plugins/geolocation",
@@ -186,6 +199,14 @@
186199
"path": "./plugins/global-shortcut",
187200
"manager": "javascript"
188201
},
202+
"opener": {
203+
"path": "./plugins/opener",
204+
"manager": "rust"
205+
},
206+
"opener-js": {
207+
"path": "./plugins/opener",
208+
"manager": "javascript"
209+
},
189210
"haptics": {
190211
"path": "./plugins/haptics",
191212
"manager": "rust"
@@ -201,13 +222,14 @@
201222
},
202223
"http-js": {
203224
"path": "./plugins/http",
204-
"manager": "javascript"
225+
"manager": "javascript",
226+
"dependencies": ["fs-js"]
205227
},
206228
"localhost": {
207229
"path": "./plugins/localhost",
208230
"manager": "rust"
209231
},
210-
"log-plugin": {
232+
"log": {
211233
"path": "./plugins/log",
212234
"manager": "rust"
213235
},

.changes/fix-deep-link-onopenurl-current.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changes/fix-inconsistent-webview-log-target.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changes/fs-read-dir-broken-symlink.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

.changes/localhost-custom-host-binding.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changes/readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ As you create PRs and make changes that require a version bump, please add a new
66

77
When you select the version bump required, you do _not_ need to consider dependencies. Only note the package with the actual change, and any packages that depend on that package will be bumped automatically in the process.
88

9+
**Note, that in this repository, even if only the Rust code or only the JavaScript code of a plugin changed, both packages need to be bumped with the same increment!**
10+
911
Use the following format:
1012

1113
```md

.changes/sql-allow-blocking-without-nested-runtime.md

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
2+
# SPDX-License-Identifier: Apache-2.0
3+
# SPDX-License-Identifier: MIT
4+
5+
name: check change files
6+
7+
on:
8+
pull_request:
9+
paths:
10+
- '.changes/*.md'
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
16+
jobs:
17+
check:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v4
21+
22+
- name: check change files end with .md
23+
run: |
24+
for file in .changes/*
25+
do
26+
if [[ ! "$file" =~ \.(md|json)$ ]]; then
27+
echo ".changes directory should only contain files that end with .md"
28+
echo "found an invalid file in .changes directory:"
29+
echo "$file"
30+
exit 1
31+
fi
32+
done
33+
34+
- uses: dorny/paths-filter@v3
35+
id: filter
36+
with:
37+
list-files: shell
38+
filters: |
39+
changes:
40+
- added|modified: '.changes/*.md'
41+
42+
- name: check
43+
run: node ./.scripts/ci/check-change-files.js ${{ steps.filter.outputs.changes_files }}
44+
if: ${{ steps.filter.outputs.changes == 'true' }}

.github/workflows/check-generated-files.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ jobs:
5353
- .github/workflows/check-generated-files.yml
5454
- plugins/global-shortcut/guest-js/**
5555
- plugins/global-shortcut/src/api-iife.js
56+
opener:
57+
- .github/workflows/check-generated-files.yml
58+
- plugins/opener/guest-js/**
59+
- plugins/opener/src/api-iife.js
5660
haptics:
5761
- .github/workflows/check-generated-files.yml
5862
- plugins/haptics/guest-js/**

0 commit comments

Comments
 (0)