chore: remove @janus-idp/cli dep and relink local packages (#2456)

* chore: remove @janus-idp/cli dep and relink local packages Signed-off-by: Paul Schultz <pschultz@pobox.com> * add missing dep Signed-off-by: Paul Schultz <pschultz@pobox.com> --------- Signed-off-by: Paul Schultz <pschultz@pobox.com>
janus-idp · Oct 29, 2024 · 7342e9b · 7342e9b
1 parent fd60ddd
commit 7342e9b
Show file tree

Hide file tree

Showing 38 changed files with 114 additions and 237 deletions.
diff --git a/.changeset/tame-ways-guess.md b/.changeset/tame-ways-guess.md
@@ -0,0 +1,34 @@
+---
+"@janus-idp/backstage-scaffolder-backend-module-annotator": patch
+"@janus-idp/backstage-plugin-analytics-provider-segment": 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
+---
+
+chore: remove @janus-idp/cli dep and relink local packages
+
+This update removes `@janus-idp/cli` from all plugins, as it’s no longer necessary. Additionally, packages are now correctly linked with a specified version.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -15,7 +15,7 @@ env:
 # enforce only one release action per release branch at a time
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: false
+  cancel-in-progress: true
 
 jobs:
   release:

diff --git a/.github/workflows/update-changeset-prs.yaml b/.github/workflows/update-changeset-prs.yaml
@@ -8,7 +8,7 @@ on:
 # enforce only one release action per release branch at a time
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: false
+  cancel-in-progress: true
 
 jobs:
   prev-commit:

diff --git a/package.json b/package.json
@@ -27,9 +27,7 @@
     "prettier:fix": "turbo run prettier:fix",
     "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",
+    "versions:bump": "backstage-cli versions:bump --skip-install && find . -name 'package.json' ! -path '*/node_modules/*' -exec sed -i -e '/devDependencies/,/\\\\}/{ s/\\\"\\\\^/\\\"/g; }' {} \\; && yarn install",
     "packages:version": "changeset version",
     "packages:publish": "turbo run build --concurrency=75% --filter='@janus-idp/*' && changeset publish"
   },

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -48,6 +48,7 @@
     "@backstage/plugin-techdocs-react": "1.2.8",
     "@backstage/plugin-user-settings": "0.8.13",
     "@emotion/react": "11.11.4",
+    "@emotion/styled": "^11.13.0",
     "@mui/icons-material": "5.15.16",
     "@mui/material": "5.15.16",
     "@mui/styles": "5.15.16",

diff --git a/plugins/aap-backend/package.json b/plugins/aap-backend/package.json
@@ -27,12 +27,9 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "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",
-    "postversion": "yarn run export-dynamic",
     "prepack": "backstage-cli package prepack",
     "start": "backstage-cli package start",
     "test": "backstage-cli package test --passWithNoTests --coverage",
@@ -52,7 +49,6 @@
     "@backstage/cli": "0.27.1",
     "@backstage/config": "1.2.0",
     "@backstage/plugin-catalog-backend": "1.26.1",
-    "@janus-idp/cli": "1.16.1",
     "@types/supertest": "2.0.16",
     "msw": "1.3.3",
     "prettier": "3.3.3",

diff --git a/plugins/analytics-module-matomo/package.json b/plugins/analytics-module-matomo/package.json
@@ -22,8 +22,6 @@
   "scripts": {
     "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 .",
@@ -45,7 +43,6 @@
     "@backstage/core-app-api": "1.15.0",
     "@backstage/dev-utils": "1.1.1",
     "@backstage/test-utils": "1.6.0",
-    "@janus-idp/cli": "1.16.1",
     "@redhat-developer/red-hat-developer-hub-theme": "0.4.0",
     "@testing-library/jest-dom": "6.4.8",
     "@testing-library/react": "14.3.1",

diff --git a/plugins/analytics-provider-segment/package.json b/plugins/analytics-provider-segment/package.json
@@ -22,8 +22,6 @@
   "scripts": {
     "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 .",
@@ -56,7 +54,6 @@
     "@backstage/core-app-api": "1.15.0",
     "@backstage/dev-utils": "1.1.1",
     "@backstage/test-utils": "1.6.0",
-    "@janus-idp/cli": "1.16.1",
     "@redhat-developer/red-hat-developer-hub-theme": "0.4.0",
     "@testing-library/dom": "9.3.4",
     "@testing-library/jest-dom": "6.4.8",

diff --git a/plugins/bulk-import-backend/package.json b/plugins/bulk-import-backend/package.json
@@ -31,12 +31,9 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "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",
-    "postversion": "yarn run export-dynamic",
     "prepack": "backstage-cli package prepack",
     "start": "backstage-cli package start",
     "test": "backstage-cli package test --passWithNoTests --coverage --detectOpenHandles",
@@ -53,7 +50,7 @@
     "@backstage/plugin-catalog-node": "^1.13.0",
     "@backstage/plugin-permission-common": "^0.8.1",
     "@backstage/plugin-permission-node": "^0.8.3",
-    "@janus-idp/backstage-plugin-bulk-import-common": "*",
+    "@janus-idp/backstage-plugin-bulk-import-common": "^1.2.0",
     "@octokit/auth-app": "^6.0.3",
     "@octokit/rest": "^20.0.2",
     "ajv-formats": "^3.0.1",
@@ -71,7 +68,6 @@
     "@backstage/cli": "0.27.1",
     "@backstage/config": "1.2.0",
     "@backstage/plugin-catalog-backend": "1.26.1",
-    "@janus-idp/cli": "1.16.1",
     "@openapitools/openapi-generator-cli": "2.13.4",
     "@types/express": "4.17.1",
     "@types/supertest": "2.0.16",
@@ -82,7 +78,7 @@
     "supertest": "6.3.4"
   },
   "peerDependencies": {
-    "@janus-idp/backstage-plugin-audit-log-node": "*"
+    "@janus-idp/backstage-plugin-audit-log-node": "^1.6.0"
   },
   "files": [
     "dist",

diff --git a/plugins/bulk-import/package.json b/plugins/bulk-import/package.json
@@ -23,12 +23,9 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "export-dynamic": "janus-cli package export-dynamic-plugin --in-place",
-    "export-dynamic:clean": "janus-cli package export-dynamic-plugin --in-place --clean",
     "lint:check": "backstage-cli package lint",
     "lint:fix": "backstage-cli package lint --fix",
     "postpack": "backstage-cli package postpack",
-    "postversion": "yarn run export-dynamic",
     "prepack": "backstage-cli package prepack",
     "start": "backstage-cli package start",
     "test": "backstage-cli package test --passWithNoTests --coverage",
@@ -45,8 +42,8 @@
     "@backstage/plugin-catalog-react": "^1.13.1",
     "@backstage/plugin-permission-react": "^0.4.26",
     "@backstage/theme": "^0.5.7",
-    "@janus-idp/backstage-plugin-bulk-import-common": "*",
-    "@janus-idp/shared-react": "*",
+    "@janus-idp/backstage-plugin-bulk-import-common": "^1.2.0",
+    "@janus-idp/shared-react": "^2.12.0",
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.61",
@@ -68,7 +65,6 @@
     "@backstage/core-app-api": "1.15.0",
     "@backstage/dev-utils": "1.1.1",
     "@backstage/test-utils": "1.6.0",
-    "@janus-idp/cli": "1.16.1",
     "@playwright/test": "1.45.3",
     "@redhat-developer/red-hat-developer-hub-theme": "0.4.0",
     "@testing-library/jest-dom": "6.4.8",

diff --git a/plugins/jfrog-artifactory/package.json b/plugins/jfrog-artifactory/package.json
@@ -22,12 +22,9 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "export-dynamic": "janus-cli package export-dynamic-plugin --in-place",
-    "export-dynamic:clean": "janus-cli package export-dynamic-plugin --in-place --clean",
     "lint:check": "backstage-cli package lint",
     "lint:fix": "backstage-cli package lint --fix",
     "postpack": "backstage-cli package postpack",
-    "postversion": "yarn run export-dynamic",
     "prepack": "backstage-cli package prepack",
     "start": "backstage-cli package start",
     "test": "backstage-cli package test --passWithNoTests --coverage",
@@ -41,7 +38,7 @@
     "@backstage/core-plugin-api": "^1.9.4",
     "@backstage/plugin-catalog-react": "^1.13.1",
     "@backstage/theme": "^0.5.7",
-    "@janus-idp/shared-react": "*",
+    "@janus-idp/shared-react": "^2.12.0",
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.45",
@@ -56,7 +53,6 @@
     "@backstage/core-app-api": "1.15.0",
     "@backstage/dev-utils": "1.1.1",
     "@backstage/test-utils": "1.6.0",
-    "@janus-idp/cli": "1.16.1",
     "@redhat-developer/red-hat-developer-hub-theme": "0.4.0",
     "@testing-library/jest-dom": "6.4.8",
     "@testing-library/react": "14.3.1",

diff --git a/plugins/keycloak-backend/package.json b/plugins/keycloak-backend/package.json
@@ -28,12 +28,9 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "export-dynamic": "janus-cli package export-dynamic-plugin --embed-package @keycloak/keycloak-admin-client",
-    "export-dynamic:clean": "janus-cli package export-dynamic-plugin --embed-package @keycloak/keycloak-admin-client --clean",
     "lint:check": "backstage-cli package lint",
     "lint:fix": "backstage-cli package lint --fix",
     "postpack": "backstage-cli package postpack",
-    "postversion": "yarn run export-dynamic",
     "prepack": "backstage-cli package prepack",
     "start": "opener http://localhost:8080/admin/master/console/#/janus-realm && opener http://localhost:7007/catalog/entities && turbo run start:plugin start:keycloak",
     "start:keycloak": "podman run -p 8080:8080 -e 'KEYCLOAK_ADMIN=admin' -e 'KEYCLOAK_ADMIN_PASSWORD=admin' -v ./__fixtures__/keycloak-realm.json:/opt/keycloak/data/import/keycloak-realm.json$([[ $OSTYPE = linux* ]] && echo ':z') quay.io/keycloak/keycloak:22.0.1 start-dev --import-realm",
@@ -60,7 +57,6 @@
     "@backstage/cli": "0.27.1",
     "@backstage/config": "1.2.0",
     "@backstage/plugin-catalog-backend": "1.26.1",
-    "@janus-idp/cli": "1.16.1",
     "@types/lodash": "4.17.5",
     "@types/uuid": "9.0.8",
     "deepmerge": "4.3.1",

diff --git a/plugins/kiali-backend/package.json b/plugins/kiali-backend/package.json
@@ -38,10 +38,7 @@
     "test": "backstage-cli package test --passWithNoTests --coverage",
     "clean": "backstage-cli package clean",
     "prepack": "backstage-cli package prepack",
-    "postpack": "backstage-cli package postpack",
-    "postversion": "yarn run export-dynamic",
-    "export-dynamic": "janus-cli package export-dynamic-plugin",
-    "export-dynamic:clean": "janus-cli package export-dynamic-plugin --clean"
+    "postpack": "backstage-cli package postpack"
   },
   "configSchema": "config.d.ts",
   "dependencies": {
@@ -60,7 +57,6 @@
   "devDependencies": {
     "@backstage/backend-test-utils": "1.0.0",
     "@backstage/cli": "0.27.1",
-    "@janus-idp/cli": "1.16.1",
     "@types/express": "4.17.21",
     "@types/supertest": "2.0.16",
     "msw": "1.3.3",

diff --git a/plugins/kiali/package.json b/plugins/kiali/package.json
@@ -22,12 +22,9 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "export-dynamic": "janus-cli package export-dynamic-plugin --in-place",
-    "export-dynamic:clean": "janus-cli package export-dynamic-plugin --in-place --clean",
     "lint:check": "backstage-cli package lint",
     "lint:fix": "backstage-cli package lint --fix",
     "postpack": "backstage-cli package postpack",
-    "postversion": "yarn run export-dynamic",
     "prepack": "backstage-cli package prepack",
     "start": "backstage-cli package start",
     "test": "backstage-cli package test --passWithNoTests --coverage",
@@ -82,7 +79,6 @@
     "@backstage/cli": "0.27.1",
     "@backstage/dev-utils": "1.1.1",
     "@backstage/test-utils": "1.6.0",
-    "@janus-idp/cli": "1.16.1",
     "@playwright/test": "1.45.3",
     "@redhat-developer/red-hat-developer-hub-theme": "0.4.0",
     "@testing-library/jest-dom": "6.4.8",

diff --git a/plugins/kubernetes-actions/package.json b/plugins/kubernetes-actions/package.json
@@ -36,10 +36,7 @@
     "test": "backstage-cli package test --passWithNoTests --coverage",
     "clean": "backstage-cli package clean",
     "prepack": "backstage-cli package prepack",
-    "postpack": "backstage-cli package postpack",
-    "postversion": "yarn run export-dynamic",
-    "export-dynamic": "janus-cli package export-dynamic-plugin",
-    "export-dynamic:clean": "janus-cli package export-dynamic-plugin --clean"
+    "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
     "@backstage/backend-plugin-api": "^1.0.0",
@@ -51,7 +48,6 @@
     "@backstage/catalog-model": "1.7.0",
     "@backstage/cli": "0.27.1",
     "@backstage/plugin-scaffolder-node-test-utils": "0.1.12",
-    "@janus-idp/cli": "1.16.1",
     "msw": "1.3.3",
     "prettier": "3.3.3"
   },

diff --git a/plugins/lightspeed-backend/package.json b/plugins/lightspeed-backend/package.json
@@ -30,12 +30,9 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "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",
-    "postversion": "yarn run export-dynamic",
     "prepack": "backstage-cli package prepack",
     "start": "backstage-cli package start",
     "test": "backstage-cli package test --passWithNoTests --coverage",
@@ -55,7 +52,6 @@
     "@backstage/backend-test-utils": "1.0.0",
     "@backstage/cli": "0.27.1",
     "@backstage/config": "1.2.0",
-    "@janus-idp/cli": "1.16.1",
     "@types/express": "4.17.21",
     "@types/supertest": "2.0.16",
     "msw": "2.4.0",

diff --git a/plugins/lightspeed/package.json b/plugins/lightspeed/package.json
@@ -26,13 +26,10 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "export-dynamic": "janus-cli package export-dynamic-plugin --in-place",
-    "export-dynamic:clean": "janus-cli package export-dynamic-plugin --in-place --clean",
     "lint:check": "backstage-cli package lint",
     "lint:fix": "backstage-cli package lint --fix",
     "postpack": "backstage-cli package postpack",
-    "postversion": "yarn run export-dynamic",
-    "prepack": "backstage-cli package prepack && yarn run export-dynamic",
+    "prepack": "backstage-cli package prepack",
     "start": "backstage-cli package start",
     "test": "backstage-cli package test --passWithNoTests --coverage",
     "tsc": "tsc",
@@ -61,7 +58,6 @@
     "@backstage/core-app-api": "1.15.0",
     "@backstage/dev-utils": "1.1.1",
     "@backstage/test-utils": "1.6.0",
-    "@janus-idp/cli": "1.16.1",
     "@testing-library/jest-dom": "6.4.8",
     "@testing-library/react": "14.3.1",
     "@testing-library/react-hooks": "8.0.1",

diff --git a/plugins/matomo-backend/package.json b/plugins/matomo-backend/package.json
@@ -31,12 +31,9 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "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",
-    "postversion": "yarn run export-dynamic",
     "prepack": "backstage-cli package prepack",
     "start": "backstage-cli package start",
     "test": "backstage-cli package test --passWithNoTests --coverage",
@@ -56,7 +53,6 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.27.1",
-    "@janus-idp/cli": "1.16.1",
     "@types/supertest": "2.0.16",
     "msw": "1.3.3",
     "prettier": "3.3.3",

diff --git a/plugins/matomo/package.json b/plugins/matomo/package.json
@@ -23,12 +23,9 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "export-dynamic": "janus-cli package export-dynamic-plugin --in-place",
-    "export-dynamic:clean": "janus-cli package export-dynamic-plugin --in-place --clean",
     "lint:check": "backstage-cli package lint",
     "lint:fix": "backstage-cli package lint --fix",
     "postpack": "backstage-cli package postpack",
-    "postversion": "yarn run export-dynamic",
     "prepack": "backstage-cli package prepack",
     "start": "backstage-cli package start",
     "test": "backstage-cli package test --passWithNoTests --coverage",
@@ -57,7 +54,6 @@
     "@backstage/core-app-api": "1.15.0",
     "@backstage/dev-utils": "1.1.1",
     "@backstage/test-utils": "1.6.0",
-    "@janus-idp/cli": "1.16.1",
     "@redhat-developer/red-hat-developer-hub-theme": "0.4.0",
     "@testing-library/jest-dom": "6.4.8",
     "@testing-library/react": "14.3.1",