diff --git a/.changeset/beige-dogs-read.md b/.changeset/beige-dogs-read.md new file mode 100644 index 000000000..22b1faace --- /dev/null +++ b/.changeset/beige-dogs-read.md @@ -0,0 +1,8 @@ +--- +"@uppy/components": minor +"@uppy/svelte": minor +"@uppy/react": minor +"@uppy/vue": minor +--- + +Add @uppy/{screen-capture,status-bar,webcam} as optional peer dependencies diff --git a/.changeset/fluffy-trams-run.md b/.changeset/fluffy-trams-run.md new file mode 100644 index 000000000..5c4cdfb73 --- /dev/null +++ b/.changeset/fluffy-trams-run.md @@ -0,0 +1,5 @@ +--- +"@uppy/transloadit": minor +--- + +Remove unused @uppy/{companion-client,provider-views} dependencies diff --git a/.changeset/silver-areas-refuse.md b/.changeset/silver-areas-refuse.md new file mode 100644 index 000000000..6eb08e35f --- /dev/null +++ b/.changeset/silver-areas-refuse.md @@ -0,0 +1,5 @@ +--- +"@uppy/angular": minor +--- + +Remove @uppy/utils and add @uppy/status-bar to peerDependencies diff --git a/packages/@uppy/angular/projects/uppy/angular/package.json b/packages/@uppy/angular/projects/uppy/angular/package.json index 8534db9f4..485e0f1ec 100644 --- a/packages/@uppy/angular/projects/uppy/angular/package.json +++ b/packages/@uppy/angular/projects/uppy/angular/package.json @@ -29,7 +29,15 @@ "@angular/core": "^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0", "@uppy/core": "workspace:^", "@uppy/dashboard": "workspace:^", - "@uppy/utils": "workspace:^" + "@uppy/status-bar": "workspace:^" + }, + "peerDependenciesMeta": { + "@uppy/dashboard": { + "optional": true + }, + "@uppy/status-bar": { + "optional": true + } }, "sideEffects": false } diff --git a/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard-modal/dashboard-modal-demo.component.ts b/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard-modal/dashboard-modal-demo.component.ts index 9729c637e..098108d3f 100644 --- a/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard-modal/dashboard-modal-demo.component.ts +++ b/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard-modal/dashboard-modal-demo.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from "@angular/core"; import { Uppy } from "@uppy/core"; import type * as Dashboard from "@uppy/dashboard"; -import type { Body, Meta } from "@uppy/utils"; +import type { Body, Meta } from "@uppy/core"; import { DashboardModalComponent } from "./dashboard-modal.component"; diff --git a/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard-modal/dashboard-modal.component.ts b/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard-modal/dashboard-modal.component.ts index d62a7d8f2..d2e51baf6 100644 --- a/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard-modal/dashboard-modal.component.ts +++ b/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard-modal/dashboard-modal.component.ts @@ -11,7 +11,7 @@ import { import { Uppy } from "@uppy/core"; import type { DashboardOptions } from "@uppy/dashboard"; import Dashboard from "@uppy/dashboard"; -import type { Body, Meta } from "@uppy/utils"; +import type { Body, Meta } from "@uppy/core"; import { UppyAngularWrapper } from "../../utils/wrapper"; @Component({ diff --git a/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard/dashboard-demo.component.ts b/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard/dashboard-demo.component.ts index 83282e8f4..837488788 100644 --- a/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard/dashboard-demo.component.ts +++ b/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard/dashboard-demo.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from "@angular/core"; import { Uppy } from "@uppy/core"; import type * as Dashboard from "@uppy/dashboard"; -import type { Body, Meta } from "@uppy/utils"; +import type { Body, Meta } from "@uppy/core"; import { DashboardComponent } from "./dashboard.component"; @Component({ diff --git a/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard/dashboard.component.ts b/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard/dashboard.component.ts index 17430791f..f26f56901 100644 --- a/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard/dashboard.component.ts +++ b/packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard/dashboard.component.ts @@ -11,7 +11,7 @@ import { import { Uppy } from "@uppy/core"; import type { DashboardOptions } from "@uppy/dashboard"; import Dashboard from "@uppy/dashboard"; -import type { Body, Meta } from "@uppy/utils"; +import type { Body, Meta } from "@uppy/core"; import { UppyAngularWrapper } from "../../utils/wrapper"; @Component({ diff --git a/packages/@uppy/angular/projects/uppy/angular/src/lib/components/status-bar/status-bar-demo.component.ts b/packages/@uppy/angular/projects/uppy/angular/src/lib/components/status-bar/status-bar-demo.component.ts index 7dbcf4338..e3507c425 100644 --- a/packages/@uppy/angular/projects/uppy/angular/src/lib/components/status-bar/status-bar-demo.component.ts +++ b/packages/@uppy/angular/projects/uppy/angular/src/lib/components/status-bar/status-bar-demo.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, type OnInit } from "@angular/core"; import { Uppy } from "@uppy/core"; import type * as StatusBar from "@uppy/status-bar"; import Tus from "@uppy/tus"; -import type { Body, Meta } from "@uppy/utils/lib/UppyFile"; +import type { Body, Meta } from "@uppy/core"; import { StatusBarComponent } from "./status-bar.component"; @Component({ diff --git a/packages/@uppy/angular/projects/uppy/angular/src/lib/components/status-bar/status-bar.component.ts b/packages/@uppy/angular/projects/uppy/angular/src/lib/components/status-bar/status-bar.component.ts index 5ca1aa176..090fac758 100644 --- a/packages/@uppy/angular/projects/uppy/angular/src/lib/components/status-bar/status-bar.component.ts +++ b/packages/@uppy/angular/projects/uppy/angular/src/lib/components/status-bar/status-bar.component.ts @@ -11,7 +11,7 @@ import { import { Uppy } from "@uppy/core"; import type { StatusBarOptions } from "@uppy/status-bar"; import StatusBar from "@uppy/status-bar"; -import type { Body, Meta } from "@uppy/utils"; +import type { Body, Meta } from "@uppy/core"; import { UppyAngularWrapper } from "../../utils/wrapper"; @Component({ diff --git a/packages/@uppy/angular/projects/uppy/angular/src/lib/utils/wrapper.ts b/packages/@uppy/angular/projects/uppy/angular/src/lib/utils/wrapper.ts index e9c62717c..ef2281e94 100644 --- a/packages/@uppy/angular/projects/uppy/angular/src/lib/utils/wrapper.ts +++ b/packages/@uppy/angular/projects/uppy/angular/src/lib/utils/wrapper.ts @@ -1,7 +1,6 @@ import type { ElementRef, SimpleChanges } from "@angular/core"; -import type { UIPlugin, UIPluginOptions, Uppy } from "@uppy/core"; +import type { UIPlugin, UIPluginOptions, Uppy, Body, Meta } from "@uppy/core"; import type { DashboardOptions } from "@uppy/dashboard"; -import type { Body, Meta } from "@uppy/utils"; export abstract class UppyAngularWrapper< M extends Meta, diff --git a/packages/@uppy/components/package.json b/packages/@uppy/components/package.json index 25bd83a18..ef9708cba 100644 --- a/packages/@uppy/components/package.json +++ b/packages/@uppy/components/package.json @@ -40,12 +40,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/audio": "workspace:^", - "@uppy/core": "workspace:^", - "@uppy/image-editor": "workspace:^", - "@uppy/remote-sources": "workspace:^", - "@uppy/screen-capture": "workspace:^", - "@uppy/webcam": "workspace:^", "clsx": "^2.1.1", "dequal": "^2.0.3", "preact": "^10.5.13", @@ -53,7 +47,25 @@ }, "devDependencies": { "@tailwindcss/cli": "^4.0.6", + "@uppy/core": "workspace:^", "tailwindcss": "^4.0.6", "typescript": "^5.8.3" + }, + "peerDependencies": { + "@uppy/core": "workspace:^", + "@uppy/image-editor": "workspace:^", + "@uppy/screen-capture": "workspace:^", + "@uppy/webcam": "workspace:^" + }, + "peerDependenciesMeta": { + "@uppy/image-editor": { + "optional": true + }, + "@uppy/screen-capture": { + "optional": true + }, + "@uppy/webcam": { + "optional": true + } } } diff --git a/packages/@uppy/components/src/hooks/remote-source.ts b/packages/@uppy/components/src/hooks/remote-source.ts index bf949df5d..551be40cb 100644 --- a/packages/@uppy/components/src/hooks/remote-source.ts +++ b/packages/@uppy/components/src/hooks/remote-source.ts @@ -6,11 +6,19 @@ import type { UppyEventMap, } from '@uppy/core' import type { ProviderViews } from '@uppy/provider-views' -import type { AvailablePluginsKeys } from '@uppy/remote-sources' import { dequal } from 'dequal/lite' import { Subscribers } from './utils.js' -export type { AvailablePluginsKeys as RemoteSourceKeys } +export type RemoteSourceKeys = + | 'Box' + | 'Dropbox' + | 'Facebook' + | 'GoogleDrive' + | 'Instagram' + | 'OneDrive' + | 'Unsplash' + | 'Url' + | 'Zoom' export type RemoteSourceSnapshot = { state: UnknownProviderPluginState & { @@ -35,7 +43,7 @@ export type RemoteSourceStore = { export function createRemoteSourceController( uppy: Uppy, - sourceId: AvailablePluginsKeys, + sourceId: RemoteSourceKeys, ): RemoteSourceStore { const plugin = uppy.getPlugin>(sourceId) if (!plugin) { diff --git a/packages/@uppy/components/turbo.json b/packages/@uppy/components/turbo.json index d2aaef0c2..67bd28e84 100644 --- a/packages/@uppy/components/turbo.json +++ b/packages/@uppy/components/turbo.json @@ -2,7 +2,13 @@ "extends": ["//"], "tasks": { "build": { - "dependsOn": ["^build", "@uppy/core#build"], + "dependsOn": [ + "^build", + "@uppy/core#build", + "@uppy/image-editor#build", + "@uppy/screen-capture#build", + "@uppy/webcam#build" + ], "outputs": ["lib/**"] }, "build:css": { diff --git a/packages/@uppy/golden-retriever/package.json b/packages/@uppy/golden-retriever/package.json index 17cdc1d4a..de6a218a5 100644 --- a/packages/@uppy/golden-retriever/package.json +++ b/packages/@uppy/golden-retriever/package.json @@ -49,6 +49,7 @@ "@uppy/core": "workspace:^" }, "devDependencies": { + "@uppy/core": "workspace:^", "@uppy/dashboard": "workspace:^", "@uppy/xhr-upload": "workspace:^", "@vitest/browser": "^3.2.4", diff --git a/packages/@uppy/react/package.json b/packages/@uppy/react/package.json index 15d32f0f7..b736cc7f7 100644 --- a/packages/@uppy/react/package.json +++ b/packages/@uppy/react/package.json @@ -36,7 +36,6 @@ ], "dependencies": { "@uppy/components": "workspace:^", - "@uppy/utils": "workspace:^", "preact": "^10.5.13", "use-sync-external-store": "^1.3.0" }, @@ -65,6 +64,7 @@ "@uppy/core": "workspace:^", "@uppy/dashboard": "workspace:^", "@uppy/screen-capture": "workspace:^", + "@uppy/status-bar": "workspace:^", "@uppy/webcam": "workspace:^", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" diff --git a/packages/@uppy/svelte/package.json b/packages/@uppy/svelte/package.json index 981a279f7..920fa63ee 100644 --- a/packages/@uppy/svelte/package.json +++ b/packages/@uppy/svelte/package.json @@ -70,14 +70,23 @@ "peerDependencies": { "@uppy/core": "workspace:^", "@uppy/dashboard": "workspace:^", + "@uppy/screen-capture": "workspace:^", + "@uppy/status-bar": "workspace:^", + "@uppy/webcam": "workspace:^", "svelte": "^4.0.0 || ^5.0.0" }, "peerDependenciesMeta": { "@uppy/dashboard": { "optional": true }, + "@uppy/screen-capture": { + "optional": true + }, "@uppy/status-bar": { "optional": true + }, + "@uppy/webcam": { + "optional": true } }, "publishConfig": { diff --git a/packages/@uppy/transloadit/package.json b/packages/@uppy/transloadit/package.json index 4437d9ed7..aab454861 100644 --- a/packages/@uppy/transloadit/package.json +++ b/packages/@uppy/transloadit/package.json @@ -42,8 +42,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", - "@uppy/provider-views": "workspace:^", "@uppy/tus": "workspace:^", "@uppy/utils": "workspace:^", "component-emitter": "^2.0.0", diff --git a/packages/@uppy/vue/package.json b/packages/@uppy/vue/package.json index 612e5e97b..339c28d86 100644 --- a/packages/@uppy/vue/package.json +++ b/packages/@uppy/vue/package.json @@ -38,14 +38,23 @@ "peerDependencies": { "@uppy/core": "workspace:^", "@uppy/dashboard": "workspace:^", + "@uppy/screen-capture": "workspace:^", + "@uppy/status-bar": "workspace:^", + "@uppy/webcam": "workspace:^", "vue": ">=3.0.0" }, "peerDependenciesMeta": { "@uppy/dashboard": { "optional": true }, + "@uppy/screen-capture": { + "optional": true + }, "@uppy/status-bar": { "optional": true + }, + "@uppy/webcam": { + "optional": true } }, "publishConfig": { diff --git a/yarn.lock b/yarn.lock index da5f14612..5ff544e7a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10698,11 +10698,16 @@ __metadata: "@angular/core": ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 "@uppy/core": "workspace:^" "@uppy/dashboard": "workspace:^" - "@uppy/utils": "workspace:^" + "@uppy/status-bar": "workspace:^" + peerDependenciesMeta: + "@uppy/dashboard": + optional: true + "@uppy/status-bar": + optional: true languageName: unknown linkType: soft -"@uppy/audio@workspace:*, @uppy/audio@workspace:^, @uppy/audio@workspace:packages/@uppy/audio": +"@uppy/audio@workspace:*, @uppy/audio@workspace:packages/@uppy/audio": version: 0.0.0-use.local resolution: "@uppy/audio@workspace:packages/@uppy/audio" dependencies: @@ -10844,18 +10849,25 @@ __metadata: resolution: "@uppy/components@workspace:packages/@uppy/components" dependencies: "@tailwindcss/cli": "npm:^4.0.6" - "@uppy/audio": "workspace:^" "@uppy/core": "workspace:^" - "@uppy/image-editor": "workspace:^" - "@uppy/remote-sources": "workspace:^" - "@uppy/screen-capture": "workspace:^" - "@uppy/webcam": "workspace:^" clsx: "npm:^2.1.1" dequal: "npm:^2.0.3" preact: "npm:^10.5.13" pretty-bytes: "npm:^6.1.1" tailwindcss: "npm:^4.0.6" typescript: "npm:^5.8.3" + peerDependencies: + "@uppy/core": "workspace:^" + "@uppy/image-editor": "workspace:^" + "@uppy/screen-capture": "workspace:^" + "@uppy/webcam": "workspace:^" + peerDependenciesMeta: + "@uppy/image-editor": + optional: true + "@uppy/screen-capture": + optional: true + "@uppy/webcam": + optional: true languageName: unknown linkType: soft @@ -11009,6 +11021,7 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/golden-retriever@workspace:packages/@uppy/golden-retriever" dependencies: + "@uppy/core": "workspace:^" "@uppy/dashboard": "workspace:^" "@uppy/utils": "workspace:^" "@uppy/xhr-upload": "workspace:^" @@ -11066,7 +11079,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/image-editor@workspace:*, @uppy/image-editor@workspace:^, @uppy/image-editor@workspace:packages/@uppy/image-editor": +"@uppy/image-editor@workspace:*, @uppy/image-editor@workspace:packages/@uppy/image-editor": version: 0.0.0-use.local resolution: "@uppy/image-editor@workspace:packages/@uppy/image-editor" dependencies: @@ -11160,7 +11173,6 @@ __metadata: "@types/use-sync-external-store": "npm:^0.0.6" "@uppy/components": "workspace:^" "@uppy/core": "workspace:^" - "@uppy/utils": "workspace:^" jsdom: "npm:^26.1.0" preact: "npm:^10.5.13" react: "npm:^18.2.0" @@ -11172,6 +11184,7 @@ __metadata: "@uppy/core": "workspace:^" "@uppy/dashboard": "workspace:^" "@uppy/screen-capture": "workspace:^" + "@uppy/status-bar": "workspace:^" "@uppy/webcam": "workspace:^" react: ^18.0.0 || ^19.0.0 react-dom: ^18.0.0 || ^19.0.0 @@ -11187,7 +11200,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/remote-sources@workspace:*, @uppy/remote-sources@workspace:^, @uppy/remote-sources@workspace:packages/@uppy/remote-sources": +"@uppy/remote-sources@workspace:*, @uppy/remote-sources@workspace:packages/@uppy/remote-sources": version: 0.0.0-use.local resolution: "@uppy/remote-sources@workspace:packages/@uppy/remote-sources" dependencies: @@ -11211,7 +11224,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/screen-capture@workspace:*, @uppy/screen-capture@workspace:^, @uppy/screen-capture@workspace:packages/@uppy/screen-capture": +"@uppy/screen-capture@workspace:*, @uppy/screen-capture@workspace:packages/@uppy/screen-capture": version: 0.0.0-use.local resolution: "@uppy/screen-capture@workspace:packages/@uppy/screen-capture" dependencies: @@ -11274,12 +11287,19 @@ __metadata: peerDependencies: "@uppy/core": "workspace:^" "@uppy/dashboard": "workspace:^" + "@uppy/screen-capture": "workspace:^" + "@uppy/status-bar": "workspace:^" + "@uppy/webcam": "workspace:^" svelte: ^4.0.0 || ^5.0.0 peerDependenciesMeta: "@uppy/dashboard": optional: true + "@uppy/screen-capture": + optional: true "@uppy/status-bar": optional: true + "@uppy/webcam": + optional: true languageName: unknown linkType: soft @@ -11302,9 +11322,7 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/transloadit@workspace:packages/@uppy/transloadit" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" - "@uppy/provider-views": "workspace:^" "@uppy/tus": "workspace:^" "@uppy/utils": "workspace:^" component-emitter: "npm:^2.0.0" @@ -11398,12 +11416,19 @@ __metadata: peerDependencies: "@uppy/core": "workspace:^" "@uppy/dashboard": "workspace:^" + "@uppy/screen-capture": "workspace:^" + "@uppy/status-bar": "workspace:^" + "@uppy/webcam": "workspace:^" vue: ">=3.0.0" peerDependenciesMeta: "@uppy/dashboard": optional: true + "@uppy/screen-capture": + optional: true "@uppy/status-bar": optional: true + "@uppy/webcam": + optional: true languageName: unknown linkType: soft