Merge branch 'main' into sveltekit-support

pingdotgg · Apr 9, 2024 · d0ae7c2 · d0ae7c2
2 parents 8be3eba + b563bc3
commit d0ae7c2
Show file tree

Hide file tree

Showing 33 changed files with 239 additions and 57 deletions.
diff --git a/.changeset/fast-laws-move.md b/.changeset/fast-laws-move.md
diff --git a/.changeset/ninety-chicken-know.md b/.changeset/ninety-chicken-know.md
diff --git a/.changeset/two-melons-shop.md b/.changeset/two-melons-shop.md
diff --git a/docs/package.json b/docs/package.json
@@ -13,13 +13,13 @@
   "dependencies": {
     "@radix-ui/react-accordion": "^1.1.2",
     "@scalar/api-reference-react": "0.0.4",
-    "@uploadthing/react": "workspace:6.4.1",
+    "@uploadthing/react": "workspace:6.4.2",
     "next": "14.1.0",
     "nextra": "^2.13.2",
     "nextra-theme-docs": "^2.13.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "uploadthing": "workspace:6.7.0"
+    "uploadthing": "workspace:6.8.0"
   },
   "devDependencies": {
     "@types/react": "18.2.60",

diff --git a/docs/src/pages/api-reference/ut-api.mdx b/docs/src/pages/api-reference/ut-api.mdx
@@ -323,3 +323,34 @@ const url = await utapi.getSignedURL(fileKey, {
 > `TimeString` refers to a human-readable string that can be parsed as a number,
 > followed by a unit of time. For example, `1s`, `1 second`, `2m`, `2 minutes`,
 > `7 days` etc. If no unit is specified, seconds are assumed.
+
+### `updateACL`
+
+> Added in `v6.8`
+
+Update the [ACL](/regions-and-acl#access-controls) of set of files.
+
+```ts
+import { utapi } from "~/server/uploadthing.ts";
+
+// Make a single file public
+await utapi.updateACL(
+  "2e0fdb64-9957-4262-8e45-f372ba903ac8_image.jpg",
+  "public-read",
+);
+
+// Make multiple files private
+await utapi.updateACL(
+  [
+    "2e0fdb64-9957-4262-8e45-f372ba903ac8_image.jpg",
+    "1649353b-04ea-48a2-9db7-31de7f562c8d_image2.jpg",
+  ],
+  "private",
+);
+```
+
+| Arguments    | Type                       | Required | Description                                                |
+| :----------- | :------------------------- | :------- | :--------------------------------------------------------- |
+| keys         | string \| string[]         | Yes      | The fileKeys (or customIds) you want to update the ACL for |
+| acl          | "public-read" \| "private" | Yes      | The ACL to update to.                                      |
+| opts.keyType | "fileKey" \| "customId"    | No       | The type of key you are passing in. Defaults to `fileKey`  |
diff --git a/examples/backend-adapters/client/package.json b/examples/backend-adapters/client/package.json
@@ -8,10 +8,10 @@
     "start": "vite preview"
   },
   "dependencies": {
-    "@uploadthing/react": "workspace:6.4.1",
+    "@uploadthing/react": "workspace:6.4.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "uploadthing": "workspace:6.7.0"
+    "uploadthing": "workspace:6.8.0"
   },
   "devDependencies": {
     "@types/react": "18.2.60",

diff --git a/examples/backend-adapters/package.json b/examples/backend-adapters/package.json
@@ -19,10 +19,10 @@
     "test": "playwright test"
   },
   "dependencies": {
-    "@uploadthing/react": "workspace:6.4.1",
+    "@uploadthing/react": "workspace:6.4.2",
     "concurrently": "^8.2.2",
     "typescript": "^5.4.2",
-    "uploadthing": "workspace:6.7.0"
+    "uploadthing": "workspace:6.8.0"
   },
   "devDependencies": {
     "@playwright/test": "1.42.1"

diff --git a/examples/backend-adapters/server/package.json b/examples/backend-adapters/server/package.json
@@ -22,7 +22,7 @@
     "h3": "^1.11.1",
     "hono": "^4.0.8",
     "listhen": "^1.7.2",
-    "uploadthing": "workspace:6.7.0"
+    "uploadthing": "workspace:6.8.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20240222.0",

diff --git a/examples/minimal-appdir/package.json b/examples/minimal-appdir/package.json
@@ -9,11 +9,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@uploadthing/react": "workspace:6.4.1",
+    "@uploadthing/react": "workspace:6.4.2",
     "next": "14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "uploadthing": "workspace:6.7.0"
+    "uploadthing": "workspace:6.8.0"
   },
   "devDependencies": {
     "@types/node": "^20.11.21",

diff --git a/examples/minimal-astro-react/package.json b/examples/minimal-astro-react/package.json
@@ -12,11 +12,11 @@
   "dependencies": {
     "@astrojs/node": "^8.2.1",
     "@astrojs/react": "^3.0.10",
-    "@uploadthing/react": "workspace:6.4.1",
+    "@uploadthing/react": "workspace:6.4.2",
     "astro": "^4.4.5",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "uploadthing": "workspace:6.7.0"
+    "uploadthing": "workspace:6.8.0"
   },
   "devDependencies": {
     "@types/react": "18.2.60",

diff --git a/examples/minimal-pagedir/package.json b/examples/minimal-pagedir/package.json
@@ -9,11 +9,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@uploadthing/react": "workspace:6.4.1",
+    "@uploadthing/react": "workspace:6.4.2",
     "next": "14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "uploadthing": "workspace:6.7.0"
+    "uploadthing": "workspace:6.8.0"
   },
   "devDependencies": {
     "@types/node": "^20.11.21",

diff --git a/examples/minimal-solidstart/package.json b/examples/minimal-solidstart/package.json
@@ -12,9 +12,9 @@
     "@solidjs/meta": "^0.29.3",
     "@solidjs/router": "^0.12.4",
     "@solidjs/start": "^0.6.0",
-    "@uploadthing/solid": "workspace:6.3.1",
+    "@uploadthing/solid": "workspace:6.3.2",
     "solid-js": "^1.8.15",
-    "uploadthing": "workspace:6.7.0",
+    "uploadthing": "workspace:6.8.0",
     "vinxi": "0.3.4"
   },
   "devDependencies": {

diff --git a/examples/with-clerk-appdir/package.json b/examples/with-clerk-appdir/package.json
@@ -12,11 +12,11 @@
   "dependencies": {
     "@clerk/nextjs": "^4.29.8",
     "@t3-oss/env-nextjs": "^0.9.2",
-    "@uploadthing/react": "workspace:6.4.1",
+    "@uploadthing/react": "workspace:6.4.2",
     "next": "14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "uploadthing": "workspace:6.7.0",
+    "uploadthing": "workspace:6.8.0",
     "zod": "^3.22.4"
   },
   "devDependencies": {

diff --git a/examples/with-clerk-pagesdir/package.json b/examples/with-clerk-pagesdir/package.json
@@ -12,11 +12,11 @@
   "dependencies": {
     "@clerk/nextjs": "^4.29.8",
     "@t3-oss/env-nextjs": "^0.9.2",
-    "@uploadthing/react": "workspace:6.4.1",
+    "@uploadthing/react": "workspace:6.4.2",
     "next": "14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "uploadthing": "workspace:6.7.0",
+    "uploadthing": "workspace:6.8.0",
     "zod": "^3.22.4"
   },
   "devDependencies": {

diff --git a/examples/with-drizzle-appdir/package.json b/examples/with-drizzle-appdir/package.json
@@ -11,13 +11,13 @@
   },
   "dependencies": {
     "@t3-oss/env-nextjs": "^0.9.2",
-    "@uploadthing/react": "workspace:6.4.1",
+    "@uploadthing/react": "workspace:6.4.2",
     "better-sqlite3": "^9.4.3",
     "drizzle-orm": "^0.29.4",
     "next": "14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "uploadthing": "workspace:6.7.0",
+    "uploadthing": "workspace:6.8.0",
     "zod": "^3.22.4"
   },
   "devDependencies": {

diff --git a/examples/with-drizzle-pagesdir/package.json b/examples/with-drizzle-pagesdir/package.json
@@ -11,14 +11,14 @@
   },
   "dependencies": {
     "@t3-oss/env-nextjs": "^0.9.2",
-    "@uploadthing/react": "workspace:6.4.1",
+    "@uploadthing/react": "workspace:6.4.2",
     "better-sqlite3": "^9.4.3",
     "drizzle-orm": "^0.29.4",
     "next": "14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "swr": "^2.2.5",
-    "uploadthing": "workspace:6.7.0",
+    "uploadthing": "workspace:6.8.0",
     "zod": "^3.22.4"
   },
   "devDependencies": {

diff --git a/examples/with-react-image-crop/package.json b/examples/with-react-image-crop/package.json
@@ -9,12 +9,12 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@uploadthing/react": "workspace:6.4.1",
+    "@uploadthing/react": "workspace:6.4.2",
     "next": "14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-image-crop": "^11.0.5",
-    "uploadthing": "workspace:6.7.0"
+    "uploadthing": "workspace:6.8.0"
   },
   "devDependencies": {
     "@types/node": "^20.11.21",

diff --git a/examples/with-serveractions/package.json b/examples/with-serveractions/package.json
@@ -12,7 +12,7 @@
     "next": "14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "uploadthing": "workspace:6.7.0"
+    "uploadthing": "workspace:6.8.0"
   },
   "devDependencies": {
     "@types/node": "^20.11.21",

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -9,11 +9,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@uploadthing/react": "workspace:6.4.1",
+    "@uploadthing/react": "workspace:6.4.2",
     "next": "14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "uploadthing": "workspace:6.7.0"
+    "uploadthing": "workspace:6.8.0"
   },
   "devDependencies": {
     "@types/node": "^20.11.21",

diff --git a/packages/mime-types/CHANGELOG.md b/packages/mime-types/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @uploadthing/mime-types
 
+## 0.2.7
+
+### Patch Changes
+
+- [#740](https://github.com/pingdotgg/uploadthing/pull/740) [`0069ead`](https://github.com/pingdotgg/uploadthing/commit/0069eadbffd90db29df1966eae4f0a85aa3a8490) Thanks [@kaspnilsson](https://github.com/kaspnilsson)! - Add support for 'model/step' MIME type
+
 ## 0.2.6
 
 ### Patch Changes

diff --git a/packages/mime-types/package.json b/packages/mime-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uploadthing/mime-types",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "type": "module",
   "license": "MIT",
   "main": "./dist/index.cjs",

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @uploadthing/react
 
+## 6.4.2
+
+### Patch Changes
+
+- [#734](https://github.com/pingdotgg/uploadthing/pull/734) [`5606d15`](https://github.com/pingdotgg/uploadthing/commit/5606d15e952c077d652943fee4efdb3c32d33667) Thanks [@juliusmarminge](https://github.com/juliusmarminge)! - fix dropzone not submitting when inside a form
+
+- Updated dependencies [[`d627742`](https://github.com/pingdotgg/uploadthing/commit/d6277425c8b11ff92ad3168d302e54f70e6f2667)]:
+  - @uploadthing/shared@6.5.0
+
 ## 6.4.1
 
 ### Patch Changes

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uploadthing/react",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "type": "module",
   "license": "MIT",
   "main": "./dist/index.cjs",
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "@uploadthing/dropzone": "workspace:0.2.1",
-    "@uploadthing/shared": "workspace:6.4.0",
+    "@uploadthing/shared": "workspace:6.5.0",
     "file-selector": "^0.6.0",
     "tailwind-merge": "^2.2.1"
   },
@@ -89,7 +89,7 @@
     "react": "18.2.0",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.4.2",
-    "uploadthing": "workspace:6.7.0",
+    "uploadthing": "workspace:6.8.0",
     "wait-on": "^7.2.0",
     "zod": "^3.22.4"
   },

diff --git a/packages/shared/CHANGELOG.md b/packages/shared/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @uploadthing/shared
 
+## 6.5.0
+
+### Minor Changes
+
+- [#739](https://github.com/pingdotgg/uploadthing/pull/739) [`d627742`](https://github.com/pingdotgg/uploadthing/commit/d6277425c8b11ff92ad3168d302e54f70e6f2667) Thanks [@markflorkowski](https://github.com/markflorkowski)! - feat: minFileCount option on RouteConfig
+
 ## 6.4.0
 
 ### Minor Changes

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uploadthing/shared",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "type": "module",
   "license": "MIT",
   "main": "dist/index.cjs",
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@uploadthing/eslint-config": "workspace:0.2.0",
-    "@uploadthing/mime-types": "workspace:0.2.6",
+    "@uploadthing/mime-types": "workspace:0.2.7",
     "@uploadthing/tsconfig": "workspace:0.1.0",
     "bunchee": "^5.1.2",
     "eslint": "^8.57.0",

diff --git a/packages/solid/CHANGELOG.md b/packages/solid/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @uploadthing/solid
 
+## 6.3.2
+
+### Patch Changes
+
+- [#734](https://github.com/pingdotgg/uploadthing/pull/734) [`5606d15`](https://github.com/pingdotgg/uploadthing/commit/5606d15e952c077d652943fee4efdb3c32d33667) Thanks [@juliusmarminge](https://github.com/juliusmarminge)! - fix dropzone not submitting when inside a form
+
+- Updated dependencies [[`d627742`](https://github.com/pingdotgg/uploadthing/commit/d6277425c8b11ff92ad3168d302e54f70e6f2667)]:
+  - @uploadthing/[email protected]
+
 ## 6.3.1
 
 ### Patch Changes

diff --git a/packages/solid/package.json b/packages/solid/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "author": "OrJDev",
   "license": "MIT",
-  "version": "6.3.1",
+  "version": "6.3.2",
   "main": "./dist/server.cjs",
   "module": "./dist/server.js",
   "types": "./dist/index.d.ts",
@@ -111,7 +111,7 @@
   },
   "dependencies": {
     "@uploadthing/dropzone": "workspace:0.2.1",
-    "@uploadthing/shared": "workspace:6.4.0",
+    "@uploadthing/shared": "workspace:6.5.0",
     "tailwind-merge": "^2.2.1"
   },
   "devDependencies": {
@@ -121,7 +121,7 @@
     "tsup": "8.0.2",
     "tsup-preset-solid": "2.2.0",
     "typescript": "^5.4.2",
-    "uploadthing": "workspace:6.7.0",
+    "uploadthing": "workspace:6.8.0",
     "wait-on": "^7.2.0"
   },
   "peerDependencies": {