diff --git a/examples/companion-custom-provider/package.json b/examples/companion-custom-provider/package.json index cef4f93bd..03a9b70b4 100644 --- a/examples/companion-custom-provider/package.json +++ b/examples/companion-custom-provider/package.json @@ -4,7 +4,6 @@ "private": true, "type": "module", "dependencies": { - "@uppy/companion-client": "workspace:*", "@uppy/core": "workspace:*", "@uppy/dashboard": "workspace:*", "@uppy/google-drive": "workspace:*", diff --git a/packages/@uppy/aws-s3/package.json b/packages/@uppy/aws-s3/package.json index a6a2d77b6..b9410bdea 100644 --- a/packages/@uppy/aws-s3/package.json +++ b/packages/@uppy/aws-s3/package.json @@ -37,9 +37,6 @@ ".": "./lib/index.js", "./package.json": "./package.json" }, - "dependencies": { - "@uppy/companion-client": "workspace:^" - }, "devDependencies": { "@aws-sdk/client-s3": "^3.362.0", "@aws-sdk/s3-request-presigner": "^3.362.0", diff --git a/packages/@uppy/aws-s3/src/index.ts b/packages/@uppy/aws-s3/src/index.ts index 6e46c6e6f..a6fe7c5ee 100644 --- a/packages/@uppy/aws-s3/src/index.ts +++ b/packages/@uppy/aws-s3/src/index.ts @@ -1,4 +1,3 @@ -import { RequestClient } from '@uppy/companion-client' import { BasePlugin, type DefinePluginOpts, @@ -6,6 +5,7 @@ import { type PluginOpts, type Uppy, } from '@uppy/core' +import { RequestClient } from '@uppy/core/companion-client' import type { Body, LocalUppyFile, diff --git a/packages/@uppy/aws-s3/tsconfig.build.json b/packages/@uppy/aws-s3/tsconfig.build.json index 90105c5c7..ac99ccdd7 100644 --- a/packages/@uppy/aws-s3/tsconfig.build.json +++ b/packages/@uppy/aws-s3/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/aws-s3/tsconfig.json b/packages/@uppy/aws-s3/tsconfig.json index d56445ec8..8bd369999 100644 --- a/packages/@uppy/aws-s3/tsconfig.json +++ b/packages/@uppy/aws-s3/tsconfig.json @@ -7,9 +7,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/box/package.json b/packages/@uppy/box/package.json index 3c2896553..b0b8d7696 100644 --- a/packages/@uppy/box/package.json +++ b/packages/@uppy/box/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, diff --git a/packages/@uppy/box/src/Box.tsx b/packages/@uppy/box/src/Box.tsx index c894cb1ec..b63640024 100644 --- a/packages/@uppy/box/src/Box.tsx +++ b/packages/@uppy/box/src/Box.tsx @@ -1,9 +1,3 @@ -import { - type CompanionPluginOptions, - getAllowedHosts, - Provider, - tokenStorage, -} from '@uppy/companion-client' import type { AsyncStore, Body, @@ -13,6 +7,12 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import { + type CompanionPluginOptions, + getAllowedHosts, + Provider, + tokenStorage, +} from '@uppy/core/companion-client' import type { LocaleStrings } from '@uppy/core/utils' import { ProviderViews } from '@uppy/provider-views' // biome-ignore lint/style/useImportType: h is not a type diff --git a/packages/@uppy/box/tsconfig.build.json b/packages/@uppy/box/tsconfig.build.json index 8d355f390..73521b1c6 100644 --- a/packages/@uppy/box/tsconfig.build.json +++ b/packages/@uppy/box/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/box/tsconfig.json b/packages/@uppy/box/tsconfig.json index 96feccd1e..1b6915eca 100644 --- a/packages/@uppy/box/tsconfig.json +++ b/packages/@uppy/box/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/companion-client/.npmignore b/packages/@uppy/companion-client/.npmignore deleted file mode 100644 index 6c816673f..000000000 --- a/packages/@uppy/companion-client/.npmignore +++ /dev/null @@ -1 +0,0 @@ -tsconfig.* diff --git a/packages/@uppy/companion-client/CHANGELOG.md b/packages/@uppy/companion-client/CHANGELOG.md deleted file mode 100644 index 16783ddfd..000000000 --- a/packages/@uppy/companion-client/CHANGELOG.md +++ /dev/null @@ -1,301 +0,0 @@ -# @uppy/companion-client - -## 5.1.1 - -### Patch Changes - -- 0c16fe4: - Split UppyFile into two intefaces distinguished by the `isRemote` boolean: - - LocalUppyFile - - RemoteUppyFile -- Updated dependencies [0c16fe4] - - @uppy/core@5.1.1 - - @uppy/utils@7.1.1 - -## 5.1.0 - -### Minor Changes - -- 5ba2c1c: Introduce the concept of server-side search and add support for it for the Dropbox provider. Previously, only client-side filtering in the currently viewed folder was possible, which was limiting. Now users using Companion with Dropbox can perform a search across their entire account. - -### Patch Changes - -- Updated dependencies [5ba2c1c] - - @uppy/utils@7.1.0 - - @uppy/core@5.1.0 - -## 5.0.1 - -### Patch Changes - -- 975317d: Removed "main" from package.json, since export maps serve as the contract for the public API. -- Updated dependencies [4b6a76c] -- Updated dependencies [975317d] -- Updated dependencies [9bac4c8] - - @uppy/core@5.0.2 - - @uppy/utils@7.0.2 - -## 5.0.0 - -### Major Changes - -- c5b51f6: ### Export maps for all packages - - All packages now have export maps. This is a breaking change in two cases: - - 1. The css imports have changed from `@uppy[package]/dist/styles.min.css` to `@uppy[package]/css/styles.min.css` - 2. You were importing something that wasn't exported from the root, for instance `@uppy/core/lib/foo.js`. You can now only import things we explicitly exported. - - #### Changed imports for `@uppy/react`, `@uppy/vue`, and `@uppy/svelte` - - Some components, like Dashboard, require a peer dependency to work but since all components were exported from a single file you were forced to install all peer dependencies. Even if you never imported, for instance, the status bar component. - - Every component that requires a peer dependency has now been moved to a subpath, such as `@uppy/react/dashboard`, so you only need to install the peer dependencies you need. - - **Example for `@uppy/react`:** - - **Before:** - - ```javascript - import { Dashboard, StatusBar } from "@uppy/react"; - ``` - - **Now:** - - ```javascript - import Dashboard from "@uppy/react/dashboard"; - import StatusBar from "@uppy/react/status-bar"; - ``` - -### Patch Changes - -- Updated dependencies [d301c01] -- Updated dependencies [c5b51f6] - - @uppy/utils@7.0.0 - - @uppy/core@5.0.0 - -## 4.5.2 - -### Patch Changes - -- 1b1a9e3: Define "files" in package.json -- Updated dependencies [1b1a9e3] - - @uppy/utils@6.2.2 - - @uppy/core@4.5.2 - -## 4.5.0 - -### Minor Changes - -- 0c24c5a: Use TypeScript compiler instead of Babel - -### Patch Changes - -- Updated dependencies [0c24c5a] -- Updated dependencies [0c24c5a] - - @uppy/core@4.5.0 - - @uppy/utils@6.2.0 - -## 4.4.2 - -Released: 2025-05-18 -Included in: Uppy v4.16.0 - -- @uppy/companion-client: don't reject on incorrect origin (Mikael Finstad / #5736) - -## 4.4.0 - -Released: 2025-01-06 -Included in: Uppy v4.11.0 - -- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) - -## 4.2.0 - -Released: 2024-12-05 -Included in: Uppy v4.8.0 - -- @uppy/companion-client: Fix allowed origins (Mikael Finstad / #5536) -- @uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/store-default,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/utils,@uppy/vue,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom: cleanup tsconfig (Mikael Finstad / #5520) - -## 4.1.1 - -Released: 2024-10-31 -Included in: Uppy v4.6.0 - -- @uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react-native,@uppy/react,@uppy/redux-dev-tools,@uppy/screen-capture,@uppy/status-bar,@uppy/store-default,@uppy/store-redux,@uppy/svelte,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/utils,@uppy/vue,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom: Fix links (Anthony Veaudry / #5492) - -## 4.0.0 - -Released: 2024-07-10 -Included in: Uppy v4.0.0 - -- docs,@uppy/companion-client: don't close socket when pausing (Mikael Finstad / #4821) - -## 4.0.0-beta.7 - -Released: 2024-06-04 -Included in: Uppy v4.0.0-beta.10 - -- @uppy/companion-client: do not allow boolean `RequestOptions` (Mikael Finstad / #5198) -- @uppy/companion-client: remove deprecated options (Mikael Finstad / #5198) -- @uppy/companion-client: make `supportsRefreshToken` default (Mikael Finstad / #5198) -- @uppy/companion-client: remove optional chaining (Mikael Finstad / #5198) -- @uppy/companion-client: remove `Socket` (Mikael Finstad / #5198) - -## 4.0.0-beta.6 - -Released: 2024-05-14 -Included in: Uppy v4.0.0-beta.7 - -- @uppy/companion-client,@uppy/dropbox,@uppy/screen-capture,@uppy/unsplash,@uppy/url,@uppy/webcam: Use `title` consistently from locales (Merlijn Vos / #5134) - -## 4.0.0-beta.1 - -Released: 2024-03-28 -Included in: Uppy v4.0.0-beta.1 - -- @uppy/companion-client,@uppy/provider-views,@uppy/status-bar: fix type imports (Antoine du Hamel / #5038) -- @uppy/companion-client: Replace Provider.initPlugin with composition (Merlijn Vos / #4977) - -## 3.8.0 - -Released: 2024-03-27 -Included in: Uppy v3.24.0 - -- @uppy/box,@uppy/companion-client,@uppy/provider-views,@uppy/status-bar: fix type imports (Antoine du Hamel / #5038) -- @uppy/companion-client: Replace Provider.initPlugin with composition (Merlijn Vos / #4977) - -## 3.7.4 - -Released: 2024-02-28 -Included in: Uppy v3.23.0 - -- @uppy/companion-client,@uppy/utils,@uppy/xhr-upload: improvements for #4922 (Mikael Finstad / #4960) - -## 3.7.3 - -Released: 2024-02-22 -Included in: Uppy v3.22.2 - -- @uppy/companion-client: fix body/url on upload-success (Merlijn Vos / #4922) -- @uppy/companion-client: remove unnecessary `'use strict'` directives (Antoine du Hamel / #4943) -- @uppy/companion-client: type changes for provider-views (Antoine du Hamel / #4938) -- @uppy/companion-client: update types (Antoine du Hamel / #4927) - -## 3.7.1 - -Released: 2024-02-19 -Included in: Uppy v3.22.0 - -- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/companion-client,@uppy/tus,@uppy/xhr-upload: update `uppyfile` objects before emitting events (antoine du hamel / #4928) -- @uppy/companion-client: fix tests and linter (antoine du hamel / #4890) -- @uppy/companion-client: migrate to ts (merlijn vos / #4864) -- @uppy/companion-client: fix `typeerror` (antoine du hamel) - -## 3.7.0 - -Released: 2023-12-12 -Included in: Uppy v3.21.0 - -- @uppy/companion-client: avoid unnecessary preflight requests (Antoine du Hamel / #4462) - -## 3.6.1 - -Released: 2023-11-24 -Included in: Uppy v3.20.0 - -- @uppy/companion-client: fix log type error (Mikael Finstad / #4766) -- @uppy/companion-client: revert breaking change (Antoine du Hamel / #4801) - -## 3.5.0 - -Released: 2023-10-20 -Included in: Uppy v3.18.0 - -- @uppy/companion-client: fixup! Added Companion OAuth Key type (Murderlon / #4668) -- @uppy/companion-client: Added Companion OAuth Key type (Chris Pratt / #4668) - -## 3.4.1 - -Released: 2023-09-29 -Included in: Uppy v3.17.0 - -- @uppy/companion-client: fix a refresh token race condition (Mikael Finstad / #4695) - -## 3.4.0 - -Released: 2023-09-05 -Included in: Uppy v3.15.0 - -- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/companion-client,@uppy/core,@uppy/tus,@uppy/utils,@uppy/xhr-upload: Move remote file upload logic into companion-client (Merlijn Vos / #4573) - -## 3.3.0 - -Released: 2023-08-15 -Included in: Uppy v3.14.0 - -- @uppy/companion-client,@uppy/provider-views: make authentication optional (Dominik Schmidt / #4556) - -## 3.1.2 - -Released: 2023-04-04 -Included in: Uppy v3.7.0 - -- @uppy/companion-client: do not open socket more than once (Artur Paikin) - -## 3.1.1 - -Released: 2022-11-16 -Included in: Uppy v3.3.1 - -- @uppy/companion-client: treat `*` the same as missing header (Antoine du Hamel / #4221) - -## 3.1.0 - -Released: 2022-11-10 -Included in: Uppy v3.3.0 - -- @uppy/companion-client: add support for `AbortSignal` (Antoine du Hamel / #4201) -- @uppy/companion-client: prevent preflight race condition (Mikael Finstad / #4182) - -## 3.0.2 - -Released: 2022-09-25 -Included in: Uppy v3.1.0 - -- @uppy/audio,@uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/companion,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/redux-dev-tools,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/store-default,@uppy/store-redux,@uppy/svelte,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/utils,@uppy/vue,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom: add missing entries to changelog for individual packages (Antoine du Hamel / #4092) - -## 3.0.0 - -Released: 2022-08-22 -Included in: Uppy v3.0.0 - -- Switch to ESM - -## 2.2.0 - -Released: 2022-05-30 -Included in: Uppy v2.11.0 - -- @uppy/companion-client: Revert "Revert "@uppy/companion-client: refactor to ESM"" (Antoine du Hamel / #3730) - -## 2.1.0 - -Released: 2022-05-14 -Included in: Uppy v2.10.0 - -- @uppy/companion-client: refactor to ESM (Antoine du Hamel / #3693) - -## 2.0.6 - -Released: 2022-04-07 -Included in: Uppy v2.9.2 - -- @uppy/aws-s3,@uppy/companion-client,@uppy/transloadit,@uppy/utils: Propagate `isNetworkError` through error wrappers (Renée Kooi / #3620) - -## 2.0.5 - -Released: 2022-02-14 -Included in: Uppy v2.5.0 - -- @uppy/companion-client,@uppy/companion,@uppy/provider-views,@uppy/robodog: Finishing touches on Companion dynamic Oauth (Renée Kooi / #2802) diff --git a/packages/@uppy/companion-client/LICENSE b/packages/@uppy/companion-client/LICENSE deleted file mode 100644 index c23747330..000000000 --- a/packages/@uppy/companion-client/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2018 Transloadit - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/@uppy/companion-client/README.md b/packages/@uppy/companion-client/README.md deleted file mode 100644 index 5aeaa1465..000000000 --- a/packages/@uppy/companion-client/README.md +++ /dev/null @@ -1,55 +0,0 @@ -# @uppy/companion-client - -Uppy logo: a smiling puppy above a pink upwards arrow - -[![npm version](https://img.shields.io/npm/v/@uppy/companion-client.svg?style=flat-square)](https://www.npmjs.com/package/@uppy/companion-client) -![CI status for Uppy tests](https://github.com/transloadit/uppy/workflows/CI/badge.svg) -![CI status for Companion tests](https://github.com/transloadit/uppy/workflows/Companion/badge.svg) -![CI status for browser tests](https://github.com/transloadit/uppy/workflows/End-to-end%20tests/badge.svg) - -Client library for communication with Companion. Intended for use in Uppy -plugins. - -Uppy is being developed by the folks at [Transloadit](https://transloadit.com), -a versatile file encoding service. - -## Example - -```js -import Uppy from '@uppy/core' -import { Provider, RequestClient, Socket } from '@uppy/companion-client' - -const uppy = new Uppy() - -const client = new RequestClient(uppy, { - companionUrl: 'https://uppy.mywebsite.com/', -}) -client.get('/drive/list').then(() => {}) - -const provider = new Provider(uppy, { - companionUrl: 'https://uppy.mywebsite.com/', - provider: providerPluginInstance, -}) -provider.checkAuth().then(() => {}) - -const socket = new Socket({ target: 'wss://uppy.mywebsite.com/' }) -socket.on('progress', () => {}) -``` - -## Installation - -> Unless you are writing a custom provider plugin, you do not need to install -> this. - -```bash -$ npm install @uppy/companion-client -``` - -## Documentation - -Documentation for this plugin can be found on the -[Uppy website](https://uppy.io/docs/companion). - -## License - -[The MIT License](./LICENSE). diff --git a/packages/@uppy/companion-client/package.json b/packages/@uppy/companion-client/package.json deleted file mode 100644 index a845d9bbd..000000000 --- a/packages/@uppy/companion-client/package.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "@uppy/companion-client", - "description": "Client library for communication with Companion. Intended for use in Uppy plugins.", - "version": "5.1.1", - "license": "MIT", - "type": "module", - "sideEffects": false, - "scripts": { - "build": "tsc --build tsconfig.build.json", - "typecheck": "tsc --build", - "test": "vitest run --environment=jsdom --silent='passed-only'" - }, - "keywords": [ - "file uploader", - "uppy", - "uppy-plugin", - "companion", - "provider" - ], - "homepage": "https://uppy.io", - "bugs": { - "url": "https://github.com/transloadit/uppy/issues" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/transloadit/uppy.git" - }, - "files": [ - "src", - "lib", - "dist", - "CHANGELOG.md" - ], - "exports": { - ".": "./lib/index.js", - "./package.json": "./package.json" - }, - "dependencies": { - "namespace-emitter": "^2.0.1", - "p-retry": "^6.1.0" - }, - "devDependencies": { - "jsdom": "^29.1.1", - "typescript": "^5.8.3", - "vitest": "^4.1.6" - }, - "peerDependencies": { - "@uppy/core": "workspace:^" - } -} diff --git a/packages/@uppy/companion-client/tsconfig.build.json b/packages/@uppy/companion-client/tsconfig.build.json deleted file mode 100644 index ac99ccdd7..000000000 --- a/packages/@uppy/companion-client/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../../tsconfig.shared", - "compilerOptions": { - "outDir": "./lib", - "rootDir": "./src" - }, - "include": ["./src/**/*.*"], - "exclude": ["./src/**/*.test.ts"], - "references": [ - { - "path": "../core/tsconfig.build.json" - } - ] -} diff --git a/packages/@uppy/companion-client/tsconfig.json b/packages/@uppy/companion-client/tsconfig.json deleted file mode 100644 index edd6c80fb..000000000 --- a/packages/@uppy/companion-client/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../../tsconfig.shared", - "compilerOptions": { - "emitDeclarationOnly": false, - "noEmit": true - }, - "include": ["./package.json", "./src/**/*.*"], - "references": [ - { - "path": "../core/tsconfig.build.json" - } - ] -} diff --git a/packages/@uppy/companion-client/turbo.json b/packages/@uppy/companion-client/turbo.json deleted file mode 100644 index 83c0d57e1..000000000 --- a/packages/@uppy/companion-client/turbo.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": ["//"], - "tasks": { - "build": { - "dependsOn": ["^build", "@uppy/core#build"] - } - } -} diff --git a/packages/@uppy/core/package.json b/packages/@uppy/core/package.json index a4707b7c0..ad456a072 100644 --- a/packages/@uppy/core/package.json +++ b/packages/@uppy/core/package.json @@ -40,6 +40,7 @@ "./css/style.scss": "./src/style.scss", "./store-default": "./lib/store/index.js", "./utils": "./lib/utils/index.js", + "./companion-client": "./lib/companion-client/index.js", "./package.json": "./package.json" }, "dependencies": { @@ -48,6 +49,7 @@ "mime-match": "^1.0.2", "namespace-emitter": "^2.0.1", "nanoid": "^5.1.11", + "p-retry": "^6.1.0", "preact": "^10.29.2" }, "devDependencies": { diff --git a/packages/@uppy/core/src/Uppy.ts b/packages/@uppy/core/src/Uppy.ts index 84b0d0986..7a6485011 100644 --- a/packages/@uppy/core/src/Uppy.ts +++ b/packages/@uppy/core/src/Uppy.ts @@ -166,7 +166,7 @@ export interface BaseProviderPlugin { * that uses the Companion-assisted OAuth flow. * As the plugins are passed around throughout Uppy we need a generic type for this. * It may seems like duplication, but this type safe. Changing the type of `storage` - * will error in the `Provider` class of @uppy/companion-client and vice versa. + * will error in the `Provider` class of @uppy/core/companion-client and vice versa. * * Note that this is the *plugin* class, not a version of the `Provider` class. * `Provider` does operate on Companion plugins with `uppy.getPlugin()`. @@ -187,7 +187,7 @@ export type UnknownProviderPlugin< * UnknownSearchProviderPlugin can be any search Companion plugin (such as Unsplash). * As the plugins are passed around throughout Uppy we need a generic type for this. * It may seems like duplication, but this type safe. Changing the type of `title` - * will error in the `SearchProvider` class of @uppy/companion-client and vice versa. + * will error in the `SearchProvider` class of @uppy/core/companion-client and vice versa. * * Note that this is the *plugin* class, not a version of the `SearchProvider` class. * `SearchProvider` does operate on Companion plugins with `uppy.getPlugin()`. diff --git a/packages/@uppy/companion-client/src/AuthError.ts b/packages/@uppy/core/src/companion-client/AuthError.ts similarity index 100% rename from packages/@uppy/companion-client/src/AuthError.ts rename to packages/@uppy/core/src/companion-client/AuthError.ts diff --git a/packages/@uppy/companion-client/src/CompanionPluginOptions.ts b/packages/@uppy/core/src/companion-client/CompanionPluginOptions.ts similarity index 84% rename from packages/@uppy/companion-client/src/CompanionPluginOptions.ts rename to packages/@uppy/core/src/companion-client/CompanionPluginOptions.ts index b02babd00..a1a40a9fd 100644 --- a/packages/@uppy/companion-client/src/CompanionPluginOptions.ts +++ b/packages/@uppy/core/src/companion-client/CompanionPluginOptions.ts @@ -1,4 +1,4 @@ -import type { AsyncStore, UIPluginOptions } from '@uppy/core' +import type { AsyncStore, UIPluginOptions } from '../index.js' export interface CompanionPluginOptions extends UIPluginOptions { storage?: AsyncStore diff --git a/packages/@uppy/companion-client/src/Provider.ts b/packages/@uppy/core/src/companion-client/Provider.ts similarity index 99% rename from packages/@uppy/companion-client/src/Provider.ts rename to packages/@uppy/core/src/companion-client/Provider.ts index 0923b7ea1..bbea03aca 100644 --- a/packages/@uppy/companion-client/src/Provider.ts +++ b/packages/@uppy/core/src/companion-client/Provider.ts @@ -4,12 +4,12 @@ import type { PluginOpts, UnknownProviderPlugin, Uppy, -} from '@uppy/core' +} from '../index.js' import { type CompanionClientProvider, getSocketHost, type RequestOptions, -} from '@uppy/core/utils' +} from '../utils/index.js' import type { CompanionPluginOptions } from './index.js' import RequestClient, { authErrorStatusCode } from './RequestClient.js' diff --git a/packages/@uppy/companion-client/src/RequestClient.test.ts b/packages/@uppy/core/src/companion-client/RequestClient.test.ts similarity index 100% rename from packages/@uppy/companion-client/src/RequestClient.test.ts rename to packages/@uppy/core/src/companion-client/RequestClient.test.ts diff --git a/packages/@uppy/companion-client/src/RequestClient.ts b/packages/@uppy/core/src/companion-client/RequestClient.ts similarity index 99% rename from packages/@uppy/companion-client/src/RequestClient.ts rename to packages/@uppy/core/src/companion-client/RequestClient.ts index 5affe44bd..4e3bbf558 100644 --- a/packages/@uppy/companion-client/src/RequestClient.ts +++ b/packages/@uppy/core/src/companion-client/RequestClient.ts @@ -1,19 +1,19 @@ -import type Uppy from '@uppy/core' +import pRetry, { AbortError } from 'p-retry' +import packageJson from '../../package.json' with { type: 'json' } +import type Uppy from '../index.js' import type { Body, Meta, RemoteUppyFile, RequestOptions, UppyFile, -} from '@uppy/core/utils' +} from '../utils/index.js' import { ErrorWithCause, fetchWithNetworkError, getSocketHost, UserFacingApiError, -} from '@uppy/core/utils' -import pRetry, { AbortError } from 'p-retry' -import packageJson from '../package.json' with { type: 'json' } +} from '../utils/index.js' import AuthError from './AuthError.js' type CompanionHeaders = Record | undefined diff --git a/packages/@uppy/companion-client/src/SearchProvider.ts b/packages/@uppy/core/src/companion-client/SearchProvider.ts similarity index 88% rename from packages/@uppy/companion-client/src/SearchProvider.ts rename to packages/@uppy/core/src/companion-client/SearchProvider.ts index 8c7720b07..793bd33d6 100644 --- a/packages/@uppy/companion-client/src/SearchProvider.ts +++ b/packages/@uppy/core/src/companion-client/SearchProvider.ts @@ -1,5 +1,5 @@ -import type { Body, Meta, Uppy } from '@uppy/core' -import type { CompanionClientSearchProvider } from '@uppy/core/utils' +import type { Body, Meta, Uppy } from '../index.js' +import type { CompanionClientSearchProvider } from '../utils/index.js' import RequestClient, { type Opts } from './RequestClient.js' const getName = (id: string): string => { diff --git a/packages/@uppy/companion-client/src/getAllowedHosts.test.ts b/packages/@uppy/core/src/companion-client/getAllowedHosts.test.ts similarity index 100% rename from packages/@uppy/companion-client/src/getAllowedHosts.test.ts rename to packages/@uppy/core/src/companion-client/getAllowedHosts.test.ts diff --git a/packages/@uppy/companion-client/src/getAllowedHosts.ts b/packages/@uppy/core/src/companion-client/getAllowedHosts.ts similarity index 100% rename from packages/@uppy/companion-client/src/getAllowedHosts.ts rename to packages/@uppy/core/src/companion-client/getAllowedHosts.ts diff --git a/packages/@uppy/companion-client/src/index.ts b/packages/@uppy/core/src/companion-client/index.ts similarity index 100% rename from packages/@uppy/companion-client/src/index.ts rename to packages/@uppy/core/src/companion-client/index.ts diff --git a/packages/@uppy/companion-client/src/tokenStorage.ts b/packages/@uppy/core/src/companion-client/tokenStorage.ts similarity index 100% rename from packages/@uppy/companion-client/src/tokenStorage.ts rename to packages/@uppy/core/src/companion-client/tokenStorage.ts diff --git a/packages/@uppy/core/src/utils/CompanionClientProvider.ts b/packages/@uppy/core/src/utils/CompanionClientProvider.ts index 4f5f82f14..6cce7c558 100644 --- a/packages/@uppy/core/src/utils/CompanionClientProvider.ts +++ b/packages/@uppy/core/src/utils/CompanionClientProvider.ts @@ -11,7 +11,7 @@ export type RequestOptions = { /** * CompanionClientProvider is subset of the types of the `Provider` - * class from @uppy/companion-client. + * class from @uppy/core/companion-client. * * This is needed as the `Provider` class is passed around in Uppy and we * need to have shared types for it. Although we are duplicating some types, diff --git a/packages/@uppy/dropbox/package.json b/packages/@uppy/dropbox/package.json index 78e652bbf..467be902d 100644 --- a/packages/@uppy/dropbox/package.json +++ b/packages/@uppy/dropbox/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, diff --git a/packages/@uppy/dropbox/src/Dropbox.tsx b/packages/@uppy/dropbox/src/Dropbox.tsx index a79dce4a6..bd834226a 100644 --- a/packages/@uppy/dropbox/src/Dropbox.tsx +++ b/packages/@uppy/dropbox/src/Dropbox.tsx @@ -1,9 +1,3 @@ -import { - type CompanionPluginOptions, - getAllowedHosts, - Provider, - tokenStorage, -} from '@uppy/companion-client' import type { AsyncStore, Body, @@ -13,6 +7,12 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import { + type CompanionPluginOptions, + getAllowedHosts, + Provider, + tokenStorage, +} from '@uppy/core/companion-client' import type { LocaleStrings } from '@uppy/core/utils' import { ProviderViews } from '@uppy/provider-views' // biome-ignore lint/style/useImportType: h is not a type diff --git a/packages/@uppy/dropbox/tsconfig.build.json b/packages/@uppy/dropbox/tsconfig.build.json index 8d355f390..73521b1c6 100644 --- a/packages/@uppy/dropbox/tsconfig.build.json +++ b/packages/@uppy/dropbox/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/dropbox/tsconfig.json b/packages/@uppy/dropbox/tsconfig.json index 96feccd1e..1b6915eca 100644 --- a/packages/@uppy/dropbox/tsconfig.json +++ b/packages/@uppy/dropbox/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/facebook/package.json b/packages/@uppy/facebook/package.json index fcdd874fe..f95b6b187 100644 --- a/packages/@uppy/facebook/package.json +++ b/packages/@uppy/facebook/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, diff --git a/packages/@uppy/facebook/src/Facebook.tsx b/packages/@uppy/facebook/src/Facebook.tsx index e53d81aab..852602ca3 100644 --- a/packages/@uppy/facebook/src/Facebook.tsx +++ b/packages/@uppy/facebook/src/Facebook.tsx @@ -1,9 +1,3 @@ -import { - type CompanionPluginOptions, - getAllowedHosts, - Provider, - tokenStorage, -} from '@uppy/companion-client' import type { AsyncStore, Body, @@ -13,6 +7,12 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import { + type CompanionPluginOptions, + getAllowedHosts, + Provider, + tokenStorage, +} from '@uppy/core/companion-client' import type { LocaleStrings } from '@uppy/core/utils' import { ProviderViews } from '@uppy/provider-views' // biome-ignore lint/style/useImportType: h is not a type diff --git a/packages/@uppy/facebook/tsconfig.build.json b/packages/@uppy/facebook/tsconfig.build.json index 8d355f390..73521b1c6 100644 --- a/packages/@uppy/facebook/tsconfig.build.json +++ b/packages/@uppy/facebook/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/facebook/tsconfig.json b/packages/@uppy/facebook/tsconfig.json index 96feccd1e..1b6915eca 100644 --- a/packages/@uppy/facebook/tsconfig.json +++ b/packages/@uppy/facebook/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/google-drive-picker/package.json b/packages/@uppy/google-drive-picker/package.json index a29d4d6d3..d81ea8a13 100644 --- a/packages/@uppy/google-drive-picker/package.json +++ b/packages/@uppy/google-drive-picker/package.json @@ -36,7 +36,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, diff --git a/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx b/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx index 60674f9da..2737512fd 100644 --- a/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx +++ b/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx @@ -1,10 +1,10 @@ +import type { AsyncStore, BaseProviderPlugin, Body, Meta } from '@uppy/core' +import { UIPlugin, type Uppy } from '@uppy/core' import { type CompanionPluginOptions, RequestClient, tokenStorage, -} from '@uppy/companion-client' -import type { AsyncStore, BaseProviderPlugin, Body, Meta } from '@uppy/core' -import { UIPlugin, type Uppy } from '@uppy/core' +} from '@uppy/core/companion-client' import type { LocaleStrings } from '@uppy/core/utils' import { GoogleDriveIcon, diff --git a/packages/@uppy/google-drive-picker/tsconfig.build.json b/packages/@uppy/google-drive-picker/tsconfig.build.json index 6956822a9..a36abc05e 100644 --- a/packages/@uppy/google-drive-picker/tsconfig.build.json +++ b/packages/@uppy/google-drive-picker/tsconfig.build.json @@ -9,9 +9,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/google-drive-picker/tsconfig.json b/packages/@uppy/google-drive-picker/tsconfig.json index 96feccd1e..1b6915eca 100644 --- a/packages/@uppy/google-drive-picker/tsconfig.json +++ b/packages/@uppy/google-drive-picker/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/google-drive/package.json b/packages/@uppy/google-drive/package.json index 7789e9edc..796518672 100644 --- a/packages/@uppy/google-drive/package.json +++ b/packages/@uppy/google-drive/package.json @@ -35,7 +35,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, diff --git a/packages/@uppy/google-drive/src/GoogleDrive.tsx b/packages/@uppy/google-drive/src/GoogleDrive.tsx index 36cccf58e..9f93a5b11 100644 --- a/packages/@uppy/google-drive/src/GoogleDrive.tsx +++ b/packages/@uppy/google-drive/src/GoogleDrive.tsx @@ -1,9 +1,3 @@ -import { - type CompanionPluginOptions, - getAllowedHosts, - Provider, - tokenStorage, -} from '@uppy/companion-client' import type { AsyncStore, Body, @@ -13,6 +7,12 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import { + type CompanionPluginOptions, + getAllowedHosts, + Provider, + tokenStorage, +} from '@uppy/core/companion-client' import type { LocaleStrings } from '@uppy/core/utils' import type { ProviderViews } from '@uppy/provider-views' // biome-ignore lint/style/useImportType: h is not a type diff --git a/packages/@uppy/google-drive/tsconfig.build.json b/packages/@uppy/google-drive/tsconfig.build.json index 8d355f390..73521b1c6 100644 --- a/packages/@uppy/google-drive/tsconfig.build.json +++ b/packages/@uppy/google-drive/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/google-drive/tsconfig.json b/packages/@uppy/google-drive/tsconfig.json index 96feccd1e..1b6915eca 100644 --- a/packages/@uppy/google-drive/tsconfig.json +++ b/packages/@uppy/google-drive/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/google-photos-picker/package.json b/packages/@uppy/google-photos-picker/package.json index 7b6bb6a90..edf79bbb8 100644 --- a/packages/@uppy/google-photos-picker/package.json +++ b/packages/@uppy/google-photos-picker/package.json @@ -36,7 +36,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, diff --git a/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx b/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx index f5729b04b..250d11f24 100644 --- a/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx +++ b/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx @@ -1,10 +1,10 @@ +import type { AsyncStore, BaseProviderPlugin, Body, Meta } from '@uppy/core' +import { UIPlugin, type Uppy } from '@uppy/core' import { type CompanionPluginOptions, RequestClient, tokenStorage, -} from '@uppy/companion-client' -import type { AsyncStore, BaseProviderPlugin, Body, Meta } from '@uppy/core' -import { UIPlugin, type Uppy } from '@uppy/core' +} from '@uppy/core/companion-client' import type { LocaleStrings } from '@uppy/core/utils' import { GooglePhotosIcon, diff --git a/packages/@uppy/google-photos-picker/tsconfig.build.json b/packages/@uppy/google-photos-picker/tsconfig.build.json index 6956822a9..a36abc05e 100644 --- a/packages/@uppy/google-photos-picker/tsconfig.build.json +++ b/packages/@uppy/google-photos-picker/tsconfig.build.json @@ -9,9 +9,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/google-photos-picker/tsconfig.json b/packages/@uppy/google-photos-picker/tsconfig.json index 96feccd1e..1b6915eca 100644 --- a/packages/@uppy/google-photos-picker/tsconfig.json +++ b/packages/@uppy/google-photos-picker/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/onedrive/package.json b/packages/@uppy/onedrive/package.json index a122a6bdf..d350514d0 100644 --- a/packages/@uppy/onedrive/package.json +++ b/packages/@uppy/onedrive/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, diff --git a/packages/@uppy/onedrive/src/OneDrive.tsx b/packages/@uppy/onedrive/src/OneDrive.tsx index 25843f8a6..219b5042a 100644 --- a/packages/@uppy/onedrive/src/OneDrive.tsx +++ b/packages/@uppy/onedrive/src/OneDrive.tsx @@ -1,9 +1,3 @@ -import { - type CompanionPluginOptions, - getAllowedHosts, - Provider, - tokenStorage, -} from '@uppy/companion-client' import type { AsyncStore, Body, @@ -13,6 +7,12 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import { + type CompanionPluginOptions, + getAllowedHosts, + Provider, + tokenStorage, +} from '@uppy/core/companion-client' import type { LocaleStrings } from '@uppy/core/utils' import { ProviderViews } from '@uppy/provider-views' // biome-ignore lint/style/useImportType: h is not a type diff --git a/packages/@uppy/onedrive/tsconfig.build.json b/packages/@uppy/onedrive/tsconfig.build.json index 8d355f390..73521b1c6 100644 --- a/packages/@uppy/onedrive/tsconfig.build.json +++ b/packages/@uppy/onedrive/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/onedrive/tsconfig.json b/packages/@uppy/onedrive/tsconfig.json index 96feccd1e..1b6915eca 100644 --- a/packages/@uppy/onedrive/tsconfig.json +++ b/packages/@uppy/onedrive/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/remote-sources/src/index.ts b/packages/@uppy/remote-sources/src/index.ts index f9ec5f842..e1bc0bdac 100644 --- a/packages/@uppy/remote-sources/src/index.ts +++ b/packages/@uppy/remote-sources/src/index.ts @@ -1,5 +1,4 @@ import Box from '@uppy/box' -import type { CompanionPluginOptions } from '@uppy/companion-client' import type { Body, DefinePluginOpts, @@ -8,6 +7,7 @@ import type { Uppy, } from '@uppy/core' import { BasePlugin } from '@uppy/core' +import type { CompanionPluginOptions } from '@uppy/core/companion-client' import Dropbox from '@uppy/dropbox' import Facebook from '@uppy/facebook' import GoogleDrive from '@uppy/google-drive' diff --git a/packages/@uppy/transloadit/tsconfig.build.json b/packages/@uppy/transloadit/tsconfig.build.json index 5bf2c7317..796d499a7 100644 --- a/packages/@uppy/transloadit/tsconfig.build.json +++ b/packages/@uppy/transloadit/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/transloadit/tsconfig.json b/packages/@uppy/transloadit/tsconfig.json index 3390dce0e..25b3d2803 100644 --- a/packages/@uppy/transloadit/tsconfig.json +++ b/packages/@uppy/transloadit/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/tus/package.json b/packages/@uppy/tus/package.json index 27f4c9b5f..6ab1bc004 100644 --- a/packages/@uppy/tus/package.json +++ b/packages/@uppy/tus/package.json @@ -37,7 +37,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", "tus-js-client": "^4.3.1" }, "devDependencies": { diff --git a/packages/@uppy/tus/src/index.ts b/packages/@uppy/tus/src/index.ts index e02b5663e..2929cb76e 100644 --- a/packages/@uppy/tus/src/index.ts +++ b/packages/@uppy/tus/src/index.ts @@ -1,4 +1,3 @@ -import type { RequestClient } from '@uppy/companion-client' import type { Body, DefinePluginOpts, @@ -8,6 +7,7 @@ import type { UppyFile, } from '@uppy/core' import { BasePlugin, EventManager } from '@uppy/core' +import type { RequestClient } from '@uppy/core/companion-client' import { filterFilesToEmitUploadStarted, filterFilesToUpload, diff --git a/packages/@uppy/tus/tsconfig.build.json b/packages/@uppy/tus/tsconfig.build.json index 90105c5c7..ac99ccdd7 100644 --- a/packages/@uppy/tus/tsconfig.build.json +++ b/packages/@uppy/tus/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/tus/tsconfig.json b/packages/@uppy/tus/tsconfig.json index 63e6154dd..edd6c80fb 100644 --- a/packages/@uppy/tus/tsconfig.json +++ b/packages/@uppy/tus/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/unsplash/package.json b/packages/@uppy/unsplash/package.json index f5b84cc0a..b033a108c 100644 --- a/packages/@uppy/unsplash/package.json +++ b/packages/@uppy/unsplash/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, diff --git a/packages/@uppy/unsplash/src/Unsplash.tsx b/packages/@uppy/unsplash/src/Unsplash.tsx index dd5e04b44..ec2376991 100644 --- a/packages/@uppy/unsplash/src/Unsplash.tsx +++ b/packages/@uppy/unsplash/src/Unsplash.tsx @@ -1,9 +1,3 @@ -import { - type CompanionPluginOptions, - getAllowedHosts, - SearchProvider, - tokenStorage, -} from '@uppy/companion-client' import type { AsyncStore, Body, @@ -13,6 +7,12 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import { + type CompanionPluginOptions, + getAllowedHosts, + SearchProvider, + tokenStorage, +} from '@uppy/core/companion-client' import type { LocaleStrings } from '@uppy/core/utils' import { SearchProviderViews } from '@uppy/provider-views' // biome-ignore lint/style/useImportType: h is not a type diff --git a/packages/@uppy/unsplash/tsconfig.build.json b/packages/@uppy/unsplash/tsconfig.build.json index 8d355f390..73521b1c6 100644 --- a/packages/@uppy/unsplash/tsconfig.build.json +++ b/packages/@uppy/unsplash/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/unsplash/tsconfig.json b/packages/@uppy/unsplash/tsconfig.json index 96feccd1e..1b6915eca 100644 --- a/packages/@uppy/unsplash/tsconfig.json +++ b/packages/@uppy/unsplash/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/url/package.json b/packages/@uppy/url/package.json index c24c94230..91e142074 100644 --- a/packages/@uppy/url/package.json +++ b/packages/@uppy/url/package.json @@ -45,7 +45,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", "nanoid": "^5.1.11", "preact": "^10.29.2" }, diff --git a/packages/@uppy/url/src/Url.tsx b/packages/@uppy/url/src/Url.tsx index 4658dec13..9ebb03869 100644 --- a/packages/@uppy/url/src/Url.tsx +++ b/packages/@uppy/url/src/Url.tsx @@ -1,9 +1,9 @@ +import type { Body, Meta } from '@uppy/core' +import { UIPlugin, type Uppy } from '@uppy/core' import { type CompanionPluginOptions, RequestClient, -} from '@uppy/companion-client' -import type { Body, Meta } from '@uppy/core' -import { UIPlugin, type Uppy } from '@uppy/core' +} from '@uppy/core/companion-client' import type { LocaleStrings, MinimalRequiredUppyFile, diff --git a/packages/@uppy/url/tsconfig.build.json b/packages/@uppy/url/tsconfig.build.json index 90105c5c7..ac99ccdd7 100644 --- a/packages/@uppy/url/tsconfig.build.json +++ b/packages/@uppy/url/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/url/tsconfig.json b/packages/@uppy/url/tsconfig.json index 63e6154dd..edd6c80fb 100644 --- a/packages/@uppy/url/tsconfig.json +++ b/packages/@uppy/url/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/webdav/package.json b/packages/@uppy/webdav/package.json index fb7fde4c8..892210f4a 100644 --- a/packages/@uppy/webdav/package.json +++ b/packages/@uppy/webdav/package.json @@ -38,7 +38,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, diff --git a/packages/@uppy/webdav/src/Webdav.tsx b/packages/@uppy/webdav/src/Webdav.tsx index d9eaaeaab..e11c5b96e 100644 --- a/packages/@uppy/webdav/src/Webdav.tsx +++ b/packages/@uppy/webdav/src/Webdav.tsx @@ -1,8 +1,3 @@ -import { - type CompanionPluginOptions, - Provider, - tokenStorage, -} from '@uppy/companion-client' import type { AsyncStore, Body, @@ -12,8 +7,12 @@ import type { Uppy, UppyFile, } from '@uppy/core' - import { UIPlugin } from '@uppy/core' +import { + type CompanionPluginOptions, + Provider, + tokenStorage, +} from '@uppy/core/companion-client' import type { I18n, LocaleStrings } from '@uppy/core/utils' import { ProviderViews, SearchView } from '@uppy/provider-views' // biome-ignore lint/style/useImportType: h is not a type diff --git a/packages/@uppy/webdav/tsconfig.build.json b/packages/@uppy/webdav/tsconfig.build.json index 59d42e678..497086450 100644 --- a/packages/@uppy/webdav/tsconfig.build.json +++ b/packages/@uppy/webdav/tsconfig.build.json @@ -12,9 +12,6 @@ }, { "path": "../provider-views/tsconfig.build.json" - }, - { - "path": "../companion-client/tsconfig.build.json" } ] } diff --git a/packages/@uppy/webdav/tsconfig.json b/packages/@uppy/webdav/tsconfig.json index a2eedebab..3d1faf43c 100644 --- a/packages/@uppy/webdav/tsconfig.json +++ b/packages/@uppy/webdav/tsconfig.json @@ -11,9 +11,6 @@ }, { "path": "../provider-views/tsconfig.build.json" - }, - { - "path": "../companion-client/tsconfig.build.json" } ] } diff --git a/packages/@uppy/xhr-upload/package.json b/packages/@uppy/xhr-upload/package.json index e9256b4fc..bd2fdcfce 100644 --- a/packages/@uppy/xhr-upload/package.json +++ b/packages/@uppy/xhr-upload/package.json @@ -39,9 +39,6 @@ ".": "./lib/index.js", "./package.json": "./package.json" }, - "dependencies": { - "@uppy/companion-client": "workspace:^" - }, "devDependencies": { "@uppy/core": "workspace:^", "@uppy/dashboard": "workspace:^", diff --git a/packages/@uppy/xhr-upload/src/index.ts b/packages/@uppy/xhr-upload/src/index.ts index 439a1656c..9bd19f35b 100644 --- a/packages/@uppy/xhr-upload/src/index.ts +++ b/packages/@uppy/xhr-upload/src/index.ts @@ -1,4 +1,3 @@ -import type { RequestClient } from '@uppy/companion-client' import type { Body, DefinePluginOpts, @@ -9,6 +8,7 @@ import type { UppyFile, } from '@uppy/core' import { BasePlugin, EventManager } from '@uppy/core' +import type { RequestClient } from '@uppy/core/companion-client' import { type FetcherOptions, fetcher, diff --git a/packages/@uppy/xhr-upload/tsconfig.build.json b/packages/@uppy/xhr-upload/tsconfig.build.json index 90105c5c7..ac99ccdd7 100644 --- a/packages/@uppy/xhr-upload/tsconfig.build.json +++ b/packages/@uppy/xhr-upload/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/xhr-upload/tsconfig.json b/packages/@uppy/xhr-upload/tsconfig.json index 63e6154dd..edd6c80fb 100644 --- a/packages/@uppy/xhr-upload/tsconfig.json +++ b/packages/@uppy/xhr-upload/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/zoom/package.json b/packages/@uppy/zoom/package.json index b2382d423..b97047747 100644 --- a/packages/@uppy/zoom/package.json +++ b/packages/@uppy/zoom/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, diff --git a/packages/@uppy/zoom/src/Zoom.tsx b/packages/@uppy/zoom/src/Zoom.tsx index 8a0ffdf1c..a61533ea5 100644 --- a/packages/@uppy/zoom/src/Zoom.tsx +++ b/packages/@uppy/zoom/src/Zoom.tsx @@ -1,9 +1,3 @@ -import { - type CompanionPluginOptions, - getAllowedHosts, - Provider, - tokenStorage, -} from '@uppy/companion-client' import type { AsyncStore, Body, @@ -13,6 +7,12 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import { + type CompanionPluginOptions, + getAllowedHosts, + Provider, + tokenStorage, +} from '@uppy/core/companion-client' import type { LocaleStrings } from '@uppy/core/utils' import { ProviderViews } from '@uppy/provider-views' // biome-ignore lint/style/useImportType: h is not a type diff --git a/packages/@uppy/zoom/tsconfig.build.json b/packages/@uppy/zoom/tsconfig.build.json index 8d355f390..73521b1c6 100644 --- a/packages/@uppy/zoom/tsconfig.build.json +++ b/packages/@uppy/zoom/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/@uppy/zoom/tsconfig.json b/packages/@uppy/zoom/tsconfig.json index 96feccd1e..1b6915eca 100644 --- a/packages/@uppy/zoom/tsconfig.json +++ b/packages/@uppy/zoom/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../companion-client/tsconfig.build.json" - }, { "path": "../provider-views/tsconfig.build.json" }, diff --git a/packages/uppy/package.json b/packages/uppy/package.json index 057d4b2e0..421228837 100644 --- a/packages/uppy/package.json +++ b/packages/uppy/package.json @@ -40,7 +40,6 @@ "@uppy/audio": "workspace:*", "@uppy/aws-s3": "workspace:*", "@uppy/box": "workspace:*", - "@uppy/companion-client": "workspace:*", "@uppy/compressor": "workspace:*", "@uppy/core": "workspace:*", "@uppy/dashboard": "workspace:*", diff --git a/packages/uppy/src/bundle.ts b/packages/uppy/src/bundle.ts index d87821cef..2678bcca0 100644 --- a/packages/uppy/src/bundle.ts +++ b/packages/uppy/src/bundle.ts @@ -10,7 +10,7 @@ export function Core() { } // Utilities -export * as server from '@uppy/companion-client' +export * as server from '@uppy/core/companion-client' import * as ProviderView from '@uppy/provider-views' diff --git a/packages/uppy/tsconfig.build.json b/packages/uppy/tsconfig.build.json index c9b5dd42c..5a5d2372a 100644 --- a/packages/uppy/tsconfig.build.json +++ b/packages/uppy/tsconfig.build.json @@ -16,9 +16,6 @@ { "path": "../@uppy/box/tsconfig.build.json" }, - { - "path": "../@uppy/companion-client/tsconfig.build.json" - }, { "path": "../@uppy/compressor/tsconfig.build.json" }, diff --git a/packages/uppy/tsconfig.json b/packages/uppy/tsconfig.json index 1796a88fa..e1cb4dc63 100644 --- a/packages/uppy/tsconfig.json +++ b/packages/uppy/tsconfig.json @@ -15,9 +15,6 @@ { "path": "../@uppy/box/tsconfig.build.json" }, - { - "path": "../@uppy/companion-client/tsconfig.build.json" - }, { "path": "../@uppy/compressor/tsconfig.build.json" }, diff --git a/yarn.lock b/yarn.lock index b391ea8d7..974abb952 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9060,7 +9060,6 @@ __metadata: "@aws-sdk/client-s3": "npm:^3.362.0" "@aws-sdk/s3-request-presigner": "npm:^3.362.0" "@types/node": "npm:^20.19.0" - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" jsdom: "npm:^26.1.0" nock: "npm:^13.1.0" @@ -9076,7 +9075,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/box@workspace:packages/@uppy/box" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" @@ -9086,20 +9084,6 @@ __metadata: languageName: unknown linkType: soft -"@uppy/companion-client@workspace:*, @uppy/companion-client@workspace:^, @uppy/companion-client@workspace:packages/@uppy/companion-client": - version: 0.0.0-use.local - resolution: "@uppy/companion-client@workspace:packages/@uppy/companion-client" - dependencies: - jsdom: "npm:^29.1.1" - namespace-emitter: "npm:^2.0.1" - p-retry: "npm:^6.1.0" - typescript: "npm:^5.8.3" - vitest: "npm:^4.1.6" - peerDependencies: - "@uppy/core": "workspace:^" - languageName: unknown - linkType: soft - "@uppy/companion@workspace:*, @uppy/companion@workspace:^, @uppy/companion@workspace:packages/@uppy/companion": version: 0.0.0-use.local resolution: "@uppy/companion@workspace:packages/@uppy/companion" @@ -9240,6 +9224,7 @@ __metadata: mime-match: "npm:^1.0.2" namespace-emitter: "npm:^2.0.1" nanoid: "npm:^5.1.11" + p-retry: "npm:^6.1.0" postcss: "npm:^8.5.15" postcss-cli: "npm:^11.0.1" preact: "npm:^10.29.2" @@ -9315,7 +9300,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/dropbox@workspace:packages/@uppy/dropbox" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" @@ -9329,7 +9313,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/facebook@workspace:packages/@uppy/facebook" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" @@ -9372,7 +9355,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/google-drive-picker@workspace:packages/@uppy/google-drive-picker" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" @@ -9386,7 +9368,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/google-drive@workspace:packages/@uppy/google-drive" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" @@ -9400,7 +9381,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/google-photos-picker@workspace:packages/@uppy/google-photos-picker" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" @@ -9459,7 +9439,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/onedrive@workspace:packages/@uppy/onedrive" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" @@ -9657,7 +9636,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/tus@workspace:packages/@uppy/tus" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" jsdom: "npm:^29.1.1" tus-js-client: "npm:^4.3.1" @@ -9672,7 +9650,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/unsplash@workspace:packages/@uppy/unsplash" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" @@ -9686,7 +9663,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/url@workspace:packages/@uppy/url" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" "@vitest/browser": "npm:^4.1.6" "@vitest/browser-playwright": "npm:^4.1.6" @@ -9755,7 +9731,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/webdav@workspace:packages/@uppy/webdav" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" @@ -9769,7 +9744,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/xhr-upload@workspace:packages/@uppy/xhr-upload" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" "@uppy/dashboard": "workspace:^" "@vitest/browser": "npm:^4.1.6" @@ -9788,7 +9762,6 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/zoom@workspace:packages/@uppy/zoom" dependencies: - "@uppy/companion-client": "workspace:^" "@uppy/core": "workspace:^" "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" @@ -13493,7 +13466,6 @@ __metadata: resolution: "example-companion-custom-provider@workspace:examples/companion-custom-provider" dependencies: "@uppy/companion": "workspace:*" - "@uppy/companion-client": "workspace:*" "@uppy/core": "workspace:*" "@uppy/dashboard": "workspace:*" "@uppy/google-drive": "workspace:*" @@ -23399,7 +23371,6 @@ __metadata: "@uppy/audio": "workspace:*" "@uppy/aws-s3": "workspace:*" "@uppy/box": "workspace:*" - "@uppy/companion-client": "workspace:*" "@uppy/compressor": "workspace:*" "@uppy/core": "workspace:*" "@uppy/dashboard": "workspace:*"