From f47c62993dd187e7cec1b8b3d72ef7e65a423506 Mon Sep 17 00:00:00 2001 From: benjdlambert Date: Mon, 21 Jul 2025 11:04:15 +0200 Subject: [PATCH] chore: include bui version and rename folder to app Signed-off-by: benjdlambert --- packages/create-app/src/createApp.ts | 10 +++++++++- .../default-app/packages/app-next/package.json.hbs | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/create-app/src/createApp.ts b/packages/create-app/src/createApp.ts index 5c199258da..8e6b510c73 100644 --- a/packages/create-app/src/createApp.ts +++ b/packages/create-app/src/createApp.ts @@ -70,7 +70,7 @@ export default async (opts: OptionValues): Promise => { ? paths.resolveTarget(opts.templatePath) : paths.resolveOwn('templates/default-app'); - // If using the default template, filter out `packages/app` when the `--next` flag + // If using the default template, filter out `packages/app` when the `--` flag // is used or `packages/app-next` when its not used. const excludedDirs = !opts.templatePath ? [opts.experimentalFrontend ? 'packages/app/' : 'packages/app-next/'] @@ -128,6 +128,14 @@ export default async (opts: OptionValues): Promise => { await moveAppTask(tempDir, appDir, answers.name); } + if (opts.next) { + // we need to rename the app-next directory back to the app directory which got excluded + await fs.rename( + resolvePath(appDir, 'app-next'), + resolvePath(appDir, 'app'), + ); + } + const fetchedYarnLockSeed = await fetchYarnLockSeedTask(appDir); if (gitConfig) { diff --git a/packages/create-app/templates/default-app/packages/app-next/package.json.hbs b/packages/create-app/templates/default-app/packages/app-next/package.json.hbs index 1d97185dd5..f336b3a293 100644 --- a/packages/create-app/templates/default-app/packages/app-next/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/app-next/package.json.hbs @@ -17,6 +17,7 @@ "@backstage/frontend-defaults": "^{{version '@backstage/frontend-defaults'}}", "@backstage/frontend-plugin-api": "^{{version '@backstage/frontend-plugin-api'}}", "@backstage/plugin-catalog": "^{{version '@backstage/plugin-catalog'}}", + "@backstage/ui": "^{{version '@backstage/ui'}}", "react": "^18.0.2", "react-dom": "^18.0.2", "react-router": "^6.3.0",