Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolaSpadari committed Oct 8, 2024
2 parents 91e0e75 + 590a219 commit e7ba83f
Show file tree
Hide file tree
Showing 18 changed files with 9,661 additions and 12,379 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.6.0
version: 9.12.1

- name: install frontend dependencies
run: pnpm install
Expand Down
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ A spiritual successor of <a href="https://github.com/NicolaSpadari/vitauri">ViTa
Build super fast desktop applications!
</p>

>**⚠️ `nuxtor` is still a WIP**
<br />

<p float="left">
Expand Down Expand Up @@ -41,13 +39,14 @@ Build super fast desktop applications!
- Run shell commands from the app
- Send custom notifications to the client (remember to turn on/grant notifications in your computer settings!)
- Display OS related informations
- Show tray icon
- Support all Nuxt functionalities (routing/layout/middleware/modules/etc...)

## Setup

- Before running this app, you need to configure your environment with Rust. Take a look at the [Tauri docs](https://v2.tauri.app/start/prerequisites).
- This project enforces [pnpm](https://pnpm.io). In order to use another package manager you need to update `package.json` and `tauri.config.js`
- The frontend runs on the usual port `3000` of Nuxt, the Tauri server uses the port `3001`. This settings are customizable in the `nuxt.config.ts` and `tauri.config.js`.
- This project enforces [pnpm](https://pnpm.io). In order to use another package manager you need to update `package.json` and `tauri.conf.json`
- The frontend runs on the usual port `3000` of Nuxt, the Tauri server uses the port `3001`. This settings are customizable in the `nuxt.config.ts` and `tauri.conf.json`.
- Once ready, follow these commands:

```sh
Expand Down Expand Up @@ -84,10 +83,9 @@ The same Tauri bundle will generate under `src-tauri/target`, but with the abili

## Notes

- Tauri v2 is still in beta. Some things might not work, or present some bugs.
- Tauri v2 brings some big refactors, such as packages names and permission management. New permissions have to be granted under `src-tauri/capabilities/main.json`
- Tauri js functions are auto imported as-is with the help of a custom module. If another Tauri plugin is added, then the module has to be updated to support auto imports under `src/modules/tauri.ts`
- As per documentation, the Nuxt SSR must be disabled in order for Tauri to act as the backend. Still, all Nuxt goodies are still there.
- As per documentation, Nuxt SSR must be disabled in order for Tauri to act as the backend. Still, all Nuxt goodies will be functional.

## License

Expand Down
2 changes: 1 addition & 1 deletion bump.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { defineConfig } from "bumpp";

export default defineConfig({
release: "patch",
release: "prompt",
commit: false,
tag: false,
push: false,
Expand Down
11 changes: 10 additions & 1 deletion nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export default defineNuxtConfig({
"@vueuse/nuxt",
"@unocss/nuxt",
"@nuxt/icon",
"@nuxt/fonts",
"nuxt-svgo",
"@nuxt/eslint"
],
Expand Down Expand Up @@ -30,12 +31,20 @@ export default defineNuxtConfig({
experimental: {
typedPages: true
},
fonts: {
defaults: {
weights: [`${100}..${900}`]
}
},
css: [
"@unocss/reset/tailwind.css"
],
svgo: {
autoImportPath: "@/assets/"
},
icon: {
mode: "svg"
},
vite: {
clearScreen: false,
envPrefix: ["VITE_", "TAURI_"],
Expand All @@ -61,5 +70,5 @@ export default defineNuxtConfig({
standalone: false
}
},
compatibilityDate: "2024-08-01"
compatibilityDate: "2024-10-01"
});
43 changes: 22 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "nuxtor",
"type": "module",
"version": "0.0.4",
"version": "1.0.0",
"private": true,
"packageManager": "pnpm@9.6.0",
"packageManager": "pnpm@9.12.1",
"description": "Starter template for Nuxt 3 and Tauri 2",
"author": "Nicola Spadari",
"license": "MIT",
Expand All @@ -23,26 +23,27 @@
"tauri:build:debug": "tauri build --debug"
},
"dependencies": {
"@tauri-apps/api": ">=2.0.0-rc.0",
"@tauri-apps/plugin-fs": "^2.0.0-rc.0",
"@tauri-apps/plugin-notification": "^2.0.0-rc.0",
"@tauri-apps/plugin-os": "^2.0.0-rc.0",
"@tauri-apps/plugin-shell": "^2.0.0-rc.0"
"@nuxt/fonts": "^0.10.0",
"@tauri-apps/api": ">=2.0.2",
"@tauri-apps/plugin-fs": "^2.0.0",
"@tauri-apps/plugin-notification": "^2.0.0",
"@tauri-apps/plugin-os": "^2.0.0",
"@tauri-apps/plugin-shell": "^2.0.0"
},
"devDependencies": {
"@antfu/eslint-config": "^2.24.1",
"@nuxt/eslint": "^0.4.0",
"@nuxt/icon": "^1.4.5",
"@tauri-apps/cli": ">=2.0.0-rc.1",
"@unocss/eslint-plugin": "^0.61.9",
"@unocss/nuxt": "^0.61.9",
"@vueuse/core": "^10.11.0",
"@vueuse/nuxt": "^10.11.0",
"bumpp": "^9.4.2",
"eslint": "8.57.0",
"nuxt": "^3.12.4",
"nuxt-svgo": "^4.0.2",
"sass": "^1.77.8",
"typescript": "^5.5.4"
"@antfu/eslint-config": "^3.7.3",
"@nuxt/eslint": "^0.5.7",
"@nuxt/icon": "^1.5.5",
"@tauri-apps/cli": ">=2.0.2",
"@unocss/eslint-plugin": "^0.63.4",
"@unocss/nuxt": "^0.63.4",
"@vueuse/core": "^11.1.0",
"@vueuse/nuxt": "^11.1.0",
"bumpp": "^9.6.1",
"eslint": "9.12.0",
"nuxt": "^3.13.2",
"nuxt-svgo": "^4.0.6",
"sass": "^1.79.4",
"typescript": "^5.6.2"
}
}
Loading

0 comments on commit e7ba83f

Please sign in to comment.