From 59d42ca40e2ee5cb4de2df68feaacf9e2e3a4088 Mon Sep 17 00:00:00 2001
From: Sara Vieira <hey@iamsaravieira.com>
Date: Tue, 19 Jul 2022 19:08:48 +0200
Subject: [PATCH] more pr fixes

---
 packages/asset-uploader/src/index.ts               | 5 +++--
 packages/asset-uploader/src/schema.ts              | 5 +++++
 packages/asset-uploader/src/targets/disk/upload.ts | 2 +-
 packages/asset-uploader/src/targets/s3/handler.ts  | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/asset-uploader/src/index.ts b/packages/asset-uploader/src/index.ts
index 37125fa8b5..a6a206da3a 100644
--- a/packages/asset-uploader/src/index.ts
+++ b/packages/asset-uploader/src/index.ts
@@ -7,10 +7,12 @@ import {
 import { s3UploadHandler } from "./targets/s3/handler";
 import { uploadToS3 } from "./targets/s3/uploader";
 import { uploadToDisk } from "./targets/disk/upload";
+import { fsEnvVariables } from "./schema";
 
 const isS3Upload = Boolean(
   S3_ENV_KEYS.every((key) => Object.keys(process.env).includes(key))
 );
+const fsUploadVars = fsEnvVariables.parse(process.env);
 
 export const uploadAsset = async ({
   request,
@@ -24,8 +26,7 @@ export const uploadAsset = async ({
   dirname: string;
 }) => {
   const uploads = path.join(dirname, "../public");
-  const folderInPublic = process.env.FILE_UPLOAD_PATH || DEFAULT_UPLPOAD_PATH;
-  const directory = path.join(uploads, folderInPublic);
+  const directory = path.join(uploads, fsUploadVars.FILE_UPLOAD_PATH);
   const formData = await unstable_parseMultipartFormData(
     request,
     isS3Upload
diff --git a/packages/asset-uploader/src/schema.ts b/packages/asset-uploader/src/schema.ts
index ccd22b6896..09525fb3eb 100644
--- a/packages/asset-uploader/src/schema.ts
+++ b/packages/asset-uploader/src/schema.ts
@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { NodeOnDiskFile } from "@remix-run/node";
+import { DEFAULT_UPLPOAD_PATH } from "./constants";
 
 const SingleImageInUpload = z.instanceof(NodeOnDiskFile);
 
@@ -21,3 +22,7 @@ export const s3EnvVariables = z.object({
   S3_BUCKET: z.string(),
   S3_ACL: z.string().optional(),
 });
+
+export const fsEnvVariables = z.object({
+  FILE_UPLOAD_PATH: z.string().optional().default(DEFAULT_UPLPOAD_PATH),
+});
diff --git a/packages/asset-uploader/src/targets/disk/upload.ts b/packages/asset-uploader/src/targets/disk/upload.ts
index 1b723dc1f4..55a0939f76 100644
--- a/packages/asset-uploader/src/targets/disk/upload.ts
+++ b/packages/asset-uploader/src/targets/disk/upload.ts
@@ -1,6 +1,6 @@
 import path from "path";
 import sharp from "sharp";
-import { ImagesUpload } from "../../types";
+import { ImagesUpload } from "../../schema";
 
 export const uploadToDisk = async ({
   formData,
diff --git a/packages/asset-uploader/src/targets/s3/handler.ts b/packages/asset-uploader/src/targets/s3/handler.ts
index 52d439d225..67905b1536 100644
--- a/packages/asset-uploader/src/targets/s3/handler.ts
+++ b/packages/asset-uploader/src/targets/s3/handler.ts
@@ -4,7 +4,7 @@ import { Upload } from "@aws-sdk/lib-storage";
 import ObjectID from "bson-objectid";
 
 import sharp from "sharp";
-import { ImagesUploadedSuccess, s3EnvVariables } from "../../types";
+import { ImagesUploadedSuccess, s3EnvVariables } from "../../schema";
 import {
   getArrayBufferFromIterable,
   getFilenameAndExtension,