Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update scaffolder-backend-module-regex wrapper #1908

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .rhdh/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/parfuemerie-douglas-scaffo
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment/package.json
Expand Down Expand Up @@ -130,6 +128,8 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-plugin-catalog-b
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-bitbucket-cloud-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-bitbucket-cloud-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-topology/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-topology/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-tekton/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-tekton/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-tech-radar/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-tech-radar/package.json
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/parfuemerie-douglas-scaffo
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment/package.json
Expand Down Expand Up @@ -131,6 +129,8 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-plugin-catalog-b
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-bitbucket-cloud-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-bitbucket-cloud-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-topology/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-topology/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-tekton/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-tekton/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-tech-radar/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-tech-radar/package.json
Expand Down
2 changes: 1 addition & 1 deletion dynamic-plugins.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ plugins:
- package: ./dynamic-plugins/dist/janus-idp-backstage-scaffolder-backend-module-quay-dynamic
disabled: false

- package: ./dynamic-plugins/dist/janus-idp-backstage-scaffolder-backend-module-regex-dynamic
- package: ./dynamic-plugins/dist/backstage-community-scaffolder-backend-module-regex-dynamic
disabled: false

- package: ./dynamic-plugins/dist/backstage-community-plugin-rbac
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "janus-idp-backstage-scaffolder-backend-module-regex-dynamic",
"version": "2.2.0",
"name": "backstage-community-scaffolder-backend-module-regex-dynamic",
"version": "2.2.2",
"main": "./dist/index.cjs.js",
"types": "src/index.ts",
"license": "Apache-2.0",
Expand All @@ -10,7 +10,7 @@
},
"backstage": {
"role": "backend-plugin-module",
"supported-versions": "1.32.4",
"supported-versions": "1.32.5",
"pluginId": "scaffolder",
"pluginPackage": "@backstage/plugin-scaffolder-backend"
},
Expand All @@ -31,7 +31,7 @@
"repository": {
"type": "git",
"url": "https://github.com/janus-idp/backstage-showcase",
"directory": "dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic"
"directory": "dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic"
},
"maintainers": [
"@janus-idp/maintainers-showcase"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ __metadata:
version: 6
cacheKey: 8

"janus-idp-backstage-scaffolder-backend-module-regex-dynamic@workspace:.":
"backstage-community-scaffolder-backend-module-regex-dynamic@workspace:.":
version: 0.0.0-use.local
resolution: "janus-idp-backstage-scaffolder-backend-module-regex-dynamic@workspace:."
resolution: "backstage-community-scaffolder-backend-module-regex-dynamic@workspace:."
dependencies:
yaml: ^2.3.3
zod: ^3.22.4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "janus-idp-backstage-scaffolder-backend-module-regex",
"version": "2.2.0",
"name": "backstage-community-scaffolder-backend-module-regex",
"version": "2.2.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
Expand All @@ -10,7 +10,7 @@
},
"backstage": {
"role": "backend-plugin-module",
"supported-versions": "1.32.4",
"supported-versions": "1.32.5",
"pluginId": "scaffolder",
"pluginPackage": "@backstage/plugin-scaffolder-backend"
},
Expand All @@ -32,11 +32,11 @@
"test": "backstage-cli package test --passWithNoTests --coverage",
"clean": "backstage-cli package clean",
"clean-dynamic-sources": "yarn clean && rm -Rf node_modules",
"export-dynamic": "janus-cli package export-dynamic-plugin --embed-package @janus-idp/backstage-scaffolder-backend-module-regex --override-interop default --no-embed-as-dependencies",
"export-dynamic:clean": "janus-cli package export-dynamic-plugin --embed-package @janus-idp/backstage-scaffolder-backend-module-regex --override-interop default --no-embed-as-dependencies --clean"
"export-dynamic": "janus-cli package export-dynamic-plugin --embed-package @backstage-community/scaffolder-backend-module-regex --override-interop default --no-embed-as-dependencies",
"export-dynamic:clean": "janus-cli package export-dynamic-plugin --embed-package @backstage-community/scaffolder-backend-module-regex --override-interop default --no-embed-as-dependencies --clean"
},
"dependencies": {
"@janus-idp/backstage-scaffolder-backend-module-regex": "2.2.0"
"@backstage-community/scaffolder-backend-module-regex": "2.2.2"
},
"devDependencies": {
"@backstage/cli": "0.28.2",
Expand All @@ -50,7 +50,7 @@
"repository": {
"type": "git",
"url": "https://github.com/janus-idp/backstage-showcase",
"directory": "dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic"
"directory": "dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic"
},
"maintainers": [
"@janus-idp/maintainers-showcase"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from '@backstage-community/scaffolder-backend-module-regex';
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"include": ["src", "dev", "migrations"],
"exclude": ["node_modules"],
"compilerOptions": {
"outDir": "../../../dist-types/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic",
"outDir": "../../../dist-types/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic",
"rootDir": "."
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": ["//"],
"tasks": {
"tsc": {
"outputs": [
"../../../dist-types/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic/**"
]
}
}
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ export const InternalPluginsMap: Record<string, string> = {
'./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-http-request-dynamic',
'janus-idp-backstage-scaffolder-backend-module-quay-dynamic':
'./dynamic-plugins/dist/janus-idp-backstage-scaffolder-backend-module-quay-dynamic',
'janus-idp-backstage-scaffolder-backend-module-regex-dynamic':
'./dynamic-plugins/dist/janus-idp-backstage-scaffolder-backend-module-regex-dynamic',
'backstage-community-plugin-rbac':
'./dynamic-plugins/dist/backstage-community-plugin-rbac',
'backstage-community-scaffolder-backend-module-regex-dynamic':
'./dynamic-plugins/dist/backstage-community-scaffolder-backend-module-regex-dynamic',
'backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic':
'./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic',
'backstage-community-scaffolder-backend-module-sonarqube-dynamic':
Expand Down
44 changes: 22 additions & 22 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3605,6 +3605,18 @@ __metadata:
languageName: node
linkType: hard

"@backstage-community/scaffolder-backend-module-regex@npm:2.2.2":
version: 2.2.2
resolution: "@backstage-community/scaffolder-backend-module-regex@npm:2.2.2"
dependencies:
"@backstage/backend-plugin-api": ^1.0.1
"@backstage/plugin-scaffolder-node": ^0.5.0
yaml: ^2.3.3
zod: ^3.22.4
checksum: bd9257bd0b732f1792116407f7c76a5cf733d58ac89ab1fb47ea4f34fa48e66153c0a375486f4f95423a06f9b293d07a4c16376561305dc0cc6872906b2d6297
languageName: node
linkType: hard

"@backstage/app-defaults@npm:1.5.12, @backstage/app-defaults@npm:^1.5.12":
version: 1.5.12
resolution: "@backstage/app-defaults@npm:1.5.12"
Expand Down Expand Up @@ -9953,18 +9965,6 @@ __metadata:
languageName: node
linkType: hard

"@janus-idp/backstage-scaffolder-backend-module-regex@npm:2.2.0":
version: 2.2.0
resolution: "@janus-idp/backstage-scaffolder-backend-module-regex@npm:2.2.0"
dependencies:
"@backstage/backend-plugin-api": ^1.0.1
"@backstage/plugin-scaffolder-node": ^0.5.0
yaml: ^2.3.3
zod: ^3.22.4
checksum: 5b708b124bbefe9ba548911cae94565f02ac08b27198d754def31bd76e6c1ca8d6fec793518054ae8a5bf0ab42ccb72c1f613a56e40c4af04361d6c4519e2774
languageName: node
linkType: hard

"@janus-idp/cli@npm:1.17.0":
version: 1.17.0
resolution: "@janus-idp/cli@npm:1.17.0"
Expand Down Expand Up @@ -21724,6 +21724,16 @@ __metadata:
languageName: unknown
linkType: soft

"backstage-community-scaffolder-backend-module-regex@workspace:dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic":
version: 0.0.0-use.local
resolution: "backstage-community-scaffolder-backend-module-regex@workspace:dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-regex-dynamic"
dependencies:
"@backstage-community/scaffolder-backend-module-regex": 2.2.2
"@backstage/cli": 0.28.2
"@janus-idp/cli": 1.17.0
languageName: unknown
linkType: soft

"backstage-community-scaffolder-backend-module-sonarqube@workspace:dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic":
version: 0.0.0-use.local
resolution: "backstage-community-scaffolder-backend-module-sonarqube@workspace:dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic"
Expand Down Expand Up @@ -30748,16 +30758,6 @@ __metadata:
languageName: unknown
linkType: soft

"janus-idp-backstage-scaffolder-backend-module-regex@workspace:dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic":
version: 0.0.0-use.local
resolution: "janus-idp-backstage-scaffolder-backend-module-regex@workspace:dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic"
dependencies:
"@backstage/cli": 0.28.2
"@janus-idp/backstage-scaffolder-backend-module-regex": 2.2.0
"@janus-idp/cli": 1.17.0
languageName: unknown
linkType: soft

"javascript-natural-sort@npm:^0.7.1":
version: 0.7.1
resolution: "javascript-natural-sort@npm:0.7.1"
Expand Down
Loading