fix(deps): upgrade devex plugins to mui v5 (janus-idp#1696)

* feat(matomo): upgrade to mui v5 - added `secure` flag to matomo-backend plugin - use backstage fetchApi for new backend system Signed-off-by: Yash Oswal <[email protected]> * feat(feedback): upgrade to mui v5 - switch to backstage `AlertApi` instead of snackbars - use mui 5 styled components - add `themeId` prop to GlobalFeedback component - updated tests - added dynamic loading entrypoint in feedback backend plugin Signed-off-by: Yash Oswal <[email protected]> --------- Signed-off-by: Yash Oswal <[email protected]>
04kash · May 23, 2024 · 06d9cf0 · 06d9cf0
1 parent c2d8da7
commit 06d9cf0
Show file tree

Hide file tree

Showing 27 changed files with 1,123 additions and 705 deletions.
diff --git a/plugins/feedback-backend/dist-dynamic/package.json b/plugins/feedback-backend/dist-dynamic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@janus-idp/backstage-plugin-feedback-backend-dynamic",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
   "license": "Apache-2.0",
@@ -42,7 +42,6 @@
     "config.d.ts",
     "app-config.janus-idp.yaml",
     "migrations/**/*.{js,d.ts}",
-    "dist-dynamic",
     "alpha"
   ],
   "configSchema": "config.d.ts",
@@ -56,6 +55,7 @@
   "bundleDependencies": true,
   "peerDependencies": {
     "@backstage/backend-common": "^0.21.7",
+    "@backstage/backend-dynamic-feature-service": "^0.2.10",
     "@backstage/backend-plugin-api": "^0.6.17",
     "@backstage/backend-test-utils": "^0.3.7",
     "@backstage/catalog-client": "^1.6.4",

diff --git a/plugins/feedback-backend/dist-dynamic/yarn.lock b/plugins/feedback-backend/dist-dynamic/yarn.lock
@@ -55,9 +55,9 @@
     "@types/node" "*"
 
 "@types/express-serve-static-core@^4.17.33":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.0.tgz#3ae8ab3767d98d0b682cda063c3339e1e86ccfaa"
-  integrity sha512-bGyep3JqPCRry1wq+O5n7oiBgGWmeIJXPjXXCo8EK0u8duZGSYar7cGqd3ML2JUsLGeB7fmc06KYo9fLGWqPvQ==
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.1.tgz#57d34698bb580720fd6e3c360d4b2fdef579b979"
+  integrity sha512-ej0phymbFLoCB26dbbq5PGScsf2JAJ4IJHjG10LalgUV36XKTmA4GdA+PVllKvRk0sEKt64X8975qFnkSi0hqA==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -152,9 +152,9 @@ asynckit@^0.4.0:
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 axios@^1.6.4:
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
-  integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
+  integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"

diff --git a/plugins/feedback-backend/package.json b/plugins/feedback-backend/package.json
@@ -40,6 +40,7 @@
   },
   "dependencies": {
     "@backstage/backend-common": "^0.21.7",
+    "@backstage/backend-dynamic-feature-service": "^0.2.10",
     "@backstage/backend-plugin-api": "^0.6.17",
     "@backstage/backend-test-utils": "^0.3.7",
     "@backstage/catalog-client": "^1.6.4",
@@ -69,7 +70,9 @@
     "config.d.ts",
     "app-config.janus-idp.yaml",
     "migrations/**/*.{js,d.ts}",
-    "dist-dynamic"
+    "dist-dynamic/*.*",
+    "dist-dynamic/dist/**",
+    "dist-dynamic/alpha/*"
   ],
   "configSchema": "config.d.ts",
   "repository": "github:janus-idp/backstage-plugins",

diff --git a/plugins/feedback-backend/src/dynamic/inedx.ts b/plugins/feedback-backend/src/dynamic/inedx.ts
@@ -0,0 +1,8 @@
+import { BackendDynamicPluginInstaller } from '@backstage/backend-dynamic-feature-service';
+
+import { feedbackPlugin } from '../plugin';
+
+export const dynamicPluginInstaller: BackendDynamicPluginInstaller = {
+  kind: 'new',
+  install: () => feedbackPlugin(),
+};
diff --git a/plugins/feedback/package.json b/plugins/feedback/package.json
@@ -31,9 +31,8 @@
     "@backstage/core-plugin-api": "^1.9.2",
     "@backstage/plugin-catalog-react": "^1.11.3",
     "@backstage/theme": "^0.5.3",
-    "@material-ui/core": "^4.9.13",
-    "@material-ui/icons": "^4.9.1",
-    "@material-ui/lab": "^4.0.0-alpha.61",
+    "@mui/icons-material": "^5.15.18",
+    "@mui/material": "^5.15.18",
     "@one-platform/opc-feedback": "0.1.1-alpha",
     "axios": "^1.6.4",
     "react-use": "^17.2.4"