@striae-org/striae 3.2.0 → 3.2.2

package/app/components/actions/image-manage.ts

@@ -1,4 +1,4 @@
-import { User } from 'firebase/auth';
+import type { User } from 'firebase/auth';
 import paths from '~/config/config.json';
 import { 
   getImageApiKey,
@@ -6,8 +6,8 @@ import {
 } from '~/utils/auth';
 import { canUploadFile } from '~/utils/permissions';
 import { getCaseData, updateCaseData, deleteFileAnnotations } from '~/utils/data-operations';
-import { CaseData, FileData, ImageUploadResponse } from '~/types';
-import { auditService } from '~/services/audit.service';
+import type { CaseData, FileData, ImageUploadResponse } from '~/types';
+import { auditService } from '~/services/audit';
 
 const IMAGE_URL = paths.image_worker_url;
 

package/app/components/actions/notes-manage.ts

@@ -1,6 +1,6 @@
-import { User } from 'firebase/auth';
-import { AnnotationData } from '~/types/annotations';
-import { saveFileAnnotations, getFileAnnotations, DataOperationOptions } from '~/utils/data-operations';
+import type { User } from 'firebase/auth';
+import { type AnnotationData } from '~/types/annotations';
+import { saveFileAnnotations, getFileAnnotations, type DataOperationOptions } from '~/utils/data-operations';
 
 export const saveNotes = async (
   user: User,

package/app/components/actions/signout.tsx

@@ -1,5 +1,5 @@
 import { auth } from '~/services/firebase';
-import { auditService } from '~/services/audit.service';
+import { auditService } from '~/services/audit';
 import { generateUniqueId } from '~/utils/id-generator';
 import styles from './signout.module.css';
 

package/app/components/audit/user-audit-viewer.tsx

@@ -1,8 +1,7 @@
 import { useState, useEffect, useContext, useCallback } from 'react';
 import { AuthContext } from '~/contexts/auth.context';
-import { auditService } from '~/services/audit.service';
-import { auditExportService } from '~/services/audit-export.service';
-import { ValidationAuditEntry, AuditAction, AuditResult, AuditTrail, UserData, WorkflowPhase } from '~/types';
+import { auditService, auditExportService } from '~/services/audit';
+import { type ValidationAuditEntry, type AuditAction, type AuditResult, type AuditTrail, type UserData, type WorkflowPhase } from '~/types';
 import { getUserData } from '~/utils/permissions';
 import styles from './user-audit.module.css';
 

package/app/components/auth/auth-provider.tsx

@@ -1,11 +1,11 @@
-import { User } from 'firebase/auth';
+import type { User } from 'firebase/auth';
 import { useEffect, useState } from 'react';
 import { auth } from '~/services/firebase';
 import { useInactivityTimeout } from '~/hooks/useInactivityTimeout';
 import { INACTIVITY_CONFIG } from '~/config/inactivity';
 import { AuthContext } from '~/contexts/auth.context';
 import { InactivityWarning } from '~/components/user/inactivity-warning';
-import { auditService } from '~/services/audit.service';
+import { auditService } from '~/services/audit';
 import { generateUniqueId } from '~/utils/id-generator';
 
 interface AuthProviderProps {

package/app/components/auth/mfa-enrollment.tsx

@@ -6,11 +6,11 @@ import {
   PhoneMultiFactorGenerator,
   RecaptchaVerifier,
   multiFactor,
-  User
+  type User
 } from 'firebase/auth';
-import { handleAuthError, getValidationError } from '~/services/firebase-errors';
+import { handleAuthError, getValidationError } from '~/services/firebase/errors';
 import { SignOut } from '~/components/actions/signout';
-import { auditService } from '~/services/audit.service';
+import { auditService } from '~/services/audit';
 import styles from './mfa-enrollment.module.css';
 
 interface MFAEnrollmentProps {

package/app/components/auth/mfa-verification.tsx

@@ -3,13 +3,13 @@ import {
   PhoneAuthProvider, 
   PhoneMultiFactorGenerator, 
   RecaptchaVerifier,
-  MultiFactorResolver,
-  UserCredential
+  type MultiFactorResolver,
+  type UserCredential
 } from 'firebase/auth';
 import { auth } from '~/services/firebase';
-import { handleAuthError, getValidationError } from '~/services/firebase-errors';
+import { handleAuthError, getValidationError } from '~/services/firebase/errors';
 import { SignOut } from '~/components/actions/signout';
-import { auditService } from '~/services/audit.service';
+import { auditService } from '~/services/audit';
 import { generateUniqueId } from '~/utils/id-generator';
 import styles from './mfa-verification.module.css';
 

package/app/components/canvas/box-annotations/box-annotations.tsx

@@ -1,7 +1,7 @@
 import { useState, useCallback, useMemo, useRef, useEffect, useContext } from 'react';
-import { BoxAnnotation } from '~/types';
+import { type BoxAnnotation } from '~/types';
 import { AuthContext } from '~/contexts/auth.context';
-import { auditService } from '~/services/audit.service';
+import { auditService } from '~/services/audit';
 import { resolveEarliestAnnotationTimestamp } from '~/utils/annotation-timestamp';
 import styles from './box-annotations.module.css';
 

package/app/components/canvas/canvas.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState, useRef, useContext, useCallback } from 'react';
 import { BoxAnnotations } from './box-annotations/box-annotations';
 import { ConfirmationModal } from './confirmation/confirmation';
-import { AnnotationData, BoxAnnotation, ConfirmationData } from '~/types/annotations';
+import { type AnnotationData, type BoxAnnotation, type ConfirmationData } from '~/types/annotations';
 import { AuthContext } from '~/contexts/auth.context';
 import { storeConfirmation } from '~/components/actions/confirm-export';
 import styles from './canvas.module.css';

package/app/components/canvas/confirmation/confirmation.tsx

@@ -1,5 +1,5 @@
 import { useState, useEffect, useContext } from 'react';
-import { ConfirmationData } from '~/types/annotations';
+import { type ConfirmationData } from '~/types/annotations';
 import { AuthContext } from '~/contexts/auth.context';
 import { generateConfirmationId } from '~/utils/id-generator';
 import styles from './confirmation.module.css';

package/app/components/form/base-form.tsx

@@ -1,4 +1,4 @@
-import { Form as RemixForm } from '@remix-run/react';
+import { Form as RemixForm } from 'react-router';
 import styles from './form.module.css';
 
 interface BaseFormProps {

package/app/components/sidebar/case-export/case-export.tsx

@@ -364,20 +364,6 @@ export const CaseExport = ({
               </>
             )}
 
-            <div className={styles.divider}>
-              <span>Verification</span>
-            </div>
-
-            <div className={styles.publicKeySection}>
-              <button
-                type="button"
-                className={styles.publicKeyButton}
-                onClick={() => setIsPublicKeyModalOpen(true)}
-              >
-                View Public Signing Key
-              </button>
-            </div>
-            
             {exportProgress && exportProgress.total > 0 && (
               <div className={styles.progressSection}>
                 <div className={styles.progressText}>
@@ -391,7 +377,7 @@ export const CaseExport = ({
                 </div>
               </div>
             )}
-            
+
             {isExportingAll && !exportProgress && (
               <div className={styles.progressSection}>
                 <div className={styles.progressText}>
@@ -399,6 +385,20 @@ export const CaseExport = ({
                 </div>
               </div>
             )}
+
+            <div className={styles.divider}>
+              <span>Verification</span>
+            </div>
+
+            <div className={styles.publicKeySection}>
+              <button
+                type="button"
+                className={styles.publicKeyButton}
+                onClick={() => setIsPublicKeyModalOpen(true)}
+              >
+                View Public Signing Key
+              </button>
+            </div>
             
             {error && (
               <div className={styles.error}>

package/app/components/sidebar/case-import/case-import.tsx

@@ -5,8 +5,8 @@ import {
   deleteReadOnlyCase
 } from '~/components/actions/case-review';
 import {
-  ImportResult,  
-  ConfirmationImportResult
+  type ImportResult,  
+  type ConfirmationImportResult
 } from '~/types';
 import {
   FileSelector,

package/app/components/sidebar/case-import/components/CasePreviewSection.tsx

@@ -1,4 +1,4 @@
-import { CaseImportPreview } from '~/types';
+import { type CaseImportPreview } from '~/types';
 import styles from '../case-import.module.css';
 
 interface CasePreviewSectionProps {

package/app/components/sidebar/case-import/components/ConfirmationDialog.tsx

@@ -1,4 +1,4 @@
-import { CaseImportPreview } from '~/types';
+import { type CaseImportPreview } from '~/types';
 import styles from '../case-import.module.css';
 
 interface ConfirmationDialogProps {

package/app/components/sidebar/case-import/hooks/useFilePreview.ts

@@ -1,8 +1,8 @@
 import { useState, useCallback } from 'react';
-import { User } from 'firebase/auth';
+import type { User } from 'firebase/auth';
 import { previewCaseImport } from '~/components/actions/case-review';
-import { CaseImportPreview } from '~/types';
-import { ConfirmationPreview } from '../components/ConfirmationPreviewSection';
+import { type CaseImportPreview } from '~/types';
+import { type ConfirmationPreview } from '../components/ConfirmationPreviewSection';
 
 type UnknownRecord = Record<string, unknown>;
 

package/app/components/sidebar/case-import/hooks/useImportExecution.ts

@@ -1,7 +1,7 @@
 import { useCallback } from 'react';
-import { User } from 'firebase/auth';
+import type { User } from 'firebase/auth';
 import { importCaseForReview, importConfirmationData } from '~/components/actions/case-review';
-import { ImportResult, ConfirmationImportResult } from '~/types';
+import { type ImportResult, type ConfirmationImportResult } from '~/types';
 
 interface ProgressState {
   stage: string;

package/app/components/sidebar/cases/case-sidebar.tsx

@@ -1,18 +1,10 @@
-import { User } from 'firebase/auth';
-import {
-  exportCaseData,
-  exportAllCases,
-  downloadCaseAsJSON,
-  downloadCaseAsCSV,
-  downloadAllCasesAsJSON,
-  downloadAllCasesAsCSV,
-  downloadCaseAsZip
-} from '../../actions/case-export';
+import type { User } from 'firebase/auth';
+import type * as CaseExportActions from '../../actions/case-export';
 import { useState, useEffect, useMemo, useCallback } from 'react';
 import styles from './cases.module.css';
 import { CasesModal } from './cases-modal';
 import { FilesModal } from '../files/files-modal';
-import { CaseExport, ExportFormat } from '../case-export/case-export';
+import { CaseExport, type ExportFormat } from '../case-export/case-export';
 import { ImageUploadZone } from '../upload/image-upload-zone';
 import { UserAuditViewer } from '~/components/audit/user-audit-viewer';
 import {
@@ -36,7 +28,7 @@ import {
   getUserData
 } from '~/utils/permissions';
 import { getFileAnnotations } from '~/utils/data-operations';
-import { FileData, CaseActionType } from '~/types';
+import { type FileData, type CaseActionType } from '~/types';
 
 interface CaseSidebarProps {
   user: User;
@@ -66,6 +58,18 @@ interface CaseSidebarProps {
 
 const SUCCESS_MESSAGE_TIMEOUT = 3000;
 
+type CaseExportActionsModule = typeof CaseExportActions;
+
+let caseExportActionsPromise: Promise<CaseExportActionsModule> | null = null;
+
+const loadCaseExportActions = (): Promise<CaseExportActionsModule> => {
+  if (!caseExportActionsPromise) {
+    caseExportActionsPromise = import('../../actions/case-export');
+  }
+
+  return caseExportActionsPromise;
+};
+
 export const CaseSidebar = ({ 
   user, 
   onImageSelect, 
@@ -512,20 +516,22 @@ const handleImageSelect = (file: FileData) => {
 
   const handleExport = async (exportCaseNumber: string, format: ExportFormat, includeImages?: boolean) => {
     try {
+      const caseExportActions = await loadCaseExportActions();
+
       if (includeImages) {
         // ZIP export with images - only available for single case exports
-        await downloadCaseAsZip(user, exportCaseNumber, format);
+        await caseExportActions.downloadCaseAsZip(user, exportCaseNumber, format);
       } else {
         // Standard data-only export
-        const exportData = await exportCaseData(user, exportCaseNumber, {
+        const exportData = await caseExportActions.exportCaseData(user, exportCaseNumber, {
           includeMetadata: true
         });
         
         // Download the exported data in the selected format
         if (format === 'json') {
-          await downloadCaseAsJSON(user, exportData);
+          await caseExportActions.downloadCaseAsJSON(user, exportData);
         } else {
-          await downloadCaseAsCSV(user, exportData);
+          await caseExportActions.downloadCaseAsCSV(user, exportData);
         }
       }
       
@@ -537,16 +543,18 @@ const handleImageSelect = (file: FileData) => {
 
   const handleExportAll = async (onProgress: (current: number, total: number, caseName: string) => void, format: ExportFormat) => {
     try {
+      const caseExportActions = await loadCaseExportActions();
+
       // Export all cases with progress callback
-      const exportData = await exportAllCases(user, {
+      const exportData = await caseExportActions.exportAllCases(user, {
         includeMetadata: true
       }, onProgress);
       
       // Download the exported data in the selected format
       if (format === 'json') {
-        await downloadAllCasesAsJSON(user, exportData);
+        await caseExportActions.downloadAllCasesAsJSON(user, exportData);
       } else {
-        await downloadAllCasesAsCSV(user, exportData);
+        await caseExportActions.downloadAllCasesAsCSV(user, exportData);
       }
       
     } catch (error) {

package/app/components/sidebar/cases/cases-modal.tsx

@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import { User } from 'firebase/auth';
+import type { User } from 'firebase/auth';
 import { listCases } from '~/components/actions/case-manage';
 import { getFileAnnotations } from '~/utils/data-operations';
 import { fetchFiles } from '~/components/actions/image-manage';

package/app/components/sidebar/files/files-modal.tsx

@@ -1,8 +1,9 @@
-import React, { useState, useContext, useEffect } from 'react';
+import type React from 'react';
+import { useState, useContext, useEffect } from 'react';
 import { AuthContext } from '~/contexts/auth.context';
 import { deleteFile } from '~/components/actions/image-manage';
 import { getFileAnnotations } from '~/utils/data-operations';
-import { FileData } from '~/types';
+import { type FileData } from '~/types';
 import styles from './files-modal.module.css';
 
 interface FilesModalProps {

package/app/components/sidebar/notes/notes-sidebar.tsx

@@ -1,11 +1,11 @@
 import { useState, useEffect } from 'react';
-import { User } from 'firebase/auth';
+import type { User } from 'firebase/auth';
 import { ColorSelector } from '~/components/colors/colors';
 import { NotesModal } from './notes-modal';
 import { getNotes, saveNotes } from '~/components/actions/notes-manage';
-import { AnnotationData } from '~/types/annotations';
+import { type AnnotationData } from '~/types/annotations';
 import { resolveEarliestAnnotationTimestamp } from '~/utils/annotation-timestamp';
-import { auditService } from '~/services/audit.service';
+import { auditService } from '~/services/audit';
 import styles from './notes.module.css';
 
 interface NotesSidebarProps {

package/app/components/sidebar/sidebar-container.tsx

@@ -1,10 +1,11 @@
 /* eslint-disable jsx-a11y/no-static-element-interactions */
 /* eslint-disable jsx-a11y/click-events-have-key-events */
-import React, { useState, useEffect } from 'react';
-import { Link } from '@remix-run/react';
+import type React from 'react';
+import { useState, useEffect } from 'react';
+import { Link } from 'react-router';
 import { Sidebar } from './sidebar';
-import { User } from 'firebase/auth';
-import { FileData } from '~/types';
+import type { User } from 'firebase/auth';
+import { type FileData } from '~/types';
 import styles from './sidebar.module.css';
 import { getAppVersion } from '../../utils/version';
 

package/app/components/sidebar/sidebar.tsx

@@ -1,4 +1,4 @@
-import { User } from 'firebase/auth';
+import type { User } from 'firebase/auth';
 import { useState, useCallback } from 'react';
 import styles from './sidebar.module.css';
 import { ManageProfile } from '../user/manage-profile';
@@ -7,7 +7,7 @@ import { CaseSidebar } from './cases/case-sidebar';
 import { NotesSidebar } from './notes/notes-sidebar';
 import { CaseImport } from './case-import/case-import';
 import { Toast } from '../toast/toast';
-import { FileData, ImportResult, ConfirmationImportResult } from '~/types';
+import { type FileData, type ImportResult, type ConfirmationImportResult } from '~/types';
 
 interface SidebarProps {
   user: User;

package/app/components/sidebar/upload/image-upload-zone.tsx

@@ -1,8 +1,8 @@
-import { User } from 'firebase/auth';
+import type { User } from 'firebase/auth';
 import { useState, useRef, useEffect, useCallback } from 'react';
 import styles from './image-upload-zone.module.css';
 import { uploadFile } from '~/components/actions/image-manage';
-import { FileData } from '~/types';
+import { type FileData } from '~/types';
 
 interface ImageUploadZoneProps {
   user: User;

package/app/components/theme-provider/theme-provider.tsx

@@ -1,4 +1,4 @@
-import { JSX, createContext, useContext } from 'react';
+import { type JSX, createContext, useContext } from 'react';
 import { classes, media } from '~/utils/style';
 import { themes, tokens } from './theme';
 

package/app/components/user/delete-account.tsx

@@ -3,7 +3,7 @@ import { signOut } from 'firebase/auth';
 import { auth } from '~/services/firebase';
 import paths from '~/config/config.json';
 import { getUserApiKey } from '~/utils/auth';
-import { auditService } from '~/services/audit.service';
+import { auditService } from '~/services/audit';
 import styles from './delete-account.module.css';
 
 interface DeletionProgress {

package/app/components/user/manage-profile.tsx

@@ -5,8 +5,8 @@ import { DeleteAccount } from './delete-account';
 import { UserAuditViewer } from '../audit/user-audit-viewer';
 import { AuthContext } from '~/contexts/auth.context';
 import { getUserData, updateUserData } from '~/utils/permissions';
-import { auditService } from '~/services/audit.service';
-import { handleAuthError, ERROR_MESSAGES } from '~/services/firebase-errors';
+import { auditService } from '~/services/audit';
+import { handleAuthError, ERROR_MESSAGES } from '~/services/firebase/errors';
 import { FormField, FormButton, FormMessage } from '../form';
 import { MfaPhoneUpdateSection } from './mfa-phone-update';
 import styles from './manage-profile.module.css';

package/app/components/user/mfa-phone-update.tsx

@@ -12,9 +12,9 @@ import {
   type MultiFactorResolver,
   type User,
 } from 'firebase/auth';
-import { auditService } from '~/services/audit.service';
+import { auditService } from '~/services/audit';
 import { auth } from '~/services/firebase';
-import { ERROR_MESSAGES, getValidationError, handleAuthError } from '~/services/firebase-errors';
+import { ERROR_MESSAGES, getValidationError, handleAuthError } from '~/services/firebase/errors';
 import {
   formatPhoneNumberForMfa,
   getMaskedFactorDisplay,

package/app/contexts/auth.context.ts

@@ -1,5 +1,5 @@
 import { createContext } from 'react';
-import { User } from 'firebase/auth';
+import type { User } from 'firebase/auth';
 
 interface AuthContextType {
   user: User | null;

package/app/entry.client.tsx

@@ -1,12 +1,12 @@
-import { RemixBrowser } from "@remix-run/react";
-import { startTransition, StrictMode } from "react";
-import { hydrateRoot } from "react-dom/client";
-
-startTransition(() => {
-  hydrateRoot(
-    document,
-    <StrictMode>
-      <RemixBrowser />
-    </StrictMode>
-  );
-});
+import { HydratedRouter } from "react-router/dom";
+import { startTransition, StrictMode } from "react";
+import { hydrateRoot } from "react-dom/client";
+
+startTransition(() => {
+  hydrateRoot(
+    document,
+    <StrictMode>
+      <HydratedRouter />
+    </StrictMode>
+  );
+});

package/app/entry.server.tsx

@@ -1,5 +1,5 @@
-import type { EntryContext } from "@remix-run/cloudflare";
-import { RemixServer } from "@remix-run/react";
+import type { EntryContext } from "react-router";
+import { ServerRouter } from "react-router";
 import { isbot } from "isbot";
 import { renderToReadableStream } from "react-dom/server";
 
@@ -7,10 +7,10 @@ export default async function handleRequest(
   request: Request,
   responseStatusCode: number,
   responseHeaders: Headers,
-  remixContext: EntryContext
+  reactRouterContext: EntryContext
 ) {
   const body = await renderToReadableStream(
-    <RemixServer context={remixContext} url={request.url} />,
+    <ServerRouter context={reactRouterContext} url={request.url} />,
     {
       // If you wish to abort the rendering process, you can pass a signal here.
       // Please refer to the templates for example son how to configure this.

package/app/hooks/useInactivityTimeout.ts

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useCallback } from 'react';
-import { useLocation } from '@remix-run/react';
+import { useLocation } from 'react-router';
 import { signOut } from 'firebase/auth';
 import { auth } from '~/services/firebase';
 import { INACTIVITY_CONFIG } from '~/config/inactivity';

package/app/root.tsx

@@ -1,4 +1,4 @@
-import type { LinksFunction } from "@remix-run/cloudflare";
+import type { LinksFunction } from 'react-router';
 import {
   Links,
   Meta,
@@ -9,8 +9,8 @@ import {
   useRouteError,
   Link,
   useLocation,
-  useMatches
-} from "@remix-run/react";
+  useMatches,
+} from 'react-router';
 import { 
   ThemeProvider,
   themeStyles 

package/app/routes/auth/emailActionHandler.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState } from 'react';
-import { Link, useNavigate } from '@remix-run/react';
+import { Link, useNavigate } from 'react-router';
 import {
   applyActionCode,
   checkActionCode,
@@ -7,10 +7,10 @@ import {
   verifyPasswordResetCode,
 } from 'firebase/auth';
 import { auth } from '~/services/firebase';
-import { handleAuthError } from '~/services/firebase-errors';
+import { handleAuthError } from '~/services/firebase/errors';
 import { evaluatePasswordPolicy } from '~/utils/password-policy';
 import { getSafeContinuePath } from '~/utils/auth-action-settings';
-import { auditService } from '~/services/audit.service';
+import { auditService } from '~/services/audit';
 import { Icon } from '~/components/icon/icon';
 import styles from './emailActionHandler.module.css';
 

package/app/routes/auth/emailVerification.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
-import { Link } from '@remix-run/react';
-import { sendEmailVerification, User } from 'firebase/auth';
-import { auditService } from '~/services/audit.service';
+import { Link } from 'react-router';
+import { sendEmailVerification, type User } from 'firebase/auth';
+import { auditService } from '~/services/audit';
 import { buildActionCodeSettings } from '~/utils/auth-action-settings';
 import styles from './login.module.css';
 

package/app/routes/auth/login.tsx

@@ -1,28 +1,28 @@
 import { useState, useEffect } from 'react';
-import { Link, useSearchParams } from '@remix-run/react';
+import { Link, useSearchParams } from 'react-router';
 import { auth } from '~/services/firebase';
 import {
     signInWithEmailAndPassword, 
     createUserWithEmailAndPassword,
     onAuthStateChanged,
     sendEmailVerification,
-    User,
+  type User,
     updateProfile,
     getMultiFactorResolver,
-    MultiFactorResolver,
-    MultiFactorError
+    type MultiFactorResolver,
+    type MultiFactorError
 } from 'firebase/auth';
 import { PasswordReset } from '~/routes/auth/passwordReset';
 import { EmailVerification } from '~/routes/auth/emailVerification';
 import { EmailActionHandler } from '~/routes/auth/emailActionHandler';
-import { handleAuthError } from '~/services/firebase-errors';
+import { handleAuthError } from '~/services/firebase/errors';
 import { MFAVerification } from '~/components/auth/mfa-verification';
 import { MFAEnrollment } from '~/components/auth/mfa-enrollment';
 import { Icon } from '~/components/icon/icon';
 import styles from './login.module.css';
 import { Striae } from '~/routes/striae/striae';
 import { getUserData, createUser } from '~/utils/permissions';
-import { auditService } from '~/services/audit.service';
+import { auditService } from '~/services/audit';
 import { generateUniqueId } from '~/utils/id-generator';
 import { evaluatePasswordPolicy } from '~/utils/password-policy';
 import { buildActionCodeSettings } from '~/utils/auth-action-settings';

package/app/routes/auth/passwordReset.tsx

@@ -1,9 +1,9 @@
 import { useRef, useState } from 'react';
-import { Link } from '@remix-run/react';
+import { Link } from 'react-router';
 import { sendPasswordResetEmail, signOut } from 'firebase/auth';
 import { auth } from '~/services/firebase';
-import { handleAuthError, ERROR_MESSAGES } from '~/services/firebase-errors';
-import { auditService } from '~/services/audit.service';
+import { handleAuthError, ERROR_MESSAGES } from '~/services/firebase/errors';
+import { auditService } from '~/services/audit';
 import { buildActionCodeSettings } from '~/utils/auth-action-settings';
 import styles from './passwordReset.module.css';
 

package/app/routes/auth/route.ts

@@ -1,4 +1,4 @@
-import { redirect } from '@remix-run/cloudflare';
+import { redirect } from 'react-router';
 
 export const loader = async () => {
 	throw redirect('/');