Merge branch 'main' into plain-app-id

.gitignore

@@ -55,6 +55,8 @@ packages/*/*/
 !packages/*/playground/
 
 dist
+tsup.config.bundled_*
+app.config.bundled_*
 
 .svelte-kit
 .solid

docs/src/app/(docs)/api-reference/react/page.mdx

@@ -104,7 +104,7 @@ export const UploadDropzone = generateUploadDropzone<OurFileRouter>();
 
 The `generateReactHelpers` function is used to generate the
 [useUploadThing](/api-reference/react#use-upload-thing) hook and the
-[uploadFiles]/api-reference/client#upload-files) functions you use to interact
+[uploadFiles](/api-reference/client#upload-files) functions you use to interact
 with UploadThing in custom components. It takes your File Router as a generic
 
 ```tsx
@@ -547,7 +547,7 @@ and `useUploadThing` hooks. For a more complete example, take a look at
 [our prebuilt components](https://github.com/pingdotgg/uploadthing/tree/main/packages/react/src/components).
 
 ```tsx {{ title: "app/example-custom-uploader.tsx" }}
-// import { useDropzone } from "@uploadthing/react";
+import { useDropzone } from "@uploadthing/react";
 import { generateClientDropzoneAccept } from "uploadthing/client";
 
 import { useUploadThing } from "~/utils/uploadthing";

docs/src/app/(docs)/api-reference/server/page.mdx

@@ -244,6 +244,15 @@ Environment variables follows the naming convention of `UPLOADTHING_<NAME>`
     Enable more verbose logging.
     <Note>If using an older version of the SDK, levels might vary.</Note>
   </Property>
+  <Property
+    name="logFormat"
+    type="json | logFmt | structured | pretty"
+    since="7.1"
+    defaultValue="pretty in development, else json"
+  >
+    What format log entries should be in. [Read more about the log formats
+    here](https://effect.website/docs/guides/observability/logging#built-in-loggers).
+  </Property>
   <Property
     name="isDev"
     type="boolean"

docs/src/app/(docs)/api-reference/ut-api/page.mdx

@@ -69,6 +69,15 @@ Environment variables follows the naming convention of `UPLOADTHING_<NAME>`
     Enable more verbose logging.
     <Note>If using an older version of the SDK, levels might vary.</Note>
   </Property>
+  <Property
+    name="logFormat"
+    type="json | logFmt | structured | pretty"
+    since="7.1"
+    defaultValue="pretty in development, else json"
+  >
+    What format log entries should be in. [Read more about the log formats
+    here](https://effect.website/docs/guides/observability/logging#built-in-loggers).
+  </Property>
   <Property
     name="defaultKeyType"
     type="'fileKey' | 'customId'"

docs/src/app/(docs)/backend-adapters/fetch/page.mdx

@@ -104,11 +104,13 @@ const handlers = createRouteHandler({
   config: { ... },
 });
 
-const app = new Elysia().get("/", () => "Hello Elysia");
-
-app.all("/api/uploadthing", handlers);
-
-app.listen(3000);
+new Elysia()
+  .get("/api", () => "Hello from Elysia!")
+  .get("/api/uploadthing", (ev) => handlers(ev.request))
+  .post("/api/uploadthing", (ev) => handlers(ev.request))
+  .listen(3000, (server) => {
+    console.log(`Server listening on port ${server.port}`);
+  });
 ```
 
 ### Hono

docs/src/app/(docs)/getting-started/remix/page.mdx

@@ -47,7 +47,7 @@ of a FileRoute similar to an endpoint, it has:
 To get full insight into what you can do with the FileRoutes, please refer to
 the [File Router API](/file-routes).
 
-```tsx {{ title: "routes/api.uploadthing.ts" }}
+```tsx {{ title: "app/routes/api.uploadthing.ts" }}
 import type { ActionFunctionArgs } from "@remix-run/node"; // or cloudflare/deno
 
 import { createUploadthing, type FileRouter } from "uploadthing/remix";
@@ -97,7 +97,7 @@ exporting the action and loader functions.
   serving it from `/api/uploadthing`.
 </Note>
 
-```ts {{ title: "routes/api.uploadthing.ts" }}
+```ts {{ title: "app/routes/api.uploadthing.ts" }}
 import { createRouteHandler } from "uploadthing/remix";
 
 const uploadRouter = {
@@ -117,16 +117,16 @@ export const { action, loader } = createRouteHandler({
 
 ## Create The UploadThing Components
 
-```ts {{ title: "src/utils/uploadthing.ts" }}
+```ts {{ title: "app/utils/uploadthing.ts" }}
 import {
   generateUploadButton,
   generateUploadDropzone,
 } from "@uploadthing/react";
 
 import type { UploadRouter } from "~/routes/api.uploadthing";
 
-export const UploadButton = generateUploadButton<OurFileRouter>();
-export const UploadDropzone = generateUploadDropzone<OurFileRouter>();
+export const UploadButton = generateUploadButton<UploadRouter>();
+export const UploadDropzone = generateUploadDropzone<UploadRouter>();
 ```
 
 ### Add UploadThing's Styles