Skip to content

Commit a8fb7d8

Browse files
fix(remix-dev/vite): remove Vite v4 back compat (#8581)
1 parent 6debfd5 commit a8fb7d8

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

packages/remix-dev/vite/plugin.ts

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -405,11 +405,6 @@ const getServerBundleBuildConfig = (
405405
return viteUserConfig.__remixServerBundleBuildConfig as ServerBundleBuildConfig;
406406
};
407407

408-
const getViteMajorVersion = (): number => {
409-
let vitePkg = require("vite/package.json");
410-
return parseInt(vitePkg.version.split(".")[0]!);
411-
};
412-
413408
export let getServerBuildDirectory = (remixConfig: ResolvedVitePluginConfig) =>
414409
path.join(
415410
remixConfig.buildDirectory,
@@ -428,8 +423,6 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
428423
let viteUserConfig: Vite.UserConfig;
429424
let viteConfig: Vite.ResolvedConfig | undefined;
430425

431-
let isViteV4 = getViteMajorVersion() === 4;
432-
433426
let cssModulesManifest: Record<string, string> = {};
434427
let ssrBuildContext:
435428
| { isSsrBuild: false }
@@ -586,11 +579,8 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
586579
};
587580

588581
let loadViteManifest = async (directory: string) => {
589-
let manifestPath = isViteV4
590-
? "manifest.json"
591-
: path.join(".vite", "manifest.json");
592582
let manifestContents = await fse.readFile(
593-
path.resolve(directory, manifestPath),
583+
path.resolve(directory, ".vite", "manifest.json"),
594584
"utf-8"
595585
);
596586
return JSON.parse(manifestContents) as Vite.Manifest;
@@ -731,12 +721,6 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
731721
)
732722
);
733723

734-
let isSsrBuild =
735-
"ssrBuild" in viteConfigEnv &&
736-
typeof viteConfigEnv.ssrBuild === "boolean"
737-
? viteConfigEnv.ssrBuild // Vite v4 back compat
738-
: viteConfigEnv.isSsrBuild;
739-
740724
return {
741725
__remixPluginResolvedConfig: remixConfig,
742726
appType: "custom",
@@ -784,7 +768,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
784768
base: remixConfig.publicPath,
785769
build: {
786770
...viteUserConfig.build,
787-
...(!isSsrBuild
771+
...(!viteConfigEnv.isSsrBuild
788772
? {
789773
manifest: true,
790774
outDir: getClientBuildDirectory(remixConfig),
@@ -862,9 +846,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
862846
{
863847
command: viteConfig.command,
864848
mode: viteConfig.mode,
865-
...(isViteV4
866-
? { ssrBuild: ssrBuildContext.isSsrBuild }
867-
: { isSsrBuild: ssrBuildContext.isSsrBuild }),
849+
isSsrBuild: ssrBuildContext.isSsrBuild,
868850
},
869851
viteConfig.configFile
870852
);

0 commit comments

Comments
 (0)