Skip to content

Commit 2e27e77

Browse files
chore: upgrading salesforce/core to latest
1 parent e199533 commit 2e27e77

Some content is hidden

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

51 files changed

+3852
-2851
lines changed

package.json

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@
66
"bugs": "https://github.com/forcedotcom/cli/issues",
77
"dependencies": {
88
"@apexdevtools/apex-parser": "^4.1.0",
9+
"@babel/parser": "^7.25.6",
10+
"@babel/traverse": "^7.25.6",
911
"@babel/types": "^7.25.6",
1012
"@oclif/command": "^1",
1113
"@oclif/config": "^1",
1214
"@oclif/errors": "^1",
13-
"@salesforce/command": "^4.2.1",
14-
"@salesforce/core": "^2.37.1",
15+
"@salesforce/command": "^5.3.9",
16+
"@salesforce/core": "^8.23.4",
17+
"@salesforce/sf-plugins-core": "^12.1.0",
1518
"@types/jsdom": "^21.1.7",
1619
"@types/lodash.chunk": "^4.2.9",
1720
"@types/shelljs": "^0.8.15",
@@ -22,9 +25,7 @@
2225
"lodash.chunk": "^4.2.0",
2326
"open": "^8.4.2",
2427
"shelljs": "^0.8.5",
25-
"tslib": "^2",
26-
"@babel/parser": "^7.25.6",
27-
"@babel/traverse": "^7.25.6"
28+
"tslib": "^2"
2829
},
2930
"devDependencies": {
3031
"@oclif/dev-cli": "^1",
@@ -37,7 +38,7 @@
3738
"@salesforce/prettier-config": "^0.0.3",
3839
"@salesforce/ts-sinon": "^1",
3940
"@types/babel__traverse": "^7.20.6",
40-
"@types/jsforce": "^1.11.5",
41+
"@types/jsforce": "^1.11.6",
4142
"@types/xmldom": "^0.1.34",
4243
"@typescript-eslint/eslint-plugin": "^4.2.0",
4344
"@typescript-eslint/parser": "^4.2.0",
@@ -65,6 +66,7 @@
6566
"typescript": "^4.9.5"
6667
},
6768
"resolutions": {
69+
"@salesforce/core": "^8.23.4",
6870
"nanoid": "^3.3.8",
6971
"marked": "^4.0.10",
7072
"semver": "^7.5.2",
@@ -130,18 +132,18 @@
130132
},
131133
"repository": "salesforcecli/plugin-omnistudio-migration-tool",
132134
"scripts": {
133-
"build": "sf-build && yarn copy-assets",
135+
"build": "sf-build",
134136
"clean": "sf-clean",
135137
"clean-all": "sf-clean all",
136138
"clean:lib": "shx rm -rf lib && shx rm -rf coverage && shx rm -rf .nyc_output && shx rm -f oclif.manifest.json",
137-
"compile": "sf-compile && yarn copy-assets",
139+
"compile": "sf-compile",
138140
"copy-assets": "shx cp -r src/templates lib/ && shx cp -r src/styles lib/ && shx cp -r src/javascripts lib/",
139141
"docs": "sf-docs",
140142
"format": "sf-format",
141143
"lint": "sf-lint",
142144
"postpack": "shx rm -f oclif.manifest.json",
143145
"posttest": "yarn lint && yarn test:deprecation-policy && yarn test:command-reference",
144-
"prepack": "sf-prepack && yarn copy-assets",
146+
"prepack": "sf-prepack",
145147
"prepare": "sf-install",
146148
"pretest": "sf-compile-test",
147149
"test": "sf-test",

src/commands/omnistudio/migration/info.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
import * as os from 'os';
88
import { flags, SfdxCommand } from '@salesforce/command';
9-
import { Messages, SfdxError } from '@salesforce/core';
9+
import { Messages, SfError } from '@salesforce/core';
1010
import { AnyJson } from '@salesforce/ts-types';
1111
import { Logger } from '../../../utils/logger';
1212

@@ -80,7 +80,7 @@ export default class Org extends SfdxCommand {
8080
// Organization will always return one result, but this is an example of throwing an error
8181
// The output and --json will automatically be handled for you.
8282
if (!result.records || result.records.length <= 0) {
83-
throw new SfdxError(messages.getMessage('errorNoOrgResults', [this.org.getOrgId()]));
83+
throw new SfError(messages.getMessage('errorNoOrgResults', [this.org.getOrgId()]));
8484
}
8585

8686
// Organization always only returns one result

src/migration/base.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ export class BaseMigrationTool {
4646
protected readonly connection: Connection;
4747
protected readonly namespacePrefix: string;
4848
protected readonly logger: Logger;
49-
protected readonly messages: Messages;
49+
protected readonly messages: Messages<string>;
5050
protected readonly ux: UX;
5151
protected readonly nameRegistry: NameMappingRegistry;
5252

53-
public constructor(namespace: string, connection: Connection, logger: Logger, messages: Messages, ux: UX) {
53+
public constructor(namespace: string, connection: Connection, logger: Logger, messages: Messages<string>, ux: UX) {
5454
this.namespace = namespace;
5555
this.connection = connection;
5656
this.logger = logger;

src/migration/customLabels.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export interface CustomLabelRecord {
5959
}
6060

6161
export class CustomLabelsMigrationTool extends BaseMigrationTool implements MigrationTool {
62-
public constructor(namespace: string, connection: Connection, logger: Logger, messages: Messages, ux: UX) {
62+
public constructor(namespace: string, connection: Connection, logger: Logger, messages: Messages<string>, ux: UX) {
6363
super(namespace, connection, logger, messages, ux);
6464
}
6565

src/migration/deployer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ export class Deployer {
1212
private readonly omniscriptCustomizationPackage = '@omnistudio/omniscript_customization';
1313
private readonly omniscriptCustomizationPackageVersion = '250.0.0';
1414
private readonly username: string;
15-
private readonly messages: Messages;
15+
private readonly messages: Messages<string>;
1616
private readonly omniscriptPackageConfig: OmniscriptPackageConfig;
1717
private omniscriptPackageManager?: OmniscriptPackageManager;
1818

19-
public constructor(projectPath: string, messages: Messages, username: string, authKey: string) {
19+
public constructor(projectPath: string, messages: Messages<string>, username: string, authKey: string) {
2020
this.projectPath = projectPath;
2121
this.username = username;
2222
this.messages = messages;

src/migration/flexcard.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
3636
namespace: string,
3737
connection: Connection,
3838
logger: Logger,
39-
messages: Messages,
39+
messages: Messages<string>,
4040
ux: UX,
4141
allVersions: boolean
4242
) {

src/migration/globalautonumber.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export class GlobalAutoNumberMigrationTool extends BaseMigrationTool implements
2020
private prefManager: OmnistudioSettingsPrefManager;
2121
private globalAutoNumberSettings: AnyJson[] | null = null;
2222

23-
constructor(namespace: string, connection: Connection, logger: Logger, messages: Messages, ux: UX) {
23+
constructor(namespace: string, connection: Connection, logger: Logger, messages: Messages<string>, ux: UX) {
2424
super(namespace, connection, logger, messages, ux);
2525
this.prefManager = new OmnistudioSettingsPrefManager(this.connection, this.messages);
2626
}

src/migration/omniscript.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
7272
namespace: string,
7373
connection: Connection,
7474
logger: Logger,
75-
messages: Messages,
75+
messages: Messages<string>,
7676
ux: UX,
7777
allVersions: boolean
7878
) {

src/migration/postMigrate.ts

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

33
import { Connection, Messages, Org } from '@salesforce/core';
44
import { UX } from '@salesforce/command';
5-
import { ExecuteAnonymousResult } from 'jsforce';
5+
import type { ExecuteAnonymousResult } from '@jsforce/jsforce-node/lib/api/tooling';
66
import { Logger } from '../utils/logger';
77
import { AnonymousApexRunner } from '../utils/apex/executor/AnonymousApexRunner';
88
import { Constants } from '../utils/constants/stringContants';
@@ -30,7 +30,7 @@ export class PostMigrate extends BaseMigrationTool {
3030
namespace: string,
3131
connection: Connection,
3232
logger: Logger,
33-
messages: Messages,
33+
messages: Messages<string>,
3434
ux: UX,
3535
relatedObjectsToProcess: string[],
3636
deploymentConfig?: { autoDeploy: boolean; authKey: string | undefined },

src/migration/premigrate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const authEnvKey = 'OMA_AUTH_KEY';
1414

1515
export class PreMigrate extends BaseMigrationTool {
1616
// Source Custom Object Names
17-
public constructor(namespace: string, connection: Connection, logger: Logger, messages: Messages, ux: UX) {
17+
public constructor(namespace: string, connection: Connection, logger: Logger, messages: Messages<string>, ux: UX) {
1818
super(namespace, connection, logger, messages, ux);
1919
}
2020

0 commit comments

Comments
 (0)