From 811eda89600439dc862762849f873b0d237f7e5e Mon Sep 17 00:00:00 2001 From: Min Kim Date: Thu, 19 Dec 2024 16:31:08 -0500 Subject: [PATCH] Move common utilities files' up Signed-off-by: Min Kim --- packages/cli/src/commands/new/new.ts | 4 ++-- packages/cli/src/commands/new/util.ts | 2 +- packages/cli/src/commands/versions/migrate.test.ts | 2 +- .../cli/src/lib/new/{factories/common => }/prompts.ts | 4 ++-- .../src/lib/new/{factories/common => }/tasks.test.ts | 2 +- .../cli/src/lib/new/{factories/common => }/tasks.ts | 10 +++++----- .../src/lib/new/{factories/common => }/testUtils.ts | 2 +- .../src/lib/new/{factories/common => }/util.test.ts | 0 .../cli/src/lib/new/{factories/common => }/util.ts | 0 9 files changed, 13 insertions(+), 13 deletions(-) rename packages/cli/src/lib/new/{factories/common => }/prompts.ts (96%) rename packages/cli/src/lib/new/{factories/common => }/tasks.test.ts (98%) rename packages/cli/src/lib/new/{factories/common => }/tasks.ts (90%) rename packages/cli/src/lib/new/{factories/common => }/testUtils.ts (98%) rename packages/cli/src/lib/new/{factories/common => }/util.test.ts (100%) rename packages/cli/src/lib/new/{factories/common => }/util.ts (100%) diff --git a/packages/cli/src/commands/new/new.ts b/packages/cli/src/commands/new/new.ts index e36ce3ab16..5ce51e5b68 100644 --- a/packages/cli/src/commands/new/new.ts +++ b/packages/cli/src/commands/new/new.ts @@ -28,9 +28,9 @@ import { addCodeownersEntry, getCodeownersFilePath, } from '../../lib/codeowners'; -import { resolvePackageName } from '../../lib/new/factories/common/util'; +import { resolvePackageName } from '../../lib/new/util'; -import { executePluginPackageTemplate } from '../../lib/new/factories/common/tasks'; +import { executePluginPackageTemplate } from '../../lib/new/tasks'; import { readCliConfig, templateSelector, diff --git a/packages/cli/src/commands/new/util.ts b/packages/cli/src/commands/new/util.ts index 51591ccba8..e6a5ec3fda 100644 --- a/packages/cli/src/commands/new/util.ts +++ b/packages/cli/src/commands/new/util.ts @@ -24,7 +24,7 @@ import { moduleIdIdPrompt, npmRegistryPrompt, ownerPrompt, -} from '../../lib/new/factories/common/prompts'; +} from '../../lib/new/prompts'; import defaultTemplates from '../../../templates/all-default-templates'; import { diff --git a/packages/cli/src/commands/versions/migrate.test.ts b/packages/cli/src/commands/versions/migrate.test.ts index 043e1893a4..bfaa103e98 100644 --- a/packages/cli/src/commands/versions/migrate.test.ts +++ b/packages/cli/src/commands/versions/migrate.test.ts @@ -21,7 +21,7 @@ import * as run from '../../lib/run'; import migrate from './migrate'; import { withLogCollector } from '@backstage/test-utils'; import fs from 'fs-extra'; -import { expectLogsToMatch } from '../../lib/new/factories/common/testUtils'; +import { expectLogsToMatch } from '../../lib/new/testUtils'; // Remove log coloring to simplify log matching jest.mock('chalk', () => ({ diff --git a/packages/cli/src/lib/new/factories/common/prompts.ts b/packages/cli/src/lib/new/prompts.ts similarity index 96% rename from packages/cli/src/lib/new/factories/common/prompts.ts rename to packages/cli/src/lib/new/prompts.ts index 5663ee2c21..0bc4f9205d 100644 --- a/packages/cli/src/lib/new/factories/common/prompts.ts +++ b/packages/cli/src/lib/new/prompts.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { Prompt } from '../../types'; -import { parseOwnerIds } from '../../../codeowners'; +import { Prompt } from './types'; +import { parseOwnerIds } from '../codeowners'; export function pluginIdPrompt(): Prompt<{ id: string }> { return { diff --git a/packages/cli/src/lib/new/factories/common/tasks.test.ts b/packages/cli/src/lib/new/tasks.test.ts similarity index 98% rename from packages/cli/src/lib/new/factories/common/tasks.test.ts rename to packages/cli/src/lib/new/tasks.test.ts index 60783344fc..3e6423c531 100644 --- a/packages/cli/src/lib/new/factories/common/tasks.test.ts +++ b/packages/cli/src/lib/new/tasks.test.ts @@ -21,7 +21,7 @@ import { expectLogsToMatch, mockPaths, } from './testUtils'; -import { CreateContext } from '../../types'; +import { CreateContext } from './types'; import { executePluginPackageTemplate } from './tasks'; import { createMockDirectory } from '@backstage/backend-test-utils'; diff --git a/packages/cli/src/lib/new/factories/common/tasks.ts b/packages/cli/src/lib/new/tasks.ts similarity index 90% rename from packages/cli/src/lib/new/factories/common/tasks.ts rename to packages/cli/src/lib/new/tasks.ts index a6c9e520c7..fa43ccd45e 100644 --- a/packages/cli/src/lib/new/factories/common/tasks.ts +++ b/packages/cli/src/lib/new/tasks.ts @@ -17,11 +17,11 @@ import fs from 'fs-extra'; import chalk from 'chalk'; import { resolve as resolvePath, relative as relativePath } from 'path'; -import { paths } from '../../../paths'; -import { Task, templatingTask } from '../../../tasks'; -import { Lockfile } from '../../../versioning'; -import { createPackageVersionProvider } from '../../../version'; -import { CreateContext } from '../../types'; +import { paths } from '../paths'; +import { Task, templatingTask } from '../tasks'; +import { Lockfile } from '../versioning'; +import { createPackageVersionProvider } from '../version'; +import { CreateContext } from './types'; export async function executePluginPackageTemplate( ctx: CreateContext, diff --git a/packages/cli/src/lib/new/factories/common/testUtils.ts b/packages/cli/src/lib/new/testUtils.ts similarity index 98% rename from packages/cli/src/lib/new/factories/common/testUtils.ts rename to packages/cli/src/lib/new/testUtils.ts index 1ade13a996..55469d2f0d 100644 --- a/packages/cli/src/lib/new/factories/common/testUtils.ts +++ b/packages/cli/src/lib/new/testUtils.ts @@ -18,7 +18,7 @@ import { WriteStream } from 'tty'; import { resolve as resolvePath } from 'path'; -import { paths } from '../../../paths'; +import { paths } from '../paths'; export function mockPaths(options: { ownDir?: string; diff --git a/packages/cli/src/lib/new/factories/common/util.test.ts b/packages/cli/src/lib/new/util.test.ts similarity index 100% rename from packages/cli/src/lib/new/factories/common/util.test.ts rename to packages/cli/src/lib/new/util.test.ts diff --git a/packages/cli/src/lib/new/factories/common/util.ts b/packages/cli/src/lib/new/util.ts similarity index 100% rename from packages/cli/src/lib/new/factories/common/util.ts rename to packages/cli/src/lib/new/util.ts