Merge branch 'main' into bulk-import-reactQuery

.changeset/calm-cougars-behave.md

@@ -0,0 +1,32 @@
+---
+"@janus-idp/backstage-plugin-analytics-provider-segment": patch
+"@janus-idp/backstage-plugin-openshift-image-registry": patch
+"@janus-idp/backstage-plugin-analytics-module-matomo": patch
+"@janus-idp/backstage-plugin-orchestrator-form-react": patch
+"@janus-idp/backstage-plugin-orchestrator-backend": patch
+"@janus-idp/backstage-plugin-bulk-import-backend": patch
+"@janus-idp/backstage-scaffolder-backend-module-kubernetes": patch
+"@janus-idp/backstage-scaffolder-backend-module-servicenow": patch
+"@janus-idp/backstage-plugin-jfrog-artifactory": patch
+"@janus-idp/backstage-scaffolder-backend-module-sonarqube": patch
+"@janus-idp/backstage-plugin-keycloak-backend": patch
+"@janus-idp/backstage-plugin-matomo-backend": patch
+"@janus-idp/backstage-plugin-kiali-backend": patch
+"@janus-idp/backstage-scaffolder-backend-module-regex": patch
+"@janus-idp/backstage-plugin-orchestrator": patch
+"@janus-idp/backstage-scaffolder-backend-module-quay": patch
+"@janus-idp/backstage-plugin-rbac-backend": patch
+"@janus-idp/backstage-plugin-web-terminal": patch
+"@janus-idp/backstage-plugin-aap-backend": patch
+"@janus-idp/backstage-plugin-bulk-import": patch
+"@janus-idp/backstage-plugin-ocm-backend": patch
+"@janus-idp/backstage-plugin-topology": patch
+"@janus-idp/backstage-plugin-matomo": patch
+"@janus-idp/backstage-plugin-tekton": patch
+"@janus-idp/backstage-plugin-kiali": patch
+"@janus-idp/backstage-plugin-quay": patch
+"@janus-idp/backstage-plugin-rbac": patch
+"@janus-idp/backstage-plugin-ocm": patch
+---
+
+Change local package references to a `*`

.changeset/green-trees-fly.md

@@ -0,0 +1,5 @@
+---
+"@janus-idp/shared-react": minor
+---
+
+Modified the package to enable the StatusIcon component to accept className as a prop

.changeset/heavy-mails-doubt.md

@@ -0,0 +1,5 @@
+---
+"@janus-idp/backstage-plugin-bulk-import": minor
+---
+
+update bulk import ui as per the api response

.changeset/hip-walls-kiss.md

@@ -0,0 +1,5 @@
+---
+"@janus-idp/backstage-plugin-ocm": minor
+---
+
+replaced pf-icons with mui icons

.changeset/perfect-ways-marry.md

@@ -0,0 +1,12 @@
+---
+"@janus-idp/backstage-plugin-orchestrator-common": patch
+"@janus-idp/backstage-plugin-bulk-import-common": patch
+"@janus-idp/backstage-plugin-topology-common": patch
+"@janus-idp/backstage-plugin-tekton-common": patch
+"@janus-idp/backstage-plugin-ocm-backend": patch
+"@janus-idp/backstage-plugin-quay-common": patch
+"@janus-idp/backstage-plugin-rbac-common": patch
+"@janus-idp/backstage-plugin-ocm-common": patch
+---
+
+change deps to peer deps in common packages

.changeset/popular-donkeys-flow.md

@@ -0,0 +1,30 @@
+---
+"@janus-idp/backstage-plugin-analytics-provider-segment": patch
+"@janus-idp/backstage-plugin-openshift-image-registry": patch
+"@janus-idp/backstage-plugin-analytics-module-matomo": patch
+"@janus-idp/backstage-plugin-orchestrator-backend": patch
+"@janus-idp/backstage-plugin-bulk-import-backend": patch
+"@janus-idp/backstage-scaffolder-backend-module-kubernetes": patch
+"@janus-idp/backstage-scaffolder-backend-module-servicenow": patch
+"@janus-idp/backstage-plugin-jfrog-artifactory": patch
+"@janus-idp/backstage-scaffolder-backend-module-sonarqube": patch
+"@janus-idp/backstage-plugin-keycloak-backend": patch
+"@janus-idp/backstage-plugin-matomo-backend": patch
+"@janus-idp/backstage-plugin-kiali-backend": patch
+"@janus-idp/backstage-scaffolder-backend-module-regex": patch
+"@janus-idp/backstage-plugin-orchestrator": patch
+"@janus-idp/backstage-scaffolder-backend-module-quay": patch
+"@janus-idp/backstage-plugin-web-terminal": patch
+"@janus-idp/backstage-plugin-aap-backend": patch
+"@janus-idp/backstage-plugin-bulk-import": patch
+"@janus-idp/backstage-plugin-ocm-backend": patch
+"@janus-idp/backstage-plugin-topology": patch
+"@janus-idp/backstage-plugin-matomo": patch
+"@janus-idp/backstage-plugin-tekton": patch
+"@janus-idp/backstage-plugin-kiali": patch
+"@janus-idp/backstage-plugin-quay": patch
+"@janus-idp/backstage-plugin-rbac": patch
+"@janus-idp/backstage-plugin-ocm": patch
+---
+
+pin the @janus-idp/cli package

.changeset/twelve-dancers-press.md

@@ -0,0 +1,17 @@
+---
+"@janus-idp/backstage-scaffolder-backend-module-annotator": patch
+"@janus-idp/backstage-plugin-orchestrator-backend": patch
+"@janus-idp/backstage-plugin-bulk-import-backend": patch
+"@janus-idp/backstage-scaffolder-backend-module-kubernetes": patch
+"@janus-idp/backstage-scaffolder-backend-module-servicenow": patch
+"@janus-idp/backstage-scaffolder-backend-module-sonarqube": patch
+"@janus-idp/backstage-plugin-keycloak-backend": patch
+"@janus-idp/backstage-plugin-matomo-backend": patch
+"@janus-idp/backstage-plugin-kiali-backend": patch
+"@janus-idp/backstage-scaffolder-backend-module-regex": patch
+"@janus-idp/backstage-scaffolder-backend-module-quay": patch
+"@janus-idp/backstage-plugin-aap-backend": patch
+"@janus-idp/backstage-plugin-ocm-backend": patch
+---
+
+Change the export-dynamic script to no longer use any flags and remove the tracking of the dist-dynamic folder

.github/workflows/release.yaml

@@ -60,7 +60,6 @@ jobs:
         with:
           title: 'chore(release): version packages on ${{ github.ref_name }} branch'
           commit: 'chore(release): version packages on ${{ github.ref_name }} branch'
-          # We want to make sure an update-to-date yarn lockfile is committed
           version: yarn run packages:version
           publish: yarn run packages:publish
         env:

.gitignore

@@ -32,9 +32,7 @@ node_modules/
 dist
 dist-types
 dist-scalprum
-/plugins/*/dist-dynamic/*
-!/plugins/*/dist-dynamic/package.json
-!/plugins/*/dist-dynamic/yarn.lock
+dist-dynamic
 storybook-static
 
 # Temporary change files created by Vim

package.json

@@ -27,9 +27,9 @@
     "new": "janus-cli new --do-not-edit-packages",
     "prepare": "husky install",
     "export-dynamic": "turbo run export-dynamic",
-    "export-dynamic:clean": "turbo run export-dynamic -- -- --clean",
-    "versions:bump": "backstage-cli versions:bump && find . -name 'package.json' ! -path '*/node_modules/*' -exec sed -i -e '/devDependencies/,/\\\\}/{ s/\\\"\\\\^/\\\"/; }' {} ; && yarn install && turbo run export-dynamic:clean",
-    "packages:version": "changeset version && yarn install && turbo run export-dynamic:clean --concurrency=75% --affected && git add .\\*package.json .\\*yarn.lock",
+    "export-dynamic:clean": "turbo run export-dynamic:clean",
+    "versions:bump": "backstage-cli versions:bump && find . -name 'package.json' ! -path '*/node_modules/*' -exec sed -i -e '/devDependencies/,/\\\\}/{ s/\\\"\\\\^/\\\"/; }' {} ; && yarn install",
+    "packages:version": "changeset version",
     "packages:publish": "turbo run build --concurrency=75% --filter=@janus-idp/* && changeset publish"
   },
   "workspaces": {
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@backstage/cli": "0.27.1",
     "@ianvs/prettier-plugin-sort-imports": "4.2.1",
-    "@janus-idp/cli": "*",
+    "@janus-idp/cli": "1.15.2",
     "@spotify/prettier-config": "15.0.0",
     "eslint-plugin-jest": "27.9.0",
     "husky": "8.0.3",

plugins/aap-backend/package.json

@@ -27,7 +27,8 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "export-dynamic": "janus-cli package export-dynamic-plugin --no-embed-as-dependencies",
+    "export-dynamic": "janus-cli package export-dynamic-plugin",
+    "export-dynamic:clean": "janus-cli package export-dynamic-plugin --clean",
     "lint:check": "backstage-cli package lint",
     "lint:fix": "backstage-cli package lint --fix",
     "postpack": "backstage-cli package postpack",

plugins/analytics-module-matomo/package.json

@@ -23,6 +23,7 @@
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
     "export-dynamic": "janus-cli package export-dynamic-plugin --in-place",
+    "export-dynamic:clean": "janus-cli package export-dynamic-plugin --in-place --clean",
     "tsc": "tsc",
     "prettier:check": "prettier --ignore-unknown --check .",
     "prettier:fix": "prettier --ignore-unknown --write .",

plugins/analytics-provider-segment/package.json

@@ -23,6 +23,7 @@
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
     "export-dynamic": "janus-cli package export-dynamic-plugin --in-place",
+    "export-dynamic:clean": "janus-cli package export-dynamic-plugin --in-place --clean",
     "tsc": "tsc",
     "prettier:check": "prettier --ignore-unknown --check .",
     "prettier:fix": "prettier --ignore-unknown --write .",