Skip to content

Commit 4ae7c3a

Browse files
mshanemcmshanemc
authored
Sm/fixes (#543)
* fix: align base class with TemplateOptions interface, update deps, fix Windows UT
1 parent b5e880f commit 4ae7c3a

18 files changed

+204
-275
lines changed

‎.github/workflows/unitTestsWindows.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
run: git config --global core.autocrlf false
1616
shell: bash
1717
- uses: actions/checkout@v3
18-
- uses: salesforcecli/github-workflows/.github/actions/windowsCachePerf@main
1918
- uses: actions/setup-node@v3
2019
with:
2120
node-version: ${{ matrix.node_version }}

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
"mime-types": "^2.1.27",
2020
"proxy-agent": "^5.0.0",
2121
"proxy-from-env": "^1.1.0",
22-
"shelljs": "^0.8.5",
23-
"tar": "^6.1.10",
22+
"tar": "^6.1.13",
2423
"tslib": "^1",
2524
"yeoman-environment": "^3.9.1",
2625
"yeoman-generator": "^5.6.1"
@@ -59,6 +58,7 @@
5958
"nyc": "^15.1.0",
6059
"prettier": "^2.0.5",
6160
"pretty-quick": "^3.1.0",
61+
"shelljs": "^0.8.5",
6262
"shx": "^0.3.4",
6363
"sinon": "10.0.0",
6464
"ts-node": "^10.0.0",
@@ -88,4 +88,4 @@
8888
"path": "./node_modules/cz-conventional-changelog"
8989
}
9090
}
91-
}
91+
}

‎src/generators/analyticsTemplateGenerator.ts‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ export default class AnalyticsTemplateGenerator extends SfdxGenerator<AnalyticsT
1919
public validateOptions(): void {
2020
CreateUtil.checkInputs(this.options.templatename);
2121

22-
const fileparts = path.resolve(this.options.outputdir).split(path.sep);
22+
const fileparts = path.resolve(this.outputdir).split(path.sep);
2323
if (!fileparts.includes('waveTemplates')) {
2424
throw new Error(nls.localize('MissingWaveTemplatesDir'));
2525
}
2626
}
2727

2828
public writing(): void {
29-
const { outputdir, templatename, apiversion } = this.options;
29+
const { templatename } = this.options;
3030
// tslint:disable-next-line:no-unused-expression
3131
this.fs.copyTpl(
3232
this.templatePath(
@@ -38,7 +38,7 @@ export default class AnalyticsTemplateGenerator extends SfdxGenerator<AnalyticsT
3838
),
3939
this.destinationPath(
4040
path.join(
41-
outputdir,
41+
this.outputdir,
4242
templatename,
4343
'dashboards',
4444
templatename + 'Dashboard.json'
@@ -51,21 +51,23 @@ export default class AnalyticsTemplateGenerator extends SfdxGenerator<AnalyticsT
5151
path.join('DefaultAnalyticsTemplate', 'app-to-template-rules.json')
5252
),
5353
this.destinationPath(
54-
path.join(outputdir, templatename, 'app-to-template-rules.json')
54+
path.join(this.outputdir, templatename, 'app-to-template-rules.json')
5555
),
5656
{}
5757
);
5858
this.fs.copyTpl(
5959
this.templatePath(path.join('DefaultAnalyticsTemplate', 'folder.json')),
60-
this.destinationPath(path.join(outputdir, templatename, 'folder.json')),
60+
this.destinationPath(
61+
path.join(this.outputdir, templatename, 'folder.json')
62+
),
6163
{ templateName: templatename }
6264
);
6365
this.fs.copyTpl(
6466
this.templatePath(
6567
path.join('DefaultAnalyticsTemplate', 'releaseNotes.html')
6668
),
6769
this.destinationPath(
68-
path.join(outputdir, templatename, 'releaseNotes.html')
70+
path.join(this.outputdir, templatename, 'releaseNotes.html')
6971
),
7072
{}
7173
);
@@ -74,33 +76,33 @@ export default class AnalyticsTemplateGenerator extends SfdxGenerator<AnalyticsT
7476
path.join('DefaultAnalyticsTemplate', 'template-info.json')
7577
),
7678
this.destinationPath(
77-
path.join(outputdir, templatename, 'template-info.json')
79+
path.join(this.outputdir, templatename, 'template-info.json')
7880
),
7981
{
8082
templateName: templatename,
81-
sourceApiVersion: apiversion,
83+
sourceApiVersion: this.apiversion,
8284
}
8385
);
8486
this.fs.copyTpl(
8587
this.templatePath(
8688
path.join('DefaultAnalyticsTemplate', 'template-to-app-rules.json')
8789
),
8890
this.destinationPath(
89-
path.join(outputdir, templatename, 'template-to-app-rules.json')
91+
path.join(this.outputdir, templatename, 'template-to-app-rules.json')
9092
),
9193
{}
9294
);
9395
this.fs.copyTpl(
9496
this.templatePath(path.join('DefaultAnalyticsTemplate', 'ui.json')),
95-
this.destinationPath(path.join(outputdir, templatename, 'ui.json')),
97+
this.destinationPath(path.join(this.outputdir, templatename, 'ui.json')),
9698
{}
9799
);
98100
this.fs.copyTpl(
99101
this.templatePath(
100102
path.join('DefaultAnalyticsTemplate', 'variables.json')
101103
),
102104
this.destinationPath(
103-
path.join(outputdir, templatename, 'variables.json')
105+
path.join(this.outputdir, templatename, 'variables.json')
104106
),
105107
{}
106108
);

‎src/generators/apexClassGenerator.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,18 @@ export default class ApexClassGenerator extends SfdxGenerator<ApexClassOptions>
2121
}
2222

2323
public writing(): void {
24-
const { template, outputdir, classname, apiversion } = this.options;
24+
const { template, classname } = this.options;
2525
this.fs.copyTpl(
2626
this.templatePath(`${template}.cls`),
27-
this.destinationPath(path.join(outputdir, `${classname}.cls`)),
27+
this.destinationPath(path.join(this.outputdir, `${classname}.cls`)),
2828
{ apiName: classname }
2929
),
3030
this.fs.copyTpl(
3131
this.templatePath('_class.cls-meta.xml'),
32-
this.destinationPath(path.join(outputdir, `${classname}.cls-meta.xml`)),
33-
{ apiName: classname, apiVersion: apiversion }
32+
this.destinationPath(
33+
path.join(this.outputdir, `${classname}.cls-meta.xml`)
34+
),
35+
{ apiName: classname, apiVersion: this.apiversion }
3436
);
3537
}
3638
}

‎src/generators/apexTriggerGenerator.ts‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,18 @@ export default class ApexTriggerGenerator extends SfdxGenerator<ApexTriggerOptio
1919
CreateUtil.checkInputs(this.options.template);
2020
}
2121
public writing(): void {
22-
const {
23-
template,
24-
outputdir,
25-
triggername,
26-
apiversion,
27-
triggerevents,
28-
sobject,
29-
} = this.options;
22+
const { template, triggername, triggerevents, sobject } = this.options;
3023
this.fs.copyTpl(
3124
this.templatePath(`${template}.trigger`),
32-
this.destinationPath(path.join(outputdir, `${triggername}.trigger`)),
25+
this.destinationPath(path.join(this.outputdir, `${triggername}.trigger`)),
3326
{ triggername, sobject, triggerEvents: triggerevents }
34-
),
35-
this.fs.copyTpl(
36-
this.templatePath('_trigger.trigger-meta.xml'),
37-
this.destinationPath(
38-
path.join(outputdir, `${triggername}.trigger-meta.xml`)
39-
),
40-
{ apiVersion: apiversion }
41-
);
27+
);
28+
this.fs.copyTpl(
29+
this.templatePath('_trigger.trigger-meta.xml'),
30+
this.destinationPath(
31+
path.join(this.outputdir, `${triggername}.trigger-meta.xml`)
32+
),
33+
{ apiVersion: this.apiversion }
34+
);
4235
}
4336
}

‎src/generators/lightningAppGenerator.ts‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,68 +20,74 @@ export default class LightningAppGenerator extends SfdxGenerator<LightningAppOpt
2020
CreateUtil.checkInputs(this.options.appname);
2121
CreateUtil.checkInputs(this.options.template);
2222

23-
const fileparts = path.resolve(this.options.outputdir).split(path.sep);
23+
const fileparts = path.resolve(this.outputdir).split(path.sep);
2424
if (!fileparts.includes('aura') && !this.options.internal) {
2525
throw new Error(nls.localize('MissingAuraDir'));
2626
}
2727
}
2828

2929
public writing(): void {
30-
const { template, outputdir, appname, apiversion, internal } = this.options;
30+
const { template, appname, internal } = this.options;
3131
// tslint:disable-next-line:no-unused-expression
3232
if (!internal) {
3333
this.fs.copyTpl(
3434
this.templatePath('_auradefinitionbundle.app-meta.xml'),
3535
this.destinationPath(
36-
path.join(outputdir, appname, `${appname}.app-meta.xml`)
36+
path.join(this.outputdir, appname, `${appname}.app-meta.xml`)
3737
),
3838
{
39-
apiVersion: apiversion,
39+
apiVersion: this.apiversion,
4040
description: nls.localize('LightningAppBundle'),
4141
}
4242
);
4343
}
4444
this.fs.copyTpl(
4545
this.templatePath(`${template}.app`),
46-
this.destinationPath(path.join(outputdir, appname, `${appname}.app`)),
46+
this.destinationPath(
47+
path.join(this.outputdir, appname, `${appname}.app`)
48+
),
4749
{}
4850
),
4951
this.fs.copyTpl(
5052
this.templatePath('DefaultLightningAuradoc.auradoc'),
5153
this.destinationPath(
52-
path.join(outputdir, appname, `${appname}.auradoc`)
54+
path.join(this.outputdir, appname, `${appname}.auradoc`)
5355
),
5456
{}
5557
),
5658
this.fs.copyTpl(
5759
this.templatePath('DefaultLightningController.js'),
5860
this.destinationPath(
59-
path.join(outputdir, appname, `${appname}Controller.js`)
61+
path.join(this.outputdir, appname, `${appname}Controller.js`)
6062
),
6163
{}
6264
),
6365
this.fs.copyTpl(
6466
this.templatePath('DefaultLightningCss.css'),
65-
this.destinationPath(path.join(outputdir, appname, `${appname}.css`)),
67+
this.destinationPath(
68+
path.join(this.outputdir, appname, `${appname}.css`)
69+
),
6670
{}
6771
),
6872
this.fs.copyTpl(
6973
this.templatePath('DefaultLightningHelper.js'),
7074
this.destinationPath(
71-
path.join(outputdir, appname, `${appname}Helper.js`)
75+
path.join(this.outputdir, appname, `${appname}Helper.js`)
7276
),
7377
{}
7478
),
7579
this.fs.copyTpl(
7680
this.templatePath('DefaultLightningRenderer.js'),
7781
this.destinationPath(
78-
path.join(outputdir, appname, `${appname}Renderer.js`)
82+
path.join(this.outputdir, appname, `${appname}Renderer.js`)
7983
),
8084
{}
8185
),
8286
this.fs.copyTpl(
8387
this.templatePath('DefaultLightningSVG.svg'),
84-
this.destinationPath(path.join(outputdir, appname, `${appname}.svg`)),
88+
this.destinationPath(
89+
path.join(this.outputdir, appname, `${appname}.svg`)
90+
),
8591
{}
8692
);
8793
}

0 commit comments

Comments
 (0)