Skip to content

DONT MERGE debugging #1401

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.

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

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ jobs:
# Since the Windows unit tests take much longer, we run the linux unit tests first and then run the windows unit tests in parallel with NUTs
linux-unit-tests:
needs: yarn-lockfile-check
uses: salesforcecli/github-workflows/.github/workflows/unitTestsLinux.yml@main
uses: salesforcecli/github-workflows/.github/workflows/unitTestsLinux.yml@ew/wireit-cache-2
windows-unit-tests:
needs: linux-unit-tests
uses: salesforcecli/github-workflows/.github/workflows/unitTestsWindows.yml@main
uses: salesforcecli/github-workflows/.github/workflows/unitTestsWindows.yml@ew/wireit-cache-2
nuts:
needs: linux-unit-tests
uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main
needs: yarn-lockfile-check
uses: salesforcecli/github-workflows/.github/workflows/nut.yml@ew/wireit-cache-2
secrets: inherit
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest]
command: ['yarn test:nuts']
fail-fast: false
with:
Expand Down
3 changes: 3 additions & 0 deletions .sfdevrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"devDepOverrides": [ "wireit"]
}
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# plugin-org

foobar

[![NPM](https://img.shields.io/npm/v/@salesforce/plugin-org.svg?label=@salesforce/plugin-org)](https://www.npmjs.com/package/@salesforce/plugin-org) [![Downloads/week](https://img.shields.io/npm/dw/@salesforce/plugin-org.svg)](https://npmjs.org/package/@salesforce/plugin-org) [![License](https://img.shields.io/badge/License-BSD%203--Clause-brightgreen.svg)](https://raw.githubusercontent.com/salesforcecli/plugin-org/main/LICENSE.txt)

Commands for working with Salesforce orgs. As the Salesforce CLI is transitioning commands owned by various teams to
Expand Down
10 changes: 8 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"dependencies": {
"@oclif/core": "^4.2.10",
"@oclif/multi-stage-output": "^0.8.12",
"@oclif/table": "0.4.7",
"@salesforce/core": "^8.9.0",
"@salesforce/kit": "^3.2.3",
"@salesforce/sf-plugins-core": "^12.2.1",
Expand All @@ -18,6 +19,10 @@
"open": "^10.1.0",
"terminal-link": "^3.0.0"
},
"resolutions": {
"@oclif/table": "0.4.7",
"wireit": "0.14.12"
},
"devDependencies": {
"@oclif/plugin-command-snapshot": "^5.2.38",
"@salesforce/cli-plugins-testkit": "^5.3.39",
Expand All @@ -28,7 +33,8 @@
"moment": "^2.30.1",
"oclif": "^4.17.43",
"ts-node": "^10.9.2",
"typescript": "^5.8.3"
"typescript": "^5.8.3",
"wireit": "^0.14.12"
},
"engines": {
"node": ">=18.0.0"
Expand Down Expand Up @@ -100,7 +106,7 @@
"prepack": "sf-prepack",
"prepare": "sf-install",
"test": "wireit",
"test:nuts": "nyc mocha \"./test/nut/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --jobs 2",
"test:nuts": "nyc mocha \"./test/nut/listAndDisplay.nut.ts\" --slow 4500 --timeout 1200000 --parallel --jobs 2",
"test:nuts:sandbox": "nyc mocha \"./test/**/*.sandboxNut.ts\" --slow 450000 --timeout 7200000 --parallel --jobs 5",
"test:only": "wireit",
"test:watch": "mocha --watch \"./test/**/*.test.ts\"",
Expand Down
8 changes: 4 additions & 4 deletions test/nut/listAndDisplay.nut.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const verifyHumanResults = (
expect(defaultUserLine).to.include(defaultOrgEmoji);
const aliasUserLine = lines.find((line) => line.includes(aliasedUsername));
assert(aliasUserLine);
expect(aliasUserLine).to.include('anAlias');
expect(aliasUserLine).to.include('anAliasThatIsReallyLongToSeeIfICanGetThisTableToWrap');
// verbose mode should display scratch org Id and dev hub org Id
if (verbose) {
expect(defaultUserLine.match(/00D/g)).to.have.lengthOf(2, defaultUserLine);
Expand Down Expand Up @@ -61,7 +61,7 @@ describe('Org Command NUT', () => {
},
{
config: join('config', 'project-scratch-def.json'),
alias: 'anAlias',
alias: 'anAliasThatIsReallyLongToSeeIfICanGetThisTableToWrap',
},
],
});
Expand All @@ -70,7 +70,7 @@ describe('Org Command NUT', () => {
hubOrgUsername = session.hubOrg?.username;

const defaultOrg = session.orgs.get('default');
const aliasOrg = session.orgs.get('anAlias');
const aliasOrg = session.orgs.get('anAliasThatIsReallyLongToSeeIfICanGetThisTableToWrap');

assert(defaultOrg?.username);
assert(defaultOrg?.orgId);
Expand Down Expand Up @@ -104,7 +104,7 @@ describe('Org Command NUT', () => {
namespace: null,
});
expect(scratchOrgs.find((org) => org.username === aliasedUsername)).to.include({
alias: 'anAlias',
alias: 'anAliasThatIsReallyLongToSeeIfICanGetThisTableToWrap',
namespace: null,
});
expect(listResult.nonScratchOrgs[0]).to.include(
Expand Down
47 changes: 11 additions & 36 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1705,10 +1705,10 @@
lodash "^4.17.21"
registry-auth-token "^5.0.3"

"@oclif/table@^0.4.6":
version "0.4.6"
resolved "https://registry.yarnpkg.com/@oclif/table/-/table-0.4.6.tgz#4e07fc11de9b8a3187a5ea43edce71c42811ab7e"
integrity sha512-NXh72vHHYnDrWPmVfh4i7kDydz3CXm/tSAr17fWhmWfMM+8jGn5uo6FXtvB0cd9s4skvDqzoRcsRwOeR73zIKA==
"@oclif/table@0.4.7", "@oclif/table@^0.4.6":
version "0.4.7"
resolved "https://registry.yarnpkg.com/@oclif/table/-/table-0.4.7.tgz#5e2d3690f897a68f3d2fb13573f15cdfcff84e29"
integrity sha512-NZGHzQbsy4w30fw9p+5eANmPUB4aXyIAbU+qAlxbAGzRm1ogxm06EmuuCfdH25rUIlq4GnycGEO3AQIkPnG9Cg==
dependencies:
"@types/react" "^18.3.12"
change-case "^5.4.4"
Expand Down Expand Up @@ -7661,16 +7661,7 @@ stack-utils@^2.0.6:
dependencies:
escape-string-regexp "^2.0.0"

"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down Expand Up @@ -7738,14 +7729,7 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -8302,10 +8286,10 @@ widest-line@^5.0.0:
dependencies:
string-width "^7.0.0"

wireit@^0.14.5:
version "0.14.5"
resolved "https://registry.npmjs.org/wireit/-/wireit-0.14.5.tgz"
integrity sha512-K4ka9YBpSyD6pmFZYTJd4VpPsAiPT6j/fOtLzYgnKWlPIMM7lAZjQQ30H7urO+Lqx1Wvrw88tQHBz4njy+lglg==
wireit@0.14.12, wireit@^0.14.12, wireit@^0.14.5:
version "0.14.12"
resolved "https://registry.yarnpkg.com/wireit/-/wireit-0.14.12.tgz#c35788b4be4a796a8d05d204ec7d3f5c4b355d71"
integrity sha512-gNSd+nZmMo6cuICezYXRIayu6TSOeCSCDzjSF0q6g8FKDsRbdqrONrSZYzdk/uBISmRcv4vZtsno6GyGvdXwGA==
dependencies:
brace-expansion "^4.0.0"
chokidar "^3.5.3"
Expand All @@ -8323,7 +8307,7 @@ workerpool@^6.5.1:
resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz"
integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand All @@ -8341,15 +8325,6 @@ wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"
Expand Down
Loading