First merge from develop to main (WIP) #7

Merged
sugar merged 199 commits from develop into main 2026-01-27 17:47:07 +00:00
2 changed files with 12 additions and 12 deletions
Showing only changes of commit c4951f820a - Show all commits

View File

@@ -1,15 +1,15 @@
import path from 'node:path'; import path from "node:path";
import tailwindcss from '@tailwindcss/vite'; import tailwindcss from "@tailwindcss/vite";
import { tanstackRouter } from '@tanstack/router-plugin/vite'; import { tanstackRouter } from "@tanstack/router-plugin/vite";
import react from '@vitejs/plugin-react'; import react from "@vitejs/plugin-react";
import { defineConfig } from 'vite'; import { defineConfig } from "vite";
import svgr from 'vite-plugin-svgr'; import svgr from "vite-plugin-svgr";
// https://vite.dev/config/ // https://vite.dev/config/
export default defineConfig({ export default defineConfig({
plugins: [ plugins: [
tanstackRouter({ tanstackRouter({
target: 'react', target: "react",
autoCodeSplitting: true, autoCodeSplitting: true,
}), }),
react(), react(),
@@ -18,15 +18,15 @@ export default defineConfig({
], ],
resolve: { resolve: {
alias: { alias: {
'@': path.resolve(__dirname, './src'), "@": path.resolve(__dirname, "./src"),
}, },
}, },
server: { server: {
proxy: { proxy: {
'/api': 'http://10.0.0.250:8000', "/api": "http://10.0.0.250:8000",
}, },
host: '0.0.0.0', host: "0.0.0.0",
port: 5173, port: 5173,
allowedHosts: ['test.sne.moe'], allowedHosts: ["nix.org.cn", "nixos.party"],
}, },
}); });

View File

@@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, ... }:
{ {
process.managers.process-compose = { process.managers.process-compose = {