chore(orchestrator): add export-dynamic to scaffolder orchestrator (#389)

* chore(orchestrator): add export-dynamic to scaffolder orchestrator

Signed-off-by: Marek Libra <marek.libra@gmail.com>

* chore(orchestrator): export scaffolder module as a dynamic plugin

add @Red-Hat-Developer-Hub org to the scaffolder module name
update @janus-idp/cli to 3.2.0 from 1.19.1
embed dependencies to pass d/s dynamic plugin build

and additional related fixes.

Signed-off-by: Marek Libra <marek.libra@gmail.com>

* yarn fix --publish

---------

Signed-off-by: Marek Libra <marek.libra@gmail.com>

Author: mareklibra

workspaces/orchestrator/.changeset/moody-crabs-wonder.md

@@ -0,0 +1,5 @@
+---
+'@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator': minor
+---
+
+Added yarn export-dynamic target

workspaces/orchestrator/packages/backend/package.json

@@ -50,8 +50,8 @@
     "@backstage/plugin-signals-backend": "^0.2.3",
     "@backstage/plugin-techdocs-backend": "^1.11.1",
     "@red-hat-developer-hub/backstage-plugin-orchestrator-backend": "workspace:^",
+    "@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator": "workspace:^",
     "app": "link:../app",
-    "backstage-plugin-scaffolder-backend-module-orchestrator": "^0.1.0",
     "better-sqlite3": "^9.0.0",
     "node-gyp": "^10.0.0",
     "pg": "^8.11.3",

workspaces/orchestrator/packages/backend/src/index.ts

@@ -59,7 +59,11 @@ backend.add(
 );
 backend.add(import('@backstage/plugin-notifications-backend'));
 backend.add(import('@backstage/plugin-signals-backend'));
-backend.add(import('backstage-plugin-scaffolder-backend-module-orchestrator'));
+backend.add(
+  import(
+    '@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator'
+  ),
+);
 
 // for integrating templates with github
 backend.add(import('@backstage/plugin-scaffolder-backend-module-github'));

workspaces/orchestrator/plugins/orchestrator-backend/package.json

@@ -94,7 +94,7 @@
     "@backstage/backend-test-utils": "1.0.2",
     "@backstage/cli": "0.28.2",
     "@janus-idp/backstage-plugin-audit-log-node": "^1.7.1",
-    "@janus-idp/cli": "1.19.1",
+    "@janus-idp/cli": "3.2.0",
     "@types/express": "4.17.21",
     "@types/fs-extra": "11.0.4",
     "@types/json-schema": "7.0.15",

workspaces/orchestrator/plugins/orchestrator/package.json

@@ -86,7 +86,7 @@
     "@backstage/dev-utils": "1.1.2",
     "@backstage/test-utils": "1.7.0",
     "@backstage/types": "1.1.1",
-    "@janus-idp/cli": "1.19.1",
+    "@janus-idp/cli": "3.2.0",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.45",

workspaces/orchestrator/plugins/scaffolder-backend-module-orchestrator/README.md

@@ -11,7 +11,7 @@ An example of using these actions can be found in the `workspaces/orchestrator/e
 In `packages/backend/src/index.ts`:
 
 ```
-backend.add(import('backstage-plugin-scaffolder-backend-module-orchestrator'));
+backend.add(import('@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator'));
 ```
 
 # The software template generating templates from workflows - convertWorkflowToTemplate

workspaces/orchestrator/plugins/scaffolder-backend-module-orchestrator/package.json

@@ -1,15 +1,12 @@
 {
-  "name": "backstage-plugin-scaffolder-backend-module-orchestrator",
+  "name": "@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator",
   "description": "The orchestrator module for @backstage/plugin-scaffolder-backend",
   "version": "0.1.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
-  "private": true,
   "publishConfig": {
-    "access": "public",
-    "main": "dist/index.cjs.js",
-    "types": "dist/index.d.ts"
+    "access": "public"
   },
   "repository": {
     "type": "git",
@@ -19,8 +16,33 @@
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "scaffolder",
+    "supported-versions": "1.32.5",
+    "pluginPackages": [
+      "@red-hat-developer-hub/backstage-plugin-orchestrator-common",
+      "@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator"
+    ],
     "pluginPackage": "@backstage/plugin-scaffolder-backend"
   },
+  "bugs": "https://github.com/redhat-developer/rhdh-plugins/issues",
+  "keywords": [
+    "support:tech-preview",
+    "lifecycle:active",
+    "backstage",
+    "plugin",
+    "orchestrator",
+    "workflows"
+  ],
+  "exports": {
+    ".": "./src/index.ts",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -32,23 +54,34 @@
     "prettier:check": "prettier --ignore-unknown --check .",
     "prettier:fix": "prettier --ignore-unknown --write .",
     "lint:check": "backstage-cli package lint",
-    "lint:fix": "backstage-cli package lint --fix"
+    "lint:fix": "backstage-cli package lint --fix",
+    "export-dynamic": "janus-cli package export-dynamic-plugin --no-embed-as-dependencies --embed-package '@red-hat-developer-hub/backstage-plugin-orchestrator-common'"
   },
   "dependencies": {
     "@backstage/backend-plugin-api": "^1.0.2",
     "@backstage/catalog-model": "^1.7.0",
     "@backstage/plugin-scaffolder-node": "^0.6.0",
     "@backstage/types": "^1.2.1",
     "@red-hat-developer-hub/backstage-plugin-orchestrator-common": "workspace:^",
-    "axios": "^1.7.7",
+    "axios": "^1.7.9",
     "js-yaml": "^4.1.0"
   },
   "devDependencies": {
     "@backstage/cli": "^0.29.0",
     "@backstage/plugin-scaffolder-node-test-utils": "^0.1.15",
+    "@janus-idp/cli": "3.2.0",
     "@spotify/prettier-config": "^15.0.0"
   },
   "files": [
-    "dist"
+    "app-config.yaml",
+    "dist",
+    "dist-dynamic/*.*",
+    "dist-dynamic/dist/**",
+    "static"
+  ],
+  "maintainers": [
+    "@mlibra",
+    "@batzionb",
+    "@gciavarrini"
   ]
 }

workspaces/orchestrator/plugins/scaffolder-backend-module-orchestrator/report.api.md

@@ -1,4 +1,4 @@
-## API Report File for "backstage-plugin-scaffolder-backend-module-orchestrator"
+## API Report File for "@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator"
 
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 

workspaces/orchestrator/yarn.lock

@@ -8367,17 +8367,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@janus-idp/cli@npm:1.19.1":
-  version: 1.19.1
-  resolution: "@janus-idp/cli@npm:1.19.1"
+"@janus-idp/cli@npm:3.2.0":
+  version: 3.2.0
+  resolution: "@janus-idp/cli@npm:3.2.0"
   dependencies:
-    "@backstage/cli-common": ^0.1.14
-    "@backstage/cli-node": ^0.2.9
-    "@backstage/config": ^1.2.0
-    "@backstage/config-loader": ^1.9.1
-    "@backstage/errors": ^1.2.4
+    "@backstage/cli-common": ^0.1.15
+    "@backstage/cli-node": ^0.2.12
+    "@backstage/config": ^1.3.2
+    "@backstage/config-loader": ^1.9.5
+    "@backstage/errors": ^1.2.7
     "@backstage/eslint-plugin": ^0.1.10
-    "@backstage/types": ^1.1.1
+    "@backstage/types": ^1.2.1
     "@manypkg/get-packages": ^1.1.3
     "@openshift/dynamic-plugin-sdk-webpack": ^3.0.0
     "@pmmmwh/react-refresh-webpack-plugin": ^0.5.7
@@ -8415,7 +8415,7 @@ __metadata:
     react-dev-utils: ^12.0.0-next.60
     react-refresh: ^0.14.0
     recursive-readdir: ^2.2.2
-    rollup: ^2.78.0
+    rollup: ^4.0.0
     rollup-plugin-dts: ^4.0.1
     rollup-plugin-esbuild: ^4.7.2
     rollup-plugin-postcss: ^4.0.0
@@ -8436,7 +8436,7 @@ __metadata:
       optional: true
   bin:
     janus-cli: bin/janus-cli
-  checksum: f9418392f21e88d6eb24a4520b57e9446207bef696a7fbf212562fb3721f105141d9e975935db25bf27431513af9aad8ddfad2d29716a607cb0a4fcc844b73b4
+  checksum: ac5121095765b0b9224b96d2546c852a81d167004fdc48638c3cc36796b784b564d16d0d6e72f9b32c45889ac0976f634dfaf0ca2053ae5aeb64af0a3d3b7b00
   languageName: node
   linkType: hard
 
@@ -12254,7 +12254,7 @@ __metadata:
     "@backstage/plugin-scaffolder-backend": ^1.26.2
     "@backstage/plugin-scaffolder-node": ^0.5.0
     "@janus-idp/backstage-plugin-audit-log-node": ^1.7.1
-    "@janus-idp/cli": 1.19.1
+    "@janus-idp/cli": 3.2.0
     "@red-hat-developer-hub/backstage-plugin-orchestrator-common": "workspace:^"
     "@types/express": 4.17.21
     "@types/fs-extra": 11.0.4
@@ -12385,7 +12385,7 @@ __metadata:
     "@backstage/plugin-permission-react": 0.4.27
     "@backstage/test-utils": 1.7.0
     "@backstage/types": 1.1.1
-    "@janus-idp/cli": 1.19.1
+    "@janus-idp/cli": 3.2.0
     "@kie-tools-core/editor": ^0.32.0
     "@kie-tools-core/notifications": ^0.32.0
     "@kie-tools-core/react-hooks": ^0.32.0
@@ -12429,6 +12429,24 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator@workspace:^, @red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator@workspace:plugins/scaffolder-backend-module-orchestrator":
+  version: 0.0.0-use.local
+  resolution: "@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator@workspace:plugins/scaffolder-backend-module-orchestrator"
+  dependencies:
+    "@backstage/backend-plugin-api": ^1.0.2
+    "@backstage/catalog-model": ^1.7.0
+    "@backstage/cli": ^0.29.0
+    "@backstage/plugin-scaffolder-node": ^0.6.0
+    "@backstage/plugin-scaffolder-node-test-utils": ^0.1.15
+    "@backstage/types": ^1.2.1
+    "@janus-idp/cli": 3.2.0
+    "@red-hat-developer-hub/backstage-plugin-orchestrator-common": "workspace:^"
+    "@spotify/prettier-config": ^15.0.0
+    axios: ^1.7.9
+    js-yaml: ^4.1.0
+  languageName: unknown
+  linkType: soft
+
 "@redhat-developer/red-hat-developer-hub-theme@npm:0.4.0, @redhat-developer/red-hat-developer-hub-theme@npm:^0.4.0":
   version: 0.4.0
   resolution: "@redhat-developer/red-hat-developer-hub-theme@npm:0.4.0"
@@ -18105,11 +18123,11 @@ __metadata:
     "@backstage/plugin-signals-backend": ^0.2.3
     "@backstage/plugin-techdocs-backend": ^1.11.1
     "@red-hat-developer-hub/backstage-plugin-orchestrator-backend": "workspace:^"
+    "@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator": "workspace:^"
     "@types/express": ^4.17.6
     "@types/express-serve-static-core": ^4.17.5
     "@types/luxon": ^2.0.4
     app: "link:../app"
-    backstage-plugin-scaffolder-backend-module-orchestrator: ^0.1.0
     better-sqlite3: ^9.0.0
     node-gyp: ^10.0.0
     pg: ^8.11.3
@@ -18124,23 +18142,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"backstage-plugin-scaffolder-backend-module-orchestrator@^0.1.0, backstage-plugin-scaffolder-backend-module-orchestrator@workspace:plugins/scaffolder-backend-module-orchestrator":
-  version: 0.0.0-use.local
-  resolution: "backstage-plugin-scaffolder-backend-module-orchestrator@workspace:plugins/scaffolder-backend-module-orchestrator"
-  dependencies:
-    "@backstage/backend-plugin-api": ^1.0.2
-    "@backstage/catalog-model": ^1.7.0
-    "@backstage/cli": ^0.29.0
-    "@backstage/plugin-scaffolder-node": ^0.6.0
-    "@backstage/plugin-scaffolder-node-test-utils": ^0.1.15
-    "@backstage/types": ^1.2.1
-    "@red-hat-developer-hub/backstage-plugin-orchestrator-common": "workspace:^"
-    "@spotify/prettier-config": ^15.0.0
-    axios: ^1.7.7
-    js-yaml: ^4.1.0
-  languageName: unknown
-  linkType: soft
-
 "bail@npm:^2.0.0":
   version: 2.0.2
   resolution: "bail@npm:2.0.2"
@@ -34553,20 +34554,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^2.78.0":
-  version: 2.79.2
-  resolution: "rollup@npm:2.79.2"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: df7aa4c8b95245dede157b06ab71e1921de6080757d30e9bf31f8fb142064d12dda865e2bafbab4349588f43425b2965a290c9a5da1c048246a70fc21734ebd7
-  languageName: node
-  linkType: hard
-
 "rollup@npm:^4.0.0":
   version: 4.24.0
   resolution: "rollup@npm:4.24.0"