Skip to content

Commit 469761f

Browse files
committed
Merge remote-tracking branch 'origin/dev' into fix/remove-cargo-config
2 parents 7f2eaa5 + 70306dc commit 469761f

File tree

150 files changed

+2315
-19112
lines changed

Some content is hidden

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

150 files changed

+2315
-19112
lines changed

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[env]
2-
# workaround needed to prevent `STATUS_ENTRYPOINT_NOT_FOUND` error
2+
# workaround needed to prevent `STATUS_ENTRYPOINT_NOT_FOUND` error in tests
33
# see https://github.com/tauri-apps/tauri/pull/4383#issuecomment-1212221864
44
__TAURI_WORKSPACE__ = "true"

.changes/tauri-build.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"tauri-build": "patch:feat"
3+
---
4+
5+
Add `WindowsAttributes::new_without_app_manifest` to create `WindowsAttributes` without the default manifest.
6+

.github/workflows/fmt.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
2+
# SPDX-License-Identifier: Apache-2.0
3+
# SPDX-License-Identifier: MIT
4+
5+
name: check formatting
6+
7+
on:
8+
pull_request:
9+
10+
jobs:
11+
rustfmt:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
17+
- name: install Rust stable and rustfmt
18+
uses: dtolnay/rust-toolchain@stable
19+
with:
20+
components: rustfmt
21+
22+
- name: run cargo fmt
23+
run: cargo fmt --all -- --check
24+
25+
prettier:
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@v4
29+
- run: corepack enable
30+
- uses: actions/setup-node@v4
31+
with:
32+
node-version: 'lts/*'
33+
cache: 'pnpm'
34+
- run: pnpm i --frozen-lockfile
35+
- run: pnpm format:check
36+
37+
taplo:
38+
name: taplo (.toml files)
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/checkout@v4
42+
43+
- name: install Rust stable
44+
uses: dtolnay/rust-toolchain@stable
45+
46+
- name: install taplo-cli
47+
uses: taiki-e/install-action@v2
48+
with:
49+
tool: taplo-cli
50+
51+
- run: taplo fmt --check --diff

.github/workflows/lint-core.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,6 @@ concurrency:
2525
cancel-in-progress: true
2626

2727
jobs:
28-
fmt:
29-
runs-on: ubuntu-latest
30-
31-
steps:
32-
- uses: actions/checkout@v4
33-
34-
- name: install Rust stable and rustfmt
35-
uses: dtolnay/rust-toolchain@stable
36-
with:
37-
components: rustfmt
38-
39-
- name: run cargo fmt
40-
run: cargo fmt --all -- --check
41-
4228
clippy:
4329
runs-on: ubuntu-latest
4430
strategy:

.github/workflows/lint-js.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@ concurrency:
1616
cancel-in-progress: true
1717

1818
jobs:
19-
prettier:
20-
runs-on: ubuntu-latest
21-
steps:
22-
- uses: actions/checkout@v4
23-
- run: corepack enable
24-
- uses: actions/setup-node@v4
25-
with:
26-
node-version: 'lts/*'
27-
cache: 'pnpm'
28-
- run: pnpm i --frozen-lockfile
29-
- run: pnpm format:check
30-
3119
eslint:
3220
runs-on: ubuntu-latest
3321
steps:

.gitignore

Lines changed: 36 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,55 @@
1-
# Logs
2-
logs
3-
*.log
4-
npm-debug.log*
5-
yarn-debug.log*
6-
yarn-error.log*
7-
8-
# smoke-tests repo
9-
/smoke-tests
10-
11-
# Runtime data
12-
pids
13-
*.pid
14-
*.seed
15-
*.pid.lock
16-
17-
# Directory for instrumented libs generated by jscoverage/JSCover
18-
lib-cov
19-
20-
# Coverage directory used by tools like istanbul
21-
coverage
22-
23-
# nyc test coverage
24-
.nyc_output
1+
# dependency directories
2+
node_modules/
253

26-
# node-waf configuration
27-
.lock-wscript
4+
# Optional npm and yarn cache directory
5+
.npm/
6+
.yarn/
287

29-
# Compiled binary addons (http://nodejs.org/api/addons.html)
30-
build/Release
8+
# Output of 'npm pack'
9+
*.tgz
3110

32-
# Dependency directories
33-
node_modules/
34-
jspm_packages/
11+
# dotenv environment variables file
12+
.env
3513

36-
# Typescript v1 declaration files
37-
typings/
14+
# .vscode workspace settings file
15+
.vscode/settings.json
3816

39-
# Optional npm cache directory
40-
.npm
17+
# npm, yarn and bun lock files
18+
package-lock.json
19+
yarn.lock
20+
bun.lockb
4121

42-
# Optional yarn cache directory
43-
.yarn
22+
# rust compiled folders
23+
target/
4424

45-
# Optional eslint cache
46-
.eslintcache
25+
# test video for streaming example
26+
streaming_example_test_video.mp4
4727

48-
# Optional REPL history
49-
.node_repl_history
28+
# examples /gen directory
29+
/examples/**/gen/
5030

51-
# Output of 'npm pack'
52-
*.tgz
31+
# old cli directories
32+
/tooling/cli.js
33+
/tooling/cli.rs
5334

54-
# Yarn Integrity file
55-
.yarn-integrity
35+
# logs
36+
logs
37+
*.log
38+
npm-debug.log*
39+
yarn-debug.log*
40+
yarn-error.log*
5641

57-
# dotenv environment variables file
58-
.env
42+
# runtime data
43+
pids
44+
*.pid
45+
*.seed
46+
*.pid.lock
5947

48+
# miscellaneous
6049
/.vs
6150
.DS_Store
6251
.Thumbs.db
6352
*.sublime*
6453
.idea
6554
debug.log
66-
package-lock.json
67-
.vscode/settings.json
68-
*/.vscode/
69-
proptest-regressions/
7055
TODO.md
71-
72-
# rust compiled folders
73-
target
74-
75-
# lock for libs
76-
#/Cargo.lock Committed to prevent msrv checks from failing
77-
/tooling/bench/tests/Cargo.lock
78-
/yarn.lock
79-
80-
# ignore frida handlers
81-
__handlers__/
82-
83-
# benches
84-
gh-pages
85-
test_video.mp4
86-
87-
# old cli directories
88-
/tooling/cli.js
89-
/tooling/cli.rs

.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"recommendations": [
3+
"rust-lang.rust-analyzer",
34
"EditorConfig.EditorConfig",
45
"esbenp.prettier-vscode",
5-
"rust-lang.rust-analyzer",
6+
"tamasfe.even-better-toml"
67
]
78
}

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ members = [
1616
# integration tests
1717
"core/tests/restart",
1818
"core/tests/acl",
19+
20+
# examples
21+
"examples/file-associations/src-tauri",
22+
"examples/api/src-tauri",
1923
]
2024

2125
exclude = [

core/tauri-acl-schema/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55
publish = false
66

77
[build-dependencies]
8-
tauri-utils = { features = [ "schema" ], path = "../tauri-utils" }
8+
tauri-utils = { features = ["schema"], path = "../tauri-utils" }
99
schemars = { version = "0.8", features = ["url", "preserve_order"] }
1010
serde = { version = "1.0", features = ["derive"] }
1111
serde_json = "1.0"

0 commit comments

Comments
 (0)