From d28944a65404f63dd2974e463234766b1d09f775 Mon Sep 17 00:00:00 2001 From: Tomas Coufal Date: Mon, 6 Nov 2023 11:32:06 +0100 Subject: [PATCH] fix(scalprum): make module optional with PluginRoot fallback Signed-off-by: Tomas Coufal --- app-config.example.yaml | 32 --------- dynamic-plugins.default.yaml | 32 --------- dynamic-plugins/imports/package.json | 12 ++-- .../package.json | 2 +- .../package.json | 4 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../backstage-plugin-dynatrace/package.json | 4 +- .../package.json | 4 +- .../package.json | 4 +- .../package.json | 2 +- .../backstage-plugin-jenkins/package.json | 4 +- .../package.json | 2 +- .../backstage-plugin-kubernetes/package.json | 4 +- .../backstage-plugin-lighthouse/package.json | 4 +- .../backstage-plugin-pagerduty/package.json | 4 +- .../package.json | 2 +- .../package.json | 2 +- .../backstage-plugin-sonarqube/package.json | 4 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 4 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 4 +- .../package.json | 4 +- .../package.json | 4 +- .../package.json | 4 +- .../package.json | 4 +- .../package.json | 4 +- .../package.json | 2 +- .../package.json | 2 +- packages/app/config.d.ts | 4 +- packages/app/package.json | 2 +- .../utils/dynamicUI/extractDynamicConfig.ts | 3 +- yarn.lock | 70 ++----------------- 39 files changed, 63 insertions(+), 188 deletions(-) diff --git a/app-config.example.yaml b/app-config.example.yaml index eb85b2e900..c70c76285b 100644 --- a/app-config.example.yaml +++ b/app-config.example.yaml @@ -105,7 +105,6 @@ dynamicPlugins: backstage.plugin-azure-devops: mountPoints: - mountPoint: entity.page.ci/cards - module: AzureDevopsPlugin importName: EntityAzurePipelinesContent config: layout: @@ -114,7 +113,6 @@ dynamicPlugins: allOf: - isAzureDevOpsAvailable - mountPoint: entity.page.pull-requests/cards - module: AzureDevopsPlugin importName: EntityAzurePullRequestsContent config: layout: @@ -125,7 +123,6 @@ dynamicPlugins: backstage.plugin-dynatrace: mountPoints: - mountPoint: entity.page.monitoring/cards - module: DynatracePlugin importName: DynatraceTab config: layout: @@ -136,7 +133,6 @@ dynamicPlugins: backstage.plugin-github-actions: mountPoints: - mountPoint: entity.page.ci/cards - module: GithubActionsPlugin importName: EntityGithubActionsContent config: layout: @@ -147,7 +143,6 @@ dynamicPlugins: backstage.plugin-github-issues: mountPoints: - mountPoint: entity.page.issues/cards - module: GithubIssuesPlugin importName: GithubIssuesCard config: layout: @@ -158,7 +153,6 @@ dynamicPlugins: backstage.plugin-jenkins: mountPoints: - mountPoint: entity.page.ci/cards - module: JenkinsPlugin importName: EntityJenkinsContent config: layout: @@ -169,7 +163,6 @@ dynamicPlugins: backstage.plugin-kubernetes: mountPoints: - mountPoint: entity.page.kubernetes/cards - module: KubernetesPlugin importName: EntityKubernetesContent config: layout: @@ -181,14 +174,12 @@ dynamicPlugins: backstage.plugin-lighthouse: dynamicRoutes: - path: /lighthouse - module: LighthousePlugin importName: LighthousePage menuItem: icon: Assessment text: Lighthouse mountPoints: - mountPoint: entity.page.overview/cards - module: LighthousePlugin importName: EntityLastLighthouseAuditCard config: layout: @@ -199,7 +190,6 @@ dynamicPlugins: backstage.plugin-pagerduty: mountPoints: - mountPoint: entity.page.overview/cards - module: PagerdutyPlugin importName: EntityPagerDutyCard config: layout: @@ -210,7 +200,6 @@ dynamicPlugins: backstage.plugin-sonarqube: mountPoints: - mountPoint: entity.page.overview/cards - module: SonarQubePlugin importName: EntitySonarQubeCard config: layout: @@ -222,7 +211,6 @@ dynamicPlugins: immobiliarelabs.backstage-plugin-gitlab: mountPoints: - mountPoint: entity.page.overview/cards - module: GitlabPlugin importName: EntityGitlabMergeRequestStatsCard config: layout: @@ -232,7 +220,6 @@ dynamicPlugins: allOf: - isGitlabAvailable - mountPoint: entity.page.ci/cards - module: GitlabPlugin importName: EntityGitlabPipelinesTable config: layout: @@ -241,7 +228,6 @@ dynamicPlugins: allOf: - isGitlabAvailable - mountPoint: entity.page.issues/cards - module: GitlabPlugin importName: EntityGitlabIssuesTable config: layout: @@ -250,7 +236,6 @@ dynamicPlugins: allOf: - isGitlabAvailable - mountPoint: entity.page.pull-requests/cards - module: GitlabPlugin importName: EntityGitlabMergeRequestsTable config: layout: @@ -261,7 +246,6 @@ dynamicPlugins: janus-idp.backstage-plugin-jfrog-artifactory: mountPoints: - mountPoint: entity.page.image-registry/cards - module: JfrogArtifactoryPlugin importName: JfrogArtifactoryPage config: layout: @@ -272,7 +256,6 @@ dynamicPlugins: janus-idp.backstage-plugin-nexus-repository-manager: mountPoints: - mountPoint: entity.page.image-registry/cards - module: NexusRepositoryManagerPlugin importName: NexusRepositoryManagerPage config: layout: @@ -283,17 +266,14 @@ dynamicPlugins: janus-idp.backstage-plugin-ocm: dynamicRoutes: - path: /ocm - module: OcmPlugin importName: OcmPage menuItem: icon: Storage text: Clusters mountPoints: - mountPoint: entity.page.overview/context - module: OcmPlugin importName: ClusterContextProvider - mountPoint: entity.page.overview/cards - module: OcmPlugin importName: ClusterAvailableResourceCard config: layout: @@ -305,7 +285,6 @@ dynamicPlugins: - isType: kubernetes-cluster - mountPoint: entity.page.overview/cards importName: ClusterInfoCard - module: OcmPlugin config: if: allOf: @@ -314,7 +293,6 @@ dynamicPlugins: janus-idp.backstage-plugin-quay: mountPoints: - mountPoint: entity.page.image-registry/cards - module: QuayPlugin importName: QuayPage config: layout: @@ -325,7 +303,6 @@ dynamicPlugins: janus-idp.backstage-plugin-tekton: mountPoints: - mountPoint: entity.page.ci/cards - module: TektonPlugin importName: TektonCI config: layout: @@ -336,7 +313,6 @@ dynamicPlugins: janus-idp.backstage-plugin-topology: mountPoints: - mountPoint: entity.page.topology/cards - module: TopologyPlugin importName: TopologyPage config: layout: @@ -348,7 +324,6 @@ dynamicPlugins: roadiehq.backstage-plugin-argo-cd: mountPoints: - mountPoint: entity.page.overview/cards - module: ArgocdPlugin importName: EntityArgoCDOverviewCard config: layout: @@ -357,7 +332,6 @@ dynamicPlugins: allOf: - isArgocdAvailable - mountPoint: entity.page.cd/cards - module: ArgocdPlugin importName: EntityArgoCDHistoryCard config: layout: @@ -368,7 +342,6 @@ dynamicPlugins: roadiehq.backstage-plugin-datadog: mountPoints: - mountPoint: entity.page.monitoring/cards - module: DatadogPlugin importName: EntityDatadogContent config: layout: @@ -379,7 +352,6 @@ dynamicPlugins: roadiehq.backstage-plugin-github-insights: mountPoints: - mountPoint: entity.page.overview/cards - module: GithubInsightsPlugin importName: EntityGithubInsightsComplianceCard config: layout: @@ -391,7 +363,6 @@ dynamicPlugins: roadiehq.backstage-plugin-github-pull-requests: mountPoints: - mountPoint: entity.page.overview/cards - module: GithubPullRequestsPlugin importName: EntityGithubPullRequestsOverviewCard config: layout: @@ -401,7 +372,6 @@ dynamicPlugins: allOf: - isGithubPullRequestsAvailable - mountPoint: entity.page.pull-requests/cards - module: GithubPullRequestsPlugin importName: EntityGithubPullRequestsContent config: layout: @@ -412,7 +382,6 @@ dynamicPlugins: roadiehq.backstage-plugin-jira: mountPoints: - mountPoint: entity.page.issues/cards - module: JiraPlugin importName: EntityJiraOverviewCard config: layout: @@ -423,7 +392,6 @@ dynamicPlugins: roadiehq.backstage-plugin-security-insights: mountPoints: - mountPoint: entity.page.overview/cards - module: SecurityInsightsPlugin importName: EntityDependabotAlertsCard config: layout: diff --git a/dynamic-plugins.default.yaml b/dynamic-plugins.default.yaml index 1ab94d7811..5b503b0c2d 100644 --- a/dynamic-plugins.default.yaml +++ b/dynamic-plugins.default.yaml @@ -29,7 +29,6 @@ plugins: backstage.plugin-github-actions: mountPoints: - mountPoint: entity.page.ci/cards - module: GithubActionsPlugin importName: EntityGithubActionsContent config: layout: @@ -45,7 +44,6 @@ plugins: backstage.plugin-github-issues: mountPoints: - mountPoint: entity.page.issues/cards - module: GithubIssuesPlugin importName: GithubIssuesCard config: layout: @@ -61,7 +59,6 @@ plugins: roadiehq.backstage-plugin-github-insights: mountPoints: - mountPoint: entity.page.overview/cards - module: GithubInsightsPlugin importName: EntityGithubInsightsComplianceCard config: layout: @@ -78,7 +75,6 @@ plugins: roadiehq.backstage-plugin-github-pull-requests: mountPoints: - mountPoint: entity.page.overview/cards - module: GithubPullRequestsPlugin importName: EntityGithubPullRequestsOverviewCard config: layout: @@ -88,7 +84,6 @@ plugins: allOf: - isGithubPullRequestsAvailable - mountPoint: entity.page.pull-requests/cards - module: GithubPullRequestsPlugin importName: EntityGithubPullRequestsContent config: layout: @@ -104,7 +99,6 @@ plugins: roadiehq.backstage-plugin-security-insights: mountPoints: - mountPoint: entity.page.overview/cards - module: SecurityInsightsPlugin importName: EntityDependabotAlertsCard config: layout: @@ -131,7 +125,6 @@ plugins: immobiliarelabs.backstage-plugin-gitlab: mountPoints: - mountPoint: entity.page.overview/cards - module: GitlabPlugin importName: EntityGitlabMergeRequestStatsCard config: layout: @@ -141,7 +134,6 @@ plugins: allOf: - isGitlabAvailable - mountPoint: entity.page.ci/cards - module: GitlabPlugin importName: EntityGitlabPipelinesTable config: layout: @@ -150,7 +142,6 @@ plugins: allOf: - isGitlabAvailable - mountPoint: entity.page.issues/cards - module: GitlabPlugin importName: EntityGitlabIssuesTable config: layout: @@ -159,7 +150,6 @@ plugins: allOf: - isGitlabAvailable - mountPoint: entity.page.pull-requests/cards - module: GitlabPlugin importName: EntityGitlabMergeRequestsTable config: layout: @@ -216,7 +206,6 @@ plugins: backstage.plugin-kubernetes: mountPoints: - mountPoint: entity.page.kubernetes/cards - module: KubernetesPlugin importName: EntityKubernetesContent config: layout: @@ -233,7 +222,6 @@ plugins: janus-idp.backstage-plugin-topology: mountPoints: - mountPoint: entity.page.topology/cards - module: TopologyPlugin importName: TopologyPage config: layout: @@ -286,7 +274,6 @@ plugins: roadiehq.backstage-plugin-argo-cd: mountPoints: - mountPoint: entity.page.overview/cards - module: ArgocdPlugin importName: EntityArgoCDOverviewCard config: layout: @@ -295,7 +282,6 @@ plugins: allOf: - isArgocdAvailable - mountPoint: entity.page.cd/cards - module: ArgocdPlugin importName: EntityArgoCDHistoryCard config: layout: @@ -322,7 +308,6 @@ plugins: backstage.plugin-azure-devops: mountPoints: - mountPoint: entity.page.ci/cards - module: AzureDevopsPlugin importName: EntityAzurePipelinesContent config: layout: @@ -331,7 +316,6 @@ plugins: allOf: - isAzureDevOpsAvailable - mountPoint: entity.page.pull-requests/cards - module: AzureDevopsPlugin importName: EntityAzurePullRequestsContent config: layout: @@ -360,7 +344,6 @@ plugins: backstage.plugin-jenkins: mountPoints: - mountPoint: entity.page.ci/cards - module: JenkinsPlugin importName: EntityJenkinsContent config: layout: @@ -386,7 +369,6 @@ plugins: backstage.plugin-sonarqube: mountPoints: - mountPoint: entity.page.overview/cards - module: SonarQubePlugin importName: EntitySonarQubeCard config: layout: @@ -418,17 +400,14 @@ plugins: janus-idp.backstage-plugin-ocm: dynamicRoutes: - path: /ocm - module: OcmPlugin importName: OcmPage menuItem: icon: Storage text: Clusters mountPoints: - mountPoint: entity.page.overview/context - module: OcmPlugin importName: ClusterContextProvider - mountPoint: entity.page.overview/cards - module: OcmPlugin importName: ClusterAvailableResourceCard config: layout: @@ -440,7 +419,6 @@ plugins: - isType: kubernetes-cluster - mountPoint: entity.page.overview/cards importName: ClusterInfoCard - module: OcmPlugin config: if: allOf: @@ -505,7 +483,6 @@ plugins: backstage.plugin-dynatrace: mountPoints: - mountPoint: entity.page.monitoring/cards - module: DynatracePlugin importName: DynatraceTab config: layout: @@ -522,7 +499,6 @@ plugins: roadiehq.backstage-plugin-jira: mountPoints: - mountPoint: entity.page.issues/cards - module: JiraPlugin importName: EntityJiraOverviewCard config: layout: @@ -539,7 +515,6 @@ plugins: roadiehq.backstage-plugin-datadog: mountPoints: - mountPoint: entity.page.monitoring/cards - module: DatadogPlugin importName: EntityDatadogContent config: layout: @@ -556,7 +531,6 @@ plugins: janus-idp.backstage-plugin-tekton: mountPoints: - mountPoint: entity.page.ci/cards - module: TektonPlugin importName: TektonCI config: layout: @@ -573,7 +547,6 @@ plugins: janus-idp.backstage-plugin-quay: mountPoints: - mountPoint: entity.page.image-registry/cards - module: QuayPlugin importName: QuayPage config: layout: @@ -590,7 +563,6 @@ plugins: janus-idp.backstage-plugin-nexus-repository-manager: mountPoints: - mountPoint: entity.page.image-registry/cards - module: NexusRepositoryManagerPlugin importName: NexusRepositoryManagerPage config: layout: @@ -607,7 +579,6 @@ plugins: janus-idp.backstage-plugin-jfrog-artifactory: mountPoints: - mountPoint: entity.page.image-registry/cards - module: JfrogArtifactoryPlugin importName: JfrogArtifactoryPage config: layout: @@ -624,7 +595,6 @@ plugins: backstage.plugin-pagerduty: mountPoints: - mountPoint: entity.page.overview/cards - module: PagerdutyPlugin importName: EntityPagerDutyCard config: layout: @@ -641,14 +611,12 @@ plugins: backstage.plugin-lighthouse: dynamicRoutes: - path: /lighthouse - module: LighthousePlugin importName: LighthousePage menuItem: icon: Assessment text: Lighthouse mountPoints: - mountPoint: entity.page.overview/cards - module: LighthousePlugin importName: EntityLastLighthouseAuditCard config: layout: diff --git a/dynamic-plugins/imports/package.json b/dynamic-plugins/imports/package.json index 93e2734d4b..e36e9b8c65 100644 --- a/dynamic-plugins/imports/package.json +++ b/dynamic-plugins/imports/package.json @@ -15,11 +15,11 @@ "tar": "6.2.0" }, "peerDependencies": { - "@janus-idp/backstage-plugin-jfrog-artifactory": "1.2.1", - "@janus-idp/backstage-plugin-nexus-repository-manager": "1.4.1", - "@janus-idp/backstage-plugin-ocm": "3.3.2", - "@janus-idp/backstage-plugin-quay": "1.4.3", - "@janus-idp/backstage-plugin-tekton": "3.1.1", - "@janus-idp/backstage-plugin-topology": "1.16.1" + "@janus-idp/backstage-plugin-jfrog-artifactory": "1.2.3", + "@janus-idp/backstage-plugin-nexus-repository-manager": "1.4.3", + "@janus-idp/backstage-plugin-ocm": "3.3.3", + "@janus-idp/backstage-plugin-quay": "1.4.5", + "@janus-idp/backstage-plugin-tekton": "3.1.2", + "@janus-idp/backstage-plugin-topology": "1.16.3" } } diff --git a/dynamic-plugins/wrappers/backstage-plugin-azure-devops-backend-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-azure-devops-backend-dynamic/package.json index 4f177f1bc2..011ae0cb02 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-azure-devops-backend-dynamic/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-azure-devops-backend-dynamic/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/backstage-plugin-azure-devops/package.json b/dynamic-plugins/wrappers/backstage-plugin-azure-devops/package.json index 350c34e801..f1886ea7f0 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-azure-devops/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-azure-devops/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.1" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "backstage.plugin-azure-devops", "exposedModules": { - "AzureDevopsPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-github-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-github-dynamic/package.json index 366992ac5b..6d99f7d303 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-github-dynamic/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-github-dynamic/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-github-org-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-github-org-dynamic/package.json index b5ca1d4152..cd64a9528e 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-github-org-dynamic/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-github-org-dynamic/package.json @@ -31,7 +31,7 @@ "@backstage/plugin-catalog-backend-module-github": "0.4.4" }, "devDependencies": { - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-gitlab-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-gitlab-dynamic/package.json index 03764fd5c0..85947dcd14 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-gitlab-dynamic/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-gitlab-dynamic/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/backstage-plugin-dynatrace/package.json b/dynamic-plugins/wrappers/backstage-plugin-dynatrace/package.json index 4461a05eda..379235d672 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-dynatrace/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-dynatrace/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "backstage.plugin-dynatrace", "exposedModules": { - "DynatracePlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/backstage-plugin-github-actions/package.json b/dynamic-plugins/wrappers/backstage-plugin-github-actions/package.json index 87a71f9f37..c1159d5ee5 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-github-actions/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-github-actions/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "backstage.plugin-github-actions", "exposedModules": { - "GithubActionsPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/backstage-plugin-github-issues/package.json b/dynamic-plugins/wrappers/backstage-plugin-github-issues/package.json index 21913d0aaa..929a5088ec 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-github-issues/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-github-issues/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "backstage.plugin-github-issues", "exposedModules": { - "GithubIssuesPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/backstage-plugin-jenkins-backend-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-jenkins-backend-dynamic/package.json index 0c44305217..084cc6d7c3 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-jenkins-backend-dynamic/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-jenkins-backend-dynamic/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/backstage-plugin-jenkins/package.json b/dynamic-plugins/wrappers/backstage-plugin-jenkins/package.json index fb65017577..326528d215 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-jenkins/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-jenkins/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "backstage.plugin-jenkins", "exposedModules": { - "JenkinsPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/backstage-plugin-kubernetes-backend-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-kubernetes-backend-dynamic/package.json index 47e0d6fc99..c184399af5 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-kubernetes-backend-dynamic/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-kubernetes-backend-dynamic/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/backstage-plugin-kubernetes/package.json b/dynamic-plugins/wrappers/backstage-plugin-kubernetes/package.json index fb64e982b9..4cabdacb76 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-kubernetes/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-kubernetes/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "backstage.plugin-kubernetes", "exposedModules": { - "KubernetesPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/backstage-plugin-lighthouse/package.json b/dynamic-plugins/wrappers/backstage-plugin-lighthouse/package.json index 0e407a5078..c575ee8917 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-lighthouse/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-lighthouse/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "backstage.plugin-lighthouse", "exposedModules": { - "LighthousePlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/backstage-plugin-pagerduty/package.json b/dynamic-plugins/wrappers/backstage-plugin-pagerduty/package.json index fa48240b92..08423af7c8 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-pagerduty/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-pagerduty/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "backstage.plugin-pagerduty", "exposedModules": { - "PagerdutyPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/backstage-plugin-scaffolder-backend-module-gitlab-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-scaffolder-backend-module-gitlab-dynamic/package.json index 40ae3079e9..df1954623b 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-scaffolder-backend-module-gitlab-dynamic/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-scaffolder-backend-module-gitlab-dynamic/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/backstage-plugin-sonarqube-backend-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-sonarqube-backend-dynamic/package.json index 23d25c6f4e..111d0a65fb 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-sonarqube-backend-dynamic/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-sonarqube-backend-dynamic/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/backstage-plugin-sonarqube/package.json b/dynamic-plugins/wrappers/backstage-plugin-sonarqube/package.json index c19bcc90fb..53f62f71a5 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-sonarqube/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-sonarqube/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "backstage.plugin-sonarqube", "exposedModules": { - "SonarQubePlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/backstage-plugin-techdocs-backend-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-techdocs-backend-dynamic/package.json index cf892e96ef..f8f9c719ad 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-techdocs-backend-dynamic/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-techdocs-backend-dynamic/package.json @@ -36,7 +36,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic/package.json b/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic/package.json index 2e25987702..fb87578f3e 100644 --- a/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic/package.json +++ b/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab/package.json b/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab/package.json index 38abb6a7fe..c9a2e8ed21 100644 --- a/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab/package.json +++ b/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "immobiliarelabs.backstage-plugin-gitlab", "exposedModules": { - "GitlabPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json index 1aba5a3056..809ededeca 100644 --- a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json +++ b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-keycloak-backend-dynamic/package.json b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-keycloak-backend-dynamic/package.json index 2681e176d0..a3c14c1126 100644 --- a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-keycloak-backend-dynamic/package.json +++ b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-keycloak-backend-dynamic/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-ocm-backend-dynamic/package.json b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-ocm-backend-dynamic/package.json index 49b991ef49..d10cf632ed 100644 --- a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-ocm-backend-dynamic/package.json +++ b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-ocm-backend-dynamic/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-argo-cd-backend-dynamic/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-argo-cd-backend-dynamic/package.json index 62085707fb..97e7c161c3 100644 --- a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-argo-cd-backend-dynamic/package.json +++ b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-argo-cd-backend-dynamic/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-argo-cd/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-argo-cd/package.json index 855efb835d..a09865c029 100644 --- a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-argo-cd/package.json +++ b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-argo-cd/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "roadiehq.backstage-plugin-argo-cd", "exposedModules": { - "ArgocdPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-datadog/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-datadog/package.json index 07ef6bfabf..e6c557c2f5 100644 --- a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-datadog/package.json +++ b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-datadog/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "roadiehq.backstage-plugin-datadog", "exposedModules": { - "DatadogPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-github-insights/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-github-insights/package.json index 8b69742b05..f1ad839815 100644 --- a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-github-insights/package.json +++ b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-github-insights/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "roadiehq.backstage-plugin-github-insights", "exposedModules": { - "GithubInsightsPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-github-pull-requests/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-github-pull-requests/package.json index 6501841b90..e06f9d85d7 100644 --- a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-github-pull-requests/package.json +++ b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-github-pull-requests/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "roadiehq.backstage-plugin-github-pull-requests", "exposedModules": { - "GithubPullRequestsPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-jira/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-jira/package.json index a71787948b..7cc2c5cd67 100644 --- a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-jira/package.json +++ b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-jira/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "roadiehq.backstage-plugin-jira", "exposedModules": { - "JiraPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-security-insights/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-security-insights/package.json index 931c57bc0b..c2139dff88 100644 --- a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-security-insights/package.json +++ b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-security-insights/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", @@ -33,7 +33,7 @@ "scalprum": { "name": "roadiehq.backstage-plugin-security-insights", "exposedModules": { - "SecurityInsightsPlugin": "./src/index.ts" + "PluginRoot": "./src/index.ts" } } } diff --git a/dynamic-plugins/wrappers/roadiehq-scaffolder-backend-argocd-dynamic/package.json b/dynamic-plugins/wrappers/roadiehq-scaffolder-backend-argocd-dynamic/package.json index 9cdb5f6774..9858e1a2dd 100644 --- a/dynamic-plugins/wrappers/roadiehq-scaffolder-backend-argocd-dynamic/package.json +++ b/dynamic-plugins/wrappers/roadiehq-scaffolder-backend-argocd-dynamic/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/dynamic-plugins/wrappers/roadiehq-scaffolder-backend-module-utils-dynamic/package.json b/dynamic-plugins/wrappers/roadiehq-scaffolder-backend-module-utils-dynamic/package.json index c757d9357f..5173210296 100644 --- a/dynamic-plugins/wrappers/roadiehq-scaffolder-backend-module-utils-dynamic/package.json +++ b/dynamic-plugins/wrappers/roadiehq-scaffolder-backend-module-utils-dynamic/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@backstage/cli": "0.23.1", - "@janus-idp/cli": "1.3.2" + "@janus-idp/cli": "1.3.3" }, "files": [ "dist", diff --git a/packages/app/config.d.ts b/packages/app/config.d.ts index bf9934024e..a2b938a047 100644 --- a/packages/app/config.d.ts +++ b/packages/app/config.d.ts @@ -73,8 +73,8 @@ export interface Config { }[]; mountPoints: { mountPoint: string; - module: string; - importName: string; + module?: string; + importName?: string; config: { layout?: { [key: string]: string; diff --git a/packages/app/package.json b/packages/app/package.json index 716a037805..1b6aa76145 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -82,7 +82,7 @@ }, "devDependencies": { "@backstage/test-utils": "1.4.4", - "@janus-idp/cli": "1.3.2", + "@janus-idp/cli": "1.3.3", "@scalprum/react-test-utils": "0.0.5", "@testing-library/dom": "8.20.1", "@testing-library/jest-dom": "5.17.0", diff --git a/packages/app/src/utils/dynamicUI/extractDynamicConfig.ts b/packages/app/src/utils/dynamicUI/extractDynamicConfig.ts index a12147da57..10a280bf9c 100644 --- a/packages/app/src/utils/dynamicUI/extractDynamicConfig.ts +++ b/packages/app/src/utils/dynamicUI/extractDynamicConfig.ts @@ -29,7 +29,7 @@ type DynamicRoute = { export type MountPoint = { mountPoint: string; - module: string; + module?: string; importName?: string; }; @@ -131,6 +131,7 @@ async function extractDynamicConfig() { accMountPoints.push( ...(mountPoints ?? []).map(point => ({ ...point, + module: point.module ?? 'PluginRoot', importName: point.importName ?? 'default', scope, })), diff --git a/yarn.lock b/yarn.lock index ec50d425d3..17e80dc3b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5621,72 +5621,10 @@ lodash "^4.17.21" react-use "^17.4.0" -"@janus-idp/cli@1.3.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@janus-idp/cli/-/cli-1.3.1.tgz#8272576a20ec88241c082d233f0a6d0e29cae77e" - integrity sha512-1GRfojww/cj3J0eNV3a6c7xE13f4HjqDb4ad0O2wirRfzY3aBvCl1/nCucmReYtpBI5TuQPmDL8O8S+7IixhBQ== - dependencies: - "@backstage/cli-common" "^0.1.13" - "@backstage/cli-node" "^0.1.5" - "@backstage/config" "^1.1.1" - "@backstage/config-loader" "^1.5.1" - "@backstage/errors" "^1.2.3" - "@backstage/eslint-plugin" "^0.1.3" - "@backstage/types" "^1.1.1" - "@manypkg/get-packages" "^1.1.3" - "@openshift/dynamic-plugin-sdk-webpack" "^3.0.0" - "@pmmmwh/react-refresh-webpack-plugin" "^0.5.7" - "@rollup/plugin-commonjs" "^25.0.4" - "@rollup/plugin-json" "^6.0.0" - "@rollup/plugin-node-resolve" "^15.2.1" - "@rollup/plugin-yaml" "^4.0.0" - "@svgr/rollup" "^8.1.0" - "@svgr/webpack" "^6.5.1" - "@yarnpkg/lockfile" "^1.1.0" - "@yarnpkg/parsers" "^3.0.0-rc.4" - bfj "^7.0.2" - chalk "^4.0.0" - chokidar "^3.3.1" - commander "^9.1.0" - css-loader "^6.5.1" - esbuild "^0.19.0" - esbuild-loader "^2.18.0" - eslint "^8.49.0" - eslint-config-prettier "^8.10.0" - eslint-webpack-plugin "^3.2.0" - express "^4.18.2" - fork-ts-checker-webpack-plugin "^7.0.0-alpha.8" - fs-extra "^10.1.0" - handlebars "^4.7.7" - html-webpack-plugin "^5.3.1" - inquirer "^8.2.0" - lodash "^4.17.21" - mini-css-extract-plugin "^2.4.2" - node-libs-browser "^2.2.1" - npm-packlist "^5.0.0" - ora "^5.3.0" - postcss "^8.2.13" - process "^0.11.10" - react-dev-utils "^12.0.0-next.60" - react-refresh "^0.14.0" - recursive-readdir "^2.2.2" - rollup "^2.78.0" - rollup-plugin-dts "^4.0.1" - rollup-plugin-esbuild "^4.7.2" - rollup-plugin-postcss "^4.0.0" - rollup-pluginutils "^2.8.2" - semver "^7.5.4" - style-loader "^3.3.1" - swc-loader "^0.2.3" - webpack "^5.89.0" - webpack-dev-server "^4.15.1" - yml-loader "^2.1.0" - yn "^4.0.0" - -"@janus-idp/cli@1.3.2": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@janus-idp/cli/-/cli-1.3.2.tgz#e659eaf71c12c125047968650b6f047f58b76ef7" - integrity sha512-AmzLlxUpZ2RGoGC5GKJ5JZ/mSUrEf5vpwpu6/V73i+dyyLnV3c28JFE+WwW9b4CRN7b2yzkjFxplc302JoI72g== +"@janus-idp/cli@1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@janus-idp/cli/-/cli-1.3.3.tgz#6269f389ba9780f3f2e4cffb407b52b059d9b527" + integrity sha512-m7lbKpDY6rwE4u/9Iy0yw55L2VZXsYdxj4buJxybzdM+mYNQC5mcAvQJt8lIFkdBApX1LIcTTblMI0U9WWoOiw== dependencies: "@backstage/cli-common" "^0.1.13" "@backstage/cli-node" "^0.1.5"