diff --git a/Electron-App/package.json b/Electron-App/package.json index fb820db..7376147 100644 --- a/Electron-App/package.json +++ b/Electron-App/package.json @@ -5,7 +5,6 @@ "main": "./out/main/index.js", "author": "example.com", "homepage": "https://www.electronjs.org", - "type": "module", "scripts": { "format": "prettier --write .", "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix", diff --git a/Electron-App/src/main/index.ts b/Electron-App/src/main/index.ts index dedf2a4..9f21e5a 100644 --- a/Electron-App/src/main/index.ts +++ b/Electron-App/src/main/index.ts @@ -1,8 +1,8 @@ import { app, shell, BrowserWindow } from 'electron' import { join } from 'path' import { electronApp, optimizer, is } from '@electron-toolkit/utils' -import { handler } from '../../../Built-App/src/handler.js' import icon from '../../resources/icon.png?asset' +import { handler } from '../../../Svelte-Build/src/handler.js' import express from 'express' const port = 3000 @@ -10,17 +10,21 @@ const origin = `http://localhost:${port}` const server = express() -// add a route that lives separately from the SvelteKit app -server.get('/healthcheck', (req, res) => { - res.end('ok') -}) +const createServer = async () => { + // add a route that lives separately from the SvelteKit app + server.get('/healthcheck', (req, res) => { + res.end('ok') + }) -// let SvelteKit handle everything else, including serving prerendered pages and static assets -server.use(handler) + // let SvelteKit handle everything else, including serving prerendered pages and static assets + server.use(handler) -server.listen(3000, () => { - console.log(`Server listening on ${origin}`) -}) + server.listen(3000, () => { + console.log(`Server listening on ${origin}`) + }) +} + +createServer() function createWindow(): void { // Create the browser window. diff --git a/SvelteKit-App/svelte.config.js b/SvelteKit-App/svelte.config.js index 139bee1..9955a39 100644 --- a/SvelteKit-App/svelte.config.js +++ b/SvelteKit-App/svelte.config.js @@ -11,7 +11,7 @@ const config = { // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list. // If your environment is not supported or you settled on a specific environment, switch out the adapter. // See https://kit.svelte.dev/docs/adapters for more information about adapters. - adapter: adapter({ out: '../Built-App/src' }) + adapter: adapter({ out: '../Svelte-Build/src' }) } };