Skip to content

Commit

Permalink
feat: remove dependency on yeoman
Browse files Browse the repository at this point in the history
  • Loading branch information
mdonnalley committed Jun 19, 2024
1 parent 96a8fa0 commit bb45562
Show file tree
Hide file tree
Showing 16 changed files with 57 additions and 366 deletions.
11 changes: 3 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,22 @@
"author": "Salesforce",
"bugs": "https://github.com/salesforcecli/plugin-templates/issues",
"dependencies": {
"@oclif/core": "^4",
"@salesforce/core": "^7.3.8",
"@salesforce/sf-plugins-core": "^10.0.1",
"@salesforce/templates": "^60.1.6",
"yeoman-environment": "^3",
"yeoman-generator": "^5"
"@salesforce/templates": "^60.1.6"
},
"devDependencies": {
"@oclif/core": "^4",
"@oclif/plugin-command-snapshot": "^5.2.2",
"@salesforce/cli-plugins-testkit": "^5.3.9",
"@salesforce/dev-scripts": "^10.1.0",
"@salesforce/plugin-command-reference": "^3.1.2",
"@types/yeoman-assert": "^3.1.4",
"@types/yeoman-environment": "^2.10.9",
"@types/yeoman-generator": "^5.2.13",
"eslint-plugin-sf-plugin": "^1.18.7",
"oclif": "^4.13.6",
"ts-node": "^10.9.2",
"typescript": "^5.4.5",
"yeoman-assert": "^3.1.1",
"yeoman-test": "^6.3.0"
"yeoman-assert": "^3.1.1"
},
"homepage": "https://github.com/salesforcecli/plugin-templates",
"keywords": [
Expand Down
5 changes: 2 additions & 3 deletions src/commands/analytics/generate/template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand, Ux } from '@salesforce/sf-plugins-core';
import { Messages } from '@salesforce/core';
import AnalyticsTemplateGenerator from '@salesforce/templates/lib/generators/analyticsTemplateGenerator.js';
import { AnalyticsTemplateOptions, CreateOutput } from '@salesforce/templates';
import { AnalyticsTemplateOptions, CreateOutput, TemplateType } from '@salesforce/templates';
import { getCustomTemplates, runGenerator } from '../../../utils/templateCommand.js';
import { outputDirFlag } from '../../../utils/flags.js';

Expand Down Expand Up @@ -42,7 +41,7 @@ export default class AnalyticsTemplate extends SfCommand<CreateOutput> {
};

return runGenerator({
generator: AnalyticsTemplateGenerator,
templateType: TemplateType.AnalyticsTemplate,
opts: flagsAsOptions,
ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
templates: getCustomTemplates(this.configAggregator),
Expand Down
5 changes: 2 additions & 3 deletions src/commands/apex/generate/class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/

import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand, Ux } from '@salesforce/sf-plugins-core';
import { ApexClassOptions, CreateOutput } from '@salesforce/templates';
import ApexClassGenerator from '@salesforce/templates/lib/generators/apexClassGenerator.js';
import { ApexClassOptions, CreateOutput, TemplateType } from '@salesforce/templates';
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
import { Messages } from '@salesforce/core';
import { runGenerator, getCustomTemplates } from '../../../utils/templateCommand.js';
Expand Down Expand Up @@ -54,7 +53,7 @@ export default class ApexClass extends SfCommand<CreateOutput> {
outputdir: flags['output-dir'],
};
return runGenerator({
generator: ApexClassGenerator,
templateType: TemplateType.ApexClass,
opts: flagsAsOptions,
ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
templates: getCustomTemplates(this.configAggregator),
Expand Down
20 changes: 10 additions & 10 deletions src/commands/apex/generate/trigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import {
SfCommand,
Ux,
} from '@salesforce/sf-plugins-core';
import { ApexTriggerOptions, CreateOutput } from '@salesforce/templates';
import ApexTriggerGenerator from '@salesforce/templates/lib/generators/apexTriggerGenerator.js';
import { ApexTriggerOptions, CreateOutput, TemplateType } from '@salesforce/templates';
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
import { Messages } from '@salesforce/core';
import { getCustomTemplates, runGenerator } from '../../../utils/templateCommand.js';
Expand Down Expand Up @@ -74,15 +73,16 @@ export default class ApexTrigger extends SfCommand<CreateOutput> {

public async run(): Promise<CreateOutput> {
const { flags } = await this.parse(ApexTrigger);
const opts: ApexTriggerOptions = {
triggername: flags.name,
outputdir: flags['output-dir'],
template: 'ApexTrigger',
sobject: flags.sobject,
triggerevents: flags.event as ApexTriggerOptions['triggerevents'],
};
return runGenerator({
generator: ApexTriggerGenerator,
opts: {
triggername: flags.name,
outputdir: flags['output-dir'],
template: 'ApexTrigger',
sobject: flags.sobject,
triggerevents: flags.event as ApexTriggerOptions['triggerevents'],
},
templateType: TemplateType.ApexTrigger,
opts,
ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
templates: getCustomTemplates(this.configAggregator),
});
Expand Down
5 changes: 2 additions & 3 deletions src/commands/lightning/generate/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/

import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand, Ux } from '@salesforce/sf-plugins-core';
import { CreateOutput, LightningAppOptions } from '@salesforce/templates';
import LightningAppGenerator from '@salesforce/templates/lib/generators/lightningAppGenerator.js';
import { CreateOutput, LightningAppOptions, TemplateType } from '@salesforce/templates';
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
import { Messages } from '@salesforce/core';
import { getCustomTemplates, runGenerator } from '../../../utils/templateCommand.js';
Expand Down Expand Up @@ -57,7 +56,7 @@ export default class LightningApp extends SfCommand<CreateOutput> {
internal: flags.internal,
};
return runGenerator({
generator: LightningAppGenerator,
templateType: TemplateType.LightningApp,
opts: flagsAsOptions,
ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
templates: getCustomTemplates(this.configAggregator),
Expand Down
5 changes: 2 additions & 3 deletions src/commands/lightning/generate/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
// tslint:disable:no-unused-expression

import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand, Ux } from '@salesforce/sf-plugins-core';
import { CreateOutput, LightningComponentOptions } from '@salesforce/templates';
import LightningComponentGenerator from '@salesforce/templates/lib/generators/lightningComponentGenerator.js';
import { CreateOutput, LightningComponentOptions, TemplateType } from '@salesforce/templates';
import { Messages } from '@salesforce/core';
import { getCustomTemplates, runGenerator } from '../../../utils/templateCommand.js';
import { internalFlag, outputDirFlagLightning } from '../../../utils/flags.js';
Expand Down Expand Up @@ -64,7 +63,7 @@ export default class LightningComponent extends SfCommand<CreateOutput> {
type: flags.type,
};
return runGenerator({
generator: LightningComponentGenerator,
templateType: TemplateType.LightningComponent,
opts: flagsAsOptions,
ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
templates: getCustomTemplates(this.configAggregator),
Expand Down
5 changes: 2 additions & 3 deletions src/commands/lightning/generate/event.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/

import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand, Ux } from '@salesforce/sf-plugins-core';
import { CreateOutput, LightningEventOptions } from '@salesforce/templates';
import LightningEventGenerator from '@salesforce/templates/lib/generators/lightningEventGenerator.js';
import { CreateOutput, LightningEventOptions, TemplateType } from '@salesforce/templates';
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
import { Messages } from '@salesforce/core';
import { getCustomTemplates, runGenerator } from '../../../utils/templateCommand.js';
Expand Down Expand Up @@ -58,7 +57,7 @@ export default class LightningEvent extends SfCommand<CreateOutput> {
internal: flags.internal,
};
return runGenerator({
generator: LightningEventGenerator,
templateType: TemplateType.LightningEvent,
opts: flagsAsOptions,
ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
templates: getCustomTemplates(this.configAggregator),
Expand Down
5 changes: 2 additions & 3 deletions src/commands/lightning/generate/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/

import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand, Ux } from '@salesforce/sf-plugins-core';
import { CreateOutput, LightningInterfaceOptions } from '@salesforce/templates';
import LightningInterfaceGenerator from '@salesforce/templates/lib/generators/lightningInterfaceGenerator.js';
import { CreateOutput, LightningInterfaceOptions, TemplateType } from '@salesforce/templates';
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
import { Messages } from '@salesforce/core';
import { getCustomTemplates, runGenerator } from '../../../utils/templateCommand.js';
Expand Down Expand Up @@ -57,7 +56,7 @@ export default class LightningInterface extends SfCommand<CreateOutput> {
template: 'DefaultLightningIntf',
};
return runGenerator({
generator: LightningInterfaceGenerator,
templateType: TemplateType.LightningInterface,
opts: flagsAsOptions,
ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
templates: getCustomTemplates(this.configAggregator),
Expand Down
5 changes: 2 additions & 3 deletions src/commands/lightning/generate/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/

import { Flags, loglevel, SfCommand, orgApiVersionFlagWithDeprecations, Ux } from '@salesforce/sf-plugins-core';
import { CreateOutput, LightningTestOptions } from '@salesforce/templates';
import LightningTestGenerator from '@salesforce/templates/lib/generators/lightningTestGenerator.js';
import { CreateOutput, LightningTestOptions, TemplateType } from '@salesforce/templates';
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
import { Messages } from '@salesforce/core';
import { getCustomTemplates, runGenerator } from '../../../utils/templateCommand.js';
Expand Down Expand Up @@ -57,7 +56,7 @@ export default class LightningTest extends SfCommand<CreateOutput> {
apiversion: flags['api-version'],
};
return runGenerator({
generator: LightningTestGenerator,
templateType: TemplateType.LightningTest,
opts: flagsAsOptions,
ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
templates: getCustomTemplates(this.configAggregator),
Expand Down
5 changes: 2 additions & 3 deletions src/commands/project/generate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/

import { Flags, loglevel, SfCommand, Ux } from '@salesforce/sf-plugins-core';
import { CreateOutput, ProjectOptions } from '@salesforce/templates';
import ProjectGenerator from '@salesforce/templates/lib/generators/projectGenerator.js';
import { CreateOutput, ProjectOptions, TemplateType } from '@salesforce/templates';
import { Messages } from '@salesforce/core';
import { getCustomTemplates, runGenerator } from '../../utils/templateCommand.js';
import { outputDirFlag } from '../../utils/flags.js';
Expand Down Expand Up @@ -84,7 +83,7 @@ export default class Project extends SfCommand<CreateOutput> {
apiversion: flags['api-version'],
};
return runGenerator({
generator: ProjectGenerator,
templateType: TemplateType.Project,
opts: flagsAsOptions,
ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
templates: getCustomTemplates(this.configAggregator),
Expand Down
5 changes: 2 additions & 3 deletions src/commands/static-resource/generate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
*/

import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand, Ux } from '@salesforce/sf-plugins-core';
import { CreateOutput, StaticResourceOptions } from '@salesforce/templates';
import { CreateOutput, StaticResourceOptions, TemplateType } from '@salesforce/templates';
import { Messages } from '@salesforce/core';
import StaticResourceGenerator from '@salesforce/templates/lib/generators/staticResourceGenerator.js';
import { outputDirFlag } from '../../utils/flags.js';
import { getCustomTemplates, runGenerator } from '../../utils/templateCommand.js';

Expand Down Expand Up @@ -53,7 +52,7 @@ export default class StaticResource extends SfCommand<CreateOutput> {
};

return runGenerator({
generator: StaticResourceGenerator,
templateType: TemplateType.StaticResource,
opts: flagsAsOptions,
ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
templates: getCustomTemplates(this.configAggregator),
Expand Down
5 changes: 2 additions & 3 deletions src/commands/visualforce/generate/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/

import { Flags, SfCommand, orgApiVersionFlagWithDeprecations, Ux, loglevel } from '@salesforce/sf-plugins-core';
import { CreateOutput, VisualforceComponentOptions } from '@salesforce/templates';
import VisualforceComponentGenerator from '@salesforce/templates/lib/generators/visualforceComponentGenerator.js';
import { CreateOutput, TemplateType, VisualforceComponentOptions } from '@salesforce/templates';
import { Messages } from '@salesforce/core';
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
import { outputDirFlag } from '../../../utils/flags.js';
Expand Down Expand Up @@ -64,7 +63,7 @@ export default class VisualforceComponent extends SfCommand<CreateOutput> {
};

return runGenerator({
generator: VisualforceComponentGenerator,
templateType: TemplateType.VisualforceComponent,
opts: flagsAsOptions,
ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
templates: getCustomTemplates(this.configAggregator),
Expand Down
5 changes: 2 additions & 3 deletions src/commands/visualforce/generate/page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/

import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand, Ux } from '@salesforce/sf-plugins-core';
import VisualforcePageGenerator from '@salesforce/templates/lib/generators/visualforcePageGenerator.js';
import { CreateOutput, CreateUtil, VisualforcePageOptions } from '@salesforce/templates';
import { CreateOutput, CreateUtil, TemplateType, VisualforcePageOptions } from '@salesforce/templates';
import { Messages } from '@salesforce/core';
import { getCustomTemplates, runGenerator } from '../../../utils/templateCommand.js';
import { outputDirFlag } from '../../../utils/flags.js';
Expand Down Expand Up @@ -64,7 +63,7 @@ export default class VisualforcePage extends SfCommand<CreateOutput> {
apiversion: flags['api-version'],
};
return runGenerator({
generator: VisualforcePageGenerator,
templateType: TemplateType.VisualforcePage,
opts: flagsAsOptions,
ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
templates: getCustomTemplates(this.configAggregator),
Expand Down
Loading

0 comments on commit bb45562

Please sign in to comment.