Skip to content

Commit 604cf37

Browse files
svc-cli-botmshanemc
svc-cli-bot
and
mshanemc
authored
fix(deps): devScripts update (#1019)
* chore: updates from devScripts * chore: dep bumps * fix: interface=>type saves filter work --------- Co-authored-by: mshanemc <[email protected]>
1 parent a0bf8c4 commit 604cf37

File tree

9 files changed

+64
-138
lines changed

9 files changed

+64
-138
lines changed

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"bugs": "https://github.com/forcedotcom/cli/issues",
77
"dependencies": {
88
"@oclif/core": "^3.26.0",
9-
"@salesforce/core": "^6.6.0",
9+
"@salesforce/core": "^6.7.6",
1010
"@salesforce/kit": "^3.1.0",
1111
"@salesforce/sf-plugins-core": "^8.0.3",
12-
"@salesforce/source-deploy-retrieve": "^10.5.5",
12+
"@salesforce/source-deploy-retrieve": "^10.9.1",
1313
"chalk": "^5.3.0",
1414
"change-case": "^5.4.4",
1515
"is-wsl": "^3.1.0",
@@ -18,7 +18,7 @@
1818
"devDependencies": {
1919
"@oclif/plugin-command-snapshot": "^5.1.2",
2020
"@salesforce/cli-plugins-testkit": "^5.1.14",
21-
"@salesforce/dev-scripts": "^8.4.4",
21+
"@salesforce/dev-scripts": "^8.5.0",
2222
"@salesforce/plugin-command-reference": "^3.0.74",
2323
"@salesforce/ts-sinon": "1.4.19",
2424
"eslint-plugin-sf-plugin": "^1.17.4",

‎src/commands/force/org/create.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import { SandboxReporter } from '../../../shared/sandboxReporter.js';
3939
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
4040
const messages = Messages.loadMessages('@salesforce/plugin-org', 'create');
4141

42-
export interface ScratchOrgProcessObject {
42+
export type ScratchOrgProcessObject = {
4343
username?: string;
4444
scratchOrgInfo: ScratchOrgInfo;
4545
authFields?: AuthFields;

‎src/commands/org/delete/sandbox.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { orgThatMightBeDeleted } from '../../../shared/flags.js';
1212
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
1313
const messages = Messages.loadMessages('@salesforce/plugin-org', 'delete_sandbox');
1414

15-
export interface SandboxDeleteResponse {
15+
export type SandboxDeleteResponse = {
1616
orgId: string;
1717
username: string;
1818
}

‎src/commands/org/delete/scratch.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { orgThatMightBeDeleted } from '../../../shared/flags.js';
1212
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
1313
const messages = Messages.loadMessages('@salesforce/plugin-org', 'delete_scratch');
1414

15-
export interface ScratchDeleteResponse {
15+
export type ScratchDeleteResponse = {
1616
orgId: string;
1717
username: string;
1818
}

‎src/commands/org/list.ts‎

Lines changed: 26 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -185,35 +185,32 @@ Legend: ${defaultHubEmoji}=Default DevHub, ${defaultOrgEmoji}=Default Org ${
185185
.map(statusToEmoji),
186186
];
187187

188-
this.table(
189-
allOrgs.map((org) => Object.fromEntries(Object.entries(org).filter(fieldFilter))),
190-
{
191-
defaultMarker: {
192-
header: '',
193-
},
194-
type: {
195-
header: 'Type',
196-
},
197-
alias: {
198-
header: 'Alias',
199-
},
200-
username: { header: 'Username' },
201-
orgId: { header: 'Org ID' },
202-
...(!skipconnectionstatus ? { connectedStatus: { header: 'Status' } } : {}),
203-
...(this.flags.verbose
204-
? {
205-
instanceUrl: { header: 'Instance URL' },
206-
namespacePrefix: { header: 'Namespace' },
207-
devHubOrgId: { header: 'Dev Hub ID' },
208-
createdDate: {
209-
header: 'Created',
210-
get: (data): string => (data.createdDate as string)?.split('T')?.[0] ?? '',
211-
},
212-
}
213-
: {}),
214-
expirationDate: { header: 'Expires' },
215-
}
216-
);
188+
this.table(allOrgs, {
189+
defaultMarker: {
190+
header: '',
191+
},
192+
type: {
193+
header: 'Type',
194+
},
195+
alias: {
196+
header: 'Alias',
197+
},
198+
username: { header: 'Username' },
199+
orgId: { header: 'Org ID' },
200+
...(!skipconnectionstatus ? { connectedStatus: { header: 'Status' } } : {}),
201+
...(this.flags.verbose
202+
? {
203+
instanceUrl: { header: 'Instance URL' },
204+
namespacePrefix: { header: 'Namespace' },
205+
devHubOrgId: { header: 'Dev Hub ID' },
206+
createdDate: {
207+
header: 'Created',
208+
get: (data): string => ('createdDate' in data ? data.createdDate?.split('T')?.[0] ?? '' : ''),
209+
},
210+
}
211+
: {}),
212+
expirationDate: { header: 'Expires' },
213+
});
217214
}
218215
}
219216

@@ -267,23 +264,6 @@ const colorEveryFieldButConnectedStatus =
267264
// TS is not smart enough to know this didn't change any types
268265
) as ExtendedAuthFieldsWithType;
269266

270-
const fieldFilter = ([key]: [string, string]): boolean =>
271-
[
272-
'defaultMarker',
273-
'namespacePrefix',
274-
'alias',
275-
'username',
276-
'orgId',
277-
'status',
278-
'connectedStatus',
279-
'expirationDate',
280-
'devHubOrgId',
281-
'createdDate',
282-
'instanceUrl',
283-
'type',
284-
'createdDate',
285-
].includes(key);
286-
287267
const convertScratchOrgStatus = (
288268
row: FullyPopulatedScratchOrgFields
289269
): FullyPopulatedScratchOrgFields & { connectedStatus: string } => ({ ...row, connectedStatus: row.status });

‎src/commands/org/open.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ export class OrgOpenCommand extends SfCommand<OrgOpenOutput> {
161161
}
162162
}
163163

164-
export interface OrgOpenOutput {
164+
export type OrgOpenOutput = {
165165
url: string;
166166
username: string;
167167
orgId: string;

‎src/shared/orgHooks.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ type PostOrgCreateOpts = HookOpts<OrgCreateResult>;
3232
/**
3333
* Extends OCLIF's Hooks interface to add types for hooks that run on org commands
3434
*/
35-
export interface OrgHooks extends Interfaces.Hooks {
35+
export type OrgHooks = {
3636
postorgcreate: PostOrgCreateOpts;
37-
}
37+
} & Interfaces.Hooks
3838

3939
// eslint-disable-next-line @typescript-eslint/no-explicit-any
4040
export type OrgHook<T> = (this: Hook.Context, options: T extends keyof Interfaces.Hooks ? OrgHooks[T] : T) => any;

‎src/shared/orgTypes.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export type FullyPopulatedScratchOrgFields = ScratchOrgFields &
5151
};
5252

5353
// developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_objects_scratchorginfo.htm
54-
export interface ScratchOrgInfoSObject {
54+
export type ScratchOrgInfoSObject = {
5555
Id: string;
5656
CreatedDate: string;
5757
Status: 'New' | 'Deleted' | 'Active' | 'Error';
@@ -66,7 +66,7 @@ export interface ScratchOrgInfoSObject {
6666
}
6767

6868
/** fields in the */
69-
export interface ScratchOrgFields {
69+
export type ScratchOrgFields = {
7070
createdBy: string;
7171
createdDate: string;
7272
expirationDate: string;
@@ -80,7 +80,7 @@ export interface ScratchOrgFields {
8080
signupUsername: string;
8181
}
8282

83-
export interface OrgListFields {
83+
export type OrgListFields = {
8484
connectedStatus?: string;
8585
isDefaultUsername?: boolean;
8686
isDefaultDevHubUsername?: boolean;
@@ -90,7 +90,7 @@ export interface OrgListFields {
9090
}
9191

9292
/** If the scratch org is resumed, but doesn't get very far in the process, it won't have much information on it */
93-
export interface ScratchCreateResponse {
93+
export type ScratchCreateResponse = {
9494
username?: string;
9595
scratchOrgInfo?: ScratchOrgInfo;
9696
authFields?: AuthFields;

‎yarn.lock‎

Lines changed: 25 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,7 +1622,7 @@
16221622
strip-ansi "6.0.1"
16231623
ts-retry-promise "^0.8.0"
16241624

1625-
"@salesforce/core@^6.4.1", "@salesforce/core@^6.6.0", "@salesforce/core@^6.7.0", "@salesforce/core@^6.7.3", "@salesforce/core@^6.7.6":
1625+
"@salesforce/core@^6.4.1", "@salesforce/core@^6.7.0", "@salesforce/core@^6.7.3", "@salesforce/core@^6.7.6":
16261626
version "6.7.6"
16271627
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.7.6.tgz#6a73c6a4e615ce837be5b5c142cfc63a6c8db3bd"
16281628
integrity sha512-0ZZ1GgUQTwTs8/xa+hmZd+wwKXkK8MNcI2Kn20HmHShsweA2Jp3Yaxx0+EbRPqhSBARXso+TADSnsOjlZvQ3tg==
@@ -1650,10 +1650,10 @@
16501650
resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.1.0.tgz#e529576466d074e7a5f1441236510fef123da01e"
16511651
integrity sha512-2iDDepiIwjXHS5IVY7pwv8jMo4xWosJ7p/UTj+lllpB/gnJiYLhjJPE4Z3FCGFKyvfg5jGaimCd8Ca6bLGsCQA==
16521652

1653-
"@salesforce/dev-scripts@^8.4.4":
1654-
version "8.4.4"
1655-
resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-8.4.4.tgz#13e25346a527865785566a32b059f5e813a9d954"
1656-
integrity sha512-XQ4B7cwINouoxqKNlcCTAnuMIe2jrB6VjcAL93Qns5MNQYYjjSV9kU7RkHck8Wvx2dCAL43iFp0oqpudz3bD5A==
1653+
"@salesforce/dev-scripts@^8.5.0":
1654+
version "8.5.0"
1655+
resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-8.5.0.tgz#b0b44ca595450328c6186968528d9c0ef06cd27e"
1656+
integrity sha512-vR+CB5VoQrNAqNTcu5GZ/l4I4Rxd5HkIj/qTxEzP1EYnIlgjrbcsQgaunSnTrttIEy/BD8epd6UWAT8yAItufg==
16571657
dependencies:
16581658
"@commitlint/cli" "^17.1.2"
16591659
"@commitlint/config-conventional" "^17.8.1"
@@ -1666,7 +1666,7 @@
16661666
chai "^4.3.10"
16671667
chalk "^4.0.0"
16681668
cosmiconfig "^8.3.6"
1669-
eslint-config-salesforce-typescript "^3.2.12"
1669+
eslint-config-salesforce-typescript "^3.3.0"
16701670
husky "^7.0.4"
16711671
linkinator "^6.0.4"
16721672
mocha "^10.4.0"
@@ -1740,16 +1740,16 @@
17401740
"@salesforce/ts-types" "^2.0.9"
17411741
chalk "^5.3.0"
17421742

1743-
"@salesforce/source-deploy-retrieve@^10.5.5":
1744-
version "10.5.5"
1745-
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.5.5.tgz#c2680de777e4b392a5f02631ca1cd385cad72c93"
1746-
integrity sha512-o+c/qD9QojXIPMOuteUSdrbx/GI9HS0jFv49NcVrZX1Rzm/ZUk5JHkLzJtiUVQOEnBg4VVnFh2rBarPh0x6dWg==
1743+
"@salesforce/source-deploy-retrieve@^10.9.1":
1744+
version "10.9.1"
1745+
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.9.1.tgz#315981e58e684b4fe49dd812b3e3c6a3daf92bf6"
1746+
integrity sha512-FmSO6F4DFv7CqtFIzs0v8yuMlEie+hG2fq7QrBmhBxd6+1WNfk7wM3vXZyO0zOv9uarkILStB5+Dy91DYVrRHw==
17471747
dependencies:
1748-
"@salesforce/core" "^6.7.0"
1749-
"@salesforce/kit" "^3.0.15"
1748+
"@salesforce/core" "^6.7.3"
1749+
"@salesforce/kit" "^3.1.0"
17501750
"@salesforce/ts-types" "^2.0.9"
17511751
fast-levenshtein "^3.0.0"
1752-
fast-xml-parser "^4.3.5"
1752+
fast-xml-parser "^4.3.6"
17531753
got "^11.8.6"
17541754
graceful-fs "^4.2.11"
17551755
ignore "^5.3.1"
@@ -1906,21 +1906,7 @@
19061906
"@smithy/util-middleware" "^2.2.0"
19071907
tslib "^2.6.2"
19081908

1909-
"@smithy/core@^1.4.0":
1910-
version "1.4.1"
1911-
resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.1.tgz#42d1413ccade7c9a5418d739df68f5f6a039a7c0"
1912-
integrity sha512-jCnbEQHvTOUQXxXOS110FIMc83dCXUlrqiG/q0QzUSYhglDj9bJVPFjXmxc6qUfARe0mEb8h9LeVoh7FUYHuUg==
1913-
dependencies:
1914-
"@smithy/middleware-endpoint" "^2.5.0"
1915-
"@smithy/middleware-retry" "^2.3.0"
1916-
"@smithy/middleware-serde" "^2.3.0"
1917-
"@smithy/protocol-http" "^3.3.0"
1918-
"@smithy/smithy-client" "^2.5.0"
1919-
"@smithy/types" "^2.12.0"
1920-
"@smithy/util-middleware" "^2.2.0"
1921-
tslib "^2.6.2"
1922-
1923-
"@smithy/core@^1.4.1":
1909+
"@smithy/core@^1.4.0", "@smithy/core@^1.4.1":
19241910
version "1.4.2"
19251911
resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.2.tgz#1c3ed886d403041ce5bd2d816448420c57baa19c"
19261912
integrity sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA==
@@ -2063,20 +2049,7 @@
20632049
"@smithy/types" "^2.12.0"
20642050
tslib "^2.6.2"
20652051

2066-
"@smithy/middleware-endpoint@^2.5.0":
2067-
version "2.5.0"
2068-
resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.0.tgz#9f1459e9b4cbf00fadfd99e98f88d4b1a2aeb987"
2069-
integrity sha512-OBhI9ZEAG8Xen0xsFJwwNOt44WE2CWkfYIxTognC8x42Lfsdf0VN/wCMqpdkySMDio/vts10BiovAxQp0T0faA==
2070-
dependencies:
2071-
"@smithy/middleware-serde" "^2.3.0"
2072-
"@smithy/node-config-provider" "^2.3.0"
2073-
"@smithy/shared-ini-file-loader" "^2.4.0"
2074-
"@smithy/types" "^2.12.0"
2075-
"@smithy/url-parser" "^2.2.0"
2076-
"@smithy/util-middleware" "^2.2.0"
2077-
tslib "^2.6.2"
2078-
2079-
"@smithy/middleware-endpoint@^2.5.1":
2052+
"@smithy/middleware-endpoint@^2.5.0", "@smithy/middleware-endpoint@^2.5.1":
20802053
version "2.5.1"
20812054
resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.1.tgz#1333c58304aff4d843e8ef4b85c8cb88975dd5ad"
20822055
integrity sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ==
@@ -2089,22 +2062,7 @@
20892062
"@smithy/util-middleware" "^2.2.0"
20902063
tslib "^2.6.2"
20912064

2092-
"@smithy/middleware-retry@^2.2.0", "@smithy/middleware-retry@^2.3.0":
2093-
version "2.3.0"
2094-
resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.3.0.tgz#b7b9a279f364b43e097cf96ca7a4192f361f3776"
2095-
integrity sha512-5H7kD0My2RkZryvYIWA4C9w6t/pdJfbgEdq+fcZhbnZsqHm/4vYFVjDsOzb5pC7PEpksuijoM9fGbM6eN4rLSg==
2096-
dependencies:
2097-
"@smithy/node-config-provider" "^2.3.0"
2098-
"@smithy/protocol-http" "^3.3.0"
2099-
"@smithy/service-error-classification" "^2.1.5"
2100-
"@smithy/smithy-client" "^2.5.0"
2101-
"@smithy/types" "^2.12.0"
2102-
"@smithy/util-middleware" "^2.2.0"
2103-
"@smithy/util-retry" "^2.2.0"
2104-
tslib "^2.6.2"
2105-
uuid "^9.0.1"
2106-
2107-
"@smithy/middleware-retry@^2.3.1":
2065+
"@smithy/middleware-retry@^2.2.0", "@smithy/middleware-retry@^2.3.0", "@smithy/middleware-retry@^2.3.1":
21082066
version "2.3.1"
21092067
resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.3.1.tgz#d6fdce94f2f826642c01b4448e97a509c4556ede"
21102068
integrity sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA==
@@ -2218,19 +2176,7 @@
22182176
"@smithy/util-utf8" "^2.3.0"
22192177
tslib "^2.6.2"
22202178

2221-
"@smithy/smithy-client@^2.5.0":
2222-
version "2.5.0"
2223-
resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.0.tgz#8de4fff221d232dda34a8e706d6a4f2911dffe2e"
2224-
integrity sha512-DDXWHWdimtS3y/Kw1Jo46KQ0ZYsDKcldFynQERUGBPDpkW1lXOTHy491ALHjwfiBQvzsVKVxl5+ocXNIgJuX4g==
2225-
dependencies:
2226-
"@smithy/middleware-endpoint" "^2.5.0"
2227-
"@smithy/middleware-stack" "^2.2.0"
2228-
"@smithy/protocol-http" "^3.3.0"
2229-
"@smithy/types" "^2.12.0"
2230-
"@smithy/util-stream" "^2.2.0"
2231-
tslib "^2.6.2"
2232-
2233-
"@smithy/smithy-client@^2.5.1":
2179+
"@smithy/smithy-client@^2.5.0", "@smithy/smithy-client@^2.5.1":
22342180
version "2.5.1"
22352181
resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.1.tgz#0fd2efff09dc65500d260e590f7541f8a387eae3"
22362182
integrity sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ==
@@ -4043,10 +3989,10 @@ eslint-config-salesforce-license@^0.2.0:
40433989
resolved "https://registry.yarnpkg.com/eslint-config-salesforce-license/-/eslint-config-salesforce-license-0.2.0.tgz#323193f1aa15dd33fbf108d25fc1210afc11065e"
40443990
integrity sha512-DJdBvgj82Erum82YMe+YvG/o6ukna3UA++lRl0HSTldj0VlBl3Q8hzCp97nRXZHra6JH1I912yievZzklXDw6w==
40453991

4046-
eslint-config-salesforce-typescript@^3.2.12:
4047-
version "3.2.12"
4048-
resolved "https://registry.yarnpkg.com/eslint-config-salesforce-typescript/-/eslint-config-salesforce-typescript-3.2.12.tgz#be87ce5ab9a846ac577c1aa7441fc63c6a675d40"
4049-
integrity sha512-dCXU2V7DE8woGtfEZyxD9hSX3F+ZS/26nS6oG963I7/p9aeA1S6apPR1v3kV7o9VDR86ry1OIFbvK//1oDcz/w==
3992+
eslint-config-salesforce-typescript@^3.3.0:
3993+
version "3.3.0"
3994+
resolved "https://registry.yarnpkg.com/eslint-config-salesforce-typescript/-/eslint-config-salesforce-typescript-3.3.0.tgz#308acead1909665a92e9d32895c592ec4c9ee87a"
3995+
integrity sha512-83+zp2Y2h9oz9D3UksjNGCw+xWD7ylIiAJZ58vUbBD10l8FRUMNyn+RDCKn0xCQz7xed5/LcmgUE4T7roe+HBw==
40503996
dependencies:
40513997
"@typescript-eslint/eslint-plugin" "^6.21.0"
40523998
"@typescript-eslint/parser" "^6.21.0"
@@ -4357,10 +4303,10 @@ [email protected]:
43574303
dependencies:
43584304
strnum "^1.0.5"
43594305

4360-
fast-xml-parser@^4.3.5:
4361-
version "4.3.5"
4362-
resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.5.tgz#e2f2a2ae8377e9c3dc321b151e58f420ca7e5ccc"
4363-
integrity sha512-sWvP1Pl8H03B8oFJpFR3HE31HUfwtX7Rlf9BNsvdpujD4n7WMhfmu8h9wOV2u+c1k0ZilTADhPqypzx2J690ZQ==
4306+
fast-xml-parser@^4.3.6:
4307+
version "4.3.6"
4308+
resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.6.tgz#190f9d99097f0c8f2d3a0e681a10404afca052ff"
4309+
integrity sha512-M2SovcRxD4+vC493Uc2GZVcZaj66CCJhWurC4viynVSTvrpErCShNcDz1lAho6n9REQKvL/ll4A4/fw6Y9z8nw==
43644310
dependencies:
43654311
strnum "^1.0.5"
43664312

0 commit comments

Comments
 (0)