Merge pull request #9986 from backstage/rugvip/patch0701

Applied patches from 0.70.1 release

.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"
+  }
 }

.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.

.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.

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

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

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

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 },

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 },

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

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;

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;

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

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