FY25 Q3 package updates and required chagnes

package.json

@@ -37,63 +37,62 @@
     "upload-debug-symbols": "node sentry-symbols.js"
   },
   "dependencies": {
-    "@headlessui/react": "^2.1.10",
+    "@headlessui/react": "^2.2.0",
     "clsx": "^2.1.1",
-    "csv-parse": "^5.5.6",
-    "csv-stringify": "^6.5.1",
-    "electron-log": "^5.2.0",
+    "csv-parse": "^5.6.0",
+    "csv-stringify": "^6.5.2",
+    "electron-log": "^5.2.4",
     "electron-store": "^10.0.0",
     "electron-unhandled": "^5.0.0",
     "electron-util": "^0.18.1",
     "electron-window-state": "^5.0.3",
     "humanize-duration": "^3.32.1",
-    "ky": "^1.7.2",
+    "ky": "^1.7.4",
     "md5": "^2.3.0",
     "os-name": "^6.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-dropzone": "^14.2.9",
-    "react-error-boundary": "^4.1.1",
+    "react-dropzone": "^14.3.5",
+    "react-error-boundary": "^5.0.0",
     "react-navigator-status": "^0.1.2",
     "react-router-dom": "^5.3.4",
-    "update-electron-app": "^3.0.0",
-    "use-immer": "^0.10.0"
+    "update-electron-app": "^3.1.0",
+    "use-immer": "^0.11.0"
   },
   "devDependencies": {
-    "@electron-forge/cli": "^7.5.0",
-    "@electron-forge/maker-deb": "^7.5.0",
-    "@electron-forge/maker-dmg": "^7.5.0",
-    "@electron-forge/maker-rpm": "^7.5.0",
-    "@electron-forge/maker-squirrel": "^7.5.0",
-    "@electron-forge/maker-zip": "^7.5.0",
-    "@electron-forge/plugin-auto-unpack-natives": "^7.5.0",
-    "@electron-forge/plugin-fuses": "^7.5.0",
-    "@electron-forge/plugin-vite": "^7.5.0",
-    "@electron-forge/publisher-github": "^7.5.0",
+    "@electron-forge/cli": "^7.6.0",
+    "@electron-forge/maker-deb": "^7.6.0",
+    "@electron-forge/maker-dmg": "^7.6.0",
+    "@electron-forge/maker-rpm": "^7.6.0",
+    "@electron-forge/maker-squirrel": "^7.6.0",
+    "@electron-forge/maker-zip": "^7.6.0",
+    "@electron-forge/plugin-auto-unpack-natives": "^7.6.0",
+    "@electron-forge/plugin-fuses": "^7.6.0",
+    "@electron-forge/plugin-vite": "^7.6.0",
+    "@electron-forge/publisher-github": "^7.6.0",
     "@electron/fuses": "^1.8.0",
-    "@heroicons/react": "^2.1.5",
+    "@heroicons/react": "^2.2.0",
     "@types/electron-squirrel-startup": "^1.0.2",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.1",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "autoprefixer": "^10.4.20",
     "cross-env": "^7.0.3",
-    "dotenv": "^16.4.5",
-    "electron": "33.0.1",
+    "dotenv": "^16.4.7",
+    "electron": "33.2.1",
     "electron-squirrel-startup": "^1.0.1",
     "eslint": "^8.57.1",
     "eslint-plugin-import": "^2.31.0",
-    "postcss": "^8.4.47",
-    "prettier": "^3.3.3",
+    "postcss": "^8.4.49",
+    "prettier": "^3.4.2",
     "prettier-plugin-organize-imports": "^4.1.0",
-    "prettier-plugin-packagejson": "^2.5.3",
-    "prettier-plugin-tailwindcss": "^0.6.8",
-    "tailwindcss": "^3.4.14",
+    "prettier-plugin-packagejson": "^2.5.6",
+    "prettier-plugin-tailwindcss": "^0.6.9",
+    "tailwindcss": "^3.4.17",
     "ts-node": "^10.9.2",
-    "typescript": "~4.5.4",
-    "vite": "^5.4.9",
-    "vite-plugin-static-copy": "^0.17.1"
+    "typescript": "~5.7.2",
+    "vite": "^6.0.6"
   },
   "productName": "forge-vite-ts"
 }

src/main.ts

@@ -1,6 +1,7 @@
 import { app, BrowserWindow, dialog, ipcMain, shell } from 'electron';
 import logger from 'electron-log/main';
 import startup from 'electron-squirrel-startup';
+// eslint-disable-next-line import/no-unresolved
 import { enforceMacOSAppLocation, isDev } from 'electron-util/main';
 import windowStateKeeper from 'electron-window-state';
 import path from 'path';

src/pages/ApiKey.tsx

@@ -32,7 +32,6 @@ export function ApiKey() {
         }
       })
       .catch(handleError);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [history, handleError]);
 
   const onApiKeyChange = async (event) => {

src/services/errors.ts

@@ -1,11 +1,14 @@
 import { app, ipcMain, shell } from 'electron';
 // import unhandled from 'electron-unhandled';
+// eslint-disable-next-line import/no-unresolved
 // import { openNewGitHubIssue } from 'electron-util';
 import osName from 'os-name';
 
+// Module format "cjs" does not support top-level await. Use the "es" or "system" output formats rather.
 // unhandled({
 //   reportButton: (error) => {
-//     openIssue(error.message, error.stack);
+//     console.log(error);
+//     // openIssue(error.message, error.stack);
 //   },
 //   logger: (error) => {
 //     console.error(error, true);
@@ -17,7 +20,7 @@ ipcMain.on('relaunchApp', () => {
   app.exit();
 });
 
-function getBody(message, stack) {
+function getBody(message: string, stack: string) {
   return `### What happened?
 
 
@@ -62,11 +65,11 @@ ipcMain.on('openEmail', (_, { message, stack }) => {
   );
 });
 
-ipcMain.on('openIssue', (_, { message, stack }) => {
-  // openIssue(message, stack);
-});
+// ipcMain.on('openIssue', (_, { message, stack }) => {
+//   openIssue(message, stack);
+// });
 
-// const openIssue = (message, stack) => {
+// const openIssue = (message: string, stack: string) => {
 //   openNewGitHubIssue({
 //     user: 'agrc',
 //     repo: 'api-client',

src/services/geocode.ts

@@ -1,21 +1,12 @@
 import { parse } from 'csv-parse';
 import { stringify } from 'csv-stringify';
-import { app, ipcMain, nativeImage } from 'electron';
-// import url from 'url';
+import { app, ipcMain } from 'electron';
 import log from 'electron-log/main';
 import fs from 'fs';
 import ky from 'ky';
 import path from 'path';
 // import { trackEvent } from './analytics';
-// import md5 from 'md5';
 // import '../../tests/mocks/server';
-// does this not work because we are not in a tsx file?
-import dragIconUrl from '../assets/draganddrop.png';
-
-const dragIcon = nativeImage.createFromPath(dragIconUrl);
-
-// const __filename = url.fileURLToPath(import.meta.url);
-// const __dirname = path.dirname(__filename);
 const SPACES = / +/;
 const INVALID_CHARS = /[^a-zA-Z0-9]/g;
 
@@ -28,7 +19,7 @@ const client = ky.create({
   },
 });
 
-const cleanseStreet = (data) => {
+const cleanseStreet = (data: string) => {
   const replacement = ' ';
 
   // & -> and
@@ -39,7 +30,7 @@ const cleanseStreet = (data) => {
   return street.trim();
 };
 
-const cleanseZone = (data) => {
+const cleanseZone = (data: number) => {
   let zone = data.toString().replace(INVALID_CHARS, ' ');
   zone = zone.replace(SPACES, ' ').trim();
 
@@ -57,12 +48,12 @@ const coolYourJets = () => {
   return new Promise((resolve) => setTimeout(resolve, Math.random() * (max - min) + min));
 };
 
-let cancelled;
+let cancelled: string;
 export const cancelGeocode = (status = 'cancelled') => {
   cancelled = status;
 };
 
-export const checkApiKey = async (apiKey) => {
+export const checkApiKey = async (apiKey: string) => {
   log.info(`Checking API key: ${apiKey}`);
 
   let response;

tsconfig.json

@@ -1,15 +1,15 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "module": "ESNext",
+    "module": "CommonJS",
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
     "noImplicitAny": true,
     "sourceMap": true,
     "baseUrl": ".",
     "outDir": "dist",
-    "moduleResolution": "Bundler",
+    "moduleResolution": "node",
     "resolveJsonModule": true,
     "jsx": "react-jsx",
   }