manual build option, npm i, and remove #each keys

.github/workflows/static.yml

@@ -1,8 +1,7 @@
 name: Deploy SvelteKit to GitHub Pages
 
 on:
-  push:
-    branches: [main]
+  workflow_dispatch: # allows manual trigger
 
 permissions:
   contents: read
@@ -22,10 +21,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
-          cache: npm # cache node_modules for faster builds
 
       - name: Install dependencies
-        run: npm ci # ci (not install) to install exact versions from package-lock.json
+        run: npm i
 
       # Build the SvelteKit project
       - name: Build project

.nvmrc

@@ -1 +1 @@
-v22.17.0
+v22.22.0

README.md

@@ -1,6 +1,6 @@
 # SCN website (operated by LCL)
 
-Code repo for the seattlecommunitynetwork.org website.
+Code repo for the https://seattlecommunitynetwork.org website.
 
 This site is built using [SvelteKit](https://svelte.dev/docs/kit/introduction). SvelteKit supports building fully static sites - which is how this site is built. SvelteKit uses NodeJS to run the static site build.
 

create-redirects.js

@@ -3,8 +3,7 @@ import { existsSync, mkdirSync } from 'fs';
 
 const redirects = [
     ['/aboutUs.html', "/about-us"],
-    ['/ourSites.html', "/our-sites"],
-    ['/donate.html', "/donate"]
+    ['/ourSites.html', "/our-sites"]
 ];
 
 const template =

e2e/donate.test.ts

@@ -2,7 +2,7 @@ import { expect, test } from '@playwright/test';
 import { expectH1AndTitle } from './lib/lib';
 
 test.beforeEach(async ({ page }) => {
-    await page.goto('/donate/');
+    await page.goto('/donate');
 });
 
 test.describe('Donate', () => {

e2e/our-sites.test.ts

@@ -26,8 +26,7 @@ test.describe('Our Sites', () => {
         });
     });
 
-    // skip for now, destination page is down
-    test.skip('main CTAs link correctly', async ({ page }) => {
+    test('main CTAs link correctly', async ({ page }) => {
         await expectLinks({
             page,
             pageName: 'our-sites',

eslint.config.js

@@ -27,6 +27,7 @@ export default ts.config(
 
             // https://github.com/sveltejs/eslint-plugin-svelte/issues/1353
             'svelte/no-navigation-without-resolve': 'off',
+            'svelte/require-each-key': 'off'
 
         }
     },

messages/en.json

@@ -208,7 +208,7 @@
     "pages.sites.sites.iframe.title": "Sites and Estimated LTE Coverage Map",
     "pages.sites.sites.paragraphs.1": "For more specific information on signal strength, upload speed, and more:",
     "pages.sites.sites.cta": "Visit Our Map Page",
-    "pages.sites.sites.href": "https://coverage.seattlecommunitynetwork.org/",
+    "pages.sites.sites.href": "https://map.seattlecommunitynetwork.org/",
 
 
 

src/lib/components/Footer.svelte

@@ -32,7 +32,7 @@
                 <p>{m['common.mission.desc']()}</p>
             </div>
             <div class="ctas">
-                {#each buttons as { href, cta} (href)}
+                {#each buttons as { href, cta}}
                     <div>
                         <Button {href} type="medium">{cta}</Button>
                     </div>

src/lib/components/Header.svelte

@@ -68,7 +68,7 @@
 
 <nav class="nav" data-test="site-nav">
     <div class="nav-items" class:show-nav={showNav}>
-        {#each navItems as {href, label} (href)}
+        {#each navItems as {href, label}}
             <a
                 href={href}
                 class="nav-link"

src/lib/components/Socials.svelte

@@ -40,7 +40,7 @@
 </script>
 
 <div class={cssClass}>
-    {#each socials as { href, cta, src } (href)}
+    {#each socials as { href, cta, src }}
         <a {href} data-test={`social-${cta.toLowerCase()}`}>
             <img src={src[type]} alt={cta} />
         </a>

src/routes/+page.svelte

@@ -68,7 +68,7 @@
                 {m['pages.home.overview.header']()}
             </h2>
 
-            {#each overview as over (over)}
+            {#each overview as over}
                 <p>{@html over}</p>
             {/each}
 
@@ -91,7 +91,7 @@
         </h2>
 
         <div class="button-row">
-            {#each buttons as { href, cta, dataTest } (href)}
+            {#each buttons as { href, cta, dataTest }}
                 <Button {href} arrow={true} dataTest={dataTest}>
                     {cta}
                 </Button>

src/routes/about-us/+page.svelte

@@ -52,7 +52,7 @@
 <PageTitle title={m["pages.about.title"]()} />
 
 <Wrapper dataTest="about-page">
-    {#each sections as section, index (section.key)}
+    {#each sections as section, index}
         <section data-test={`about-us-${section.key}`}>
             <Panel type="plain">
                 {#if index === 0}
@@ -61,7 +61,7 @@
                     <h2>{section.header}</h2>
                 {/if}
 
-                {#each section.paragraphs as paragraph (paragraph) }
+                {#each section.paragraphs as paragraph}
                     <p>{@html paragraph}</p>
                 {/each}
 

src/routes/donate/+page.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { page } from '$app/state';
     import { m } from '$lib/paraglide/messages.js';
 
     import Button    from '$lib/components/Button.svelte';
@@ -18,6 +19,14 @@
 
 </script>
 
+
+<svelte:head>
+     {#if page.url.pathname.endsWith('.html')}
+        <meta http-equiv="refresh" content="0; url='/donate'" />
+        <title>Redirecting...</title>
+    {/if}
+</svelte:head>
+
 <PageTitle title={m['pages.donate.title']()} />
 
 <div class="wave" style="--wave-url: url(/pages/donate/upsidedown-wave.min.png)">
@@ -39,7 +48,7 @@
                     <img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
                 </form>
 
-                {#each buttons as { href, cta } (href)}
+                {#each buttons as { href, cta }}
                     <Button {href} type="donate" dataTest={`donate-${cta.toLowerCase()}`}>{cta}</Button>
                 {/each}
             </div>

src/routes/our-sites/+page.svelte

@@ -54,7 +54,7 @@
             <p>{m["pages.sites.details.paragraphs.2"]()}</p>
 
             <ul>
-                {#each detailsList as detail (detail)}
+                {#each detailsList as detail}
                     <li>{detail}</li>
                 {/each}
             </ul>
@@ -66,7 +66,7 @@
             <h2>{m["pages.sites.eligibility.header"]()}</h2>
             <p>{m["pages.sites.eligibility.paragraphs.0"]()}</p>
             <ul>
-                {#each eligibilityList as eligibility (eligibility)}
+                {#each eligibilityList as eligibility}
                     <li>{eligibility}</li>
                 {/each}
             </ul>
@@ -80,7 +80,7 @@
             <h3>{m["pages.sites.locations.subheader"]()}</h3>
 
             <div class="locations">
-                {#each locations as location (location)}
+                {#each locations as location}
                     <div class="location">
                         <img
                             src={m[`pages.sites.locations.locations.${location}.src`]()}