update library for react-router 7

Author: nicknisi

package-lock.json

@@ -28,7 +28,7 @@
     "jose": "^5.2.3"
   },
   "peerDependencies": {
-    "@remix-run/node": "^2.4.1",
+    "react-router": "^7.2.0",
     "react": "^18.0 || ^19.0.0",
     "react-dom": "^18.0 || ^19.0.0"
   },

package.json

@@ -1,4 +1,4 @@
-import type { LoaderFunction } from '@remix-run/node';
+import type { LoaderFunction } from 'react-router';
 import { getWorkOS } from './workos.js';
 import { authLoader } from './authkit-callback-route.js';
 import {

src/authkit-callback-route.spec.ts

@@ -1,4 +1,4 @@
-import { LoaderFunctionArgs, json, redirect } from '@remix-run/node';
+import { LoaderFunctionArgs, data as json, redirect } from 'react-router';
 import { getConfig } from './config.js';
 import { HandleAuthOptions } from './interfaces.js';
 import { encryptSession } from './session.js';

src/authkit-callback-route.ts

@@ -1,4 +1,4 @@
-import type { SessionStorage, SessionIdStorageStrategy } from '@remix-run/node';
+import type { SessionStorage, SessionIdStorageStrategy } from 'react-router';
 import type { OauthTokens, User } from '@workos-inc/node';
 
 export interface HandleAuthOptions {

src/interfaces.ts

@@ -1,4 +1,4 @@
-import { LoaderFunctionArgs, Session as RemixSession, redirect } from '@remix-run/node';
+import { LoaderFunctionArgs, Session as RemixSession, redirect } from 'react-router';
 import { AuthenticationResponse } from '@workos-inc/node';
 import * as ironSession from 'iron-session';
 import * as jose from 'jose';

src/session.spec.ts

@@ -1,5 +1,4 @@
-import type { LoaderFunctionArgs, SessionData, TypedResponse } from '@remix-run/node';
-import { json, redirect } from '@remix-run/node';
+import { data as json, redirect, type LoaderFunctionArgs, type SessionData } from 'react-router';
 import { getAuthorizationUrl } from './get-authorization-url.js';
 import type { AccessToken, AuthKitLoaderOptions, AuthorizedData, Session, UnauthorizedData } from './interfaces.js';
 import { getWorkOS } from './workos.js';
@@ -9,6 +8,12 @@ import { createRemoteJWKSet, decodeJwt, jwtVerify } from 'jose';
 import { getConfig } from './config.js';
 import { configureSessionStorage, getSessionStorage } from './sessionStorage.js';
 
+// must be a type since this is a subtype of response
+// interfaces must conform to the types they extend
+export type TypedResponse<T> = Response & {
+  json(): Promise<T>;
+};
+
 async function updateSession(request: Request, debug: boolean) {
   const session = await getSessionFromCookie(request.headers.get('Cookie') as string);
   const { commitSession, getSession, destroySession } = await getSessionStorage();

src/session.ts

@@ -1,4 +1,4 @@
-import { createCookie, createMemorySessionStorage } from '@remix-run/node';
+import { createCookie, createMemorySessionStorage } from 'react-router';
 import { SessionStorageManager, errors } from './sessionStorage.js';
 import { configure } from './config.js';
 
@@ -81,7 +81,7 @@ describe('SessionStorageManager', () => {
   });
 
   describe('storageManager', () => {
-    type CreateCookieSessionStorageType = (typeof import('@remix-run/node'))['createCookieSessionStorage'];
+    type CreateCookieSessionStorageType = (typeof import('react-router'))['createCookieSessionStorage'];
     let createCookieSessionStorage: jest.MockedFunction<CreateCookieSessionStorageType>;
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -97,16 +97,16 @@ describe('SessionStorageManager', () => {
       });
 
       // Mock first, before any imports
-      jest.doMock('@remix-run/node', () => ({
-        ...jest.requireActual('@remix-run/node'),
+      jest.doMock('react-router', () => ({
+        ...jest.requireActual('react-router'),
         createCookieSessionStorage: jest.fn().mockReturnValue({
           getSession: jest.fn(),
           commitSession: jest.fn(),
           destroySession: jest.fn(),
         }),
       }));
 
-      createCookieSessionStorage = (await import('@remix-run/node'))
+      createCookieSessionStorage = (await import('react-router'))
         .createCookieSessionStorage as jest.MockedFunction<CreateCookieSessionStorageType>;
 
       const { SessionStorageManager } = await import('./sessionStorage.js');

src/sessionStorage.spec.ts

@@ -1,4 +1,4 @@
-import { createCookieSessionStorage, type SessionIdStorageStrategy, type SessionStorage } from '@remix-run/node';
+import { createCookieSessionStorage, type SessionIdStorageStrategy, type SessionStorage } from 'react-router';
 import { getConfig } from './config.js';
 
 type SessionStorageConfig = { storage?: never; cookieName?: string } | { storage: SessionStorage; cookieName: string };