Improve build process (work in progress); Update vite

package.json

@@ -78,9 +78,7 @@
     "test": "tap test/*.js --no-timeout --node-arg=--require --node-arg=@babel/register --node-arg=--require --node-arg=@babel/polyfill",
     "coveralls": "tap test/*.js --coverage --coverage-report=text-lcov --nyc-arg=--require --nyc-arg=@babel/register --nyc-arg=--require --nyc-arg=@babel/polyfill | coveralls",
     "cypress:open": "cypress open",
-    "vite:build": "npm run vite:build:server && npm run vite:build:client",
-    "vite:build:client": "vite build --ssrManifest",
-    "vite:build:server": "vite build --ssr ./src/app/src/entry-server.tsx --outDir ../../dist/gsender/app-server",
+    "vite:build": "yarn --cwd ./src/app build",
     "postvite:build": "bash -c \"mkdir -p dist/gsender/app; cp -af src/app_old/{favicon.ico,i18n,images,assets} dist/gsender/app/\"",
     "install:packages": "yarn install && yarn install --prefix /src/app"
   },
@@ -501,7 +499,6 @@
     "@types/react-dom": "^18.3.0",
     "@types/sha1": "^1.1.1",
     "@types/three": "^0.146.0",
-    "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.19",
     "avrgirl-arduino": "^5.0.1",
     "axios": "^1.2.4",
@@ -651,7 +648,7 @@
     "use-long-press": "^1.1.2",
     "use-stay-awake": "^0.1.7",
     "uuid": "~3.3.2",
-    "vite": "^5.2.11",
+    "vite": "^5.4.2",
     "watch": "~1.0.2",
     "webappengine": "~1.2.0",
     "winston": "~3.2.1",

src/app/package.json

@@ -1,41 +1,41 @@
 {
-  "name": "vite-react-typescript-starter",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "node server",
-    "build": "npm run build:client && npm run build:server",
-    "build:client": "vite build --ssrManifest --outDir dist/client",
-    "build:server": "vite build --ssr src/entry-server.tsx --outDir dist/server",
-    "preview": "cross-env NODE_ENV=production node server"
-  },
-  "dependencies": {
-    "@reduxjs/toolkit": "^2.2.7",
-    "@tanstack/react-router": "^1.46.8",
-    "compression": "^1.7.4",
-    "express": "^4.19.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-redux": "^9.1.2",
-    "sirv": "^2.0.4",
-    "styled-components": "^6.1.12"
-  },
-  "devDependencies": {
-    "@tanstack/router-devtools": "^1.46.7",
-    "@tanstack/router-plugin": "^1.47.0",
-    "@types/classnames": "^2.3.0",
-    "@types/express": "^4.17.21",
-    "@types/node": "^20.12.7",
-    "@types/react": "^18.2.79",
-    "@types/react-dom": "^18.3.0",
-    "@types/redux-action": "^1.2.8",
-    "@types/redux-batched-subscribe": "^0.1.7",
-    "@types/redux-logger": "^3.0.13",
-    "@vitejs/plugin-react": "^4.2.1",
-    "cross-env": "^7.0.3",
-    "typescript": "^5.4.5",
-    "vite": "^5.2.10",
-    "vite-tsconfig-paths": "^5.0.1"
-  }
+    "name": "gSender",
+    "private": true,
+    "version": "0.0.0",
+    "type": "module",
+    "scripts": {
+        "dev": "node server",
+        "build": "npm run build:client && npm run build:server",
+        "build:client": "vite build --outDir ../../dist/gsender/app --ssrManifest ",
+        "build:server": "vite build --outDir ../../dist/gsender/app-server --ssr src/entry-server.tsx",
+        "preview": "cross-env NODE_ENV=production node server"
+    },
+    "dependencies": {
+        "@reduxjs/toolkit": "^2.2.7",
+        "@tanstack/react-router": "^1.46.8",
+        "compression": "^1.7.4",
+        "express": "^4.19.2",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
+        "react-redux": "^9.1.2",
+        "sirv": "^2.0.4",
+        "styled-components": "^6.1.12"
+    },
+    "devDependencies": {
+        "@tanstack/router-devtools": "^1.46.7",
+        "@tanstack/router-plugin": "^1.47.0",
+        "@types/classnames": "^2.3.0",
+        "@types/express": "^4.17.21",
+        "@types/node": "^20.12.7",
+        "@types/react": "^18.2.79",
+        "@types/react-dom": "^18.3.0",
+        "@types/redux-action": "^1.2.8",
+        "@types/redux-batched-subscribe": "^0.1.7",
+        "@types/redux-logger": "^3.0.13",
+        "@vitejs/plugin-react": "^4.2.1",
+        "cross-env": "^7.0.3",
+        "typescript": "^5.4.5",
+        "vite": "^5.4.2",
+        "vite-tsconfig-paths": "^5.0.1"
+    }
 }

src/app/vite.config.js

@@ -1,35 +1,24 @@
-import { defineConfig } from "vite";
-import path from "path";
-import react from "@vitejs/plugin-react";
-import tailwindcss from "tailwindcss";
-import { TanStackRouterVite } from "@tanstack/router-plugin/vite";
-import tsconfigPaths from 'vite-tsconfig-paths'
+import { defineConfig } from 'vite';
+import path from 'path';
+import react from '@vitejs/plugin-react';
+import tailwindcss from 'tailwindcss';
+import { TanStackRouterVite } from '@tanstack/router-plugin/vite';
+import tsconfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig({
-    root: path.resolve(__dirname, "./"), // Set root to the directory containing index.html
-    base: "./",
-    build: {
-        outDir: path.resolve(__dirname, "../../dist/gsender/app"), // Output directly to /output/app
-        rollupOptions: {
-            input: {
-                main: path.resolve(__dirname, "./src/entry-client.tsx"), // Main entry point
-            },
-            output: {
-                assetFileNames: "assets/[name].[ext]",
-            },
-        },
-    },
+    root: path.resolve(__dirname, './'), // Set root to the directory containing index.html
+    base: './',
     css: {
         postcss: {
             plugins: [tailwindcss()],
         },
     },
     plugins: [
         TanStackRouterVite({
-            routesDirectory: path.resolve(__dirname, "./src/routes"),
+            routesDirectory: path.resolve(__dirname, './src/routes'),
             generatedRouteTree: path.resolve(
                 __dirname,
-                "./src/routeTree.gen.ts",
+                './src/routeTree.gen.ts',
             ),
         }),
         tsconfigPaths(),