From 20dce9979dc28f7d1781520ab2619a0145bbee63 Mon Sep 17 00:00:00 2001 From: Prescott Rynewicz Date: Mon, 15 Apr 2024 15:36:53 -0700 Subject: [PATCH 1/2] fix SSR build duplicate file error --- packages/remix-dev/vite/plugin.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts index 43045c74259..7a9507a0eed 100644 --- a/packages/remix-dev/vite/plugin.ts +++ b/packages/remix-dev/vite/plugin.ts @@ -1399,8 +1399,8 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => { let movedAssetPaths: string[] = []; for (let ssrAssetPath of ssrAssetPaths) { let src = path.join(serverBuildDirectory, ssrAssetPath); - if (!clientAssetPaths.has(ssrAssetPath)) { - let dest = path.join(clientBuildDirectory, ssrAssetPath); + let dest = path.join(clientBuildDirectory, ssrAssetPath); + if (!clientAssetPaths.has(ssrAssetPath) && !fse.existsSync(dest)) { await fse.move(src, dest); movedAssetPaths.push(dest); } else { From 065f7cb55690ac725d05e542d9a0f7460d9143eb Mon Sep 17 00:00:00 2001 From: Prescott Rynewicz Date: Mon, 15 Apr 2024 19:46:20 -0700 Subject: [PATCH 2/2] add name to contributors --- contributors.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.yml b/contributors.yml index ccf91fdc40a..3b70ae6c9b9 100644 --- a/contributors.yml +++ b/contributors.yml @@ -505,6 +505,7 @@ - pmbanugo - prasook-jain - pratikdevdas +- prescottjrynewicz - princerajroy - prvnbist - ptitFicus