Merge pull request #11464 from owncloud/chore/monorepo-setup

chore: clean up mono repo dependencies

package.json

@@ -30,25 +30,6 @@
     "not OperaMini all",
     "not OperaMobile > 0"
   ],
-  "dependencies": {
-    "@types/uuid": "9.0.8",
-    "@vue/compiler-dom": "3.4.21",
-    "@vue/compiler-sfc": "3.4.21",
-    "@vue/runtime-dom": "3.4.21",
-    "rollup-plugin-gzip": "^3.1.0",
-    "vite-plugin-static-copy": "^0.17.0",
-    "vite-plugin-treat-umd-as-commonjs": "0.1.4",
-    "vue": "3.4.21"
-  },
-  "peerDependencies": {
-    "@uppy/core": "3.3.0",
-    "caf": "15.0.1",
-    "portal-vue": "3.0.0",
-    "uuid": "9.0.1",
-    "vue-demi": "0.14.10",
-    "vue-router": "4.2.5",
-    "vue3-gettext": "2.4.0"
-  },
   "devDependencies": {
     "@babel/core": "7.23.7",
     "@babel/polyfill": "7.12.1",
@@ -59,59 +40,55 @@
     "@cucumber/pretty-formatter": "1.0.0",
     "@noble/hashes": "1.3.0",
     "@ownclouders/babel-preset": "workspace:*",
-    "@ownclouders/design-system": "workspace:*",
     "@ownclouders/eslint-config": "workspace:*",
     "@ownclouders/prettier-config": "workspace:*",
     "@ownclouders/tsconfig": "workspace:*",
     "@playwright/test": "1.45.0",
-    "@rollup/plugin-inject": "5.0.3",
-    "@types/glob": "8.1.0",
-    "@types/lodash-es": "4.17.7",
-    "@types/node": "18.11.9",
-    "@types/node-fetch": "2.6.10",
+    "@types/dompurify": "3.0.5",
+    "@types/luxon": "3.2.1",
+    "@types/mark.js": "8.11.12",
+    "@types/semver": "7.5.0",
+    "@types/uuid": "9.0.8",
     "@vitejs/plugin-vue": "5.0.3",
     "@vitest/coverage-v8": "2.0.3",
     "@vitest/web-worker": "2.0.5",
+    "@vue/compiler-dom": "3.4.21",
+    "@vue/compiler-sfc": "3.4.21",
     "@vue/test-utils": "2.4.5",
-    "autoprefixer": "10.4.16",
     "browserslist-to-esbuild": "^2.0.0",
     "browserslist-useragent-regexp": "^4.0.0",
     "commander": "12.1.0",
     "core-js": "3.30.2",
-    "cross-fetch": "4.0.0",
     "cucumber-html-reporter": "7.1.1",
     "ejs": "3.1.10",
     "eslint": "8.56.0",
-    "flush-promises": "1.0.2",
     "git-repo-info": "2.1.1",
-    "simple-git": "3.25.0",
     "glob": "11.0.0",
     "happy-dom": "13.3.1",
-    "join-path": "1.1.1",
     "jsdom": "^25.0.0",
     "license-checker-rseidelsohn": "4.3.0",
-    "lodash": "4.17.21",
     "node-fetch": "2.7.0",
-    "pino": "9.3.2",
     "pino-pretty": "11.2.2",
-    "postcss": "8.4.32",
+    "pino": "9.3.2",
     "qs": "6.13.0",
-    "react": "17.0.2",
     "requirejs": "2.3.7",
+    "rollup-plugin-gzip": "^3.1.0",
     "rollup-plugin-visualizer": "5.9.0",
-    "sass": "1.77.8",
+    "simple-git": "3.25.0",
     "ts-node": "10.9.2",
     "tslib": "2.5.0",
     "typescript": "5.5.4",
-    "url-search-params-polyfill": "8.1.1",
-    "vite": "5.2.8",
     "vite-plugin-environment": "^1.1.3",
     "vite-plugin-node-polyfills": "0.21.0",
-    "vitest": "2.0.5",
+    "vite-plugin-static-copy": "^0.17.0",
+    "vite-plugin-treat-umd-as-commonjs": "0.1.4",
+    "vite": "5.2.8",
     "vitest-mock-extended": "1.3.2",
+    "vitest": "2.0.5",
+    "vue-demi": "0.14.10",
     "vue-tsc": "2.0.24",
-    "vue3-gettext": "2.4.0",
-    "wait-for-expect": "3.0.2"
+    "vue": "3.4.21",
+    "vue3-gettext": "2.4.0"
   },
   "engines": {
     "node": ">=18"

packages/design-system/.depcheckrc

@@ -1,12 +1,12 @@
 {
   "ignores": [
     "autoprefixer",
-    "easygettext",
-    "webpack-dev-server",
-    "stylelint-config-standard",
-    "stylelint-config-sass-guidelines",
     "style-loader",
-    "postcss-import"
+    "stylelint-config-sass-guidelines",
+    "stylelint-config-standard",
+    "vue-inline-svg",
+    "webfontloader",
+    "webpack-dev-server"
   ],
   "ignorePatterns": [
     "src/styles/**/*.scss",

packages/design-system/package.json

@@ -39,6 +39,15 @@
     "not OperaMini all",
     "not OperaMobile > 0"
   ],
+  "dependencies": {
+    "@emoji-mart/data": "1.2.1",
+    "@popperjs/core": "^2.11.5",
+    "emoji-mart": "5.6.0",
+    "tippy.js": "^6.3.7",
+    "vue-inline-svg": "3.1.3",
+    "vue-select": "4.0.0-beta.6",
+    "webfontloader": "^1.6.28"
+  },
   "devDependencies": {
     "@babel/core": "7.23.7",
     "@babel/plugin-transform-runtime": "7.23.7",
@@ -48,9 +57,7 @@
     "@codemirror/language": "^6.10.0",
     "@codemirror/state": "^6.4.0",
     "@codemirror/view": "^6.23.0",
-    "@emoji-mart/data": "1.2.1",
     "@lezer/highlight": "^1.2.0",
-    "@popperjs/core": "^2.11.5",
     "autoprefixer": "10.4.16",
     "babel-core": "7.0.0-bridge.0",
     "babel-loader": "^9.0.0",
@@ -59,28 +66,17 @@
     "compression-webpack-plugin": "^11.0.0",
     "copy-webpack-plugin": "^12.0.0",
     "css-loader": "7.1.2",
-    "deepmerge": "^4.2.2",
-    "emoji-mart": "5.6.0",
-    "file-loader": "^6.2.0",
-    "filesize": "^10.1.0",
-    "focus-trap": "7.5.4",
-    "focus-trap-vue": "^4.0.1",
-    "fuse.js": "6.6.2",
     "glob": "^11.0.0",
-    "lodash-es": "4.17.21",
-    "luxon": "3.5.0",
     "mini-css-extract-plugin": "^2.0.0",
     "node-notifier": "^10.0.0",
     "npm": "^8.0.0",
     "npm-run-all2": "^6.0.0",
     "onchange": "^7.1.0",
     "optimize-css-assets-webpack-plugin": "^6.0.1",
-    "postcss-import": "16.1.0",
     "postcss-loader": "7.3.4",
     "postcss-nested": "^6.0.1",
     "postcss-safe-parser": "7.0.0",
     "postcss-simple-vars": "^7.0.1",
-    "prettier": "^3.0.0",
     "process": "^0.11.10",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -96,40 +92,33 @@
     "stylelint-config-sass-guidelines": "^11.0.0",
     "stylelint-config-standard": "^36.0.0",
     "tinycolor2": "^1.6.0",
-    "tippy.js": "^6.3.7",
     "ts-loader": "^9.5.1",
     "typescript": "5.5.4",
     "url": "^0.11.3",
     "url-loader": "^4.1.1",
-    "vue": "3.4.21",
-    "vue-inline-svg": "3.1.2",
     "vue-loader": "^17.4.2",
-    "vue-router": "4.2.5",
-    "vue-select": "4.0.0-beta.6",
     "vue-style-loader": "^4.1.3",
     "vue-styleguidist": "^4.72.4",
-    "vue3-gettext": "2.4.0",
     "web-test-helpers": "workspace:*",
-    "webfontloader": "^1.6.28",
     "webpack": "^5.89.0",
     "webpack-bundle-analyzer": "^4.10.1",
-    "webpack-dev-server": "^5.0.4",
+    "webpack-dev-server": "^3.11.3",
     "webpack-merge": "^5.10.0",
     "webpack-merge-and-include-globally": "^2.3.4",
     "webpack-node-externals": "^3.0.0",
     "yaml": "^2.3.4"
   },
   "peerDependencies": {
-    "@popperjs/core": "^2.11.5",
+    "deepmerge": "^4.2.2",
     "filesize": "^10.1.0",
-    "focus-trap": "7.5.4",
     "focus-trap-vue": "^4.0.1",
-    "postcss-import": "^16.1.0",
-    "tippy.js": "^6.3.7",
+    "focus-trap": "7.5.4",
+    "fuse.js": "6.6.2",
+    "lodash-es": "4.17.21",
+    "luxon": "3.5.0",
+    "vue-router": "4.2.5",
     "vue": "3.4.21",
-    "vue-inline-svg": "3.1.3",
-    "webfontloader": "^1.6.28",
-    "luxon": "3.5.0"
+    "vue3-gettext": "2.4.0"
   },
   "engines": {
     "node": ">= 14.0.0",

packages/web-app-admin-settings/package.json

@@ -5,25 +5,24 @@
   "description": "ownCloud admin settings",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@types/mark.js": "8.11.12",
-    "@types/uuid": "9.0.8",
     "web-test-helpers": "workspace:*"
   },
   "dependencies": {
-    "deep-object-diff": "^1.1.9",
-    "email-validator": "^2.0.4",
-    "mark.js": "^8.11.1"
+    "deep-object-diff": "^1.1.9"
   },
   "peerDependencies": {
     "@ownclouders/web-client": "workspace:*",
     "@ownclouders/web-pkg": "workspace:*",
     "axios": "1.7.5",
     "design-system": "workspace:@ownclouders/design-system@*",
+    "email-validator": "^2.0.4",
     "fuse.js": "6.6.2",
     "lodash-es": "4.17.21",
+    "mark.js": "^8.11.1",
     "pinia": "2.2.2",
     "uuid": "9.0.1",
     "vue-concurrency": "5.0.1",
+    "vue-router": "4.2.5",
     "web-app-admin-settings": "workspace:*"
   }
 }

packages/web-app-app-store/package.json

@@ -5,22 +5,19 @@
   "description": "ownCloud app store",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@types/mark.js": "8.11.12",
     "web-test-helpers": "workspace:*"
   },
-  "dependencies": {
-    "mark.js": "^8.11.1"
-  },
   "peerDependencies": {
     "@ownclouders/web-client": "workspace:*",
     "@ownclouders/web-pkg": "workspace:*",
     "axios": "1.7.5",
     "design-system": "workspace:@ownclouders/design-system@*",
     "fuse.js": "6.6.2",
     "lodash-es": "4.17.21",
+    "mark.js": "^8.11.1",
     "pinia": "2.2.2",
     "vue-concurrency": "5.0.1",
-    "web-app-app-store": "workspace:*",
+    "vue-router": "4.2.5",
     "zod": "3.23.8"
   }
 }

packages/web-app-external/package.json

@@ -5,7 +5,6 @@
   "description": "ownCloud web integration of the reva app provider",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@types/uuid": "9.0.8",
     "web-test-helpers": "workspace:*"
   },
   "peerDependencies": {
@@ -16,6 +15,7 @@
     "uuid": "9.0.1",
     "vue-concurrency": "5.0.1",
     "vue3-gettext": "2.4.0",
+    "vue-router": "4.2.5",
     "zod": "3.23.8"
   }
 }

packages/web-app-files/package.json

@@ -4,31 +4,23 @@
   "private": true,
   "description": "ownCloud web files",
   "license": "AGPL-3.0",
-  "dependencies": {
-    "mark.js": "^8.11.1"
-  },
   "devDependencies": {
-    "@types/dompurify": "3.0.5",
-    "@types/luxon": "3.2.1",
-    "@types/mark.js": "8.11.12",
-    "@types/uuid": "9.0.8",
-    "@vueuse/core": "^10.3.0",
     "web-test-helpers": "workspace:*"
   },
   "peerDependencies": {
     "@ownclouders/web-client": "workspace:*",
     "@ownclouders/web-pkg": "workspace:*",
-    "@uppy/core": "3.3.0",
-    "@uppy/dashboard": "3.4.1",
-    "@uppy/onedrive": "3.1.1",
+    "@uppy/core": "^3.3.0",
     "@vueuse/core": "^10.3.0",
     "axios": "1.7.5",
     "design-system": "workspace:@ownclouders/design-system@*",
+    "dompurify": "^3.0.6",
     "email-validator": "^2.0.4",
     "filesize": "^10.1.0",
     "fuse.js": "6.6.2",
     "lodash-es": "4.17.21",
     "luxon": "3.5.0",
+    "mark.js": "^8.11.1",
     "p-queue": "^6.6.2",
     "pinia": "2.2.2",
     "qs": "6.13.0",
@@ -37,8 +29,6 @@
     "vue-router": "4.2.5",
     "vue3-gettext": "2.4.0",
     "web-app-files": "workspace:*",
-    "web-app-search": "workspace:*",
-    "web-runtime": "workspace:*",
-    "dompurify": "^3.0.6"
+    "web-app-search": "workspace:*"
   }
 }

packages/web-app-files/src/services/folder.ts

@@ -14,7 +14,9 @@ import {
   ResourcesStore,
   useResourcesStore,
   SharesStore,
-  useSharesStore
+  useSharesStore,
+  useAuthService,
+  AuthServiceInterface
 } from '@ownclouders/web-pkg'
 import { unref } from 'vue'
 import { ClientService } from '@ownclouders/web-pkg'
@@ -41,6 +43,7 @@ export type TaskContext = {
   capabilityStore: CapabilityStore
   resourcesStore: ResourcesStore
   sharesStore: SharesStore
+  authService: AuthServiceInterface
 }
 
 export interface FolderLoader {
@@ -72,6 +75,7 @@ export class FolderService {
     const configStore = useConfigStore()
     const resourcesStore = useResourcesStore()
     const sharesStore = useSharesStore()
+    const authService = useAuthService()
 
     const loader = this.loaders.find((l) => l.isEnabled() && l.isActive(unref(router)))
     if (!loader) {
@@ -88,7 +92,8 @@ export class FolderService {
         capabilityStore,
         resourcesStore,
         sharesStore,
-        router
+        router,
+        authService
       }
       try {
         yield loader.getTask(context).perform(...args)

packages/web-app-files/src/services/folder/loaderSpace.ts

@@ -11,7 +11,6 @@ import {
 } from '@ownclouders/web-client'
 import { unref } from 'vue'
 import { FolderLoaderOptions } from './types'
-import { authService } from 'web-runtime/src/services/auth'
 import { useFileRouteReplace } from '@ownclouders/web-pkg'
 import { IncomingShareResource } from '@ownclouders/web-client'
 import { getIndicators } from '@ownclouders/web-pkg'
@@ -33,7 +32,7 @@ export class FolderLoaderSpace implements FolderLoader {
   }
 
   public getTask(context: TaskContext): FolderLoaderTask {
-    const { router, clientService, resourcesStore, userStore } = context
+    const { router, clientService, resourcesStore, userStore, authService } = context
     const { webdav } = clientService
     const { replaceInvalidFileRoute } = useFileRouteReplace({ router })