@@ -405,11 +405,6 @@ const getServerBundleBuildConfig = (
405
405
return viteUserConfig . __remixServerBundleBuildConfig as ServerBundleBuildConfig ;
406
406
} ;
407
407
408
- const getViteMajorVersion = ( ) : number => {
409
- let vitePkg = require ( "vite/package.json" ) ;
410
- return parseInt ( vitePkg . version . split ( "." ) [ 0 ] ! ) ;
411
- } ;
412
-
413
408
export let getServerBuildDirectory = ( remixConfig : ResolvedVitePluginConfig ) =>
414
409
path . join (
415
410
remixConfig . buildDirectory ,
@@ -428,8 +423,6 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
428
423
let viteUserConfig : Vite . UserConfig ;
429
424
let viteConfig : Vite . ResolvedConfig | undefined ;
430
425
431
- let isViteV4 = getViteMajorVersion ( ) === 4 ;
432
-
433
426
let cssModulesManifest : Record < string , string > = { } ;
434
427
let ssrBuildContext :
435
428
| { isSsrBuild : false }
@@ -586,11 +579,8 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
586
579
} ;
587
580
588
581
let loadViteManifest = async ( directory : string ) => {
589
- let manifestPath = isViteV4
590
- ? "manifest.json"
591
- : path . join ( ".vite" , "manifest.json" ) ;
592
582
let manifestContents = await fse . readFile (
593
- path . resolve ( directory , manifestPath ) ,
583
+ path . resolve ( directory , ".vite" , "manifest.json" ) ,
594
584
"utf-8"
595
585
) ;
596
586
return JSON . parse ( manifestContents ) as Vite . Manifest ;
@@ -731,12 +721,6 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
731
721
)
732
722
) ;
733
723
734
- let isSsrBuild =
735
- "ssrBuild" in viteConfigEnv &&
736
- typeof viteConfigEnv . ssrBuild === "boolean"
737
- ? viteConfigEnv . ssrBuild // Vite v4 back compat
738
- : viteConfigEnv . isSsrBuild ;
739
-
740
724
return {
741
725
__remixPluginResolvedConfig : remixConfig ,
742
726
appType : "custom" ,
@@ -784,7 +768,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
784
768
base : remixConfig . publicPath ,
785
769
build : {
786
770
...viteUserConfig . build ,
787
- ...( ! isSsrBuild
771
+ ...( ! viteConfigEnv . isSsrBuild
788
772
? {
789
773
manifest : true ,
790
774
outDir : getClientBuildDirectory ( remixConfig ) ,
@@ -862,9 +846,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
862
846
{
863
847
command : viteConfig . command ,
864
848
mode : viteConfig . mode ,
865
- ...( isViteV4
866
- ? { ssrBuild : ssrBuildContext . isSsrBuild }
867
- : { isSsrBuild : ssrBuildContext . isSsrBuild } ) ,
849
+ isSsrBuild : ssrBuildContext . isSsrBuild ,
868
850
} ,
869
851
viteConfig . configFile
870
852
) ;
0 commit comments