Skip to content

Commit 5821898

Browse files
authored
feat: use new not-config-file stl (#999)
* feat: use new not-config-file stl * chore: remove debug * chore: remove more devDeps * chore: bump source-testkit * test: more cli fixes * chore: bump testkit * chore: bump source-testkit for fix * test: cli on testkit.assignPermsets * test: cli for manifest:create * test: more cli in nuts * test: correct componetStatus * fix: correct status on push filtering
1 parent 589031e commit 5821898

File tree

66 files changed

+690
-674
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+690
-674
lines changed

.eslintrc.cjs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,9 @@ module.exports = {
1212
'plugin:sf-plugin/recommended',
1313
],
1414
ignorePatterns: ['test/nuts/ebikes-lwc/**', 'test/nuts/nestedLWCProject/**'],
15+
rules: {
16+
// This rule requires the `strictNullChecks` compiler option to be turned on to function correctly @typescript-eslint/prefer-nullish-coalescing
17+
// we never got PS to strict nulls because it's not worth the effort
18+
'@typescript-eslint/prefer-nullish-coalescing': 'off',
19+
},
1520
};

package.json

Lines changed: 10 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"dependencies": {
99
"@oclif/core": "^2.15.0",
1010
"@salesforce/apex-node": "^2.1.0",
11-
"@salesforce/core": "^5.3.10",
12-
"@salesforce/kit": "^3.0.14",
11+
"@salesforce/core": "^5.3.18",
12+
"@salesforce/kit": "^3.0.15",
1313
"@salesforce/sf-plugins-core": "^3.1.25",
14-
"@salesforce/source-deploy-retrieve": "^9.7.28",
15-
"@salesforce/source-tracking": "^4.2.17",
14+
"@salesforce/source-deploy-retrieve": "^9.8.4",
15+
"@salesforce/source-tracking": "^4.3.0",
1616
"chalk": "^4.1.2",
1717
"got": "^11.8.6",
1818
"proxy-agent": "^6.3.1",
@@ -21,51 +21,23 @@
2121
"devDependencies": {
2222
"@oclif/plugin-command-snapshot": "^4.0.14",
2323
"@oclif/plugin-help": "^5.2.20",
24-
"@salesforce/cli-plugins-testkit": "^4.4.12",
25-
"@salesforce/dev-config": "^4.0.1",
26-
"@salesforce/dev-scripts": "^5.11.0",
24+
"@salesforce/cli-plugins-testkit": "^5.0.2",
25+
"@salesforce/dev-scripts": "^6.0.3",
2726
"@salesforce/plugin-command-reference": "^3.0.45",
2827
"@salesforce/plugin-deploy-retrieve": "^1.19.3",
2928
"@salesforce/plugin-info": "^2.6.51",
30-
"@salesforce/plugin-settings": "^1.4.28",
31-
"@salesforce/plugin-templates": "^55.5.14",
32-
"@salesforce/plugin-user": "^2.3.36",
33-
"@salesforce/prettier-config": "^0.0.3",
34-
"@salesforce/source-testkit": "^2.1.34",
29+
"@salesforce/source-testkit": "^2.1.62",
3530
"@salesforce/ts-sinon": "1.4.19",
3631
"@swc/core": "1.3.39",
3732
"@types/archiver": "^5.3.2",
38-
"@types/debug": "^4.1.7",
39-
"@types/shelljs": "^0.8.11",
40-
"@typescript-eslint/eslint-plugin": "^5.42.1",
41-
"@typescript-eslint/parser": "^5.62.0",
4233
"archiver": "^5.3.2",
43-
"chai": "^4.3.10",
4434
"chai-each": "^0.0.1",
4535
"cross-env": "^7.0.3",
46-
"debug": "^4.3.3",
47-
"eslint": "^8.51.0",
48-
"eslint-config-prettier": "^8.10.0",
49-
"eslint-config-salesforce": "^2.0.2",
50-
"eslint-config-salesforce-license": "^0.2.0",
51-
"eslint-config-salesforce-typescript": "^1.1.1",
52-
"eslint-plugin-header": "^3.1.1",
53-
"eslint-plugin-import": "^2.28.1",
54-
"eslint-plugin-jsdoc": "^43.0.5",
5536
"eslint-plugin-sf-plugin": "^1.16.13",
56-
"fast-glob": "^3.3.1",
57-
"husky": "^7.0.4",
58-
"mocha": "^9.1.3",
59-
"nyc": "^15.1.0",
6037
"oclif": "^3.16.0",
61-
"prettier": "^2.8.8",
62-
"pretty-quick": "^3.1.3",
63-
"shelljs": "^0.8.5",
6438
"shx": "0.3.4",
65-
"sinon": "10.0.0",
66-
"ts-node": "^10.4.0",
67-
"typescript": "^4.9.5",
68-
"wireit": "^0.10.0"
39+
"ts-node": "^10.9.1",
40+
"typescript": "^4.9.5"
6941
},
7042
"config": {},
7143
"engines": {
@@ -92,10 +64,7 @@
9264
"@oclif/plugin-command-snapshot",
9365
"@oclif/plugin-help",
9466
"@salesforce/plugin-command-reference",
95-
"@salesforce/plugin-deploy-retrieve",
96-
"@salesforce/plugin-templates",
97-
"@salesforce/plugin-settings",
98-
"@salesforce/plugin-user"
67+
"@salesforce/plugin-deploy-retrieve"
9968
],
10069
"topics": {
10170
"force": {

src/commands/force/source/push.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import { Duration, env } from '@salesforce/kit';
99
import { Lifecycle, Messages } from '@salesforce/core';
10-
import { DeployResult, DeployVersionData, RequestStatus } from '@salesforce/source-deploy-retrieve';
10+
import { ComponentStatus, DeployResult, DeployVersionData, RequestStatus } from '@salesforce/source-deploy-retrieve';
1111
import { SourceTracking } from '@salesforce/source-tracking';
1212
import { getBoolean } from '@salesforce/ts-types';
1313
import {
@@ -209,7 +209,7 @@ export default class Push extends DeployCommand {
209209
result.response.status === RequestStatus.Succeeded ||
210210
// successful-ish (only warnings about deleted things that are already deleted)
211211
(result.response.status === RequestStatus.Failed &&
212-
result.getFileResponses().every((fr) => fr.state !== 'Failed') &&
212+
result.getFileResponses().every((fr) => fr.state !== ComponentStatus.Failed) &&
213213
!result.response.errorMessage);
214214
// all successes
215215
if (this.deployResults.every((result) => isSuccessLike(result))) {

src/commands/force/source/retrieve.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
66
*/
77

8-
import { dirname, join, resolve } from 'path';
9-
import * as fs from 'fs';
8+
import { dirname, join, resolve } from 'node:path';
9+
import * as fs from 'node:fs';
1010

1111
import { Lifecycle, Messages, SfError, SfProject } from '@salesforce/core';
1212
import { Duration } from '@salesforce/kit';

src/deployCommand.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
66
*/
77

8-
import * as path from 'path';
9-
import * as fs from 'fs';
8+
import * as path from 'node:path';
9+
import * as fs from 'node:fs';
1010
import {
1111
AsyncResult,
1212
ComponentSet,

src/formatters/deployReportResultFormatter.ts

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

88
import { MetadataApiDeployStatus, RequestStatus } from '@salesforce/source-deploy-retrieve';
9-
import { getString } from '@salesforce/ts-types';
109
import { SfError, Messages } from '@salesforce/core';
1110
import { DeployResultFormatter } from './deployResultFormatter';
1211

@@ -16,7 +15,7 @@ export type DeployReportCommandResult = MetadataApiDeployStatus;
1615

1716
export class DeployReportResultFormatter extends DeployResultFormatter {
1817
public display(): void {
19-
const status = getString(this, 'result.response.status', 'unknown');
18+
const status = this.result.response.status ?? 'unknown';
2019
this.ux.log(`Status: ${status}`);
2120
if (!this.isVerbose()) {
2221
const componentsTotal = this.getNumResult('numberComponentsTotal');

src/formatters/deployResultFormatter.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
66
*/
77

8-
import * as path from 'path';
8+
import * as path from 'node:path';
99
import * as chalk from 'chalk';
1010

1111
import { Messages, SfError } from '@salesforce/core';
1212
import { ensureArray } from '@salesforce/kit';
1313
import { asString, get, getBoolean, getNumber, getString } from '@salesforce/ts-types';
1414
import {
15+
ComponentStatus,
1516
DeployMessage,
1617
DeployResult,
1718
Failures,
@@ -107,7 +108,7 @@ export class DeployResultFormatter extends ResultFormatter {
107108
}
108109

109110
protected hasStatus(status: RequestStatus): boolean {
110-
return getString(this.result, 'response.status') === status;
111+
return this.result.response.status === status;
111112
}
112113

113114
protected isRunTestsEnabled(): boolean {
@@ -170,7 +171,7 @@ export class DeployResultFormatter extends ResultFormatter {
170171
}
171172

172173
protected displayDeletions(): void {
173-
const deletions = this.fileResponses.filter((f) => f.state === 'Deleted');
174+
const deletions = this.fileResponses.filter((f) => f.state === ComponentStatus.Deleted);
174175
if (!deletions.length) {
175176
return;
176177
}
@@ -197,7 +198,7 @@ export class DeployResultFormatter extends ResultFormatter {
197198
if (this.fileResponses?.length) {
198199
const fileResponses: FileResponse[] = [];
199200
this.fileResponses
200-
.filter((f) => f.state === 'Failed')
201+
.filter((f) => f.state === ComponentStatus.Failed)
201202
.map((f: FileResponse & { error: string }) => {
202203
fileResponses.push(f);
203204
fileResponseFailures.set(`${f.type}#${f.fullName}`, f.error);

src/formatters/mdapi/mdDeployAsyncResultFormatter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
66
*/
77

8-
import { EOL } from 'os';
8+
import { EOL } from 'node:os';
99

1010
import { Messages } from '@salesforce/core';
1111
import { AsyncResult } from '@salesforce/source-deploy-retrieve';

src/formatters/mdapi/retrieveResultFormatter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Licensed under the BSD 3-Clause license.
55
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
66
*/
7-
import { join, parse } from 'path';
7+
import { join, parse } from 'node:path';
88
import { blue } from 'chalk';
99
import { getNumber } from '@salesforce/ts-types';
1010
import {

src/formatters/resultFormatter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77
/* eslint-disable class-methods-use-this */
88

9-
import * as path from 'path';
10-
import * as fs from 'fs';
9+
import * as path from 'node:path';
10+
import * as fs from 'node:fs';
1111
import { Failures, FileProperties, FileResponse, Successes } from '@salesforce/source-deploy-retrieve';
1212
import { getNumber } from '@salesforce/ts-types';
1313
import * as chalk from 'chalk';

0 commit comments

Comments
 (0)