Merge pull request #40 from magne4000/main

fix: Cannot assign to read only property 'clone'
sinclairnick · Aug 26, 2024 · 3eb5965 · 3eb5965
2 parents d3cffb1 + d066ae2
commit 3eb5965
Show file tree

Hide file tree

Showing 11 changed files with 1,669 additions and 1,363 deletions.
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -31,7 +31,7 @@
   "private": false,
   "repository": "https://github.com/sinclairnick/webroute",
   "scripts": {
-    "build": "tsup-node",
+    "build": "tsup",
     "check": "tsc --noEmit",
     "publish-pkg": "pnpm run build && pnpm publish --access=public --no-git-checks",
     "test": "vitest",

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -20,7 +20,7 @@
   "private": false,
   "repository": "https://github.com/sinclairnick/webroute",
   "scripts": {
-    "build": "tsup-node",
+    "build": "tsup",
     "publish-pkg": "pnpm run build && pnpm publish --access=public --no-git-checks"
   },
   "types": "dist/index.d.ts"

diff --git a/packages/create-app/package.json b/packages/create-app/package.json
@@ -27,7 +27,7 @@
   "main": "dist/index.mjs",
   "repository": "https://github.com/sinclairnick/webroute",
   "scripts": {
-    "build": "tsup-node",
+    "build": "tsup",
     "publish-pkg": "pnpm run build && pnpm publish --access=public --no-git-checks",
     "start": "node ./dist/index.mjs"
   }

diff --git a/packages/middleware/package.json b/packages/middleware/package.json
@@ -32,7 +32,7 @@
   "private": false,
   "repository": "https://github.com/sinclairnick/webroute",
   "scripts": {
-    "build": "tsup-node",
+    "build": "tsup",
     "check": "tsc --noEmit",
     "publish-pkg": "pnpm run build && pnpm publish --access=public --no-git-checks",
     "test": "vitest",

diff --git a/packages/oas/package.json b/packages/oas/package.json
@@ -38,7 +38,7 @@
   "module": "dist/index.mjs",
   "repository": "https://github.com/sinclairnick/webroute",
   "scripts": {
-    "build": "tsup-node",
+    "build": "tsup",
     "check": "tsc --noEmit",
     "publish-pkg": "pnpm run build && pnpm publish --access=public --no-git-checks",
     "test": "vitest",

diff --git a/packages/route/package.json b/packages/route/package.json
@@ -42,7 +42,7 @@
   "private": false,
   "repository": "https://github.com/sinclairnick/webroute",
   "scripts": {
-    "build": "tsup-node",
+    "build": "tsup",
     "check": "tsc --noEmit",
     "publish-pkg": "pnpm run build && pnpm publish --access=public --no-git-checks",
     "test": "vitest",

diff --git a/packages/route/src/route/handler/index.ts b/packages/route/src/route/handler/index.ts
@@ -10,6 +10,7 @@ import { AnyRouteBuilder, RouteBuilder } from "./builder";
 import { Def, createParseFn } from "./util";
 import { getParseFn } from "@webroute/schema";
 import { fixRequestClone, fixResponseClone } from "../patch";
+import { isBun } from "../../util";
 
 function createNewBuilder(
   configA: AnyHandlerDefinition,
@@ -109,7 +110,7 @@ export function createBuilder<TPath extends string | undefined = undefined>(
     },
     handle(handler) {
       const _handler = async (_req: Request) => {
-        const req = fixRequestClone(_req);
+        const req = isBun ? fixRequestClone(_req) : _req;
 
         const parse = createParseFn(req, def);
         const middlewareOut: MiddlewareOutFn[] = [];
@@ -175,7 +176,9 @@ export function createBuilder<TPath extends string | undefined = undefined>(
           }
         }
 
-        response = fixResponseClone(response);
+        if (isBun) {
+          response = fixResponseClone(response);
+        }
 
         // --- RES MIDDLEWARE ---
         // Run through outgoing middleware
@@ -187,7 +190,7 @@ export function createBuilder<TPath extends string | undefined = undefined>(
 
             // Set response if one was returned
             if (result) {
-              response = fixResponseClone(result);
+              response = isBun ? fixResponseClone(result) : result;
             }
           }
         }

diff --git a/packages/route/src/util.ts b/packages/route/src/util.ts
@@ -19,4 +19,7 @@ export const cached = <T extends () => any>(fn: T) => {
     called = true;
     return result;
   };
-};
+};
+
+// @ts-ignore
+export const isBun = typeof Bun !== "undefined";
diff --git a/packages/router/package.json b/packages/router/package.json
@@ -34,7 +34,7 @@
   "module": "dist/index.mjs",
   "repository": "https://github.com/sinclairnick/webroute",
   "scripts": {
-    "build": "tsup-node",
+    "build": "tsup",
     "publish-pkg": "pnpm run build && pnpm publish --access=public --no-git-checks",
     "test": "vitest",
     "docs": "typedoc"

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -18,7 +18,7 @@
     "superjson": "^2.2.1",
     "superstruct": "^1.0.4",
     "tsup": "^8.0.1",
-    "valibot": "0.31.0-rc.0",
+    "valibot": "^0.37.0",
     "vitest": "^1.6.0",
     "yup": "^1.4.0",
     "zod": "^3.22.4"
@@ -87,13 +87,13 @@
     "joi": "^17.13.1",
     "runtypes": "^6.7.0",
     "superstruct": "^1.0.4",
-    "valibot": "0.31.0-rc.0",
+    "valibot": "^0.37.0",
     "yup": "^1.4.0",
     "zod": "^3.22.4"
   },
   "repository": "https://github.com/sinclairnick/webroute",
   "scripts": {
-    "build": "tsup-node",
+    "build": "tsup",
     "publish-pkg": "pnpm run build && pnpm publish --access=public --no-git-checks",
     "test": "vitest",
     "docs": "typedoc"