Skip to content

Commit e245ad7

Browse files
amrbashiramrbashir
committed
chore: switch formatting to oxfmt
1 parent b805cb7 commit e245ad7

24 files changed

Lines changed: 635 additions & 432 deletions

‎.editorconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ root = true
22

33
[*]
44
charset = utf-8
5-
indent_style = space
6-
indent_size = 2
5+
indent_style = tab
6+
indent_size = 4
77
end_of_line = lf
88
insert_final_newline = true
99
trim_trailing_whitespace = true
10+
max_line_length = 100

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- run: pnpm install
2121
- run: pnpm build
2222
- run: pnpm ts:check
23-
- run: pnpm format:check
23+
- run: pnpm fmt:check
2424
- name: install system dependencies
2525
run: |
2626
sudo apt-get update

‎.oxfmtrc.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"$schema": "./node_modules/oxfmt/configuration_schema.json",
3+
"semi": true,
4+
"singleQuote": false
5+
}

‎.prettierrc‎

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

‎CHANGELOG.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
# [3.1.0](https://github.com/amrbashir/vite-plugin-tauri/compare/v3.1.0...v3.0.2) (2022-10-1)
2121

2222
- Add a default export to the plugin which allows two styles of importing:
23-
2423
- Named export (current):
2524
```ts
2625
import { tauri } from "vite-plugin-tauri";

‎README.md‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ import { defineConfig } from "vite";
2727
import tauri from "vite-plugin-tauri"; // 1. import the plugin
2828

2929
export default defineConfig({
30-
plugins: [
31-
tauri(), // 2. add it to the plugins list
32-
],
33-
34-
// 3. optional but recommended
35-
clearScreen: false,
36-
server: {
37-
open: false,
38-
},
30+
plugins: [
31+
tauri(), // 2. add it to the plugins list
32+
],
33+
34+
// 3. optional but recommended
35+
clearScreen: false,
36+
server: {
37+
open: false,
38+
},
3939
});
4040
```
4141

@@ -65,15 +65,15 @@ your tauri app that won't conflict with your normal vite web development flow.
6565
import tauri from "vite-plugin-tauri";
6666

6767
export default defineConfig(
68-
mergeConfig(baseViteConfig, {
69-
plugins: [tauri()],
70-
71-
// optional but recommended
72-
clearScreen: false,
73-
server: {
74-
open: false,
75-
},
76-
}),
68+
mergeConfig(baseViteConfig, {
69+
plugins: [tauri()],
70+
71+
// optional but recommended
72+
clearScreen: false,
73+
server: {
74+
open: false,
75+
},
76+
}),
7777
);
7878
```
7979

‎example/index.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!doctype html>
22
<html lang="en">
3-
<head>
4-
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Vite + Vue</title>
8-
</head>
3+
<head>
4+
<meta charset="UTF-8" />
5+
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<title>Vite + Vue</title>
8+
</head>
99

10-
<body>
11-
<div id="app"></div>
12-
<script type="module" src="/src/main.js"></script>
13-
</body>
10+
<body>
11+
<div id="app"></div>
12+
<script type="module" src="/src/main.js"></script>
13+
</body>
1414
</html>

‎example/package.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
2-
"name": "vite-project",
3-
"private": true,
4-
"version": "0.0.0",
5-
"type": "module",
6-
"scripts": {
7-
"dev": "vite",
8-
"build": "vite build",
9-
"dev:tauri": "vite --config vite.config.tauri.js",
10-
"build:tauri": "vite build --config vite.config.tauri.js",
11-
"preview": "vite preview"
12-
},
13-
"dependencies": {
14-
"vue": "^3.5.13"
15-
},
16-
"devDependencies": {
17-
"@tauri-apps/cli": "^2.1.0",
18-
"@vitejs/plugin-vue": "^5.2.1",
19-
"typescript": "^5.7.2",
20-
"vite": "^6.0.5",
21-
"vite-plugin-tauri": "workspace:^"
22-
}
2+
"name": "vite-project",
3+
"version": "0.0.0",
4+
"private": true,
5+
"type": "module",
6+
"scripts": {
7+
"dev": "vite",
8+
"build": "vite build",
9+
"dev:tauri": "vite --config vite.config.tauri.js",
10+
"build:tauri": "vite build --config vite.config.tauri.js",
11+
"preview": "vite preview"
12+
},
13+
"dependencies": {
14+
"vue": "^3.5.13"
15+
},
16+
"devDependencies": {
17+
"@tauri-apps/cli": "^2.1.0",
18+
"@vitejs/plugin-vue": "^5.2.1",
19+
"typescript": "^5.7.2",
20+
"vite": "^6.0.5",
21+
"vite-plugin-tauri": "workspace:^"
22+
}
2323
}

‎example/src-tauri/build.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
fn main() {
2-
tauri_build::build()
2+
tauri_build::build()
33
}

‎example/src-tauri/capabilities/default.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"identifier": "default",
3-
"local": true,
4-
"windows": ["main"],
5-
"permissions": ["core:default"]
2+
"identifier": "default",
3+
"local": true,
4+
"windows": ["main"],
5+
"permissions": ["core:default"]
66
}

0 commit comments

Comments
 (0)