Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(cna): use Commander args instead of process.argv #68454

Merged
merged 3 commits into from
Aug 2, 2024
Merged

refactor(cna): use Commander args instead of process.argv #68454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
703bdb9
refactor(cna): use args instead of process.argv
devjiwonchoi Aug 2, 2024
e0aa377
fix: correct opts value
devjiwonchoi Aug 2, 2024
6c3f08b
sync naming for app value for future destructuring
devjiwonchoi Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/create-next-app/create-app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export async function createApp({
typescript,
tailwind,
eslint,
appRouter,
app,
srcDir,
importAlias,
skipInstall,
Expand All @@ -45,7 +45,7 @@ export async function createApp({
typescript: boolean
tailwind: boolean
eslint: boolean
appRouter: boolean
app: boolean
srcDir: boolean
importAlias: string
skipInstall: boolean
Expand All @@ -54,7 +54,7 @@ export async function createApp({
}): Promise<void> {
let repoInfo: RepoInfo | undefined
const mode: TemplateMode = typescript ? 'ts' : 'js'
const template: TemplateType = `${appRouter ? 'app' : 'default'}${tailwind ? '-tw' : ''}${empty ? '-empty' : ''}`
const template: TemplateType = `${app ? 'app' : 'default'}${tailwind ? '-tw' : ''}${empty ? '-empty' : ''}`

if (example) {
let repoUrl: URL | undefined
Expand Down
35 changes: 13 additions & 22 deletions packages/create-next-app/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ const program = new Command(packageJson.name)
.parse(process.argv)

const opts = program.opts()
// const { args } = program
const { args } = program

const packageManager: PackageManager = !!opts.useNpm
? 'npm'
Expand Down Expand Up @@ -273,10 +273,7 @@ async function run(): Promise<void> {
}
}

if (
!process.argv.includes('--eslint') &&
!process.argv.includes('--no-eslint')
) {
if (!opts.eslint && !args.includes('--no-eslint')) {
if (skipPrompt) {
opts.eslint = getPrefOrDefault('eslint')
} else {
Expand All @@ -295,10 +292,7 @@ async function run(): Promise<void> {
}
}

if (
!process.argv.includes('--tailwind') &&
!process.argv.includes('--no-tailwind')
) {
if (!opts.tailwind && !args.includes('--no-tailwind')) {
if (skipPrompt) {
opts.tailwind = getPrefOrDefault('tailwind')
} else {
Expand All @@ -317,10 +311,7 @@ async function run(): Promise<void> {
}
}

if (
!process.argv.includes('--src-dir') &&
!process.argv.includes('--no-src-dir')
) {
if (!opts.srcDir && !args.includes('--no-src-dir')) {
if (skipPrompt) {
opts.srcDir = getPrefOrDefault('srcDir')
} else {
Expand All @@ -339,26 +330,26 @@ async function run(): Promise<void> {
}
}

if (!process.argv.includes('--app') && !process.argv.includes('--no-app')) {
if (!opts.app && !args.includes('--no-app')) {
if (skipPrompt) {
opts.app = getPrefOrDefault('app')
} else {
const styledAppDir = blue('App Router')
const { appRouter } = await prompts({
const { app } = await prompts({
onState: onPromptState,
type: 'toggle',
name: 'appRouter',
name: 'app',
message: `Would you like to use ${styledAppDir}? (recommended)`,
initial: getPrefOrDefault('app'),
active: 'Yes',
inactive: 'No',
})
opts.app = Boolean(appRouter)
preferences.app = Boolean(appRouter)
opts.app = Boolean(app)
preferences.app = Boolean(app)
}
}

if (!opts.turbo && !process.argv.includes('--no-turbo')) {
if (!opts.turbo && !args.includes('--no-turbo')) {
if (skipPrompt) {
opts.turbo = getPrefOrDefault('turbo')
} else {
Expand All @@ -385,7 +376,7 @@ async function run(): Promise<void> {
if (skipPrompt) {
// We don't use preferences here because the default value is @/* regardless of existing preferences
opts.importAlias = defaults.importAlias
} else if (process.argv.includes('--no-import-alias')) {
} else if (args.includes('--no-import-alias')) {
opts.importAlias = defaults.importAlias
} else {
const styledImportAlias = blue('import alias')
Expand Down Expand Up @@ -431,7 +422,7 @@ async function run(): Promise<void> {
typescript: opts.typescript,
tailwind: opts.tailwind,
eslint: opts.eslint,
appRouter: opts.app,
app: opts.app,
srcDir: opts.srcDir,
importAlias: opts.importAlias,
skipInstall: opts.skipInstall,
Expand Down Expand Up @@ -462,7 +453,7 @@ async function run(): Promise<void> {
typescript: opts.typescript,
eslint: opts.eslint,
tailwind: opts.tailwind,
appRouter: opts.app,
app: opts.app,
srcDir: opts.srcDir,
importAlias: opts.importAlias,
skipInstall: opts.skipInstall,
Expand Down
Loading