Skip to content

Commit ce7d140

Browse files
dependabot[bot]k-capehart
dependabot[bot]
and
k-capehart
authored
fix(deps): bump the dependencies group with 11 updates (#60)
* fix(deps): bump the dependencies group with 11 updates Bumps the dependencies group with 11 updates: | Package | From | To | | --- | --- | --- | | [@oclif/core](https://github.com/oclif/core) | `4.0.25` | `4.0.31` | | [@salesforce/core](https://github.com/forcedotcom/sfdx-core) | `8.6.1` | `8.6.4` | | [@salesforce/sf-plugins-core](https://github.com/salesforcecli/sf-plugins-core) | `11.3.10` | `12.0.11` | | [@salesforce/source-deploy-retrieve](https://github.com/forcedotcom/source-deploy-retrieve) | `12.7.3` | `12.10.0` | | [@salesforce/source-tracking](https://github.com/forcedotcom/source-tracking) | `7.1.16` | `7.1.18` | | [@salesforce/ts-sinon](https://github.com/forcedotcom/ts-sinon) | `1.4.27` | `1.4.28` | | [@oclif/plugin-command-snapshot](https://github.com/oclif/plugin-command-snapshot) | `5.2.17` | `5.2.20` | | [@salesforce/cli-plugins-testkit](https://github.com/salesforcecli/cli-plugins-testkit) | `5.3.33` | `5.3.35` | | [eslint-plugin-sf-plugin](https://github.com/salesforcecli/eslint-plugin-sf-plugin) | `1.20.8` | `1.20.10` | | [oclif](https://github.com/oclif/oclif) | `4.14.36` | `4.15.16` | | [typescript](https://github.com/microsoft/TypeScript) | `5.6.2` | `5.6.3` | Updates `@oclif/core` from 4.0.25 to 4.0.31 - [Release notes](https://github.com/oclif/core/releases) - [Changelog](https://github.com/oclif/core/blob/main/CHANGELOG.md) - [Commits](oclif/core@4.0.25...4.0.31) Updates `@salesforce/core` from 8.6.1 to 8.6.4 - [Release notes](https://github.com/forcedotcom/sfdx-core/releases) - [Changelog](https://github.com/forcedotcom/sfdx-core/blob/main/CHANGELOG.md) - [Commits](forcedotcom/sfdx-core@8.6.1...8.6.4) Updates `@salesforce/sf-plugins-core` from 11.3.10 to 12.0.11 - [Release notes](https://github.com/salesforcecli/sf-plugins-core/releases) - [Changelog](https://github.com/salesforcecli/sf-plugins-core/blob/main/CHANGELOG.md) - [Commits](salesforcecli/sf-plugins-core@11.3.10...12.0.11) Updates `@salesforce/source-deploy-retrieve` from 12.7.3 to 12.10.0 - [Release notes](https://github.com/forcedotcom/source-deploy-retrieve/releases) - [Changelog](https://github.com/forcedotcom/source-deploy-retrieve/blob/main/CHANGELOG.md) - [Commits](forcedotcom/source-deploy-retrieve@12.7.3...12.10.0) Updates `@salesforce/source-tracking` from 7.1.16 to 7.1.18 - [Release notes](https://github.com/forcedotcom/source-tracking/releases) - [Changelog](https://github.com/forcedotcom/source-tracking/blob/main/CHANGELOG.md) - [Commits](forcedotcom/source-tracking@7.1.16...7.1.18) Updates `@salesforce/ts-sinon` from 1.4.27 to 1.4.28 - [Release notes](https://github.com/forcedotcom/ts-sinon/releases) - [Changelog](https://github.com/forcedotcom/ts-sinon/blob/main/CHANGELOG.md) - [Commits](forcedotcom/ts-sinon@1.4.27...1.4.28) Updates `@oclif/plugin-command-snapshot` from 5.2.17 to 5.2.20 - [Release notes](https://github.com/oclif/plugin-command-snapshot/releases) - [Changelog](https://github.com/oclif/plugin-command-snapshot/blob/main/CHANGELOG.md) - [Commits](oclif/plugin-command-snapshot@5.2.17...5.2.20) Updates `@salesforce/cli-plugins-testkit` from 5.3.33 to 5.3.35 - [Release notes](https://github.com/salesforcecli/cli-plugins-testkit/releases) - [Changelog](https://github.com/salesforcecli/cli-plugins-testkit/blob/main/CHANGELOG.md) - [Commits](salesforcecli/cli-plugins-testkit@5.3.33...5.3.35) Updates `eslint-plugin-sf-plugin` from 1.20.8 to 1.20.10 - [Release notes](https://github.com/salesforcecli/eslint-plugin-sf-plugin/releases) - [Changelog](https://github.com/salesforcecli/eslint-plugin-sf-plugin/blob/main/CHANGELOG.md) - [Commits](salesforcecli/eslint-plugin-sf-plugin@1.20.8...1.20.10) Updates `oclif` from 4.14.36 to 4.15.16 - [Release notes](https://github.com/oclif/oclif/releases) - [Changelog](https://github.com/oclif/oclif/blob/main/CHANGELOG.md) - [Commits](oclif/oclif@4.14.36...4.15.16) Updates `typescript` from 5.6.2 to 5.6.3 - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](microsoft/TypeScript@v5.6.2...v5.6.3) --- updated-dependencies: - dependency-name: "@oclif/core" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: "@salesforce/core" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: "@salesforce/sf-plugins-core" dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: "@salesforce/source-deploy-retrieve" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: "@salesforce/source-tracking" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: "@salesforce/ts-sinon" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: "@oclif/plugin-command-snapshot" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: "@salesforce/cli-plugins-testkit" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: eslint-plugin-sf-plugin dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: oclif dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * updates to ux.table --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kyle <[email protected]>
1 parent 098715e commit ce7d140

File tree

5 files changed

+944
-444
lines changed

5 files changed

+944
-444
lines changed

‎package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@
1616
},
1717
"homepage": "https://github.com/k-capehart/kc-sf-plugin",
1818
"dependencies": {
19-
"@oclif/core": "^4.0.25",
20-
"@salesforce/core": "^8.6.1",
21-
"@salesforce/sf-plugins-core": "^11.3.10",
22-
"@salesforce/source-deploy-retrieve": "^12.7.3",
23-
"@salesforce/source-tracking": "^7.1.16",
24-
"@salesforce/ts-sinon": "^1.4.27",
19+
"@oclif/core": "^4.0.31",
20+
"@salesforce/core": "^8.6.4",
21+
"@salesforce/sf-plugins-core": "^12.0.11",
22+
"@salesforce/source-deploy-retrieve": "^12.10.0",
23+
"@salesforce/source-tracking": "^7.1.18",
24+
"@salesforce/ts-sinon": "^1.4.28",
2525
"@salesforce/ts-types": "^2.0.12",
2626
"chalk": "^5.3.0",
2727
"fast-xml-parser": "^4.5.0",
2828
"fs-extra": "^11.2.0"
2929
},
3030
"devDependencies": {
31-
"@oclif/plugin-command-snapshot": "^5.2.17",
32-
"@salesforce/cli-plugins-testkit": "^5.3.33",
31+
"@oclif/plugin-command-snapshot": "^5.2.20",
32+
"@salesforce/cli-plugins-testkit": "^5.3.35",
3333
"@salesforce/dev-scripts": "^10.2.10",
3434
"@types/fs-extra": "^11.0.4",
3535
"@types/yeoman-assert": "^3.1.4",
36-
"eslint-plugin-sf-plugin": "^1.20.8",
37-
"oclif": "^4.14.36",
36+
"eslint-plugin-sf-plugin": "^1.20.10",
37+
"oclif": "^4.15.16",
3838
"shx": "0.3.4",
3939
"ts-node": "^10.9.2",
40-
"typescript": "^5.6.2",
40+
"typescript": "^5.6.3",
4141
"yeoman-assert": "^3.1.1"
4242
},
4343
"engines": {

‎src/utils/diffSource.ts

+26-7
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ const getWillDelete = (files: PreviewFile[]): PreviewFile[] =>
112112
files.filter(willGo).filter((f) => f.operation && ['deletePre', 'deletePost'].includes(f.operation));
113113

114114
// relative paths are easier on tables
115-
const columns = { type: {}, fullName: {}, projectRelativePath: { header: 'Path' } };
116115
const makeKey = ({ type, fullName }: { type: MetadataType; fullName: string }): string => `${type.name}#${fullName}`;
117116

118117
export const compileResults = ({
@@ -229,13 +228,19 @@ const printDeployTable = (files: PreviewFile[], deletedFiles: PreviewFile[]): vo
229228
);
230229
if (files.length !== 0) {
231230
ux.log(chalk.dim(messages.getMessage('deployChanges.header', [files.length])));
232-
ux.table<PreviewFile>(files, columns);
231+
ux.table<PreviewFile>({
232+
data: files,
233+
columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
234+
});
233235
} else {
234236
ux.log(chalk.dim(messages.getMessage('deployChanges.none')));
235237
}
236238
if (deletedFiles.length !== 0) {
237239
ux.log(chalk.dim(messages.getMessage('deployDeletes.header', [deletedFiles.length])));
238-
ux.table<PreviewFile>(deletedFiles, columns);
240+
ux.table<PreviewFile>({
241+
data: deletedFiles,
242+
columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
243+
});
239244
} else {
240245
ux.log(chalk.dim(messages.getMessage('deployDeletes.none')));
241246
}
@@ -253,13 +258,19 @@ const printRetrieveTable = (files: PreviewFile[], deletedFiles: PreviewFile[]):
253258
);
254259
if (files.length !== 0) {
255260
ux.log(chalk.dim(messages.getMessage('retrieveChanges.header', [files.length])));
256-
ux.table<PreviewFile>(files, columns);
261+
ux.table<PreviewFile>({
262+
data: files,
263+
columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
264+
});
257265
} else {
258266
ux.log(chalk.dim(messages.getMessage('retrieveChanges.none')));
259267
}
260268
if (deletedFiles.length !== 0) {
261269
ux.log(chalk.dim(messages.getMessage('retrieveDeletes.header', [deletedFiles.length])));
262-
ux.table<PreviewFile>(deletedFiles, columns);
270+
ux.table<PreviewFile>({
271+
data: deletedFiles,
272+
columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
273+
});
263274
} else {
264275
ux.log(chalk.dim(messages.getMessage('retrieveDeletes.none')));
265276
}
@@ -272,7 +283,11 @@ const printConflictsTable = (files: PreviewFile[]): void => {
272283
ux.log(chalk.dim(messages.getMessage('conflicts.none')));
273284
} else {
274285
ux.log(StandardColors.error(chalk.bold(messages.getMessage('conflicts.header', [files.length]))));
275-
ux.table<PreviewFile>(files, columns, { sort: 'path' });
286+
ux.table<PreviewFile>({
287+
data: files,
288+
columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
289+
sort: { path: 'asc' },
290+
});
276291
}
277292
};
278293

@@ -282,7 +297,11 @@ const printIgnoredTable = (files: PreviewFile[]): void => {
282297
ux.log(chalk.dim(messages.getMessage('ignored.none')));
283298
} else {
284299
ux.log(chalk.dim(messages.getMessage('ignored.header', [files.length, 'change'])));
285-
ux.table<PreviewFile>(files, columns, { sort: 'path' });
300+
ux.table<PreviewFile>({
301+
data: files,
302+
columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
303+
sort: { path: 'asc' },
304+
});
286305
}
287306
};
288307

‎test/utils/diffSource.test.ts

+24-20
Original file line numberDiff line numberDiff line change
@@ -116,25 +116,29 @@ describe('diff table', () => {
116116
it('prints output table', () => {
117117
printTables(mockRetrievePreviewOutput, mockDeployPreviewOutput);
118118
expect(tableStub.callCount).to.equal(6);
119-
expect(tableStub.firstCall.args[0]).to.deep.equal([
120-
{
121-
fullName: 'test',
122-
type: 'PermissionSet',
123-
conflict: true,
124-
ignored: false,
125-
path: 'force-app',
126-
projectRelativePath: 'force-app',
127-
operation: 'retrieve',
128-
},
129-
{
130-
fullName: 'test',
131-
type: 'PermissionSet',
132-
conflict: true,
133-
ignored: false,
134-
path: 'force-app',
135-
projectRelativePath: 'force-app',
136-
operation: 'deploy',
137-
},
138-
]);
119+
expect(tableStub.firstCall.args[0]).to.deep.equal({
120+
data: [
121+
{
122+
fullName: 'test',
123+
type: 'PermissionSet',
124+
conflict: true,
125+
ignored: false,
126+
path: 'force-app',
127+
projectRelativePath: 'force-app',
128+
operation: 'retrieve',
129+
},
130+
{
131+
fullName: 'test',
132+
type: 'PermissionSet',
133+
conflict: true,
134+
ignored: false,
135+
path: 'force-app',
136+
projectRelativePath: 'force-app',
137+
operation: 'deploy',
138+
},
139+
],
140+
columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
141+
sort: { path: 'asc' },
142+
});
139143
});
140144
});

‎tsconfig.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
"compilerOptions": {
44
"outDir": "lib",
55
"rootDir": "src",
6-
"lib": [
7-
"ES2021.String"
8-
]
6+
"lib": ["ES2021.String"]
97
},
108
"include": ["./src/**/*.ts"]
119
}

0 commit comments

Comments
 (0)