Move index.html to /src/

n-gist · n-gist · commit 670ecfc5d5b2 · 2024-06-06T08:56:41.000+05:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gist-vite-electron-react",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "license": "MIT",
     "private": true,
     "type": "module",
diff --git a/src/main/main.ts b/src/main/main.ts
@@ -27,11 +27,14 @@ function createWindow() {
         ipcMain.once('renderer-process-message', () => { clearTimeout(noMsgTimeout) })
         win?.webContents.send('main-process-message', (new Date).toLocaleString())
     })
-
+    
+    const entryHtml = 'src/renderer/index.html'
     if (process.env.VITE_DEV_SERVER_URL) {
-        void win.loadURL(process.env.VITE_DEV_SERVER_URL)
+        const loadUrl = process.env.VITE_DEV_SERVER_URL + entryHtml
+        win.loadURL(loadUrl).catch( () => { console.log(`Can't loadUrl ${loadUrl}`) } )
     } else {
-        void win.loadFile(path.join(DIST, 'index.html'))
+        const loadFile = path.join(DIST, entryHtml)
+        win.loadFile(loadFile).catch( () => { console.log(`Can't loadFile ${loadFile}`) } )
     }
 }
 
diff --git a/src/renderer/index.html b/src/renderer/index.html
@@ -8,6 +8,6 @@
     </head>
     <body>
         <div id="root"></div>
-        <script type="module" src="/src/renderer/main.tsx"></script>
+        <script type="module" src="/src/renderer/index.tsx"></script>
     </body>
 </html>
diff --git a/src/renderer/index.tsx b/src/renderer/index.tsx
diff --git a/vite.config.ts b/vite.config.ts
@@ -1,7 +1,20 @@
 import { rmSync } from 'node:fs'
-import { defineConfig, type LogLevel } from 'vite'
+import { defineConfig, type LogLevel, type ViteDevServer, type PluginOption } from 'vite'
 import electron from 'vite-plugin-electron/simple'
 import react from '@vitejs/plugin-react'
+import { join } from 'path'
+
+const entryHtml = '/src/renderer/index.html'
+
+const resolveMainPage: () => PluginOption = () => ({
+    name: 'redirect-main-page',
+    configureServer(server: ViteDevServer) {
+        server.middlewares.use((req, _res, next) => {
+            if (req.originalUrl === '/' || req.originalUrl === '/index.html') req.url = entryHtml
+            next()
+        })
+    }
+})
 
 export default defineConfig(({ command }) => {
     
@@ -20,6 +33,7 @@ export default defineConfig(({ command }) => {
         publicDir,
         logLevel,
         plugins: [
+            resolveMainPage(),
             react(),
             electron({
                 main: {
@@ -58,6 +72,13 @@ export default defineConfig(({ command }) => {
                 },
                 renderer: {},
             }),
-        ]
+        ],
+        build: {
+            rollupOptions: {
+                input: {
+                    main: join(__dirname, entryHtml)
+                }
+            }
+        }
     }
 })

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gist-vite-electron-react",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.2",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"private": true,`
`6`	`6`	`"type": "module",`