Skip to content

Commit b745c38

Browse files
Merge pull request #922 from salesforcecli/sm/use-top-level-templates-exports
refactor: use top-level @salesforce/templates exports instead of deep lib/ imports - W-22245234
2 parents c69acec + 33fada0 commit b745c38

7 files changed

Lines changed: 7 additions & 14 deletions

File tree

src/commands/template/generate/apex/class.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
*/
77

88
import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand, Ux } from '@salesforce/sf-plugins-core';
9-
import { ApexClassOptions, CreateOutput, TemplateType } from '@salesforce/templates';
10-
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
9+
import { ApexClassOptions, CreateOutput, CreateUtil, TemplateType } from '@salesforce/templates';
1110
import { Messages } from '@salesforce/core';
1211
import { runGenerator, getCustomTemplates } from '../../../../utils/templateCommand.js';
1312
import { outputDirFlag } from '../../../../utils/flags.js';

src/commands/template/generate/apex/trigger.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import {
1313
SfCommand,
1414
Ux,
1515
} from '@salesforce/sf-plugins-core';
16-
import { ApexTriggerOptions, CreateOutput, TemplateType } from '@salesforce/templates';
17-
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
16+
import { ApexTriggerOptions, CreateOutput, CreateUtil, TemplateType } from '@salesforce/templates';
1817
import { Messages } from '@salesforce/core';
1918
import { getCustomTemplates, runGenerator } from '../../../../utils/templateCommand.js';
2019
import { outputDirFlag } from '../../../../utils/flags.js';

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
*/
77

88
import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand, Ux } from '@salesforce/sf-plugins-core';
9-
import { CreateOutput, LightningAppOptions, TemplateType } from '@salesforce/templates';
10-
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
9+
import { CreateOutput, CreateUtil, LightningAppOptions, TemplateType } from '@salesforce/templates';
1110
import { Messages } from '@salesforce/core';
1211
import { getCustomTemplates, runGenerator } from '../../../../utils/templateCommand.js';
1312
import { internalFlag, outputDirFlagLightning } from '../../../../utils/flags.js';

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
*/
77

88
import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand, Ux } from '@salesforce/sf-plugins-core';
9-
import { CreateOutput, LightningEventOptions, TemplateType } from '@salesforce/templates';
10-
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
9+
import { CreateOutput, CreateUtil, LightningEventOptions, TemplateType } from '@salesforce/templates';
1110
import { Messages } from '@salesforce/core';
1211
import { getCustomTemplates, runGenerator } from '../../../../utils/templateCommand.js';
1312
import { internalFlag, outputDirFlagLightning } from '../../../../utils/flags.js';

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
*/
77

88
import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand, Ux } from '@salesforce/sf-plugins-core';
9-
import { CreateOutput, LightningInterfaceOptions, TemplateType } from '@salesforce/templates';
10-
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
9+
import { CreateOutput, CreateUtil, LightningInterfaceOptions, TemplateType } from '@salesforce/templates';
1110
import { Messages } from '@salesforce/core';
1211
import { getCustomTemplates, runGenerator } from '../../../../utils/templateCommand.js';
1312
import { internalFlag, outputDirFlagLightning } from '../../../../utils/flags.js';

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
*/
77

88
import { Flags, loglevel, SfCommand, orgApiVersionFlagWithDeprecations, Ux } from '@salesforce/sf-plugins-core';
9-
import { CreateOutput, LightningTestOptions, TemplateType } from '@salesforce/templates';
10-
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
9+
import { CreateOutput, CreateUtil, LightningTestOptions, TemplateType } from '@salesforce/templates';
1110
import { Messages } from '@salesforce/core';
1211
import { getCustomTemplates, runGenerator } from '../../../../utils/templateCommand.js';
1312
import { internalFlag, outputDirFlagLightning } from '../../../../utils/flags.js';

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
*/
77

88
import { Flags, SfCommand, orgApiVersionFlagWithDeprecations, Ux, loglevel } from '@salesforce/sf-plugins-core';
9-
import { CreateOutput, TemplateType, VisualforceComponentOptions } from '@salesforce/templates';
9+
import { CreateOutput, CreateUtil, TemplateType, VisualforceComponentOptions } from '@salesforce/templates';
1010
import { Messages } from '@salesforce/core';
11-
import { CreateUtil } from '@salesforce/templates/lib/utils/index.js';
1211
import { outputDirFlag } from '../../../../utils/flags.js';
1312
import { runGenerator, getCustomTemplates } from '../../../../utils/templateCommand.js';
1413
const visualforceComponentFileSuffix = /.component$/;

0 commit comments

Comments
 (0)