Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 5 additions & 0 deletions .changeset/polite-garlics-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@react-router/dev": patch
---

Import ESM package `pkg-types` with a dynamic import to avoid issues on Node 20.18 and below
4 changes: 2 additions & 2 deletions .github/workflows/integration-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: ./.github/workflows/shared-integration.yml
with:
os: "ubuntu-latest"
node_version: "[20, 22]"
node_version: "[20.18, 22]"
browser: '["chromium", "firefox"]'

integration-windows:
Expand All @@ -49,5 +49,5 @@ jobs:
uses: ./.github/workflows/shared-integration.yml
with:
os: "macos-latest"
node_version: "[20, 22]"
node_version: "[20.18, 22]"
browser: '["webkit"]'
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
node:
- 20
- 20.18
- 22

runs-on: ubuntu-latest
Expand Down
3 changes: 2 additions & 1 deletion packages/react-router-dev/cli/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { readFile, writeFile } from "node:fs/promises";
import * as path from "node:path";
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,6 +137,8 @@ export async function generateEntry(
return;
}

// TODO(v8): Remove - only required for Node 20.18 and below
let { readPackageJSON } = await import("pkg-types");
let pkgJson = await readPackageJSON(rootDirectory);
let deps = pkgJson.dependencies ?? {};

Expand Down
5 changes: 4 additions & 1 deletion packages/react-router-dev/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ 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 @@ -933,6 +932,10 @@ export async function resolveEntryFiles({
);
}

// TODO(v8): Remove - only required for Node 20.18 and below
let { readPackageJSON, sortPackage, updatePackage } = await import(
"pkg-types"
);
let packageJsonDirectory = Path.dirname(packageJsonPath);
let pkgJson = await readPackageJSON(packageJsonDirectory);
let deps = pkgJson.dependencies ?? {};
Expand Down
Loading