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
- #6351 — merge `@uppy/store-default` → `@uppy/core/store-default`
- #6352 — merge `@uppy/utils` → `@uppy/core/utils`
- #6353 — merge `@uppy/companion-client` → `@uppy/core/companion-client`
- #6358 — merge `@uppy/provider-views` → `@uppy/core/provider-views`
- #6359 — remove the duplicate `CompanionClientProvider` / `view: any`
bridge types and type `UnknownProviderPlugin['provider']` structurally
(Pick of the real `Provider`/`SearchProvider`)
### 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`.
restore #6314 to d30c93df37
- merged `main` to it
- resolved confilicts
- squashed all commits into a single commit and sign it ( I had to do
this as signing the past unsigned commits was difficult it was messing
up the history everytime I tried )
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
The Norwegian Bokmål (`nb_NO`) locale had fallen behind `en_US` by ~55
strings. This brings it up to date.
**Added** translations for the missing keys, including: AI image
generation (`generateImage`, `generating1`–`5`), audio recording
(`allowAudioAccess*`, `noAudio*`, `startAudioRecording`,
`stopAudioRecording`), required meta fields
(`missingRequiredMetaField*`), session recovery (`recoveredAllFiles`,
`recoveredXFiles`, `sessionRestored`), plugin names (`pluginName*`),
image compression (`compressedX`, `compressingImages`), and various UI
strings (`error`, `search`, `pleaseWait`, `unnamed`, `uploadStalled`,
etc.).
**Removed** keys no longer present in `en_US` (`backToSearch`,
`fileSource`, `selectFileNamed`, `timedOut`, `unselectFileNamed`).
**Fixed** `exceedsSize` to include the `%{file}` placeholder, and
aligned key order with `en_US`.
I'm a native Norwegian speaker and reviewed every string. Translation
was done with AI assistance (Claude) and checked by me.
---------
Co-authored-by: Mikael Finstad <finstaden@gmail.com>