From 0ed09e3bb5b29a1f9f4094ff18289fb7eb266f5f Mon Sep 17 00:00:00 2001
From: fullsend-code
 <278716306+fullsend-ai-coder[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2026 16:52:34 +0000
Subject: [PATCH 1/3] feat(#4037): move app drawer module into app-defaults
 plugin

Move appDrawerExtension and appDrawerModule from app-react into the
app-defaults plugin where default module registrations belong. The
app-react package retains the reusable building blocks (components,
hooks, blueprints, data refs) while app-defaults now owns the module
that wires them into the app.

Changes:
- Create plugins/app-defaults/src/appDrawerModule.tsx importing
  ApplicationDrawer and appDrawerContentDataRef from app-react
- Export appDrawerModule as named and default export from alpha.ts
- Remove appDrawerModule.tsx and its barrel export from app-react
- Update sample app to import from app-defaults/alpha
- Update API reports for both packages
- Update README documentation for both packages

Closes #4037
---
 .../app-defaults/packages/app/package.json    |  1 +
 .../app-defaults/packages/app/src/App.tsx     |  2 +-
 .../plugins/app-defaults/README.md            | 20 ++++++++++++++++---
 .../plugins/app-defaults/package.json         |  4 +++-
 .../plugins/app-defaults/report-alpha.api.md  |  9 ++++++---
 .../plugins/app-defaults/src/alpha.ts         |  5 +++--
 .../src}/appDrawerModule.tsx                  |  7 ++++---
 .../app-defaults/plugins/app-react/README.md  |  6 +++---
 .../plugins/app-react/report-alpha.api.md     |  4 ----
 .../plugins/app-react/src/drawer/index.ts     |  1 -
 workspaces/app-defaults/yarn.lock             |  5 ++++-
 11 files changed, 42 insertions(+), 22 deletions(-)
 rename workspaces/app-defaults/plugins/{app-react/src/drawer/extensions => app-defaults/src}/appDrawerModule.tsx (93%)

diff --git a/workspaces/app-defaults/packages/app/package.json b/workspaces/app-defaults/packages/app/package.json
index dad515bb3c9..56ddbe6e3fe 100644
--- a/workspaces/app-defaults/packages/app/package.json
+++ b/workspaces/app-defaults/packages/app/package.json
@@ -44,6 +44,7 @@
     "@mui/icons-material": "^5.18.0",
     "@mui/material": "^5.18.0",
     "@red-hat-developer-hub/backstage-plugin-app-auth": "workspace:^",
+    "@red-hat-developer-hub/backstage-plugin-app-defaults": "workspace:^",
     "@red-hat-developer-hub/backstage-plugin-app-integrations": "workspace:^",
     "@red-hat-developer-hub/backstage-plugin-app-react": "workspace:^",
     "@red-hat-developer-hub/backstage-plugin-global-header": "^1.21.0",
diff --git a/workspaces/app-defaults/packages/app/src/App.tsx b/workspaces/app-defaults/packages/app/src/App.tsx
index b33c1373703..adadc6cba46 100644
--- a/workspaces/app-defaults/packages/app/src/App.tsx
+++ b/workspaces/app-defaults/packages/app/src/App.tsx
@@ -18,7 +18,7 @@ import { createApp } from '@backstage/frontend-defaults';
 import catalogPlugin from '@backstage/plugin-catalog/alpha';
 import { appAuthModule } from '@red-hat-developer-hub/backstage-plugin-app-auth/alpha';
 import { appIntegrationsModule } from '@red-hat-developer-hub/backstage-plugin-app-integrations/alpha';
-import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-react/alpha';
+import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults/alpha';
 import {
   globalHeaderModule,
   globalHeaderTranslationsModule,
diff --git a/workspaces/app-defaults/plugins/app-defaults/README.md b/workspaces/app-defaults/plugins/app-defaults/README.md
index 83fec9b8d39..3fe7cc13943 100644
--- a/workspaces/app-defaults/plugins/app-defaults/README.md
+++ b/workspaces/app-defaults/plugins/app-defaults/README.md
@@ -1,8 +1,22 @@
 # @red-hat-developer-hub/backstage-plugin-app-defaults
 
-Empty RHDH app module for the **new frontend system**, registered against `pluginId: 'app'`.
+RHDH app modules for the **new frontend system**, registered against `pluginId: 'app'`.
 
 ## Usage
 
-- **Dynamic loading**: default export is a `FrontendModule` suitable for `@backstage/frontend-dynamic-feature-loader`.
-- **Static / alpha**: import from `@red-hat-developer-hub/backstage-plugin-app-defaults/alpha` for `appDefaultsModule`.
+- **Dynamic loading**: default export is the `appDrawerModule` `FrontendModule` suitable for `@backstage/frontend-dynamic-feature-loader`.
+- **Static / alpha**: import from `@red-hat-developer-hub/backstage-plugin-app-defaults/alpha` for `appDrawerModule` and `appDefaultsModule`.
+
+### App Integration
+
+```typescript
+import { createApp } from '@backstage/frontend-defaults';
+import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults/alpha';
+
+export default createApp({
+  features: [
+    appDrawerModule,
+    // ...other plugins and modules
+  ],
+});
+```
diff --git a/workspaces/app-defaults/plugins/app-defaults/package.json b/workspaces/app-defaults/plugins/app-defaults/package.json
index 4e253623836..1cde7fae9c3 100644
--- a/workspaces/app-defaults/plugins/app-defaults/package.json
+++ b/workspaces/app-defaults/plugins/app-defaults/package.json
@@ -47,7 +47,9 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/frontend-plugin-api": "^0.17.2"
+    "@backstage/frontend-plugin-api": "^0.17.2",
+    "@backstage/plugin-app-react": "^0.2.4",
+    "@red-hat-developer-hub/backstage-plugin-app-react": "workspace:^"
   },
   "peerDependencies": {
     "react": "^16.13.1 || ^17.0.0 || ^18.0.0"
diff --git a/workspaces/app-defaults/plugins/app-defaults/report-alpha.api.md b/workspaces/app-defaults/plugins/app-defaults/report-alpha.api.md
index 6c9ccfd85f3..531fa23a7de 100644
--- a/workspaces/app-defaults/plugins/app-defaults/report-alpha.api.md
+++ b/workspaces/app-defaults/plugins/app-defaults/report-alpha.api.md
@@ -6,7 +6,10 @@
 import { FrontendModule } from '@backstage/frontend-plugin-api';
 
 // @alpha
-const appDefaultsModule: FrontendModule;
-export { appDefaultsModule };
-export default appDefaultsModule;
+export const appDefaultsModule: FrontendModule;
+
+// @alpha
+const appDrawerModule: FrontendModule;
+export { appDrawerModule };
+export default appDrawerModule;
 ```
diff --git a/workspaces/app-defaults/plugins/app-defaults/src/alpha.ts b/workspaces/app-defaults/plugins/app-defaults/src/alpha.ts
index 92b528fad2c..84ab8c7b191 100644
--- a/workspaces/app-defaults/plugins/app-defaults/src/alpha.ts
+++ b/workspaces/app-defaults/plugins/app-defaults/src/alpha.ts
@@ -15,11 +15,12 @@
  */
 
 /**
- * New Frontend System: empty app module for the app plugin.
+ * New Frontend System: default app modules for the app plugin.
  *
  * @packageDocumentation
  */
 
 export { appDefaultsModule } from './appDefaultsModule';
+export { appDrawerModule } from './appDrawerModule';
 
-export { appDefaultsModule as default } from './appDefaultsModule';
+export { appDrawerModule as default } from './appDrawerModule';
diff --git a/workspaces/app-defaults/plugins/app-react/src/drawer/extensions/appDrawerModule.tsx b/workspaces/app-defaults/plugins/app-defaults/src/appDrawerModule.tsx
similarity index 93%
rename from workspaces/app-defaults/plugins/app-react/src/drawer/extensions/appDrawerModule.tsx
rename to workspaces/app-defaults/plugins/app-defaults/src/appDrawerModule.tsx
index 0e91abc529c..9cf82bc23e4 100644
--- a/workspaces/app-defaults/plugins/app-react/src/drawer/extensions/appDrawerModule.tsx
+++ b/workspaces/app-defaults/plugins/app-defaults/src/appDrawerModule.tsx
@@ -19,9 +19,10 @@ import {
   createFrontendModule,
 } from '@backstage/frontend-plugin-api';
 import { AppRootWrapperBlueprint } from '@backstage/plugin-app-react';
-
-import { ApplicationDrawer } from '../components/ApplicationDrawer';
-import { appDrawerContentDataRef } from './appDrawerContentDataRef';
+import {
+  ApplicationDrawer,
+  appDrawerContentDataRef,
+} from '@red-hat-developer-hub/backstage-plugin-app-react/alpha';
 
 /**
  * Wrapper extension that renders the ApplicationDrawer around the app content.
diff --git a/workspaces/app-defaults/plugins/app-react/README.md b/workspaces/app-defaults/plugins/app-react/README.md
index 954193c2668..8cb71d6ed6c 100644
--- a/workspaces/app-defaults/plugins/app-react/README.md
+++ b/workspaces/app-defaults/plugins/app-react/README.md
@@ -14,11 +14,12 @@ yarn add @red-hat-developer-hub/backstage-plugin-app-react
 
 ## App Integration
 
-Register the drawer module in your app's `createApp` call:
+Register the drawer module from `@red-hat-developer-hub/backstage-plugin-app-defaults`
+in your app's `createApp` call:
 
 ```typescript
 import { createApp } from '@backstage/frontend-defaults';
-import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-react/alpha';
+import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults/alpha';
 
 export default createApp({
   features: [
@@ -147,4 +148,3 @@ function MyDrawerContent() {
 
 - `appDrawerContentDataRef` -- extension data ref
 - `AppDrawerContentBlueprint` -- blueprint for contributing drawers
-- `appDrawerModule` -- frontend module (registers the drawer wrapper extension)
diff --git a/workspaces/app-defaults/plugins/app-react/report-alpha.api.md b/workspaces/app-defaults/plugins/app-react/report-alpha.api.md
index 6e423b60101..b3b7f0e0a8d 100644
--- a/workspaces/app-defaults/plugins/app-react/report-alpha.api.md
+++ b/workspaces/app-defaults/plugins/app-react/report-alpha.api.md
@@ -6,7 +6,6 @@
 import { ConfigurableExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { ExtensionBlueprint } from '@backstage/frontend-plugin-api';
 import { ExtensionDataRef } from '@backstage/frontend-plugin-api';
-import { FrontendModule } from '@backstage/frontend-plugin-api';
 import { JSX as JSX_2 } from 'react/jsx-runtime';
 
 // @public
@@ -67,9 +66,6 @@ export const appDrawerContentDataRef: ConfigurableExtensionDataRef<
   {}
 >;
 
-// @alpha
-export const appDrawerModule: FrontendModule;
-
 // @public
 export const ApplicationDrawer: (
   input: ApplicationDrawerProps,
diff --git a/workspaces/app-defaults/plugins/app-react/src/drawer/index.ts b/workspaces/app-defaults/plugins/app-react/src/drawer/index.ts
index 8d8203c9e6d..51be0c2d341 100644
--- a/workspaces/app-defaults/plugins/app-react/src/drawer/index.ts
+++ b/workspaces/app-defaults/plugins/app-react/src/drawer/index.ts
@@ -20,7 +20,6 @@ export { DrawerPanel } from './components/DrawerPanel';
 
 export { appDrawerContentDataRef } from './extensions/appDrawerContentDataRef';
 export { AppDrawerContentBlueprint } from './extensions/AppDrawerContentBlueprint';
-export { appDrawerModule } from './extensions/appDrawerModule';
 
 export type { ApplicationDrawerProps } from './components/ApplicationDrawer';
 export type { DrawerPanelProps } from './components/DrawerPanel';
diff --git a/workspaces/app-defaults/yarn.lock b/workspaces/app-defaults/yarn.lock
index ee687266df3..a5460789446 100644
--- a/workspaces/app-defaults/yarn.lock
+++ b/workspaces/app-defaults/yarn.lock
@@ -9446,13 +9446,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@red-hat-developer-hub/backstage-plugin-app-defaults@workspace:plugins/app-defaults":
+"@red-hat-developer-hub/backstage-plugin-app-defaults@workspace:^, @red-hat-developer-hub/backstage-plugin-app-defaults@workspace:plugins/app-defaults":
   version: 0.0.0-use.local
   resolution: "@red-hat-developer-hub/backstage-plugin-app-defaults@workspace:plugins/app-defaults"
   dependencies:
     "@backstage/cli": "npm:^0.36.3"
     "@backstage/frontend-plugin-api": "npm:^0.17.2"
+    "@backstage/plugin-app-react": "npm:^0.2.4"
     "@backstage/test-utils": "npm:^1.7.19"
+    "@red-hat-developer-hub/backstage-plugin-app-react": "workspace:^"
     "@testing-library/jest-dom": "npm:^6.0.0"
     "@testing-library/react": "npm:^16.0.0"
     "@types/react": "npm:^18"
@@ -14226,6 +14228,7 @@ __metadata:
     "@mui/material": "npm:^5.18.0"
     "@playwright/test": "npm:1.61.1"
     "@red-hat-developer-hub/backstage-plugin-app-auth": "workspace:^"
+    "@red-hat-developer-hub/backstage-plugin-app-defaults": "workspace:^"
     "@red-hat-developer-hub/backstage-plugin-app-integrations": "workspace:^"
     "@red-hat-developer-hub/backstage-plugin-app-react": "workspace:^"
     "@red-hat-developer-hub/backstage-plugin-global-header": "npm:^1.21.0"

From 8a997f17f450937a6f3b8c89f3f20ef9eb0aeb8f Mon Sep 17 00:00:00 2001
From: fullsend-fix <278716306+fullsend-ai-coder[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2026 18:05:02 +0000
Subject: [PATCH 2/3] fix: export modules from default path and add changelogs

Move appDrawerModule and appDefaultsModule exports from the /alpha
subpath to the default package entry point of app-defaults. Update
the sample app import accordingly.

Add CHANGELOG entries with breaking change notices and migration hints:
- app-defaults 0.0.2 (patch): appDrawerModule added to default export
- app-react 0.2.0 (minor): appDrawerModule removed (moved to app-defaults)

Addresses review feedback on #4038
---
 workspaces/app-defaults/packages/app/src/App.tsx  |  2 +-
 .../plugins/app-defaults/CHANGELOG.md             | 12 ++++++++++++
 .../app-defaults/plugins/app-defaults/README.md   |  4 ++--
 .../plugins/app-defaults/package.json             |  2 +-
 .../plugins/app-defaults/report-alpha.api.md      | 11 ++++-------
 .../plugins/app-defaults/report.api.md            | 10 ++++++++--
 .../plugins/app-defaults/src/alpha.ts             |  5 ++---
 .../plugins/app-defaults/src/appDefaultsModule.ts |  2 +-
 .../plugins/app-defaults/src/appDrawerModule.tsx  |  2 +-
 .../plugins/app-defaults/src/index.ts             |  9 ++++++---
 .../app-defaults/plugins/app-react/CHANGELOG.md   | 15 +++++++++++++++
 .../app-defaults/plugins/app-react/README.md      |  2 +-
 .../app-defaults/plugins/app-react/package.json   |  2 +-
 13 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/workspaces/app-defaults/packages/app/src/App.tsx b/workspaces/app-defaults/packages/app/src/App.tsx
index adadc6cba46..dea06ab01f4 100644
--- a/workspaces/app-defaults/packages/app/src/App.tsx
+++ b/workspaces/app-defaults/packages/app/src/App.tsx
@@ -18,7 +18,7 @@ import { createApp } from '@backstage/frontend-defaults';
 import catalogPlugin from '@backstage/plugin-catalog/alpha';
 import { appAuthModule } from '@red-hat-developer-hub/backstage-plugin-app-auth/alpha';
 import { appIntegrationsModule } from '@red-hat-developer-hub/backstage-plugin-app-integrations/alpha';
-import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults/alpha';
+import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults';
 import {
   globalHeaderModule,
   globalHeaderTranslationsModule,
diff --git a/workspaces/app-defaults/plugins/app-defaults/CHANGELOG.md b/workspaces/app-defaults/plugins/app-defaults/CHANGELOG.md
index e5a86056eae..f83702f5bfb 100644
--- a/workspaces/app-defaults/plugins/app-defaults/CHANGELOG.md
+++ b/workspaces/app-defaults/plugins/app-defaults/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @red-hat-developer-hub/backstage-plugin-app-defaults
 
+## 0.0.2
+
+### Patch Changes
+
+- 0ed09e3: Added `appDrawerModule` to the default package export. The module was moved from `@red-hat-developer-hub/backstage-plugin-app-react` into this plugin where default module registrations belong.
+
+  **Migration:** Import `appDrawerModule` from the default entry point:
+
+  ```ts
+  import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults';
+  ```
+
 ## 0.0.1
 
 ### Patch Changes
diff --git a/workspaces/app-defaults/plugins/app-defaults/README.md b/workspaces/app-defaults/plugins/app-defaults/README.md
index 3fe7cc13943..2a5fe32eda6 100644
--- a/workspaces/app-defaults/plugins/app-defaults/README.md
+++ b/workspaces/app-defaults/plugins/app-defaults/README.md
@@ -5,13 +5,13 @@ RHDH app modules for the **new frontend system**, registered against `pluginId:
 ## Usage
 
 - **Dynamic loading**: default export is the `appDrawerModule` `FrontendModule` suitable for `@backstage/frontend-dynamic-feature-loader`.
-- **Static / alpha**: import from `@red-hat-developer-hub/backstage-plugin-app-defaults/alpha` for `appDrawerModule` and `appDefaultsModule`.
+- **Static**: import from `@red-hat-developer-hub/backstage-plugin-app-defaults` for `appDrawerModule` and `appDefaultsModule`.
 
 ### App Integration
 
 ```typescript
 import { createApp } from '@backstage/frontend-defaults';
-import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults/alpha';
+import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults';
 
 export default createApp({
   features: [
diff --git a/workspaces/app-defaults/plugins/app-defaults/package.json b/workspaces/app-defaults/plugins/app-defaults/package.json
index 1cde7fae9c3..7506fdb4b96 100644
--- a/workspaces/app-defaults/plugins/app-defaults/package.json
+++ b/workspaces/app-defaults/plugins/app-defaults/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/backstage-plugin-app-defaults",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "license": "Apache-2.0",
   "description": "Empty RHDH app module for the new frontend system",
   "main": "src/alpha.ts",
diff --git a/workspaces/app-defaults/plugins/app-defaults/report-alpha.api.md b/workspaces/app-defaults/plugins/app-defaults/report-alpha.api.md
index 531fa23a7de..5463d2b2442 100644
--- a/workspaces/app-defaults/plugins/app-defaults/report-alpha.api.md
+++ b/workspaces/app-defaults/plugins/app-defaults/report-alpha.api.md
@@ -5,11 +5,8 @@
 ```ts
 import { FrontendModule } from '@backstage/frontend-plugin-api';
 
-// @alpha
-export const appDefaultsModule: FrontendModule;
-
-// @alpha
-const appDrawerModule: FrontendModule;
-export { appDrawerModule };
-export default appDrawerModule;
+// @public
+const appDefaultsModule: FrontendModule;
+export { appDefaultsModule };
+export default appDefaultsModule;
 ```
diff --git a/workspaces/app-defaults/plugins/app-defaults/report.api.md b/workspaces/app-defaults/plugins/app-defaults/report.api.md
index ef1d82ee4ac..2d9e4f8fd4c 100644
--- a/workspaces/app-defaults/plugins/app-defaults/report.api.md
+++ b/workspaces/app-defaults/plugins/app-defaults/report.api.md
@@ -3,7 +3,13 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { FrontendModule } from '@backstage/frontend-plugin-api';
+
+// @public
+export const appDefaultsModule: FrontendModule;
+
 // @public
-const _default: {};
-export default _default;
+const appDrawerModule: FrontendModule;
+export { appDrawerModule };
+export default appDrawerModule;
 ```
diff --git a/workspaces/app-defaults/plugins/app-defaults/src/alpha.ts b/workspaces/app-defaults/plugins/app-defaults/src/alpha.ts
index 84ab8c7b191..92b528fad2c 100644
--- a/workspaces/app-defaults/plugins/app-defaults/src/alpha.ts
+++ b/workspaces/app-defaults/plugins/app-defaults/src/alpha.ts
@@ -15,12 +15,11 @@
  */
 
 /**
- * New Frontend System: default app modules for the app plugin.
+ * New Frontend System: empty app module for the app plugin.
  *
  * @packageDocumentation
  */
 
 export { appDefaultsModule } from './appDefaultsModule';
-export { appDrawerModule } from './appDrawerModule';
 
-export { appDrawerModule as default } from './appDrawerModule';
+export { appDefaultsModule as default } from './appDefaultsModule';
diff --git a/workspaces/app-defaults/plugins/app-defaults/src/appDefaultsModule.ts b/workspaces/app-defaults/plugins/app-defaults/src/appDefaultsModule.ts
index de5f9503a8e..74a38d092ec 100644
--- a/workspaces/app-defaults/plugins/app-defaults/src/appDefaultsModule.ts
+++ b/workspaces/app-defaults/plugins/app-defaults/src/appDefaultsModule.ts
@@ -20,7 +20,7 @@ import { createFrontendModule } from '@backstage/frontend-plugin-api';
  * Empty RHDH app module for `pluginId: 'app'`.
  * Default-export this module for dynamic frontend loading.
  *
- * @alpha
+ * @public
  */
 export const appDefaultsModule = createFrontendModule({
   pluginId: 'app',
diff --git a/workspaces/app-defaults/plugins/app-defaults/src/appDrawerModule.tsx b/workspaces/app-defaults/plugins/app-defaults/src/appDrawerModule.tsx
index 9cf82bc23e4..fcc967fbb05 100644
--- a/workspaces/app-defaults/plugins/app-defaults/src/appDrawerModule.tsx
+++ b/workspaces/app-defaults/plugins/app-defaults/src/appDrawerModule.tsx
@@ -52,7 +52,7 @@ const appDrawerExtension = AppRootWrapperBlueprint.makeWithOverrides({
  * Registers a wrapper extension that renders the drawer and accepts
  * drawer content contributions via inputs.
  *
- * @alpha
+ * @public
  */
 export const appDrawerModule = createFrontendModule({
   pluginId: 'app',
diff --git a/workspaces/app-defaults/plugins/app-defaults/src/index.ts b/workspaces/app-defaults/plugins/app-defaults/src/index.ts
index 096e162e2c3..84ab8c7b191 100644
--- a/workspaces/app-defaults/plugins/app-defaults/src/index.ts
+++ b/workspaces/app-defaults/plugins/app-defaults/src/index.ts
@@ -15,9 +15,12 @@
  */
 
 /**
- * Stub package root export for API reporting and bundlers. This plugin targets
- * the new frontend system only; use `./alpha` for public APIs.
+ * New Frontend System: default app modules for the app plugin.
  *
  * @packageDocumentation
  */
-export default {};
+
+export { appDefaultsModule } from './appDefaultsModule';
+export { appDrawerModule } from './appDrawerModule';
+
+export { appDrawerModule as default } from './appDrawerModule';
diff --git a/workspaces/app-defaults/plugins/app-react/CHANGELOG.md b/workspaces/app-defaults/plugins/app-react/CHANGELOG.md
index aaa8d2dbf8e..5fa02f4f844 100644
--- a/workspaces/app-defaults/plugins/app-react/CHANGELOG.md
+++ b/workspaces/app-defaults/plugins/app-react/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @red-hat-developer-hub/backstage-plugin-app-react
 
+## 0.2.0
+
+### Minor Changes
+
+- 0ed09e3: **BREAKING:** Removed `appDrawerModule` from this package. The module has been moved to `@red-hat-developer-hub/backstage-plugin-app-defaults` where default module registrations belong.
+
+  **Migration:** Update your imports:
+
+  ```diff
+  -import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-react/alpha';
+  +import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults';
+  ```
+
+  The reusable building blocks (`ApplicationDrawer`, `appDrawerContentDataRef`, `AppDrawerContentBlueprint`, `useAppDrawer`, `DrawerPanel`) remain in this package.
+
 ## 0.1.0
 
 ### Minor Changes
diff --git a/workspaces/app-defaults/plugins/app-react/README.md b/workspaces/app-defaults/plugins/app-react/README.md
index 8cb71d6ed6c..f8585ec4bf4 100644
--- a/workspaces/app-defaults/plugins/app-react/README.md
+++ b/workspaces/app-defaults/plugins/app-react/README.md
@@ -19,7 +19,7 @@ in your app's `createApp` call:
 
 ```typescript
 import { createApp } from '@backstage/frontend-defaults';
-import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults/alpha';
+import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults';
 
 export default createApp({
   features: [
diff --git a/workspaces/app-defaults/plugins/app-react/package.json b/workspaces/app-defaults/plugins/app-react/package.json
index 30c59761306..e7566c3ee40 100644
--- a/workspaces/app-defaults/plugins/app-react/package.json
+++ b/workspaces/app-defaults/plugins/app-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/backstage-plugin-app-react",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "license": "Apache-2.0",
   "description": "Shared UI components and extension APIs for the RHDH app shell",
   "main": "src/index.ts",

From 769abb9b9388ea873ada2b61debf6cc696e0c85a Mon Sep 17 00:00:00 2001
From: fullsend-fix <278716306+fullsend-ai-coder[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2026 19:41:51 +0000
Subject: [PATCH 3/3] fix: replace changelog entries with changeset for PR
 #4038

Revert manual CHANGELOG.md entries and version bumps in package.json
for both app-defaults and app-react packages. Add a proper changeset
file instead, which will generate changelogs and version bumps during
the release process.

Addresses review feedback on #4038
---
 .../.changeset/move-drawer-to-app-defaults.md     | 13 +++++++++++++
 .../plugins/app-defaults/CHANGELOG.md             | 12 ------------
 .../plugins/app-defaults/package.json             |  2 +-
 .../app-defaults/plugins/app-react/CHANGELOG.md   | 15 ---------------
 .../app-defaults/plugins/app-react/package.json   |  2 +-
 5 files changed, 15 insertions(+), 29 deletions(-)
 create mode 100644 workspaces/app-defaults/.changeset/move-drawer-to-app-defaults.md

diff --git a/workspaces/app-defaults/.changeset/move-drawer-to-app-defaults.md b/workspaces/app-defaults/.changeset/move-drawer-to-app-defaults.md
new file mode 100644
index 00000000000..e7d93c4c7f0
--- /dev/null
+++ b/workspaces/app-defaults/.changeset/move-drawer-to-app-defaults.md
@@ -0,0 +1,13 @@
+---
+'@red-hat-developer-hub/backstage-plugin-app-defaults': patch
+'@red-hat-developer-hub/backstage-plugin-app-react': minor
+---
+
+Moved `appDrawerModule` from `@red-hat-developer-hub/backstage-plugin-app-react` into `@red-hat-developer-hub/backstage-plugin-app-defaults` where default module registrations belong. The reusable building blocks (`ApplicationDrawer`, `appDrawerContentDataRef`, `AppDrawerContentBlueprint`, `useAppDrawer`, `DrawerPanel`) remain in app-react.
+
+**Migration:** Update your imports:
+
+```diff
+-import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-react/alpha';
++import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults';
+```
diff --git a/workspaces/app-defaults/plugins/app-defaults/CHANGELOG.md b/workspaces/app-defaults/plugins/app-defaults/CHANGELOG.md
index f83702f5bfb..e5a86056eae 100644
--- a/workspaces/app-defaults/plugins/app-defaults/CHANGELOG.md
+++ b/workspaces/app-defaults/plugins/app-defaults/CHANGELOG.md
@@ -1,17 +1,5 @@
 # @red-hat-developer-hub/backstage-plugin-app-defaults
 
-## 0.0.2
-
-### Patch Changes
-
-- 0ed09e3: Added `appDrawerModule` to the default package export. The module was moved from `@red-hat-developer-hub/backstage-plugin-app-react` into this plugin where default module registrations belong.
-
-  **Migration:** Import `appDrawerModule` from the default entry point:
-
-  ```ts
-  import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults';
-  ```
-
 ## 0.0.1
 
 ### Patch Changes
diff --git a/workspaces/app-defaults/plugins/app-defaults/package.json b/workspaces/app-defaults/plugins/app-defaults/package.json
index 7506fdb4b96..1cde7fae9c3 100644
--- a/workspaces/app-defaults/plugins/app-defaults/package.json
+++ b/workspaces/app-defaults/plugins/app-defaults/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/backstage-plugin-app-defaults",
-  "version": "0.0.2",
+  "version": "0.0.1",
   "license": "Apache-2.0",
   "description": "Empty RHDH app module for the new frontend system",
   "main": "src/alpha.ts",
diff --git a/workspaces/app-defaults/plugins/app-react/CHANGELOG.md b/workspaces/app-defaults/plugins/app-react/CHANGELOG.md
index 5fa02f4f844..aaa8d2dbf8e 100644
--- a/workspaces/app-defaults/plugins/app-react/CHANGELOG.md
+++ b/workspaces/app-defaults/plugins/app-react/CHANGELOG.md
@@ -1,20 +1,5 @@
 # @red-hat-developer-hub/backstage-plugin-app-react
 
-## 0.2.0
-
-### Minor Changes
-
-- 0ed09e3: **BREAKING:** Removed `appDrawerModule` from this package. The module has been moved to `@red-hat-developer-hub/backstage-plugin-app-defaults` where default module registrations belong.
-
-  **Migration:** Update your imports:
-
-  ```diff
-  -import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-react/alpha';
-  +import { appDrawerModule } from '@red-hat-developer-hub/backstage-plugin-app-defaults';
-  ```
-
-  The reusable building blocks (`ApplicationDrawer`, `appDrawerContentDataRef`, `AppDrawerContentBlueprint`, `useAppDrawer`, `DrawerPanel`) remain in this package.
-
 ## 0.1.0
 
 ### Minor Changes
diff --git a/workspaces/app-defaults/plugins/app-react/package.json b/workspaces/app-defaults/plugins/app-react/package.json
index e7566c3ee40..30c59761306 100644
--- a/workspaces/app-defaults/plugins/app-react/package.json
+++ b/workspaces/app-defaults/plugins/app-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/backstage-plugin-app-react",
-  "version": "0.2.0",
+  "version": "0.1.0",
   "license": "Apache-2.0",
   "description": "Shared UI components and extension APIs for the RHDH app shell",
   "main": "src/index.ts",