refactor: ConfigPreset type safety and migrate lodash to es-toolkit

Author: valley

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

@@ -9,10 +9,7 @@ import chokidar, {
   type EmitArgs as ChokidarEmitArgs,
 } from "chokidar";
 import colors from "picocolors";
-import pick from "lodash/pick";
-import omit from "lodash/omit";
-import cloneDeep from "lodash/cloneDeep";
-import isEqual from "lodash/isEqual";
+import { pick, omit, cloneDeep, isEqual } from "es-toolkit";
 
 import {
   type RouteManifest,
@@ -391,7 +388,7 @@ async function resolveConfig({
   // Prevent mutations to the user config
   reactRouterUserConfig = deepFreeze(cloneDeep(reactRouterUserConfig));
 
-  let presets: ReactRouterConfig[] = (
+  let presets: ConfigPreset[] = (
     await Promise.all(
       (reactRouterUserConfig.presets ?? []).map(async (preset) => {
         if (!preset.name) {
@@ -404,10 +401,15 @@ async function resolveConfig({
           return null;
         }
 
-        let configPreset: ReactRouterConfig = omit(
-          await preset.reactRouterConfig({ reactRouterUserConfig }),
-          excludedConfigPresetKeys,
-        );
+        let presetResult = await preset.reactRouterConfig({
+          reactRouterUserConfig,
+        });
+
+        let configPreset = presetResult;
+
+        if ("presets" in presetResult) {
+          configPreset = omit(presetResult, excludedConfigPresetKeys);
+        }
 
         return configPreset;
       }),

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

@@ -1,6 +1,6 @@
 import * as Path from "pathe";
 import * as v from "valibot";
-import pick from "lodash/pick";
+import { pick } from "es-toolkit/compat";
 
 import invariant from "../invariant";
 

packages/react-router-dev/package.json

@@ -87,7 +87,6 @@
     "es-module-lexer": "^1.3.1",
     "exit-hook": "2.2.1",
     "jsesc": "3.0.2",
-    "lodash": "^4.17.21",
     "pathe": "^1.1.2",
     "picocolors": "^1.1.1",
     "prettier": "^3.6.2",
@@ -106,7 +105,7 @@
     "@types/dedent": "^0.7.0",
     "@types/express": "^4.17.9",
     "@types/jsesc": "^3.0.1",
-    "@types/lodash": "^4.14.182",
+    "es-toolkit": "^1.39.7",
     "@types/node": "^20.0.0",
     "@types/npmcli__package-json": "^4.0.0",
     "@types/set-cookie-parser": "^2.4.1",

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

@@ -32,10 +32,9 @@ import {
   parse as esModuleLexer,
 } from "es-module-lexer";
 import { escapePath as escapePathAsGlob } from "tinyglobby";
-import pick from "lodash/pick";
+import { pick, kebabCase } from "es-toolkit/compat";
 import jsesc from "jsesc";
 import colors from "picocolors";
-import kebabCase from "lodash/kebabCase";
 
 import * as Typegen from "../typegen";
 import type { RouteManifestEntry, RouteManifest } from "../config/routes";