Merge pull request #9 from forge-42/rr7

Migration from remix to rr7

Author: AlemTuzlak

.gitignore

@@ -129,4 +129,5 @@ dist
 .yarn/install-state.gz
 .pnp.*
 /dist
-.history
+.history
+.react-router

package-lock.json

@@ -25,18 +25,18 @@
 		"test:cov": "vitest run --coverage",
 		"postbuild": "npm run check:exports",
 		"build": "tsup src/index.ts --config tsup.config.ts",
-		"remix:dev": "npm run dev -w test-apps/remix-vite",
-		"remix:cjs:dev": "npm run dev -w test-apps/remix-vite-cjs",
+		"react-router:esm:dev": "npm run dev -w test-apps/react-router-esm",
+		"react-router:cjs:dev": "npm run dev -w test-apps/react-router-cjs",
 		"build:dev": "tsup src/index.ts --config tsup.dev.config.ts",
 		"build:dev:watch": "npm run build:dev -- --watch",
 		"build:dev:cjs:watch": "npm run build:dev -- --watch",
-		"dev": "npm-run-all -s build:dev -p remix:dev build:dev:watch",
-		"dev:cjs": "npm-run-all -s build:dev -p remix:cjs:dev build:dev:cjs:watch",
+		"dev": "npm-run-all -s build:dev -p react-router:esm:dev build:dev:watch",
+		"dev:cjs": "npm-run-all -s build:dev -p react-router:cjs:dev build:dev:cjs:watch",
 		"prepublishOnly": "npm run build",
 		"check": "biome check .",
 		"check:fix": "biome check --fix .",
 		"typecheck": "tsc",
-		"validate": "npm run check && npm run tsc && npm run test",
+		"validate": "npm run check && npm run typecheck && npm run test",
 		"check:exports": "attw --pack .",
 		"local-release": "changeset version && changeset publish"
 	},

package.json

@@ -4,15 +4,15 @@
  * For more information, see https://remix.run/file-conventions/entry.client
  */
 
-import { RemixBrowser } from "@remix-run/react";
+import { HydratedRouter } from "react-router/dom"
 import { startTransition, StrictMode } from "react";
 import { hydrateRoot } from "react-dom/client";
 
 startTransition(() => {
   hydrateRoot(
     document,
     <StrictMode>
-      <RemixBrowser />
+     	<HydratedRouter />
     </StrictMode>
   );
 });

test-apps/remix-vite-cjs/.eslintrc.cjs test-apps/react-router-cjs/.eslintrc.cjstest-apps/remix-vite-cjs/.eslintrc.cjs renamed to test-apps/react-router-cjs/.eslintrc.cjs

@@ -5,10 +5,8 @@
  */
 
 import { PassThrough } from "node:stream";
-
-import type { AppLoadContext, EntryContext } from "@remix-run/node";
-import { createReadableStreamFromReadable } from "@remix-run/node";
-import { RemixServer } from "@remix-run/react";
+import { createReadableStreamFromReadable } from "@react-router/node";
+import { type AppLoadContext, type EntryContext, ServerRouter } from "react-router"
 import { isbot } from "isbot";
 import { renderToPipeableStream } from "react-dom/server";
 
@@ -18,7 +16,7 @@ export default function handleRequest(
   request: Request,
   responseStatusCode: number,
   responseHeaders: Headers,
-  remixContext: EntryContext,
+  reactRouterContext: EntryContext,
   // This is ignored so we can keep it in the template for visibility.  Feel
   // free to delete this parameter in your app if you're not using it!
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -29,30 +27,26 @@ export default function handleRequest(
         request,
         responseStatusCode,
         responseHeaders,
-        remixContext
+        reactRouterContext
       )
     : handleBrowserRequest(
         request,
         responseStatusCode,
         responseHeaders,
-        remixContext
+        reactRouterContext
       );
 }
 
 function handleBotRequest(
   request: Request,
   responseStatusCode: number,
   responseHeaders: Headers,
-  remixContext: EntryContext
+  reactRouterContext: EntryContext
 ) {
   return new Promise((resolve, reject) => {
     let shellRendered = false;
     const { pipe, abort } = renderToPipeableStream(
-      <RemixServer
-        context={remixContext}
-        url={request.url}
-        abortDelay={ABORT_DELAY}
-      />,
+      <ServerRouter context={reactRouterContext} url={request.url} />,
       {
         onAllReady() {
           shellRendered = true;
@@ -93,16 +87,12 @@ function handleBrowserRequest(
   request: Request,
   responseStatusCode: number,
   responseHeaders: Headers,
-  remixContext: EntryContext
+  reactRouterContext: EntryContext
 ) {
   return new Promise((resolve, reject) => {
     let shellRendered = false;
     const { pipe, abort } = renderToPipeableStream(
-      <RemixServer
-        context={remixContext}
-        url={request.url}
-        abortDelay={ABORT_DELAY}
-      />,
+      <ServerRouter context={reactRouterContext} url={request.url} />,
       {
         onShellReady() {
           shellRendered = true;

test-apps/remix-vite-cjs/.gitignore test-apps/react-router-cjs/.gitignoretest-apps/remix-vite-cjs/.gitignore renamed to test-apps/react-router-cjs/.gitignore

@@ -4,7 +4,7 @@ import {
   Outlet,
   Scripts,
   ScrollRestoration,
-} from "@remix-run/react";
+} from "react-router";
 
 export function Layout({ children }: { children: React.ReactNode }) {
   return (

test-apps/remix-vite-cjs/README.md test-apps/react-router-cjs/README.mdtest-apps/remix-vite-cjs/README.md renamed to test-apps/react-router-cjs/README.md

@@ -0,0 +1,6 @@
+// @ts-ignore
+import { route } from "@react-router/dev/routes";
+
+export default [
+	route("/", "./routes/_index.tsx")
+]