Skip to content

Commit 1e9177b

Browse files
authored
Merge pull request #1314 from salesforcecli/sh/updated-connectionResolver
W-18033709 - fix: use updated connectionResolver from SDR
2 parents f8619da + b8bc5ef commit 1e9177b

File tree

4 files changed

+1623
-1065
lines changed

4 files changed

+1623
-1065
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
"bugs": "https://github.com/forcedotcom/cli/issues",
77
"dependencies": {
88
"@oclif/core": "^4.2.10",
9-
"@oclif/multi-stage-output": "^0.8.11",
9+
"@oclif/multi-stage-output": "^0.8.12",
1010
"@salesforce/apex-node": "^8.1.19",
1111
"@salesforce/core": "^8.8.5",
1212
"@salesforce/kit": "^3.2.3",
1313
"@salesforce/plugin-info": "^3.4.47",
14-
"@salesforce/sf-plugins-core": "^12.2.0",
15-
"@salesforce/source-deploy-retrieve": "^12.16.6",
16-
"@salesforce/source-tracking": "^7.3.17",
14+
"@salesforce/sf-plugins-core": "^12.2.1",
15+
"@salesforce/source-deploy-retrieve": "12.16.9",
16+
"@salesforce/source-tracking": "^7.3.19",
1717
"@salesforce/ts-types": "^2.0.12",
1818
"ansis": "^3.17.0",
1919
"terminal-link": "^3.0.0"

src/commands/project/convert/source.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ export class Source extends SfCommand<ConvertResultJson> {
3939
public static readonly aliases = ['force:source:convert'];
4040
public static readonly deprecateAliases = true;
4141
public static readonly flags = {
42-
'api-version': { ...orgApiVersionFlagWithDeprecations, summary: messages.getMessage('flags.api-version.summary') },
42+
'api-version': {
43+
...orgApiVersionFlagWithDeprecations,
44+
summary: messages.getMessage('flags.api-version.summary'),
45+
} as Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>,
4346
loglevel,
4447
'root-dir': Flags.directory({
4548
aliases: ['rootdir'],

tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"compilerOptions": {
44
"outDir": "lib",
55
"rootDir": "src",
6-
"skipLibCheck": true,
7-
"baseUrl": "."
6+
"skipLibCheck": true
87
},
98
"include": ["./src/**/*.ts"]
109
}

0 commit comments

Comments
 (0)