Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump tauri from 2.0.4 to 2.0.5 in /src-tauri #389

Merged
merged 7 commits into from
Dec 18, 2024
Merged

Bump tauri from 2.0.4 to 2.0.5 in /src-tauri #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7b82cc7
some refactoring
Puyodead1 Oct 15, 2024
7c51117
Update Cargo.lock
Puyodead1 Oct 15, 2024
cc260c3
fix issues with observables not updating
Puyodead1 Oct 16, 2024
7160e48
fix an error
Puyodead1 Oct 16, 2024
5c40164
stuff
Puyodead1 Oct 16, 2024
b0eb887
Update ChannelListItem.tsx
Puyodead1 Oct 16, 2024
8232e66
Bump tauri from 2.0.4 to 2.0.5 in /src-tauri
dependabot[bot] Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
node_modules
.pnp
.pnp.js

# testing
/coverage
coverage

# production
/dist
dist

# misc
.DS_Store
Expand All @@ -22,3 +22,5 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
src-tauri/.cargo/config.toml

.swc/
1 change: 1 addition & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
{
"references.preferredLocation": "view"
}
10 changes: 7 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"@mattjennings/react-modal-stack": "^1.0.4",
"@mdi/js": "^7.4.47",
"@mdi/react": "^1.6.1",
"@mui/material": "^6.1.3",
"@originjs/vite-plugin-commonjs": "^1.0.3",
"@rollup/plugin-replace": "^6.0.1",
"@spacebarchat/spacebar-api-types": "0.37.51",
Expand All @@ -35,6 +34,7 @@
"@types/react-measure": "^2.0.12",
"@types/react-portal": "^4.0.7",
"@uidotdev/usehooks": "^2.4.1",
"@vitejs/plugin-react-swc": "^3.7.1",
"classnames": "^2.5.1",
"csstype": "^3.1.3",
"dayjs": "^1.11.13",
Expand Down Expand Up @@ -75,6 +75,7 @@
},
"devDependencies": {
"@craco/craco": "^7.1.0",
"@swc/plugin-styled-components": "^3.0.3",
"@tauri-apps/cli": "2.0.2",
"@types/jest": "^29.5.13",
"@types/loadable__component": "^5.13.9",
Expand All @@ -92,6 +93,7 @@
"eslint": "^8.57.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.12",
"source-map-explorer": "^2.5.3",
"typescript": "^5.6.3",
"vite": "^5.4.8",
"vite-plugin-chunk-split": "^0.5.0",
Expand All @@ -108,12 +110,14 @@
"url": "git+https://github.com/spacebarchat/client.git"
},
"scripts": {
"dev": "cross-env VITE_ENV_DEV=true vite --open",
"preview": "vite preview",
"analyze": "source-map-explorer 'dist/asset/*.js'",
"build": "tsc && vite build",
"build:dev": "tsc && cross-env VITE_ENV_DEV=true vite build",
"ci:prebuild": "node scripts/tauri-version.js",
"dev": "vite",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"lint:fix": "pnpx prettier . --write",
"preview": "vite preview",
"tauri:dev": "pnpm run ci:prebuild && tauri dev",
"tauri:build": "pnpm run ci:prebuild && tauri build",
"tauri:android:dev": "pnpm run ci:prebuild && tauri android dev",
Expand Down
Loading