diff --git a/examples/companion-custom-provider/client/MyCustomProvider.jsx b/examples/companion-custom-provider/client/MyCustomProvider.jsx index 52fab29ff..b8fd62b25 100644 --- a/examples/companion-custom-provider/client/MyCustomProvider.jsx +++ b/examples/companion-custom-provider/client/MyCustomProvider.jsx @@ -2,7 +2,7 @@ import { getAllowedHosts, Provider, tokenStorage } from '@uppy/companion-client' import { UIPlugin } from '@uppy/core' -import { ProviderViews } from '@uppy/provider-views' +import { ProviderViews } from '@uppy/core/provider-views' const defaultOptions = {} diff --git a/examples/companion-custom-provider/package.json b/examples/companion-custom-provider/package.json index 03a9b70b4..c18ecab3b 100644 --- a/examples/companion-custom-provider/package.json +++ b/examples/companion-custom-provider/package.json @@ -7,7 +7,6 @@ "@uppy/core": "workspace:*", "@uppy/dashboard": "workspace:*", "@uppy/google-drive": "workspace:*", - "@uppy/provider-views": "workspace:*", "@uppy/tus": "workspace:*", "preact": "^10.29.2" }, diff --git a/packages/@uppy/box/package.json b/packages/@uppy/box/package.json index b0b8d7696..64e39fce2 100644 --- a/packages/@uppy/box/package.json +++ b/packages/@uppy/box/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/box/src/Box.tsx b/packages/@uppy/box/src/Box.tsx index b63640024..a73b06552 100644 --- a/packages/@uppy/box/src/Box.tsx +++ b/packages/@uppy/box/src/Box.tsx @@ -13,8 +13,8 @@ import { Provider, tokenStorage, } from '@uppy/core/companion-client' +import { ProviderViews } from '@uppy/core/provider-views' import type { LocaleStrings } from '@uppy/core/utils' -import { ProviderViews } from '@uppy/provider-views' // 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 73521b1c6..ac99ccdd7 100644 --- a/packages/@uppy/box/tsconfig.build.json +++ b/packages/@uppy/box/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/box/tsconfig.json b/packages/@uppy/box/tsconfig.json index 1b6915eca..edd6c80fb 100644 --- a/packages/@uppy/box/tsconfig.json +++ b/packages/@uppy/box/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/components/src/hooks/remote-source.ts b/packages/@uppy/components/src/hooks/remote-source.ts index e65035e6e..262bb467f 100644 --- a/packages/@uppy/components/src/hooks/remote-source.ts +++ b/packages/@uppy/components/src/hooks/remote-source.ts @@ -5,7 +5,7 @@ import type { UnknownProviderPluginState, UppyEventMap, } from '@uppy/core' -import type { ProviderViews } from '@uppy/provider-views' +import type { ProviderViews } from '@uppy/core/provider-views' import { dequal } from 'dequal/lite' import { Subscribers } from './utils.js' diff --git a/packages/@uppy/core/package.json b/packages/@uppy/core/package.json index ad456a072..82d0feee2 100644 --- a/packages/@uppy/core/package.json +++ b/packages/@uppy/core/package.json @@ -10,7 +10,7 @@ ], "scripts": { "build": "tsc --build tsconfig.build.json", - "build:css": "sass --load-path=../../ src/style.scss dist/style.css && postcss dist/style.css -u cssnano -o dist/style.min.css", + "build:css": "sass --load-path=../../ src/style.scss dist/style.css && sass --load-path=../../ src/provider-views/style.scss dist/provider-views.css && postcss dist/style.css -u cssnano -o dist/style.min.css && postcss dist/provider-views.css -u cssnano -o dist/provider-views.min.css", "typecheck": "tsc --build", "test": "vitest run --environment=jsdom --silent='passed-only'" }, @@ -41,19 +41,28 @@ "./store-default": "./lib/store/index.js", "./utils": "./lib/utils/index.js", "./companion-client": "./lib/companion-client/index.js", + "./provider-views": "./lib/provider-views/index.js", + "./provider-views/css/style.min.css": "./dist/provider-views.min.css", + "./provider-views/css/style.css": "./dist/provider-views.css", + "./provider-views/css/style.scss": "./src/provider-views/style.scss", "./package.json": "./package.json" }, "dependencies": { "@transloadit/prettier-bytes": "^1.1.0", + "classnames": "^2.5.1", "lodash": "^4.18.1", "mime-match": "^1.0.2", "namespace-emitter": "^2.0.1", "nanoid": "^5.1.11", + "p-queue": "^9.3.0", "p-retry": "^6.1.0", "preact": "^10.29.2" }, "devDependencies": { "@types/deep-freeze": "^0", + "@types/gapi": "^0.0.47", + "@types/google.accounts": "^0.0.14", + "@types/google.picker": "^0.0.42", "@types/lodash": "^4.14.199", "@types/node": "^20.19.0", "cssnano": "^8.0.1", diff --git a/packages/@uppy/provider-views/src/Breadcrumbs.tsx b/packages/@uppy/core/src/provider-views/Breadcrumbs.tsx similarity index 94% rename from packages/@uppy/provider-views/src/Breadcrumbs.tsx rename to packages/@uppy/core/src/provider-views/Breadcrumbs.tsx index 831ed0438..f98b4fdd8 100644 --- a/packages/@uppy/provider-views/src/Breadcrumbs.tsx +++ b/packages/@uppy/core/src/provider-views/Breadcrumbs.tsx @@ -1,5 +1,5 @@ -import type { Body, Meta, PartialTreeFolder } from '@uppy/core' import { Fragment, type h } from 'preact' +import type { Body, Meta, PartialTreeFolder } from '../index.js' import type ProviderView from './ProviderView/index.js' type BreadcrumbsProps = { diff --git a/packages/@uppy/provider-views/src/Browser.tsx b/packages/@uppy/core/src/provider-views/Browser.tsx similarity index 96% rename from packages/@uppy/provider-views/src/Browser.tsx rename to packages/@uppy/core/src/provider-views/Browser.tsx index 59b6e8d2c..244ad04a6 100644 --- a/packages/@uppy/provider-views/src/Browser.tsx +++ b/packages/@uppy/core/src/provider-views/Browser.tsx @@ -1,12 +1,12 @@ +import { useEffect, useState } from 'preact/hooks' import type { Body, Meta, PartialTreeFile, PartialTreeFolderNode, -} from '@uppy/core' -import type { I18n } from '@uppy/core/utils' -import { VirtualList } from '@uppy/core/utils' -import { useEffect, useState } from 'preact/hooks' +} from '../index.js' +import type { I18n } from '../utils/index.js' +import { VirtualList } from '../utils/index.js' 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/core/src/provider-views/FilterInput.tsx similarity index 98% rename from packages/@uppy/provider-views/src/FilterInput.tsx rename to packages/@uppy/core/src/provider-views/FilterInput.tsx index 83aa34ccb..25c101058 100644 --- a/packages/@uppy/provider-views/src/FilterInput.tsx +++ b/packages/@uppy/core/src/provider-views/FilterInput.tsx @@ -1,4 +1,4 @@ -import type { I18n } from '@uppy/core/utils' +import type { I18n } from '../utils/index.js' import { useSearchForm } from './useSearchForm.js' interface FilterInputProps { diff --git a/packages/@uppy/provider-views/src/FooterActions.tsx b/packages/@uppy/core/src/provider-views/FooterActions.tsx similarity index 94% rename from packages/@uppy/provider-views/src/FooterActions.tsx rename to packages/@uppy/core/src/provider-views/FooterActions.tsx index 946fe49cc..a5ffa3db8 100644 --- a/packages/@uppy/provider-views/src/FooterActions.tsx +++ b/packages/@uppy/core/src/provider-views/FooterActions.tsx @@ -1,7 +1,7 @@ -import type { Body, Meta, PartialTree } from '@uppy/core' -import type { I18n } from '@uppy/core/utils' import classNames from 'classnames' import { useMemo } from 'preact/hooks' +import type { Body, Meta, PartialTree } from '../index.js' +import type { I18n } from '../utils/index.js' import type ProviderView from './ProviderView/ProviderView.js' import getNumberOfSelectedFiles from './utils/PartialTreeUtils/getNumberOfSelectedFiles.js' diff --git a/packages/@uppy/provider-views/src/GooglePicker/GooglePickerView.tsx b/packages/@uppy/core/src/provider-views/GooglePicker/GooglePickerView.tsx similarity index 98% rename from packages/@uppy/provider-views/src/GooglePicker/GooglePickerView.tsx rename to packages/@uppy/core/src/provider-views/GooglePicker/GooglePickerView.tsx index bf9ddb2e7..371bcbddc 100644 --- a/packages/@uppy/provider-views/src/GooglePicker/GooglePickerView.tsx +++ b/packages/@uppy/core/src/provider-views/GooglePicker/GooglePickerView.tsx @@ -1,6 +1,6 @@ -import type { AsyncStore, Uppy } from '@uppy/core' -import type { I18n } from '@uppy/core/utils' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' +import type { AsyncStore, Uppy } from '../../index.js' +import type { I18n } from '../../utils/index.js' import AuthView from '../ProviderView/AuthView.js' import { authorize, diff --git a/packages/@uppy/provider-views/src/GooglePicker/googlePicker.ts b/packages/@uppy/core/src/provider-views/GooglePicker/googlePicker.ts similarity index 100% rename from packages/@uppy/provider-views/src/GooglePicker/googlePicker.ts rename to packages/@uppy/core/src/provider-views/GooglePicker/googlePicker.ts diff --git a/packages/@uppy/provider-views/src/GooglePicker/icons.tsx b/packages/@uppy/core/src/provider-views/GooglePicker/icons.tsx similarity index 100% rename from packages/@uppy/provider-views/src/GooglePicker/icons.tsx rename to packages/@uppy/core/src/provider-views/GooglePicker/icons.tsx diff --git a/packages/@uppy/provider-views/src/Item/components/GridItem.tsx b/packages/@uppy/core/src/provider-views/Item/components/GridItem.tsx similarity index 94% rename from packages/@uppy/provider-views/src/Item/components/GridItem.tsx rename to packages/@uppy/core/src/provider-views/Item/components/GridItem.tsx index e7c19601b..55ad44c46 100644 --- a/packages/@uppy/provider-views/src/Item/components/GridItem.tsx +++ b/packages/@uppy/core/src/provider-views/Item/components/GridItem.tsx @@ -1,5 +1,5 @@ -import type { PartialTreeFile, PartialTreeFolderNode } from '@uppy/core' import type { h } from 'preact' +import type { PartialTreeFile, PartialTreeFolderNode } from '../../../index.js' import ItemIcon from './ItemIcon.js' type GridItemProps = { diff --git a/packages/@uppy/provider-views/src/Item/components/ItemIcon.tsx b/packages/@uppy/core/src/provider-views/Item/components/ItemIcon.tsx similarity index 100% rename from packages/@uppy/provider-views/src/Item/components/ItemIcon.tsx rename to packages/@uppy/core/src/provider-views/Item/components/ItemIcon.tsx diff --git a/packages/@uppy/provider-views/src/Item/components/ListItem.tsx b/packages/@uppy/core/src/provider-views/Item/components/ListItem.tsx similarity index 98% rename from packages/@uppy/provider-views/src/Item/components/ListItem.tsx rename to packages/@uppy/core/src/provider-views/Item/components/ListItem.tsx index 4522644f2..4b2e78240 100644 --- a/packages/@uppy/provider-views/src/Item/components/ListItem.tsx +++ b/packages/@uppy/core/src/provider-views/Item/components/ListItem.tsx @@ -1,9 +1,9 @@ +import type { h } from 'preact' import type { PartialTreeFile, PartialTreeFolderNode, PartialTreeId, -} from '@uppy/core' -import type { h } from 'preact' +} from '../../../index.js' import ItemIcon from './ItemIcon.js' // if folder: diff --git a/packages/@uppy/provider-views/src/Item/components/SearchResultItem.tsx b/packages/@uppy/core/src/provider-views/Item/components/SearchResultItem.tsx similarity index 93% rename from packages/@uppy/provider-views/src/Item/components/SearchResultItem.tsx rename to packages/@uppy/core/src/provider-views/Item/components/SearchResultItem.tsx index abebd2370..2dff933cb 100644 --- a/packages/@uppy/provider-views/src/Item/components/SearchResultItem.tsx +++ b/packages/@uppy/core/src/provider-views/Item/components/SearchResultItem.tsx @@ -1,6 +1,6 @@ -import type { PartialTreeFile, PartialTreeFolderNode } from '@uppy/core' -import type { I18n } from '@uppy/core/utils' import classNames from 'classnames' +import type { PartialTreeFile, PartialTreeFolderNode } from '../../../index.js' +import type { I18n } from '../../../utils/index.js' 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/core/src/provider-views/Item/index.tsx similarity index 96% rename from packages/@uppy/provider-views/src/Item/index.tsx rename to packages/@uppy/core/src/provider-views/Item/index.tsx index 171fbd699..2f43a38ca 100644 --- a/packages/@uppy/provider-views/src/Item/index.tsx +++ b/packages/@uppy/core/src/provider-views/Item/index.tsx @@ -1,11 +1,11 @@ +import classNames from 'classnames' +import type { h } from 'preact' import type { PartialTreeFile, PartialTreeFolderNode, PartialTreeId, -} from '@uppy/core' -import type { I18n } from '@uppy/core/utils' -import classNames from 'classnames' -import type { h } from 'preact' +} from '../../index.js' +import type { I18n } from '../../utils/index.js' import GridItem from './components/GridItem.js' import ListItem from './components/ListItem.js' diff --git a/packages/@uppy/provider-views/src/ProviderView/AuthView.tsx b/packages/@uppy/core/src/provider-views/ProviderView/AuthView.tsx similarity index 97% rename from packages/@uppy/provider-views/src/ProviderView/AuthView.tsx rename to packages/@uppy/core/src/provider-views/ProviderView/AuthView.tsx index c76be47ad..8fe835979 100644 --- a/packages/@uppy/provider-views/src/ProviderView/AuthView.tsx +++ b/packages/@uppy/core/src/provider-views/ProviderView/AuthView.tsx @@ -1,7 +1,7 @@ -import type { Body, Meta } from '@uppy/core' -import type { I18n } from '@uppy/core/utils' import type { h } from 'preact' import { useCallback } from 'preact/hooks' +import type { Body, Meta } from '../../index.js' +import type { I18n } from '../../utils/index.js' import type ProviderViews from './ProviderView.js' import type { Opts } from './ProviderView.js' diff --git a/packages/@uppy/provider-views/src/ProviderView/GlobalSearchView.tsx b/packages/@uppy/core/src/provider-views/ProviderView/GlobalSearchView.tsx similarity index 88% rename from packages/@uppy/provider-views/src/ProviderView/GlobalSearchView.tsx rename to packages/@uppy/core/src/provider-views/ProviderView/GlobalSearchView.tsx index a5b046589..0c040840a 100644 --- a/packages/@uppy/provider-views/src/ProviderView/GlobalSearchView.tsx +++ b/packages/@uppy/core/src/provider-views/ProviderView/GlobalSearchView.tsx @@ -1,5 +1,5 @@ -import type { PartialTreeFile, PartialTreeFolderNode } from '@uppy/core' -import type { I18n } from '@uppy/core/utils' +import type { PartialTreeFile, PartialTreeFolderNode } from '../../index.js' +import type { I18n } from '../../utils/index.js' 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/core/src/provider-views/ProviderView/Header.tsx similarity index 91% rename from packages/@uppy/provider-views/src/ProviderView/Header.tsx rename to packages/@uppy/core/src/provider-views/ProviderView/Header.tsx index 51a929e42..22e7a210b 100644 --- a/packages/@uppy/provider-views/src/ProviderView/Header.tsx +++ b/packages/@uppy/core/src/provider-views/ProviderView/Header.tsx @@ -1,7 +1,7 @@ -import type { Body, Meta, PartialTreeFolder } from '@uppy/core' -import type { I18n } from '@uppy/core/utils' import classNames from 'classnames' import type { h } from 'preact' +import type { Body, Meta, PartialTreeFolder } from '../../index.js' +import type { I18n } from '../../utils/index.js' import Breadcrumbs from '../Breadcrumbs.js' import type ProviderView from './ProviderView.js' import User from './User.js' diff --git a/packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx b/packages/@uppy/core/src/provider-views/ProviderView/ProviderView.tsx similarity index 99% rename from packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx rename to packages/@uppy/core/src/provider-views/ProviderView/ProviderView.tsx index 59b4422d9..ece73bf93 100644 --- a/packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx +++ b/packages/@uppy/core/src/provider-views/ProviderView/ProviderView.tsx @@ -1,3 +1,7 @@ +import classNames from 'classnames' +import debounce from 'lodash/debounce.js' +import type { h } from 'preact' +import packageJson from '../../../package.json' with { type: 'json' } import type { Body, Meta, @@ -9,13 +13,9 @@ import type { UnknownProviderPlugin, UnknownProviderPluginState, ValidateableFile, -} from '@uppy/core' -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' -import packageJson from '../../package.json' with { type: 'json' } +} from '../../index.js' +import type { CompanionFile, I18n } from '../../utils/index.js' +import { remoteFileObjToLocal } from '../../utils/index.js' import Browser from '../Browser.js' import FilterInput from '../FilterInput.js' import FooterActions from '../FooterActions.js' diff --git a/packages/@uppy/provider-views/src/ProviderView/User.tsx b/packages/@uppy/core/src/provider-views/ProviderView/User.tsx similarity index 100% rename from packages/@uppy/provider-views/src/ProviderView/User.tsx rename to packages/@uppy/core/src/provider-views/ProviderView/User.tsx diff --git a/packages/@uppy/provider-views/src/ProviderView/index.ts b/packages/@uppy/core/src/provider-views/ProviderView/index.ts similarity index 100% rename from packages/@uppy/provider-views/src/ProviderView/index.ts rename to packages/@uppy/core/src/provider-views/ProviderView/index.ts diff --git a/packages/@uppy/provider-views/src/SearchProviderView/SearchProviderView.tsx b/packages/@uppy/core/src/provider-views/SearchProviderView/SearchProviderView.tsx similarity index 97% rename from packages/@uppy/provider-views/src/SearchProviderView/SearchProviderView.tsx rename to packages/@uppy/core/src/provider-views/SearchProviderView/SearchProviderView.tsx index 7ddaf127e..6d58a7405 100644 --- a/packages/@uppy/provider-views/src/SearchProviderView/SearchProviderView.tsx +++ b/packages/@uppy/core/src/provider-views/SearchProviderView/SearchProviderView.tsx @@ -1,3 +1,6 @@ +import classNames from 'classnames' +import type { h } from 'preact' +import packageJson from '../../../package.json' with { type: 'json' } import type { Body, DefinePluginOpts, @@ -9,12 +12,9 @@ import type { UnknownSearchProviderPlugin, UnknownSearchProviderPluginState, ValidateableFile, -} from '@uppy/core' -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' } +} from '../../index.js' +import type { CompanionFile } from '../../utils/index.js' +import { remoteFileObjToLocal } from '../../utils/index.js' import Browser from '../Browser.js' import FilterInput from '../FilterInput.js' import FooterActions from '../FooterActions.js' diff --git a/packages/@uppy/provider-views/src/SearchProviderView/index.ts b/packages/@uppy/core/src/provider-views/SearchProviderView/index.ts similarity index 100% rename from packages/@uppy/provider-views/src/SearchProviderView/index.ts rename to packages/@uppy/core/src/provider-views/SearchProviderView/index.ts diff --git a/packages/@uppy/provider-views/src/SearchView.tsx b/packages/@uppy/core/src/provider-views/SearchView.tsx similarity index 100% rename from packages/@uppy/provider-views/src/SearchView.tsx rename to packages/@uppy/core/src/provider-views/SearchView.tsx diff --git a/packages/@uppy/provider-views/src/index.ts b/packages/@uppy/core/src/provider-views/index.ts similarity index 100% rename from packages/@uppy/provider-views/src/index.ts rename to packages/@uppy/core/src/provider-views/index.ts diff --git a/packages/@uppy/provider-views/src/style.scss b/packages/@uppy/core/src/provider-views/style.scss similarity index 100% rename from packages/@uppy/provider-views/src/style.scss rename to packages/@uppy/core/src/provider-views/style.scss diff --git a/packages/@uppy/provider-views/src/style/uppy-ProviderBrowser-viewType--grid.scss b/packages/@uppy/core/src/provider-views/style/uppy-ProviderBrowser-viewType--grid.scss similarity index 100% rename from packages/@uppy/provider-views/src/style/uppy-ProviderBrowser-viewType--grid.scss rename to packages/@uppy/core/src/provider-views/style/uppy-ProviderBrowser-viewType--grid.scss diff --git a/packages/@uppy/provider-views/src/style/uppy-ProviderBrowser-viewType--list.scss b/packages/@uppy/core/src/provider-views/style/uppy-ProviderBrowser-viewType--list.scss similarity index 100% rename from packages/@uppy/provider-views/src/style/uppy-ProviderBrowser-viewType--list.scss rename to packages/@uppy/core/src/provider-views/style/uppy-ProviderBrowser-viewType--list.scss diff --git a/packages/@uppy/provider-views/src/style/uppy-ProviderBrowserItem-checkbox.scss b/packages/@uppy/core/src/provider-views/style/uppy-ProviderBrowserItem-checkbox.scss similarity index 100% rename from packages/@uppy/provider-views/src/style/uppy-ProviderBrowserItem-checkbox.scss rename to packages/@uppy/core/src/provider-views/style/uppy-ProviderBrowserItem-checkbox.scss diff --git a/packages/@uppy/provider-views/src/style/uppy-SearchProvider-input.scss b/packages/@uppy/core/src/provider-views/style/uppy-SearchProvider-input.scss similarity index 100% rename from packages/@uppy/provider-views/src/style/uppy-SearchProvider-input.scss rename to packages/@uppy/core/src/provider-views/style/uppy-SearchProvider-input.scss diff --git a/packages/@uppy/provider-views/src/useSearchForm.ts b/packages/@uppy/core/src/provider-views/useSearchForm.ts similarity index 100% rename from packages/@uppy/provider-views/src/useSearchForm.ts rename to packages/@uppy/core/src/provider-views/useSearchForm.ts diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterFill.ts b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/afterFill.ts similarity index 97% rename from packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterFill.ts rename to packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/afterFill.ts index 31616b9c2..c89dda661 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterFill.ts +++ b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/afterFill.ts @@ -1,13 +1,13 @@ +// 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' import type { PartialTree, PartialTreeFile, PartialTreeFolderNode, PartialTreeId, -} from '@uppy/core' -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' +} from '../../../index.js' +import type { CompanionFile } from '../../../utils/index.js' import shallowClone from './shallowClone.js' export type ApiList = (directory: PartialTreeId) => Promise<{ diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterOpenFolder.ts b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/afterOpenFolder.ts similarity index 96% rename from packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterOpenFolder.ts rename to packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/afterOpenFolder.ts index 7479857eb..678a86128 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterOpenFolder.ts +++ b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/afterOpenFolder.ts @@ -3,8 +3,8 @@ import type { PartialTreeFile, PartialTreeFolder, PartialTreeFolderNode, -} from '@uppy/core' -import type { CompanionFile } from '@uppy/core/utils' +} from '../../../index.js' +import type { CompanionFile } from '../../../utils/index.js' const afterOpenFolder = ( oldPartialTree: PartialTree, diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterScrollFolder.ts b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/afterScrollFolder.ts similarity index 95% rename from packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterScrollFolder.ts rename to packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/afterScrollFolder.ts index bc0015dbb..bb121c76f 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterScrollFolder.ts +++ b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/afterScrollFolder.ts @@ -4,8 +4,8 @@ import type { PartialTreeFolder, PartialTreeFolderNode, PartialTreeId, -} from '@uppy/core' -import type { CompanionFile } from '@uppy/core/utils' +} from '../../../index.js' +import type { CompanionFile } from '../../../utils/index.js' const afterScrollFolder = ( oldPartialTree: PartialTree, diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterToggleCheckbox.ts b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/afterToggleCheckbox.ts similarity index 99% rename from packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterToggleCheckbox.ts rename to packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/afterToggleCheckbox.ts index 484c3f45a..9b807a44e 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/afterToggleCheckbox.ts +++ b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/afterToggleCheckbox.ts @@ -4,7 +4,7 @@ import type { PartialTreeFolder, PartialTreeFolderNode, PartialTreeId, -} from '@uppy/core' +} from '../../../index.js' import shallowClone from './shallowClone.js' /* diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/getBreadcrumbs.ts b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/getBreadcrumbs.ts similarity index 96% rename from packages/@uppy/provider-views/src/utils/PartialTreeUtils/getBreadcrumbs.ts rename to packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/getBreadcrumbs.ts index b98d2064c..cd7b9315e 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/getBreadcrumbs.ts +++ b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/getBreadcrumbs.ts @@ -3,7 +3,7 @@ import type { PartialTreeFolder, PartialTreeFolderNode, PartialTreeId, -} from '@uppy/core' +} from '../../../index.js' const getBreadcrumbs = ( partialTree: PartialTree, diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/getCheckedFilesWithPaths.ts b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/getCheckedFilesWithPaths.ts similarity index 96% rename from packages/@uppy/provider-views/src/utils/PartialTreeUtils/getCheckedFilesWithPaths.ts rename to packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/getCheckedFilesWithPaths.ts index 7af16eba5..23959e12c 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/getCheckedFilesWithPaths.ts +++ b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/getCheckedFilesWithPaths.ts @@ -3,8 +3,8 @@ import type { PartialTreeFile, PartialTreeFolderNode, PartialTreeId, -} from '@uppy/core' -import type { CompanionFile } from '@uppy/core/utils' +} from '../../../index.js' +import type { CompanionFile } from '../../../utils/index.js' export interface Cache { [key: string]: (PartialTreeFile | PartialTreeFolderNode)[] diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/getNumberOfSelectedFiles.ts b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/getNumberOfSelectedFiles.ts similarity index 93% rename from packages/@uppy/provider-views/src/utils/PartialTreeUtils/getNumberOfSelectedFiles.ts rename to packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/getNumberOfSelectedFiles.ts index 1c6643509..232378d36 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/getNumberOfSelectedFiles.ts +++ b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/getNumberOfSelectedFiles.ts @@ -1,4 +1,4 @@ -import type { PartialTree } from '@uppy/core' +import type { PartialTree } from '../../../index.js' /** * We're interested in all 'checked' leaves of this tree, diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.test.ts b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/index.test.ts similarity index 99% rename from packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.test.ts rename to packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/index.test.ts index aa6d8b60f..3ad272d9b 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.test.ts +++ b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/index.test.ts @@ -1,12 +1,12 @@ +import { describe, expect, it, vi } from 'vitest' import type { PartialTree, PartialTreeFile, PartialTreeFolderNode, PartialTreeFolderRoot, PartialTreeId, -} from '@uppy/core' -import type { CompanionFile } from '@uppy/core/utils' -import { describe, expect, it, vi } from 'vitest' +} from '../../../index.js' +import type { CompanionFile } from '../../../utils/index.js' import afterFill from './afterFill.js' import afterOpenFolder from './afterOpenFolder.js' import afterScrollFolder from './afterScrollFolder.js' diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.ts b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/index.ts similarity index 100% rename from packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.ts rename to packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/index.ts diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/shallowClone.ts b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/shallowClone.ts similarity index 86% rename from packages/@uppy/provider-views/src/utils/PartialTreeUtils/shallowClone.ts rename to packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/shallowClone.ts index a68cdbf3c..4fb8a4eed 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/shallowClone.ts +++ b/packages/@uppy/core/src/provider-views/utils/PartialTreeUtils/shallowClone.ts @@ -1,4 +1,4 @@ -import type { PartialTree } from '@uppy/core' +import type { PartialTree } from '../../../index.js' /** * One-level copying is sufficient as mutations within our `partialTree` are limited to properties diff --git a/packages/@uppy/provider-views/src/utils/addFiles.ts b/packages/@uppy/core/src/provider-views/utils/addFiles.ts similarity index 89% rename from packages/@uppy/provider-views/src/utils/addFiles.ts rename to packages/@uppy/core/src/provider-views/utils/addFiles.ts index 47848da4d..31cee9d98 100644 --- a/packages/@uppy/provider-views/src/utils/addFiles.ts +++ b/packages/@uppy/core/src/provider-views/utils/addFiles.ts @@ -1,4 +1,4 @@ -import type { UnknownPlugin } from '@uppy/core' +import type { UnknownPlugin } from '../../index.js' import type { Body, CompanionClientProvider, @@ -6,8 +6,8 @@ import type { CompanionFile, Meta, UppyFileNonGhost, -} from '@uppy/core/utils' -import { getSafeFileId } from '@uppy/core/utils' +} from '../../utils/index.js' +import { getSafeFileId } from '../../utils/index.js' import companionFileToUppyFile from './companionFileToUppyFile.js' const addFiles = ( diff --git a/packages/@uppy/provider-views/src/utils/companionFileToUppyFile.ts b/packages/@uppy/core/src/provider-views/utils/companionFileToUppyFile.ts similarity index 94% rename from packages/@uppy/provider-views/src/utils/companionFileToUppyFile.ts rename to packages/@uppy/core/src/provider-views/utils/companionFileToUppyFile.ts index c3e63e9d3..dee607c40 100644 --- a/packages/@uppy/provider-views/src/utils/companionFileToUppyFile.ts +++ b/packages/@uppy/core/src/provider-views/utils/companionFileToUppyFile.ts @@ -1,4 +1,4 @@ -import type { UnknownPlugin } from '@uppy/core' +import type { UnknownPlugin } from '../../index.js' import type { Body, CompanionClientProvider, @@ -6,7 +6,7 @@ import type { CompanionFile, Meta, RemoteUppyFile, -} from '@uppy/core/utils' +} from '../../utils/index.js' const companionFileToUppyFile = ( file: CompanionFile, diff --git a/packages/@uppy/provider-views/src/utils/getClickedRange.ts b/packages/@uppy/core/src/provider-views/utils/getClickedRange.ts similarity index 91% rename from packages/@uppy/provider-views/src/utils/getClickedRange.ts rename to packages/@uppy/core/src/provider-views/utils/getClickedRange.ts index e9549218d..c58e98681 100644 --- a/packages/@uppy/provider-views/src/utils/getClickedRange.ts +++ b/packages/@uppy/core/src/provider-views/utils/getClickedRange.ts @@ -1,4 +1,4 @@ -import type { PartialTreeFile, PartialTreeFolderNode } from '@uppy/core' +import type { PartialTreeFile, PartialTreeFolderNode } from '../../index.js' // Shift-clicking selects a single consecutive list of items // starting at the previous click. diff --git a/packages/@uppy/provider-views/src/utils/handleError.ts b/packages/@uppy/core/src/provider-views/utils/handleError.ts similarity index 94% rename from packages/@uppy/provider-views/src/utils/handleError.ts rename to packages/@uppy/core/src/provider-views/utils/handleError.ts index 64cf08ae1..06aea875f 100644 --- a/packages/@uppy/provider-views/src/utils/handleError.ts +++ b/packages/@uppy/core/src/provider-views/utils/handleError.ts @@ -1,4 +1,4 @@ -import type Uppy from '@uppy/core' +import type Uppy from '../../index.js' const handleError = (uppy: Uppy) => diff --git a/packages/@uppy/provider-views/src/utils/shouldHandleScroll.ts b/packages/@uppy/core/src/provider-views/utils/shouldHandleScroll.ts similarity index 100% rename from packages/@uppy/provider-views/src/utils/shouldHandleScroll.ts rename to packages/@uppy/core/src/provider-views/utils/shouldHandleScroll.ts diff --git a/packages/@uppy/core/tsconfig.build.json b/packages/@uppy/core/tsconfig.build.json index d49e86d5f..e249c49cb 100644 --- a/packages/@uppy/core/tsconfig.build.json +++ b/packages/@uppy/core/tsconfig.build.json @@ -2,7 +2,8 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "rootDir": "./src" + "rootDir": "./src", + "types": ["preact", "google.accounts", "google.picker", "gapi"] }, "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], diff --git a/packages/@uppy/core/tsconfig.json b/packages/@uppy/core/tsconfig.json index 4fc6da5a4..ce0f03b4c 100644 --- a/packages/@uppy/core/tsconfig.json +++ b/packages/@uppy/core/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "types": ["preact", "node"] + "types": ["preact", "node", "google.accounts", "google.picker", "gapi"] }, "include": ["./package.json", "./src/**/*.*"], "references": [] diff --git a/packages/@uppy/dashboard/package.json b/packages/@uppy/dashboard/package.json index 0cc2b8ead..30cec88a8 100644 --- a/packages/@uppy/dashboard/package.json +++ b/packages/@uppy/dashboard/package.json @@ -45,7 +45,6 @@ }, "dependencies": { "@transloadit/prettier-bytes": "^1.1.0", - "@uppy/provider-views": "workspace:^", "@uppy/thumbnail-generator": "workspace:^", "classnames": "^2.5.1", "lodash": "^4.18.1", diff --git a/packages/@uppy/dashboard/src/Dashboard.tsx b/packages/@uppy/dashboard/src/Dashboard.tsx index 5c05efd8f..8d5f329b5 100644 --- a/packages/@uppy/dashboard/src/Dashboard.tsx +++ b/packages/@uppy/dashboard/src/Dashboard.tsx @@ -10,9 +10,9 @@ import type { UppyFile, } from '@uppy/core' import { UIPlugin } from '@uppy/core' +import { defaultPickerIcon } from '@uppy/core/provider-views' 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 { nanoid } from 'nanoid/non-secure' import type { ComponentChild, h, VNode } from 'preact' diff --git a/packages/@uppy/dashboard/src/GlobalSearch.browser.test.ts b/packages/@uppy/dashboard/src/GlobalSearch.browser.test.ts index 5222ee753..449d4d239 100644 --- a/packages/@uppy/dashboard/src/GlobalSearch.browser.test.ts +++ b/packages/@uppy/dashboard/src/GlobalSearch.browser.test.ts @@ -1,8 +1,8 @@ import Uppy from '@uppy/core' +import { ProviderViews } from '@uppy/core/provider-views' import Dashboard from '@uppy/dashboard' import Dropbox from '@uppy/dropbox' import GoogleDrive from '@uppy/google-drive' -import { ProviderViews } from '@uppy/provider-views' import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest' import { page, userEvent } from 'vitest/browser' import { worker } from './setup.js' diff --git a/packages/@uppy/dashboard/src/style.scss b/packages/@uppy/dashboard/src/style.scss index f5283a0f5..75073d8f4 100644 --- a/packages/@uppy/dashboard/src/style.scss +++ b/packages/@uppy/dashboard/src/style.scss @@ -2,7 +2,7 @@ @use "sass:color"; @use '@uppy/core/src/_utils.scss'; @use '@uppy/core/src/_variables.scss'; -@use '@uppy/provider-views/src/style.scss' as style3; +@use '@uppy/core/src/provider-views/style.scss' as style3; // Component-specific css imports @use 'components/FileItem/index.scss'; diff --git a/packages/@uppy/dashboard/tsconfig.build.json b/packages/@uppy/dashboard/tsconfig.build.json index 6f43fe776..f79f379c3 100644 --- a/packages/@uppy/dashboard/tsconfig.build.json +++ b/packages/@uppy/dashboard/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../thumbnail-generator/tsconfig.build.json" }, diff --git a/packages/@uppy/dashboard/tsconfig.json b/packages/@uppy/dashboard/tsconfig.json index 2fd6b4df9..5164c6582 100644 --- a/packages/@uppy/dashboard/tsconfig.json +++ b/packages/@uppy/dashboard/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../thumbnail-generator/tsconfig.build.json" }, diff --git a/packages/@uppy/dropbox/package.json b/packages/@uppy/dropbox/package.json index 467be902d..9654dd977 100644 --- a/packages/@uppy/dropbox/package.json +++ b/packages/@uppy/dropbox/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/dropbox/src/Dropbox.tsx b/packages/@uppy/dropbox/src/Dropbox.tsx index bd834226a..af4c5e68d 100644 --- a/packages/@uppy/dropbox/src/Dropbox.tsx +++ b/packages/@uppy/dropbox/src/Dropbox.tsx @@ -13,8 +13,8 @@ import { Provider, tokenStorage, } from '@uppy/core/companion-client' +import { ProviderViews } from '@uppy/core/provider-views' import type { LocaleStrings } from '@uppy/core/utils' -import { ProviderViews } from '@uppy/provider-views' // 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 73521b1c6..ac99ccdd7 100644 --- a/packages/@uppy/dropbox/tsconfig.build.json +++ b/packages/@uppy/dropbox/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/dropbox/tsconfig.json b/packages/@uppy/dropbox/tsconfig.json index 1b6915eca..edd6c80fb 100644 --- a/packages/@uppy/dropbox/tsconfig.json +++ b/packages/@uppy/dropbox/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/facebook/package.json b/packages/@uppy/facebook/package.json index f95b6b187..2e043db43 100644 --- a/packages/@uppy/facebook/package.json +++ b/packages/@uppy/facebook/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/facebook/src/Facebook.tsx b/packages/@uppy/facebook/src/Facebook.tsx index 852602ca3..366a56de1 100644 --- a/packages/@uppy/facebook/src/Facebook.tsx +++ b/packages/@uppy/facebook/src/Facebook.tsx @@ -13,8 +13,8 @@ import { Provider, tokenStorage, } from '@uppy/core/companion-client' +import { ProviderViews } from '@uppy/core/provider-views' import type { LocaleStrings } from '@uppy/core/utils' -import { ProviderViews } from '@uppy/provider-views' // 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 73521b1c6..ac99ccdd7 100644 --- a/packages/@uppy/facebook/tsconfig.build.json +++ b/packages/@uppy/facebook/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/facebook/tsconfig.json b/packages/@uppy/facebook/tsconfig.json index 1b6915eca..edd6c80fb 100644 --- a/packages/@uppy/facebook/tsconfig.json +++ b/packages/@uppy/facebook/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../provider-views/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 d81ea8a13..1eac073ad 100644 --- a/packages/@uppy/google-drive-picker/package.json +++ b/packages/@uppy/google-drive-picker/package.json @@ -36,7 +36,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/provider-views": "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 2737512fd..056b5edfa 100644 --- a/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx +++ b/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx @@ -5,12 +5,12 @@ import { RequestClient, tokenStorage, } from '@uppy/core/companion-client' -import type { LocaleStrings } from '@uppy/core/utils' import { GoogleDriveIcon, GooglePickerView, type PickedItem, -} from '@uppy/provider-views' +} from '@uppy/core/provider-views' +import type { LocaleStrings } from '@uppy/core/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 a36abc05e..0a39b1547 100644 --- a/packages/@uppy/google-drive-picker/tsconfig.build.json +++ b/packages/@uppy/google-drive-picker/tsconfig.build.json @@ -9,9 +9,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../provider-views/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 1b6915eca..edd6c80fb 100644 --- a/packages/@uppy/google-drive-picker/tsconfig.json +++ b/packages/@uppy/google-drive-picker/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../provider-views/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 796518672..8b6d8b120 100644 --- a/packages/@uppy/google-drive/package.json +++ b/packages/@uppy/google-drive/package.json @@ -35,7 +35,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/google-drive/src/DriveProviderViews.ts b/packages/@uppy/google-drive/src/DriveProviderViews.ts index 2d0e66411..2d28246eb 100644 --- a/packages/@uppy/google-drive/src/DriveProviderViews.ts +++ b/packages/@uppy/google-drive/src/DriveProviderViews.ts @@ -4,7 +4,7 @@ import type { PartialTreeFile, PartialTreeFolderNode, } from '@uppy/core' -import { ProviderViews } from '@uppy/provider-views' +import { ProviderViews } from '@uppy/core/provider-views' export default class DriveProviderViews< M extends Meta, diff --git a/packages/@uppy/google-drive/src/GoogleDrive.tsx b/packages/@uppy/google-drive/src/GoogleDrive.tsx index 9f93a5b11..ef85103c6 100644 --- a/packages/@uppy/google-drive/src/GoogleDrive.tsx +++ b/packages/@uppy/google-drive/src/GoogleDrive.tsx @@ -13,8 +13,8 @@ import { Provider, tokenStorage, } from '@uppy/core/companion-client' +import type { ProviderViews } from '@uppy/core/provider-views' import type { LocaleStrings } from '@uppy/core/utils' -import type { ProviderViews } from '@uppy/provider-views' // 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 73521b1c6..ac99ccdd7 100644 --- a/packages/@uppy/google-drive/tsconfig.build.json +++ b/packages/@uppy/google-drive/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../provider-views/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 1b6915eca..edd6c80fb 100644 --- a/packages/@uppy/google-drive/tsconfig.json +++ b/packages/@uppy/google-drive/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../provider-views/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 edf79bbb8..83f13d88e 100644 --- a/packages/@uppy/google-photos-picker/package.json +++ b/packages/@uppy/google-photos-picker/package.json @@ -36,7 +36,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/provider-views": "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 250d11f24..c2f95a9b1 100644 --- a/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx +++ b/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx @@ -5,12 +5,12 @@ import { RequestClient, tokenStorage, } from '@uppy/core/companion-client' -import type { LocaleStrings } from '@uppy/core/utils' import { GooglePhotosIcon, GooglePickerView, type PickedItem, -} from '@uppy/provider-views' +} from '@uppy/core/provider-views' +import type { LocaleStrings } from '@uppy/core/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 a36abc05e..0a39b1547 100644 --- a/packages/@uppy/google-photos-picker/tsconfig.build.json +++ b/packages/@uppy/google-photos-picker/tsconfig.build.json @@ -9,9 +9,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../provider-views/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 1b6915eca..edd6c80fb 100644 --- a/packages/@uppy/google-photos-picker/tsconfig.json +++ b/packages/@uppy/google-photos-picker/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../provider-views/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 ee26009d5..73eec15df 100644 --- a/packages/@uppy/image-generator/package.json +++ b/packages/@uppy/image-generator/package.json @@ -39,7 +39,6 @@ "typecheck": "tsc --build" }, "dependencies": { - "@uppy/provider-views": "workspace:^", "@uppy/transloadit": "workspace:^", "preact": "^10.29.2" }, diff --git a/packages/@uppy/image-generator/src/index.tsx b/packages/@uppy/image-generator/src/index.tsx index 3e9d5e99d..4d1bdd09a 100644 --- a/packages/@uppy/image-generator/src/index.tsx +++ b/packages/@uppy/image-generator/src/index.tsx @@ -1,7 +1,7 @@ import type { Body, Meta, MinimalRequiredUppyFile, Uppy } from '@uppy/core' import { UIPlugin, type UIPluginOptions } from '@uppy/core' +import { FilterInput, SearchView } from '@uppy/core/provider-views' import { RateLimitedQueue } from '@uppy/core/utils' -import { FilterInput, SearchView } from '@uppy/provider-views' import { Assembly, type AssemblyResult, diff --git a/packages/@uppy/image-generator/tsconfig.json b/packages/@uppy/image-generator/tsconfig.json index e264a78c7..cf118785e 100644 --- a/packages/@uppy/image-generator/tsconfig.json +++ b/packages/@uppy/image-generator/tsconfig.json @@ -9,9 +9,6 @@ { "path": "../core/tsconfig.build.json" }, - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../transloadit/tsconfig.build.json" } diff --git a/packages/@uppy/onedrive/package.json b/packages/@uppy/onedrive/package.json index d350514d0..7ff428b18 100644 --- a/packages/@uppy/onedrive/package.json +++ b/packages/@uppy/onedrive/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/onedrive/src/OneDrive.tsx b/packages/@uppy/onedrive/src/OneDrive.tsx index 219b5042a..d3a67bf24 100644 --- a/packages/@uppy/onedrive/src/OneDrive.tsx +++ b/packages/@uppy/onedrive/src/OneDrive.tsx @@ -13,8 +13,8 @@ import { Provider, tokenStorage, } from '@uppy/core/companion-client' +import { ProviderViews } from '@uppy/core/provider-views' import type { LocaleStrings } from '@uppy/core/utils' -import { ProviderViews } from '@uppy/provider-views' // 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 73521b1c6..ac99ccdd7 100644 --- a/packages/@uppy/onedrive/tsconfig.build.json +++ b/packages/@uppy/onedrive/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/onedrive/tsconfig.json b/packages/@uppy/onedrive/tsconfig.json index 1b6915eca..edd6c80fb 100644 --- a/packages/@uppy/onedrive/tsconfig.json +++ b/packages/@uppy/onedrive/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/provider-views/.npmignore b/packages/@uppy/provider-views/.npmignore deleted file mode 100644 index 6c816673f..000000000 --- a/packages/@uppy/provider-views/.npmignore +++ /dev/null @@ -1 +0,0 @@ -tsconfig.* diff --git a/packages/@uppy/provider-views/CHANGELOG.md b/packages/@uppy/provider-views/CHANGELOG.md deleted file mode 100644 index 57f7b4cf3..000000000 --- a/packages/@uppy/provider-views/CHANGELOG.md +++ /dev/null @@ -1,437 +0,0 @@ -# @uppy/provider-views - -## 5.2.2 - -### Patch Changes - -- 50e2420: Improve Google Drive Picker folder picking: Resolve also folders inside shared drives (but not symlinks to folders) -- Updated dependencies [648f245] - - @uppy/utils@7.1.5 - -## 5.2.1 - -### Patch Changes - -- 5684efa: Refactor internal components - -## 5.2.0 - -### Minor Changes - -- e661348: Allow selecting folders with Google Drive Picker. They will be recursively resolved. -- 79e6460: - Add PluginTypeRegistry and typed getPlugin overload in @uppy/core - - Register plugin ids across packages so uppy.getPlugin('Dashboard' | 'Webcam') returns the concrete plugin type and removes the need to pass generics in getPlugin() - -### Patch Changes - -- 4817585: added icon to webdav provider, add css to truncate large file names -- Updated dependencies [79e6460] -- Updated dependencies [ac12f35] -- Updated dependencies [4817585] - - @uppy/core@5.2.0 - - @uppy/utils@7.1.4 - -## 5.1.2 - -### Patch Changes - -- 46e339a: Add missing lodash dependency - -## 5.1.1 - -### Patch Changes - -- 0c16fe4: - Rename `getTagFile` to `companionFileToUppyFile` -- Updated dependencies [0c16fe4] - - @uppy/core@5.1.1 - - @uppy/utils@7.1.1 - -## 5.1.0 - -### Minor Changes - -- 5ba2c1c: Introduce the concept of server-side search and add support for it for the Dropbox provider. Previously, only client-side filtering in the currently viewed folder was possible, which was limiting. Now users using Companion with Dropbox can perform a search across their entire account. - -### Patch Changes - -- Updated dependencies [5ba2c1c] - - @uppy/utils@7.1.0 - - @uppy/core@5.1.0 - -## 5.0.2 - -### Patch Changes - -- 975317d: Removed "main" from package.json, since export maps serve as the contract for the public API. -- Updated dependencies [4b6a76c] -- Updated dependencies [975317d] -- Updated dependencies [9bac4c8] - - @uppy/core@5.0.2 - - @uppy/utils@7.0.2 - -## 5.0.1 - -### Patch Changes - -- 49522ec: Remove preact/compat imports in favor of preact, preventing JSX type issues in certain setups. -- Updated dependencies [49522ec] - - @uppy/utils@7.0.1 - - @uppy/core@5.0.1 - -## 5.0.0 - -### Major Changes - -- c5b51f6: ### Export maps for all packages - - All packages now have export maps. This is a breaking change in two cases: - - 1. The css imports have changed from `@uppy[package]/dist/styles.min.css` to `@uppy[package]/css/styles.min.css` - 2. You were importing something that wasn't exported from the root, for instance `@uppy/core/lib/foo.js`. You can now only import things we explicitly exported. - - #### Changed imports for `@uppy/react`, `@uppy/vue`, and `@uppy/svelte` - - Some components, like Dashboard, require a peer dependency to work but since all components were exported from a single file you were forced to install all peer dependencies. Even if you never imported, for instance, the status bar component. - - Every component that requires a peer dependency has now been moved to a subpath, such as `@uppy/react/dashboard`, so you only need to install the peer dependencies you need. - - **Example for `@uppy/react`:** - - **Before:** - - ```javascript - import { Dashboard, StatusBar } from "@uppy/react"; - ``` - - **Now:** - - ```javascript - import Dashboard from "@uppy/react/dashboard"; - import StatusBar from "@uppy/react/status-bar"; - ``` - -### Patch Changes - -- Updated dependencies [d301c01] -- Updated dependencies [c5b51f6] - - @uppy/utils@7.0.0 - - @uppy/core@5.0.0 - -## 4.5.3 - -### Patch Changes - -- 2f62f40: VirtualList now virtualises rows in the file list, as was intented. This means better performance when scrolling thousands for files. -- Updated dependencies [eee05db] - - @uppy/core@4.5.3 - -## 4.5.2 - -### Patch Changes - -- 1b1a9e3: Define "files" in package.json -- c66fd85: Fix package.json import -- Updated dependencies [1b1a9e3] - - @uppy/utils@6.2.2 - - @uppy/core@4.5.2 - -## 4.5.0 - -### Minor Changes - -- 0c24c5a: Use TypeScript compiler instead of Babel - -### Patch Changes - -- Updated dependencies [0c24c5a] -- Updated dependencies [0c24c5a] - - @uppy/core@4.5.0 - - @uppy/utils@6.2.0 - -## 4.4.5 - -Released: 2025-06-30 -Included in: Uppy v4.18.0 - -- @uppy/provider-views: improve metadata handling in Google Photos Picker (ben rosenbaum / #5769) - -## 4.4.4 - -Released: 2025-06-02 -Included in: Uppy v4.17.0 - -- @uppy/provider-views: fix: handle pagination for Google Photos picker (fixes #5765) (ben rosenbaum / #5768) - -## 4.4.3 - -Released: 2025-04-14 -Included in: Uppy v4.15.0 - -- @uppy/provider-views: Fix google photos picker (Mikael Finstad / #5717) - -## 4.4.2 - -Released: 2025-02-03 -Included in: Uppy v4.13.2 - -- @uppy/provider-views: fix google photos picker videos (Mikael Finstad / #5635) -- @uppy/core,@uppy/google-drive-picker,@uppy/google-photos-picker,@uppy/provider-views: - -## 4.4.1 - -Released: 2025-01-09 -Included in: Uppy v4.12.2 - -- @uppy/provider-views: Import types consistently from @uppy/core (Merlijn Vos / #5589) -- @uppy/provider-views: fix incorrect import (Merlijn Vos / #5588) - -## 4.4.0 - -Released: 2025-01-08 -Included in: Uppy v4.12.0 - -- @uppy/unsplash,@uppy/provider-views: add utmSource option (Merlijn Vos / #5580) - -## 4.3.0 - -Released: 2025-01-06 -Included in: Uppy v4.11.0 - -- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) - -## 4.2.1 - -Released: 2025-01-06 -Included in: Uppy v4.10.0 - -- @uppy/core,@uppy/dashboard,@uppy/provider-views,@uppy/store-redux,@uppy/url: build(deps): bump nanoid from 5.0.7 to 5.0.9 (dependabot[bot] / #5544) - -## 4.1.0 - -Released: 2024-12-05 -Included in: Uppy v4.8.0 - -- @uppy/provider-views: Google picker scope (Mikael Finstad / #5535) -- @uppy/core,@uppy/provider-views: move useStore out of core (Mikael Finstad / #5533) -- @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.0.2 - -Released: 2024-10-31 -Included in: Uppy v4.6.0 - -- @uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react-native,@uppy/react,@uppy/redux-dev-tools,@uppy/screen-capture,@uppy/status-bar,@uppy/store-default,@uppy/store-redux,@uppy/svelte,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/utils,@uppy/vue,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom: Fix links (Anthony Veaudry / #5492) - -## 4.0.0 - -Released: 2024-07-10 -Included in: Uppy v4.0.0 - -- @uppy/provider-views: `.openFolder()` - return progress indication (Evgenia Karunus / #5306) - -## 4.0.0-beta.11 - -Released: 2024-07-02 -Included in: Uppy v4.0.0-beta.14 - -- @uppy/provider-views: `afterFill()` - add loading progress (Evgenia Karunus / #5288) - -## 4.0.0-beta.10 - -Released: 2024-06-27 -Included in: Uppy v4.0.0-beta.13 - -- @uppy/provider-views: `Loader.tsx` - delete the file (Evgenia Karunus / #5284) -- @uppy/provider-views: Provider views rewrite (.files, .folders => .partialTree) (Evgenia Karunus / #5050) - -## 4.0.0-beta.9 - -Released: 2024-06-18 -Included in: Uppy v4.0.0-beta.12 - -- @uppy/provider-views: Renames & `eslint-disable react/require-default-props` removal (Evgenia Karunus / #5251) -- examples,@uppy/locales,@uppy/provider-views,@uppy/transloadit: Release: uppy@3.26.1 (github-actions[bot] / #5242) -- @uppy/provider-views: fix wrong font for files (Merlijn Vos / #5234) - -## 4.0.0-beta.7 - -Released: 2024-06-04 -Included in: Uppy v4.0.0-beta.10 - -- @uppy/provider-views: PartialTree - get rid of `.onFirstRender()` (Evgenia Karunus / #5187) - -## 4.0.0-beta.4 - -Released: 2024-04-29 -Included in: Uppy v4.0.0-beta.4 - -- @uppy/dashboard,@uppy/provider-views: Remove JSX global type everywhere (Merlijn Vos / #5117) -- @uppy/provider-views: bring back "loaded X files..." (Mikael Finstad / #5097) - -## 4.0.0-beta.1 - -Released: 2024-03-28 -Included in: Uppy v4.0.0-beta.1 - -- @uppy/companion-client,@uppy/provider-views,@uppy/status-bar: fix type imports (Antoine du Hamel / #5038) -- @uppy/provider-views: fix `super.toggleCheckbox` bug (Mikael Finstad / #5004) -- @uppy/core,@uppy/provider-views: Fix breadcrumbs (Evgenia Karunus / #4986) - -## 3.12.1 - -Released: 2024-06-11 -Included in: Uppy v3.26.1 - -- @uppy/provider-views: fix wrong font for files (Merlijn Vos / #5234) - -## 3.12.0 - -Released: 2024-04-29 -Included in: Uppy v3.25.0 - -- @uppy/dashboard,@uppy/provider-views: Remove JSX global type everywhere (Merlijn Vos / #5117) -- @uppy/provider-views: bring back "loaded X files..." (Mikael Finstad / #5097) - -## 3.11.0 - -Released: 2024-03-27 -Included in: Uppy v3.24.0 - -- @uppy/box,@uppy/companion-client,@uppy/provider-views,@uppy/status-bar: fix type imports (Antoine du Hamel / #5038) -- @uppy/provider-views: fix `super.toggleCheckbox` bug (Mikael Finstad / #5004) -- @uppy/core,@uppy/provider-views: Fix breadcrumbs (Evgenia Karunus / #4986) - -## 3.10.0 - -Released: 2024-02-28 -Included in: Uppy v3.23.0 - -- @uppy/provider-views: migrate to TS (Merlijn Vos / #4919) - -## 3.9.0 - -Released: 2024-02-19 -Included in: Uppy v3.22.0 - -- @uppy/provider-views: update uppy-providerbrowser-viewtype--list.scss (aditya patadia / #4913) -- @uppy/provider-views: add referrerpolicy to images (merlijn vos / #4853) - -## 3.8.0 - -Released: 2023-12-12 -Included in: Uppy v3.21.0 - -- @uppy/provider-views: fix uploadRemoteFile undefined (Mikael Finstad / #4814) - -## 3.5.0 - -Released: 2023-08-15 -Included in: Uppy v3.14.0 - -- @uppy/companion-client,@uppy/provider-views: make authentication optional (Dominik Schmidt / #4556) -- @uppy/provider-views: fix ProviderView error on empty plugin.icon (Dominik Schmidt / #4553) - -## 3.4.1 - -Released: 2023-07-20 -Included in: Uppy v3.13.0 - -- @uppy/provider-views: Add VirtualList to ProviderView (Merlijn Vos / #4566) -- @uppy/provider-views: fix race conditions with folder loading (Mikael Finstad / #4578) -- @uppy/provider-views: fix infinite folder loading (Mikael Finstad / #4590) - -## 3.4.0 - -Released: 2023-07-13 -Included in: Uppy v3.12.0 - -- @uppy/provider-views: add support for remote file paths (Mikael Finstad / #4537) -- @uppy/box,@uppy/companion,@uppy/dropbox,@uppy/google-drive,@uppy/onedrive,@uppy/provider-views: Load Google Drive / OneDrive lists 5-10x faster & always load all files (Merlijn Vos / #4513) - -## 3.3.1 - -Released: 2023-06-19 -Included in: Uppy v3.10.0 - -- @uppy/provider-views: Fix range selection not resetting and computing correctly (Terence C / #4415) - -## 3.3.0 - -Released: 2023-04-18 -Included in: Uppy v3.8.0 - -- @uppy/provider-views: Concurrent file listing (Mikael Finstad / #4401) -- @uppy/core,@uppy/locales,@uppy/provider-views: User feedback adding recursive folders take 2 (Mikael Finstad / #4399) - -## 3.2.0 - -Released: 2023-04-04 -Included in: Uppy v3.7.0 - -- @uppy/provider-views: fix race condition when adding folders (Mikael Finstad / #4384) -- @uppy/provider-views: UI: Use form attribite with a form in doc root to prevent outer form submit (Artur Paikin / #4283) - -## 3.0.2 - -Released: 2022-10-24 -Included in: Uppy v3.2.2 - -- @uppy/provider-views: Fix button and input inconsistent font and style (Artur Paikin / #4162) - -## 3.0.1 - -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-beta.3 - -Released: 2022-08-16 -Included in: Uppy v3.0.0-beta.5 - -- @uppy/provider-views: Reset filter input correctly in provider views (Merlijn Vos / #3978) -- @uppy/provider-views: core validateRestrictions: return error directly vs the result/reason obj (Artur Paikin / #3951) - -## 2.1.2 - -Released: 2022-07-06 -Included in: Uppy v2.12.2 - -- @uppy/provider-views: improve logging (Mikael Finstad / #3638) - -## 2.1.1 - -Released: 2022-05-30 -Included in: Uppy v2.11.0 - -- @uppy/provider-views: Add onKeyPress event handler to capture e.shiftKey, unavailable in onChange (Artur Paikin / #3768) - -## 2.1.0 - -Released: 2022-05-14 -Included in: Uppy v2.10.0 - -- @uppy/provider-views: refactor to ESM (Antoine du Hamel / #3715) - -## 2.0.8 - -Released: 2022-03-16 -Included in: Uppy v2.8.0 - -- @uppy/provider-views: provider-view: fix breadcrumbs (Artur Paikin / #3535) - -## 2.0.7 - -Released: 2022-02-14 -Included in: Uppy v2.5.0 - -- @uppy/companion-client,@uppy/companion,@uppy/provider-views,@uppy/robodog: Finishing touches on Companion dynamic Oauth (Renée Kooi / #2802) -- @uppy/provider-views: Unsplash: UI improvements (Artur Paikin / #3438) - -## 3.0.0 - -Released: 2022-08-22 -Included in: Uppy v3.0.0 - -- Switch to ESM diff --git a/packages/@uppy/provider-views/LICENSE b/packages/@uppy/provider-views/LICENSE deleted file mode 100644 index c23747330..000000000 --- a/packages/@uppy/provider-views/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/provider-views/README.md b/packages/@uppy/provider-views/README.md deleted file mode 100644 index f1a9a5ae5..000000000 --- a/packages/@uppy/provider-views/README.md +++ /dev/null @@ -1,50 +0,0 @@ -# @uppy/provider-views - -Uppy logo: a smiling puppy above a pink upwards arrow - -[![npm version](https://img.shields.io/npm/v/@uppy/provider-views.svg?style=flat-square)](https://www.npmjs.com/package/@uppy/provider-views) -![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) - -View library for Uppy remote provider plugins. - -Uppy is being developed by the folks at [Transloadit](https://transloadit.com), -a versatile file encoding service. - -## Example - -```js -import Plugin from '@uppy/core/lib/plugin' -import { ProviderViews } from '@uppy/provider-views' - -class GoogleDrive extends UIPlugin { - install() { - this.view = new ProviderViews(this) - // snip - } - - render(state) { - return this.view.render(state) - } -} -``` - -## Installation - -> Unless you are creating a custom provider plugin, you do not need to install -> this. - -```bash -$ npm install @uppy/provider-views -``` - - - -## License - -[The MIT License](./LICENSE). diff --git a/packages/@uppy/provider-views/package.json b/packages/@uppy/provider-views/package.json deleted file mode 100644 index b47d44dc5..000000000 --- a/packages/@uppy/provider-views/package.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "name": "@uppy/provider-views", - "description": "View library for Uppy remote provider plugins.", - "version": "5.2.2", - "license": "MIT", - "style": "dist/style.min.css", - "type": "module", - "sideEffects": [ - "*.css" - ], - "scripts": { - "build": "tsc --build tsconfig.build.json", - "build:css": "sass --load-path=../../ src/style.scss dist/style.css && postcss dist/style.css -u cssnano -o dist/style.min.css", - "typecheck": "tsc --build", - "test": "vitest run --environment=jsdom --silent='passed-only'" - }, - "keywords": [ - "file uploader", - "uppy" - ], - "homepage": "https://uppy.io", - "bugs": { - "url": "https://github.com/transloadit/uppy/issues" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/transloadit/uppy.git" - }, - "files": [ - "src", - "lib", - "dist", - "CHANGELOG.md" - ], - "exports": { - ".": "./lib/index.js", - "./css/style.min.css": "./dist/style.min.css", - "./css/style.css": "./dist/style.css", - "./css/style.scss": "./src/style.scss", - "./package.json": "./package.json" - }, - "dependencies": { - "classnames": "^2.5.1", - "lodash": "^4.18.1", - "nanoid": "^5.1.11", - "p-queue": "^9.3.0", - "preact": "^10.29.2" - }, - "devDependencies": { - "@types/gapi": "^0.0.47", - "@types/google.accounts": "^0.0.14", - "@types/google.picker": "^0.0.42", - "cssnano": "^8.0.1", - "jsdom": "^29.1.1", - "postcss": "^8.5.15", - "postcss-cli": "^11.0.1", - "sass": "^1.89.2", - "typescript": "^5.8.3", - "vitest": "^4.1.6" - }, - "peerDependencies": { - "@uppy/core": "workspace:^" - } -} diff --git a/packages/@uppy/provider-views/tsconfig.build.json b/packages/@uppy/provider-views/tsconfig.build.json deleted file mode 100644 index 3c498ff33..000000000 --- a/packages/@uppy/provider-views/tsconfig.build.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../../../tsconfig.shared", - "compilerOptions": { - "outDir": "./lib", - "rootDir": "./src", - "types": ["google.accounts", "google.picker", "gapi"] - }, - "include": ["./src/**/*.*"], - "exclude": ["./src/**/*.test.ts"], - "references": [ - { - "path": "../core/tsconfig.build.json" - } - ] -} diff --git a/packages/@uppy/provider-views/tsconfig.json b/packages/@uppy/provider-views/tsconfig.json deleted file mode 100644 index 1ff3bf95e..000000000 --- a/packages/@uppy/provider-views/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../../tsconfig.shared", - "compilerOptions": { - "emitDeclarationOnly": false, - "noEmit": true, - "types": ["google.accounts", "google.picker", "gapi"] - }, - "include": ["./package.json", "./src/**/*.*"], - "references": [ - { - "path": "../core/tsconfig.build.json" - } - ] -} diff --git a/packages/@uppy/provider-views/turbo.json b/packages/@uppy/provider-views/turbo.json deleted file mode 100644 index 83c0d57e1..000000000 --- a/packages/@uppy/provider-views/turbo.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": ["//"], - "tasks": { - "build": { - "dependsOn": ["^build", "@uppy/core#build"] - } - } -} diff --git a/packages/@uppy/transloadit/tsconfig.build.json b/packages/@uppy/transloadit/tsconfig.build.json index 796d499a7..bd7ee9f5d 100644 --- a/packages/@uppy/transloadit/tsconfig.build.json +++ b/packages/@uppy/transloadit/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../tus/tsconfig.build.json" }, diff --git a/packages/@uppy/transloadit/tsconfig.json b/packages/@uppy/transloadit/tsconfig.json index 25b3d2803..aa84eba3d 100644 --- a/packages/@uppy/transloadit/tsconfig.json +++ b/packages/@uppy/transloadit/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../tus/tsconfig.build.json" }, diff --git a/packages/@uppy/unsplash/package.json b/packages/@uppy/unsplash/package.json index b033a108c..b05c858cb 100644 --- a/packages/@uppy/unsplash/package.json +++ b/packages/@uppy/unsplash/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/unsplash/src/Unsplash.tsx b/packages/@uppy/unsplash/src/Unsplash.tsx index ec2376991..bdd2a41e4 100644 --- a/packages/@uppy/unsplash/src/Unsplash.tsx +++ b/packages/@uppy/unsplash/src/Unsplash.tsx @@ -13,8 +13,8 @@ import { SearchProvider, tokenStorage, } from '@uppy/core/companion-client' +import { SearchProviderViews } from '@uppy/core/provider-views' import type { LocaleStrings } from '@uppy/core/utils' -import { SearchProviderViews } from '@uppy/provider-views' // 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/unsplash/tsconfig.build.json b/packages/@uppy/unsplash/tsconfig.build.json index 73521b1c6..ac99ccdd7 100644 --- a/packages/@uppy/unsplash/tsconfig.build.json +++ b/packages/@uppy/unsplash/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/unsplash/tsconfig.json b/packages/@uppy/unsplash/tsconfig.json index 1b6915eca..edd6c80fb 100644 --- a/packages/@uppy/unsplash/tsconfig.json +++ b/packages/@uppy/unsplash/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/webdav/package.json b/packages/@uppy/webdav/package.json index 892210f4a..0a390c1bc 100644 --- a/packages/@uppy/webdav/package.json +++ b/packages/@uppy/webdav/package.json @@ -38,7 +38,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/webdav/src/Webdav.tsx b/packages/@uppy/webdav/src/Webdav.tsx index e11c5b96e..696c761ac 100644 --- a/packages/@uppy/webdav/src/Webdav.tsx +++ b/packages/@uppy/webdav/src/Webdav.tsx @@ -13,8 +13,8 @@ import { Provider, tokenStorage, } from '@uppy/core/companion-client' +import { ProviderViews, SearchView } from '@uppy/core/provider-views' import type { I18n, LocaleStrings } from '@uppy/core/utils' -import { ProviderViews, SearchView } from '@uppy/provider-views' // biome-ignore lint/style/useImportType: h is not a type import { type ComponentChild, h } from 'preact' import { useCallback, useState } from 'preact/hooks' diff --git a/packages/@uppy/webdav/tsconfig.build.json b/packages/@uppy/webdav/tsconfig.build.json index 497086450..ac99ccdd7 100644 --- a/packages/@uppy/webdav/tsconfig.build.json +++ b/packages/@uppy/webdav/tsconfig.build.json @@ -9,9 +9,6 @@ "references": [ { "path": "../core/tsconfig.build.json" - }, - { - "path": "../provider-views/tsconfig.build.json" } ] } diff --git a/packages/@uppy/webdav/tsconfig.json b/packages/@uppy/webdav/tsconfig.json index 3d1faf43c..edd6c80fb 100644 --- a/packages/@uppy/webdav/tsconfig.json +++ b/packages/@uppy/webdav/tsconfig.json @@ -8,9 +8,6 @@ "references": [ { "path": "../core/tsconfig.build.json" - }, - { - "path": "../provider-views/tsconfig.build.json" } ] } diff --git a/packages/@uppy/zoom/package.json b/packages/@uppy/zoom/package.json index b97047747..b4fc871fb 100644 --- a/packages/@uppy/zoom/package.json +++ b/packages/@uppy/zoom/package.json @@ -34,7 +34,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@uppy/provider-views": "workspace:^", "preact": "^10.29.2" }, "peerDependencies": { diff --git a/packages/@uppy/zoom/src/Zoom.tsx b/packages/@uppy/zoom/src/Zoom.tsx index a61533ea5..8f8cb802a 100644 --- a/packages/@uppy/zoom/src/Zoom.tsx +++ b/packages/@uppy/zoom/src/Zoom.tsx @@ -13,8 +13,8 @@ import { Provider, tokenStorage, } from '@uppy/core/companion-client' +import { ProviderViews } from '@uppy/core/provider-views' import type { LocaleStrings } from '@uppy/core/utils' -import { ProviderViews } from '@uppy/provider-views' // 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/zoom/tsconfig.build.json b/packages/@uppy/zoom/tsconfig.build.json index 73521b1c6..ac99ccdd7 100644 --- a/packages/@uppy/zoom/tsconfig.build.json +++ b/packages/@uppy/zoom/tsconfig.build.json @@ -7,9 +7,6 @@ "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/@uppy/zoom/tsconfig.json b/packages/@uppy/zoom/tsconfig.json index 1b6915eca..edd6c80fb 100644 --- a/packages/@uppy/zoom/tsconfig.json +++ b/packages/@uppy/zoom/tsconfig.json @@ -6,9 +6,6 @@ }, "include": ["./package.json", "./src/**/*.*"], "references": [ - { - "path": "../provider-views/tsconfig.build.json" - }, { "path": "../core/tsconfig.build.json" } diff --git a/packages/uppy/package.json b/packages/uppy/package.json index 421228837..a98a0bc19 100644 --- a/packages/uppy/package.json +++ b/packages/uppy/package.json @@ -56,7 +56,6 @@ "@uppy/image-generator": "workspace:*", "@uppy/locales": "workspace:*", "@uppy/onedrive": "workspace:*", - "@uppy/provider-views": "workspace:*", "@uppy/remote-sources": "workspace:*", "@uppy/screen-capture": "workspace:*", "@uppy/status-bar": "workspace:*", diff --git a/packages/uppy/src/bundle.ts b/packages/uppy/src/bundle.ts index 2678bcca0..ca3d501aa 100644 --- a/packages/uppy/src/bundle.ts +++ b/packages/uppy/src/bundle.ts @@ -12,7 +12,7 @@ export function Core() { // Utilities export * as server from '@uppy/core/companion-client' -import * as ProviderView from '@uppy/provider-views' +import * as ProviderView from '@uppy/core/provider-views' export const views = { ProviderView } diff --git a/packages/uppy/src/style.scss b/packages/uppy/src/style.scss index 6b331ddd8..e36c61356 100644 --- a/packages/uppy/src/style.scss +++ b/packages/uppy/src/style.scss @@ -1,7 +1,7 @@ @use '@uppy/core/src/style.scss' as core; @use '@uppy/dashboard/src/style.scss' as dashboard; @use '@uppy/drag-drop/src/style.scss' as drag-drop; -@use '@uppy/provider-views/src/style.scss' as provider-views; +@use '@uppy/core/src/provider-views/style.scss' as provider-views; @use '@uppy/url/src/style.scss' as url; @use '@uppy/webcam/src/style.scss' as webcam; @use '@uppy/audio/src/style.scss' as audio; diff --git a/packages/uppy/tsconfig.build.json b/packages/uppy/tsconfig.build.json index 5a5d2372a..c95042b2d 100644 --- a/packages/uppy/tsconfig.build.json +++ b/packages/uppy/tsconfig.build.json @@ -55,9 +55,6 @@ { "path": "../@uppy/onedrive/tsconfig.build.json" }, - { - "path": "../@uppy/provider-views/tsconfig.build.json" - }, { "path": "../@uppy/remote-sources/tsconfig.build.json" }, diff --git a/packages/uppy/tsconfig.json b/packages/uppy/tsconfig.json index e1cb4dc63..1cbc0fdfb 100644 --- a/packages/uppy/tsconfig.json +++ b/packages/uppy/tsconfig.json @@ -54,9 +54,6 @@ { "path": "../@uppy/onedrive/tsconfig.build.json" }, - { - "path": "../@uppy/provider-views/tsconfig.build.json" - }, { "path": "../@uppy/remote-sources/tsconfig.build.json" }, diff --git a/yarn.lock b/yarn.lock index 974abb952..90bfeb010 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9076,7 +9076,6 @@ __metadata: resolution: "@uppy/box@workspace:packages/@uppy/box" dependencies: "@uppy/core": "workspace:^" - "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" typescript: "npm:^5.8.3" peerDependencies: @@ -9215,8 +9214,12 @@ __metadata: dependencies: "@transloadit/prettier-bytes": "npm:^1.1.0" "@types/deep-freeze": "npm:^0" + "@types/gapi": "npm:^0.0.47" + "@types/google.accounts": "npm:^0.0.14" + "@types/google.picker": "npm:^0.0.42" "@types/lodash": "npm:^4.14.199" "@types/node": "npm:^20.19.0" + classnames: "npm:^2.5.1" cssnano: "npm:^8.0.1" deep-freeze: "npm:^0.0.1" jsdom: "npm:^29.1.1" @@ -9224,6 +9227,7 @@ __metadata: mime-match: "npm:^1.0.2" namespace-emitter: "npm:^2.0.1" nanoid: "npm:^5.1.11" + p-queue: "npm:^9.3.0" p-retry: "npm:^6.1.0" postcss: "npm:^8.5.15" postcss-cli: "npm:^11.0.1" @@ -9242,7 +9246,6 @@ __metadata: "@uppy/core": "workspace:^" "@uppy/dropbox": "workspace:^" "@uppy/google-drive": "workspace:^" - "@uppy/provider-views": "workspace:^" "@uppy/thumbnail-generator": "workspace:^" "@uppy/url": "workspace:^" "@uppy/webcam": "workspace:^" @@ -9301,7 +9304,6 @@ __metadata: resolution: "@uppy/dropbox@workspace:packages/@uppy/dropbox" dependencies: "@uppy/core": "workspace:^" - "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" typescript: "npm:^5.8.3" peerDependencies: @@ -9314,7 +9316,6 @@ __metadata: resolution: "@uppy/facebook@workspace:packages/@uppy/facebook" dependencies: "@uppy/core": "workspace:^" - "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" typescript: "npm:^5.8.3" peerDependencies: @@ -9356,7 +9357,6 @@ __metadata: resolution: "@uppy/google-drive-picker@workspace:packages/@uppy/google-drive-picker" dependencies: "@uppy/core": "workspace:^" - "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" typescript: "npm:^5.8.3" peerDependencies: @@ -9369,7 +9369,6 @@ __metadata: resolution: "@uppy/google-drive@workspace:packages/@uppy/google-drive" dependencies: "@uppy/core": "workspace:^" - "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" typescript: "npm:^5.8.3" peerDependencies: @@ -9382,7 +9381,6 @@ __metadata: resolution: "@uppy/google-photos-picker@workspace:packages/@uppy/google-photos-picker" dependencies: "@uppy/core": "workspace:^" - "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" typescript: "npm:^5.8.3" peerDependencies: @@ -9411,7 +9409,6 @@ __metadata: resolution: "@uppy/image-generator@workspace:packages/@uppy/image-generator" dependencies: "@uppy/core": "workspace:^" - "@uppy/provider-views": "workspace:^" "@uppy/transloadit": "workspace:^" cssnano: "npm:^8.0.1" postcss: "npm:^8.5.15" @@ -9440,7 +9437,6 @@ __metadata: resolution: "@uppy/onedrive@workspace:packages/@uppy/onedrive" dependencies: "@uppy/core": "workspace:^" - "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" typescript: "npm:^5.8.3" peerDependencies: @@ -9448,30 +9444,6 @@ __metadata: languageName: unknown linkType: soft -"@uppy/provider-views@workspace:*, @uppy/provider-views@workspace:^, @uppy/provider-views@workspace:packages/@uppy/provider-views": - version: 0.0.0-use.local - resolution: "@uppy/provider-views@workspace:packages/@uppy/provider-views" - dependencies: - "@types/gapi": "npm:^0.0.47" - "@types/google.accounts": "npm:^0.0.14" - "@types/google.picker": "npm:^0.0.42" - classnames: "npm:^2.5.1" - cssnano: "npm:^8.0.1" - jsdom: "npm:^29.1.1" - lodash: "npm:^4.18.1" - nanoid: "npm:^5.1.11" - p-queue: "npm:^9.3.0" - postcss: "npm:^8.5.15" - postcss-cli: "npm:^11.0.1" - preact: "npm:^10.29.2" - sass: "npm:^1.89.2" - typescript: "npm:^5.8.3" - vitest: "npm:^4.1.6" - peerDependencies: - "@uppy/core": "workspace:^" - languageName: unknown - linkType: soft - "@uppy/react@workspace:*, @uppy/react@workspace:packages/@uppy/react": version: 0.0.0-use.local resolution: "@uppy/react@workspace:packages/@uppy/react" @@ -9651,7 +9623,6 @@ __metadata: resolution: "@uppy/unsplash@workspace:packages/@uppy/unsplash" dependencies: "@uppy/core": "workspace:^" - "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" typescript: "npm:^5.8.3" peerDependencies: @@ -9732,7 +9703,6 @@ __metadata: resolution: "@uppy/webdav@workspace:packages/@uppy/webdav" dependencies: "@uppy/core": "workspace:^" - "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" typescript: "npm:^5.8.3" peerDependencies: @@ -9763,7 +9733,6 @@ __metadata: resolution: "@uppy/zoom@workspace:packages/@uppy/zoom" dependencies: "@uppy/core": "workspace:^" - "@uppy/provider-views": "workspace:^" preact: "npm:^10.29.2" typescript: "npm:^5.8.3" peerDependencies: @@ -13469,7 +13438,6 @@ __metadata: "@uppy/core": "workspace:*" "@uppy/dashboard": "workspace:*" "@uppy/google-drive": "workspace:*" - "@uppy/provider-views": "workspace:*" "@uppy/tus": "workspace:*" body-parser: "npm:^2.2.2" dotenv: "npm:^17.4.2" @@ -23387,7 +23355,6 @@ __metadata: "@uppy/image-generator": "workspace:*" "@uppy/locales": "workspace:*" "@uppy/onedrive": "workspace:*" - "@uppy/provider-views": "workspace:*" "@uppy/remote-sources": "workspace:*" "@uppy/screen-capture": "workspace:*" "@uppy/status-bar": "workspace:*"