test(e2e): Fix peer dependency issues in hydrogen-react-router-7

dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/entry.server.tsx

@@ -1,7 +1,6 @@
 import '../instrument.server';
-import { HandleErrorFunction, ServerRouter } from 'react-router';
+import { type EntryContext, HandleErrorFunction, ServerRouter } from 'react-router';
 import { createContentSecurityPolicy } from '@shopify/hydrogen';
-import type { EntryContext } from '@shopify/remix-oxygen';
 import { renderToReadableStream } from 'react-dom/server';
 import * as Sentry from '@sentry/react-router/cloudflare';
 

dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/lib/session.ts

@@ -1,5 +1,5 @@
 import type { HydrogenSession } from '@shopify/hydrogen';
-import { type Session, type SessionStorage, createCookieSessionStorage } from '@shopify/remix-oxygen';
+import { type Session, type SessionStorage, createCookieSessionStorage } from 'react-router';
 
 /**
  * This is a custom session implementation for your Hydrogen shop.

dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/root.tsx

@@ -1,5 +1,5 @@
-import { type LoaderFunctionArgs } from '@shopify/remix-oxygen';
 import {
+  type LoaderFunctionArgs,
   Outlet,
   isRouteErrorResponse,
   type ShouldRevalidateFunction,

dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/routes/loader-error.tsx

@@ -1,5 +1,5 @@
 import { useLoaderData } from 'react-router';
-import type { LoaderFunction } from '@shopify/remix-oxygen';
+import type { LoaderFunction } from 'react-router';
 
 export default function LoaderError() {
   useLoaderData();

dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/routes/navigate.tsx

@@ -1,5 +1,5 @@
 import { useLoaderData } from 'react-router';
-import type { LoaderFunction } from '@shopify/remix-oxygen';
+import type { LoaderFunction } from 'react-router';
 
 export const loader: LoaderFunction = async ({ params: { id } }) => {
   if (id === '-1') {

dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/env.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="vite/client" />
-/// <reference types="@shopify/remix-oxygen" />
 /// <reference types="@shopify/oxygen-workers-types" />
 
 // Enhance TypeScript's built-in typings.

dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/package.json

@@ -6,7 +6,6 @@
     "build": "pnpm typecheck && shopify hydrogen build --codegen",
     "dev": "shopify hydrogen dev --codegen",
     "preview": "shopify hydrogen preview",
-    "lint": "eslint --no-error-on-unmatched-pattern --ext .js,.ts,.jsx,.tsx .",
     "typecheck": "tsc",
     "codegen": "shopify hydrogen codegen",
     "clean": "npx rimraf node_modules dist pnpm-lock.yaml",
@@ -17,35 +16,30 @@
     "@sentry/cloudflare": "file:../../packed/sentry-cloudflare-packed.tgz",
     "@sentry/react-router": "file:../../packed/sentry-react-router-packed.tgz",
     "@sentry/vite-plugin": "^5.4.1",
-    "@shopify/hydrogen": "2025.5.0",
-    "@shopify/remix-oxygen": "^3.0.0",
+    "@shopify/hydrogen": "2026.4.7",
     "graphql": "^16.10.0",
     "graphql-tag": "^2.12.6",
     "isbot": "^5.1.22",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-router": "7.18.2",
-    "react-router-dom": "7.13.0"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-router": "7.16.0",
+    "react-router-dom": "7.16.0"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.2",
     "@playwright/test": "~1.63.0",
-    "@react-router/dev": "7.13.0",
-    "@react-router/fs-routes": "7.13.0",
+    "@react-router/dev": "7.16.0",
+    "@react-router/fs-routes": "7.16.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@shopify/cli": "3.80.4",
     "@shopify/hydrogen-codegen": "^0.3.3",
     "@shopify/mini-oxygen": "3.2.1",
     "@shopify/oxygen-workers-types": "^4.1.6",
-    "@tailwindcss/vite": "4.0.0-alpha.17",
     "@total-typescript/ts-reset": "^0.4.2",
-    "@types/eslint": "^8.4.10",
     "@types/react": "^18.2.22",
     "@types/node": "^18.19.1",
     "@types/react-dom": "^18.2.7",
     "esbuild": "0.25.0",
-    "eslint": "^9.18.0",
-    "eslint-plugin-hydrogen": "0.12.2",
     "typescript": "^5.2.2",
     "vite": "^6.2.4",
     "vite-tsconfig-paths": "^4.3.1"

dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/server.ts

@@ -6,7 +6,8 @@ import {
   createStorefrontClient,
   storefrontRedirect,
 } from '@shopify/hydrogen';
-import { type AppLoadContext, createRequestHandler, getStorefrontHeaders } from '@shopify/remix-oxygen';
+import { createRequestHandler, getStorefrontHeaders } from '@shopify/hydrogen/oxygen';
+import type { AppLoadContext } from 'react-router';
 import { CART_QUERY_FRAGMENT } from '~/lib/fragments';
 import { AppSession } from '~/lib/session';
 import { httpServerIntegration, wrapRequestHandler } from '@sentry/cloudflare/request';