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.

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

✨ chore: update Rust edition to 2024 #131

Merged
merged 4 commits into from
Mar 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 9 additions & 7 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@
{
"name": "Tauri",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/universal:2",
"features": {
"ghcr.io/michidk/devcontainers-features/bun:1": {},
"ghcr.io/devcontainers/features/desktop-lite:1": {},
"ghcr.io/devcontainers/features/rust:1": {}
}
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",

// Use 'mounts' to make the cargo cache persistent in a Docker Volume.
// "mounts": [
Expand All @@ -20,7 +15,14 @@
// ]

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
"features": {
"ghcr.io/prulloac/devcontainer-features/bun:1": {},
"ghcr.io/devcontainers/features/desktop-lite:1": {},
"ghcr.io/devcontainers/features/rust:1": {},
"ghcr.io/devcontainers-extra/features/apt-packages:1": {
"packages": "libwebkit2gtk-4.1-dev,build-essential,file,libxdo-dev,libssl-dev,libayatana-appindicator3-dev,librsvg2-dev"
}
}

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
Expand Down
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

[//]:[![Stars](https://img.shields.io/github/stars/AR10Dev/tauri-solid-ts-tailwind-vite?style=social)](https://github.com/AR10Dev/tauri-solid-ts-tailwind-vite)
[![Rust](https://img.shields.io/badge/Rust-black?style=for-the-badge&logo=rust&logoColor=#E57324)](https://github.com/AR10Dev/tauri-solid-ts-tailwind-vite)
[![Typescript](https://img.shields.io/badge/TypeScript-007ACC?style=for-the-badge&logo=typescript&logoColor=white)](https://AR10Dev/tauri-solid-ts-tailwind-vite)
[![Typescript](https://img.shields.io/badge/TypeScript-007ACC?style=for-the-badge&logo=typescript&logoColor=white)](https://github.com/AR10Dev/tauri-solid-ts-tailwind-vite)
[![Solid JS](https://img.shields.io/badge/SolidJS-2C4F7C?style=for-the-badge&logo=solid&logoColor=white)](https://github.com/AR10Dev/tauri-solid-ts-tailwind-vite)
[![Tailwind CSS](https://img.shields.io/badge/Tailwind_CSS-38B2AC?style=for-the-badge&logo=tailwind-css&logoColor=white)](https://github.com/AR10Dev/tauri-solid-ts-tailwind-vite)
[![Vite](https://img.shields.io/badge/Vite-646CFF?style=for-the-badge&logo=vite&logoColor=white)](https://github.com/AR10Dev/tauri-solid-ts-tailwind-vite)
[![Tauri](https://img.shields.io/badge/Tauri-24C8D8?style=for-the-badge&logo=tauri&logoColor=white)](https://github.com/AR10Dev/tauri-solid-ts-tailwind-vite)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg?style=for-the-badge)](https://github.com/AR10Dev/tauri-solid-ts-tailwind-vite)

A starter template for [Tauri](https://tauri.app) + [Solid](https://solidjs.com) App that comes preconfigured with [Vite](https://vitejs.dev),
[TypeScript](https://typescriptlang.org), [Tailwind CSS](https://tailwindcss.com), [ESLint](https://eslint.org), [Prettier](https://prettier.io) and HMR (Hot Module Replacement).
Expand Down Expand Up @@ -82,7 +87,7 @@ It correctly bundles Solid in production mode and optimizes the binary for the b
🎉 Congratulations, your app is ready to be release!

## Custom App Icon
To generate your custom app icon you can follow this [guide](https://v2.tauri.app/reference/cli/#icon).<br>
To generate your custom app icon you can follow this [guide](https://tauri.app/reference/cli/#icon).<br>
Your new app icons will be located in `src-tauri/icons/` and remeber to update the `icon` field in `src-tauri/tauri.conf.json` with all your new icon path names.<br>

## Customize the tauri.conf.json
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["AR10"]
license = "MIT"
repository = "https://github.com/AR10Dev/tauri-solid-ts-tailwind-vite"
default-run = "app"
edition = "2021"
edition = "2024"

[lib]
# The `_lib` suffix may seem redundant but it is necessary
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/build.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fn main() {
tauri_build::build()
tauri_build::build()
}
20 changes: 10 additions & 10 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#[cfg_attr(mobile, tauri::mobile_entry_point)]
pub fn run() {
#[cfg(debug_assertions)] // only enable instrumentation in development builds
let devtools = tauri_plugin_devtools::init();
#[cfg(debug_assertions)] // only enable instrumentation in development builds
let devtools = tauri_plugin_devtools::init();

let mut builder = tauri::Builder::default();
let mut builder = tauri::Builder::default();

#[cfg(debug_assertions)]
#[cfg(debug_assertions)]
{
builder = builder.plugin(devtools);
}

builder
// .plugin( /* Add your Tauri plugin here */ )
// Add your commands here that you will call from your JS code
// .invoke_handler(tauri::generate_handler![ /* Add your commands here */ ])
.run(tauri::generate_context!())
.expect("error while running tauri application");
builder
// .plugin( /* Add your Tauri plugin here */ )
// Add your commands here that you will call from your JS code
// .invoke_handler(tauri::generate_handler![ /* Add your commands here */ ])
.run(tauri::generate_context!())
.expect("error while running tauri application");
}