Enable v3_singleFetch and v3_routeConfig future flags (#199)

* enable single-fetch and route-config * update future flags enabled in README
PhilDL · Nov 24, 2024 · ec07484 · ec07484
1 parent 2ff876a
commit ec07484
Show file tree

Hide file tree

Showing 13 changed files with 152 additions and 104 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ _This Package **uses `pnpm` as the package manager** of choice to manage workspa
   - TS Configs, also with different presets.
   - [Tailwind](https://tailwindcss.com/) configs.
 
-### Remix future flags activated:
+### All Remix future flags activated:
 
 ```ts
 future: {
@@ -59,6 +59,8 @@ future: {
   v3_lazyRouteDiscovery: true,
   v3_relativeSplatPath: true,
   v3_throwAbortReason: true,
+  v3_singleFetch: true,
+  v3_routeConfig: true,
 },
 ```
 

diff --git a/apps/remix-app/app/entry.server.tsx b/apps/remix-app/app/entry.server.tsx
@@ -6,7 +6,7 @@ import {
 import { RemixServer } from "@remix-run/react";
 import { renderToPipeableStream } from "react-dom/server";
 
-const ABORT_DELAY = 5000;
+export const streamTimeout = 5000;
 
 export default async function handleRequest(
   request: Request,
@@ -45,6 +45,6 @@ export default async function handleRequest(
       },
     );
 
-    setTimeout(abort, ABORT_DELAY);
+    setTimeout(abort, streamTimeout + 5000);
   });
 }
diff --git a/apps/remix-app/app/routes.ts b/apps/remix-app/app/routes.ts
@@ -0,0 +1,5 @@
+import { flatRoutes } from "@remix-run/fs-routes";
+import type { RouteConfig } from "@remix-run/route-config";
+
+export const routes: RouteConfig = flatRoutes();
+export default routes;
diff --git a/apps/remix-app/app/routes/_index.tsx b/apps/remix-app/app/routes/_index.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import { type LoaderFunctionArgs } from "@remix-run/node";
 import {
   isRouteErrorResponse,
   useLoaderData,
@@ -25,11 +25,11 @@ import Service, { helloWorld } from "~/services.server.ts";
 export const loader = async ({ request: _request }: LoaderFunctionArgs) => {
   const users = await Service.userRepository.getUsers();
   const salesPersons = getSalesPersonDirectory();
-  return json({
+  return {
     users,
     serverValue: helloWorld("Remix Turborepo"),
     salesPersons,
-  });
+  };
 };
 
 export default function Index() {

diff --git a/apps/remix-app/package.json b/apps/remix-app/package.json
@@ -30,9 +30,9 @@
     "@remix-gospel-stack/database": "workspace:*",
     "@remix-gospel-stack/internal-nobuild": "workspace:*",
     "@remix-gospel-stack/ui": "workspace:*",
-    "@remix-run/express": "2.14.0",
-    "@remix-run/node": "2.14.0",
-    "@remix-run/react": "2.14.0",
+    "@remix-run/express": "2.15.0",
+    "@remix-run/node": "2.15.0",
+    "@remix-run/react": "2.15.0",
     "address": "^2.0.3",
     "chalk": "^5.3.0",
     "chokidar": "^4.0.1",
@@ -51,7 +51,9 @@
     "@faker-js/faker": "^9.0.2",
     "@playwright/test": "^1.47.2",
     "@remix-gospel-stack/eslint-config": "workspace:*",
-    "@remix-run/dev": "2.14.0",
+    "@remix-run/dev": "2.15.0",
+    "@remix-run/fs-routes": "^2.15.0",
+    "@remix-run/route-config": "^2.15.0",
     "@swc/core": "^1.7.28",
     "@swc/helpers": "^0.5.13",
     "@tailwindcss/typography": "^0.5.15",

diff --git a/apps/remix-app/server.mjs b/apps/remix-app/server.mjs
@@ -1,6 +1,5 @@
 import crypto from "crypto";
 import { createRequestHandler } from "@remix-run/express";
-import { installGlobals } from "@remix-run/node";
 import { ip } from "address";
 import chalk from "chalk";
 import closeWithGrace from "close-with-grace";
@@ -10,8 +9,6 @@ import getPort, { portNumbers } from "get-port";
 // import helmet from "helmet";
 import morgan from "morgan";
 
-installGlobals();
-
 const viteDevServer =
   process.env.NODE_ENV === "production"
     ? undefined

diff --git a/apps/remix-app/tests/setup/setup-test-env.ts b/apps/remix-app/tests/setup/setup-test-env.ts
@@ -1,6 +1,2 @@
-import { installGlobals } from "@remix-run/node";
-
 import "@testing-library/jest-dom/vitest";
 import "dotenv/config";
-
-installGlobals();
diff --git a/apps/remix-app/vite.config.ts b/apps/remix-app/vite.config.ts
@@ -2,6 +2,12 @@ import { vitePlugin as remix } from "@remix-run/dev";
 import { defineConfig } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
 
+declare module "@remix-run/server-runtime" {
+  interface Future {
+    v3_singleFetch: true;
+  }
+}
+
 export default defineConfig({
   plugins: [
     remix({
@@ -13,6 +19,8 @@ export default defineConfig({
         v3_lazyRouteDiscovery: true,
         v3_relativeSplatPath: true,
         v3_throwAbortReason: true,
+        v3_singleFetch: true,
+        v3_routeConfig: true,
       },
     }),
     tsconfigPaths(),

diff --git a/apps/remix-vercel/package.json b/apps/remix-vercel/package.json
@@ -12,21 +12,21 @@
   "dependencies": {
     "@remix-gospel-stack/internal-nobuild": "workspace:*",
     "@remix-gospel-stack/ui": "workspace:*",
-    "@remix-run/css-bundle": "2.14.0",
-    "@remix-run/node": "2.14.0",
-    "@remix-run/react": "2.14.0",
-    "@remix-run/serve": "2.14.0",
-    "@remix-run/server-runtime": "2.14.0",
+    "@remix-run/css-bundle": "2.15.0",
+    "@remix-run/node": "2.15.0",
+    "@remix-run/react": "2.15.0",
+    "@remix-run/serve": "2.15.0",
+    "@remix-run/server-runtime": "2.15.0",
     "@vercel/analytics": "^1.3.1",
-    "@vercel/remix": "2.14.0",
+    "@vercel/remix": "2.15.0",
     "isbot": "^5.1.17",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@remix-gospel-stack/eslint-config": "workspace:*",
-    "@remix-run/dev": "2.14.0",
+    "@remix-run/dev": "2.15.0",
     "@types/react": "^18.3.9",
     "@types/react-dom": "^18.3.0",
     "@types/source-map-support": "^0.5.10",

diff --git a/apps/remix-vercel/vite.config.ts b/apps/remix-vercel/vite.config.ts
@@ -1,11 +1,8 @@
 import { vitePlugin as remix } from "@remix-run/dev";
-import { installGlobals } from "@remix-run/node";
 import { vercelPreset } from "@vercel/remix/vite";
 import { defineConfig } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
 
-installGlobals();
-
 export default defineConfig({
   plugins: [
     remix({

diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
-    "@remix-run/dev": "2.14.0",
+    "@remix-run/dev": "2.15.0",
     "@turbo/gen": "^2.1.2",
     "@types/glob": "8.1.0",
     "glob": "^11.0.0",

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -26,8 +26,8 @@
     "tailwind-merge": "^2.5.2"
   },
   "peerDependencies": {
-    "@remix-run/dev": "2.14.0",
-    "@remix-run/node": "2.14.0",
+    "@remix-run/dev": "2.15.0",
+    "@remix-run/node": "2.15.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "tailwindcss": "^3.3.2",
@@ -36,8 +36,8 @@
   "devDependencies": {
     "@remix-gospel-stack/eslint-config": "workspace:*",
     "@remix-gospel-stack/tsconfig": "workspace:*",
-    "@remix-run/dev": "2.14.0",
-    "@remix-run/node": "2.14.0",
+    "@remix-run/dev": "2.15.0",
+    "@remix-run/node": "2.15.0",
     "@storybook/addon-essentials": "^8.3.3",
     "@storybook/addon-interactions": "^8.3.3",
     "@storybook/addon-links": "^8.3.3",