From 1c7ede3cd4047a244d90d05f11c1cb47866f6e71 Mon Sep 17 00:00:00 2001 From: prakash Date: Mon, 15 Jun 2026 12:54:57 +0530 Subject: [PATCH 01/11] refactor(core): merge @uppy/store-default into core via ./store-default export --- packages/@uppy/core/package.json | 2 +- packages/@uppy/core/src/Uppy.ts | 2 +- packages/@uppy/core/src/index.ts | 2 +- .../src => core/src/store}/index.test.ts | 0 .../src => core/src/store}/index.ts | 2 +- packages/@uppy/core/tsconfig.build.json | 3 - packages/@uppy/core/tsconfig.json | 3 - packages/@uppy/store-default/.npmignore | 1 - packages/@uppy/store-default/CHANGELOG.md | 102 ------------------ packages/@uppy/store-default/LICENSE | 21 ---- packages/@uppy/store-default/README.md | 45 -------- packages/@uppy/store-default/package.json | 43 -------- .../@uppy/store-default/tsconfig.build.json | 10 -- packages/@uppy/store-default/tsconfig.json | 10 -- packages/uppy/package.json | 1 - packages/uppy/src/bundle.ts | 4 +- packages/uppy/tsconfig.build.json | 3 - packages/uppy/tsconfig.json | 3 - private/dev/tsconfig.json | 3 - yarn.lock | 13 --- 20 files changed, 6 insertions(+), 267 deletions(-) rename packages/@uppy/{store-default/src => core/src/store}/index.test.ts (100%) rename packages/@uppy/{store-default/src => core/src/store}/index.ts (94%) delete mode 100644 packages/@uppy/store-default/.npmignore delete mode 100644 packages/@uppy/store-default/CHANGELOG.md delete mode 100644 packages/@uppy/store-default/LICENSE delete mode 100644 packages/@uppy/store-default/README.md delete mode 100644 packages/@uppy/store-default/package.json delete mode 100644 packages/@uppy/store-default/tsconfig.build.json delete mode 100644 packages/@uppy/store-default/tsconfig.json diff --git a/packages/@uppy/core/package.json b/packages/@uppy/core/package.json index 540183e47..75c57afb8 100644 --- a/packages/@uppy/core/package.json +++ b/packages/@uppy/core/package.json @@ -38,11 +38,11 @@ "./css/style.min.css": "./dist/style.min.css", "./css/style.css": "./dist/style.css", "./css/style.scss": "./src/style.scss", + "./store-default": "./lib/store/index.js", "./package.json": "./package.json" }, "dependencies": { "@transloadit/prettier-bytes": "^1.1.0", - "@uppy/store-default": "workspace:^", "@uppy/utils": "workspace:^", "lodash": "^4.18.1", "mime-match": "^1.0.2", diff --git a/packages/@uppy/core/src/Uppy.ts b/packages/@uppy/core/src/Uppy.ts index 73d0dd812..8077616ff 100644 --- a/packages/@uppy/core/src/Uppy.ts +++ b/packages/@uppy/core/src/Uppy.ts @@ -1,6 +1,5 @@ /* global AggregateError */ -import DefaultStore, { type Store } from '@uppy/store-default' import type { Body, CompanionClientProvider, @@ -40,6 +39,7 @@ import { Restricter, RestrictionError, } from './Restricter.js' +import DefaultStore, { type Store } from './store/index.js' import supportsUploadProgress from './supportsUploadProgress.js' type Processor = ( diff --git a/packages/@uppy/core/src/index.ts b/packages/@uppy/core/src/index.ts index 961bdd1a5..8382e6250 100644 --- a/packages/@uppy/core/src/index.ts +++ b/packages/@uppy/core/src/index.ts @@ -1,4 +1,3 @@ -export type { Store } from '@uppy/store-default' export type { Body, Meta, @@ -11,6 +10,7 @@ export { default as EventManager } from './EventManager.js' export { debugLogger } from './loggers.js' export type { Restrictions, ValidateableFile } from './Restricter.js' export { RestrictionError } from './Restricter.js' +export type { Store } from './store/index.js' export type { PluginTarget, UIPluginOptions } from './UIPlugin.js' export { default as UIPlugin } from './UIPlugin.js' export type { diff --git a/packages/@uppy/store-default/src/index.test.ts b/packages/@uppy/core/src/store/index.test.ts similarity index 100% rename from packages/@uppy/store-default/src/index.test.ts rename to packages/@uppy/core/src/store/index.test.ts diff --git a/packages/@uppy/store-default/src/index.ts b/packages/@uppy/core/src/store/index.ts similarity index 94% rename from packages/@uppy/store-default/src/index.ts rename to packages/@uppy/core/src/store/index.ts index 5da7359cb..c7708dbcb 100644 --- a/packages/@uppy/store-default/src/index.ts +++ b/packages/@uppy/core/src/store/index.ts @@ -1,4 +1,4 @@ -import packageJson from '../package.json' with { type: 'json' } +import packageJson from '../../package.json' with { type: 'json' } export type GenericState = Record diff --git a/packages/@uppy/core/tsconfig.build.json b/packages/@uppy/core/tsconfig.build.json index 7af4ec3f9..5afe23c5a 100644 --- a/packages/@uppy/core/tsconfig.build.json +++ b/packages/@uppy/core/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../store-default/tsconfig.build.json" - }, { "path": "../utils/tsconfig.build.json" } diff --git a/packages/@uppy/core/tsconfig.json b/packages/@uppy/core/tsconfig.json index 66c8a6882..9b315b7f0 100644 --- a/packages/@uppy/core/tsconfig.json +++ b/packages/@uppy/core/tsconfig.json @@ -7,9 +7,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../store-default/tsconfig.build.json" - }, { "path": "../utils/tsconfig.build.json" } diff --git a/packages/@uppy/store-default/.npmignore b/packages/@uppy/store-default/.npmignore deleted file mode 100644 index 6c816673f..000000000 --- a/packages/@uppy/store-default/.npmignore +++ /dev/null @@ -1 +0,0 @@ -tsconfig.* diff --git a/packages/@uppy/store-default/CHANGELOG.md b/packages/@uppy/store-default/CHANGELOG.md deleted file mode 100644 index 9d1e951f2..000000000 --- a/packages/@uppy/store-default/CHANGELOG.md +++ /dev/null @@ -1,102 +0,0 @@ -# @uppy/store-default - -## 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"; - ``` - -## 4.3.2 - -### Patch Changes - -- 1b1a9e3: Define "files" in package.json - -## 4.3.0 - -### Minor Changes - -- 0c24c5a: Use TypeScript compiler instead of Babel - -## 4.1.2 - -Released: 2024-12-05 -Included in: Uppy v4.8.0 - -- @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.1.0 - -Released: 2024-07-30 -Included in: Uppy v4.1.0 - -- @uppy/core,@uppy/store-default: export `Store` type (Merlijn Vos / #5373) - -## 3.1.0 - -Released: 2023-11-24 -Included in: Uppy v3.20.0 - -- @uppy/store-default: refactor to typescript (Antoine du Hamel / #4785) - -## 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 - -## 3.0.0-beta.2 - -Released: 2022-08-03 -Included in: Uppy v3.0.0-beta.4 - -- @uppy/store-default: export the class, don't expose `.callbacks` (Antoine du Hamel / #3928) - -## 2.1.0 - -Released: 2022-05-30 -Included in: Uppy v2.11.0 - -- @uppy/angular,@uppy/audio,@uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/box,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/onedrive,@uppy/progress-bar,@uppy/react,@uppy/redux-dev-tools,@uppy/robodog,@uppy/screen-capture,@uppy/status-bar,@uppy/store-default,@uppy/store-redux,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom: doc: update bundler recommendation (Antoine du Hamel / #3763) -- @uppy/store-default: refactor to ESM (Antoine du Hamel / #3746) diff --git a/packages/@uppy/store-default/LICENSE b/packages/@uppy/store-default/LICENSE deleted file mode 100644 index c23747330..000000000 --- a/packages/@uppy/store-default/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/store-default/README.md b/packages/@uppy/store-default/README.md deleted file mode 100644 index e47ca538b..000000000 --- a/packages/@uppy/store-default/README.md +++ /dev/null @@ -1,45 +0,0 @@ -# @uppy/store-default - -Uppy logo: a smiling puppy above a pink upwards arrow - -[![npm version](https://img.shields.io/npm/v/@uppy/store-default.svg?style=flat-square)](https://www.npmjs.com/package/@uppy/store-default) -![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) - -A basic object-based store for Uppy. This one is used by default, you do not -need to add it manually. - -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 DefaultStore from '@uppy/store-default' - -const uppy = new Uppy({ - store: new DefaultStore(), -}) -``` - -## Installation - -```bash -$ npm install @uppy/store-default -``` - -Alternatively, you can also use this package in a pre-built bundle from -Transloadit’s CDN: Smart CDN. In that case `Uppy` will attach itself to the -global `window.Uppy` object. See the -[main Uppy documentation](https://uppy.io/docs/#Installation) for instructions. - -## Documentation - -Documentation for this plugin can be found on the -[Uppy website](https://uppy.io/docs/guides/custom-stores#defaultstore). - -## License - -[The MIT License](./LICENSE). diff --git a/packages/@uppy/store-default/package.json b/packages/@uppy/store-default/package.json deleted file mode 100644 index fcb615c1b..000000000 --- a/packages/@uppy/store-default/package.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "@uppy/store-default", - "description": "The default simple object-based store for Uppy.", - "version": "5.0.0", - "license": "MIT", - "main": "lib/index.js", - "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-store" - ], - "homepage": "https://uppy.io", - "bugs": { - "url": "https://github.com/transloadit/uppy/issues" - }, - "devDependencies": { - "@types/node": "^20.19.0", - "jsdom": "^29.1.1", - "typescript": "^5.8.3", - "vitest": "^4.1.6" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/transloadit/uppy.git" - }, - "exports": { - ".": "./lib/index.js", - "./package.json": "./package.json" - }, - "files": [ - "src", - "lib", - "dist", - "CHANGELOG.md" - ] -} diff --git a/packages/@uppy/store-default/tsconfig.build.json b/packages/@uppy/store-default/tsconfig.build.json deleted file mode 100644 index d49e86d5f..000000000 --- a/packages/@uppy/store-default/tsconfig.build.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../tsconfig.shared", - "compilerOptions": { - "outDir": "./lib", - "rootDir": "./src" - }, - "include": ["./src/**/*.*"], - "exclude": ["./src/**/*.test.ts"], - "references": [] -} diff --git a/packages/@uppy/store-default/tsconfig.json b/packages/@uppy/store-default/tsconfig.json deleted file mode 100644 index 4fc6da5a4..000000000 --- a/packages/@uppy/store-default/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../tsconfig.shared", - "compilerOptions": { - "emitDeclarationOnly": false, - "noEmit": true, - "types": ["preact", "node"] - }, - "include": ["./package.json", "./src/**/*.*"], - "references": [] -} diff --git a/packages/uppy/package.json b/packages/uppy/package.json index cafdb50c1..057d4b2e0 100644 --- a/packages/uppy/package.json +++ b/packages/uppy/package.json @@ -61,7 +61,6 @@ "@uppy/remote-sources": "workspace:*", "@uppy/screen-capture": "workspace:*", "@uppy/status-bar": "workspace:*", - "@uppy/store-default": "workspace:*", "@uppy/thumbnail-generator": "workspace:*", "@uppy/transloadit": "workspace:*", "@uppy/tus": "workspace:*", diff --git a/packages/uppy/src/bundle.ts b/packages/uppy/src/bundle.ts index 860c41d21..d87821cef 100644 --- a/packages/uppy/src/bundle.ts +++ b/packages/uppy/src/bundle.ts @@ -23,6 +23,8 @@ export { default as AwsS3 } from '@uppy/aws-s3' export { default as Box } from '@uppy/box' // Miscellaneous export { default as Compressor } from '@uppy/compressor' +// Stores +export { default as DefaultStore } from '@uppy/core/store-default' // UI plugins export { default as Dashboard } from '@uppy/dashboard' export { default as DragDrop } from '@uppy/drag-drop' @@ -39,8 +41,6 @@ export { default as OneDrive } from '@uppy/onedrive' export { default as RemoteSources } from '@uppy/remote-sources' export { default as ScreenCapture } from '@uppy/screen-capture' export { default as StatusBar } from '@uppy/status-bar' -// Stores -export { default as DefaultStore } from '@uppy/store-default' export { default as ThumbnailGenerator } from '@uppy/thumbnail-generator' export { default as Transloadit } from '@uppy/transloadit' export { default as Tus } from '@uppy/tus' diff --git a/packages/uppy/tsconfig.build.json b/packages/uppy/tsconfig.build.json index f782a97d5..c9b5dd42c 100644 --- a/packages/uppy/tsconfig.build.json +++ b/packages/uppy/tsconfig.build.json @@ -67,9 +67,6 @@ { "path": "../@uppy/screen-capture/tsconfig.build.json" }, - { - "path": "../@uppy/store-default/tsconfig.build.json" - }, { "path": "../@uppy/thumbnail-generator/tsconfig.build.json" }, diff --git a/packages/uppy/tsconfig.json b/packages/uppy/tsconfig.json index 1c9df8e7c..1796a88fa 100644 --- a/packages/uppy/tsconfig.json +++ b/packages/uppy/tsconfig.json @@ -66,9 +66,6 @@ { "path": "../@uppy/screen-capture/tsconfig.build.json" }, - { - "path": "../@uppy/store-default/tsconfig.build.json" - }, { "path": "../@uppy/thumbnail-generator/tsconfig.build.json" }, diff --git a/private/dev/tsconfig.json b/private/dev/tsconfig.json index ff6a1ecec..c4f7c62e2 100644 --- a/private/dev/tsconfig.json +++ b/private/dev/tsconfig.json @@ -7,9 +7,6 @@ }, "include": ["./package.json", "./*.ts", "./*.js"], "references": [ - { - "path": "../../packages/@uppy/store-default/tsconfig.build.json" - }, { "path": "../../packages/@uppy/utils/tsconfig.build.json" }, diff --git a/yarn.lock b/yarn.lock index cdb4fe9f2..b44ce4e23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9237,7 +9237,6 @@ __metadata: "@transloadit/prettier-bytes": "npm:^1.1.0" "@types/deep-freeze": "npm:^0" "@types/node": "npm:^20.19.0" - "@uppy/store-default": "workspace:^" "@uppy/utils": "workspace:^" cssnano: "npm:^8.0.1" deep-freeze: "npm:^0.0.1" @@ -9608,17 +9607,6 @@ __metadata: languageName: unknown linkType: soft -"@uppy/store-default@workspace:*, @uppy/store-default@workspace:^, @uppy/store-default@workspace:packages/@uppy/store-default": - version: 0.0.0-use.local - resolution: "@uppy/store-default@workspace:packages/@uppy/store-default" - dependencies: - "@types/node": "npm:^20.19.0" - jsdom: "npm:^29.1.1" - typescript: "npm:^5.8.3" - vitest: "npm:^4.1.6" - languageName: unknown - linkType: soft - "@uppy/svelte@workspace:*, @uppy/svelte@workspace:packages/@uppy/svelte": version: 0.0.0-use.local resolution: "@uppy/svelte@workspace:packages/@uppy/svelte" @@ -23475,7 +23463,6 @@ __metadata: "@uppy/remote-sources": "workspace:*" "@uppy/screen-capture": "workspace:*" "@uppy/status-bar": "workspace:*" - "@uppy/store-default": "workspace:*" "@uppy/thumbnail-generator": "workspace:*" "@uppy/transloadit": "workspace:*" "@uppy/tus": "workspace:*" From 156b87ec1781d9444ad00726f598142ef31dbe2d Mon Sep 17 00:00:00 2001 From: prakash Date: Mon, 15 Jun 2026 13:13:09 +0530 Subject: [PATCH 02/11] refactor(core): merge @uppy/utils into core via ./utils export --- packages/@uppy/angular/turbo.json | 6 +- packages/@uppy/audio/package.json | 1 - packages/@uppy/audio/src/Audio.tsx | 4 +- packages/@uppy/audio/src/DiscardButton.tsx | 2 +- .../@uppy/audio/src/PermissionsScreen.tsx | 2 +- packages/@uppy/audio/src/RecordButton.tsx | 2 +- packages/@uppy/audio/src/RecordingScreen.tsx | 2 +- packages/@uppy/audio/src/SubmitButton.tsx | 2 +- packages/@uppy/audio/tsconfig.build.json | 3 - packages/@uppy/audio/tsconfig.json | 3 - packages/@uppy/aws-s3/package.json | 3 +- .../aws-s3/src/HTTPCommunicationQueue.ts | 5 +- .../@uppy/aws-s3/src/MultipartUploader.ts | 4 +- packages/@uppy/aws-s3/src/index.ts | 4 +- packages/@uppy/aws-s3/src/utils.ts | 4 +- packages/@uppy/aws-s3/tsconfig.build.json | 3 - packages/@uppy/aws-s3/tsconfig.json | 3 - packages/@uppy/box/package.json | 1 - packages/@uppy/box/src/Box.tsx | 3 +- packages/@uppy/box/tsconfig.build.json | 3 - packages/@uppy/box/tsconfig.json | 3 - packages/@uppy/companion-client/package.json | 1 - .../@uppy/companion-client/src/Provider.ts | 2 +- .../companion-client/src/RequestClient.ts | 4 +- .../companion-client/src/SearchProvider.ts | 2 +- .../companion-client/tsconfig.build.json | 3 - packages/@uppy/companion-client/tsconfig.json | 3 - packages/@uppy/components/tsconfig.build.json | 6 - packages/@uppy/components/tsconfig.json | 6 - packages/@uppy/compressor/package.json | 1 - packages/@uppy/compressor/src/index.test.ts | 2 +- packages/@uppy/compressor/src/index.ts | 4 +- packages/@uppy/compressor/tsconfig.build.json | 3 - packages/@uppy/compressor/tsconfig.json | 3 - packages/@uppy/core/package.json | 3 +- packages/@uppy/core/src/BasePlugin.ts | 9 +- packages/@uppy/core/src/EventManager.ts | 2 +- packages/@uppy/core/src/Restricter.ts | 2 +- packages/@uppy/core/src/UIPlugin.ts | 4 +- packages/@uppy/core/src/Uppy.test.ts | 2 +- packages/@uppy/core/src/Uppy.ts | 46 +-- packages/@uppy/core/src/index.ts | 12 +- packages/@uppy/core/src/loggers.ts | 2 +- packages/@uppy/core/src/types.test.ts | 7 +- .../src/utils}/AbortController.test.ts | 0 .../src => core/src/utils}/AbortController.ts | 0 .../src/utils}/CompanionClientProvider.ts | 0 .../src => core/src/utils}/CompanionFile.ts | 0 .../src/utils}/ErrorWithCause.test.ts | 0 .../src => core/src/utils}/ErrorWithCause.ts | 0 .../src/utils}/FOCUSABLE_ELEMENTS.ts | 0 .../src => core/src/utils}/FileProgress.ts | 0 .../src => core/src/utils}/NetworkError.ts | 0 .../src => core/src/utils}/ProgressTimeout.ts | 0 .../src/utils}/RateLimitedQueue.test.ts | 0 .../src/utils}/RateLimitedQueue.ts | 0 .../src => core/src/utils}/TaskQueue.test.ts | 0 .../src => core/src/utils}/TaskQueue.ts | 0 .../src => core/src/utils}/Translator.test.ts | 0 .../src => core/src/utils}/Translator.ts | 0 .../{utils/src => core/src/utils}/UppyFile.ts | 0 .../src/utils}/UserFacingApiError.ts | 0 .../src => core/src/utils}/VirtualList.tsx | 0 .../src => core/src/utils}/canvasToBlob.ts | 0 .../src/utils}/dataURItoBlob.test.ts | 0 .../src => core/src/utils}/dataURItoBlob.ts | 0 .../src/utils}/dataURItoFile.test.ts | 0 .../src => core/src/utils}/dataURItoFile.ts | 0 .../src => core/src/utils}/delay.test.ts | 0 .../{utils/src => core/src/utils}/delay.ts | 0 .../src => core/src/utils}/emaFilter.test.ts | 0 .../src => core/src/utils}/emaFilter.ts | 0 .../src/utils}/fetchWithNetworkError.ts | 0 .../{utils/src => core/src/utils}/fetcher.ts | 0 .../src => core/src/utils}/fileFilters.ts | 0 .../src/utils}/findAllDOMElements.ts | 0 .../src => core/src/utils}/findDOMElement.ts | 0 .../src/utils}/generateFileID.test.ts | 0 .../src => core/src/utils}/generateFileID.ts | 0 .../src/utils}/getAllowedMetaFields.ts | 0 .../src/utils}/getBytesRemaining.test.ts | 0 .../src/utils}/getBytesRemaining.ts | 0 .../src/utils}/getDroppedFiles/README.md | 0 .../src/utils}/getDroppedFiles/index.ts | 0 .../getDroppedFiles/utils/fallbackApi.ts | 0 .../getFilesAndDirectoriesFromDirectory.ts | 0 .../utils/webkitGetAsEntryApi/index.ts | 0 .../src => core/src/utils}/getETA.test.ts | 0 .../{utils/src => core/src/utils}/getETA.ts | 0 .../utils}/getFileNameAndExtension.test.ts | 0 .../src/utils}/getFileNameAndExtension.ts | 0 .../src/utils}/getFileType.test.ts | 0 .../src => core/src/utils}/getFileType.ts | 0 .../src/utils}/getFileTypeExtension.test.ts | 0 .../src/utils}/getFileTypeExtension.ts | 0 .../src/utils}/getSocketHost.test.ts | 0 .../src => core/src/utils}/getSocketHost.ts | 0 .../src => core/src/utils}/getSpeed.test.ts | 0 .../{utils/src => core/src/utils}/getSpeed.ts | 0 .../src/utils}/getTextDirection.ts | 0 .../src => core/src/utils}/getTimeStamp.ts | 0 .../src => core/src/utils}/hasProperty.ts | 0 .../{utils/src => core/src/utils}/index.ts | 0 .../src => core/src/utils}/isDOMElement.ts | 0 .../src/utils}/isDragDropSupported.ts | 0 .../src/utils}/isMobileDevice.test.ts | 0 .../src => core/src/utils}/isMobileDevice.ts | 0 .../src/utils}/isNetworkError.test.ts | 0 .../src => core/src/utils}/isNetworkError.ts | 0 .../src/utils}/isObjectURL.test.ts | 0 .../src => core/src/utils}/isObjectURL.ts | 0 .../src/utils}/isPreviewSupported.test.ts | 0 .../src/utils}/isPreviewSupported.ts | 0 .../src/utils}/isTouchDevice.test.ts | 0 .../src => core/src/utils}/isTouchDevice.ts | 0 .../src => core/src/utils}/microtip.scss | 0 .../src => core/src/utils}/mimeTypes.ts | 0 .../src => core/src/utils}/prettyETA.test.ts | 0 .../src => core/src/utils}/prettyETA.ts | 0 .../src/utils}/remoteFileObjToLocal.ts | 0 .../src/utils}/sampleImageDataURI.ts | 0 .../src/utils}/secondsToTime.test.ts | 0 .../src => core/src/utils}/secondsToTime.ts | 0 .../src => core/src/utils}/toArray.test.ts | 0 .../{utils/src => core/src/utils}/toArray.ts | 0 .../src/utils}/truncateString.test.ts | 0 .../src => core/src/utils}/truncateString.ts | 0 packages/@uppy/core/tsconfig.build.json | 6 +- packages/@uppy/core/tsconfig.json | 6 +- packages/@uppy/dashboard/package.json | 1 - packages/@uppy/dashboard/src/Dashboard.tsx | 4 +- .../dashboard/src/components/AddFiles.tsx | 2 +- .../dashboard/src/components/Dashboard.tsx | 4 +- .../src/components/FileItem/Buttons/index.tsx | 2 +- .../components/FileItem/FileInfo/index.tsx | 4 +- .../FileItem/FileProgress/index.tsx | 2 +- .../src/components/FileItem/index.tsx | 2 +- .../dashboard/src/components/FileList.tsx | 4 +- .../src/components/StatusBar/Components.tsx | 4 +- .../src/components/StatusBar/StatusBar.tsx | 4 +- .../src/components/StatusBar/StatusBarUI.tsx | 2 +- .../StatusBar/calculateProcessingProgress.ts | 2 +- .../src/components/StatusBar/style.scss | 2 +- .../dashboard/src/utils/createSuperFocus.ts | 2 +- .../@uppy/dashboard/src/utils/trapFocus.ts | 2 +- packages/@uppy/dashboard/tsconfig.build.json | 3 - packages/@uppy/dashboard/tsconfig.json | 3 - packages/@uppy/drag-drop/package.json | 1 - packages/@uppy/drag-drop/src/DragDrop.tsx | 4 +- packages/@uppy/drag-drop/tsconfig.build.json | 3 - packages/@uppy/drag-drop/tsconfig.json | 3 - packages/@uppy/drop-target/package.json | 3 - packages/@uppy/drop-target/src/index.ts | 2 +- .../@uppy/drop-target/tsconfig.build.json | 3 - packages/@uppy/drop-target/tsconfig.json | 3 - packages/@uppy/dropbox/package.json | 1 - packages/@uppy/dropbox/src/Dropbox.tsx | 3 +- packages/@uppy/dropbox/tsconfig.build.json | 3 - packages/@uppy/dropbox/tsconfig.json | 3 - packages/@uppy/facebook/package.json | 1 - packages/@uppy/facebook/src/Facebook.tsx | 3 +- packages/@uppy/facebook/tsconfig.build.json | 3 - packages/@uppy/facebook/tsconfig.json | 3 - packages/@uppy/form/package.json | 1 - packages/@uppy/form/src/index.ts | 2 +- packages/@uppy/form/tsconfig.build.json | 3 - packages/@uppy/form/tsconfig.json | 3 - packages/@uppy/golden-retriever/package.json | 1 - .../golden-retriever/src/IndexedDBStore.ts | 2 +- .../golden-retriever/src/MetaDataStore.ts | 6 +- .../golden-retriever/src/ServiceWorker.ts | 2 +- .../src/ServiceWorkerStore.ts | 2 +- packages/@uppy/golden-retriever/src/index.ts | 2 +- .../golden-retriever/tsconfig.build.json | 3 - packages/@uppy/golden-retriever/tsconfig.json | 3 - .../@uppy/google-drive-picker/package.json | 1 - .../src/GoogleDrivePicker.tsx | 2 +- .../google-drive-picker/tsconfig.build.json | 3 - .../@uppy/google-drive-picker/tsconfig.json | 3 - packages/@uppy/google-drive/package.json | 1 - .../@uppy/google-drive/src/GoogleDrive.tsx | 3 +- .../@uppy/google-drive/tsconfig.build.json | 3 - packages/@uppy/google-drive/tsconfig.json | 3 - .../@uppy/google-photos-picker/package.json | 1 - .../src/GooglePhotosPicker.tsx | 2 +- .../google-photos-picker/tsconfig.build.json | 3 - .../@uppy/google-photos-picker/tsconfig.json | 3 - packages/@uppy/image-editor/package.json | 1 - packages/@uppy/image-editor/src/Editor.tsx | 2 +- .../@uppy/image-editor/src/ImageEditor.tsx | 2 +- .../@uppy/image-editor/tsconfig.build.json | 3 - packages/@uppy/image-editor/tsconfig.json | 3 - packages/@uppy/image-generator/package.json | 1 - packages/@uppy/image-generator/src/index.tsx | 2 +- .../@uppy/image-generator/tsconfig.build.json | 3 - packages/@uppy/image-generator/tsconfig.json | 3 - packages/@uppy/locales/package.json | 2 +- packages/@uppy/locales/src/ar_SA.ts | 2 +- packages/@uppy/locales/src/bg_BG.ts | 2 +- packages/@uppy/locales/src/ca_ES.ts | 2 +- packages/@uppy/locales/src/cs_CZ.ts | 2 +- packages/@uppy/locales/src/da_DK.ts | 2 +- packages/@uppy/locales/src/de_DE.ts | 2 +- packages/@uppy/locales/src/el_GR.ts | 2 +- packages/@uppy/locales/src/en_US.ts | 2 +- packages/@uppy/locales/src/es_ES.ts | 2 +- packages/@uppy/locales/src/es_MX.ts | 2 +- packages/@uppy/locales/src/fa_IR.ts | 2 +- packages/@uppy/locales/src/fi_FI.ts | 2 +- packages/@uppy/locales/src/fr_FR.ts | 2 +- packages/@uppy/locales/src/gl_ES.ts | 2 +- packages/@uppy/locales/src/he_IL.ts | 2 +- packages/@uppy/locales/src/hi_IN.ts | 2 +- packages/@uppy/locales/src/hr_HR.ts | 2 +- packages/@uppy/locales/src/hu_HU.ts | 2 +- packages/@uppy/locales/src/id_ID.ts | 2 +- packages/@uppy/locales/src/is_IS.ts | 2 +- packages/@uppy/locales/src/it_IT.ts | 2 +- packages/@uppy/locales/src/ja_JP.ts | 2 +- packages/@uppy/locales/src/ko_KR.ts | 2 +- packages/@uppy/locales/src/ms_MY.ts | 2 +- packages/@uppy/locales/src/nb_NO.ts | 2 +- packages/@uppy/locales/src/nl_NL.ts | 2 +- packages/@uppy/locales/src/pl_PL.ts | 2 +- packages/@uppy/locales/src/pt_BR.ts | 2 +- packages/@uppy/locales/src/pt_PT.ts | 2 +- packages/@uppy/locales/src/ro_RO.ts | 2 +- packages/@uppy/locales/src/ru_RU.ts | 2 +- packages/@uppy/locales/src/sk_SK.ts | 2 +- packages/@uppy/locales/src/sr_RS_Cyrillic.ts | 2 +- packages/@uppy/locales/src/sr_RS_Latin.ts | 2 +- packages/@uppy/locales/src/sv_SE.ts | 2 +- packages/@uppy/locales/src/th_TH.ts | 2 +- packages/@uppy/locales/src/tr_TR.ts | 2 +- packages/@uppy/locales/src/uk_UA.ts | 2 +- packages/@uppy/locales/src/uz_UZ.ts | 2 +- packages/@uppy/locales/src/vi_VN.ts | 2 +- packages/@uppy/locales/src/zh_CN.ts | 2 +- packages/@uppy/locales/src/zh_TW.ts | 2 +- packages/@uppy/locales/template.ts | 2 +- packages/@uppy/locales/tsconfig.build.json | 2 +- packages/@uppy/locales/tsconfig.json | 2 +- packages/@uppy/onedrive/package.json | 1 - packages/@uppy/onedrive/src/OneDrive.tsx | 3 +- packages/@uppy/onedrive/tsconfig.build.json | 3 - packages/@uppy/onedrive/tsconfig.json | 3 - packages/@uppy/provider-views/package.json | 1 - packages/@uppy/provider-views/src/Browser.tsx | 4 +- .../@uppy/provider-views/src/FilterInput.tsx | 2 +- .../provider-views/src/FooterActions.tsx | 2 +- .../src/GooglePicker/GooglePickerView.tsx | 2 +- .../src/Item/components/SearchResultItem.tsx | 2 +- .../@uppy/provider-views/src/Item/index.tsx | 2 +- .../src/ProviderView/AuthView.tsx | 2 +- .../src/ProviderView/GlobalSearchView.tsx | 2 +- .../src/ProviderView/Header.tsx | 2 +- .../src/ProviderView/ProviderView.tsx | 4 +- .../SearchProviderView/SearchProviderView.tsx | 4 +- .../src/utils/PartialTreeUtils/afterFill.ts | 2 +- .../utils/PartialTreeUtils/afterOpenFolder.ts | 2 +- .../PartialTreeUtils/afterScrollFolder.ts | 2 +- .../getCheckedFilesWithPaths.ts | 2 +- .../src/utils/PartialTreeUtils/index.test.ts | 2 +- .../provider-views/src/utils/addFiles.ts | 4 +- .../src/utils/companionFileToUppyFile.ts | 2 +- .../@uppy/provider-views/tsconfig.build.json | 3 - packages/@uppy/provider-views/tsconfig.json | 3 - packages/@uppy/react/src/useUppyEvent.test.ts | 2 +- packages/@uppy/react/tsconfig.build.json | 3 - packages/@uppy/react/tsconfig.json | 3 - packages/@uppy/screen-capture/package.json | 1 - .../screen-capture/src/DiscardButton.tsx | 2 +- .../@uppy/screen-capture/src/RecordButton.tsx | 2 +- .../screen-capture/src/ScreenCapture.tsx | 4 +- .../@uppy/screen-capture/src/SubmitButton.tsx | 2 +- .../@uppy/screen-capture/tsconfig.build.json | 3 - packages/@uppy/screen-capture/tsconfig.json | 3 - packages/@uppy/status-bar/package.json | 1 - packages/@uppy/status-bar/src/Components.tsx | 4 +- packages/@uppy/status-bar/src/StatusBar.tsx | 2 +- .../@uppy/status-bar/src/StatusBarOptions.ts | 2 +- packages/@uppy/status-bar/src/StatusBarUI.tsx | 2 +- .../src/calculateProcessingProgress.ts | 2 +- packages/@uppy/status-bar/src/style.scss | 2 +- packages/@uppy/status-bar/tsconfig.build.json | 3 - packages/@uppy/status-bar/tsconfig.json | 3 - .../src/lib/components/Dashboard.svelte | 2 +- .../src/lib/components/DashboardModal.svelte | 2 +- .../@uppy/thumbnail-generator/package.json | 1 - .../@uppy/thumbnail-generator/src/index.ts | 8 +- .../thumbnail-generator/tsconfig.build.json | 3 - .../@uppy/thumbnail-generator/tsconfig.json | 3 - packages/@uppy/transloadit/package.json | 1 - .../@uppy/transloadit/src/Assembly.test.js | 2 +- packages/@uppy/transloadit/src/Assembly.ts | 7 +- packages/@uppy/transloadit/src/Client.ts | 4 +- packages/@uppy/transloadit/src/index.ts | 6 +- .../@uppy/transloadit/tsconfig.build.json | 3 - packages/@uppy/transloadit/tsconfig.json | 3 - packages/@uppy/tus/package.json | 1 - packages/@uppy/tus/src/getFingerprint.ts | 2 +- packages/@uppy/tus/src/index.ts | 4 +- packages/@uppy/tus/tsconfig.build.json | 3 - packages/@uppy/tus/tsconfig.json | 3 - packages/@uppy/unsplash/package.json | 1 - packages/@uppy/unsplash/src/Unsplash.tsx | 2 +- packages/@uppy/unsplash/tsconfig.build.json | 3 - packages/@uppy/unsplash/tsconfig.json | 3 - packages/@uppy/url/package.json | 1 - packages/@uppy/url/src/Url.tsx | 4 +- packages/@uppy/url/src/UrlUI.tsx | 2 +- .../src/utils/forEachDroppedOrPastedUrl.ts | 2 +- packages/@uppy/url/tsconfig.build.json | 3 - packages/@uppy/url/tsconfig.json | 3 - packages/@uppy/utils/.npmignore | 1 - packages/@uppy/utils/CHANGELOG.md | 388 ------------------ packages/@uppy/utils/LICENSE | 21 - packages/@uppy/utils/README.md | 27 -- packages/@uppy/utils/package.json | 45 -- packages/@uppy/utils/tsconfig.build.json | 10 - packages/@uppy/utils/tsconfig.json | 9 - packages/@uppy/webcam/package.json | 1 - packages/@uppy/webcam/src/CameraScreen.tsx | 2 +- packages/@uppy/webcam/src/DiscardButton.tsx | 2 +- .../@uppy/webcam/src/PermissionsScreen.tsx | 2 +- packages/@uppy/webcam/src/RecordButton.tsx | 2 +- packages/@uppy/webcam/src/SnapshotButton.tsx | 2 +- packages/@uppy/webcam/src/SubmitButton.tsx | 2 +- packages/@uppy/webcam/src/Webcam.tsx | 4 +- packages/@uppy/webcam/tsconfig.build.json | 3 - packages/@uppy/webcam/tsconfig.json | 3 - packages/@uppy/webdav/package.json | 1 - packages/@uppy/webdav/src/Webdav.tsx | 2 +- packages/@uppy/webdav/tsconfig.build.json | 3 - packages/@uppy/webdav/tsconfig.json | 3 - packages/@uppy/xhr-upload/package.json | 3 +- packages/@uppy/xhr-upload/src/index.ts | 4 +- packages/@uppy/xhr-upload/tsconfig.build.json | 3 - packages/@uppy/xhr-upload/tsconfig.json | 3 - packages/@uppy/zoom/package.json | 1 - packages/@uppy/zoom/src/Zoom.tsx | 3 +- packages/@uppy/zoom/tsconfig.build.json | 3 - packages/@uppy/zoom/tsconfig.json | 3 - private/dev/tsconfig.json | 3 - yarn.lock | 47 +-- 345 files changed, 245 insertions(+), 1015 deletions(-) rename packages/@uppy/{utils/src => core/src/utils}/AbortController.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/AbortController.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/CompanionClientProvider.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/CompanionFile.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/ErrorWithCause.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/ErrorWithCause.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/FOCUSABLE_ELEMENTS.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/FileProgress.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/NetworkError.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/ProgressTimeout.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/RateLimitedQueue.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/RateLimitedQueue.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/TaskQueue.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/TaskQueue.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/Translator.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/Translator.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/UppyFile.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/UserFacingApiError.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/VirtualList.tsx (100%) rename packages/@uppy/{utils/src => core/src/utils}/canvasToBlob.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/dataURItoBlob.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/dataURItoBlob.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/dataURItoFile.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/dataURItoFile.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/delay.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/delay.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/emaFilter.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/emaFilter.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/fetchWithNetworkError.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/fetcher.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/fileFilters.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/findAllDOMElements.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/findDOMElement.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/generateFileID.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/generateFileID.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getAllowedMetaFields.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getBytesRemaining.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getBytesRemaining.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getDroppedFiles/README.md (100%) rename packages/@uppy/{utils/src => core/src/utils}/getDroppedFiles/index.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getDroppedFiles/utils/fallbackApi.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getDroppedFiles/utils/webkitGetAsEntryApi/getFilesAndDirectoriesFromDirectory.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getDroppedFiles/utils/webkitGetAsEntryApi/index.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getETA.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getETA.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getFileNameAndExtension.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getFileNameAndExtension.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getFileType.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getFileType.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getFileTypeExtension.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getFileTypeExtension.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getSocketHost.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getSocketHost.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getSpeed.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getSpeed.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getTextDirection.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/getTimeStamp.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/hasProperty.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/index.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/isDOMElement.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/isDragDropSupported.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/isMobileDevice.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/isMobileDevice.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/isNetworkError.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/isNetworkError.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/isObjectURL.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/isObjectURL.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/isPreviewSupported.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/isPreviewSupported.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/isTouchDevice.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/isTouchDevice.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/microtip.scss (100%) rename packages/@uppy/{utils/src => core/src/utils}/mimeTypes.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/prettyETA.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/prettyETA.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/remoteFileObjToLocal.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/sampleImageDataURI.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/secondsToTime.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/secondsToTime.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/toArray.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/toArray.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/truncateString.test.ts (100%) rename packages/@uppy/{utils/src => core/src/utils}/truncateString.ts (100%) delete mode 100644 packages/@uppy/utils/.npmignore delete mode 100644 packages/@uppy/utils/CHANGELOG.md delete mode 100644 packages/@uppy/utils/LICENSE delete mode 100644 packages/@uppy/utils/README.md delete mode 100644 packages/@uppy/utils/package.json delete mode 100644 packages/@uppy/utils/tsconfig.build.json delete mode 100644 packages/@uppy/utils/tsconfig.json diff --git a/packages/@uppy/angular/turbo.json b/packages/@uppy/angular/turbo.json index a5b5c2127..4f56bd471 100644 --- a/packages/@uppy/angular/turbo.json +++ b/packages/@uppy/angular/turbo.json @@ -2,11 +2,7 @@ "extends": ["//"], "tasks": { "build": { - "dependsOn": [ - "@uppy/core#build", - "@uppy/dashboard#build", - "@uppy/utils#build" - ], + "dependsOn": ["@uppy/core#build", "@uppy/dashboard#build"], "inputs": [ "projects/uppy/angular/src/**/*.{js,ts,jsx,tsx}", "package.json", diff --git a/packages/@uppy/audio/package.json b/packages/@uppy/audio/package.json index 87432f6b7..593a0390b 100644 --- a/packages/@uppy/audio/package.json +++ b/packages/@uppy/audio/package.json @@ -40,7 +40,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/utils": "workspace:^", "preact": "^10.29.2" }, "devDependencies": { diff --git a/packages/@uppy/audio/src/Audio.tsx b/packages/@uppy/audio/src/Audio.tsx index 2f53a8cc8..a56743b75 100644 --- a/packages/@uppy/audio/src/Audio.tsx +++ b/packages/@uppy/audio/src/Audio.tsx @@ -7,8 +7,8 @@ import type { } from '@uppy/core' import { UIPlugin } from '@uppy/core' -import type { LocaleStrings } from '@uppy/utils' -import { getFileTypeExtension } from '@uppy/utils' +import type { LocaleStrings } from '@uppy/core/utils' +import { getFileTypeExtension } from '@uppy/core/utils' import packageJson from '../package.json' with { type: 'json' } import locale from './locale.js' import PermissionsScreen from './PermissionsScreen.js' diff --git a/packages/@uppy/audio/src/DiscardButton.tsx b/packages/@uppy/audio/src/DiscardButton.tsx index 6bfd30a8f..27d49433a 100644 --- a/packages/@uppy/audio/src/DiscardButton.tsx +++ b/packages/@uppy/audio/src/DiscardButton.tsx @@ -1,4 +1,4 @@ -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' interface DiscardButtonProps { onDiscard: () => void diff --git a/packages/@uppy/audio/src/PermissionsScreen.tsx b/packages/@uppy/audio/src/PermissionsScreen.tsx index 9bc876dbd..26b93736a 100644 --- a/packages/@uppy/audio/src/PermissionsScreen.tsx +++ b/packages/@uppy/audio/src/PermissionsScreen.tsx @@ -1,4 +1,4 @@ -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import type { h } from 'preact' interface PermissionsScreenProps { diff --git a/packages/@uppy/audio/src/RecordButton.tsx b/packages/@uppy/audio/src/RecordButton.tsx index 5883c4a3a..eec35238e 100644 --- a/packages/@uppy/audio/src/RecordButton.tsx +++ b/packages/@uppy/audio/src/RecordButton.tsx @@ -1,4 +1,4 @@ -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' interface RecordButtonProps { recording: boolean diff --git a/packages/@uppy/audio/src/RecordingScreen.tsx b/packages/@uppy/audio/src/RecordingScreen.tsx index b9f5cdcfc..c3a2bb91e 100644 --- a/packages/@uppy/audio/src/RecordingScreen.tsx +++ b/packages/@uppy/audio/src/RecordingScreen.tsx @@ -1,4 +1,4 @@ -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import { useEffect, useRef } from 'preact/hooks' import AudioSourceSelect, { type AudioSourceSelectProps, diff --git a/packages/@uppy/audio/src/SubmitButton.tsx b/packages/@uppy/audio/src/SubmitButton.tsx index dbb2d0942..62f9d77d0 100644 --- a/packages/@uppy/audio/src/SubmitButton.tsx +++ b/packages/@uppy/audio/src/SubmitButton.tsx @@ -1,4 +1,4 @@ -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' interface SubmitButtonProps { onSubmit: () => void diff --git a/packages/@uppy/audio/tsconfig.build.json b/packages/@uppy/audio/tsconfig.build.json index 389eb1387..ac99ccdd7 100644 --- a/packages/@uppy/audio/tsconfig.build.json +++ b/packages/@uppy/audio/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/audio/tsconfig.json b/packages/@uppy/audio/tsconfig.json index 991d79cbd..edd6c80fb 100644 --- a/packages/@uppy/audio/tsconfig.json +++ b/packages/@uppy/audio/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/aws-s3/package.json b/packages/@uppy/aws-s3/package.json index 2be35d170..a6a2d77b6 100644 --- a/packages/@uppy/aws-s3/package.json +++ b/packages/@uppy/aws-s3/package.json @@ -38,8 +38,7 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/companion-client": "workspace:^", - "@uppy/utils": "workspace:^" + "@uppy/companion-client": "workspace:^" }, "devDependencies": { "@aws-sdk/client-s3": "^3.362.0", diff --git a/packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts b/packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts index 38e800fad..3e1ae1117 100644 --- a/packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts +++ b/packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts @@ -1,5 +1,8 @@ import type { Body, Meta, UppyFile } from '@uppy/core' -import type { RateLimitedQueue, WrapPromiseFunctionType } from '@uppy/utils' +import type { + RateLimitedQueue, + WrapPromiseFunctionType, +} from '@uppy/core/utils' import type AwsS3Multipart from './index.js' import type { AwsS3MultipartOptions, diff --git a/packages/@uppy/aws-s3/src/MultipartUploader.ts b/packages/@uppy/aws-s3/src/MultipartUploader.ts index 1e590e0c8..afd050d79 100644 --- a/packages/@uppy/aws-s3/src/MultipartUploader.ts +++ b/packages/@uppy/aws-s3/src/MultipartUploader.ts @@ -1,6 +1,6 @@ import type { Uppy } from '@uppy/core' -import type { Body, Meta, UppyFile } from '@uppy/utils' -import { AbortController } from '@uppy/utils' +import type { Body, Meta, UppyFile } from '@uppy/core/utils' +import { AbortController } from '@uppy/core/utils' import type { HTTPCommunicationQueue } from './HTTPCommunicationQueue.js' const MB = 1024 * 1024 diff --git a/packages/@uppy/aws-s3/src/index.ts b/packages/@uppy/aws-s3/src/index.ts index e1afe29c1..6e46c6e6f 100644 --- a/packages/@uppy/aws-s3/src/index.ts +++ b/packages/@uppy/aws-s3/src/index.ts @@ -12,14 +12,14 @@ import type { Meta, RequestOptions, UppyFile, -} from '@uppy/utils' +} from '@uppy/core/utils' import { createAbortError, filterFilesToEmitUploadStarted, filterFilesToUpload, getAllowedMetaFields, RateLimitedQueue, -} from '@uppy/utils' +} from '@uppy/core/utils' import packageJson from '../package.json' with { type: 'json' } import createSignedURL from './createSignedURL.js' import { HTTPCommunicationQueue } from './HTTPCommunicationQueue.js' diff --git a/packages/@uppy/aws-s3/src/utils.ts b/packages/@uppy/aws-s3/src/utils.ts index d5a2700b0..fb850912e 100644 --- a/packages/@uppy/aws-s3/src/utils.ts +++ b/packages/@uppy/aws-s3/src/utils.ts @@ -1,5 +1,5 @@ -import type { Body } from '@uppy/utils' -import { createAbortError } from '@uppy/utils' +import type { Body } from '@uppy/core/utils' +import { createAbortError } from '@uppy/core/utils' import type { AwsS3Part } from './index.js' diff --git a/packages/@uppy/aws-s3/tsconfig.build.json b/packages/@uppy/aws-s3/tsconfig.build.json index 6fc447531..90105c5c7 100644 --- a/packages/@uppy/aws-s3/tsconfig.build.json +++ b/packages/@uppy/aws-s3/tsconfig.build.json @@ -10,9 +10,6 @@ { "path": "../companion-client/tsconfig.build.json" }, - { - "path": "../utils/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 324ec94b3..d56445ec8 100644 --- a/packages/@uppy/aws-s3/tsconfig.json +++ b/packages/@uppy/aws-s3/tsconfig.json @@ -10,9 +10,6 @@ { "path": "../companion-client/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/box/package.json b/packages/@uppy/box/package.json index db74e3bed..3c2896553 100644 --- a/packages/@uppy/box/package.json +++ b/packages/@uppy/box/package.json @@ -36,7 +36,6 @@ "dependencies": { "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", - "@uppy/utils": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/box/src/Box.tsx b/packages/@uppy/box/src/Box.tsx index 590ebc3e1..c894cb1ec 100644 --- a/packages/@uppy/box/src/Box.tsx +++ b/packages/@uppy/box/src/Box.tsx @@ -13,9 +13,8 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import type { LocaleStrings } from '@uppy/core/utils' import { ProviderViews } from '@uppy/provider-views' - -import type { LocaleStrings } from '@uppy/utils' // biome-ignore lint/style/useImportType: h is not a type import { type ComponentChild, h } from 'preact' import packageJson from '../package.json' with { type: 'json' } diff --git a/packages/@uppy/box/tsconfig.build.json b/packages/@uppy/box/tsconfig.build.json index afabb530f..8d355f390 100644 --- a/packages/@uppy/box/tsconfig.build.json +++ b/packages/@uppy/box/tsconfig.build.json @@ -13,9 +13,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/box/tsconfig.json b/packages/@uppy/box/tsconfig.json index 847db9a4f..96feccd1e 100644 --- a/packages/@uppy/box/tsconfig.json +++ b/packages/@uppy/box/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/companion-client/package.json b/packages/@uppy/companion-client/package.json index e7c06cc5b..a845d9bbd 100644 --- a/packages/@uppy/companion-client/package.json +++ b/packages/@uppy/companion-client/package.json @@ -36,7 +36,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/utils": "workspace:^", "namespace-emitter": "^2.0.1", "p-retry": "^6.1.0" }, diff --git a/packages/@uppy/companion-client/src/Provider.ts b/packages/@uppy/companion-client/src/Provider.ts index 7a50897e4..0923b7ea1 100644 --- a/packages/@uppy/companion-client/src/Provider.ts +++ b/packages/@uppy/companion-client/src/Provider.ts @@ -9,7 +9,7 @@ import { type CompanionClientProvider, getSocketHost, type RequestOptions, -} from '@uppy/utils' +} from '@uppy/core/utils' import type { CompanionPluginOptions } from './index.js' import RequestClient, { authErrorStatusCode } from './RequestClient.js' diff --git a/packages/@uppy/companion-client/src/RequestClient.ts b/packages/@uppy/companion-client/src/RequestClient.ts index 227fe85ff..5affe44bd 100644 --- a/packages/@uppy/companion-client/src/RequestClient.ts +++ b/packages/@uppy/companion-client/src/RequestClient.ts @@ -5,13 +5,13 @@ import type { RemoteUppyFile, RequestOptions, UppyFile, -} from '@uppy/utils' +} from '@uppy/core/utils' import { ErrorWithCause, fetchWithNetworkError, getSocketHost, UserFacingApiError, -} from '@uppy/utils' +} from '@uppy/core/utils' import pRetry, { AbortError } from 'p-retry' import packageJson from '../package.json' with { type: 'json' } import AuthError from './AuthError.js' diff --git a/packages/@uppy/companion-client/src/SearchProvider.ts b/packages/@uppy/companion-client/src/SearchProvider.ts index 168fffb90..8c7720b07 100644 --- a/packages/@uppy/companion-client/src/SearchProvider.ts +++ b/packages/@uppy/companion-client/src/SearchProvider.ts @@ -1,5 +1,5 @@ import type { Body, Meta, Uppy } from '@uppy/core' -import type { CompanionClientSearchProvider } from '@uppy/utils' +import type { CompanionClientSearchProvider } from '@uppy/core/utils' import RequestClient, { type Opts } from './RequestClient.js' const getName = (id: string): string => { diff --git a/packages/@uppy/companion-client/tsconfig.build.json b/packages/@uppy/companion-client/tsconfig.build.json index 389eb1387..ac99ccdd7 100644 --- a/packages/@uppy/companion-client/tsconfig.build.json +++ b/packages/@uppy/companion-client/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/companion-client/tsconfig.json b/packages/@uppy/companion-client/tsconfig.json index 991d79cbd..edd6c80fb 100644 --- a/packages/@uppy/companion-client/tsconfig.json +++ b/packages/@uppy/companion-client/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/components/tsconfig.build.json b/packages/@uppy/components/tsconfig.build.json index 87681cfb3..fcc40cb89 100644 --- a/packages/@uppy/components/tsconfig.build.json +++ b/packages/@uppy/components/tsconfig.build.json @@ -18,12 +18,6 @@ }, { "path": "../image-editor/tsconfig.build.json" - }, - { - "path": "../utils/tsconfig.build.json" - }, - { - "path": "../core/tsconfig.build.json" } ] } diff --git a/packages/@uppy/components/tsconfig.json b/packages/@uppy/components/tsconfig.json index e958367c0..de667431c 100644 --- a/packages/@uppy/components/tsconfig.json +++ b/packages/@uppy/components/tsconfig.json @@ -17,12 +17,6 @@ }, { "path": "../image-editor/tsconfig.build.json" - }, - { - "path": "../utils/tsconfig.build.json" - }, - { - "path": "../core/tsconfig.build.json" } ] } diff --git a/packages/@uppy/compressor/package.json b/packages/@uppy/compressor/package.json index 6bebd8b23..26d4fdf84 100644 --- a/packages/@uppy/compressor/package.json +++ b/packages/@uppy/compressor/package.json @@ -32,7 +32,6 @@ }, "dependencies": { "@transloadit/prettier-bytes": "^1.1.0", - "@uppy/utils": "workspace:^", "compressorjs": "^1.3.0", "preact": "^10.29.2", "promise-queue": "^2.2.5" diff --git a/packages/@uppy/compressor/src/index.test.ts b/packages/@uppy/compressor/src/index.test.ts index c9c13fd18..36d7f4f1a 100644 --- a/packages/@uppy/compressor/src/index.test.ts +++ b/packages/@uppy/compressor/src/index.test.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import path from 'node:path' import Core from '@uppy/core' -import { getFileNameAndExtension } from '@uppy/utils' +import { getFileNameAndExtension } from '@uppy/core/utils' import { describe, expect, it } from 'vitest' import CompressorPlugin from './index.js' diff --git a/packages/@uppy/compressor/src/index.ts b/packages/@uppy/compressor/src/index.ts index 9fb3f1293..eb09f83b9 100644 --- a/packages/@uppy/compressor/src/index.ts +++ b/packages/@uppy/compressor/src/index.ts @@ -1,8 +1,8 @@ import { prettierBytes } from '@transloadit/prettier-bytes' import type { DefinePluginOpts, PluginOpts } from '@uppy/core' import { BasePlugin, type Uppy } from '@uppy/core' -import type { Body, LocalUppyFile, Meta, UppyFile } from '@uppy/utils' -import { getFileNameAndExtension, RateLimitedQueue } from '@uppy/utils' +import type { Body, LocalUppyFile, Meta, UppyFile } from '@uppy/core/utils' +import { getFileNameAndExtension, RateLimitedQueue } from '@uppy/core/utils' import CompressorJS from 'compressorjs' import locale from './locale.js' diff --git a/packages/@uppy/compressor/tsconfig.build.json b/packages/@uppy/compressor/tsconfig.build.json index 389eb1387..ac99ccdd7 100644 --- a/packages/@uppy/compressor/tsconfig.build.json +++ b/packages/@uppy/compressor/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/compressor/tsconfig.json b/packages/@uppy/compressor/tsconfig.json index c761a6e68..8bd369999 100644 --- a/packages/@uppy/compressor/tsconfig.json +++ b/packages/@uppy/compressor/tsconfig.json @@ -7,9 +7,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/core/package.json b/packages/@uppy/core/package.json index 75c57afb8..a4707b7c0 100644 --- a/packages/@uppy/core/package.json +++ b/packages/@uppy/core/package.json @@ -39,11 +39,11 @@ "./css/style.css": "./dist/style.css", "./css/style.scss": "./src/style.scss", "./store-default": "./lib/store/index.js", + "./utils": "./lib/utils/index.js", "./package.json": "./package.json" }, "dependencies": { "@transloadit/prettier-bytes": "^1.1.0", - "@uppy/utils": "workspace:^", "lodash": "^4.18.1", "mime-match": "^1.0.2", "namespace-emitter": "^2.0.1", @@ -52,6 +52,7 @@ }, "devDependencies": { "@types/deep-freeze": "^0", + "@types/lodash": "^4.14.199", "@types/node": "^20.19.0", "cssnano": "^8.0.1", "deep-freeze": "^0.0.1", diff --git a/packages/@uppy/core/src/BasePlugin.ts b/packages/@uppy/core/src/BasePlugin.ts index e5485a2d8..3b5e93c77 100644 --- a/packages/@uppy/core/src/BasePlugin.ts +++ b/packages/@uppy/core/src/BasePlugin.ts @@ -7,9 +7,14 @@ * See `Plugin` for the extended version with Preact rendering for interfaces. */ -import type { Body, I18n, Meta, OptionalPluralizeLocale } from '@uppy/utils' -import { Translator } from '@uppy/utils' import type { State, UnknownPlugin, Uppy } from './Uppy.js' +import type { + Body, + I18n, + Meta, + OptionalPluralizeLocale, +} from './utils/index.js' +import { Translator } from './utils/index.js' export type PluginOpts = { locale?: OptionalPluralizeLocale diff --git a/packages/@uppy/core/src/EventManager.ts b/packages/@uppy/core/src/EventManager.ts index 3a2abf2ca..65e291f72 100644 --- a/packages/@uppy/core/src/EventManager.ts +++ b/packages/@uppy/core/src/EventManager.ts @@ -1,5 +1,5 @@ -import type { Body, Meta, UppyFile } from '@uppy/utils' import type { _UppyEventMap, Uppy, UppyEventMap } from './Uppy.js' +import type { Body, Meta, UppyFile } from './utils/index.js' /** * Create a wrapper around an event emitter with a `remove` method to remove diff --git a/packages/@uppy/core/src/Restricter.ts b/packages/@uppy/core/src/Restricter.ts index 83931605b..2dab3958f 100644 --- a/packages/@uppy/core/src/Restricter.ts +++ b/packages/@uppy/core/src/Restricter.ts @@ -1,8 +1,8 @@ import { prettierBytes } from '@transloadit/prettier-bytes' -import type { Body, I18n, Meta, UppyFile } from '@uppy/utils' // @ts-expect-error untyped import match from 'mime-match' import type { NonNullableUppyOptions, State } from './Uppy.js' +import type { Body, I18n, Meta, UppyFile } from './utils/index.js' export type Restrictions = { maxFileSize: number | null diff --git a/packages/@uppy/core/src/UIPlugin.ts b/packages/@uppy/core/src/UIPlugin.ts index c7e6478d4..774d0b4b4 100644 --- a/packages/@uppy/core/src/UIPlugin.ts +++ b/packages/@uppy/core/src/UIPlugin.ts @@ -1,9 +1,9 @@ -import type { Body, Meta } from '@uppy/utils' -import { findDOMElement, getTextDirection } from '@uppy/utils' import { render } from 'preact' import type { PluginOpts } from './BasePlugin.js' import BasePlugin from './BasePlugin.js' import type { State } from './Uppy.js' +import type { Body, Meta } from './utils/index.js' +import { findDOMElement, getTextDirection } from './utils/index.js' /** * Defer a frequent call to the microtask queue. diff --git a/packages/@uppy/core/src/Uppy.test.ts b/packages/@uppy/core/src/Uppy.test.ts index b3a8afec2..46d2a43e5 100644 --- a/packages/@uppy/core/src/Uppy.test.ts +++ b/packages/@uppy/core/src/Uppy.test.ts @@ -3,7 +3,6 @@ import fs from 'node:fs' import path from 'node:path' import { prettierBytes } from '@transloadit/prettier-bytes' import type { Body, Meta } from '@uppy/core' -import type { Locale } from '@uppy/utils' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import BasePlugin, { type DefinePluginOpts, @@ -21,6 +20,7 @@ import InvalidPluginWithoutType from './mocks/invalidPluginWithoutType.js' import { RestrictionError } from './Restricter.js' import UIPlugin from './UIPlugin.js' import type { State } from './Uppy.js' +import type { Locale } from './utils/index.js' const sampleImage = fs.readFileSync( path.join(__dirname, '../../compressor/fixtures/image.jpg'), diff --git a/packages/@uppy/core/src/Uppy.ts b/packages/@uppy/core/src/Uppy.ts index 8077616ff..84b0d0986 100644 --- a/packages/@uppy/core/src/Uppy.ts +++ b/packages/@uppy/core/src/Uppy.ts @@ -1,28 +1,5 @@ /* global AggregateError */ -import type { - Body, - CompanionClientProvider, - CompanionClientSearchProvider, - CompanionFile, - FileProgressNotStarted, - FileProgressStarted, - I18n, - Locale, - LocalUppyFile, - Meta, - MinimalRequiredUppyFile, - OptionalPluralizeLocale, - RemoteUppyFile, - UppyFile, - UppyFileId, -} from '@uppy/utils' -import { - getFileNameAndExtension, - getFileType, - getSafeFileId, - Translator, -} from '@uppy/utils' import throttle from 'lodash/throttle.js' // @ts-expect-error untyped import ee from 'namespace-emitter' @@ -41,6 +18,29 @@ import { } from './Restricter.js' import DefaultStore, { type Store } from './store/index.js' import supportsUploadProgress from './supportsUploadProgress.js' +import type { + Body, + CompanionClientProvider, + CompanionClientSearchProvider, + CompanionFile, + FileProgressNotStarted, + FileProgressStarted, + I18n, + Locale, + LocalUppyFile, + Meta, + MinimalRequiredUppyFile, + OptionalPluralizeLocale, + RemoteUppyFile, + UppyFile, + UppyFileId, +} from './utils/index.js' +import { + getFileNameAndExtension, + getFileType, + getSafeFileId, + Translator, +} from './utils/index.js' type Processor = ( fileIDs: string[], diff --git a/packages/@uppy/core/src/index.ts b/packages/@uppy/core/src/index.ts index 8382e6250..2aad59c60 100644 --- a/packages/@uppy/core/src/index.ts +++ b/packages/@uppy/core/src/index.ts @@ -1,9 +1,3 @@ -export type { - Body, - Meta, - MinimalRequiredUppyFile, - UppyFile, -} from '@uppy/utils' export type { DefinePluginOpts, PluginOpts } from './BasePlugin.js' export { default as BasePlugin } from './BasePlugin.js' export { default as EventManager } from './EventManager.js' @@ -34,3 +28,9 @@ export type { UppyOptions, } from './Uppy.js' export { default, default as Uppy } from './Uppy.js' +export type { + Body, + Meta, + MinimalRequiredUppyFile, + UppyFile, +} from './utils/index.js' diff --git a/packages/@uppy/core/src/loggers.ts b/packages/@uppy/core/src/loggers.ts index a5df4e195..60233da46 100644 --- a/packages/@uppy/core/src/loggers.ts +++ b/packages/@uppy/core/src/loggers.ts @@ -1,4 +1,4 @@ -import { getTimeStamp } from '@uppy/utils' +import { getTimeStamp } from './utils/index.js' // Swallow all logs, except errors. // default if logger is not set or debug: false diff --git a/packages/@uppy/core/src/types.test.ts b/packages/@uppy/core/src/types.test.ts index 7e8450b81..bed097ee9 100644 --- a/packages/@uppy/core/src/types.test.ts +++ b/packages/@uppy/core/src/types.test.ts @@ -1,8 +1,13 @@ -import type { Body, InternalMetadata, LocaleStrings, Meta } from '@uppy/utils' import { expectTypeOf, test } from 'vitest' import BasePlugin from './BasePlugin.js' import UIPlugin, { type UIPluginOptions } from './UIPlugin.js' import Uppy, { type UnknownPlugin } from './Uppy.js' +import type { + Body, + InternalMetadata, + LocaleStrings, + Meta, +} from './utils/index.js' interface Opts extends UIPluginOptions { foo: string diff --git a/packages/@uppy/utils/src/AbortController.test.ts b/packages/@uppy/core/src/utils/AbortController.test.ts similarity index 100% rename from packages/@uppy/utils/src/AbortController.test.ts rename to packages/@uppy/core/src/utils/AbortController.test.ts diff --git a/packages/@uppy/utils/src/AbortController.ts b/packages/@uppy/core/src/utils/AbortController.ts similarity index 100% rename from packages/@uppy/utils/src/AbortController.ts rename to packages/@uppy/core/src/utils/AbortController.ts diff --git a/packages/@uppy/utils/src/CompanionClientProvider.ts b/packages/@uppy/core/src/utils/CompanionClientProvider.ts similarity index 100% rename from packages/@uppy/utils/src/CompanionClientProvider.ts rename to packages/@uppy/core/src/utils/CompanionClientProvider.ts diff --git a/packages/@uppy/utils/src/CompanionFile.ts b/packages/@uppy/core/src/utils/CompanionFile.ts similarity index 100% rename from packages/@uppy/utils/src/CompanionFile.ts rename to packages/@uppy/core/src/utils/CompanionFile.ts diff --git a/packages/@uppy/utils/src/ErrorWithCause.test.ts b/packages/@uppy/core/src/utils/ErrorWithCause.test.ts similarity index 100% rename from packages/@uppy/utils/src/ErrorWithCause.test.ts rename to packages/@uppy/core/src/utils/ErrorWithCause.test.ts diff --git a/packages/@uppy/utils/src/ErrorWithCause.ts b/packages/@uppy/core/src/utils/ErrorWithCause.ts similarity index 100% rename from packages/@uppy/utils/src/ErrorWithCause.ts rename to packages/@uppy/core/src/utils/ErrorWithCause.ts diff --git a/packages/@uppy/utils/src/FOCUSABLE_ELEMENTS.ts b/packages/@uppy/core/src/utils/FOCUSABLE_ELEMENTS.ts similarity index 100% rename from packages/@uppy/utils/src/FOCUSABLE_ELEMENTS.ts rename to packages/@uppy/core/src/utils/FOCUSABLE_ELEMENTS.ts diff --git a/packages/@uppy/utils/src/FileProgress.ts b/packages/@uppy/core/src/utils/FileProgress.ts similarity index 100% rename from packages/@uppy/utils/src/FileProgress.ts rename to packages/@uppy/core/src/utils/FileProgress.ts diff --git a/packages/@uppy/utils/src/NetworkError.ts b/packages/@uppy/core/src/utils/NetworkError.ts similarity index 100% rename from packages/@uppy/utils/src/NetworkError.ts rename to packages/@uppy/core/src/utils/NetworkError.ts diff --git a/packages/@uppy/utils/src/ProgressTimeout.ts b/packages/@uppy/core/src/utils/ProgressTimeout.ts similarity index 100% rename from packages/@uppy/utils/src/ProgressTimeout.ts rename to packages/@uppy/core/src/utils/ProgressTimeout.ts diff --git a/packages/@uppy/utils/src/RateLimitedQueue.test.ts b/packages/@uppy/core/src/utils/RateLimitedQueue.test.ts similarity index 100% rename from packages/@uppy/utils/src/RateLimitedQueue.test.ts rename to packages/@uppy/core/src/utils/RateLimitedQueue.test.ts diff --git a/packages/@uppy/utils/src/RateLimitedQueue.ts b/packages/@uppy/core/src/utils/RateLimitedQueue.ts similarity index 100% rename from packages/@uppy/utils/src/RateLimitedQueue.ts rename to packages/@uppy/core/src/utils/RateLimitedQueue.ts diff --git a/packages/@uppy/utils/src/TaskQueue.test.ts b/packages/@uppy/core/src/utils/TaskQueue.test.ts similarity index 100% rename from packages/@uppy/utils/src/TaskQueue.test.ts rename to packages/@uppy/core/src/utils/TaskQueue.test.ts diff --git a/packages/@uppy/utils/src/TaskQueue.ts b/packages/@uppy/core/src/utils/TaskQueue.ts similarity index 100% rename from packages/@uppy/utils/src/TaskQueue.ts rename to packages/@uppy/core/src/utils/TaskQueue.ts diff --git a/packages/@uppy/utils/src/Translator.test.ts b/packages/@uppy/core/src/utils/Translator.test.ts similarity index 100% rename from packages/@uppy/utils/src/Translator.test.ts rename to packages/@uppy/core/src/utils/Translator.test.ts diff --git a/packages/@uppy/utils/src/Translator.ts b/packages/@uppy/core/src/utils/Translator.ts similarity index 100% rename from packages/@uppy/utils/src/Translator.ts rename to packages/@uppy/core/src/utils/Translator.ts diff --git a/packages/@uppy/utils/src/UppyFile.ts b/packages/@uppy/core/src/utils/UppyFile.ts similarity index 100% rename from packages/@uppy/utils/src/UppyFile.ts rename to packages/@uppy/core/src/utils/UppyFile.ts diff --git a/packages/@uppy/utils/src/UserFacingApiError.ts b/packages/@uppy/core/src/utils/UserFacingApiError.ts similarity index 100% rename from packages/@uppy/utils/src/UserFacingApiError.ts rename to packages/@uppy/core/src/utils/UserFacingApiError.ts diff --git a/packages/@uppy/utils/src/VirtualList.tsx b/packages/@uppy/core/src/utils/VirtualList.tsx similarity index 100% rename from packages/@uppy/utils/src/VirtualList.tsx rename to packages/@uppy/core/src/utils/VirtualList.tsx diff --git a/packages/@uppy/utils/src/canvasToBlob.ts b/packages/@uppy/core/src/utils/canvasToBlob.ts similarity index 100% rename from packages/@uppy/utils/src/canvasToBlob.ts rename to packages/@uppy/core/src/utils/canvasToBlob.ts diff --git a/packages/@uppy/utils/src/dataURItoBlob.test.ts b/packages/@uppy/core/src/utils/dataURItoBlob.test.ts similarity index 100% rename from packages/@uppy/utils/src/dataURItoBlob.test.ts rename to packages/@uppy/core/src/utils/dataURItoBlob.test.ts diff --git a/packages/@uppy/utils/src/dataURItoBlob.ts b/packages/@uppy/core/src/utils/dataURItoBlob.ts similarity index 100% rename from packages/@uppy/utils/src/dataURItoBlob.ts rename to packages/@uppy/core/src/utils/dataURItoBlob.ts diff --git a/packages/@uppy/utils/src/dataURItoFile.test.ts b/packages/@uppy/core/src/utils/dataURItoFile.test.ts similarity index 100% rename from packages/@uppy/utils/src/dataURItoFile.test.ts rename to packages/@uppy/core/src/utils/dataURItoFile.test.ts diff --git a/packages/@uppy/utils/src/dataURItoFile.ts b/packages/@uppy/core/src/utils/dataURItoFile.ts similarity index 100% rename from packages/@uppy/utils/src/dataURItoFile.ts rename to packages/@uppy/core/src/utils/dataURItoFile.ts diff --git a/packages/@uppy/utils/src/delay.test.ts b/packages/@uppy/core/src/utils/delay.test.ts similarity index 100% rename from packages/@uppy/utils/src/delay.test.ts rename to packages/@uppy/core/src/utils/delay.test.ts diff --git a/packages/@uppy/utils/src/delay.ts b/packages/@uppy/core/src/utils/delay.ts similarity index 100% rename from packages/@uppy/utils/src/delay.ts rename to packages/@uppy/core/src/utils/delay.ts diff --git a/packages/@uppy/utils/src/emaFilter.test.ts b/packages/@uppy/core/src/utils/emaFilter.test.ts similarity index 100% rename from packages/@uppy/utils/src/emaFilter.test.ts rename to packages/@uppy/core/src/utils/emaFilter.test.ts diff --git a/packages/@uppy/utils/src/emaFilter.ts b/packages/@uppy/core/src/utils/emaFilter.ts similarity index 100% rename from packages/@uppy/utils/src/emaFilter.ts rename to packages/@uppy/core/src/utils/emaFilter.ts diff --git a/packages/@uppy/utils/src/fetchWithNetworkError.ts b/packages/@uppy/core/src/utils/fetchWithNetworkError.ts similarity index 100% rename from packages/@uppy/utils/src/fetchWithNetworkError.ts rename to packages/@uppy/core/src/utils/fetchWithNetworkError.ts diff --git a/packages/@uppy/utils/src/fetcher.ts b/packages/@uppy/core/src/utils/fetcher.ts similarity index 100% rename from packages/@uppy/utils/src/fetcher.ts rename to packages/@uppy/core/src/utils/fetcher.ts diff --git a/packages/@uppy/utils/src/fileFilters.ts b/packages/@uppy/core/src/utils/fileFilters.ts similarity index 100% rename from packages/@uppy/utils/src/fileFilters.ts rename to packages/@uppy/core/src/utils/fileFilters.ts diff --git a/packages/@uppy/utils/src/findAllDOMElements.ts b/packages/@uppy/core/src/utils/findAllDOMElements.ts similarity index 100% rename from packages/@uppy/utils/src/findAllDOMElements.ts rename to packages/@uppy/core/src/utils/findAllDOMElements.ts diff --git a/packages/@uppy/utils/src/findDOMElement.ts b/packages/@uppy/core/src/utils/findDOMElement.ts similarity index 100% rename from packages/@uppy/utils/src/findDOMElement.ts rename to packages/@uppy/core/src/utils/findDOMElement.ts diff --git a/packages/@uppy/utils/src/generateFileID.test.ts b/packages/@uppy/core/src/utils/generateFileID.test.ts similarity index 100% rename from packages/@uppy/utils/src/generateFileID.test.ts rename to packages/@uppy/core/src/utils/generateFileID.test.ts diff --git a/packages/@uppy/utils/src/generateFileID.ts b/packages/@uppy/core/src/utils/generateFileID.ts similarity index 100% rename from packages/@uppy/utils/src/generateFileID.ts rename to packages/@uppy/core/src/utils/generateFileID.ts diff --git a/packages/@uppy/utils/src/getAllowedMetaFields.ts b/packages/@uppy/core/src/utils/getAllowedMetaFields.ts similarity index 100% rename from packages/@uppy/utils/src/getAllowedMetaFields.ts rename to packages/@uppy/core/src/utils/getAllowedMetaFields.ts diff --git a/packages/@uppy/utils/src/getBytesRemaining.test.ts b/packages/@uppy/core/src/utils/getBytesRemaining.test.ts similarity index 100% rename from packages/@uppy/utils/src/getBytesRemaining.test.ts rename to packages/@uppy/core/src/utils/getBytesRemaining.test.ts diff --git a/packages/@uppy/utils/src/getBytesRemaining.ts b/packages/@uppy/core/src/utils/getBytesRemaining.ts similarity index 100% rename from packages/@uppy/utils/src/getBytesRemaining.ts rename to packages/@uppy/core/src/utils/getBytesRemaining.ts diff --git a/packages/@uppy/utils/src/getDroppedFiles/README.md b/packages/@uppy/core/src/utils/getDroppedFiles/README.md similarity index 100% rename from packages/@uppy/utils/src/getDroppedFiles/README.md rename to packages/@uppy/core/src/utils/getDroppedFiles/README.md diff --git a/packages/@uppy/utils/src/getDroppedFiles/index.ts b/packages/@uppy/core/src/utils/getDroppedFiles/index.ts similarity index 100% rename from packages/@uppy/utils/src/getDroppedFiles/index.ts rename to packages/@uppy/core/src/utils/getDroppedFiles/index.ts diff --git a/packages/@uppy/utils/src/getDroppedFiles/utils/fallbackApi.ts b/packages/@uppy/core/src/utils/getDroppedFiles/utils/fallbackApi.ts similarity index 100% rename from packages/@uppy/utils/src/getDroppedFiles/utils/fallbackApi.ts rename to packages/@uppy/core/src/utils/getDroppedFiles/utils/fallbackApi.ts diff --git a/packages/@uppy/utils/src/getDroppedFiles/utils/webkitGetAsEntryApi/getFilesAndDirectoriesFromDirectory.ts b/packages/@uppy/core/src/utils/getDroppedFiles/utils/webkitGetAsEntryApi/getFilesAndDirectoriesFromDirectory.ts similarity index 100% rename from packages/@uppy/utils/src/getDroppedFiles/utils/webkitGetAsEntryApi/getFilesAndDirectoriesFromDirectory.ts rename to packages/@uppy/core/src/utils/getDroppedFiles/utils/webkitGetAsEntryApi/getFilesAndDirectoriesFromDirectory.ts diff --git a/packages/@uppy/utils/src/getDroppedFiles/utils/webkitGetAsEntryApi/index.ts b/packages/@uppy/core/src/utils/getDroppedFiles/utils/webkitGetAsEntryApi/index.ts similarity index 100% rename from packages/@uppy/utils/src/getDroppedFiles/utils/webkitGetAsEntryApi/index.ts rename to packages/@uppy/core/src/utils/getDroppedFiles/utils/webkitGetAsEntryApi/index.ts diff --git a/packages/@uppy/utils/src/getETA.test.ts b/packages/@uppy/core/src/utils/getETA.test.ts similarity index 100% rename from packages/@uppy/utils/src/getETA.test.ts rename to packages/@uppy/core/src/utils/getETA.test.ts diff --git a/packages/@uppy/utils/src/getETA.ts b/packages/@uppy/core/src/utils/getETA.ts similarity index 100% rename from packages/@uppy/utils/src/getETA.ts rename to packages/@uppy/core/src/utils/getETA.ts diff --git a/packages/@uppy/utils/src/getFileNameAndExtension.test.ts b/packages/@uppy/core/src/utils/getFileNameAndExtension.test.ts similarity index 100% rename from packages/@uppy/utils/src/getFileNameAndExtension.test.ts rename to packages/@uppy/core/src/utils/getFileNameAndExtension.test.ts diff --git a/packages/@uppy/utils/src/getFileNameAndExtension.ts b/packages/@uppy/core/src/utils/getFileNameAndExtension.ts similarity index 100% rename from packages/@uppy/utils/src/getFileNameAndExtension.ts rename to packages/@uppy/core/src/utils/getFileNameAndExtension.ts diff --git a/packages/@uppy/utils/src/getFileType.test.ts b/packages/@uppy/core/src/utils/getFileType.test.ts similarity index 100% rename from packages/@uppy/utils/src/getFileType.test.ts rename to packages/@uppy/core/src/utils/getFileType.test.ts diff --git a/packages/@uppy/utils/src/getFileType.ts b/packages/@uppy/core/src/utils/getFileType.ts similarity index 100% rename from packages/@uppy/utils/src/getFileType.ts rename to packages/@uppy/core/src/utils/getFileType.ts diff --git a/packages/@uppy/utils/src/getFileTypeExtension.test.ts b/packages/@uppy/core/src/utils/getFileTypeExtension.test.ts similarity index 100% rename from packages/@uppy/utils/src/getFileTypeExtension.test.ts rename to packages/@uppy/core/src/utils/getFileTypeExtension.test.ts diff --git a/packages/@uppy/utils/src/getFileTypeExtension.ts b/packages/@uppy/core/src/utils/getFileTypeExtension.ts similarity index 100% rename from packages/@uppy/utils/src/getFileTypeExtension.ts rename to packages/@uppy/core/src/utils/getFileTypeExtension.ts diff --git a/packages/@uppy/utils/src/getSocketHost.test.ts b/packages/@uppy/core/src/utils/getSocketHost.test.ts similarity index 100% rename from packages/@uppy/utils/src/getSocketHost.test.ts rename to packages/@uppy/core/src/utils/getSocketHost.test.ts diff --git a/packages/@uppy/utils/src/getSocketHost.ts b/packages/@uppy/core/src/utils/getSocketHost.ts similarity index 100% rename from packages/@uppy/utils/src/getSocketHost.ts rename to packages/@uppy/core/src/utils/getSocketHost.ts diff --git a/packages/@uppy/utils/src/getSpeed.test.ts b/packages/@uppy/core/src/utils/getSpeed.test.ts similarity index 100% rename from packages/@uppy/utils/src/getSpeed.test.ts rename to packages/@uppy/core/src/utils/getSpeed.test.ts diff --git a/packages/@uppy/utils/src/getSpeed.ts b/packages/@uppy/core/src/utils/getSpeed.ts similarity index 100% rename from packages/@uppy/utils/src/getSpeed.ts rename to packages/@uppy/core/src/utils/getSpeed.ts diff --git a/packages/@uppy/utils/src/getTextDirection.ts b/packages/@uppy/core/src/utils/getTextDirection.ts similarity index 100% rename from packages/@uppy/utils/src/getTextDirection.ts rename to packages/@uppy/core/src/utils/getTextDirection.ts diff --git a/packages/@uppy/utils/src/getTimeStamp.ts b/packages/@uppy/core/src/utils/getTimeStamp.ts similarity index 100% rename from packages/@uppy/utils/src/getTimeStamp.ts rename to packages/@uppy/core/src/utils/getTimeStamp.ts diff --git a/packages/@uppy/utils/src/hasProperty.ts b/packages/@uppy/core/src/utils/hasProperty.ts similarity index 100% rename from packages/@uppy/utils/src/hasProperty.ts rename to packages/@uppy/core/src/utils/hasProperty.ts diff --git a/packages/@uppy/utils/src/index.ts b/packages/@uppy/core/src/utils/index.ts similarity index 100% rename from packages/@uppy/utils/src/index.ts rename to packages/@uppy/core/src/utils/index.ts diff --git a/packages/@uppy/utils/src/isDOMElement.ts b/packages/@uppy/core/src/utils/isDOMElement.ts similarity index 100% rename from packages/@uppy/utils/src/isDOMElement.ts rename to packages/@uppy/core/src/utils/isDOMElement.ts diff --git a/packages/@uppy/utils/src/isDragDropSupported.ts b/packages/@uppy/core/src/utils/isDragDropSupported.ts similarity index 100% rename from packages/@uppy/utils/src/isDragDropSupported.ts rename to packages/@uppy/core/src/utils/isDragDropSupported.ts diff --git a/packages/@uppy/utils/src/isMobileDevice.test.ts b/packages/@uppy/core/src/utils/isMobileDevice.test.ts similarity index 100% rename from packages/@uppy/utils/src/isMobileDevice.test.ts rename to packages/@uppy/core/src/utils/isMobileDevice.test.ts diff --git a/packages/@uppy/utils/src/isMobileDevice.ts b/packages/@uppy/core/src/utils/isMobileDevice.ts similarity index 100% rename from packages/@uppy/utils/src/isMobileDevice.ts rename to packages/@uppy/core/src/utils/isMobileDevice.ts diff --git a/packages/@uppy/utils/src/isNetworkError.test.ts b/packages/@uppy/core/src/utils/isNetworkError.test.ts similarity index 100% rename from packages/@uppy/utils/src/isNetworkError.test.ts rename to packages/@uppy/core/src/utils/isNetworkError.test.ts diff --git a/packages/@uppy/utils/src/isNetworkError.ts b/packages/@uppy/core/src/utils/isNetworkError.ts similarity index 100% rename from packages/@uppy/utils/src/isNetworkError.ts rename to packages/@uppy/core/src/utils/isNetworkError.ts diff --git a/packages/@uppy/utils/src/isObjectURL.test.ts b/packages/@uppy/core/src/utils/isObjectURL.test.ts similarity index 100% rename from packages/@uppy/utils/src/isObjectURL.test.ts rename to packages/@uppy/core/src/utils/isObjectURL.test.ts diff --git a/packages/@uppy/utils/src/isObjectURL.ts b/packages/@uppy/core/src/utils/isObjectURL.ts similarity index 100% rename from packages/@uppy/utils/src/isObjectURL.ts rename to packages/@uppy/core/src/utils/isObjectURL.ts diff --git a/packages/@uppy/utils/src/isPreviewSupported.test.ts b/packages/@uppy/core/src/utils/isPreviewSupported.test.ts similarity index 100% rename from packages/@uppy/utils/src/isPreviewSupported.test.ts rename to packages/@uppy/core/src/utils/isPreviewSupported.test.ts diff --git a/packages/@uppy/utils/src/isPreviewSupported.ts b/packages/@uppy/core/src/utils/isPreviewSupported.ts similarity index 100% rename from packages/@uppy/utils/src/isPreviewSupported.ts rename to packages/@uppy/core/src/utils/isPreviewSupported.ts diff --git a/packages/@uppy/utils/src/isTouchDevice.test.ts b/packages/@uppy/core/src/utils/isTouchDevice.test.ts similarity index 100% rename from packages/@uppy/utils/src/isTouchDevice.test.ts rename to packages/@uppy/core/src/utils/isTouchDevice.test.ts diff --git a/packages/@uppy/utils/src/isTouchDevice.ts b/packages/@uppy/core/src/utils/isTouchDevice.ts similarity index 100% rename from packages/@uppy/utils/src/isTouchDevice.ts rename to packages/@uppy/core/src/utils/isTouchDevice.ts diff --git a/packages/@uppy/utils/src/microtip.scss b/packages/@uppy/core/src/utils/microtip.scss similarity index 100% rename from packages/@uppy/utils/src/microtip.scss rename to packages/@uppy/core/src/utils/microtip.scss diff --git a/packages/@uppy/utils/src/mimeTypes.ts b/packages/@uppy/core/src/utils/mimeTypes.ts similarity index 100% rename from packages/@uppy/utils/src/mimeTypes.ts rename to packages/@uppy/core/src/utils/mimeTypes.ts diff --git a/packages/@uppy/utils/src/prettyETA.test.ts b/packages/@uppy/core/src/utils/prettyETA.test.ts similarity index 100% rename from packages/@uppy/utils/src/prettyETA.test.ts rename to packages/@uppy/core/src/utils/prettyETA.test.ts diff --git a/packages/@uppy/utils/src/prettyETA.ts b/packages/@uppy/core/src/utils/prettyETA.ts similarity index 100% rename from packages/@uppy/utils/src/prettyETA.ts rename to packages/@uppy/core/src/utils/prettyETA.ts diff --git a/packages/@uppy/utils/src/remoteFileObjToLocal.ts b/packages/@uppy/core/src/utils/remoteFileObjToLocal.ts similarity index 100% rename from packages/@uppy/utils/src/remoteFileObjToLocal.ts rename to packages/@uppy/core/src/utils/remoteFileObjToLocal.ts diff --git a/packages/@uppy/utils/src/sampleImageDataURI.ts b/packages/@uppy/core/src/utils/sampleImageDataURI.ts similarity index 100% rename from packages/@uppy/utils/src/sampleImageDataURI.ts rename to packages/@uppy/core/src/utils/sampleImageDataURI.ts diff --git a/packages/@uppy/utils/src/secondsToTime.test.ts b/packages/@uppy/core/src/utils/secondsToTime.test.ts similarity index 100% rename from packages/@uppy/utils/src/secondsToTime.test.ts rename to packages/@uppy/core/src/utils/secondsToTime.test.ts diff --git a/packages/@uppy/utils/src/secondsToTime.ts b/packages/@uppy/core/src/utils/secondsToTime.ts similarity index 100% rename from packages/@uppy/utils/src/secondsToTime.ts rename to packages/@uppy/core/src/utils/secondsToTime.ts diff --git a/packages/@uppy/utils/src/toArray.test.ts b/packages/@uppy/core/src/utils/toArray.test.ts similarity index 100% rename from packages/@uppy/utils/src/toArray.test.ts rename to packages/@uppy/core/src/utils/toArray.test.ts diff --git a/packages/@uppy/utils/src/toArray.ts b/packages/@uppy/core/src/utils/toArray.ts similarity index 100% rename from packages/@uppy/utils/src/toArray.ts rename to packages/@uppy/core/src/utils/toArray.ts diff --git a/packages/@uppy/utils/src/truncateString.test.ts b/packages/@uppy/core/src/utils/truncateString.test.ts similarity index 100% rename from packages/@uppy/utils/src/truncateString.test.ts rename to packages/@uppy/core/src/utils/truncateString.test.ts diff --git a/packages/@uppy/utils/src/truncateString.ts b/packages/@uppy/core/src/utils/truncateString.ts similarity index 100% rename from packages/@uppy/utils/src/truncateString.ts rename to packages/@uppy/core/src/utils/truncateString.ts diff --git a/packages/@uppy/core/tsconfig.build.json b/packages/@uppy/core/tsconfig.build.json index 5afe23c5a..d49e86d5f 100644 --- a/packages/@uppy/core/tsconfig.build.json +++ b/packages/@uppy/core/tsconfig.build.json @@ -6,9 +6,5 @@ }, "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], - "references": [ - { - "path": "../utils/tsconfig.build.json" - } - ] + "references": [] } diff --git a/packages/@uppy/core/tsconfig.json b/packages/@uppy/core/tsconfig.json index 9b315b7f0..4fc6da5a4 100644 --- a/packages/@uppy/core/tsconfig.json +++ b/packages/@uppy/core/tsconfig.json @@ -6,9 +6,5 @@ "types": ["preact", "node"] }, "include": ["./package.json", "./src/**/*.*"], - "references": [ - { - "path": "../utils/tsconfig.build.json" - } - ] + "references": [] } diff --git a/packages/@uppy/dashboard/package.json b/packages/@uppy/dashboard/package.json index f52a7dc60..0cc2b8ead 100644 --- a/packages/@uppy/dashboard/package.json +++ b/packages/@uppy/dashboard/package.json @@ -47,7 +47,6 @@ "@transloadit/prettier-bytes": "^1.1.0", "@uppy/provider-views": "workspace:^", "@uppy/thumbnail-generator": "workspace:^", - "@uppy/utils": "workspace:^", "classnames": "^2.5.1", "lodash": "^4.18.1", "nanoid": "^5.1.11", diff --git a/packages/@uppy/dashboard/src/Dashboard.tsx b/packages/@uppy/dashboard/src/Dashboard.tsx index 422f1cda5..5c05efd8f 100644 --- a/packages/@uppy/dashboard/src/Dashboard.tsx +++ b/packages/@uppy/dashboard/src/Dashboard.tsx @@ -10,10 +10,10 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin } from '@uppy/core' +import type { LocaleStrings } from '@uppy/core/utils' +import { findAllDOMElements, getDroppedFiles, toArray } from '@uppy/core/utils' import { defaultPickerIcon } from '@uppy/provider-views' import ThumbnailGenerator from '@uppy/thumbnail-generator' -import type { LocaleStrings } from '@uppy/utils' -import { findAllDOMElements, getDroppedFiles, toArray } from '@uppy/utils' import { nanoid } from 'nanoid/non-secure' import type { ComponentChild, h, VNode } from 'preact' import packageJson from '../package.json' with { type: 'json' } diff --git a/packages/@uppy/dashboard/src/components/AddFiles.tsx b/packages/@uppy/dashboard/src/components/AddFiles.tsx index ccafc3331..ff7e63cea 100644 --- a/packages/@uppy/dashboard/src/components/AddFiles.tsx +++ b/packages/@uppy/dashboard/src/components/AddFiles.tsx @@ -1,4 +1,4 @@ -import type { I18n, Translator } from '@uppy/utils' +import type { I18n, Translator } from '@uppy/core/utils' import { Component, type ComponentChild, Fragment, type h } from 'preact' import type { DashboardState, TargetWithRender } from '../Dashboard.js' diff --git a/packages/@uppy/dashboard/src/components/Dashboard.tsx b/packages/@uppy/dashboard/src/components/Dashboard.tsx index 10456c924..383b092eb 100644 --- a/packages/@uppy/dashboard/src/components/Dashboard.tsx +++ b/packages/@uppy/dashboard/src/components/Dashboard.tsx @@ -7,8 +7,8 @@ import type { Uppy, UppyFile, } from '@uppy/core' -import type { I18n, Translator } from '@uppy/utils' -import { isDragDropSupported } from '@uppy/utils' +import type { I18n, Translator } from '@uppy/core/utils' +import { isDragDropSupported } from '@uppy/core/utils' import classNames from 'classnames' import type { h } from 'preact' import type { DashboardState, TargetWithRender } from '../Dashboard.js' diff --git a/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx index 1e4d68a08..ba79d66df 100644 --- a/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx +++ b/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx @@ -1,6 +1,6 @@ import type Uppy from '@uppy/core' import type { Body, Meta, UppyFile } from '@uppy/core' -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import type { DashboardState } from '../../../Dashboard.js' import copyToClipboard from '../../../utils/copyToClipboard.js' diff --git a/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.tsx index 15b4c436e..de3428cd0 100644 --- a/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.tsx +++ b/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.tsx @@ -1,7 +1,7 @@ import { prettierBytes } from '@transloadit/prettier-bytes' import type { UppyFile } from '@uppy/core' -import type { I18n } from '@uppy/utils' -import { truncateString } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' +import { truncateString } from '@uppy/core/utils' import type { DashboardState } from '../../../Dashboard.js' import MetaErrorMessage from '../MetaErrorMessage.js' diff --git a/packages/@uppy/dashboard/src/components/FileItem/FileProgress/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/FileProgress/index.tsx index 2a74fc1c7..bd5f49867 100644 --- a/packages/@uppy/dashboard/src/components/FileItem/FileProgress/index.tsx +++ b/packages/@uppy/dashboard/src/components/FileItem/FileProgress/index.tsx @@ -1,5 +1,5 @@ import type { Body, Meta, State, Uppy, UppyFile } from '@uppy/core' -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import type { ComponentChild } from 'preact' interface Props { diff --git a/packages/@uppy/dashboard/src/components/FileItem/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/index.tsx index 9088d32c0..8c45b9ccb 100644 --- a/packages/@uppy/dashboard/src/components/FileItem/index.tsx +++ b/packages/@uppy/dashboard/src/components/FileItem/index.tsx @@ -1,6 +1,6 @@ import type Uppy from '@uppy/core' import type { Body, Meta, State, UppyFile } from '@uppy/core' -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import classNames from 'classnames' // biome-ignore lint/style/useImportType: h is not a type import { Component, type ComponentChild, h } from 'preact' diff --git a/packages/@uppy/dashboard/src/components/FileList.tsx b/packages/@uppy/dashboard/src/components/FileList.tsx index 24a47fe16..4f9a65251 100644 --- a/packages/@uppy/dashboard/src/components/FileList.tsx +++ b/packages/@uppy/dashboard/src/components/FileList.tsx @@ -1,6 +1,6 @@ import type { Body, Meta, State, Uppy, UppyFile } from '@uppy/core' -import type { I18n } from '@uppy/utils' -import { VirtualList } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' +import { VirtualList } from '@uppy/core/utils' import { useMemo } from 'preact/hooks' import type { DashboardState } from '../Dashboard.js' import FileItem from './FileItem/index.js' diff --git a/packages/@uppy/dashboard/src/components/StatusBar/Components.tsx b/packages/@uppy/dashboard/src/components/StatusBar/Components.tsx index c99c41d7e..6d6cecaa1 100644 --- a/packages/@uppy/dashboard/src/components/StatusBar/Components.tsx +++ b/packages/@uppy/dashboard/src/components/StatusBar/Components.tsx @@ -1,7 +1,7 @@ import { prettierBytes } from '@transloadit/prettier-bytes' import type { Body, Meta, State, Uppy } from '@uppy/core' -import type { FileProcessingInfo, I18n } from '@uppy/utils' -import { prettyETA } from '@uppy/utils' +import type { FileProcessingInfo, I18n } from '@uppy/core/utils' +import { prettyETA } from '@uppy/core/utils' import classNames from 'classnames' import statusBarStates from './StatusBarStates.js' diff --git a/packages/@uppy/dashboard/src/components/StatusBar/StatusBar.tsx b/packages/@uppy/dashboard/src/components/StatusBar/StatusBar.tsx index 6f87315cc..dc69657fc 100644 --- a/packages/@uppy/dashboard/src/components/StatusBar/StatusBar.tsx +++ b/packages/@uppy/dashboard/src/components/StatusBar/StatusBar.tsx @@ -1,6 +1,6 @@ import type { Body, Meta, State, Uppy, UppyFile } from '@uppy/core' -import type { I18n } from '@uppy/utils' -import { emaFilter } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' +import { emaFilter } from '@uppy/core/utils' import type { ComponentChild } from 'preact' import { Component } from 'preact' import statusBarStates from './StatusBarStates.js' diff --git a/packages/@uppy/dashboard/src/components/StatusBar/StatusBarUI.tsx b/packages/@uppy/dashboard/src/components/StatusBar/StatusBarUI.tsx index 8ba63fcc4..eec2722f9 100644 --- a/packages/@uppy/dashboard/src/components/StatusBar/StatusBarUI.tsx +++ b/packages/@uppy/dashboard/src/components/StatusBar/StatusBarUI.tsx @@ -1,5 +1,5 @@ import type { Body, Meta, State, Uppy, UppyFile } from '@uppy/core' -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import classNames from 'classnames' import { CancelBtn, diff --git a/packages/@uppy/dashboard/src/components/StatusBar/calculateProcessingProgress.ts b/packages/@uppy/dashboard/src/components/StatusBar/calculateProcessingProgress.ts index a7d2bd8f8..23e0af378 100644 --- a/packages/@uppy/dashboard/src/components/StatusBar/calculateProcessingProgress.ts +++ b/packages/@uppy/dashboard/src/components/StatusBar/calculateProcessingProgress.ts @@ -1,4 +1,4 @@ -import type { FileProcessingInfo, UppyFile } from '@uppy/utils' +import type { FileProcessingInfo, UppyFile } from '@uppy/core/utils' export default function calculateProcessingProgress( files: Record>, diff --git a/packages/@uppy/dashboard/src/components/StatusBar/style.scss b/packages/@uppy/dashboard/src/components/StatusBar/style.scss index 549fbadc4..e0ff9d21c 100644 --- a/packages/@uppy/dashboard/src/components/StatusBar/style.scss +++ b/packages/@uppy/dashboard/src/components/StatusBar/style.scss @@ -1,7 +1,7 @@ @use "sass:color"; @use '@uppy/core/src/_utils.scss'; @use '@uppy/core/src/_variables.scss'; -@use '@uppy/utils/src/microtip.scss'; +@use '@uppy/core/src/utils/microtip.scss'; .uppy-StatusBar { position: relative; diff --git a/packages/@uppy/dashboard/src/utils/createSuperFocus.ts b/packages/@uppy/dashboard/src/utils/createSuperFocus.ts index 34c0e8e18..7344038f7 100644 --- a/packages/@uppy/dashboard/src/utils/createSuperFocus.ts +++ b/packages/@uppy/dashboard/src/utils/createSuperFocus.ts @@ -1,4 +1,4 @@ -import { FOCUSABLE_ELEMENTS } from '@uppy/utils' +import { FOCUSABLE_ELEMENTS } from '@uppy/core/utils' import debounce from 'lodash/debounce.js' import getActiveOverlayEl from './getActiveOverlayEl.js' diff --git a/packages/@uppy/dashboard/src/utils/trapFocus.ts b/packages/@uppy/dashboard/src/utils/trapFocus.ts index 598ad14c9..60f7b4ad7 100644 --- a/packages/@uppy/dashboard/src/utils/trapFocus.ts +++ b/packages/@uppy/dashboard/src/utils/trapFocus.ts @@ -1,4 +1,4 @@ -import { FOCUSABLE_ELEMENTS, toArray } from '@uppy/utils' +import { FOCUSABLE_ELEMENTS, toArray } from '@uppy/core/utils' import getActiveOverlayEl from './getActiveOverlayEl.js' type $TSFixMe = any diff --git a/packages/@uppy/dashboard/tsconfig.build.json b/packages/@uppy/dashboard/tsconfig.build.json index 3d0c3a299..6f43fe776 100644 --- a/packages/@uppy/dashboard/tsconfig.build.json +++ b/packages/@uppy/dashboard/tsconfig.build.json @@ -13,9 +13,6 @@ { "path": "../thumbnail-generator/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" }, diff --git a/packages/@uppy/dashboard/tsconfig.json b/packages/@uppy/dashboard/tsconfig.json index f8c72a949..2fd6b4df9 100644 --- a/packages/@uppy/dashboard/tsconfig.json +++ b/packages/@uppy/dashboard/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../thumbnail-generator/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" }, diff --git a/packages/@uppy/drag-drop/package.json b/packages/@uppy/drag-drop/package.json index 81ce3935e..68493268e 100644 --- a/packages/@uppy/drag-drop/package.json +++ b/packages/@uppy/drag-drop/package.json @@ -45,7 +45,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/utils": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/drag-drop/src/DragDrop.tsx b/packages/@uppy/drag-drop/src/DragDrop.tsx index 8987f64fd..63bd14888 100644 --- a/packages/@uppy/drag-drop/src/DragDrop.tsx +++ b/packages/@uppy/drag-drop/src/DragDrop.tsx @@ -6,8 +6,8 @@ import type { Uppy, } from '@uppy/core' import { UIPlugin } from '@uppy/core' -import type { LocaleStrings } from '@uppy/utils' -import { getDroppedFiles, isDragDropSupported, toArray } from '@uppy/utils' +import type { LocaleStrings } from '@uppy/core/utils' +import { getDroppedFiles, isDragDropSupported, toArray } from '@uppy/core/utils' import type { ComponentChild, h } from 'preact' import packageJson from '../package.json' with { type: 'json' } import locale from './locale.js' diff --git a/packages/@uppy/drag-drop/tsconfig.build.json b/packages/@uppy/drag-drop/tsconfig.build.json index 389eb1387..ac99ccdd7 100644 --- a/packages/@uppy/drag-drop/tsconfig.build.json +++ b/packages/@uppy/drag-drop/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/drag-drop/tsconfig.json b/packages/@uppy/drag-drop/tsconfig.json index 991d79cbd..edd6c80fb 100644 --- a/packages/@uppy/drag-drop/tsconfig.json +++ b/packages/@uppy/drag-drop/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/drop-target/package.json b/packages/@uppy/drop-target/package.json index 7d3cdf585..dc5d68252 100644 --- a/packages/@uppy/drop-target/package.json +++ b/packages/@uppy/drop-target/package.json @@ -43,9 +43,6 @@ "./css/style.scss": "./src/style.scss", "./package.json": "./package.json" }, - "dependencies": { - "@uppy/utils": "workspace:^" - }, "peerDependencies": { "@uppy/core": "workspace:^" }, diff --git a/packages/@uppy/drop-target/src/index.ts b/packages/@uppy/drop-target/src/index.ts index abbb09e7b..a24f816b0 100644 --- a/packages/@uppy/drop-target/src/index.ts +++ b/packages/@uppy/drop-target/src/index.ts @@ -1,6 +1,6 @@ import type { Body, DefinePluginOpts, Meta, PluginOpts, Uppy } from '@uppy/core' import { BasePlugin } from '@uppy/core' -import { getDroppedFiles, toArray } from '@uppy/utils' +import { getDroppedFiles, toArray } from '@uppy/core/utils' import packageJson from '../package.json' with { type: 'json' } declare module '@uppy/core' { diff --git a/packages/@uppy/drop-target/tsconfig.build.json b/packages/@uppy/drop-target/tsconfig.build.json index 389eb1387..ac99ccdd7 100644 --- a/packages/@uppy/drop-target/tsconfig.build.json +++ b/packages/@uppy/drop-target/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/drop-target/tsconfig.json b/packages/@uppy/drop-target/tsconfig.json index 991d79cbd..edd6c80fb 100644 --- a/packages/@uppy/drop-target/tsconfig.json +++ b/packages/@uppy/drop-target/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/dropbox/package.json b/packages/@uppy/dropbox/package.json index 746effbea..78e652bbf 100644 --- a/packages/@uppy/dropbox/package.json +++ b/packages/@uppy/dropbox/package.json @@ -36,7 +36,6 @@ "dependencies": { "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", - "@uppy/utils": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/dropbox/src/Dropbox.tsx b/packages/@uppy/dropbox/src/Dropbox.tsx index e536d09e3..a79dce4a6 100644 --- a/packages/@uppy/dropbox/src/Dropbox.tsx +++ b/packages/@uppy/dropbox/src/Dropbox.tsx @@ -13,9 +13,8 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import type { LocaleStrings } from '@uppy/core/utils' import { ProviderViews } from '@uppy/provider-views' - -import type { LocaleStrings } from '@uppy/utils' // biome-ignore lint/style/useImportType: h is not a type import { type ComponentChild, h } from 'preact' import packageJson from '../package.json' with { type: 'json' } diff --git a/packages/@uppy/dropbox/tsconfig.build.json b/packages/@uppy/dropbox/tsconfig.build.json index afabb530f..8d355f390 100644 --- a/packages/@uppy/dropbox/tsconfig.build.json +++ b/packages/@uppy/dropbox/tsconfig.build.json @@ -13,9 +13,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/dropbox/tsconfig.json b/packages/@uppy/dropbox/tsconfig.json index 847db9a4f..96feccd1e 100644 --- a/packages/@uppy/dropbox/tsconfig.json +++ b/packages/@uppy/dropbox/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/facebook/package.json b/packages/@uppy/facebook/package.json index 40ea9a18d..fcdd874fe 100644 --- a/packages/@uppy/facebook/package.json +++ b/packages/@uppy/facebook/package.json @@ -36,7 +36,6 @@ "dependencies": { "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", - "@uppy/utils": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/facebook/src/Facebook.tsx b/packages/@uppy/facebook/src/Facebook.tsx index 7032db1e4..e53d81aab 100644 --- a/packages/@uppy/facebook/src/Facebook.tsx +++ b/packages/@uppy/facebook/src/Facebook.tsx @@ -13,9 +13,8 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import type { LocaleStrings } from '@uppy/core/utils' import { ProviderViews } from '@uppy/provider-views' - -import type { LocaleStrings } from '@uppy/utils' // biome-ignore lint/style/useImportType: h is not a type import { type ComponentChild, h } from 'preact' import packageJson from '../package.json' with { type: 'json' } diff --git a/packages/@uppy/facebook/tsconfig.build.json b/packages/@uppy/facebook/tsconfig.build.json index afabb530f..8d355f390 100644 --- a/packages/@uppy/facebook/tsconfig.build.json +++ b/packages/@uppy/facebook/tsconfig.build.json @@ -13,9 +13,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/facebook/tsconfig.json b/packages/@uppy/facebook/tsconfig.json index 847db9a4f..96feccd1e 100644 --- a/packages/@uppy/facebook/tsconfig.json +++ b/packages/@uppy/facebook/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/form/package.json b/packages/@uppy/form/package.json index 68e23ef68..96abd6605 100644 --- a/packages/@uppy/form/package.json +++ b/packages/@uppy/form/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/utils": "workspace:^", "get-form-data": "^3.0.0" }, "peerDependencies": { diff --git a/packages/@uppy/form/src/index.ts b/packages/@uppy/form/src/index.ts index ba36e8cc8..d3edd27ff 100644 --- a/packages/@uppy/form/src/index.ts +++ b/packages/@uppy/form/src/index.ts @@ -7,7 +7,7 @@ import type { UppyEventMap, } from '@uppy/core' import { BasePlugin } from '@uppy/core' -import { findDOMElement, toArray } from '@uppy/utils' +import { findDOMElement, toArray } from '@uppy/core/utils' // @ts-expect-error untyped import getFormData from 'get-form-data' diff --git a/packages/@uppy/form/tsconfig.build.json b/packages/@uppy/form/tsconfig.build.json index 389eb1387..ac99ccdd7 100644 --- a/packages/@uppy/form/tsconfig.build.json +++ b/packages/@uppy/form/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/form/tsconfig.json b/packages/@uppy/form/tsconfig.json index 991d79cbd..edd6c80fb 100644 --- a/packages/@uppy/form/tsconfig.json +++ b/packages/@uppy/form/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/golden-retriever/package.json b/packages/@uppy/golden-retriever/package.json index 35157b90e..3a758d31f 100644 --- a/packages/@uppy/golden-retriever/package.json +++ b/packages/@uppy/golden-retriever/package.json @@ -42,7 +42,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/utils": "workspace:^", "lodash": "^4.18.1" }, "peerDependencies": { diff --git a/packages/@uppy/golden-retriever/src/IndexedDBStore.ts b/packages/@uppy/golden-retriever/src/IndexedDBStore.ts index 00edcda25..1e44df858 100644 --- a/packages/@uppy/golden-retriever/src/IndexedDBStore.ts +++ b/packages/@uppy/golden-retriever/src/IndexedDBStore.ts @@ -1,4 +1,4 @@ -import type { UppyFileId } from '@uppy/utils' +import type { UppyFileId } from '@uppy/core/utils' const indexedDB = typeof window !== 'undefined' && diff --git a/packages/@uppy/golden-retriever/src/MetaDataStore.ts b/packages/@uppy/golden-retriever/src/MetaDataStore.ts index bc7a46d87..5b914e1f9 100644 --- a/packages/@uppy/golden-retriever/src/MetaDataStore.ts +++ b/packages/@uppy/golden-retriever/src/MetaDataStore.ts @@ -1,5 +1,9 @@ import type { Body, Meta, State as UppyState } from '@uppy/core' -import type { LocalUppyFile, RemoteUppyFile, UppyFileId } from '@uppy/utils' +import type { + LocalUppyFile, + RemoteUppyFile, + UppyFileId, +} from '@uppy/core/utils' import throttle from 'lodash/throttle.js' // we don't want to store blobs in localStorage diff --git a/packages/@uppy/golden-retriever/src/ServiceWorker.ts b/packages/@uppy/golden-retriever/src/ServiceWorker.ts index 1f7a634ac..a9a00098d 100644 --- a/packages/@uppy/golden-retriever/src/ServiceWorker.ts +++ b/packages/@uppy/golden-retriever/src/ServiceWorker.ts @@ -1,6 +1,6 @@ /// -import type { UppyFileId } from '@uppy/utils' +import type { UppyFileId } from '@uppy/core/utils' declare const self: ServiceWorkerGlobalScope diff --git a/packages/@uppy/golden-retriever/src/ServiceWorkerStore.ts b/packages/@uppy/golden-retriever/src/ServiceWorkerStore.ts index 4b7006d40..71cfdf2b2 100644 --- a/packages/@uppy/golden-retriever/src/ServiceWorkerStore.ts +++ b/packages/@uppy/golden-retriever/src/ServiceWorkerStore.ts @@ -1,4 +1,4 @@ -import type { Body, Meta, UppyFile, UppyFileId } from '@uppy/utils' +import type { Body, Meta, UppyFile, UppyFileId } from '@uppy/core/utils' import type { AddFilePayload, AllFilesMessage, diff --git a/packages/@uppy/golden-retriever/src/index.ts b/packages/@uppy/golden-retriever/src/index.ts index 3b5c878a8..ba08743d0 100644 --- a/packages/@uppy/golden-retriever/src/index.ts +++ b/packages/@uppy/golden-retriever/src/index.ts @@ -8,7 +8,7 @@ import type { UppyFile, } from '@uppy/core' import { BasePlugin } from '@uppy/core' -import type { UppyFileId } from '@uppy/utils' +import type { UppyFileId } from '@uppy/core/utils' import packageJson from '../package.json' with { type: 'json' } import IndexedDBStore from './IndexedDBStore.js' import MetaDataStore from './MetaDataStore.js' diff --git a/packages/@uppy/golden-retriever/tsconfig.build.json b/packages/@uppy/golden-retriever/tsconfig.build.json index 389eb1387..ac99ccdd7 100644 --- a/packages/@uppy/golden-retriever/tsconfig.build.json +++ b/packages/@uppy/golden-retriever/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/golden-retriever/tsconfig.json b/packages/@uppy/golden-retriever/tsconfig.json index 991d79cbd..edd6c80fb 100644 --- a/packages/@uppy/golden-retriever/tsconfig.json +++ b/packages/@uppy/golden-retriever/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/google-drive-picker/package.json b/packages/@uppy/google-drive-picker/package.json index d08ad71ea..a29d4d6d3 100644 --- a/packages/@uppy/google-drive-picker/package.json +++ b/packages/@uppy/google-drive-picker/package.json @@ -38,7 +38,6 @@ "dependencies": { "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", - "@uppy/utils": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx b/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx index 6d378afdf..60674f9da 100644 --- a/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx +++ b/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx @@ -5,12 +5,12 @@ import { } from '@uppy/companion-client' import type { AsyncStore, BaseProviderPlugin, Body, Meta } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import type { LocaleStrings } from '@uppy/core/utils' import { GoogleDriveIcon, GooglePickerView, type PickedItem, } from '@uppy/provider-views' -import type { LocaleStrings } from '@uppy/utils' import packageJson from '../package.json' with { type: 'json' } import locale from './locale.js' diff --git a/packages/@uppy/google-drive-picker/tsconfig.build.json b/packages/@uppy/google-drive-picker/tsconfig.build.json index c9ee07067..6956822a9 100644 --- a/packages/@uppy/google-drive-picker/tsconfig.build.json +++ b/packages/@uppy/google-drive-picker/tsconfig.build.json @@ -15,9 +15,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/google-drive-picker/tsconfig.json b/packages/@uppy/google-drive-picker/tsconfig.json index 847db9a4f..96feccd1e 100644 --- a/packages/@uppy/google-drive-picker/tsconfig.json +++ b/packages/@uppy/google-drive-picker/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/google-drive/package.json b/packages/@uppy/google-drive/package.json index 432dc2e20..7789e9edc 100644 --- a/packages/@uppy/google-drive/package.json +++ b/packages/@uppy/google-drive/package.json @@ -37,7 +37,6 @@ "dependencies": { "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", - "@uppy/utils": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/google-drive/src/GoogleDrive.tsx b/packages/@uppy/google-drive/src/GoogleDrive.tsx index 1d43160ba..36cccf58e 100644 --- a/packages/@uppy/google-drive/src/GoogleDrive.tsx +++ b/packages/@uppy/google-drive/src/GoogleDrive.tsx @@ -13,9 +13,8 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import type { LocaleStrings } from '@uppy/core/utils' import type { ProviderViews } from '@uppy/provider-views' - -import type { LocaleStrings } from '@uppy/utils' // biome-ignore lint/style/useImportType: h is not a type import { type ComponentChild, h } from 'preact' import packageJson from '../package.json' with { type: 'json' } diff --git a/packages/@uppy/google-drive/tsconfig.build.json b/packages/@uppy/google-drive/tsconfig.build.json index afabb530f..8d355f390 100644 --- a/packages/@uppy/google-drive/tsconfig.build.json +++ b/packages/@uppy/google-drive/tsconfig.build.json @@ -13,9 +13,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/google-drive/tsconfig.json b/packages/@uppy/google-drive/tsconfig.json index 847db9a4f..96feccd1e 100644 --- a/packages/@uppy/google-drive/tsconfig.json +++ b/packages/@uppy/google-drive/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/google-photos-picker/package.json b/packages/@uppy/google-photos-picker/package.json index 109a588ff..7b6bb6a90 100644 --- a/packages/@uppy/google-photos-picker/package.json +++ b/packages/@uppy/google-photos-picker/package.json @@ -38,7 +38,6 @@ "dependencies": { "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", - "@uppy/utils": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx b/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx index 0242358ae..f5729b04b 100644 --- a/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx +++ b/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx @@ -5,12 +5,12 @@ import { } from '@uppy/companion-client' import type { AsyncStore, BaseProviderPlugin, Body, Meta } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import type { LocaleStrings } from '@uppy/core/utils' import { GooglePhotosIcon, GooglePickerView, type PickedItem, } from '@uppy/provider-views' -import type { LocaleStrings } from '@uppy/utils' import packageJson from '../package.json' with { type: 'json' } import locale from './locale.js' diff --git a/packages/@uppy/google-photos-picker/tsconfig.build.json b/packages/@uppy/google-photos-picker/tsconfig.build.json index c9ee07067..6956822a9 100644 --- a/packages/@uppy/google-photos-picker/tsconfig.build.json +++ b/packages/@uppy/google-photos-picker/tsconfig.build.json @@ -15,9 +15,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/google-photos-picker/tsconfig.json b/packages/@uppy/google-photos-picker/tsconfig.json index 847db9a4f..96feccd1e 100644 --- a/packages/@uppy/google-photos-picker/tsconfig.json +++ b/packages/@uppy/google-photos-picker/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/image-editor/package.json b/packages/@uppy/image-editor/package.json index fae2d3e34..dbbdb1156 100644 --- a/packages/@uppy/image-editor/package.json +++ b/packages/@uppy/image-editor/package.json @@ -46,7 +46,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/utils": "workspace:^", "cropperjs": "^1.6.2", "preact": "^10.29.2" }, diff --git a/packages/@uppy/image-editor/src/Editor.tsx b/packages/@uppy/image-editor/src/Editor.tsx index fd449b2e9..84bbcc6ea 100644 --- a/packages/@uppy/image-editor/src/Editor.tsx +++ b/packages/@uppy/image-editor/src/Editor.tsx @@ -1,5 +1,5 @@ import type { Body, Meta } from '@uppy/core' -import type { I18n, LocalUppyFile } from '@uppy/utils' +import type { I18n, LocalUppyFile } from '@uppy/core/utils' import { Component } from 'preact' import type ImageEditor from './ImageEditor.js' import type { AspectRatio } from './ImageEditor.js' diff --git a/packages/@uppy/image-editor/src/ImageEditor.tsx b/packages/@uppy/image-editor/src/ImageEditor.tsx index 74ed79476..710afc588 100644 --- a/packages/@uppy/image-editor/src/ImageEditor.tsx +++ b/packages/@uppy/image-editor/src/ImageEditor.tsx @@ -7,7 +7,7 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin } from '@uppy/core' -import type { LocaleStrings } from '@uppy/utils' +import type { LocaleStrings } from '@uppy/core/utils' import Cropper from 'cropperjs' import packageJson from '../package.json' with { type: 'json' } import Editor from './Editor.js' diff --git a/packages/@uppy/image-editor/tsconfig.build.json b/packages/@uppy/image-editor/tsconfig.build.json index 389eb1387..ac99ccdd7 100644 --- a/packages/@uppy/image-editor/tsconfig.build.json +++ b/packages/@uppy/image-editor/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/image-editor/tsconfig.json b/packages/@uppy/image-editor/tsconfig.json index 991d79cbd..edd6c80fb 100644 --- a/packages/@uppy/image-editor/tsconfig.json +++ b/packages/@uppy/image-editor/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/image-generator/package.json b/packages/@uppy/image-generator/package.json index 087206d59..ee26009d5 100644 --- a/packages/@uppy/image-generator/package.json +++ b/packages/@uppy/image-generator/package.json @@ -41,7 +41,6 @@ "dependencies": { "@uppy/provider-views": "workspace:^", "@uppy/transloadit": "workspace:^", - "@uppy/utils": "workspace:^", "preact": "^10.29.2" }, "devDependencies": { diff --git a/packages/@uppy/image-generator/src/index.tsx b/packages/@uppy/image-generator/src/index.tsx index 8fc002e32..3e9d5e99d 100644 --- a/packages/@uppy/image-generator/src/index.tsx +++ b/packages/@uppy/image-generator/src/index.tsx @@ -1,5 +1,6 @@ import type { Body, Meta, MinimalRequiredUppyFile, Uppy } from '@uppy/core' import { UIPlugin, type UIPluginOptions } from '@uppy/core' +import { RateLimitedQueue } from '@uppy/core/utils' import { FilterInput, SearchView } from '@uppy/provider-views' import { Assembly, @@ -7,7 +8,6 @@ import { Client, type OptionsWithRestructuredFields, } from '@uppy/transloadit' -import { RateLimitedQueue } from '@uppy/utils' import type { h } from 'preact' import locale from './locale.js' diff --git a/packages/@uppy/image-generator/tsconfig.build.json b/packages/@uppy/image-generator/tsconfig.build.json index 389eb1387..ac99ccdd7 100644 --- a/packages/@uppy/image-generator/tsconfig.build.json +++ b/packages/@uppy/image-generator/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/image-generator/tsconfig.json b/packages/@uppy/image-generator/tsconfig.json index ee7d9ca9f..e264a78c7 100644 --- a/packages/@uppy/image-generator/tsconfig.json +++ b/packages/@uppy/image-generator/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" }, diff --git a/packages/@uppy/locales/package.json b/packages/@uppy/locales/package.json index 1832aa22b..25787d68a 100644 --- a/packages/@uppy/locales/package.json +++ b/packages/@uppy/locales/package.json @@ -31,7 +31,7 @@ "CHANGELOG.md" ], "dependencies": { - "@uppy/utils": "workspace:^" + "@uppy/core": "workspace:^" }, "devDependencies": { "chalk": "^5.0.0", diff --git a/packages/@uppy/locales/src/ar_SA.ts b/packages/@uppy/locales/src/ar_SA.ts index 5726332aa..2c1b7fcf9 100644 --- a/packages/@uppy/locales/src/ar_SA.ts +++ b/packages/@uppy/locales/src/ar_SA.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const ar_SA: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/bg_BG.ts b/packages/@uppy/locales/src/bg_BG.ts index 637e505e0..4fde38d05 100644 --- a/packages/@uppy/locales/src/bg_BG.ts +++ b/packages/@uppy/locales/src/bg_BG.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const bg_BG: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/ca_ES.ts b/packages/@uppy/locales/src/ca_ES.ts index bce9a1296..6afd3bb01 100644 --- a/packages/@uppy/locales/src/ca_ES.ts +++ b/packages/@uppy/locales/src/ca_ES.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const ca_ES: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/cs_CZ.ts b/packages/@uppy/locales/src/cs_CZ.ts index 148929450..9321ed59f 100644 --- a/packages/@uppy/locales/src/cs_CZ.ts +++ b/packages/@uppy/locales/src/cs_CZ.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const cs_CZ: Locale<0 | 1 | 2> = { strings: {}, diff --git a/packages/@uppy/locales/src/da_DK.ts b/packages/@uppy/locales/src/da_DK.ts index 1e8f807cf..3dee79d18 100644 --- a/packages/@uppy/locales/src/da_DK.ts +++ b/packages/@uppy/locales/src/da_DK.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const da_DK: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/de_DE.ts b/packages/@uppy/locales/src/de_DE.ts index 9c1d99b0d..f64f4a778 100644 --- a/packages/@uppy/locales/src/de_DE.ts +++ b/packages/@uppy/locales/src/de_DE.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const de_DE: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/el_GR.ts b/packages/@uppy/locales/src/el_GR.ts index 615121078..dd768adf6 100644 --- a/packages/@uppy/locales/src/el_GR.ts +++ b/packages/@uppy/locales/src/el_GR.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const el_GR: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/en_US.ts b/packages/@uppy/locales/src/en_US.ts index c3f95e82d..c94f60f98 100644 --- a/packages/@uppy/locales/src/en_US.ts +++ b/packages/@uppy/locales/src/en_US.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const en_US: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/es_ES.ts b/packages/@uppy/locales/src/es_ES.ts index e4581f90e..838a429dd 100644 --- a/packages/@uppy/locales/src/es_ES.ts +++ b/packages/@uppy/locales/src/es_ES.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const es_ES: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/es_MX.ts b/packages/@uppy/locales/src/es_MX.ts index b8eb47986..926cd9d9e 100644 --- a/packages/@uppy/locales/src/es_MX.ts +++ b/packages/@uppy/locales/src/es_MX.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const es_MX: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/fa_IR.ts b/packages/@uppy/locales/src/fa_IR.ts index 1b69091ca..4fceefc39 100644 --- a/packages/@uppy/locales/src/fa_IR.ts +++ b/packages/@uppy/locales/src/fa_IR.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const fa_IR: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/fi_FI.ts b/packages/@uppy/locales/src/fi_FI.ts index 5eda5537b..b9e0642bf 100644 --- a/packages/@uppy/locales/src/fi_FI.ts +++ b/packages/@uppy/locales/src/fi_FI.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const fi_FI: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/fr_FR.ts b/packages/@uppy/locales/src/fr_FR.ts index 7a8f6d0f2..c2b6c31c1 100644 --- a/packages/@uppy/locales/src/fr_FR.ts +++ b/packages/@uppy/locales/src/fr_FR.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const fr_FR: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/gl_ES.ts b/packages/@uppy/locales/src/gl_ES.ts index 25b2fed3f..e07a83432 100644 --- a/packages/@uppy/locales/src/gl_ES.ts +++ b/packages/@uppy/locales/src/gl_ES.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const gl_ES: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/he_IL.ts b/packages/@uppy/locales/src/he_IL.ts index 44a5d52f2..2cef97313 100644 --- a/packages/@uppy/locales/src/he_IL.ts +++ b/packages/@uppy/locales/src/he_IL.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const he_IL: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/hi_IN.ts b/packages/@uppy/locales/src/hi_IN.ts index 587d31f50..435530055 100644 --- a/packages/@uppy/locales/src/hi_IN.ts +++ b/packages/@uppy/locales/src/hi_IN.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const hi_IN: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/hr_HR.ts b/packages/@uppy/locales/src/hr_HR.ts index f347db827..0f9045165 100644 --- a/packages/@uppy/locales/src/hr_HR.ts +++ b/packages/@uppy/locales/src/hr_HR.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const hr_HR: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/hu_HU.ts b/packages/@uppy/locales/src/hu_HU.ts index 4b7f6d4af..7a20101be 100644 --- a/packages/@uppy/locales/src/hu_HU.ts +++ b/packages/@uppy/locales/src/hu_HU.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const hu_HU: Locale<0> = { strings: {}, diff --git a/packages/@uppy/locales/src/id_ID.ts b/packages/@uppy/locales/src/id_ID.ts index 7daf65b02..2ce7a9b1c 100644 --- a/packages/@uppy/locales/src/id_ID.ts +++ b/packages/@uppy/locales/src/id_ID.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const id_ID: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/is_IS.ts b/packages/@uppy/locales/src/is_IS.ts index ebf4713b5..020777350 100644 --- a/packages/@uppy/locales/src/is_IS.ts +++ b/packages/@uppy/locales/src/is_IS.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const is_IS: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/it_IT.ts b/packages/@uppy/locales/src/it_IT.ts index 7508dce63..cca884691 100644 --- a/packages/@uppy/locales/src/it_IT.ts +++ b/packages/@uppy/locales/src/it_IT.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const it_IT: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/ja_JP.ts b/packages/@uppy/locales/src/ja_JP.ts index 62e33ab51..fc023e05d 100644 --- a/packages/@uppy/locales/src/ja_JP.ts +++ b/packages/@uppy/locales/src/ja_JP.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const ja_JP: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/ko_KR.ts b/packages/@uppy/locales/src/ko_KR.ts index 73138bd88..671235c9b 100644 --- a/packages/@uppy/locales/src/ko_KR.ts +++ b/packages/@uppy/locales/src/ko_KR.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const ko_KR: Locale<0> = { strings: {}, diff --git a/packages/@uppy/locales/src/ms_MY.ts b/packages/@uppy/locales/src/ms_MY.ts index 1358ea330..8a18da496 100644 --- a/packages/@uppy/locales/src/ms_MY.ts +++ b/packages/@uppy/locales/src/ms_MY.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const ms_MY: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/nb_NO.ts b/packages/@uppy/locales/src/nb_NO.ts index 6560c09f0..e3986ecac 100644 --- a/packages/@uppy/locales/src/nb_NO.ts +++ b/packages/@uppy/locales/src/nb_NO.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const nb_NO: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/nl_NL.ts b/packages/@uppy/locales/src/nl_NL.ts index 28a11ed7c..dfb2cf310 100644 --- a/packages/@uppy/locales/src/nl_NL.ts +++ b/packages/@uppy/locales/src/nl_NL.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const nl_NL: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/pl_PL.ts b/packages/@uppy/locales/src/pl_PL.ts index 00b33458b..b573517e6 100644 --- a/packages/@uppy/locales/src/pl_PL.ts +++ b/packages/@uppy/locales/src/pl_PL.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const pl_PL: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/pt_BR.ts b/packages/@uppy/locales/src/pt_BR.ts index 48bbb1848..2d7963e1f 100644 --- a/packages/@uppy/locales/src/pt_BR.ts +++ b/packages/@uppy/locales/src/pt_BR.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const pt_BR: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/pt_PT.ts b/packages/@uppy/locales/src/pt_PT.ts index 13f2ce18a..e94586000 100644 --- a/packages/@uppy/locales/src/pt_PT.ts +++ b/packages/@uppy/locales/src/pt_PT.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const pt_PT: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/ro_RO.ts b/packages/@uppy/locales/src/ro_RO.ts index f271c141b..53ca18580 100644 --- a/packages/@uppy/locales/src/ro_RO.ts +++ b/packages/@uppy/locales/src/ro_RO.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const ro_RO: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/ru_RU.ts b/packages/@uppy/locales/src/ru_RU.ts index 2411009a4..5376d3768 100644 --- a/packages/@uppy/locales/src/ru_RU.ts +++ b/packages/@uppy/locales/src/ru_RU.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const ru_RU: Locale<0 | 1 | 2> = { strings: {}, diff --git a/packages/@uppy/locales/src/sk_SK.ts b/packages/@uppy/locales/src/sk_SK.ts index 68fc787a3..1c260ab96 100644 --- a/packages/@uppy/locales/src/sk_SK.ts +++ b/packages/@uppy/locales/src/sk_SK.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const sk_SK: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/sr_RS_Cyrillic.ts b/packages/@uppy/locales/src/sr_RS_Cyrillic.ts index aac4d0fa8..4ccc25a02 100644 --- a/packages/@uppy/locales/src/sr_RS_Cyrillic.ts +++ b/packages/@uppy/locales/src/sr_RS_Cyrillic.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const sr_RS_Cyrillic: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/sr_RS_Latin.ts b/packages/@uppy/locales/src/sr_RS_Latin.ts index 987627082..a5fc64076 100644 --- a/packages/@uppy/locales/src/sr_RS_Latin.ts +++ b/packages/@uppy/locales/src/sr_RS_Latin.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const sr_RS_Latin: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/sv_SE.ts b/packages/@uppy/locales/src/sv_SE.ts index bb2a25105..5acef5f33 100644 --- a/packages/@uppy/locales/src/sv_SE.ts +++ b/packages/@uppy/locales/src/sv_SE.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const sv_SE: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/th_TH.ts b/packages/@uppy/locales/src/th_TH.ts index 10ed4a16f..54ee9732c 100644 --- a/packages/@uppy/locales/src/th_TH.ts +++ b/packages/@uppy/locales/src/th_TH.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const th_TH: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/tr_TR.ts b/packages/@uppy/locales/src/tr_TR.ts index 76b1d12f2..32710af78 100644 --- a/packages/@uppy/locales/src/tr_TR.ts +++ b/packages/@uppy/locales/src/tr_TR.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const tr_TR: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/uk_UA.ts b/packages/@uppy/locales/src/uk_UA.ts index 9af66cf49..faec1e727 100644 --- a/packages/@uppy/locales/src/uk_UA.ts +++ b/packages/@uppy/locales/src/uk_UA.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const uk_UA: Locale<0 | 1 | 2> = { strings: {}, diff --git a/packages/@uppy/locales/src/uz_UZ.ts b/packages/@uppy/locales/src/uz_UZ.ts index 6f344c55d..e5a1d348b 100644 --- a/packages/@uppy/locales/src/uz_UZ.ts +++ b/packages/@uppy/locales/src/uz_UZ.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const uz_UZ: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/vi_VN.ts b/packages/@uppy/locales/src/vi_VN.ts index 9b0265e0a..31e8dc6e6 100644 --- a/packages/@uppy/locales/src/vi_VN.ts +++ b/packages/@uppy/locales/src/vi_VN.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const vi_VN: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/src/zh_CN.ts b/packages/@uppy/locales/src/zh_CN.ts index b7686b22a..d4bfba8b9 100644 --- a/packages/@uppy/locales/src/zh_CN.ts +++ b/packages/@uppy/locales/src/zh_CN.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const zh_CN: Locale<0> = { strings: {}, diff --git a/packages/@uppy/locales/src/zh_TW.ts b/packages/@uppy/locales/src/zh_TW.ts index ee96d65f8..74f6fad97 100644 --- a/packages/@uppy/locales/src/zh_TW.ts +++ b/packages/@uppy/locales/src/zh_TW.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const zh_TW: Locale<0> = { strings: {}, diff --git a/packages/@uppy/locales/template.ts b/packages/@uppy/locales/template.ts index 5aec61eb4..e6f3fe1b9 100644 --- a/packages/@uppy/locales/template.ts +++ b/packages/@uppy/locales/template.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@uppy/utils' +import type { Locale } from '@uppy/core/utils' const en_US: Locale<0 | 1> = { strings: {}, diff --git a/packages/@uppy/locales/tsconfig.build.json b/packages/@uppy/locales/tsconfig.build.json index 87d88ebef..10c346782 100644 --- a/packages/@uppy/locales/tsconfig.build.json +++ b/packages/@uppy/locales/tsconfig.build.json @@ -7,7 +7,7 @@ "include": ["./src/**/*.*"], "references": [ { - "path": "../utils/tsconfig.build.json" + "path": "../core/tsconfig.build.json" } ] } diff --git a/packages/@uppy/locales/tsconfig.json b/packages/@uppy/locales/tsconfig.json index 284d67539..edd6c80fb 100644 --- a/packages/@uppy/locales/tsconfig.json +++ b/packages/@uppy/locales/tsconfig.json @@ -7,7 +7,7 @@ "include": ["./package.json", "./src/**/*.*"], "references": [ { - "path": "../utils/tsconfig.build.json" + "path": "../core/tsconfig.build.json" } ] } diff --git a/packages/@uppy/onedrive/package.json b/packages/@uppy/onedrive/package.json index 7563950bb..a122a6bdf 100644 --- a/packages/@uppy/onedrive/package.json +++ b/packages/@uppy/onedrive/package.json @@ -36,7 +36,6 @@ "dependencies": { "@uppy/companion-client": "workspace:^", "@uppy/provider-views": "workspace:^", - "@uppy/utils": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/onedrive/src/OneDrive.tsx b/packages/@uppy/onedrive/src/OneDrive.tsx index 9a47c812d..25843f8a6 100644 --- a/packages/@uppy/onedrive/src/OneDrive.tsx +++ b/packages/@uppy/onedrive/src/OneDrive.tsx @@ -13,9 +13,8 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin, type Uppy } from '@uppy/core' +import type { LocaleStrings } from '@uppy/core/utils' import { ProviderViews } from '@uppy/provider-views' - -import type { LocaleStrings } from '@uppy/utils' // biome-ignore lint/style/useImportType: h is not a type import { type ComponentChild, h } from 'preact' import packageJson from '../package.json' with { type: 'json' } diff --git a/packages/@uppy/onedrive/tsconfig.build.json b/packages/@uppy/onedrive/tsconfig.build.json index afabb530f..8d355f390 100644 --- a/packages/@uppy/onedrive/tsconfig.build.json +++ b/packages/@uppy/onedrive/tsconfig.build.json @@ -13,9 +13,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/onedrive/tsconfig.json b/packages/@uppy/onedrive/tsconfig.json index 847db9a4f..96feccd1e 100644 --- a/packages/@uppy/onedrive/tsconfig.json +++ b/packages/@uppy/onedrive/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../provider-views/tsconfig.build.json" }, - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/provider-views/package.json b/packages/@uppy/provider-views/package.json index 9a30735c6..b47d44dc5 100644 --- a/packages/@uppy/provider-views/package.json +++ b/packages/@uppy/provider-views/package.json @@ -40,7 +40,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/utils": "workspace:^", "classnames": "^2.5.1", "lodash": "^4.18.1", "nanoid": "^5.1.11", diff --git a/packages/@uppy/provider-views/src/Browser.tsx b/packages/@uppy/provider-views/src/Browser.tsx index 1ab0a9b67..59b6e8d2c 100644 --- a/packages/@uppy/provider-views/src/Browser.tsx +++ b/packages/@uppy/provider-views/src/Browser.tsx @@ -4,8 +4,8 @@ import type { PartialTreeFile, PartialTreeFolderNode, } from '@uppy/core' -import type { I18n } from '@uppy/utils' -import { VirtualList } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' +import { VirtualList } from '@uppy/core/utils' import { useEffect, useState } from 'preact/hooks' import Item from './Item/index.js' import type ProviderView from './ProviderView/ProviderView.js' diff --git a/packages/@uppy/provider-views/src/FilterInput.tsx b/packages/@uppy/provider-views/src/FilterInput.tsx index 1fa9baabe..83aa34ccb 100644 --- a/packages/@uppy/provider-views/src/FilterInput.tsx +++ b/packages/@uppy/provider-views/src/FilterInput.tsx @@ -1,4 +1,4 @@ -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import { useSearchForm } from './useSearchForm.js' interface FilterInputProps { diff --git a/packages/@uppy/provider-views/src/FooterActions.tsx b/packages/@uppy/provider-views/src/FooterActions.tsx index df723de4d..946fe49cc 100644 --- a/packages/@uppy/provider-views/src/FooterActions.tsx +++ b/packages/@uppy/provider-views/src/FooterActions.tsx @@ -1,5 +1,5 @@ import type { Body, Meta, PartialTree } from '@uppy/core' -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import classNames from 'classnames' import { useMemo } from 'preact/hooks' import type ProviderView from './ProviderView/ProviderView.js' diff --git a/packages/@uppy/provider-views/src/GooglePicker/GooglePickerView.tsx b/packages/@uppy/provider-views/src/GooglePicker/GooglePickerView.tsx index c18a06557..bf9ddb2e7 100644 --- a/packages/@uppy/provider-views/src/GooglePicker/GooglePickerView.tsx +++ b/packages/@uppy/provider-views/src/GooglePicker/GooglePickerView.tsx @@ -1,5 +1,5 @@ import type { AsyncStore, Uppy } from '@uppy/core' -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' import AuthView from '../ProviderView/AuthView.js' import { diff --git a/packages/@uppy/provider-views/src/Item/components/SearchResultItem.tsx b/packages/@uppy/provider-views/src/Item/components/SearchResultItem.tsx index 3ba6b9492..abebd2370 100644 --- a/packages/@uppy/provider-views/src/Item/components/SearchResultItem.tsx +++ b/packages/@uppy/provider-views/src/Item/components/SearchResultItem.tsx @@ -1,5 +1,5 @@ import type { PartialTreeFile, PartialTreeFolderNode } from '@uppy/core' -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import classNames from 'classnames' import type ProviderView from '../../ProviderView/ProviderView.js' import ItemIcon from './ItemIcon.js' diff --git a/packages/@uppy/provider-views/src/Item/index.tsx b/packages/@uppy/provider-views/src/Item/index.tsx index 4caf673da..171fbd699 100644 --- a/packages/@uppy/provider-views/src/Item/index.tsx +++ b/packages/@uppy/provider-views/src/Item/index.tsx @@ -3,7 +3,7 @@ import type { PartialTreeFolderNode, PartialTreeId, } from '@uppy/core' -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import classNames from 'classnames' import type { h } from 'preact' import GridItem from './components/GridItem.js' diff --git a/packages/@uppy/provider-views/src/ProviderView/AuthView.tsx b/packages/@uppy/provider-views/src/ProviderView/AuthView.tsx index f623b1d3e..c76be47ad 100644 --- a/packages/@uppy/provider-views/src/ProviderView/AuthView.tsx +++ b/packages/@uppy/provider-views/src/ProviderView/AuthView.tsx @@ -1,5 +1,5 @@ import type { Body, Meta } from '@uppy/core' -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import type { h } from 'preact' import { useCallback } from 'preact/hooks' import type ProviderViews from './ProviderView.js' diff --git a/packages/@uppy/provider-views/src/ProviderView/GlobalSearchView.tsx b/packages/@uppy/provider-views/src/ProviderView/GlobalSearchView.tsx index 7c0eaf6f0..a5b046589 100644 --- a/packages/@uppy/provider-views/src/ProviderView/GlobalSearchView.tsx +++ b/packages/@uppy/provider-views/src/ProviderView/GlobalSearchView.tsx @@ -1,5 +1,5 @@ import type { PartialTreeFile, PartialTreeFolderNode } from '@uppy/core' -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import SearchResultItem from '../Item/components/SearchResultItem.js' import type ProviderView from './ProviderView.js' diff --git a/packages/@uppy/provider-views/src/ProviderView/Header.tsx b/packages/@uppy/provider-views/src/ProviderView/Header.tsx index 5c7c06cfd..51a929e42 100644 --- a/packages/@uppy/provider-views/src/ProviderView/Header.tsx +++ b/packages/@uppy/provider-views/src/ProviderView/Header.tsx @@ -1,5 +1,5 @@ import type { Body, Meta, PartialTreeFolder } from '@uppy/core' -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import classNames from 'classnames' import type { h } from 'preact' import Breadcrumbs from '../Breadcrumbs.js' diff --git a/packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx b/packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx index 4e010678e..59b4422d9 100644 --- a/packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx +++ b/packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx @@ -10,8 +10,8 @@ import type { UnknownProviderPluginState, ValidateableFile, } from '@uppy/core' -import type { CompanionFile, I18n } from '@uppy/utils' -import { remoteFileObjToLocal } from '@uppy/utils' +import type { CompanionFile, I18n } from '@uppy/core/utils' +import { remoteFileObjToLocal } from '@uppy/core/utils' import classNames from 'classnames' import debounce from 'lodash/debounce.js' import type { h } from 'preact' diff --git a/packages/@uppy/provider-views/src/SearchProviderView/SearchProviderView.tsx b/packages/@uppy/provider-views/src/SearchProviderView/SearchProviderView.tsx index 61bfe827f..7ddaf127e 100644 --- a/packages/@uppy/provider-views/src/SearchProviderView/SearchProviderView.tsx +++ b/packages/@uppy/provider-views/src/SearchProviderView/SearchProviderView.tsx @@ -10,8 +10,8 @@ import type { UnknownSearchProviderPluginState, ValidateableFile, } from '@uppy/core' -import type { CompanionFile } from '@uppy/utils' -import { remoteFileObjToLocal } from '@uppy/utils' +import type { CompanionFile } from '@uppy/core/utils' +import { remoteFileObjToLocal } from '@uppy/core/utils' import classNames from 'classnames' import type { h } from 'preact' import packageJson from '../../package.json' with { type: 'json' } diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterFill.ts b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterFill.ts index a16686118..31616b9c2 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterFill.ts +++ b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterFill.ts @@ -4,7 +4,7 @@ import type { PartialTreeFolderNode, PartialTreeId, } from '@uppy/core' -import type { CompanionFile } from '@uppy/utils' +import type { CompanionFile } from '@uppy/core/utils' // p-queue does not have a `"main"` field in its `package.json`, and that makes `import/no-unresolved` freak out. // We can safely ignore it because bundlers will happily use the `"exports"` field instead. import PQueue from 'p-queue' diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterOpenFolder.ts b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterOpenFolder.ts index 7295112eb..7479857eb 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterOpenFolder.ts +++ b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterOpenFolder.ts @@ -4,7 +4,7 @@ import type { PartialTreeFolder, PartialTreeFolderNode, } from '@uppy/core' -import type { CompanionFile } from '@uppy/utils' +import type { CompanionFile } from '@uppy/core/utils' const afterOpenFolder = ( oldPartialTree: PartialTree, diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterScrollFolder.ts b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterScrollFolder.ts index 429952c6f..bc0015dbb 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterScrollFolder.ts +++ b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterScrollFolder.ts @@ -5,7 +5,7 @@ import type { PartialTreeFolderNode, PartialTreeId, } from '@uppy/core' -import type { CompanionFile } from '@uppy/utils' +import type { CompanionFile } from '@uppy/core/utils' const afterScrollFolder = ( oldPartialTree: PartialTree, diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/getCheckedFilesWithPaths.ts b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/getCheckedFilesWithPaths.ts index cdae48dd0..7af16eba5 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/getCheckedFilesWithPaths.ts +++ b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/getCheckedFilesWithPaths.ts @@ -4,7 +4,7 @@ import type { PartialTreeFolderNode, PartialTreeId, } from '@uppy/core' -import type { CompanionFile } from '@uppy/utils' +import type { CompanionFile } from '@uppy/core/utils' export interface Cache { [key: string]: (PartialTreeFile | PartialTreeFolderNode)[] diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.test.ts b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.test.ts index 02a1159ed..aa6d8b60f 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.test.ts +++ b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.test.ts @@ -5,7 +5,7 @@ import type { PartialTreeFolderRoot, PartialTreeId, } from '@uppy/core' -import type { CompanionFile } from '@uppy/utils' +import type { CompanionFile } from '@uppy/core/utils' import { describe, expect, it, vi } from 'vitest' import afterFill from './afterFill.js' import afterOpenFolder from './afterOpenFolder.js' diff --git a/packages/@uppy/provider-views/src/utils/addFiles.ts b/packages/@uppy/provider-views/src/utils/addFiles.ts index d4c34c616..47848da4d 100644 --- a/packages/@uppy/provider-views/src/utils/addFiles.ts +++ b/packages/@uppy/provider-views/src/utils/addFiles.ts @@ -6,8 +6,8 @@ import type { CompanionFile, Meta, UppyFileNonGhost, -} from '@uppy/utils' -import { getSafeFileId } from '@uppy/utils' +} from '@uppy/core/utils' +import { getSafeFileId } from '@uppy/core/utils' import companionFileToUppyFile from './companionFileToUppyFile.js' const addFiles = ( diff --git a/packages/@uppy/provider-views/src/utils/companionFileToUppyFile.ts b/packages/@uppy/provider-views/src/utils/companionFileToUppyFile.ts index 9b2d190cb..c3e63e9d3 100644 --- a/packages/@uppy/provider-views/src/utils/companionFileToUppyFile.ts +++ b/packages/@uppy/provider-views/src/utils/companionFileToUppyFile.ts @@ -6,7 +6,7 @@ import type { CompanionFile, Meta, RemoteUppyFile, -} from '@uppy/utils' +} from '@uppy/core/utils' const companionFileToUppyFile = ( file: CompanionFile, diff --git a/packages/@uppy/provider-views/tsconfig.build.json b/packages/@uppy/provider-views/tsconfig.build.json index a4fd7f396..3c498ff33 100644 --- a/packages/@uppy/provider-views/tsconfig.build.json +++ b/packages/@uppy/provider-views/tsconfig.build.json @@ -8,9 +8,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/provider-views/tsconfig.json b/packages/@uppy/provider-views/tsconfig.json index 64bdee9d4..1ff3bf95e 100644 --- a/packages/@uppy/provider-views/tsconfig.json +++ b/packages/@uppy/provider-views/tsconfig.json @@ -7,9 +7,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/react/src/useUppyEvent.test.ts b/packages/@uppy/react/src/useUppyEvent.test.ts index ca7d50259..c8f74906b 100644 --- a/packages/@uppy/react/src/useUppyEvent.test.ts +++ b/packages/@uppy/react/src/useUppyEvent.test.ts @@ -1,6 +1,6 @@ import { act, renderHook } from '@testing-library/react' import Uppy from '@uppy/core' -import type { Meta, UppyFile } from '@uppy/utils' +import type { Meta, UppyFile } from '@uppy/core/utils' import { describe, expect, expectTypeOf, it, vi } from 'vitest' import { useUppyEvent } from './index.js' diff --git a/packages/@uppy/react/tsconfig.build.json b/packages/@uppy/react/tsconfig.build.json index 2985e040a..d6ce92f6c 100644 --- a/packages/@uppy/react/tsconfig.build.json +++ b/packages/@uppy/react/tsconfig.build.json @@ -9,9 +9,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.tsx"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" }, diff --git a/packages/@uppy/react/tsconfig.json b/packages/@uppy/react/tsconfig.json index 1c5aba285..17ba203c8 100644 --- a/packages/@uppy/react/tsconfig.json +++ b/packages/@uppy/react/tsconfig.json @@ -8,9 +8,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" }, diff --git a/packages/@uppy/screen-capture/package.json b/packages/@uppy/screen-capture/package.json index 8ebefee2a..dab2c6c1c 100644 --- a/packages/@uppy/screen-capture/package.json +++ b/packages/@uppy/screen-capture/package.json @@ -44,7 +44,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/utils": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/screen-capture/src/DiscardButton.tsx b/packages/@uppy/screen-capture/src/DiscardButton.tsx index d16e464a4..d7b074b5e 100644 --- a/packages/@uppy/screen-capture/src/DiscardButton.tsx +++ b/packages/@uppy/screen-capture/src/DiscardButton.tsx @@ -1,4 +1,4 @@ -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import type { h } from 'preact' interface DiscardButtonProps { diff --git a/packages/@uppy/screen-capture/src/RecordButton.tsx b/packages/@uppy/screen-capture/src/RecordButton.tsx index 4ff6de7d1..3a2f38091 100644 --- a/packages/@uppy/screen-capture/src/RecordButton.tsx +++ b/packages/@uppy/screen-capture/src/RecordButton.tsx @@ -1,4 +1,4 @@ -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import type { h } from 'preact' interface RecordButtonProps { diff --git a/packages/@uppy/screen-capture/src/ScreenCapture.tsx b/packages/@uppy/screen-capture/src/ScreenCapture.tsx index e99edfd2d..b60b63238 100644 --- a/packages/@uppy/screen-capture/src/ScreenCapture.tsx +++ b/packages/@uppy/screen-capture/src/ScreenCapture.tsx @@ -6,8 +6,8 @@ import type { Uppy, } from '@uppy/core' import { UIPlugin } from '@uppy/core' -import type { LocaleStrings } from '@uppy/utils' -import { getFileTypeExtension } from '@uppy/utils' +import type { LocaleStrings } from '@uppy/core/utils' +import { getFileTypeExtension } from '@uppy/core/utils' import type { ComponentChild } from 'preact' import packageJson from '../package.json' with { type: 'json' } import locale from './locale.js' diff --git a/packages/@uppy/screen-capture/src/SubmitButton.tsx b/packages/@uppy/screen-capture/src/SubmitButton.tsx index 61761c9a7..4021489ad 100644 --- a/packages/@uppy/screen-capture/src/SubmitButton.tsx +++ b/packages/@uppy/screen-capture/src/SubmitButton.tsx @@ -1,4 +1,4 @@ -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import type { h } from 'preact' interface SubmitButtonProps { diff --git a/packages/@uppy/screen-capture/tsconfig.build.json b/packages/@uppy/screen-capture/tsconfig.build.json index 389eb1387..ac99ccdd7 100644 --- a/packages/@uppy/screen-capture/tsconfig.build.json +++ b/packages/@uppy/screen-capture/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/screen-capture/tsconfig.json b/packages/@uppy/screen-capture/tsconfig.json index 991d79cbd..edd6c80fb 100644 --- a/packages/@uppy/screen-capture/tsconfig.json +++ b/packages/@uppy/screen-capture/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/status-bar/package.json b/packages/@uppy/status-bar/package.json index a9f9d9554..9d2031f7c 100644 --- a/packages/@uppy/status-bar/package.json +++ b/packages/@uppy/status-bar/package.json @@ -47,7 +47,6 @@ }, "dependencies": { "@transloadit/prettier-bytes": "^1.1.0", - "@uppy/utils": "workspace:^", "classnames": "^2.5.1", "preact": "^10.29.2" }, diff --git a/packages/@uppy/status-bar/src/Components.tsx b/packages/@uppy/status-bar/src/Components.tsx index e8fc308da..67383ee27 100644 --- a/packages/@uppy/status-bar/src/Components.tsx +++ b/packages/@uppy/status-bar/src/Components.tsx @@ -1,7 +1,7 @@ import { prettierBytes } from '@transloadit/prettier-bytes' import type { Body, Meta, State, Uppy } from '@uppy/core' -import type { FileProcessingInfo, I18n } from '@uppy/utils' -import { prettyETA } from '@uppy/utils' +import type { FileProcessingInfo, I18n } from '@uppy/core/utils' +import { prettyETA } from '@uppy/core/utils' import classNames from 'classnames' import statusBarStates from './StatusBarStates.js' diff --git a/packages/@uppy/status-bar/src/StatusBar.tsx b/packages/@uppy/status-bar/src/StatusBar.tsx index 07d882744..a617a10d6 100644 --- a/packages/@uppy/status-bar/src/StatusBar.tsx +++ b/packages/@uppy/status-bar/src/StatusBar.tsx @@ -7,7 +7,7 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin } from '@uppy/core' -import { emaFilter, getTextDirection } from '@uppy/utils' +import { emaFilter, getTextDirection } from '@uppy/core/utils' import type { ComponentChild } from 'preact' import packageJson from '../package.json' with { type: 'json' } import locale from './locale.js' diff --git a/packages/@uppy/status-bar/src/StatusBarOptions.ts b/packages/@uppy/status-bar/src/StatusBarOptions.ts index cf937d5da..3f3d8aec2 100644 --- a/packages/@uppy/status-bar/src/StatusBarOptions.ts +++ b/packages/@uppy/status-bar/src/StatusBarOptions.ts @@ -1,5 +1,5 @@ import type { UIPluginOptions } from '@uppy/core' -import type { LocaleStrings } from '@uppy/utils' +import type { LocaleStrings } from '@uppy/core/utils' import type StatusBarLocale from './locale.js' export interface StatusBarOptions extends UIPluginOptions { diff --git a/packages/@uppy/status-bar/src/StatusBarUI.tsx b/packages/@uppy/status-bar/src/StatusBarUI.tsx index 3a9b38ce2..c744fd392 100644 --- a/packages/@uppy/status-bar/src/StatusBarUI.tsx +++ b/packages/@uppy/status-bar/src/StatusBarUI.tsx @@ -1,5 +1,5 @@ import type { Body, Meta, State, Uppy, UppyFile } from '@uppy/core' -import type { I18n } from '@uppy/utils' +import type { I18n } from '@uppy/core/utils' import classNames from 'classnames' import { CancelBtn, diff --git a/packages/@uppy/status-bar/src/calculateProcessingProgress.ts b/packages/@uppy/status-bar/src/calculateProcessingProgress.ts index a7d2bd8f8..23e0af378 100644 --- a/packages/@uppy/status-bar/src/calculateProcessingProgress.ts +++ b/packages/@uppy/status-bar/src/calculateProcessingProgress.ts @@ -1,4 +1,4 @@ -import type { FileProcessingInfo, UppyFile } from '@uppy/utils' +import type { FileProcessingInfo, UppyFile } from '@uppy/core/utils' export default function calculateProcessingProgress( files: Record>, diff --git a/packages/@uppy/status-bar/src/style.scss b/packages/@uppy/status-bar/src/style.scss index 0e57c30f0..6f43d3d67 100644 --- a/packages/@uppy/status-bar/src/style.scss +++ b/packages/@uppy/status-bar/src/style.scss @@ -2,7 +2,7 @@ @use "sass:color"; @use '@uppy/core/src/_utils.scss'; @use '@uppy/core/src/_variables.scss'; -@use '@uppy/utils/src/microtip.scss'; +@use '@uppy/core/src/utils/microtip.scss'; .uppy-StatusBar { position: relative; diff --git a/packages/@uppy/status-bar/tsconfig.build.json b/packages/@uppy/status-bar/tsconfig.build.json index 389eb1387..ac99ccdd7 100644 --- a/packages/@uppy/status-bar/tsconfig.build.json +++ b/packages/@uppy/status-bar/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/status-bar/tsconfig.json b/packages/@uppy/status-bar/tsconfig.json index 991d79cbd..edd6c80fb 100644 --- a/packages/@uppy/status-bar/tsconfig.json +++ b/packages/@uppy/status-bar/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../utils/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/svelte/src/lib/components/Dashboard.svelte b/packages/@uppy/svelte/src/lib/components/Dashboard.svelte index d56b88718..000dd7eac 100644 --- a/packages/@uppy/svelte/src/lib/components/Dashboard.svelte +++ b/packages/@uppy/svelte/src/lib/components/Dashboard.svelte @@ -1,6 +1,6 @@