fix merge issues

Author: brophdawg11

integration/vite-extra-server-environment-test.ts

@@ -1,5 +1,5 @@
 import { test, expect } from "@playwright/test";
-import glob from "glob";
+import * as fs from "node:fs";
 
 import { build, createProject, reactRouterConfig } from "./helpers/vite.js";
 
@@ -8,9 +8,7 @@ const js = String.raw;
 test("ignores external server environments without skipping React Router build hooks", async () => {
   let cwd = await createProject(
     {
-      "react-router.config.ts": reactRouterConfig({
-        future: { v8_viteEnvironmentApi: true },
-      }),
+      "react-router.config.ts": reactRouterConfig(),
       "vite.config.ts": js`
         import { defineConfig } from "vite";
         import { reactRouter } from "@react-router/dev/vite";
@@ -104,12 +102,17 @@ test("ignores external server environments without skipping React Router build h
         };
       `,
     },
-    "vite-6-template",
+    "vite-7-template",
   );
 
   let { status, stderr } = build({ cwd });
 
   expect(stderr.toString().trim()).toBeFalsy();
   expect(status).toBe(0);
-  expect(glob.sync("build/client/assets/test-*.txt", { cwd }).length).toBe(1);
+  expect(
+    fs
+      .readdirSync("build/client/assets")
+      .filter((file) => file.startsWith("test-") && file.endsWith(".txt"))
+      .length,
+  ).toBe(1);
 });

packages/react-router-dev/config/config.ts

@@ -438,14 +438,12 @@ async function resolveConfig({
   reactRouterConfigFile,
   skipRoutes,
   validateConfig,
-  shouldLogFutureFlagWarnings,
 }: {
   root: string;
   viteRunnerContext: ViteRunner.Context;
   reactRouterConfigFile?: string;
   skipRoutes?: boolean;
   validateConfig?: ValidateConfigFunction;
-  shouldLogFutureFlagWarnings?: boolean;
 }): Promise<ConfigResult> {
   let reactRouterUserConfig: ReactRouterConfig = {};
 
@@ -798,14 +796,12 @@ export async function createConfigLoader({
   mode,
   skipRoutes,
   validateConfig,
-  shouldLogFutureFlagWarnings,
 }: {
   watch: boolean;
   rootDirectory?: string;
   mode: string;
   skipRoutes?: boolean;
   validateConfig?: ValidateConfigFunction;
-  shouldLogFutureFlagWarnings?: boolean;
 }): Promise<ConfigLoader> {
   root = Path.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
 
@@ -836,14 +832,13 @@ export async function createConfigLoader({
       reactRouterConfigFile,
       skipRoutes,
       validateConfig,
-      shouldLogFutureFlagWarnings,
     });
 
   let appDirectory: string;
 
   let initialConfigResult = await resolveConfig({
     root,
-    viteNodeContext,
+    viteRunnerContext,
     reactRouterConfigFile,
     skipRoutes,
     validateConfig,

packages/react-router-dev/vite/plugin.ts

@@ -1259,8 +1259,6 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
           rootDirectory,
           mode,
           watch: viteCommand === "serve",
-          shouldLogFutureFlagWarnings:
-            viteCommand !== "build" || viteConfigEnv.isSsrBuild === true,
         });
 
         await updatePluginContext();