Skip to content

Commit 4b348a8

Browse files
luckmerluckmer
authored
Merge pull request #50 from EyeTrackVR/tauri-v2
Tauri v2
2 parents 6d38b98 + ca05e24 commit 4b348a8

Some content is hidden

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

68 files changed

+4183
-11584
lines changed

‎.storybook/main.ts‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
import type { StorybookConfig } from 'storybook-solidjs-vite';
1+
import type { StorybookConfig } from 'storybook-solidjs-vite'
22

33
const config: StorybookConfig = {
4-
"stories": [
5-
"../src/**/*.mdx",
6-
"../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"
7-
],
8-
"addons": [
9-
"@storybook/addon-docs"
10-
],
11-
"framework": {
12-
"name": "storybook-solidjs-vite",
13-
"options": {}
14-
}
15-
};
16-
export default config;
4+
stories: ['../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
5+
addons: ['@storybook/addon-docs'],
6+
framework: {
7+
name: 'storybook-solidjs-vite',
8+
options: {},
9+
},
10+
}
11+
export default config

‎.vscode/extensions.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
{
2-
"recommendations": [
3-
"tauri-apps.tauri-vscode",
4-
"rust-lang.rust-analyzer",
5-
"esbenp.prettier-vscode"
6-
]
2+
"recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
73
}

‎README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,26 @@ This repo includes:
1717
## Usage
1818

1919
> [!WARNING]\
20-
This project uses `pnpm` by default, and utilizes `pnpm workspaces`. If you do not have `pnpm` installed, you can install it with `npm install -g pnpm`.
20+
> This project uses `pnpm` by default, and utilizes `pnpm workspaces`. If you do not have `pnpm` installed, you can install it with `npm install -g pnpm`.
2121
2222
You _can_ use `yarn` or `npm`, however, _you_ will need to modify the project to remove the `pnpm` specific commands and workspace.
2323

2424
## Setup
25+
2526
### Step 1 - setup node environment
2627

2728
```bash
2829
pnpm run setup
2930
```
31+
3032
### Step 2 - setting up the backend binary
3133

3234
To actually compile the project, you'll also need a binary of the ETVR backend from [here]().
3335

34-
Clone the project, follow its readme to set it up and build the binary.
36+
Clone the project, follow its readme to set it up and build the binary.
3537
Once done, copy the result into [backend_bin](/src-tauri/backend_bin) and rename it to `ETVR-<target-triple>`
3638

37-
The target triple can be obtained by running
39+
The target triple can be obtained by running
3840

3941
```bash
4042
rustc -Vv
@@ -77,7 +79,7 @@ Uses `Prettier` and the above `pnpm lint` command to lint and then format all in
7779

7880
## Development
7981

80-
This project follows the architecture Tauri laid down - `Tauri Plugins` and commands, to communicate with the hardware.
82+
This project follows the architecture Tauri laid down - `Tauri Plugins` and commands, to communicate with the hardware.
8183
These plugins are located in the [`src-tauri/src/lib`](/src-tauri/src/lib) folder.
8284

8385
## Deployment

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<body>
4545
<noscript>You need to enable JavaScript to run this app.</noscript>
4646
<div class="main-div" id="root" />
47-
<script type="module" src="./src/main.tsx"></script>
47+
<script type="module" src="./src/index.tsx"></script>
4848
<script type="text/javascript" data-sqs-type="imageloader-bootstrapper">
4949
;(function () {
5050
if (window.ImageLoader) {

‎package.json‎

Lines changed: 39 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,13 @@
1212
"test": "vitest run",
1313
"test:watch": "vitest",
1414
"serve": "vite preview",
15-
"setup": "pnpm install && pnpm run specta:post-install",
15+
"setup": "pnpm install",
1616
"tauri:dev": "tauri dev",
1717
"tauri:dev:release": "tauri dev --release",
1818
"tauri:build": "tauri build",
1919
"tauri:build:dev": "tauri build --debug",
2020
"tauri:update": "cd src-tauri && cargo update && cargo upgrade",
2121
"tauri:clean": "cd src-tauri && cargo clean",
22-
"specta:post-install": "pnpm run specta:gen && pnpm run specta:build",
23-
"specta:build": "pnpm --stream -r specta:build",
24-
"specta:gen": "pnpm --stream -r specta:gen",
2522
"docs": "jsdoc -c jsdoc.conf.json",
2623
"lint": "eslint --ext .js,.ts,.jsx,.tsx src",
2724
"format": "pnpm run lint --fix & pnpm prettier --write \"src/**/*.{js,jsx,ts,tsx}\"",
@@ -30,74 +27,48 @@
3027
"storybook": "storybook dev -p 6006",
3128
"build-storybook": "storybook build"
3229
},
33-
"devDependencies": {
34-
"@babel/core": "^7.26.0",
35-
"@babel/preset-env": "^7.26.0",
36-
"@storybook/addon-docs": "9.1.10",
37-
"@tailwindcss/forms": "^0.5.10",
38-
"@tauri-apps/api": "1.6.0",
39-
"@tauri-apps/cli": "1.6.3",
40-
"@types/lodash": "^4.17.21",
41-
"@types/node": "^22.10.7",
42-
"@typescript-eslint/eslint-plugin": "^8.20.0",
43-
"@typescript-eslint/parser": "^8.20.0",
44-
"autoprefixer": "^10.4.20",
45-
"babel-loader": "^9.2.1",
46-
"better-docs": "^2.7.3",
47-
"daisyui": "4.6.0",
48-
"eslint": "^9.18.0",
49-
"eslint-config-google": "^0.14.0",
50-
"eslint-config-prettier": "^10.0.1",
51-
"eslint-import-resolver-typescript": "^3.7.0",
52-
"eslint-plugin-autofix": "^2.2.0",
53-
"eslint-plugin-import": "^2.31.0",
54-
"eslint-plugin-solid": "^0.14.5",
55-
"eslint-plugin-storybook": "9.1.10",
56-
"https-localhost": "^4.7.1",
57-
"jsdoc": "^4.0.4",
58-
"jsdom": "^27.0.0",
59-
"postcss": "^8.5.1",
60-
"postcss-import": "^16.1.0",
61-
"prettier": "^3.4.2",
62-
"storybook": "9.1.10",
63-
"storybook-solidjs-vite": "9.0.3",
64-
"tailwindcss": "^3.4.17",
65-
"typescript": "^5.7.3",
66-
"vite": "^6.0.7",
67-
"vite-plugin-solid": "^2.11.0",
68-
"vitest": "^3.2.4"
69-
},
7030
"dependencies": {
71-
"@kobalte/core": "^0.13.7",
7231
"@kobalte/tailwindcss": "^0.9.0",
73-
"@optimize-lodash/rollup-plugin": "^5.0.0",
74-
"@solid-primitives/i18n": "^2.1.1",
75-
"@solid-primitives/map": "^0.5.0",
76-
"@solid-primitives/refs": "^1.0.8",
77-
"@solidjs/meta": "^0.29.4",
78-
"@solidjs/router": "^0.15.3",
79-
"@stitches/core": "^1.2.8",
80-
"@tailwindcss/typography": "^0.5.16",
32+
"@optimize-lodash/rollup-plugin": "^6.0.0",
33+
"@solidjs/router": "^0.15.4",
34+
"@storybook/addon-docs": "^10.2.8",
35+
"@tailwindcss/forms": "^0.5.11",
36+
"@tailwindcss/typography": "^0.5.19",
37+
"@tauri-apps/api": "^2",
38+
"@tauri-apps/plugin-clipboard-manager": "^2.3.2",
39+
"@tauri-apps/plugin-fs": "^2.4.5",
40+
"@tauri-apps/plugin-http": "~2",
41+
"@tauri-apps/plugin-log": "~2",
42+
"@tauri-apps/plugin-notification": "~2",
43+
"@tauri-apps/plugin-opener": "^2",
44+
"@tauri-apps/plugin-store": "~2",
45+
"@tauri-apps/plugin-upload": "~2.4.0",
8146
"@testing-library/jest-dom": "^6.9.1",
82-
"babel-preset-solid": "^1.9.3",
47+
"autoprefixer": "^10.4.24",
8348
"class-variance-authority": "^0.7.1",
84-
"esptool-js": "^0.5.4",
85-
"fp-ts": "^2.16.9",
86-
"highlight.js": "^11.11.1",
87-
"lodash": "^4.17.21",
88-
"solid-form-handler": "^1.2.3",
49+
"daisyui": "^5.5.18",
50+
"eslint-config-google": "^0.14.0",
51+
"lodash": "^4.17.23",
52+
"postcss": "^8.5.6",
53+
"postcss-import": "^16.1.1",
54+
"prettier": "^3.8.1",
8955
"solid-headless": "^0.13.1",
90-
"solid-i18n": "^1.1.0",
91-
"solid-icons": "^1.1.0",
92-
"solid-js": "^1.9.4",
93-
"solid-spinner": "^0.2.0",
94-
"solid-transition-group": "^0.2.3",
95-
"solidjs-icons": "^1.0.12",
56+
"solid-icons": "^1.2.0",
57+
"solid-js": "^1.9.3",
58+
"solid-sonner": "^0.2.8",
9659
"solidjs-use": "^2.3.0",
97-
"tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log",
98-
"tauri-plugin-request-client": "workspace:*",
99-
"tauri-plugin-serialport-api": "github:deid84/tauri-plugin-serialport#v1.0.0",
100-
"tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store",
101-
"tauri-plugin-upload-api": "github:tauri-apps/tauri-plugin-upload"
60+
"storybook": "^10.2.8",
61+
"storybook-solidjs-vite": "^10.0.9",
62+
"tailwindcss": "3.4.17",
63+
"vitest": "^4.0.18"
64+
},
65+
"devDependencies": {
66+
"@tauri-apps/cli": "^2",
67+
"@types/lodash": "^4.17.21",
68+
"@types/node": "^25.2.3",
69+
"jsdom": "^28.1.0",
70+
"typescript": "~5.6.2",
71+
"vite": "^6.0.3",
72+
"vite-plugin-solid": "^2.11.0"
10273
}
103-
}
74+
}

0 commit comments

Comments
 (0)