diff --git a/packages/create-app/cli-report.md b/packages/create-app/cli-report.md index 081371b0c0..88e19d05c6 100644 --- a/packages/create-app/cli-report.md +++ b/packages/create-app/cli-report.md @@ -8,7 +8,7 @@ Usage: backstage-create-app [options] Options: - --experimental-frontend + --next --path [directory] --skip-install --template-path [directory] diff --git a/packages/create-app/src/createApp.test.ts b/packages/create-app/src/createApp.test.ts index e71fd76fa1..c2870851b1 100644 --- a/packages/create-app/src/createApp.test.ts +++ b/packages/create-app/src/createApp.test.ts @@ -96,8 +96,8 @@ describe('command entrypoint', () => { expect(buildAppMock).toHaveBeenCalled(); }); - it('should call expected tasks when `--experimental-frontend` is supplied', async () => { - const cmd = { experimentalFrontend: true } as unknown as Command; + it('should call expected tasks when `--next` is supplied', async () => { + const cmd = { next: true } as unknown as Command; await createApp(cmd); expect(checkAppExistsMock).toHaveBeenCalled(); expect(tryInitGitRepositoryMock).toHaveBeenCalled(); diff --git a/packages/create-app/src/createApp.ts b/packages/create-app/src/createApp.ts index a2080bd45e..5c199258da 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 `--experimental-frontend` flag + // If using the default template, filter out `packages/app` when the `--next` flag // is used or `packages/app-next` when its not used. const excludedDirs = !opts.templatePath ? [opts.experimentalFrontend ? 'packages/app/' : 'packages/app-next/'] diff --git a/packages/create-app/src/index.ts b/packages/create-app/src/index.ts index 46e9f188e4..cfa448aa1a 100644 --- a/packages/create-app/src/index.ts +++ b/packages/create-app/src/index.ts @@ -31,10 +31,7 @@ const main = (argv: string[]) => { .name('backstage-create-app') .version(version) .description('Creates a new app in a new directory or specified path') - .option( - '--experimental-frontend', - 'Use the default template with the experimental frontend', - ) + .option('--next', 'Use the next generation of the app template') .option( '--path [directory]', 'Location to store the app defaulting to a new folder with the app name', diff --git a/packages/create-app/templates/default-app/packages/app-next/src/App.tsx b/packages/create-app/templates/default-app/packages/app-next/src/App.tsx index 9607e9a101..457d0cf9da 100644 --- a/packages/create-app/templates/default-app/packages/app-next/src/App.tsx +++ b/packages/create-app/templates/default-app/packages/app-next/src/App.tsx @@ -1,9 +1,11 @@ import { createApp } from '@backstage/frontend-defaults'; import catalogPlugin from '@backstage/plugin-catalog/alpha'; +import { appModule } from './modules/app'; export default createApp({ features: [ catalogPlugin, + appModule, ], }); diff --git a/packages/create-app/templates/default-app/packages/app-next/src/modules/app.tsx b/packages/create-app/templates/default-app/packages/app-next/src/modules/app.tsx index 8c90362dd8..2331df6250 100644 --- a/packages/create-app/templates/default-app/packages/app-next/src/modules/app.tsx +++ b/packages/create-app/templates/default-app/packages/app-next/src/modules/app.tsx @@ -1,5 +1,5 @@ -import { coreExtensionData, createFrontendModule } from "@backstage/frontend-plugin-api"; -import appPlugin from "@backstage/plugin-app"; +import { coreExtensionData, createFrontendModule } from '@backstage/frontend-plugin-api'; +import appPlugin from '@backstage/plugin-app'; export const appModule = createFrontendModule({ pluginId: 'app',