File tree Expand file tree Collapse file tree 3 files changed +22
-16
lines changed
packages/react-router-dev/config Expand file tree Collapse file tree 3 files changed +22
-16
lines changed Original file line number Diff line number Diff line change 1+ ---
2+ " @react-router/dev " : patch
3+ ---
4+
5+ Skip ` package.json ` resolution checks when a custom ` entry.server.(j|t)sx ` file is provided.
Original file line number Diff line number Diff line change 223223- marc2332
224224- markdalgleish
225225- markivancho
226+ - markmals
226227- maruffahmed
227228- marvinruder
228229- mathpaquette
Original file line number Diff line number Diff line change @@ -844,25 +844,25 @@ export async function resolveEntryFiles({
844844 let entryServerFile : string ;
845845 let entryClientFile = userEntryClientFile || "entry.client.tsx" ;
846846
847- let packageJsonPath = findEntry ( rootDirectory , "package" , {
848- extensions : [ ".json" ] ,
849- absolute : true ,
850- walkParents : true ,
851- } ) ;
852-
853- if ( ! packageJsonPath ) {
854- throw new Error (
855- `Could not find package.json in ${ rootDirectory } or any of its parent directories`
856- ) ;
857- }
858-
859- let packageJsonDirectory = Path . dirname ( packageJsonPath ) ;
860- let pkgJson = await PackageJson . load ( packageJsonDirectory ) ;
861- let deps = pkgJson . content . dependencies ?? { } ;
862-
863847 if ( userEntryServerFile ) {
864848 entryServerFile = userEntryServerFile ;
865849 } else {
850+ let packageJsonPath = findEntry ( rootDirectory , "package" , {
851+ extensions : [ ".json" ] ,
852+ absolute : true ,
853+ walkParents : true ,
854+ } ) ;
855+
856+ if ( ! packageJsonPath ) {
857+ throw new Error (
858+ `Could not find package.json in ${ rootDirectory } or any of its parent directories. Please add a package.json, or provide a custom entry.server.tsx/jsx file in your app directory.`
859+ ) ;
860+ }
861+
862+ let packageJsonDirectory = Path . dirname ( packageJsonPath ) ;
863+ let pkgJson = await PackageJson . load ( packageJsonDirectory ) ;
864+ let deps = pkgJson . content . dependencies ?? { } ;
865+
866866 if ( ! deps [ "@react-router/node" ] ) {
867867 throw new Error (
868868 `Could not determine server runtime. Please install @react-router/node, or provide a custom entry.server.tsx/jsx file in your app directory.`
You can’t perform that action at this time.
0 commit comments