mirror of
https://github.com/LukeHagar/sveltekit-adapters.git
synced 2025-12-06 12:47:48 +00:00
Merge branch 'swap-to-handler' of https://github.com/LukeHagar/sveltekit-adapters into swap-to-handler
This commit is contained in:
@@ -34,9 +34,7 @@ async function createWindow() {
|
|||||||
stopIntercept?.();
|
stopIntercept?.();
|
||||||
});
|
});
|
||||||
|
|
||||||
await app.whenReady();
|
// Setup the handler
|
||||||
|
|
||||||
// Third setup the handler
|
|
||||||
stopIntercept = await setupHandler(mainWindow);
|
stopIntercept = await setupHandler(mainWindow);
|
||||||
|
|
||||||
return mainWindow;
|
return mainWindow;
|
||||||
@@ -52,6 +50,11 @@ app.on('window-all-closed', () => {
|
|||||||
|
|
||||||
app.on('activate', async () => {
|
app.on('activate', async () => {
|
||||||
if (BrowserWindow.getAllWindows().length === 0 && !mainWindow) {
|
if (BrowserWindow.getAllWindows().length === 0 && !mainWindow) {
|
||||||
|
try {
|
||||||
await createWindow();
|
await createWindow();
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to create window:', error);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -30,7 +30,14 @@ export const load = (({ cookies }) => {
|
|||||||
|
|
||||||
return gameState
|
return gameState
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log("Error getting cookie", e);
|
console.error("Error loading game state:", e);
|
||||||
|
// Return a new game state as fallback
|
||||||
|
const newGame = new Game();
|
||||||
|
return {
|
||||||
|
guesses: newGame.guesses,
|
||||||
|
answers: newGame.answers,
|
||||||
|
answer: null
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}) satisfies PageServerLoad;
|
}) satisfies PageServerLoad;
|
||||||
|
|
||||||
|
|||||||
@@ -11,9 +11,9 @@ import { serialize as serializeCookie } from 'cookie';
|
|||||||
let server;
|
let server;
|
||||||
let clientDir;
|
let clientDir;
|
||||||
let prerenderedDir;
|
let prerenderedDir;
|
||||||
let Protocol = 'http';
|
const Protocol = 'http';
|
||||||
let Host = '127.0.0.1';
|
const Host = '127.0.0.1';
|
||||||
let Origin = `${Protocol}://${Host}`;
|
const Origin = `${Protocol}://${Host}`;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reports errors to the user in a way that can be filed on GitHub
|
* Reports errors to the user in a way that can be filed on GitHub
|
||||||
@@ -285,7 +285,7 @@ export async function setupHandler(mainWindow) {
|
|||||||
await mainWindow.loadURL(url);
|
await mainWindow.loadURL(url);
|
||||||
|
|
||||||
return function stopIntercept() {
|
return function stopIntercept() {
|
||||||
protocol.unhandle('http');
|
protocol.unhandle(Protocol);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user