Skip to content

Commit d88e8a3

Browse files
Merge branch 'main' into without-dropzone-package
2 parents d1291ff + e14e353 commit d88e8a3

File tree

239 files changed

+9516
-10609
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+9516
-10609
lines changed

.changeset/healthy-experts-exist.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changeset/modern-numbers-cough.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/nice-penguins-grow.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"uploadthing": minor
3+
"@uploadthing/svelte": minor
4+
"@uploadthing/react": minor
5+
"@uploadthing/solid": minor
6+
"@uploadthing/expo": minor
7+
"@uploadthing/vue": minor
8+
---
9+
10+
feat: allow custom fetch override

.changeset/odd-icons-pretend.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/rude-pumas-explode.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/six-dodos-brush.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/release-canary.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,15 @@ async function version() {
4141

4242
// Update dependencies
4343
for (const dep in pkg.dependencies) {
44-
if (versions[dep]) {
44+
if (versions[dep] && pkg.dependencies[dep].startsWith("workspace:")) {
4545
pkg.dependencies[dep] = versions[dep];
4646
}
4747
}
48+
for (const dep in pkg.peerDependencies) {
49+
if (versions[dep] && pkg.peerDependencies[dep].startsWith("workspace:")) {
50+
pkg.peerDependencies[dep] = versions[dep];
51+
}
52+
}
4853

4954
const fmt = prettier.format(JSON.stringify(pkg), { filepath: pkgJsonPath });
5055
fs.writeFileSync(pkgJsonPath, fmt);

.github/replace-workspace-protocol.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,21 @@ await Promise.all(
3434
const workspacePkg = await Bun.file("package.json").json();
3535
for (const dep in workspacePkg.dependencies) {
3636
if (dep in packageVersions) {
37-
workspacePkg.dependencies[dep] = packageVersions[dep];
37+
if (workspacePkg.dependencies[dep].startsWith("workspace:")) {
38+
workspacePkg.dependencies[dep] = packageVersions[dep];
39+
}
3840
}
3941
}
4042
for (const dep in workspacePkg.peerDependencies) {
41-
if (dep in packageVersions) {
43+
if (
44+
dep in packageVersions &&
45+
workspacePkg.peerDependencies[dep].startsWith("workspace:")
46+
) {
4247
workspacePkg.peerDependencies[dep] = packageVersions[dep];
4348
}
4449
}
4550

4651
// Remove unnecessary fields
47-
workspacePkg.eslintConfig = undefined;
4852
workspacePkg.devDependencies = undefined;
4953
workspacePkg.scripts = undefined;
5054

.github/workflows/ci.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ jobs:
3131

3232
- name: Build
3333
run: pnpm turbo build --filter "./packages/*"
34+
35+
- name: Install Playwright
36+
run: pnpm exec playwright install chromium
37+
3438
- name: Test
3539
run: pnpm run test
3640
env:

.github/workflows/pkg-pr-new.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Publish Test Releases
22
on: [push, pull_request]
33

4+
env:
5+
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
6+
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
7+
48
jobs:
59
build:
610
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)