Move common utilities files' up

Signed-off-by: Min Kim <minkimcello@gmail.com>

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,

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 {

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', () => ({

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 {

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';
 

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,

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;