fix lint/formatting, seperate test action

.github/workflows/build.yml

@@ -1,10 +1,8 @@
-name: Build & Test
+name: Build
 
 on:
   push:
     branches: [main]
-  pull_request:
-    branches: [main]
 
 jobs:
   build:
@@ -19,21 +17,4 @@ jobs:
           node-version: '22'
           cache: 'npm'
       - run: npm install
-
-      - name: Check Prettier formatting
-        run: npx prettier --check src/
-        # Let fail for now
-        continue-on-error: true
-
-      - name: Run ESLint
-        run: npx eslint src/
-        # Let fail for now
-        continue-on-error: true
-
-      - run: npm run test-coverage
       - run: npm run build
-
-      - name: Coveralls
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -0,0 +1,33 @@
+name: Test & Lint
+
+on:
+  pull_request:
+    branches: ['main']
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Setup Node
+        uses: actions/setup-node@v6
+        with:
+          node-version: '22'
+          cache: 'npm'
+
+      - run: npm install
+
+      - name: Check Prettier formatting
+        run: npx prettier --check vite.config.ts src/
+
+      - name: Run ESLint
+        run: npx eslint vite.config.ts src/
+
+      - run: npm run test-coverage
+      - run: npm run build
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

eslint.config.js

@@ -43,12 +43,12 @@ export default defineConfig([
             'react/jsx-uses-react': 'off',
             'react/react-in-jsx-scope': 'off',
             'react/no-unknown-property': ['error', { ignore: ['css'] }],
-            'no-unused-vars': [
+            '@typescript-eslint/no-unused-vars': [
                 'error',
                 {
-                    argsIgnorePattern: '^_',
-                    varsIgnorePattern: '^_',
-                    caughtErrorsIgnorePattern: '^_',
+                    argsIgnorePattern: '^_|^e$',
+                    varsIgnorePattern: '^_|^e$',
+                    caughtErrorsIgnorePattern: '^_|^e$',
                 },
             ],
             // Turning these off for now to clean up warnings

src/app.tsx

@@ -18,18 +18,16 @@ export let routes: RouteObject[] = [];
 export let router: ReturnType<typeof createBrowserRouter>;
 
 if (element) {
-  const routes = [
+  routes = [
     {
       path: '/*',
       element: (
         <TsmlUI
           google={element.getAttribute('data-google') || undefined}
-          // eslint-disable-next-line no-undef
           settings={
             typeof tsml_react_config === 'undefined'
               ? undefined
-              : // eslint-disable-next-line no-undef
-                tsml_react_config
+              : tsml_react_config
           }
           src={element.getAttribute('data-src') || undefined}
           timezone={element.getAttribute('data-timezone') || undefined}

src/components/Button.tsx

@@ -22,8 +22,8 @@ export default function Button({
         type === 'in-person'
           ? buttonDirectionsCss
           : type === 'online'
-          ? buttonJoinCss
-          : buttonCss
+            ? buttonJoinCss
+            : buttonCss
       }
       href={href}
       onClick={onClick}

src/components/Controls.tsx

@@ -133,7 +133,7 @@ export default function Controls() {
       distance:
         mode === 'search'
           ? undefined
-          : input.distance ?? settings.distance_default,
+          : (input.distance ?? settings.distance_default),
       mode,
       region: mode === 'search' ? input.region : [],
       search,

src/components/Dropdown.tsx

@@ -8,7 +8,13 @@ import {
 
 import { useNavigate } from 'react-router-dom';
 import { formatUrl, getIndexByKey, formatString as i18n } from '../helpers';
-import { type Data, useData, useInput, useLocation, useSettings } from '../hooks';
+import {
+  type Data,
+  useData,
+  useInput,
+  useLocation,
+  useSettings,
+} from '../hooks';
 import { dropdownButtonCss, dropdownCss } from '../styles';
 import type { Index } from '../types';
 

src/components/Map.tsx

@@ -5,7 +5,14 @@ import 'leaflet/dist/leaflet.css';
 import { MapContainer, Marker, Popup, TileLayer, useMap } from 'react-leaflet';
 
 import { formatDirectionsUrl } from '../helpers';
-import { useData, useError, useFilter, useInput, useLocation, useSettings } from '../hooks';
+import {
+  useData,
+  useError,
+  useFilter,
+  useInput,
+  useLocation,
+  useSettings,
+} from '../hooks';
 import { mapCss, mapPopupMeetingsCss } from '../styles';
 import type { MapLocation } from '../types';
 import Button from './Button';

src/components/Meeting.tsx

@@ -113,13 +113,13 @@ export default function Meeting() {
   const feedback_url = meeting.feedback_url
     ? meeting.feedback_url
     : feedback_emails.length
-    ? formatFeedbackEmail({
-        feedback_emails,
-        meeting,
-        settings,
-        strings,
-      })
-    : undefined;
+      ? formatFeedbackEmail({
+          feedback_emails,
+          meeting,
+          settings,
+          strings,
+        })
+      : undefined;
 
   // format time string (duration? or appointment?)
   const formatTime = (start?: DateTime, end?: DateTime) => {

src/components/Table.tsx

@@ -5,7 +5,14 @@ import InfiniteScroll from 'react-infinite-scroller';
 import { useNavigate } from 'react-router-dom';
 
 import { formatUrl, formatString as i18n } from '../helpers';
-import { useData, useError, useFilter, useInput, useLocation, useSettings } from '../hooks';
+import {
+  useData,
+  useError,
+  useFilter,
+  useInput,
+  useLocation,
+  useSettings,
+} from '../hooks';
 import {
   tableChicletCss,
   tableChicletsCss,

src/helpers/analytics.ts

@@ -11,15 +11,13 @@ export function analyticsEvent({
 }) {
   if (typeof gtag === 'function') {
     //https://developers.google.com/analytics/devguides/collection/gtagjs/events
-    // eslint-disable-next-line no-undef
     gtag('event', action, {
       event_category: category,
       event_label: label,
     });
     //console.log(`TSML UI recorded gtag event for "${label}"`);
   } else if (typeof ga === 'function') {
     //https://developers.google.com/analytics/devguides/collection/analyticsjs/events
-    // eslint-disable-next-line no-undef
     ga('send', {
       hitType: 'event',
       eventCategory: category,

src/helpers/load-meeting-data.ts

@@ -89,6 +89,7 @@ export function loadMeetingData(
       conference_phone,
       conference_phone_notes,
       conference_url_notes,
+      // eslint-disable-next-line prefer-const
       feedback_url,
       formatted_address,
       regions,

src/helpers/translate-google-sheet.ts

@@ -10,6 +10,7 @@ export type GoogleSheetData = {
   values: string[][];
 };
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const isGoogleSheetData = (data: any): data is GoogleSheetData => {
   return data && Array.isArray(data.values);
 };

src/helpers/validate-input.ts

@@ -33,7 +33,7 @@ export const validateInput = (
 
   if (weekday.includes('today')) {
     const today = settings.weekdays[new Date().getDay()];
-    weekday = weekday.map(day => day === 'today' ? today : day);
+    weekday = weekday.map(day => (day === 'today' ? today : day));
   }
 
   const type = params.has('type')

src/hooks/filter.tsx

@@ -71,12 +71,8 @@ export const FilterProvider = ({ children }: PropsWithChildren) => {
         } else {
           // get the union of other filters (Monday OR Tuesday)
           matchGroups.push(
-            [].concat.apply(
-              [],
-              // @ts-expect-error TODO
-              input[filter].map(
-                key => getIndexByKey(indexes[filter], key)?.slugs ?? []
-              )
+            input[filter].flatMap(
+              key => getIndexByKey(indexes[filter], key)?.slugs ?? []
             )
           );
         }
@@ -110,8 +106,7 @@ export const FilterProvider = ({ children }: PropsWithChildren) => {
             andTerm.every(term => meetings[slug].search?.search(term) !== -1)
           )
         );
-        // @ts-expect-error TODO
-        matchGroups.push([].concat.apply([], matches));
+        matchGroups.push(matches);
       }
     } else if (['me', 'location'].includes(input.mode)) {
       // only show meetings with physical locations