Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): apex-node7, core8 #1230

Merged
merged 3 commits into from
Jul 3, 2024
Merged

fix(deps): apex-node7, core8 #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c84a5b
fix(deps): bump apex-node, schema change for SDR required field
mshanemc Jul 2, 2024
e530a40
chore: dep bump for open PRs
mshanemc Jul 3, 2024
914a09f
fix: ts5.5 is smarter
mshanemc Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"bugs": "https://github.com/forcedotcom/cli/issues",
"dependencies": {
"@oclif/core": "^4",
"@salesforce/apex-node": "^6.0.0",
"@salesforce/core": "^8.0.1",
"@salesforce/apex-node": "^7.0.2",
"@salesforce/core": "^8.1.1",
"@salesforce/kit": "^3.1.6",
"@salesforce/sf-plugins-core": "^11.1.2",
"@salesforce/source-deploy-retrieve": "^12.0.1",
"@salesforce/source-deploy-retrieve": "^12.1.4",
"@salesforce/source-tracking": "^7.0.1",
"@salesforce/ts-types": "^2.0.10",
"chalk": "^5.3.0",
Expand All @@ -23,19 +23,19 @@
"@oclif/plugin-help": "^6.2.3",
"@salesforce/cli-plugins-testkit": "^5.3.15",
"@salesforce/dev-scripts": "^10.2.2",
"@salesforce/plugin-command-reference": "^3.1.5",
"@salesforce/plugin-command-reference": "^3.1.8",
"@salesforce/source-testkit": "^2.2.23",
"@salesforce/ts-sinon": "1.4.20",
"@types/archiver": "^5.3.2",
"@types/cli-progress": "^3.11.5",
"archiver": "^5.3.2",
"chai-each": "^0.0.1",
"cross-env": "^7.0.3",
"eslint-plugin-sf-plugin": "^1.18.8",
"eslint-plugin-sf-plugin": "^1.18.10",
"fast-glob": "^3.3.1",
"oclif": "^4.10.11",
"oclif": "^4.13.12",
"ts-node": "^10.9.2",
"typescript": "^5.4.5"
"typescript": "^5.5.3"
},
"config": {},
"engines": {
Expand Down
10 changes: 5 additions & 5 deletions schemas/force-source-deploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,10 @@
"type": "object",
"additionalProperties": false,
"properties": {
"state": {
"type": "string",
"enum": ["Created", "Changed", "Unchanged", "Deleted"]
},
"fullName": {
"type": "string"
},
Expand All @@ -469,13 +473,9 @@
},
"filePath": {
"type": "string"
},
"state": {
"type": "string",
"enum": ["Created", "Changed", "Unchanged", "Deleted"]
}
},
"required": ["fullName", "state", "type"]
"required": ["state"]
},
"FileResponseFailure": {
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion schemas/force-source-pull.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"type": "string"
}
},
"required": ["fullName", "state", "type"],
"required": ["state"],
"additionalProperties": false
}
}
Expand Down
2 changes: 1 addition & 1 deletion schemas/force-source-push.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"type": "string"
}
},
"required": ["fullName", "state", "type"],
"required": ["state"],
"additionalProperties": false
}
},
Expand Down
10 changes: 5 additions & 5 deletions schemas/force-source-retrieve.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
"type": "object",
"additionalProperties": false,
"properties": {
"state": {
"type": "string",
"enum": ["Created", "Changed", "Unchanged", "Deleted"]
},
"fullName": {
"type": "string"
},
Expand All @@ -52,13 +56,9 @@
},
"filePath": {
"type": "string"
},
"state": {
"type": "string",
"enum": ["Created", "Changed", "Unchanged", "Deleted"]
}
},
"required": ["fullName", "state", "type"]
"required": ["state"]
},
"FileResponseFailure": {
"type": "object",
Expand Down
4 changes: 2 additions & 2 deletions src/formatters/source/pushResultFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ export class PushResultFormatter extends ResultFormatter {
.filter((f) => f.state === ComponentStatus.Failed)
.map((f) => {
// we've filtered all of the file responses to failed errors with the state filter above
fileResponses.push(f as FileResponseFailure);
fileResponseFailures.set(`${f.type}#${f.fullName}`, (f as FileResponseFailure).error);
fileResponses.push(f);
fileResponseFailures.set(`${f.type}#${f.fullName}`, f.error);
});
this.sortFileResponses(fileResponses);
this.asRelativePaths(fileResponses);
Expand Down
8 changes: 4 additions & 4 deletions src/trackingFunctions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const messages = Messages.loadMessages('@salesforce/plugin-source', 'tracking');
type TrackingSetupRequest = {
ignoreConflicts: boolean;
ux: Ux;
} & SourceTrackingOptions
} & SourceTrackingOptions;

type TrackingUpdateRequest = {
tracking: SourceTracking;
Expand All @@ -33,7 +33,7 @@ type TrackingUpdateRequest = {
* You can also pass this in if your command already ran getFileResponses and you want to avoid the perf hit from doing it twice
*/
fileResponses?: FileResponse[];
}
};

type ConflictResponse = {
state: 'Conflict';
Expand Down Expand Up @@ -100,10 +100,10 @@ export const updateTracking = async ({ tracking, result, ux, fileResponses }: Tr
tracking.updateLocalTracking({
files: successes
.filter((fileResponse) => fileResponse.state !== ComponentStatus.Deleted)
.map((fileResponse) => fileResponse.filePath as string),
.map((fileResponse) => fileResponse.filePath),
deletedFiles: successes
.filter((fileResponse) => fileResponse.state === ComponentStatus.Deleted)
.map((fileResponse) => fileResponse.filePath as string),
.map((fileResponse) => fileResponse.filePath),
}),
tracking.updateRemoteTracking(
successes.map(({ state, fullName, type, filePath }) => ({ state, fullName, type, filePath })),
Expand Down
Loading
Loading