diff --git a/packages/typegpu-cli/src/create.ts b/packages/typegpu-cli/src/create.ts index 7b7cda6756..c2cbb6ecf1 100644 --- a/packages/typegpu-cli/src/create.ts +++ b/packages/typegpu-cli/src/create.ts @@ -4,7 +4,7 @@ import * as p from '@clack/prompts'; import { pmFromUserAgent, pmInstall } from './utils/pm.ts'; import { cancelExit, confirmStep, rgbText } from './utils/prompts.ts'; import { copyTemplate, prepareDirectory } from './utils/files.ts'; -import { getPackageName, getProjectDirectory } from './utils/inputs.ts'; +import { getProjectDirectory } from './utils/inputs.ts'; import { detect, resolveCommand } from 'package-manager-detector'; const DEFAULT_PROJECT_DIR = 'tgpu-project'; @@ -23,7 +23,7 @@ export async function createProject(cwd: string) { const root = await prepareDirectory(cwd, projectDir); - const packageName = await getPackageName(projectDir); + const packageName = path.basename(root); const projectTemplate = await p.select({ message: 'Select a template:', diff --git a/packages/typegpu-cli/src/utils/inputs.ts b/packages/typegpu-cli/src/utils/inputs.ts index dd3b263561..e8067bcaae 100644 --- a/packages/typegpu-cli/src/utils/inputs.ts +++ b/packages/typegpu-cli/src/utils/inputs.ts @@ -5,10 +5,6 @@ function isValidProjectDirectory(projectDir: string) { return !/[<>:"\\|?*\s]|\/+$/.test(projectDir.trim()); } -function isValidPackageName(packageName: string) { - return /^(?:@[a-z\d][a-z\d\-._]*\/)?[a-z\d][a-z\d\-._]*$/.test(packageName.trim()); -} - export async function getProjectDirectory(initialValue: string) { let projectDir = await p.text({ message: 'Project directory:', @@ -26,20 +22,3 @@ export async function getProjectDirectory(initialValue: string) { projectDir ??= '.'; return projectDir.trim(); } - -export async function getPackageName(initialValue: string) { - const packageName = await p.text({ - message: 'Package name:', - placeholder: initialValue, - initialValue, - validate: (value) => { - return !value || !isValidPackageName(value) ? 'Invalid package name.' : undefined; - }, - }); - - if (p.isCancel(packageName)) { - cancelExit(); - } - - return packageName.trim(); -}