From dc98ba469d550b51194e3681f94f7b1f24feeac0 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 4 Mar 2022 10:30:11 +0100 Subject: [PATCH 1/3] cli: fix release stage entry point resolution Signed-off-by: Patrik Oldsberg --- packages/cli/src/commands/pack.ts | 11 ++++++++--- packages/cli/src/lib/packager/copyPackageDist.ts | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/packages/cli/src/commands/pack.ts b/packages/cli/src/commands/pack.ts index e646568980..6c88ac055f 100644 --- a/packages/cli/src/commands/pack.ts +++ b/packages/cli/src/commands/pack.ts @@ -23,6 +23,11 @@ const SKIPPED_KEYS = ['access', 'registry', 'tag', 'alphaTypes', 'betaTypes']; const PKG_PATH = 'package.json'; const PKG_BACKUP_PATH = 'package.json-prepack'; +function resolveEntrypoint(pkg: any, name: string) { + const targetEntry = pkg.publishConfig[name] || pkg[name]; + return targetEntry && joinPath('..', targetEntry); +} + // Writes e.g. alpha/package.json async function writeReleaseStageEntrypoint(pkg: any, stage: 'alpha' | 'beta') { await fs.ensureDir(paths.resolveTarget(stage)); @@ -31,9 +36,9 @@ async function writeReleaseStageEntrypoint(pkg: any, stage: 'alpha' | 'beta') { { name: pkg.name, version: pkg.version, - main: (pkg.publishConfig.main || pkg.main) && '..', - module: (pkg.publishConfig.module || pkg.module) && '..', - browser: (pkg.publishConfig.browser || pkg.browser) && '..', + main: resolveEntrypoint(pkg, 'main'), + module: resolveEntrypoint(pkg, 'module'), + browser: resolveEntrypoint(pkg, 'browser'), types: joinPath('..', pkg.publishConfig[`${stage}Types`]), }, { encoding: 'utf8', spaces: 2 }, diff --git a/packages/cli/src/lib/packager/copyPackageDist.ts b/packages/cli/src/lib/packager/copyPackageDist.ts index 03ac361006..439b087fd7 100644 --- a/packages/cli/src/lib/packager/copyPackageDist.ts +++ b/packages/cli/src/lib/packager/copyPackageDist.ts @@ -20,6 +20,11 @@ import { join as joinPath, resolve as resolvePath } from 'path'; const SKIPPED_KEYS = ['access', 'registry', 'tag', 'alphaTypes', 'betaTypes']; +function resolveEntrypoint(pkg: any, name: string) { + const targetEntry = pkg.publishConfig[name] || pkg[name]; + return targetEntry && joinPath('..', targetEntry); +} + // Writes e.g. alpha/package.json async function writeReleaseStageEntrypoint( pkg: any, @@ -32,9 +37,9 @@ async function writeReleaseStageEntrypoint( { name: pkg.name, version: pkg.version, - main: (pkg.publishConfig.main || pkg.main) && '..', - module: (pkg.publishConfig.module || pkg.module) && '..', - browser: (pkg.publishConfig.browser || pkg.browser) && '..', + main: resolveEntrypoint(pkg, 'main'), + module: resolveEntrypoint(pkg, 'module'), + browser: resolveEntrypoint(pkg, 'browser'), types: joinPath('..', pkg.publishConfig[`${stage}Types`]), }, { encoding: 'utf8', spaces: 2 }, From f833dd823c1c59e4cdd2fb61e48f4d3299b8e253 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 4 Mar 2022 10:31:33 +0100 Subject: [PATCH 2/3] catalog-backend: mark github multi org reader as stable Signed-off-by: Patrik Oldsberg --- plugins/catalog-backend/api-report.md | 2 +- .../src/modules/github/GithubMultiOrgReaderProcessor.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md index 0d9f306009..fcbd124e3a 100644 --- a/plugins/catalog-backend/api-report.md +++ b/plugins/catalog-backend/api-report.md @@ -706,7 +706,7 @@ export type GithubMultiOrgConfig = Array<{ userNamespace: string | undefined; }>; -// @alpha +// @public export class GithubMultiOrgReaderProcessor implements CatalogProcessor { constructor(options: { integrations: ScmIntegrationRegistry; diff --git a/plugins/catalog-backend/src/modules/github/GithubMultiOrgReaderProcessor.ts b/plugins/catalog-backend/src/modules/github/GithubMultiOrgReaderProcessor.ts index 339119137a..dbd858fc0d 100644 --- a/plugins/catalog-backend/src/modules/github/GithubMultiOrgReaderProcessor.ts +++ b/plugins/catalog-backend/src/modules/github/GithubMultiOrgReaderProcessor.ts @@ -40,10 +40,11 @@ import { import { buildOrgHierarchy } from '../util/org'; /** - * @alpha * Extracts teams and users out of a multiple GitHub orgs namespaced per org. * * Be aware that this processor may not be compatible with future org structures in the catalog. + * + * @public */ export class GithubMultiOrgReaderProcessor implements CatalogProcessor { private readonly integrations: ScmIntegrationRegistry; From b1aacbf96a8064442ac049743ab4da3b3a317610 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 4 Mar 2022 12:55:49 +0100 Subject: [PATCH 3/3] Applied patches from 0.70.1 release Signed-off-by: Patrik Oldsberg --- .changeset/patched.json | 9 ++++++++- .changeset/popular-boxes-develop.md | 5 +++++ .changeset/popular-rats-return.md | 9 +++++++++ packages/backend-common/CHANGELOG.md | 6 ++++++ packages/catalog-model/CHANGELOG.md | 6 ++++++ packages/cli/CHANGELOG.md | 6 ++++++ plugins/catalog-backend/CHANGELOG.md | 11 +++++++++++ plugins/catalog-common/CHANGELOG.md | 6 ++++++ plugins/catalog-react/CHANGELOG.md | 8 ++++++++ 9 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 .changeset/popular-boxes-develop.md create mode 100644 .changeset/popular-rats-return.md diff --git a/.changeset/patched.json b/.changeset/patched.json index 1029c8f106..dd63e86169 100644 --- a/.changeset/patched.json +++ b/.changeset/patched.json @@ -1,3 +1,10 @@ { - "currentReleaseVersion": {} + "currentReleaseVersion": { + "@backstage/backend-common": "0.12.1", + "@backstage/catalog-model": "0.12.1", + "@backstage/cli": "0.15.1", + "@backstage/plugin-catalog-backend": "0.23.1", + "@backstage/plugin-catalog-common": "0.2.1", + "@backstage/plugin-catalog-react": "0.8.1" + } } diff --git a/.changeset/popular-boxes-develop.md b/.changeset/popular-boxes-develop.md new file mode 100644 index 0000000000..65aae2c7df --- /dev/null +++ b/.changeset/popular-boxes-develop.md @@ -0,0 +1,5 @@ +--- +'@backstage/cli': patch +--- + +Applied the fix from version `0.15.1` of this package, which was part of the `v0.70.1` release of Backstage. diff --git a/.changeset/popular-rats-return.md b/.changeset/popular-rats-return.md new file mode 100644 index 0000000000..3a91e6d707 --- /dev/null +++ b/.changeset/popular-rats-return.md @@ -0,0 +1,9 @@ +--- +'@backstage/backend-common': patch +'@backstage/catalog-model': patch +'@backstage/plugin-catalog-backend': patch +'@backstage/plugin-catalog-common': patch +'@backstage/plugin-catalog-react': patch +--- + +Applied the fix for the `/alpha` entry point resolution that was part of the `v0.70.1` release of Backstage. diff --git a/packages/backend-common/CHANGELOG.md b/packages/backend-common/CHANGELOG.md index 8a7b5ef528..70b2455a55 100644 --- a/packages/backend-common/CHANGELOG.md +++ b/packages/backend-common/CHANGELOG.md @@ -1,5 +1,11 @@ # @backstage/backend-common +## 0.12.1 + +### Patch Changes + +- Fixed runtime resolution of the `/alpha` entry point. + ## 0.12.0 ### Minor Changes diff --git a/packages/catalog-model/CHANGELOG.md b/packages/catalog-model/CHANGELOG.md index 72d4f8b04a..bea5f18f09 100644 --- a/packages/catalog-model/CHANGELOG.md +++ b/packages/catalog-model/CHANGELOG.md @@ -1,5 +1,11 @@ # @backstage/catalog-model +## 0.12.1 + +### Patch Changes + +- Fixed runtime resolution of the `/alpha` entry point. + ## 0.12.0 ### Minor Changes diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index cfae3cab06..10f7ce1d69 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -1,5 +1,11 @@ # @backstage/cli +## 0.15.1 + +### Patch Changes + +- Fixed an issue where the release stage entry point of packages were not resolved correctly. + ## 0.15.0 ### Minor Changes diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md index fb197a65f5..d4a7d8b8d6 100644 --- a/plugins/catalog-backend/CHANGELOG.md +++ b/plugins/catalog-backend/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-catalog-backend +## 0.23.1 + +### Patch Changes + +- Marked `GithubMultiOrgReaderProcessor` as stable, as it was moved to `/alpha` by mistake. +- Fixed runtime resolution of the `/alpha` entry point. +- Updated dependencies + - @backstage/backend-common@0.12.1 + - @backstage/catalog-model@0.12.1 + - @backstage/plugin-catalog-common@0.2.1 + ## 0.23.0 ### Minor Changes diff --git a/plugins/catalog-common/CHANGELOG.md b/plugins/catalog-common/CHANGELOG.md index 707207eda4..badffd5f0a 100644 --- a/plugins/catalog-common/CHANGELOG.md +++ b/plugins/catalog-common/CHANGELOG.md @@ -1,5 +1,11 @@ # @backstage/plugin-catalog-common +## 0.2.1 + +### Patch Changes + +- Fixed runtime resolution of the `/alpha` entry point. + ## 0.2.0 ### Minor Changes diff --git a/plugins/catalog-react/CHANGELOG.md b/plugins/catalog-react/CHANGELOG.md index 89e03aa445..b93a2f7451 100644 --- a/plugins/catalog-react/CHANGELOG.md +++ b/plugins/catalog-react/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/plugin-catalog-react +## 0.8.1 + +### Patch Changes + +- Fixed runtime resolution of the `/alpha` entry point. +- Updated dependencies + - @backstage/catalog-model@0.12.1 + ## 0.8.0 ### Minor Changes