aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author苏向夜 <fu050409@163.com>2026-03-29 01:12:58 +0800
committer苏向夜 <fu050409@163.com>2026-03-29 01:12:58 +0800
commite16320b34fa2dbb75e19142f7e8e31ecd41a512c (patch)
tree9f63514080e453c49f47585c3776db2ac01dddd2
parente390bca10372d853c6ebfa191f9bce65cd591974 (diff)
parentba2d607899e1beb523450cd46cdf83cd433c230a (diff)
downloadDropOut-e16320b34fa2dbb75e19142f7e8e31ecd41a512c.tar.gz
DropOut-e16320b34fa2dbb75e19142f7e8e31ecd41a512c.zip
Merge branch 'refactor/fe' of https://github.com/HydroRoll-Team/DropOut into refactor/fe
-rw-r--r--.changes/vite-tauri.md5
-rw-r--r--.env.example7
-rw-r--r--packages/ui/vite.config.ts21
-rw-r--r--src-tauri/tauri.conf.json3
4 files changed, 27 insertions, 9 deletions
diff --git a/.changes/vite-tauri.md b/.changes/vite-tauri.md
new file mode 100644
index 0000000..45d5d64
--- /dev/null
+++ b/.changes/vite-tauri.md
@@ -0,0 +1,5 @@
+---
+"@dropout/ui": "patch:chore"
+---
+
+Fix vite config to integrate with Tauri.
diff --git a/.env.example b/.env.example
deleted file mode 100644
index 9e7e55a..0000000
--- a/.env.example
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copy this file to .env and fill in values to enable optional features at build time.
-# .env is gitignored and will never be committed.
-
-# CurseForge API key — required only to build with CurseForge modpack support.
-# Obtain one at https://console.curseforge.com/
-# If absent, CurseForge modpack import is disabled at runtime (all other features work normally).
-# CURSEFORGE_API_KEY=your_key_here
diff --git a/packages/ui/vite.config.ts b/packages/ui/vite.config.ts
index 241ca8f..34df162 100644
--- a/packages/ui/vite.config.ts
+++ b/packages/ui/vite.config.ts
@@ -3,12 +3,31 @@ import tailwindcss from "@tailwindcss/vite";
import react from "@vitejs/plugin-react";
import { defineConfig } from "vite";
+const host = process.env.TAURI_DEV_HOST;
+
// https://vite.dev/config/
export default defineConfig({
plugins: [react(), tailwindcss()],
+ // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
+ //
+ // 1. prevent Vite from obscuring rust errors
+ clearScreen: false,
+ // 2. tauri expects a fixed port, fail if that port is not available
server: {
- port: 5173,
+ port: 1420,
strictPort: true,
+ host: host || false,
+ hmr: host
+ ? {
+ protocol: "ws",
+ host,
+ port: 1421,
+ }
+ : undefined,
+ watch: {
+ // 3. tell Vite to ignore watching `src-tauri`
+ ignored: ["**/src-tauri/**"],
+ },
},
resolve: {
alias: {
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 9ab9e6a..a387d6c 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,11 +1,12 @@
{
+ "$schema": "https://schema.tauri.app/config/2",
"productName": "Dropout",
"version": "0.2.0-alpha.5",
"identifier": "com.dropout.launcher",
"build": {
"beforeDevCommand": "pnpm --filter @dropout/ui dev",
"beforeBuildCommand": "pnpm --filter @dropout/ui build",
- "devUrl": "http://127.0.0.1:5173",
+ "devUrl": "http://localhost:1420",
"frontendDist": "../packages/ui/dist"
},
"app": {