Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

Merge remote-tracking branch 'origin/next' into v5-parallel-inertia-react

Andras Bacsai034218544531
diff --cc package.json
index 64f87f63ed,7b8d70d077..f751f87d4f
--- a/package.json
+++ b/package.json
@@@ -3,11 -3,8 +3,11 @@@
"private": true,
"type": "module",
"scripts": {
- "dev": "vite",
+ "dev": "vite --host",
- "build": "vite build"
+ "build": "vite build",
+ "typecheck": "tsc --noEmit",
+ "test": "vitest run",
+ "test:watch": "vitest"
},
"devDependencies": {
"@tailwindcss/postcss": "4.1.18",
diff --cc vite.config.js
index 560d4a0bde,2e0ac170be..bc2080ebc2
--- a/vite.config.js
+++ b/vite.config.js
@@@ -1,47 -1,37 +1,56 @@@
import { defineConfig, loadEnv } from "vite";
import laravel from "laravel-vite-plugin";
+import react from "@vitejs/plugin-react";
+import inertia from "@inertiajs/vite";
+import { fileURLToPath, URL } from "node:url";
export default defineConfig(({ mode }) => {
- const env = loadEnv(mode, process.cwd(), '')
- const viteHost = env.VITE_HOST || null;
- const viteHmrHost = env.VITE_HMR_HOST || null;
- const vitePort = Number(env.VITE_PORT || 5173);
+ const env = loadEnv(mode, process.cwd(), "");
+ // Prefer process.env so Docker Compose can override without writing .env.
+ // Set VITE_HOST to a browser-reachable hostname/IP when accessing the app
+ // from another device (LAN / Tailscale), e.g. VITE_HOST=100.75.155.70
+ const viteHost = (process.env.VITE_HOST || env.VITE_HOST || "localhost").trim();
++ const viteHmrHost = (
++ process.env.VITE_HMR_HOST ||
++ env.VITE_HMR_HOST ||
++ viteHost
++ ).trim();
+ const vitePort = Number(process.env.VITE_PORT || env.VITE_PORT || 5173);
return {
+ resolve: {
+ alias: {
+ "@": fileURLToPath(new URL("./resources/js/v5", import.meta.url)),
+ },
+ },
server: {
watch: {
- ignored: [
- "**/dev_*_data/**",
- "**/storage/**",
- ],
+ ignored: ["**/dev_*_data/**", "**/storage/**"],
},
+ // Listen on all interfaces so Docker / remote clients can reach the dev server
host: "0.0.0.0",
+ port: vitePort,
+ strictPort: true,
allowedHosts: true,
+ // App (:8000) and Vite (:5173) are different origins; allow any host in dev
cors: true,
- origin: viteHost ? `http://${viteHost}:${vitePort}` : undefined,
- hmr: viteHmrHost
- ? { host: viteHmrHost, clientPort: vitePort }
- : true,
+ origin: `http://${viteHost}:${vitePort}`,
+ hmr: {
- host: viteHost,
++ host: viteHmrHost,
+ clientPort: vitePort,
+ },
},
plugins: [
laravel({
- input: ["resources/css/app.css", "resources/js/app.js"],
+ input: [
+ "resources/css/app.css",
+ "resources/js/app.js",
+ "resources/js/v5/app.tsx",
+ ],
refresh: true,
}),
+ inertia({ ssr: false }),
+ react(),
],
- }
+ };
});