Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/react-router-dev/cli/commands.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { existsSync } from "node:fs";
import { readFile, writeFile } from "node:fs/promises";
import * as path from "node:path";
import PackageJson from "@npmcli/package-json";
import exitHook from "exit-hook";
import colors from "picocolors";
import { readPackageJSON } from "pkg-types";
// Workaround for "ERR_REQUIRE_CYCLE_MODULE" in Node 22.10.0+
import "react-router";

Expand Down Expand Up @@ -138,8 +138,8 @@ export async function generateEntry(
return;
}

let pkgJson = await PackageJson.load(rootDirectory);
let deps = pkgJson.content.dependencies ?? {};
let pkgJson = await readPackageJSON(rootDirectory);
let deps = pkgJson.dependencies ?? {};

if (!deps["@react-router/node"]) {
console.error(colors.red(`No default server entry detected.`));
Expand Down
17 changes: 7 additions & 10 deletions packages/react-router-dev/config/config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import fs from "node:fs";
import { execSync } from "node:child_process";
import PackageJson from "@npmcli/package-json";
import * as ViteNode from "../vite/vite-node";
import type * as Vite from "vite";
import Path from "pathe";
Expand All @@ -9,6 +8,7 @@ import chokidar, {
type EmitArgs as ChokidarEmitArgs,
} from "chokidar";
import colors from "picocolors";
import { readPackageJSON, sortPackage, updatePackage } from "pkg-types";
import pick from "lodash/pick";
import omit from "lodash/omit";
import cloneDeep from "lodash/cloneDeep";
Expand Down Expand Up @@ -921,8 +921,8 @@ export async function resolveEntryFiles({
}

let packageJsonDirectory = Path.dirname(packageJsonPath);
let pkgJson = await PackageJson.load(packageJsonDirectory);
let deps = pkgJson.content.dependencies ?? {};
let pkgJson = await readPackageJSON(packageJsonDirectory);
let deps = pkgJson.dependencies ?? {};

if (!deps["@react-router/node"]) {
throw new Error(
Expand All @@ -935,14 +935,11 @@ export async function resolveEntryFiles({
"adding `isbot@5` to your package.json, you should commit this change",
);

pkgJson.update({
dependencies: {
...pkgJson.content.dependencies,
isbot: "^5",
},
});
await updatePackage(packageJsonPath,pkg =>{
(pkg.dependencies??={}).isbot = "^5";

await pkgJson.save();
sortPackage(pkg)
})

let packageManager = detectPackageManager() ?? "npm";

Expand Down
2 changes: 1 addition & 1 deletion packages/react-router-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
"@babel/preset-typescript": "^7.27.1",
"@babel/traverse": "^7.27.7",
"@babel/types": "^7.27.7",
"@npmcli/package-json": "^4.0.1",
"@react-router/node": "workspace:*",
"@remix-run/node-fetch-server": "^0.9.0",
"arg": "^5.0.1",
Expand All @@ -86,6 +85,7 @@
"p-map": "^7.0.3",
"pathe": "^1.1.2",
"picocolors": "^1.1.1",
"pkg-types": "^2.3.0",
"prettier": "^3.6.2",
"react-refresh": "^0.14.0",
"semver": "^7.3.7",
Expand Down
Loading