@simplysf/simply-cicd-core 0.9.0 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. package/README.md +9 -9
  2. package/lib/build/createScratchOrg.js +41 -21
  3. package/lib/build/createScratchOrg.js.map +1 -1
  4. package/lib/build/deleteScratchOrg.js +1 -2
  5. package/lib/build/deleteScratchOrg.js.map +1 -1
  6. package/lib/build/devHubs.js +6 -6
  7. package/lib/build/devHubs.js.map +1 -1
  8. package/lib/resolveOrg.d.ts +25 -0
  9. package/lib/resolveOrg.js +48 -0
  10. package/lib/resolveOrg.js.map +1 -0
  11. package/lib/sfDeploy.js +3 -2
  12. package/lib/sfDeploy.js.map +1 -1
  13. package/lib/sfOrg.d.ts +25 -1
  14. package/lib/sfOrg.js +25 -12
  15. package/lib/sfOrg.js.map +1 -1
  16. package/lib/sfPackages.js +7 -6
  17. package/lib/sfPackages.js.map +1 -1
  18. package/lib/sfdxDependabot/dependabotRun.js +2 -2
  19. package/lib/sfdxDependabot/dependabotRun.js.map +1 -1
  20. package/package.json +2 -2
package/README.md CHANGED
@@ -57,15 +57,15 @@ const mr = await gitlab.findMergeRequest({ sourceBranch: 'feature/x' });
57
57
 
58
58
  The modules `@simplysf/simply-cicd`'s commands run, also exported from the package root. Each stage function takes a plain options object (the camelCase equivalent of the command's flags) and throws on failure. Full signatures are in the [API reference](https://simplysf.github.io/simply-plugins-core/api/simply-cicd-core/readme/).
59
59
 
60
- | Area | Main exports |
61
- | ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
62
- | Build | `createScratchOrg`, `deleteScratchOrg`, `cleanupScratchOrgs`, `pushToScratch`, `runScratchApexTests`, `installDependencies`, `createPackageVersion`, `createFallbackTag`, `determinePackageChanges`, `runLwcJest`, `runCheckPermissionSets`, `runFlowDelta`, `runFlexipageDelta`, `publishUtamPageObjects`, `VersionTagFormat` |
63
- | Deploy | `deployProject`, `deployHappySoup`, `runDeployStage`, `validateDeployFiles`, `toProjectStageOptions`, `toHappySoupStageOptions`, plus the `deployCommon` helpers (`runDeploymentSteps`, `loadProgress`, `updateProgress`, `installDeployPackageDependencies`, `runDeployApexTests`, …) |
64
- | Notify | `sendBuildNotification`, `projectNotifyBeforeScript`/`projectNotifyAfterScript`, `happySoupNotifyBeforeScript`/`happySoupNotifyAfterScript`, `getCommitStories`, `getRemoteCommitStories`, `sendNotification`, `renderNotifyTemplate`, `NOTIFY_TEMPLATES` |
65
- | sfdx-dependabot | `discoverEligibleProjects`, `processProject`, `applyProjectUpdate`, `updateSfdxProject` |
66
- | Schemas (zod) | `deployConfigSchema`, `deployProgressSchema`, `deployRulesSchema`, `deployStageSchema` |
67
- | Salesforce org and package operations | `authenticateOrg` (JWT or SFDX auth URL), `requestPackageVersionCreate`, `getPackageVersionCreateStatus`, `deployProjectSource`, `getPackageVersionReport`, `listInstalledPackages`, `getOrgConnection`, `getOrgInstanceUrl`, `getRemainingDailyScratchOrgs`, `assignPermissionSets`, `assignPermissionSetLicenses` (`AssignmentError`), `createScratchOrgOnHub`, `deleteTargetScratchOrg` (in-process via `@salesforce/core` / `@salesforce/packaging`, no `sf` needed) |
68
- | `sf`/`git`/env utilities | `runSf`, `runSfJson`, `installPackageDependencies`, `runApexTests`, `installPlugin`, `cloneRepo`, `appendToEnvFile`, `resolveString`/`resolveBoolean`, `logger` |
60
+ | Area | Main exports |
61
+ | ------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
62
+ | Build | `createScratchOrg`, `deleteScratchOrg`, `cleanupScratchOrgs`, `pushToScratch`, `runScratchApexTests`, `installDependencies`, `createPackageVersion`, `createFallbackTag`, `determinePackageChanges`, `runLwcJest`, `runCheckPermissionSets`, `runFlowDelta`, `runFlexipageDelta`, `publishUtamPageObjects`, `VersionTagFormat` |
63
+ | Deploy | `deployProject`, `deployHappySoup`, `runDeployStage`, `validateDeployFiles`, `toProjectStageOptions`, `toHappySoupStageOptions`, plus the `deployCommon` helpers (`runDeploymentSteps`, `loadProgress`, `updateProgress`, `installDeployPackageDependencies`, `runDeployApexTests`, …) |
64
+ | Notify | `sendBuildNotification`, `projectNotifyBeforeScript`/`projectNotifyAfterScript`, `happySoupNotifyBeforeScript`/`happySoupNotifyAfterScript`, `getCommitStories`, `getRemoteCommitStories`, `sendNotification`, `renderNotifyTemplate`, `NOTIFY_TEMPLATES` |
65
+ | sfdx-dependabot | `discoverEligibleProjects`, `processProject`, `applyProjectUpdate`, `updateSfdxProject` |
66
+ | Schemas (zod) | `deployConfigSchema`, `deployProgressSchema`, `deployRulesSchema`, `deployStageSchema` |
67
+ | Salesforce org and package operations | `authenticateOrg` (JWT or SFDX auth URL), `requestPackageVersionCreate`, `getPackageVersionCreateStatus`, `deployProjectSource`, `getPackageVersionReport`, `listInstalledPackages`, `getOrgConnection`, `getOrgInstanceUrl`, `getScratchOrgCapacity` (daily and active scratch org limits), `getRemainingDailyScratchOrgs` (deprecated), `assignPermissionSets`, `assignPermissionSetLicenses` (`AssignmentError`), `createScratchOrgOnHub`, `deleteTargetScratchOrg` (in-process via `@salesforce/core` / `@salesforce/packaging`, no `sf` needed) |
68
+ | `sf`/`git`/env utilities | `runSf`, `runSfJson`, `installPackageDependencies`, `runApexTests`, `installPlugin`, `cloneRepo`, `appendToEnvFile`, `resolveString`/`resolveBoolean`, `logger` |
69
69
 
70
70
  ```ts
71
71
  import { deployProject } from '@simplysf/simply-cicd-core';
package/lib/build/createScratchOrg.js CHANGED
@@ -16,15 +16,15 @@
16
16
  import { promises as fs } from 'node:fs';
17
17
  import { getDefaultPackageDirectory, readSfdxProject } from '@simplysf/simply-core';
18
18
  import { logger } from '../logger.js';
19
- import { assignPermissionSetLicenses as assignLicensesToOrgUser, assignPermissionSets as assignPermissionSetsToOrgUser, createScratchOrgOnHub, getOrgConnection, getRemainingDailyScratchOrgs, } from '../sfOrg.js';
19
+ import { assignPermissionSetLicenses as assignLicensesToOrgUser, assignPermissionSets as assignPermissionSetsToOrgUser, createScratchOrgOnHub, getOrgConnection, getScratchOrgCapacity, } from '../sfOrg.js';
20
20
  import { resolveDevHubs } from './devHubs.js';
21
- async function assignPermissionSets(permissionSets) {
21
+ async function assignPermissionSets(permissionSets, username) {
22
22
  if (permissionSets.length === 0) {
23
23
  return;
24
24
  }
25
25
  logger.info('Assigning permission sets...');
26
26
  try {
27
- await assignPermissionSetsToOrgUser(permissionSets);
27
+ await assignPermissionSetsToOrgUser(permissionSets, username);
28
28
  logger.success('Permission sets assigned successfully.');
29
29
  }
30
30
  catch (e) {
@@ -32,13 +32,13 @@ async function assignPermissionSets(permissionSets) {
32
32
  throw e;
33
33
  }
34
34
  }
35
- async function assignPermissionSetLicenses(licenses) {
35
+ async function assignPermissionSetLicenses(licenses, username) {
36
36
  if (licenses.length === 0) {
37
37
  return;
38
38
  }
39
39
  logger.info('Assigning permission set licenses...');
40
40
  try {
41
- await assignLicensesToOrgUser(licenses);
41
+ await assignLicensesToOrgUser(licenses, username);
42
42
  logger.success('Permission set licenses assigned successfully.');
43
43
  }
44
44
  catch (e) {
@@ -46,20 +46,20 @@ async function assignPermissionSetLicenses(licenses) {
46
46
  throw e;
47
47
  }
48
48
  }
49
- async function assignPermissions(sfdxProjectJson) {
49
+ async function assignPermissions(sfdxProjectJson, username) {
50
50
  const defaultPackageDir = getDefaultPackageDirectory(sfdxProjectJson);
51
51
  const access = defaultPackageDir?.packageMetadataAccess;
52
52
  if (!access) {
53
53
  return;
54
54
  }
55
- await assignPermissionSets(access.permissionSets ?? []);
56
- await assignPermissionSetLicenses(access.permissionSetLicenses ?? []);
55
+ await assignPermissionSets(access.permissionSets ?? [], username);
56
+ await assignPermissionSetLicenses(access.permissionSetLicenses ?? [], username);
57
57
  }
58
- async function trySetDefaultCountry() {
58
+ async function trySetDefaultCountry(username) {
59
59
  try {
60
- // Runs against the just-created scratch org (the default target org). CountryCode only exists
61
- // with State and Country/Territory picklists enabled, so this query is the feature probe.
62
- const connection = await getOrgConnection();
60
+ // Runs against the just-created scratch org. CountryCode only exists with State and
61
+ // Country/Territory picklists enabled, so this query is the feature probe.
62
+ const connection = await getOrgConnection(username);
63
63
  await connection.query('SELECT CountryCode FROM User LIMIT 1');
64
64
  logger.info('State/Country picklists detected. Setting default country for user...');
65
65
  const { Id } = await connection.singleRecordQuery("SELECT Id FROM User WHERE Name = 'User User'");
@@ -70,13 +70,32 @@ async function trySetDefaultCountry() {
70
70
  logger.info('State/Country picklists not detected. Skipping default country update.');
71
71
  }
72
72
  }
73
+ /**
74
+ * The Dev Hub's limits when it can take a signup right now, or why it can't. A signup needs room
75
+ * under both limits: one left for today (`DailyScratchOrgs`), and a free slot under the number that
76
+ * may exist at once (`ActiveScratchOrgs`). A limit the org doesn't report counts as no room, since
77
+ * only a Dev Hub reports them.
78
+ */
79
+ function checkCapacity({ daily, active }) {
80
+ if (!daily || !active) {
81
+ return 'does not report its scratch org limits (is it a Dev Hub?)';
82
+ }
83
+ if (daily.remaining <= 0) {
84
+ return `has no scratch org signups left today (daily limit ${daily.max})`;
85
+ }
86
+ if (active.remaining <= 0) {
87
+ return `is at its active scratch org limit (${active.max} active)`;
88
+ }
89
+ return { daily, active };
90
+ }
73
91
  async function attemptScratchOrgCreation(hub, definitionFile, durationDays) {
74
- const remaining = await getRemainingDailyScratchOrgs(hub.username);
75
- if (remaining === undefined || remaining <= 0) {
76
- logger.warn(`Dev Hub ${hub.alias} has no remaining scratch orgs. Skipping.`);
92
+ const capacity = checkCapacity(await getScratchOrgCapacity(hub.username));
93
+ if (typeof capacity === 'string') {
94
+ logger.warn(`Dev Hub ${hub.alias} ${capacity}. Skipping.`);
77
95
  return undefined;
78
96
  }
79
- logger.info(`Attempting to create scratch org with Dev Hub ${hub.alias} (${remaining} remaining).`);
97
+ const { daily, active } = capacity;
98
+ logger.info(`Attempting to create scratch org with Dev Hub ${hub.alias} (${daily.remaining} signups left today, ${active.remaining} of ${active.max} active slots free).`);
80
99
  const createResult = await createScratchOrgOnHub(hub.username, {
81
100
  definitionFile,
82
101
  durationDays,
@@ -88,8 +107,9 @@ async function attemptScratchOrgCreation(hub, definitionFile, durationDays) {
88
107
  return createResult;
89
108
  }
90
109
  /**
91
- * The Dev Hub refusing the signup because its daily allocation is used up. That's the API's own
92
- * `LIMIT_EXCEEDED` error on the ScratchOrgInfo insert, passed through by @salesforce/core.
110
+ * The Dev Hub refusing the signup because its daily or active allocation is used up, which can
111
+ * still happen after the capacity check when another pipeline signs up in between. That's the
112
+ * API's own `LIMIT_EXCEEDED` error on the ScratchOrgInfo insert, passed through by @salesforce/core.
93
113
  */
94
114
  function isScratchOrgLimitError(error, message) {
95
115
  return (error.errorCode === 'LIMIT_EXCEEDED' ||
@@ -130,16 +150,16 @@ export async function createScratchOrg(options, devHubAliases) {
130
150
  continue;
131
151
  }
132
152
  // eslint-disable-next-line no-await-in-loop
133
- await trySetDefaultCountry();
153
+ await trySetDefaultCountry(createResult.username);
134
154
  // eslint-disable-next-line no-await-in-loop
135
- await assignPermissions(sfdxProjectJson);
155
+ await assignPermissions(sfdxProjectJson, createResult.username);
136
156
  return createResult;
137
157
  }
138
158
  catch (error) {
139
159
  logger.error(`Scratch org creation failed with Dev Hub ${hub.alias}:`);
140
160
  const errorMessage = extractScratchOrgErrorMessage(error);
141
161
  if (isScratchOrgLimitError(error, errorMessage)) {
142
- logger.warn(`Dev Hub ${hub.alias} reached its daily limit. Trying next Dev Hub...`);
162
+ logger.warn(`Dev Hub ${hub.alias} reached a scratch org limit. Trying next Dev Hub...`);
143
163
  continue;
144
164
  }
145
165
  throw new Error(`Scratch org creation failed with a non-recoverable error using Dev Hub ${hub.alias}.`, {
package/lib/build/createScratchOrg.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createScratchOrg.js","sourceRoot":"","sources":["../../src/build/createScratchOrg.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createScratchOrg.js","sourceRoot":"","sources":["../../src/build/createScratchOrg.ts"],"names":[],"mappings":"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"}
package/lib/build/deleteScratchOrg.js CHANGED
@@ -52,8 +52,7 @@ export async function deleteScratchOrg(options, devHubAlias) {
52
52
  setDefault: true,
53
53
  debug: options.debug,
54
54
  });
55
- // ensureScratchOrgSession just made the scratch org the default target org.
56
- await deleteTargetScratchOrg();
55
+ await deleteTargetScratchOrg(scratchOrgInfo.authFields.username);
57
56
  logger.success('Scratch org deleted.');
58
57
  }
59
58
  catch (e) {
package/lib/build/deleteScratchOrg.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"deleteScratchOrg.js","sourceRoot":"","sources":["../../src/build/deleteScratchOrg.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAQzD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAgC,EAAE,WAAmB;IAC1F,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,kBAAkB,EAAE,CAAC;QAClD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,cAAc,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;QAClD,IAAI,GAAG,CAAC,QAAQ,KAAK,cAAc,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC9D,MAAM,IAAI,KAAK,CACb,aAAa,WAAW,KAAK,GAAG,CAAC,QAAQ,+DAA+D,cAAc,CAAC,UAAU,CAAC,cAAc,IAAI,SAAS,IAAI,CAClK,CAAC;QACJ,CAAC;QAED,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;YACvB,uFAAuF;YACvF,0FAA0F;YAC1F,+CAA+C;YAC/C,MAAM,eAAe,CAAC;gBACpB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,UAAU,EAAE,GAAG,CAAC,cAAc;gBAC9B,gBAAgB,EAAE,IAAI;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK;aACrB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,uBAAuB,CAAC,cAAc,CAAC,UAAU,EAAE;YACvD,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC;QAEH,4EAA4E;QAC5E,MAAM,sBAAsB,EAAE,CAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,mEAAmE,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;IAC1G,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"deleteScratchOrg.js","sourceRoot":"","sources":["../../src/build/deleteScratchOrg.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAQzD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAgC,EAAE,WAAmB;IAC1F,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,kBAAkB,EAAE,CAAC;QAClD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,cAAc,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;QAClD,IAAI,GAAG,CAAC,QAAQ,KAAK,cAAc,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC9D,MAAM,IAAI,KAAK,CACb,aAAa,WAAW,KAAK,GAAG,CAAC,QAAQ,+DAA+D,cAAc,CAAC,UAAU,CAAC,cAAc,IAAI,SAAS,IAAI,CAClK,CAAC;QACJ,CAAC;QAED,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;YACvB,uFAAuF;YACvF,0FAA0F;YAC1F,+CAA+C;YAC/C,MAAM,eAAe,CAAC;gBACpB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,UAAU,EAAE,GAAG,CAAC,cAAc;gBAC9B,gBAAgB,EAAE,IAAI;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK;aACrB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,uBAAuB,CAAC,cAAc,CAAC,UAAU,EAAE;YACvD,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC;QAEH,MAAM,sBAAsB,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjE,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,mEAAmE,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;IAC1G,CAAC;AACH,CAAC"}
package/lib/build/devHubs.js CHANGED
@@ -13,19 +13,19 @@
13
13
  * See the License for the specific language governing permissions and
14
14
  * limitations under the License.
15
15
  */
16
- import { AuthInfo } from '@salesforce/core';
16
+ import { resolveAuthInfo } from '../resolveOrg.js';
17
17
  /**
18
- * Resolves a Dev Hub alias to its already-authenticated config. `simply-cicd` never authenticates
19
- * Dev Hubs itself — the alias must already be authenticated (by the calling pipeline, however it
20
- * chooses to do that: JWT, web, SFDX auth-url, or Client Credentials) before this runs.
18
+ * Resolves a Dev Hub alias or username to its already-authenticated config. `simply-cicd` never
19
+ * authenticates Dev Hubs itself — the alias must already be authenticated (by the calling pipeline,
20
+ * however it chooses to do that: JWT, web, SFDX auth-url, or Client Credentials) before this runs.
21
21
  *
22
22
  * `clientId`/`instanceUrl`/`privateKey` are all stored in plaintext in a Dev Hub's `AuthInfo` (only
23
23
  * token/password/secret-named fields are encrypted at rest), so no decryption is needed to read them.
24
24
  *
25
- * @throws {SfError} `NamedOrgNotFoundError` if the alias hasn't already been authenticated.
25
+ * @throws {SfError} `NamedOrgNotFoundError` if no auth exists for the alias or username.
26
26
  */
27
27
  async function resolveDevHub(alias) {
28
- const authInfo = await AuthInfo.create({ username: alias });
28
+ const authInfo = await resolveAuthInfo(alias);
29
29
  const fields = authInfo.getFields();
30
30
  return {
31
31
  alias,
package/lib/build/devHubs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"devHubs.js","sourceRoot":"","sources":["../../src/build/devHubs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAa5C;;;;;;;;;GASG;AACH,KAAK,UAAU,aAAa,CAAC,KAAa;IACxC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IAEpC,OAAO;QACL,KAAK;QACL,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE;QAChC,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;QACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,cAAc,EAAE,MAAM,CAAC,UAAU;KAClC,CAAC;AACJ,CAAC;AAED,yFAAyF;AACzF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAiB;IACpD,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;AACjD,CAAC"}
1
+ {"version":3,"file":"devHubs.js","sourceRoot":"","sources":["../../src/build/devHubs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAanD;;;;;;;;;GASG;AACH,KAAK,UAAU,aAAa,CAAC,KAAa;IACxC,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IAEpC,OAAO;QACL,KAAK;QACL,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE;QAChC,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;QACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,cAAc,EAAE,MAAM,CAAC,UAAU;KAClC,CAAC;AACJ,CAAC;AAED,yFAAyF;AACzF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAiB;IACpD,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;AACjD,CAAC"}
package/lib/resolveOrg.d.ts ADDED
@@ -0,0 +1,25 @@
1
+ import { AuthInfo, Org } from '@salesforce/core';
2
+ export type ResolveOrgOptions = {
3
+ /** Fall back to the default Dev Hub (`target-dev-hub`) instead of the default target org. */
4
+ isDevHub?: boolean;
5
+ };
6
+ /**
7
+ * The authenticated org that an `--alias`/`--target-org`-style value names, resolved the way `sf`
8
+ * resolves `--target-org`: an alias or the username of an existing auth, with a blank value meaning
9
+ * the default target org (or, with `isDevHub`, the default Dev Hub).
10
+ *
11
+ * The default is re-read from disk on every call. `@salesforce/core` caches config per process, so
12
+ * without that a default set earlier in the same run (`setDefault` on a login or a scratch org
13
+ * create) would be missed, and the previous default org used instead.
14
+ *
15
+ * @throws {SfError} `NamedOrgNotFoundError` if no auth exists for the alias/username;
16
+ * `NoUsernameFoundError` if the value is blank and no default is set.
17
+ */
18
+ export declare function resolveOrg(aliasOrUsername?: string, options?: ResolveOrgOptions): Promise<Org>;
19
+ /**
20
+ * The saved auth for an alias or username, without connecting to the org. `AuthInfo.create` only
21
+ * accepts a username, so an alias is resolved to its username first.
22
+ *
23
+ * @throws {SfError} `NamedOrgNotFoundError` if no auth exists for the alias/username.
24
+ */
25
+ export declare function resolveAuthInfo(aliasOrUsername: string): Promise<AuthInfo>;
package/lib/resolveOrg.js ADDED
@@ -0,0 +1,48 @@
1
+ /*
2
+ * Copyright (c) 2026, SimplySF.
3
+ *
4
+ * Licensed under the Apache License, Version 2.0 (the "License");
5
+ * you may not use this file except in compliance with the License.
6
+ * You may obtain a copy of the License at
7
+ *
8
+ * http://www.apache.org/licenses/LICENSE-2.0
9
+ *
10
+ * Unless required by applicable law or agreed to in writing, software
11
+ * distributed under the License is distributed on an "AS IS" BASIS,
12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ * See the License for the specific language governing permissions and
14
+ * limitations under the License.
15
+ */
16
+ import { AuthInfo, ConfigAggregator, Org, StateAggregator } from '@salesforce/core';
17
+ /**
18
+ * The authenticated org that an `--alias`/`--target-org`-style value names, resolved the way `sf`
19
+ * resolves `--target-org`: an alias or the username of an existing auth, with a blank value meaning
20
+ * the default target org (or, with `isDevHub`, the default Dev Hub).
21
+ *
22
+ * The default is re-read from disk on every call. `@salesforce/core` caches config per process, so
23
+ * without that a default set earlier in the same run (`setDefault` on a login or a scratch org
24
+ * create) would be missed, and the previous default org used instead.
25
+ *
26
+ * @throws {SfError} `NamedOrgNotFoundError` if no auth exists for the alias/username;
27
+ * `NoUsernameFoundError` if the value is blank and no default is set.
28
+ */
29
+ export async function resolveOrg(aliasOrUsername, options = {}) {
30
+ const { isDevHub } = options;
31
+ const name = aliasOrUsername?.trim();
32
+ if (name) {
33
+ return Org.create({ aliasOrUsername: name, isDevHub });
34
+ }
35
+ const aggregator = await (await ConfigAggregator.create()).reload();
36
+ return Org.create({ aggregator, isDevHub });
37
+ }
38
+ /**
39
+ * The saved auth for an alias or username, without connecting to the org. `AuthInfo.create` only
40
+ * accepts a username, so an alias is resolved to its username first.
41
+ *
42
+ * @throws {SfError} `NamedOrgNotFoundError` if no auth exists for the alias/username.
43
+ */
44
+ export async function resolveAuthInfo(aliasOrUsername) {
45
+ const stateAggregator = await StateAggregator.getInstance();
46
+ return AuthInfo.create({ username: stateAggregator.aliases.resolveUsername(aliasOrUsername.trim()) });
47
+ }
48
+ //# sourceMappingURL=resolveOrg.js.map
package/lib/resolveOrg.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolveOrg.js","sourceRoot":"","sources":["../src/resolveOrg.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOpF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,eAAwB,EAAE,UAA6B,EAAE;IACxF,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7B,MAAM,IAAI,GAAG,eAAe,EAAE,IAAI,EAAE,CAAC;IACrC,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;IACpE,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC9C,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,eAAuB;IAC3D,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,CAAC;IAC5D,OAAO,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;AACxG,CAAC"}
package/lib/sfDeploy.js CHANGED
@@ -13,10 +13,11 @@
13
13
  * See the License for the specific language governing permissions and
14
14
  * limitations under the License.
15
15
  */
16
- import { Org, SfError, SfProject } from '@salesforce/core';
16
+ import { SfError, SfProject } from '@salesforce/core';
17
17
  import { ComponentSet, ComponentSetBuilder, ComponentStatus, RequestStatus } from '@salesforce/source-deploy-retrieve';
18
18
  import { SourceTracking } from '@salesforce/source-tracking';
19
19
  import { logger } from './logger.js';
20
+ import { resolveOrg } from './resolveOrg.js';
20
21
  /**
21
22
  * Deploys project source to an org with source tracking, as
22
23
  * `sf project deploy start --ignore-conflicts [--source-dir …] [--ignore-warnings] --wait <wait>` does:
@@ -31,7 +32,7 @@ import { logger } from './logger.js';
31
32
  */
32
33
  export async function deployProjectSource(options) {
33
34
  const { aliasOrUsername, sourceDirs, ignoreWarnings = false, wait } = options;
34
- const org = await Org.create({ aliasOrUsername });
35
+ const org = await resolveOrg(aliasOrUsername);
35
36
  const project = await SfProject.resolve();
36
37
  const tracking = await SourceTracking.create({ org, project, subscribeSDREvents: true, ignoreConflicts: true });
37
38
  const componentSet = sourceDirs?.length
package/lib/sfDeploy.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sfDeploy.js","sourceRoot":"","sources":["../src/sfDeploy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sfDeploy.js","sourceRoot":"","sources":["../src/sfDeploy.ts"],"names":[],"mappings":"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"}
package/lib/sfOrg.d.ts CHANGED
@@ -2,13 +2,37 @@ import { type Connection } from '@salesforce/core';
2
2
  /**
3
3
  * The org's instance URL, e.g. `https://my-domain.my.salesforce.com`.
4
4
  *
5
- * @param aliasOrUsername - The org to look up. Omit (or pass `''`) to use the default target org.
5
+ * @param aliasOrUsername - The org to look up: an alias or username of an existing auth. Omit (or
6
+ * pass `''`) to use the default target org.
6
7
  */
7
8
  export declare function getOrgInstanceUrl(aliasOrUsername?: string): Promise<string>;
9
+ /** One org limit as the REST `limits` resource reports it. */
10
+ export type OrgLimit = {
11
+ max: number;
12
+ remaining: number;
13
+ };
14
+ /**
15
+ * A Dev Hub's two scratch org limits. Each is `undefined` when the org doesn't report it (an org
16
+ * that isn't a Dev Hub reports neither).
17
+ */
18
+ export type ScratchOrgCapacity = {
19
+ /** `DailyScratchOrgs`: signups left today, which a deleted scratch org does not give back. */
20
+ daily?: OrgLimit;
21
+ /** `ActiveScratchOrgs`: scratch orgs that can exist at once; deleting one frees a slot. */
22
+ active?: OrgLimit;
23
+ };
24
+ /**
25
+ * The Dev Hub's daily and active scratch org limits, read in one `limits` call.
26
+ *
27
+ * @param hubAliasOrUsername - The Dev Hub. Must already be authenticated.
28
+ */
29
+ export declare function getScratchOrgCapacity(hubAliasOrUsername: string): Promise<ScratchOrgCapacity>;
8
30
  /**
9
31
  * How many more scratch orgs the Dev Hub may create today (its `DailyScratchOrgs` limit), or
10
32
  * `undefined` when the org doesn't report that limit.
11
33
  *
34
+ * @deprecated Use {@link getScratchOrgCapacity}, which also reports the `ActiveScratchOrgs` limit a
35
+ * signup needs room under.
12
36
  * @param hubAliasOrUsername - The Dev Hub. Must already be authenticated.
13
37
  */
14
38
  export declare function getRemainingDailyScratchOrgs(hubAliasOrUsername: string): Promise<number | undefined>;
package/lib/sfOrg.js CHANGED
@@ -14,31 +14,44 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  import { promises as fs } from 'node:fs';
17
- import { AuthInfo, AuthRemover, Org, scratchOrgCreate, SfError, User } from '@salesforce/core';
17
+ import { AuthInfo, AuthRemover, scratchOrgCreate, SfError, User } from '@salesforce/core';
18
18
  import { Duration } from '@salesforce/kit';
19
19
  import { escapeSoqlLiteral } from '@simplysf/simply-core';
20
20
  import { logger } from './logger.js';
21
+ import { resolveOrg } from './resolveOrg.js';
21
22
  /**
22
23
  * The org's instance URL, e.g. `https://my-domain.my.salesforce.com`.
23
24
  *
24
- * @param aliasOrUsername - The org to look up. Omit (or pass `''`) to use the default target org.
25
+ * @param aliasOrUsername - The org to look up: an alias or username of an existing auth. Omit (or
26
+ * pass `''`) to use the default target org.
25
27
  */
26
28
  export async function getOrgInstanceUrl(aliasOrUsername) {
27
- // Callers pass '' for "no --alias given", which `sf org display --target-org ''` treated as the
28
- // default target org; Org.create only does that for undefined.
29
- const org = await Org.create({ aliasOrUsername: aliasOrUsername === '' ? undefined : aliasOrUsername });
29
+ const org = await resolveOrg(aliasOrUsername);
30
30
  return org.getConnection().instanceUrl;
31
31
  }
32
+ function toOrgLimit(limit) {
33
+ return limit ? { max: limit.Max, remaining: limit.Remaining } : undefined;
34
+ }
35
+ /**
36
+ * The Dev Hub's daily and active scratch org limits, read in one `limits` call.
37
+ *
38
+ * @param hubAliasOrUsername - The Dev Hub. Must already be authenticated.
39
+ */
40
+ export async function getScratchOrgCapacity(hubAliasOrUsername) {
41
+ const org = await resolveOrg(hubAliasOrUsername, { isDevHub: true });
42
+ const limits = (await org.getConnection().limits());
43
+ return { daily: toOrgLimit(limits.DailyScratchOrgs), active: toOrgLimit(limits.ActiveScratchOrgs) };
44
+ }
32
45
  /**
33
46
  * How many more scratch orgs the Dev Hub may create today (its `DailyScratchOrgs` limit), or
34
47
  * `undefined` when the org doesn't report that limit.
35
48
  *
49
+ * @deprecated Use {@link getScratchOrgCapacity}, which also reports the `ActiveScratchOrgs` limit a
50
+ * signup needs room under.
36
51
  * @param hubAliasOrUsername - The Dev Hub. Must already be authenticated.
37
52
  */
38
53
  export async function getRemainingDailyScratchOrgs(hubAliasOrUsername) {
39
- const org = await Org.create({ aliasOrUsername: hubAliasOrUsername });
40
- const limits = (await org.getConnection().limits());
41
- return limits.DailyScratchOrgs?.Remaining;
54
+ return (await getScratchOrgCapacity(hubAliasOrUsername)).daily?.remaining;
42
55
  }
43
56
  /**
44
57
  * A connection to an authenticated org.
@@ -47,7 +60,7 @@ export async function getRemainingDailyScratchOrgs(hubAliasOrUsername) {
47
60
  * `--target-org` do.
48
61
  */
49
62
  export async function getOrgConnection(aliasOrUsername) {
50
- const org = await Org.create({ aliasOrUsername });
63
+ const org = await resolveOrg(aliasOrUsername);
51
64
  return org.getConnection();
52
65
  }
53
66
  /** Thrown when any assignment failed; `failures` lists each one. */
@@ -60,7 +73,7 @@ export class AssignmentError extends Error {
60
73
  }
61
74
  }
62
75
  async function resolveOrgUser(aliasOrUsername) {
63
- const org = await Org.create({ aliasOrUsername });
76
+ const org = await resolveOrg(aliasOrUsername);
64
77
  const username = org.getUsername() ?? '';
65
78
  const { Id: userId } = await org
66
79
  .getConnection()
@@ -145,7 +158,7 @@ export async function assignPermissionSetLicenses(licenseNames, aliasOrUsername)
145
158
  * @throws {SfError} If signup fails or doesn't finish within the wait.
146
159
  */
147
160
  export async function createScratchOrgOnHub(hubAliasOrUsername, options) {
148
- const hubOrg = await Org.create({ aliasOrUsername: hubAliasOrUsername });
161
+ const hubOrg = await resolveOrg(hubAliasOrUsername, { isDevHub: true });
149
162
  const orgConfig = JSON.parse(await fs.readFile(options.definitionFile, 'utf-8'));
150
163
  const { username, scratchOrgInfo, authFields, warnings } = await scratchOrgCreate({
151
164
  hubOrg,
@@ -172,7 +185,7 @@ export async function createScratchOrgOnHub(hubAliasOrUsername, options) {
172
185
  * @throws {SfError} If the org isn't a scratch org, or the Dev Hub rejects the delete.
173
186
  */
174
187
  export async function deleteTargetScratchOrg(aliasOrUsername) {
175
- const org = await Org.create({ aliasOrUsername });
188
+ const org = await resolveOrg(aliasOrUsername);
176
189
  const username = org.getUsername() ?? '';
177
190
  const { isScratch } = (await AuthInfo.create({ username })).getFields();
178
191
  if (!isScratch) {
package/lib/sfOrg.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sfOrg.js","sourceRoot":"","sources":["../src/sfOrg.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sfOrg.js","sourceRoot":"","sources":["../src/sfOrg.ts"],"names":[],"mappings":"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"}
package/lib/sfPackages.js CHANGED
@@ -13,11 +13,12 @@
13
13
  * See the License for the specific language governing permissions and
14
14
  * limitations under the License.
15
15
  */
16
- import { Org, SfProject } from '@salesforce/core';
16
+ import { SfProject } from '@salesforce/core';
17
17
  import { Duration } from '@salesforce/kit';
18
18
  import { installPackageDependencies as installPackageDependenciesCore, } from '@simplysf/simply-package-core';
19
19
  import { PackageVersion, SubscriberPackageVersion, } from '@salesforce/packaging';
20
20
  import { logger } from './logger.js';
21
+ import { resolveOrg } from './resolveOrg.js';
21
22
  /**
22
23
  * Adapts the library's progress callbacks onto this package's logger. Step boundaries become info
23
24
  * lines; in-flight status (which fires on every poll) is logged only when its text changes.
@@ -55,7 +56,7 @@ export async function installPackageDependencies(config = {}) {
55
56
  const { alias, wait = '120', installType = 'Upgrade', upgradeType = 'Mixed' } = config;
56
57
  logger.info('Installing packaged dependencies...');
57
58
  try {
58
- const org = await Org.create({ aliasOrUsername: alias });
59
+ const org = await resolveOrg(alias);
59
60
  const project = await SfProject.resolve();
60
61
  const results = await installPackageDependenciesCore({
61
62
  project,
@@ -94,7 +95,7 @@ function upgradedEntries(installResults) {
94
95
  * @throws {SfError} If the Dev Hub can't be resolved or the version doesn't exist.
95
96
  */
96
97
  export async function getPackageVersionReport(packageVersionId, devHubAliasOrUsername) {
97
- const devHub = await Org.create({ aliasOrUsername: devHubAliasOrUsername });
98
+ const devHub = await resolveOrg(devHubAliasOrUsername, { isDevHub: true });
98
99
  const packageVersion = new PackageVersion({
99
100
  connection: devHub.getConnection(),
100
101
  project: undefined,
@@ -108,7 +109,7 @@ export async function getPackageVersionReport(packageVersionId, devHubAliasOrUse
108
109
  * @param aliasOrUsername - The org to inspect. Must already be authenticated.
109
110
  */
110
111
  export async function listInstalledPackages(aliasOrUsername) {
111
- const org = await Org.create({ aliasOrUsername });
112
+ const org = await resolveOrg(aliasOrUsername);
112
113
  const installed = await SubscriberPackageVersion.installedList(org.getConnection());
113
114
  return installed.map((row) => ({
114
115
  Id: row.Id,
@@ -142,7 +143,7 @@ export async function listInstalledPackages(aliasOrUsername) {
142
143
  * (`SF_APPLY_REPLACEMENTS_ON_CONVERT`).
143
144
  */
144
145
  export async function requestPackageVersionCreate(options) {
145
- const devHub = await Org.create({ aliasOrUsername: options.devHubAliasOrUsername });
146
+ const devHub = await resolveOrg(options.devHubAliasOrUsername, { isDevHub: true });
146
147
  const project = await SfProject.resolve();
147
148
  const previous = process.env.SF_APPLY_REPLACEMENTS_ON_CONVERT;
148
149
  process.env.SF_APPLY_REPLACEMENTS_ON_CONVERT = 'true';
@@ -174,7 +175,7 @@ export async function requestPackageVersionCreate(options) {
174
175
  * array element). `Error` lists the request's error messages.
175
176
  */
176
177
  export async function getPackageVersionCreateStatus(createRequestId, devHubAliasOrUsername) {
177
- const devHub = await Org.create({ aliasOrUsername: devHubAliasOrUsername });
178
+ const devHub = await resolveOrg(devHubAliasOrUsername, { isDevHub: true });
178
179
  return PackageVersion.getCreateStatus(createRequestId, devHub.getConnection());
179
180
  }
180
181
  /** {@link getPackageVersionReport}, but warns and returns `undefined` on failure. */
package/lib/sfPackages.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sfPackages.js","sourceRoot":"","sources":["../src/sfPackages.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sfPackages.js","sourceRoot":"","sources":["../src/sfPackages.ts"],"names":[],"mappings":"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"}
package/lib/sfdxDependabot/dependabotRun.js CHANGED
@@ -13,9 +13,9 @@
13
13
  * See the License for the specific language governing permissions and
14
14
  * limitations under the License.
15
15
  */
16
- import { Org } from '@salesforce/core';
17
16
  import { escapeSoqlLiteral } from '@simplysf/simply-core';
18
17
  import { logger } from '../logger.js';
18
+ import { resolveOrg } from '../resolveOrg.js';
19
19
  import { updateSfdxProject } from './updater.js';
20
20
  /** Queries the DevHub for a released subscriber package version's name and semantic version. */
21
21
  export async function resolvePackageDetails(devhubUsername, subscriberPackageVersionId) {
@@ -28,7 +28,7 @@ export async function resolvePackageDetails(devhubUsername, subscriberPackageVer
28
28
  logger.info(`Querying DevHub for package details of 04t version: ${subscriberPackageVersionId}...`);
29
29
  const query = `SELECT MajorVersion, MinorVersion, PatchVersion, Name, BuildNumber FROM SubscriberPackageVersion WHERE Id = '${escapeSoqlLiteral(subscriberPackageVersionId)}'`;
30
30
  try {
31
- const devHub = await Org.create({ aliasOrUsername: devhubUsername });
31
+ const devHub = await resolveOrg(devhubUsername, { isDevHub: true });
32
32
  const { records } = await devHub.getConnection().tooling.query(query);
33
33
  if (!records || records.length === 0) {
34
34
  throw new Error(`No records found for Id: ${subscriberPackageVersionId}`);
package/lib/sfdxDependabot/dependabotRun.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dependabotRun.js","sourceRoot":"","sources":["../../src/sfdxDependabot/dependabotRun.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dependabotRun.js","sourceRoot":"","sources":["../../src/sfdxDependabot/dependabotRun.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@simplysf/simply-cicd-core",
3
3
  "description": "The library layer behind @simplysf/simply-cicd: build/deploy/notify pipeline stages, sfdx-dependabot, ALM issue linking (Jira, GitLab Issues) and VCS API clients (GitHub, GitLab) — published separately for direct consumption (e.g. a bot or script) without the CLI framework",
4
- "version": "0.9.0",
4
+ "version": "0.10.0",
5
5
  "author": "@ClayChipps",
6
6
  "homepage": "https://github.com/SimplySF/simply-plugins-core",
7
7
  "bugs": "https://github.com/SimplySF/simply-plugins-core/issues",
@@ -142,5 +142,5 @@
142
142
  "output": []
143
143
  }
144
144
  },
145
- "gitHead": "9c35cf8c597120faffd837f141e2f191119f1fa7"
145
+ "gitHead": "3767326fb9448f67ba8224accc6c74c5d0ef04ee"
146
146
  }