Skip to content

refactor(core): consolidate packages into @uppy/core#6370

Open
qxprakash wants to merge 23 commits into
mainfrom
merge-into-core
Open

refactor(core): consolidate packages into @uppy/core#6370
qxprakash wants to merge 23 commits into
mainfrom
merge-into-core

Conversation

@qxprakash

Copy link
Copy Markdown
Collaborator

Closes #6042.

Merges @uppy/utils, @uppy/store-default, @uppy/companion-client, and @uppy/provider-views into @uppy/core, exposed via subpath exports. These packages are removed. This collapses four separately-versioned packages into the one package every plugin already depends on removing duplicate-version bugs, making updates actually reach users, and letting co-dependent types reference each other directly instead of through hand-maintained duplicates.

Since this was a massive change so it's was done across 5 PRs

Breaking (6.0)

Import paths change, e.g. @uppy/utils@uppy/core/utils, @uppy/provider-views/css/*@uppy/core/provider-views/css/*. RequestOptions moves to @uppy/core/companion-client; CompanionClientProvider/ CompanionClientSearchProvider are removed (use the native Provider/ SearchProvider). See MIGRATION-6.0-merge-into-core.md.

qxprakash added 18 commits June 22, 2026 01:40
partly addresses #6042 

This PR merges `@uppy/store-default` into core and re-exports it via
export maps from `@uppy/core`

This is 1st of the 5 stacked PRs which I'll create to merge
`provider-views` , `companion-client` , `utils` and `store-default` into
`@uppy/core` the reason for this stacked PRs approach is to make
reviewing easier as 4 out of these 5 PRs are purely mechanical i.e.
`removing package` -> `copying files` -> `updating imports and exports`.
and it invovles changes across lots of files. so it's easier to review
if all the changes are related to a single plugin.
This PR merges @uppy/utils into `@uppy/core`

for more context see #6351 

this PR should be reviewed after #6351 gets merged
This PR merges @uppy/companion-client into core and re-exports it via
export maps from `@uppy/core`

should be merged after #6352 

see #6351 for more context

update: this PR should be reviewed after merging #6352
This PR removes the duplicate companion/provider bridge types
(CompanionClientProvider CompanionClientSearchProvider, and the`view:
any` escape hatch) and wires the real Provider/ProviderView types
directly, now possible since everything lives in `@uppy/core` Net gain
in type safety; no behavior change.

for more context on the approach see description of #6351
changesets which mention the merged packages which would fail yarn
changeset, so replaced those packages with @uppy/core
@qxprakash qxprakash self-assigned this Jun 30, 2026
@qxprakash qxprakash added the 6.0 For the 6.0 major release label Jun 30, 2026
@changeset-bot

changeset-bot Bot commented Jun 30, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 05d3c85

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes changesets to release 38 packages
Name Type
@uppy/angular Major
@uppy/google-photos-picker Major
@uppy/google-drive-picker Major
@uppy/thumbnail-generator Major
@uppy/golden-retriever Major
@uppy/image-generator Major
@uppy/remote-sources Major
@uppy/screen-capture Major
@uppy/google-drive Major
@uppy/image-editor Major
@uppy/transloadit Major
@uppy/components Major
@uppy/compressor Major
@uppy/status-bar Major
@uppy/xhr-upload Major
@uppy/companion Major
@uppy/dashboard Major
@uppy/drag-drop Major
@uppy/facebook Major
@uppy/onedrive Major
@uppy/unsplash Major
@uppy/dropbox Major
@uppy/locales Patch
@uppy/aws-s3 Major
@uppy/svelte Major
@uppy/webcam Major
@uppy/webdav Major
@uppy/audio Major
@uppy/react Major
@uppy/core Major
@uppy/form Major
@uppy/zoom Major
@uppy/box Major
@uppy/tus Major
@uppy/url Major
@uppy/vue Major
uppy Patch
@uppy/drop-target Major

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

@qxprakash

Copy link
Copy Markdown
Collaborator Author

I'll remove the migration doc before we merge this to main, it's just there for FYI for the reviewers.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.0 For the 6.0 major release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Merge @uppy/{provider-views,companion-client,utils,store-default} into core

2 participants