@shopify/create-hydrogen 5.0.22 → 5.0.23

package/dist/assets/hydrogen/starter/tsconfig.json

@@ -1,7 +1,16 @@
 {
-  "include": ["./**/*.d.ts", "./**/*.ts", "./**/*.tsx"],
+  "include": [
+    "./**/*.d.ts",
+    "./**/*.ts",
+    "./**/*.tsx",
+    ".react-router/types/**/*"
+  ],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "lib": [
+      "DOM",
+      "DOM.Iterable",
+      "ES2022"
+    ],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
@@ -16,12 +25,15 @@
     "baseUrl": ".",
     "types": [
       "@shopify/oxygen-workers-types",
-      "@remix-run/server-runtime",
+      "react-router",
       "vite/client"
     ],
     "paths": {
-      "~/*": ["app/*"]
+      "~/*": [
+        "app/*"
+      ]
     },
-    "noEmit": true
+    "noEmit": true,
+    "rootDirs": [".", "./.react-router/types"]
   }
-}
+}

package/dist/assets/hydrogen/starter/vite.config.ts

@@ -1,32 +1,11 @@
 import {defineConfig} from 'vite';
 import {hydrogen} from '@shopify/hydrogen/vite';
 import {oxygen} from '@shopify/mini-oxygen/vite';
-import {vitePlugin as remix} from '@remix-run/dev';
+import {reactRouter} from '@react-router/dev/vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
-declare module "@remix-run/server-runtime" {
-  interface Future {
-    v3_singleFetch: true;
-  }
-}
-
 export default defineConfig({
-  plugins: [
-    hydrogen(),
-    oxygen(),
-    remix({
-      presets: [hydrogen.v3preset()],
-      future: {
-        v3_fetcherPersist: true,
-        v3_relativeSplatPath: true,
-        v3_throwAbortReason: true,
-        v3_lazyRouteDiscovery: true,
-        v3_routeConfig: true,
-        v3_singleFetch: true,
-      },
-    }),
-    tsconfigPaths(),
-  ],
+  plugins: [hydrogen(), oxygen(), reactRouter(), tsconfigPaths()],
   build: {
     // Allow a strict Content-Security-Policy
     // withtout inlining assets as base64:

package/dist/assets/hydrogen/virtual-routes/components/RequestDetails.jsx

@@ -1,6 +1,6 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useState, useRef } from "react";
-import { Link } from "@remix-run/react";
+import { Link } from "react-router";
 import { IconClose } from "./IconClose.jsx";
 import _useResizeObserver from "use-resize-observer";
 const useResizeObserver = _useResizeObserver;

package/dist/assets/hydrogen/virtual-routes/layout.jsx

@@ -1,12 +1,6 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useNonce } from "@shopify/hydrogen";
-import {
-  Links,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration
-} from "@remix-run/react";
+import { Links, Meta, Outlet, Scripts, ScrollRestoration } from "react-router";
 import { Layout as VirtualLayout } from "./components/Layout.jsx";
 import styles from "./assets/styles.css?url";
 function Layout() {

package/dist/assets/hydrogen/virtual-routes/routes/index.jsx

@@ -1,5 +1,5 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { useLoaderData } from "@remix-run/react";
+import { useLoaderData } from "react-router";
 import { HydrogenLogoBaseBW } from "../components/HydrogenLogoBaseBW.jsx";
 import { HydrogenLogoBaseColor } from "../components/HydrogenLogoBaseColor.jsx";
 import { IconGithub } from "../components/IconGithub.jsx";

package/dist/assets/hydrogen/virtual-routes/routes/subrequest-profiler.jsx

@@ -3,7 +3,7 @@ import { useEffect, useState } from "react";
 import { Script } from "@shopify/hydrogen";
 import { RequestWaterfall } from "../components/RequestWaterfall.jsx";
 import { RequestTable } from "../components/RequestTable.jsx";
-import { Link } from "@remix-run/react";
+import { Link } from "react-router";
 import favicon from "../assets/favicon.svg";
 import faviconDark from "../assets/favicon-dark.svg";
 import { useDebugNetworkServer } from "../lib/useDebugNetworkServer.jsx";

package/dist/assets/hydrogen/virtual-routes/virtual-root-with-layout.jsx

@@ -7,7 +7,7 @@ import {
   ScrollRestoration,
   isRouteErrorResponse,
   useRouteError
-} from "@remix-run/react";
+} from "react-router";
 import favicon from "./assets/favicon.svg";
 import { Layout as VirtualLayout } from "./components/Layout.jsx";
 import { useNonce } from "@shopify/hydrogen";

package/dist/assets/hydrogen/virtual-routes/virtual-root.jsx

@@ -7,7 +7,7 @@ import {
   ScrollRestoration,
   isRouteErrorResponse,
   useRouteError
-} from "@remix-run/react";
+} from "react-router";
 import favicon from "./assets/favicon.svg";
 import { Layout as VirtualLayout } from "./components/Layout.jsx";
 import { useNonce } from "@shopify/hydrogen";

package/dist/assets/hydrogen/vite/vite.config.js

@@ -14,7 +14,7 @@ export default defineConfig({
         v3_fetcherPersist: true,
         v3_relativeSplatPath: true,
         v3_throwAbortReason: true,
-        v3_routeConfig: true,
+        v3_routeConfig: false,
       },
     }),
     tsconfigPaths(),