@striae-org/striae 3.1.1 → 3.2.1

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,

package/app/routes/auth/emailVerification.tsx

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

package/app/routes/auth/login.tsx

@@ -1,5 +1,5 @@
 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, 

package/app/routes/auth/passwordReset.tsx

@@ -1,5 +1,5 @@
 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';

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('/');

package/app/services/firebase.ts

@@ -1,6 +1,8 @@
 import { initializeApp } from 'firebase/app';
 import { 
     getAuth,
+    setPersistence,
+    browserSessionPersistence,
     //connectAuthEmulator,    
  } from 'firebase/auth';
 import firebaseConfig from '~/config/firebase';
@@ -9,6 +11,8 @@ import { getAppVersion } from '~/utils/version';
 export const app = initializeApp(firebaseConfig, "Striae");
 export const auth = getAuth(app);
 
+setPersistence(auth, browserSessionPersistence);
+
 console.log(`Welcome to ${app.name} v${getAppVersion()}`);
 
 //Connect to the Firebase Auth emulator if running locally

package/app/types/exceljs-bare.d.ts

@@ -0,0 +1,7 @@
+declare global {
+  interface Window {
+    ExcelJS?: typeof import('exceljs');
+  }
+}
+
+export {};

package/app/utils/auth.ts

@@ -3,7 +3,7 @@ import paths from '~/config/config.json';
 const KEYS_URL = paths.keys_url;
 const KEYS_AUTH = paths.keys_auth;
 
-type KeyType = 'USER_DB_AUTH' | 'R2_KEY_SECRET' | 'IMAGES_API_TOKEN' | 'ACCOUNT_HASH';
+type KeyType = 'USER_DB_AUTH' | 'R2_KEY_SECRET' | 'IMAGES_API_TOKEN' | 'ACCOUNT_HASH' | 'PDF_WORKER_AUTH';
 
 async function getApiKey(keyType: KeyType): Promise<string> {
   const keyResponse = await fetch(`${KEYS_URL}/${keyType}`, {
@@ -31,4 +31,8 @@ export async function getImageApiKey(): Promise<string> {
 
 export async function getAccountHash(): Promise<string> {
   return getApiKey('ACCOUNT_HASH');
+}
+
+export async function getPdfApiKey(): Promise<string> {
+  return getApiKey('PDF_WORKER_AUTH');
 }

package/functions/[[path]].ts

@@ -1,7 +1,7 @@
-import { createPagesFunctionHandler } from "@remix-run/cloudflare-pages";
+import { createPagesFunctionHandler } from "@react-router/cloudflare";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore - the server build file is generated by `remix vite:build`
+// @ts-ignore - the server build file is generated by `react-router build`
 import * as build from "../build/server";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment

package/package.json

@@ -1,14 +1,24 @@
 {
   "name": "@striae-org/striae",
-  "version": "3.1.1",
+  "version": "3.2.1",
   "private": false,
-  "description": "Cloud-native forensic annotation application for firearms identification (Remix + Cloudflare Workers).",
+  "description": "Striae is a cloud-native forensic annotation application for firearms identification, built with React Router and Cloudflare Workers.",
   "license": "Apache-2.0",
   "homepage": "https://www.striae.org",
   "repository": {
     "type": "git",
     "url": "https://github.com/striae-org/striae.git"
   },
+  "funding": [
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/striae-org"
+    },
+    {
+      "type": "patreon",
+      "url": "https://join.striae.org"
+    }
+  ],
   "bugs": {
     "url": "https://github.com/striae-org/striae/issues"
   },
@@ -16,7 +26,7 @@
     "forensics",
     "firearms",
     "annotation",
-    "remix",
+    "react",
     "cloudflare-workers",
     "chain-of-custody",
     "audit-trail"
@@ -60,15 +70,13 @@
     "LICENSE",
     "NOTICE"
   ],
-  "sideEffects": [
-    "**/*.css"
-  ],
+  "sideEffects": false,
   "type": "module",
   "scripts": {
     "deploy:all": "bash ./scripts/deploy-all.sh",
     "emulators": "firebase emulators:start --only auth",
-    "dev": "node ./scripts/dev.cjs && remix vite:dev",
-    "build": "node ./scripts/dev.cjs && remix vite:build",
+    "dev": "node ./scripts/dev.cjs && react-router dev",
+    "build": "node ./scripts/dev.cjs && react-router build",
     "clean": "rm -rf build node_modules/.cache .cache",
     "clean:build": "npm run clean && npm run build",
     "deploy": "npm run build && wrangler pages deploy",
@@ -80,7 +88,7 @@
     "publish:all:dry-run": "npm run publish:npm:dry-run && npm run publish:github:dry-run",
     "lint": "node ./scripts/run-eslint.cjs",
     "start": "node ./scripts/dev.cjs && wrangler pages dev",
-    "typecheck": "tsc",
+    "typecheck": "react-router typegen && tsc",
     "typegen": "wrangler types",
     "preview": "npm run build && wrangler pages dev",
     "cf-typegen": "wrangler types",
@@ -100,18 +108,18 @@
     "deploy-workers:user": "cd workers/user-worker && npm run deploy"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "^2.17.4",
-    "@remix-run/cloudflare-pages": "^2.17.4",
-    "@remix-run/react": "^2.17.4",
+    "@react-router/cloudflare": "^7.13.1",
+    "exceljs": "^4.4.0",
     "firebase": "^12.10.0",
     "isbot": "^5.1.35",
     "jszip": "^3.10.1",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "xlsx": "^0.18.5"
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
+    "react-router": "^7.13.1"
   },
   "devDependencies": {
-    "@remix-run/dev": "^2.17.4",
+    "@react-router/dev": "^7.13.1",
+    "@react-router/fs-routes": "^7.13.1",
     "@types/react": "^19.1.10",
     "@types/react-dom": "^19.1.7",
     "@typescript-eslint/eslint-plugin": "^8.54.0",
@@ -128,10 +136,17 @@
     "typescript": "^5.9.3",
     "vite": "^6.4.1",
     "vite-tsconfig-paths": "^6.1.1",
-    "wrangler": "^3.114.17"
+    "wrangler": "^4.73.0"
   },
   "overrides": {
-    "tar": "7.5.11"
+    "tar": "7.5.11",
+    "undici": "7.24.1",
+    "exceljs": {
+      "archiver": "7.0.1",
+      "fast-csv": "5.0.5",
+      "unzipper": "0.12.3",
+      "glob": "13.0.6"
+    }
   },
   "engines": {
     "node": ">=20.0.0"

package/public/_routes.json

@@ -8,6 +8,7 @@
     "/*.css",
     "/*.js",
     "/*.pdf",
+    "/*.png",
     "/*.zip"    
   ]
 }

package/public/vendor/exceljs.LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2019 Guyon Roche
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+