Skip to content

Commit

Permalink
Merge pull request #226 from muffinista/svelte-5
Browse files Browse the repository at this point in the history
Update to svelte 5
  • Loading branch information
muffinista authored Jan 8, 2025
2 parents 8a2a411 + 34c0cea commit 8a7eac4
Show file tree
Hide file tree
Showing 16 changed files with 198 additions and 213 deletions.
4 changes: 4 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,8 @@ export default [...compat.extends(
},

rules: {},
ignores: [
"output/*",
"data/*"
]
}];
153 changes: 66 additions & 87 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"eslint-plugin-mocha": "^10.4.3",
"eslint-plugin-n": "^17.9.0",
"eslint-plugin-promise": "^7.1.0",
"eslint-plugin-svelte": "^2.42.0",
"eslint-plugin-svelte": "^2.46.1",
"eslint-webpack-plugin": "^4.2.0",
"globals": "^15.8.0",
"html-webpack-plugin": "^5.6.0",
Expand All @@ -97,8 +97,8 @@
"sass-loader": "^16.0.2",
"sinon": "^19.0.2",
"style-loader": "^4.0.0",
"svelte": "^4.2.19",
"svelte-eslint-parser": "^0.41.1",
"svelte": "^5.15.0",
"svelte-eslint-parser": "^0.42.0",
"svelte-loader": "^3.2.3",
"tmp": "^0.2.3",
"url-loader": "^4.1.0",
Expand Down
19 changes: 9 additions & 10 deletions src/renderer/AboutScreen.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
<div>
<h1>Before Dawn</h1>
<h2>// screensaver fun //</h2>
{#await loadData() then}
<h3>{globals.APP_VERSION}</h3>

{/await}
<p>
An open-source screensaver project.<br>
<a
href="http://muffinista.github.io/before-dawn/"
on:click="{open}"
onclick={open}
>
learn more
</a>
Expand All @@ -18,7 +19,7 @@
Having trouble?
<a
href="http://github.com/muffinista/before-dawn/issues"
on:click="{open}">
onclick={open}>
please let us know!
</a>
</p>
Expand Down Expand Up @@ -77,7 +78,7 @@
<small>
<a
href="https://thenounproject.com/search/?q=sunrise&i=172009"
on:click="{open}">
onclick={open}>
App
icon
</a> Sun by Ale Estrada from the Noun Project
Expand All @@ -88,7 +89,7 @@
<small>
Powered by <a
href="https://www.electronjs.org/"
on:click="{open}"
onclick={open}
>
Electron
</a>
Expand All @@ -98,17 +99,15 @@
</div>

<script>
import { onMount } from "svelte";
console.log = window.api.log;
window.addEventListener("error", console.log);
window.addEventListener("unhandledrejection", console.log);
let globals = {};
let globals = $state({});
onMount(async () => {
async function loadData() {
globals = await window.api.getGlobals();
});
}
function open(evt) {
evt.preventDefault();
Expand Down
Loading

0 comments on commit 8a7eac4

Please sign in to comment.