Trunk linting.

.eslintrc.cjs

@@ -10,11 +10,6 @@ module.exports = {
     // 'svelte/rule-name': 'error'
   },
   parser: "@typescript-eslint/parser",
-  parserOptions: {
-    // ...
-    project: "tsconfig.json",
-    extraFileExtensions: [".svelte"], // This is a required setting in `@typescript-eslint/parser` v4.24.0.
-  },
   overrides: [
     {
       files: ["*.svelte"],

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-custom: ["https://electionscience.org/donate"]
+custom: [https://electionscience.org/donate]

.github/dependabot.yml

@@ -5,7 +5,7 @@
 
 version: 2
 updates:
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: npm # See documentation for possible values
+    directory: / # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: weekly

.trunk/.gitignore

@@ -2,7 +2,8 @@
 *logs
 *actions
 *notifications
+*tools
 plugins
 user_trunk.yaml
 user.yaml
-shims
+tmp

.trunk/trunk.yaml

@@ -1,29 +1,28 @@
 version: 0.1
 cli:
-  version: 1.10.0
+  version: 1.22.2
 plugins:
   sources:
     - id: trunk
-      ref: v0.0.17
+      ref: v1.6.0
       uri: https://github.com/trunk-io/plugins
 lint:
+  disabled:
+    - gitleaks
   enabled:
-    - eslint@8.42.0
-    - yamllint@1.32.0
-    - actionlint@1.6.24
+    - eslint@8.57.0
+    - yamllint@1.35.1
+    - actionlint@1.7.1
     - git-diff-check
-    - [email protected]
-    - [email protected]
-    - [email protected]
-    - [email protected]
-    - [email protected]
-    - [email protected]
-  disabled:
-    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
 runtimes:
   enabled:
     - [email protected]
-    - go@1.19.5
+    - go@1.21.0
     - [email protected]
 actions:
   disabled:

README.md

@@ -28,6 +28,6 @@ To add to the report, edit `./load-report.js` with the data from the election.
 Submit a pull request with the updated `data.db`.
 
 ## Deployment
+
 The site is hosted on github pages. Merge to main and it'll auto deploy.
 Site is hosted on github pages. Merge to main and it'll auto-deploy.
-

load-report.js

@@ -30,15 +30,20 @@ function addReportAndCandidates(report, candidates) {
       report.notes,
       report.ballotCount,
       report.path,
-      report.hidden
+      report.hidden,
     );
 
     // Get the last inserted row ID
     const reportId = result.lastInsertRowid;
 
     // Insert candidates
     for (const candidate of candidates) {
-      insertCandidate.run(reportId, candidate.name, candidate.votes, candidate.winner);
+      insertCandidate.run(
+        reportId,
+        candidate.name,
+        candidate.votes,
+        candidate.winner,
+      );
     }
   });
 
@@ -61,11 +66,12 @@ const report = {
   officeName: "City Commissioner",
   jurisdictionName: "Fargo, ND",
   electionName: "Primary Election",
-  website: "https://results.sos.nd.gov/resultsSW.aspx?text=All&type=CIALL&map=CTY&area=Fargo&name=Fargo",
+  website:
+    "https://results.sos.nd.gov/resultsSW.aspx?text=All&type=CIALL&map=CTY&area=Fargo&name=Fargo",
   notes: "",
   ballotCount: 14781,
   path: "us/nd/fargo/2024/06",
-  hidden: 0
+  hidden: 0,
 };
 
 const candidates = [
@@ -76,7 +82,7 @@ const candidates = [
   { name: "Anna Johnson", votes: 3545, winner: 0 },
   { name: "Delson Saintal", votes: 2378, winner: 0 },
   { name: "Nathan Pullen", votes: 1879, winner: 0 },
-  { name: "write-in", votes: 85, winner: 0 }
+  { name: "write-in", votes: 85, winner: 0 },
 ];
 
 // Add the report and candidates to the database

package.json

@@ -11,7 +11,7 @@
     "cy:run": "cypress run",
     "cy:open": "cypress open",
     "test": "run-p --race dev cy:run",
-    "lint": "prettier --check --plugin-search-dir=. .",
+    "lint": "trunk check",
     "format": "prettier --write --plugin-search-dir=. .",
     "svelte-check": "svelte-check"
   },
@@ -28,16 +28,7 @@
     "@sveltejs/kit": "^1.30.4",
     "@tsconfig/svelte": "^3.0.0",
     "@types/better-sqlite3": "^7.6.4",
-    "@typescript-eslint/eslint-plugin": "^5.59.11",
-    "eslint": "^8.42.0",
-    "eslint-config-standard-with-typescript": "^35.0.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-n": "^15.7.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-svelte": "^2.30.0",
     "marked": "^4.0.0",
-    "prettier": "^2.6.2",
-    "prettier-plugin-svelte": "^2.7.0",
     "rollup": "^2.79.1",
     "rollup-plugin-svelte": "^7.1.0",
     "rollup-plugin-terser": "^7.0.2",

src/app.html

@@ -1,22 +1,31 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-    <meta name="theme-color" content="#437527"/>
-    <link rel="manifest" crossorigin="use-credentials" href="manifest.json" />
-    <meta name="description" content="approval.vote: detailed reports on approval voting elections.">
+    <meta name="theme-color" content="#437527" />
+    <link rel="manifest" crossorigin="use-credentials" href="/manifest.json" />
+    <meta
+      name="description"
+      content="approval.vote: detailed reports on approval voting elections."
+    />
     <!-- Google tag (gtag.js) -->
 
     %sveltekit.head%
   </head>
   <div style="display: contents">%sveltekit.body%</div>
-  <script defer async src="https://www.googletagmanager.com/gtag/js?id=G-9FXGFEC813"></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag(){dataLayer.push(arguments);}
-      gtag('js', new Date());
+  <script
+    defer
+    async
+    src="https://www.googletagmanager.com/gtag/js?id=G-9FXGFEC813"
+  ></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag() {
+      dataLayer.push(arguments);
+    }
+    gtag("js", new Date());
 
-      gtag('config', 'G-9FXGFEC813');
-    </script>
+    gtag("config", "G-9FXGFEC813");
+  </script>
 </html>

src/lib/components/report_components/VoteCounts.svelte

@@ -45,7 +45,7 @@
         class={candidate.winner === true ? '' : 'eliminated'}
         transform={`translate(0 ${outerHeight * (i + 0.5)})`}
       >
-        <text font-size="12" text-anchor="end" dominant-baseline="middle">
+        <text font-size="90%" text-anchor="end" dominant-baseline="middle">
           {candidate.name}
         </text>
         <g transform={`translate(5 ${-innerHeight / 2 - 1})`}>
@@ -61,7 +61,7 @@
           />
         </g>
         <text
-          font-size="12"
+          font-size="90%"
           dominant-baseline="middle"
           x={10 + scale * candidate.votes}
         >

src/lib/server/reports.ts

@@ -53,7 +53,7 @@ function createElection(row: IElectionIndexEntry, contest: IContestIndexEntry) {
 // Helper function to add a contest to an existing election
 function addContestToElection(
   election: IElectionIndexEntry,
-  contest: IContestIndexEntry
+  contest: IContestIndexEntry,
 ) {
   election.contests.push(contest);
   election.contests.sort((b: IContestIndexEntry, a: IContestIndexEntry) => {
@@ -93,7 +93,7 @@ export function getIndex(): IReportIndex {
   const electionsByYear = rows.reduce(
     (
       grouped: IReportIndexByYear,
-      row: IElectionIndexEntry
+      row: IElectionIndexEntry,
     ): IReportIndexByYear => {
       const year = new Date(row.date).getFullYear();
       const winners = getWinners(row.id); // get winners for this report
@@ -104,7 +104,7 @@ export function getIndex(): IReportIndex {
       }
 
       const existingElectionIndex = grouped[year].findIndex(
-        (election: IElectionIndexEntry) => election.path === row.path
+        (election: IElectionIndexEntry) => election.path === row.path,
       );
 
       if (existingElectionIndex === -1) {
@@ -115,11 +115,11 @@ export function getIndex(): IReportIndex {
 
       return grouped;
     },
-    {}
+    {},
   );
 
   const groupedArray = Object.entries(
-    electionsByYear as IReportIndexByYear
+    electionsByYear as IReportIndexByYear,
   ).sort((a, b) => parseInt(b[0]) - parseInt(a[0]));
 
   // Convert the reversed array back to a Map

src/routes/card/[...path]/+page.server.ts

@@ -9,5 +9,5 @@ export async function load({ params }) {
       message: "Not found",
     });
   }
-  return { report: report, path: params.path };
+  return { report, path: params.path };
 }

src/routes/report/[...path]/+page.server.ts

@@ -5,8 +5,11 @@ import { getReport } from "$lib/server/reports";
 export async function load({ params }) {
   try {
     const report = getReport(params.path);
-    return { report: report, path: params.path };
+    if (!report) {
+      throw error(404, { message: "Not found" });
+    }
+    return { report, path: params.path };
   } catch (err) {
-    return error(404, { message: "Not found" });
+    throw error(404, { message: "Not found" });
   }
 }

static/card.css

@@ -8,7 +8,7 @@ body {
 
 h3 {
   padding: 30px;
-  font-size: 30pt;
+  font-size: 200%;
   margin-bottom: 20px;
 }
 

static/manifest.json

@@ -12,7 +12,6 @@
       "sizes": "192x192",
       "type": "image/png",
       "purpose": "maskable"
-
     },
     {
       "src": "icons/icon-512x512.png",