Skip to content

Commit 258bafd

Browse files
author
Shubham Goyal
committed
fix: simplify lwc language default handling
Only set lwcLanguage when the flag is provided. Remove redundant default template reassignment logic. Made-with: Cursor
1 parent 7ddc316 commit 258bafd

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

src/commands/template/generate/lightning/component.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,8 @@ export default class LightningComponent extends SfCommand<CreateOutput> {
7070

7171
if (defaultLwcLanguage === 'typescript') {
7272
template = 'typeScript';
73-
} else if (defaultLwcLanguage === 'javascript') {
74-
template = 'default'; // Explicit JavaScript template
7573
}
76-
// If defaultLwcLanguage is undefined or other value, template remains 'default'
74+
// If defaultLwcLanguage is undefined or non-typescript, template remains default.
7775
} catch (error) {
7876
// Not in a project context or project config not available, use default
7977
this.debug('Could not resolve project config for intelligent defaulting:', error);

src/commands/template/generate/project/index.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ export default class Project extends SfCommand<CreateOutput> {
6767
summary: messages.getMessage('flags.lwc-language.summary'),
6868
description: messages.getMessage('flags.lwc-language.description'),
6969
options: ['javascript', 'typescript'] as const,
70-
default: 'javascript',
7170
})(),
7271
loglevel,
7372
'api-version': Flags.orgApiVersion({
@@ -77,9 +76,6 @@ export default class Project extends SfCommand<CreateOutput> {
7776
public async run(): Promise<CreateOutput> {
7877
const { flags } = await this.parse(Project);
7978

80-
// Only include lwcLanguage if user explicitly provided the flag
81-
const userProvidedLwcLanguage = this.argv.includes('--lwc-language');
82-
8379
const flagsAsOptions: ProjectOptions = {
8480
projectname: flags.name,
8581
outputdir: flags['output-dir'],
@@ -90,8 +86,11 @@ export default class Project extends SfCommand<CreateOutput> {
9086
ns: flags.namespace,
9187
defaultpackagedir: flags['default-package-dir'],
9288
apiversion: flags['api-version'],
93-
...(userProvidedLwcLanguage && { lwcLanguage: flags['lwc-language'] }),
9489
};
90+
if (flags['lwc-language']) {
91+
flagsAsOptions.lwcLanguage = flags['lwc-language'];
92+
}
93+
9594
return runGenerator({
9695
templateType: TemplateType.Project,
9796
opts: flagsAsOptions,

0 commit comments

Comments
 (0)