Merge e7484ab into a7eab3e

Author: juliusmarminge

.changeset/healthy-experts-exist.md

@@ -0,0 +1,6 @@
+---
+"uploadthing": patch
+"@uploadthing/shared": patch
+---
+
+chore: bump internal effect version

.changeset/six-dodos-brush.md

@@ -0,0 +1,5 @@
+---
+"@uploadthing/nuxt": patch
+---
+
+fix module options not honored due to static analysis

examples/backend-adapters/server/package.json

@@ -12,14 +12,15 @@
     "dev:effect": "NODE_ENV=development PORT=3003 tsx watch src/effect-platform.ts"
   },
   "dependencies": {
-    "@effect/platform": "0.69.8",
-    "@effect/platform-node": "0.64.9",
+    "@effect/platform": "0.69.24",
+    "@effect/platform-node": "0.64.26",
     "@elysiajs/cors": "^1.1.1",
     "@fastify/cors": "^9.0.1",
     "@hono/node-server": "^1.8.2",
+    "@sinclair/typebox": "^0.34.3",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
-    "effect": "3.10.3",
+    "effect": "3.10.15",
     "elysia": "^1.1.16",
     "express": "^4.18.2",
     "fastify": "^4.26.1",

package.json

@@ -38,7 +38,7 @@
     "@actions/github": "^6.0.0",
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.1",
-    "@effect/vitest": "0.13.3",
+    "@effect/vitest": "0.13.15",
     "@ianvs/prettier-plugin-sort-imports": "^4.2.1",
     "@manypkg/cli": "^0.21.3",
     "@playwright/test": "1.45.0",

packages/nuxt/src/module.ts

@@ -46,6 +46,13 @@ export default defineNuxtModule<ModuleOptions>({
   defaults: {
     routerPath: "~/server/uploadthing",
     injectStyles: true,
+    // Need to manually set these for static analysis to work, even if they're set to undefined
+    token: undefined,
+    isDev: undefined,
+    logLevel: undefined,
+    logFormat: undefined,
+    ingestUrl: undefined,
+    callbackUrl: undefined,
   },
   async setup(options, nuxt) {
     const logger = useLogger("uploadthing");

packages/nuxt/src/runtime/server/api/uploadthing.ts

@@ -1,16 +1,27 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { useRuntimeConfig } from "#imports";
 import { uploadRouter } from "#uploadthing-router";
 import { defineEventHandler } from "h3";
 
 import { createRouteHandler } from "uploadthing/h3";
+import type { RouteHandlerConfig } from "uploadthing/types";
+
+const emptyStringToUndefined = (obj: Record<string, unknown>) => {
+  const newObj: Record<string, unknown> = {};
+  for (const key in obj) {
+    if (obj[key] === "") newObj[key] = undefined;
+    else newObj[key] = obj[key];
+  }
+  return newObj;
+};
 
 export default defineEventHandler((event) => {
-  const runtime = useRuntimeConfig() as any;
+  const runtime = useRuntimeConfig() as { uploadthing?: RouteHandlerConfig };
+  const config = emptyStringToUndefined(runtime.uploadthing ?? {});
+
+  console.log(config);
 
   return createRouteHandler({
     router: uploadRouter,
-    config: runtime.uploadthing,
+    config,
   })(event);
 });

packages/shared/package.json

@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@uploadthing/mime-types": "workspace:*",
-    "effect": "3.10.3",
+    "effect": "3.10.15",
     "sqids": "^0.3.0"
   },
   "devDependencies": {

packages/uploadthing/package.json

@@ -150,10 +150,10 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@effect/platform": "0.69.8",
+    "@effect/platform": "0.69.24",
     "@uploadthing/mime-types": "workspace:*",
     "@uploadthing/shared": "workspace:*",
-    "effect": "3.10.3"
+    "effect": "3.10.15"
   },
   "devDependencies": {
     "@remix-run/server-runtime": "^2.12.0",

packages/uploadthing/src/sdk/index.ts

@@ -94,7 +94,6 @@ export class UTApi {
       (e) => this.runtime.runPromise(e, signal ? { signal } : undefined),
     );
 
-    await this.runtime.dispose();
     return result;
   };
 

playground-v6/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@uploadthing/react": "npm:@uploadthing/react@6",
     "clsx": "2.1.1",
-    "effect": "3.10.3",
+    "effect": "3.10.15",
     "next": "canary",
     "react": "18.3.1",
     "react-dom": "18.3.1",