From c69ac0ce7cfa11cb24fc34b326734844a419a085 Mon Sep 17 00:00:00 2001
From: Pascal Wengerter <pascal@wengerter.info>
Date: Mon, 19 Dec 2022 22:23:55 +0100
Subject: [PATCH] Sort design-system dependencies, add web-client as peerDep

---
 packages/design-system/package.json | 19 ++++++++++---------
 pnpm-lock.yaml                      |  3 +++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 1bea794afcd..5e0554c190e 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -65,20 +65,20 @@
     "depcheck": "^1.3.1",
     "file-loader": "^6.2.0",
     "filesize": "^9.0.9",
-    "focus-trap-vue": "^1.1.1",
     "focus-trap": "^6.4.0",
+    "focus-trap-vue": "^1.1.1",
     "fuse.js": "^6.4.6",
     "glob": "^8.0.3",
     "html-loader": "^1.3.2",
+    "jest": "^28.0.2",
     "jest-axe": "^6.0.0",
     "jest-environment-jsdom": "^28.0.2",
     "jest-serializer-vue": "^2.0.2",
-    "jest": "^28.0.2",
     "luxon": "^3.0.1",
     "mini-css-extract-plugin": "^1.3.1",
     "node-notifier": "^10.0.0",
-    "npm-run-all": "^4.1.5",
     "npm": "^8.0.0",
+    "npm-run-all": "^4.1.5",
     "onchange": "^7.1.0",
     "optimize-css-assets-webpack-plugin": "^6.0.1",
     "popper-max-size-modifier": "^0.2.0",
@@ -88,25 +88,26 @@
     "postcss-url": "^9.0.0",
     "prettier": "^2.3.2",
     "process": "^0.11.10",
-    "react-dom": "^18.0.0",
     "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "rimraf": "^3.0.2",
+    "sass": "1.56.2",
     "sass-loader": "^10.1.0",
     "sass-resources-loader": "^2.0.1",
-    "sass": "1.56.2",
     "semver": "^7.1.3",
     "shelljs": "^0.8.3",
     "style-dictionary": "^3.0.0-rc.8",
     "style-loader": "^2.0.0",
     "style-value-types": "^5.0.0",
+    "stylelint": "^14.14.0",
     "stylelint-config-sass-guidelines": "^9.0.0",
     "stylelint-config-standard": "^26.0.0",
-    "stylelint": "^14.14.0",
     "tinycolor2": "^1.4.2",
     "tippy.js": "^6.3.7",
     "typescript": "^4.3.2",
     "url-loader": "^4.1.1",
     "v-calendar": "^2.3.4",
+    "vue": "2.7.14",
     "vue-gettext": "^2.1.12",
     "vue-inline-svg": "^2.0.0",
     "vue-jest": "^3.0.4",
@@ -114,14 +115,13 @@
     "vue-select": "^3.12.0",
     "vue-style-loader": "^4.1.2",
     "vue-styleguidist": "^4.44.2",
-    "vue": "2.7.14",
     "web-test-helpers": "workspace:*",
     "webfontloader": "^1.6.28",
+    "webpack": "^4.41.6",
     "webpack-bundle-analyzer": "^4.2.0",
-    "webpack-merge-and-include-globally": "^2.1.24",
     "webpack-merge": "^5.4.0",
+    "webpack-merge-and-include-globally": "^2.1.24",
     "webpack-node-externals": "^3.0.0",
-    "webpack": "^4.41.6",
     "yaml": "^2.0.0"
   },
   "peerDependencies": {
@@ -138,6 +138,7 @@
     "vue": "^2.7.13",
     "vue-inline-svg": "^2.0.0",
     "vue-select": "^3.12.0",
+    "web-client": "npm:@ownclouders/web-client",
     "webfontloader": "^1.6.28"
   },
   "engines": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 20ee333f383..c5d1ad1de05 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -251,6 +251,7 @@ importers:
       vue-select: ^3.12.0
       vue-style-loader: ^4.1.2
       vue-styleguidist: ^4.44.2
+      web-client: npm:@ownclouders/web-client
       web-test-helpers: workspace:*
       webfontloader: ^1.6.28
       webpack: ^4.41.6
@@ -259,6 +260,8 @@ importers:
       webpack-merge-and-include-globally: ^2.1.24
       webpack-node-externals: ^3.0.0
       yaml: ^2.0.0
+    dependencies:
+      web-client: link:../web-client
     devDependencies:
       '@adobe/leonardo-contrast-colors': 1.0.0-alpha.16_uknaqjiop66j4kgrr7nmysu5gi
       '@babel/core': 7.19.6