Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Use remix memory upload handler (#1514)
Bogdan Chadkinb8b997806806
diff --git a/packages/asset-uploader/src/clients/fs/upload.ts b/packages/asset-uploader/src/clients/fs/upload.tsindex 0db4633d25..ac1e026aa5 100644--- a/packages/asset-uploader/src/clients/fs/upload.ts+++ b/packages/asset-uploader/src/clients/fs/upload.ts@@ -1,8 +1,9 @@import { z } from "zod";import {- unstable_parseMultipartFormData as unstableParseMultipartFormData,- unstable_createFileUploadHandler as unstableCreateFileUploadHandler,- unstable_composeUploadHandlers as unstableComposeUploadHandlers,+ unstable_parseMultipartFormData as parseMultipartFormData,+ unstable_composeUploadHandlers as composeUploadHandlers,+ unstable_createMemoryUploadHandler as createMemoryUploadHandler,+ unstable_createFileUploadHandler as createFileUploadHandler,NodeOnDiskFile,} from "@remix-run/node";import { Location } from "@webstudio-is/prisma-client";@@ -10,7 +11,6 @@ import { AssetData, getAssetData } from "../../utils/get-asset-data";import { idsFormDataFieldName } from "../../schema";import { getUniqueFilename } from "../../utils/get-unique-filename";import { sanitizeS3Key } from "../../utils/sanitize-s3-key";-import { uuidHandler } from "../../utils/uuid-handler";const AssetsFromFs = z.array(z.instanceof(NodeOnDiskFile));const Ids = z.array(z.string().uuid());@@ -29,15 +29,20 @@ export const uploadToFs = async ({maxSize: number;fileDirectory: string;}): Promise<AssetData> => {- const uploadHandler = unstableCreateFileUploadHandler({+ const uploadHandler = createFileUploadHandler({maxPartSize: maxSize,directory: fileDirectory,file: ({ filename }) => getUniqueFilename(sanitizeS3Key(filename)),});- const formData = await unstableParseMultipartFormData(+ const formData = await parseMultipartFormData(request,- unstableComposeUploadHandlers(uploadHandler, uuidHandler)+ composeUploadHandlers(+ uploadHandler,+ createMemoryUploadHandler({+ filter: ({ name }) => name === idsFormDataFieldName,+ })+ ));const formDataImages = AssetsFromFs.parse(formData.getAll("image"));diff --git a/packages/asset-uploader/src/clients/s3/upload.ts b/packages/asset-uploader/src/clients/s3/upload.tsindex 155ad5e73d..0129aca6df 100644--- a/packages/asset-uploader/src/clients/s3/upload.ts+++ b/packages/asset-uploader/src/clients/s3/upload.ts@@ -1,8 +1,9 @@import { z } from "zod";import {type UploadHandlerPart,- unstable_parseMultipartFormData as unstableCreateFileUploadHandler,- unstable_composeUploadHandlers as unstableComposeUploadHandlers,+ unstable_parseMultipartFormData as parseMultipartFormData,+ unstable_composeUploadHandlers as composeUploadHandlers,+ unstable_createMemoryUploadHandler as createMemoryUploadHandler,MaxPartSizeExceededError,} from "@remix-run/node";import type { PutObjectCommandInput, S3Client } from "@aws-sdk/client-s3";@@ -13,7 +14,6 @@ import { getAssetData, AssetData } from "../../utils/get-asset-data";import { idsFormDataFieldName } from "../../schema";import { getUniqueFilename } from "../../utils/get-unique-filename";import { sanitizeS3Key } from "../../utils/sanitize-s3-key";-import { uuidHandler } from "../../utils/uuid-handler";const AssetsUploadedSuccess = z.object({Location: z.string(),@@ -41,9 +41,9 @@ export const uploadToS3 = async ({}): Promise<AssetData> => {const uploadHandler = createUploadHandler(MAX_FILES_PER_REQUEST, client);- const formData = await unstableCreateFileUploadHandler(+ const formData = await parseMultipartFormData(request,- unstableComposeUploadHandlers(+ composeUploadHandlers((file: UploadHandlerPart) =>uploadHandler({file,@@ -51,7 +51,9 @@ export const uploadToS3 = async ({bucket,acl,}),- uuidHandler+ createMemoryUploadHandler({+ filter: ({ name }) => name === idsFormDataFieldName,+ })));diff --git a/packages/asset-uploader/src/utils/uuid-handler.ts b/packages/asset-uploader/src/utils/uuid-handler.tsdeleted file mode 100644index d59359b157..0000000000--- a/packages/asset-uploader/src/utils/uuid-handler.ts+++ /dev/null@@ -1,9 +0,0 @@-import type { UploadHandler as UnstableUploadHandler } from "@remix-run/node";-import { idsFormDataFieldName } from "../schema";-import { toUint8Array } from "./to-uint8-array";--export const uuidHandler: UnstableUploadHandler = async (part) => {- if (part.name === idsFormDataFieldName) {- return Buffer.from(await toUint8Array(part.data)).toString();- }-};