Merge pull request #122 from owncloud/refactor/switch-to-upstream-uppy

refactor: switch to upstream uppy

docker-compose.yml

@@ -35,18 +35,20 @@ services:
       - traefik
 
   companion:
-    image: owncloud/uppy-companion:3.12.13-owncloud
+    image: transloadit/companion:5.5.0
     extra_hosts:
       - host.docker.internal:${DOCKER_HOST:-host-gateway}
     environment:
       NODE_TLS_REJECT_UNAUTHORIZED: 0
+      COMPANION_CLIENT_ORIGINS: 'true'
       COMPANION_ALLOW_LOCAL_URLS: 'true'
       COMPANION_DATADIR: /tmp/companion/
       COMPANION_DOMAIN: host.docker.internal:9200
       COMPANION_PROTOCOL: https
       COMPANION_PATH: /companion
       COMPANION_ONEDRIVE_KEY: '${COMPANION_ONEDRIVE_KEY}'
       COMPANION_ONEDRIVE_SECRET: '${COMPANION_ONEDRIVE_SECRET}'
+      COMPANION_TUS_DEFERRED_UPLOAD_LENGTH: 'false'
     volumes:
       - uppy_companion_datadir:/tmp/companion/
     labels:
@@ -103,6 +105,3 @@ services:
 volumes:
   ocis-config:
   uppy_companion_datadir:
-
-networks:
-  traefik:

package.json

@@ -35,24 +35,5 @@
     "vue-tsc": "2.1.10",
     "vue3-gettext": "^2.4.0"
   },
-  "pnpm": {
-    "overrides": {
-      "@uppy/companion-client": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-companion-client.tgz",
-      "@uppy/core": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-core.tgz",
-      "@uppy/dashboard": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-dashboard.tgz",
-      "@uppy/drop-target": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-drop-target.tgz",
-      "@uppy/google-drive": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-google-drive.tgz",
-      "@uppy/informer": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-informer.tgz",
-      "@uppy/onedrive": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-onedrive.tgz",
-      "@uppy/provider-views": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-provider-views.tgz",
-      "@uppy/status-bar": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-status-bar.tgz",
-      "@uppy/store-default": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-store-default.tgz",
-      "@uppy/thumbnail-generator": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-thumbnail-generator.tgz",
-      "@uppy/tus": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-tus.tgz",
-      "@uppy/utils": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-utils.tgz",
-      "@uppy/webdav": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-webdav.tgz",
-      "@uppy/xhr-upload": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-xhr-upload.tgz"
-    }
-  },
   "packageManager": "[email protected]"
 }

packages/web-app-importer/package.json

@@ -12,10 +12,10 @@
     "test:unit": "NODE_OPTIONS=--unhandled-rejections=throw vitest"
   },
   "dependencies": {
-    "@uppy/dashboard": "3.3.0",
-    "@uppy/google-drive": "3.3.0",
-    "@uppy/onedrive": "3.3.0",
-    "@uppy/webdav": "https://github.com/owncloud/uppy/releases/download/v3.12.13-owncloud/uppy-webdav.tgz"
+    "@uppy/dashboard": "4.1.3",
+    "@uppy/google-drive": "4.2.0",
+    "@uppy/onedrive": "4.1.2",
+    "@uppy/webdav": "0.1.0"
   },
   "devDependencies": {
     "@ownclouders/web-client": "^11.0.0",

packages/web-app-importer/src/composables/useExtensions.ts

@@ -10,7 +10,7 @@ import {
   useUserStore
 } from '@ownclouders/web-pkg'
 import '@uppy/dashboard/dist/style.min.css'
-import { WebdavPublicLink } from '@uppy/webdav'
+import Webdav from '@uppy/webdav'
 import { storeToRefs } from 'pinia'
 import { useGettext } from 'vue3-gettext'
 import { computed, nextTick, unref } from 'vue'
@@ -114,7 +114,7 @@ export const useExtensions = ({ applicationConfig }: ApplicationSetupOptions) =>
     }
 
     if (supportedClouds.includes('WebdavPublicLink')) {
-      uppyService.addPlugin(WebdavPublicLink, {
+      uppyService.addPlugin(Webdav, {
         target: Dashboard,
         id: 'WebdavPublicLink',
         companionUrl,

packages/web-app-unzip/package.json

@@ -17,7 +17,7 @@
   "devDependencies": {
     "@ownclouders/web-client": "^11.0.0",
     "@ownclouders/web-pkg": "^11.0.0",
-    "@uppy/core": "^3.3.0",
+    "@uppy/core": "^4.0.0",
     "p-queue": "^8.0.0",
     "uuid": "^11.0.0",
     "vue": "^3.4.21",

packages/web-app-unzip/src/composables/useUnzipAction.ts

@@ -15,7 +15,7 @@ import {
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { extractNameWithoutExtension, urlJoin } from '@ownclouders/web-client'
-import { UppyFile } from '@uppy/core'
+import { UppyFile, Meta, Body } from '@uppy/core'
 import * as uuid from 'uuid'
 import * as zip from '@zip.js/zip.js'
 import PQueue from 'p-queue'
@@ -24,6 +24,9 @@ import Worker from './../../node_modules/@zip.js/zip.js/dist/z-worker.js?url'
 const SUPPORTED_MIME_TYPES = ['application/zip']
 const MAX_SIZE_MB = 64 // in mb
 
+// TODO: import from web-pkg after next release
+type OcUppyFile = UppyFile<Meta, Body>
+
 export const useUnzipAction = () => {
   const { $gettext, current: currentLanguage } = useGettext()
   const clientService = useClientService()
@@ -88,7 +91,7 @@ export const useUnzipAction = () => {
       // unzip and convert to UppyFile's
       const promises = entries
         .filter(({ filename }) => !filename.endsWith('/'))
-        .map<Promise<UppyFile>>((result) => {
+        .map<Promise<OcUppyFile | void>>((result) => {
           const writer = new zip.BlobWriter()
           return queue.add(() =>
             result.getData(writer).then((data) => {
@@ -103,7 +106,7 @@ export const useUnzipAction = () => {
                   ...(path !== '.' && { webkitRelativePath: urlJoin(path, name) }),
                   uploadId
                 }
-              } as unknown as UppyFile
+              } as unknown as OcUppyFile
             })
           )
         })