diff --git a/packages/@uppy/companion/package.json b/packages/@uppy/companion/package.json index b7a173777..4774eed9e 100644 --- a/packages/@uppy/companion/package.json +++ b/packages/@uppy/companion/package.json @@ -73,7 +73,7 @@ "supports-color": "10.2.2", "tus-js-client": "4.3.1", "validator": "13.15.35", - "webdav": "^5.8.0", + "webdav": "5.10.0", "ws": "8.20.1", "zod": "4.4.3" }, diff --git a/packages/@uppy/companion/src/server/provider/webdav/index.ts b/packages/@uppy/companion/src/server/provider/webdav/index.ts index e8ec83416..c932b9691 100644 --- a/packages/@uppy/companion/src/server/provider/webdav/index.ts +++ b/packages/@uppy/companion/src/server/provider/webdav/index.ts @@ -159,12 +159,11 @@ export default class WebdavProvider extends Provider { const data: { items: WebdavListItem[] } = { items: [] } const client = await this.getClient({ providerUserSession }) - const dirResult = await client.getDirectoryContents( + const dir = await client.getDirectoryContents( (typeof query?.['directory'] === 'string' ? query?.['directory'] : undefined) || '/', ) - const dir = Array.isArray(dirResult) ? dirResult : dirResult.data dir.forEach((item) => { const isFolder = item.type === 'directory' diff --git a/yarn.lock b/yarn.lock index b3a8a0085..74d38c778 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8661,7 +8661,7 @@ __metadata: typescript: "npm:^5.8.3" validator: "npm:13.15.35" vitest: "npm:^3.2.4" - webdav: "npm:^5.8.0" + webdav: "npm:5.10.0" ws: "npm:8.20.1" zod: "npm:4.4.3" bin: @@ -10498,6 +10498,15 @@ __metadata: languageName: node linkType: hard +"brace-expansion@npm:^2.0.2": + version: 2.1.0 + resolution: "brace-expansion@npm:2.1.0" + dependencies: + balanced-match: "npm:^1.0.0" + checksum: 10/c77a7a64aabf94b8d5913955adb4f36957917565374461355bb4276830c027a313d981f32410cea9e38f52573e7eb776d02fe05091c3a79a061958d97e4d2b43 + languageName: node + linkType: hard + "braces@npm:^3.0.2, braces@npm:^3.0.3, braces@npm:~3.0.2": version: 3.0.3 resolution: "braces@npm:3.0.3" @@ -12335,7 +12344,7 @@ __metadata: languageName: node linkType: hard -"entities@npm:^6.0.0": +"entities@npm:^6.0.0, entities@npm:^6.0.1": version: 6.0.1 resolution: "entities@npm:6.0.1" checksum: 10/62af1307202884349d2867f0aac5c60d8b57102ea0b0e768b16246099512c28e239254ad772d6834e7e14cb1b6f153fc3d0c031934e3183b086c86d3838d874a @@ -13589,7 +13598,7 @@ __metadata: languageName: node linkType: hard -"fast-xml-builder@npm:^1.1.7": +"fast-xml-builder@npm:^1.1.7, fast-xml-builder@npm:^1.2.0": version: 1.2.0 resolution: "fast-xml-builder@npm:1.2.0" dependencies: @@ -13624,14 +13633,18 @@ __metadata: languageName: node linkType: hard -"fast-xml-parser@npm:^4.5.1": - version: 4.5.3 - resolution: "fast-xml-parser@npm:4.5.3" +"fast-xml-parser@npm:^5.7.2": + version: 5.8.0 + resolution: "fast-xml-parser@npm:5.8.0" dependencies: - strnum: "npm:^1.1.1" + "@nodable/entities": "npm:^2.1.0" + fast-xml-builder: "npm:^1.2.0" + path-expression-matcher: "npm:^1.5.0" + strnum: "npm:^2.3.0" + xml-naming: "npm:^0.1.0" bin: fxparser: src/cli/cli.js - checksum: 10/ca22bf9d65c10b8447c1034c13403e90ecee210e2b3852690df3d8a42b8a46ec655fae7356096abd98a15b89ddaf11878587b1773e0c3be4cbc2ac4af4c7bf95 + checksum: 10/0167d17d5275c95e005639f8fca7b4d88fec3fd013063725280f4e982313b1c798e4565d5ced7f61ce10e8f0d876a1976492cc8ac27da3080915ff549fd00705 languageName: node linkType: hard @@ -17156,6 +17169,15 @@ __metadata: languageName: node linkType: hard +"minimatch@npm:^9.0.9": + version: 9.0.9 + resolution: "minimatch@npm:9.0.9" + dependencies: + brace-expansion: "npm:^2.0.2" + checksum: 10/b91fad937deaffb68a45a2cb731ff3cff1c3baf9b6469c879477ed16f15c8f4ce39d63a3f75c2455107c2fdff0f3ab597d97dc09e2e93b883aafcf926ef0c8f9 + languageName: node + linkType: hard + "minimatch@npm:~3.0.2": version: 3.0.8 resolution: "minimatch@npm:3.0.8" @@ -21606,13 +21628,6 @@ __metadata: languageName: node linkType: hard -"strnum@npm:^1.1.1": - version: 1.1.2 - resolution: "strnum@npm:1.1.2" - checksum: 10/ccd6297a1fdaf0fc8ea0ea904acdae76878d49a4b0d98a70155df4bc081fd88eac5ec99fb150f3d1d1af065c1898d38420705259ba6c39aa850c671bcd54e35d - languageName: node - linkType: hard - "strnum@npm:^2.1.0": version: 2.1.1 resolution: "strnum@npm:2.1.1" @@ -21620,7 +21635,7 @@ __metadata: languageName: node linkType: hard -"strnum@npm:^2.2.3": +"strnum@npm:^2.2.3, strnum@npm:^2.3.0": version: 2.3.0 resolution: "strnum@npm:2.3.0" checksum: 10/ce79c86bb2b96f053eb28e14924c13604e22977dcdece9aa914c25e16cc5c4bbe048976fe0b2a4decf08a1e13600b820749cea25463fc0e5fee3078339e0a457 @@ -23143,25 +23158,25 @@ __metadata: languageName: node linkType: hard -"webdav@npm:^5.8.0": - version: 5.8.0 - resolution: "webdav@npm:5.8.0" +"webdav@npm:5.10.0": + version: 5.10.0 + resolution: "webdav@npm:5.10.0" dependencies: "@buttercup/fetch": "npm:^0.2.1" base-64: "npm:^1.0.0" byte-length: "npm:^1.0.2" - entities: "npm:^6.0.0" - fast-xml-parser: "npm:^4.5.1" + entities: "npm:^6.0.1" + fast-xml-parser: "npm:^5.7.2" hot-patcher: "npm:^2.0.1" layerr: "npm:^3.0.0" md5: "npm:^2.3.0" - minimatch: "npm:^9.0.5" + minimatch: "npm:^9.0.9" nested-property: "npm:^4.0.0" node-fetch: "npm:^3.3.2" path-posix: "npm:^1.0.0" url-join: "npm:^5.0.0" url-parse: "npm:^1.5.10" - checksum: 10/af33b5c62d810eb0cee4b3e96c335823cbe9366a51ec7c98f734a8fde6c0caf5e2ced96b524e44d554d94358cfafad79a808f59de3c110d640b71b0d2b36e1bd + checksum: 10/ca68ad41b3c35fb41b7598bba9f9a2d9d8c5cd64f1add18fef4dc9dfc045e464955a7e646668ecc179d4a7b7e1133d609b00039d3a91acf59a9263b6534a0967 languageName: node linkType: hard