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: update sfdx command to sf to match dependent command id change #66

Merged
merged 4 commits into from
Jun 24, 2024
+10 −10
Merged

fix: update sfdx command to sf to match dependent command id change #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b858aa8
fix: update sfdx command to sf to match dependent command id change
ben-zhang-at-salesforce Jun 21, 2024
202d887
prettify the code
ben-zhang-at-salesforce Jun 24, 2024
792857c
Telling VSCode that Prettier is the default formatter
khawkins Jun 24, 2024
44cbeb8
Fixing Windows test running
khawkins Jun 24, 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
4 changes: 3 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@
"out": true // set this to false to include "out" folder in search results
},
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
"typescript.tsc.autoDetect": "off"
"typescript.tsc.autoDetect": "off",
// Prettier is this project's code formatter.
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
2 changes: 1 addition & 1 deletion src/commands/wizard/authorizeCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class AuthorizeCommand {
if (!result || result.title === l10n.t('No')) {
return Promise.resolve(false);
} else {
await commands.executeCommand('sfdx.org.login.web');
await commands.executeCommand('sf.org.login.web');
await window.showInformationMessage(
l10n.t(
"Once you've authorized your Org, click here to continue."
Expand Down
5 changes: 1 addition & 4 deletions src/commands/wizard/deployToOrgCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ export class DeployToOrgCommand {
currentWorkspace.workspaceFolders[0].uri.fsPath;
const forceAppPath = path.join(workspaceFolderPath, 'force-app');
const forceAppUri = Uri.file(forceAppPath);
await commands.executeCommand(
'sfdx.force.source.deploy.source.path',
forceAppUri
);
await commands.executeCommand('sf.deploy.source.path', forceAppUri);
return Promise.resolve(true);
}
}
9 changes: 5 additions & 4 deletions src/test/runTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,16 @@ async function main() {
// support in the `engines` section of our package.
const vscodeExecutablePath =
await downloadAndUnzipVSCode(VSCODE_TEST_VERSION);
const [cliPath, ...args] =
const [cliPath, ...cliArgs] =
resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);

// Install the Salesforce Extensions, which is a pre-req for our
// extension. Bail if there's an error.
const isWindows = process.platform === 'win32';
const installExtensionDepsOuput = spawnSync(
cliPath,
[...args, '--install-extension', CORE_EXTENSION_ID],
{ stdio: 'inherit', encoding: 'utf-8' }
isWindows ? `"${cliPath}"` : cliPath,
[...cliArgs, '--install-extension', CORE_EXTENSION_ID],
{ stdio: 'inherit', encoding: 'utf-8', shell: isWindows }
);
if (installExtensionDepsOuput.error) {
console.error(
Expand Down
Loading